diff --git a/third_party/nixpkgs/.git-blame-ignore-revs b/third_party/nixpkgs/.git-blame-ignore-revs index 7cdd0738a1..4714b843f2 100644 --- a/third_party/nixpkgs/.git-blame-ignore-revs +++ b/third_party/nixpkgs/.git-blame-ignore-revs @@ -186,3 +186,6 @@ cffc27daf06c77c0d76bc35d24b929cb9d68c3c9 # fetchurl: nixfmt-rfc-style ce21e97a1f20dee15da85c084f9d1148d84f853b + +# percona: apply nixfmt +8d14fa2886fec877690c6d28cfcdba4503dbbcea diff --git a/third_party/nixpkgs/.gitattributes b/third_party/nixpkgs/.gitattributes index 01d363cbb1..32cd96ef9e 100644 --- a/third_party/nixpkgs/.gitattributes +++ b/third_party/nixpkgs/.gitattributes @@ -16,3 +16,5 @@ nixos/doc/default.nix linguist-documentation=false nixos/modules/module-list.nix merge=union # pkgs/top-level/all-packages.nix merge=union + +ci/OWNERS linguist-language=CODEOWNERS diff --git a/third_party/nixpkgs/.github/CODEOWNERS b/third_party/nixpkgs/.github/CODEOWNERS index f84abe7fc4..eb8b282c7b 100644 --- a/third_party/nixpkgs/.github/CODEOWNERS +++ b/third_party/nixpkgs/.github/CODEOWNERS @@ -1,391 +1,4 @@ -# CODEOWNERS file +# Use ci/OWNERS instead # -# This file is used to describe who owns what in this repository. This file does not -# replace `meta.maintainers` but is instead used for other things than derivations -# and modules, like documentation, package sets, and other assets. -# -# For documentation on this file, see https://help.github.com/articles/about-codeowners/ -# Mentioned users will get code review requests. -# -# IMPORTANT NOTE: in order to actually get pinged, commit access is required. -# 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. - -# CI -/.github/workflows @NixOS/Security @Mic92 @zowoq -/.github/workflows/check-nix-format.yml @infinisil -/.github/workflows/nixpkgs-vet.yml @infinisil @philiptaron -/.github/workflows/codeowners.yml @infinisil -/.github/OWNERS @infinisil -/ci @infinisil @philiptaron @NixOS/Security - -# Development support -/.editorconfig @Mic92 @zowoq -/shell.nix @infinisil @NixOS/Security - -# Libraries -/lib @infinisil -/lib/systems @alyssais @ericson2314 -/lib/generators.nix @infinisil @Profpatsch -/lib/cli.nix @infinisil @Profpatsch -/lib/debug.nix @infinisil @Profpatsch -/lib/asserts.nix @infinisil @Profpatsch -/lib/path/* @infinisil -/lib/fileset @infinisil -## Libraries / Module system -/lib/modules.nix @infinisil @roberth -/lib/types.nix @infinisil @roberth -/lib/options.nix @infinisil @roberth -/lib/tests/modules.sh @infinisil @roberth -/lib/tests/modules @infinisil @roberth - -# Nixpkgs Internals -/default.nix @Ericson2314 -/pkgs/top-level/default.nix @Ericson2314 -/pkgs/top-level/impure.nix @Ericson2314 -/pkgs/top-level/stage.nix @Ericson2314 -/pkgs/top-level/splice.nix @Ericson2314 -/pkgs/top-level/release-cross.nix @Ericson2314 -/pkgs/top-level/by-name-overlay.nix @infinisil @philiptaron -/pkgs/stdenv @philiptaron -/pkgs/stdenv/generic @Ericson2314 -/pkgs/stdenv/generic/check-meta.nix @Ericson2314 -/pkgs/stdenv/cross @Ericson2314 -/pkgs/build-support @philiptaron -/pkgs/build-support/cc-wrapper @Ericson2314 -/pkgs/build-support/bintools-wrapper @Ericson2314 -/pkgs/build-support/setup-hooks @Ericson2314 -/pkgs/build-support/setup-hooks/auto-patchelf.sh @layus -/pkgs/build-support/setup-hooks/auto-patchelf.py @layus -/pkgs/pkgs-lib @infinisil -## Format generators/serializers -/pkgs/pkgs-lib/formats/libconfig @h7x4 -/pkgs/pkgs-lib/formats/hocon @h7x4 - -# Nixpkgs build-support -/pkgs/build-support/writers @lassulus @Profpatsch - -# Nixpkgs make-disk-image -/doc/build-helpers/images/makediskimage.section.md @raitobezarius -/nixos/lib/make-disk-image.nix @raitobezarius - -# Nix, the package manager -# @raitobezarius is not "code owner", but is listed here to be notified of changes -# pertaining to the Nix package manager. -# i.e. no authority over those files. -pkgs/tools/package-management/nix/ @NixOS/nix-team @raitobezarius -nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobezarius - -# Nixpkgs documentation -/maintainers/scripts/db-to-md.sh @jtojnar @ryantm -/maintainers/scripts/doc @jtojnar @ryantm - -# Contributor documentation -/CONTRIBUTING.md @infinisil -/.github/PULL_REQUEST_TEMPLATE.md @infinisil -/doc/contributing/ @infinisil -/doc/contributing/contributing-to-documentation.chapter.md @jtojnar @infinisil -/lib/README.md @infinisil -/doc/README.md @infinisil -/nixos/README.md @infinisil -/pkgs/README.md @infinisil -/pkgs/by-name/README.md @infinisil -/maintainers/README.md @infinisil - -# User-facing development documentation -/doc/development.md @infinisil -/doc/development @infinisil - -# NixOS Internals -/nixos/default.nix @infinisil -/nixos/lib/from-env.nix @infinisil -/nixos/lib/eval-config.nix @infinisil -/nixos/modules/system/activation/bootspec.nix @grahamc @cole-h @raitobezarius -/nixos/modules/system/activation/bootspec.cue @grahamc @cole-h @raitobezarius - -# NixOS integration test driver -/nixos/lib/test-driver @tfc - -# NixOS QEMU virtualisation -/nixos/modules/virtualisation/qemu-vm.nix @raitobezarius - -# ACME -/nixos/modules/security/acme @arianvp @flokli @aanderse @emilazy # no merge permission: @m1cr0man - -# Systemd -/nixos/modules/system/boot/systemd.nix @NixOS/systemd -/nixos/modules/system/boot/systemd @NixOS/systemd -/nixos/lib/systemd-*.nix @NixOS/systemd -/pkgs/os-specific/linux/systemd @NixOS/systemd - -# Systemd-boot -/nixos/modules/system/boot/loader/systemd-boot @JulienMalka - -# Images and installer media -/nixos/modules/profiles/installation-device.nix @ElvishJerricco -/nixos/modules/installer/cd-dvd/ @ElvishJerricco -/nixos/modules/installer/sd-card/ - -# Updaters -## update.nix -/maintainers/scripts/update.nix @jtojnar -/maintainers/scripts/update.py @jtojnar -## common-updater-scripts -/pkgs/common-updater/scripts/update-source-version @jtojnar - -# Python-related code and docs -/doc/languages-frameworks/python.section.md @mweinelt @natsukium -/maintainers/scripts/update-python-libraries @natsukium -/pkgs/development/interpreters/python @natsukium -/pkgs/top-level/python-packages.nix @natsukium -/pkgs/top-level/release-python.nix @natsukium - -# Haskell -/doc/languages-frameworks/haskell.section.md @sternenseemann @maralorn -/maintainers/scripts/haskell @sternenseemann @maralorn -/pkgs/development/compilers/ghc @sternenseemann @maralorn -/pkgs/development/haskell-modules @sternenseemann @maralorn -/pkgs/test/haskell @sternenseemann @maralorn -/pkgs/top-level/release-haskell.nix @sternenseemann @maralorn -/pkgs/top-level/haskell-packages.nix @sternenseemann @maralorn - -# Perl -/pkgs/development/interpreters/perl @stigtsp @zakame @marcusramberg -/pkgs/top-level/perl-packages.nix @stigtsp @zakame @marcusramberg -/pkgs/development/perl-modules @stigtsp @zakame @marcusramberg - -# R -/pkgs/applications/science/math/R @jbedo -/pkgs/development/r-modules @jbedo - -# Rust -/pkgs/development/compilers/rust @Mic92 @zowoq @winterqt @figsoda -/pkgs/build-support/rust @zowoq @winterqt @figsoda -/doc/languages-frameworks/rust.section.md @zowoq @winterqt @figsoda - -# C compilers -/pkgs/development/compilers/gcc -/pkgs/development/compilers/llvm @alyssais @RossComputerGuy -/pkgs/development/compilers/emscripten @raitobezarius -/doc/languages-frameworks/emscripten.section.md @raitobezarius - -# Audio -/nixos/modules/services/audio/botamusique.nix @mweinelt -/nixos/modules/services/audio/snapserver.nix @mweinelt -/nixos/tests/botamusique.nix @mweinelt -/nixos/tests/snapcast.nix @mweinelt - -# Browsers -/pkgs/applications/networking/browsers/firefox @mweinelt -/pkgs/applications/networking/browsers/chromium @emilylange -/nixos/tests/chromium.nix @emilylange - -# Certificate Authorities -pkgs/data/misc/cacert/ @ajs124 @lukegb @mweinelt -pkgs/development/libraries/nss/ @ajs124 @lukegb @mweinelt -pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt - -# Jetbrains -/pkgs/applications/editors/jetbrains @edwtjo - -# Licenses -/lib/licenses.nix @alyssais - -# Qt -/pkgs/development/libraries/qt-5 @K900 @NickCao @SuperSandro2000 @ttuegel -/pkgs/development/libraries/qt-6 @K900 @NickCao @SuperSandro2000 @ttuegel - -# KDE / Plasma 5 -/pkgs/applications/kde @K900 @NickCao @SuperSandro2000 @ttuegel -/pkgs/desktops/plasma-5 @K900 @NickCao @SuperSandro2000 @ttuegel -/pkgs/development/libraries/kde-frameworks @K900 @NickCao @SuperSandro2000 @ttuegel - -# KDE / Plasma 6 -/pkgs/kde @K900 @NickCao @SuperSandro2000 @ttuegel -/maintainers/scripts/kde @K900 @NickCao @SuperSandro2000 @ttuegel - -# PostgreSQL and related stuff -/pkgs/servers/sql/postgresql @thoughtpolice -/nixos/modules/services/databases/postgresql.md @thoughtpolice -/nixos/modules/services/databases/postgresql.nix @thoughtpolice -/nixos/tests/postgresql.nix @thoughtpolice - -# Hardened profile & related modules -/nixos/modules/profiles/hardened.nix @joachifm -/nixos/modules/security/lock-kernel-modules.nix @joachifm -/nixos/modules/security/misc.nix @joachifm -/nixos/tests/hardened.nix @joachifm -/pkgs/os-specific/linux/kernel/hardened/config.nix @joachifm - -# Home Automation -/nixos/modules/services/home-automation/home-assistant.nix @mweinelt -/nixos/modules/services/home-automation/zigbee2mqtt.nix @mweinelt -/nixos/tests/home-assistant.nix @mweinelt -/nixos/tests/zigbee2mqtt.nix @mweinelt -/pkgs/servers/home-assistant @mweinelt -/pkgs/tools/misc/esphome @mweinelt - -# Network Time Daemons -/pkgs/tools/networking/chrony @thoughtpolice -/pkgs/tools/networking/ntp @thoughtpolice -/pkgs/tools/networking/openntpd @thoughtpolice -/nixos/modules/services/networking/ntp @thoughtpolice - -# Network -/pkgs/tools/networking/kea/default.nix @mweinelt -/pkgs/tools/networking/babeld/default.nix @mweinelt -/nixos/modules/services/networking/babeld.nix @mweinelt -/nixos/modules/services/networking/kea.nix @mweinelt -/nixos/modules/services/networking/knot.nix @mweinelt -/nixos/modules/services/monitoring/prometheus/exporters/kea.nix @mweinelt -/nixos/tests/babeld.nix @mweinelt -/nixos/tests/kea.nix @mweinelt -/nixos/tests/knot.nix @mweinelt - -# Web servers -/doc/packages/nginx.section.md @raitobezarius -/pkgs/servers/http/nginx/ @raitobezarius -/nixos/modules/services/web-servers/nginx/ @raitobezarius - -# Dhall -/pkgs/development/dhall-modules @Gabriella439 @Profpatsch @ehmry -/pkgs/development/interpreters/dhall @Gabriella439 @Profpatsch @ehmry - -# Idris -/pkgs/development/idris-modules @Infinisil -/pkgs/development/compilers/idris2 @mattpolzin - -# Bazel -/pkgs/development/tools/build-managers/bazel @Profpatsch - -# NixOS modules for e-mail and dns services -/nixos/modules/services/mail/mailman.nix @peti -/nixos/modules/services/mail/postfix.nix @peti -/nixos/modules/services/networking/bind.nix @peti -/nixos/modules/services/mail/rspamd.nix @peti - -# Emacs -/pkgs/applications/editors/emacs/elisp-packages @adisbladis -/pkgs/applications/editors/emacs @adisbladis -/pkgs/top-level/emacs-packages.nix @adisbladis - -# Kakoune -/pkgs/applications/editors/kakoune @philiptaron - -# Neovim -/pkgs/applications/editors/neovim @figsoda @teto - -# VimPlugins -/pkgs/applications/editors/vim/plugins @figsoda - -# VsCode Extensions -/pkgs/applications/editors/vscode/extensions - -# PHP interpreter, packages, extensions, tests and documentation -/doc/languages-frameworks/php.section.md @aanderse @drupol @globin @ma27 @talyz -/nixos/tests/php @aanderse @drupol @globin @ma27 @talyz -/pkgs/build-support/php/build-pecl.nix @aanderse @drupol @globin @ma27 @talyz -/pkgs/build-support/php @drupol -/pkgs/development/interpreters/php @jtojnar @aanderse @drupol @globin @ma27 @talyz -/pkgs/development/php-packages @aanderse @drupol @globin @ma27 @talyz -/pkgs/top-level/php-packages.nix @jtojnar @aanderse @drupol @globin @ma27 @talyz - -# Docker tools -/pkgs/build-support/docker @roberth -/nixos/tests/docker-tools* @roberth -/doc/build-helpers/images/dockertools.section.md @roberth - -# Blockchains -/pkgs/applications/blockchains @mmahut @RaghavSood - -# Go -/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 -/pkgs/desktops/gnome/extensions @jtojnar -/pkgs/build-support/make-hardcode-gsettings-patch @jtojnar - -# Cinnamon -/pkgs/by-name/ci/cinnamon-* @mkg20001 -/pkgs/by-name/cj/cjs @mkg20001 -/pkgs/by-name/mu/muffin @mkg20001 -/pkgs/by-name/ne/nemo @mkg20001 -/pkgs/by-name/ne/nemo-* @mkg20001 - -# nim -/pkgs/development/compilers/nim @ehmry - -# terraform providers -/pkgs/applications/networking/cluster/terraform-providers @zowoq - -# Forgejo -nixos/modules/services/misc/forgejo.nix @adamcstephens @bendlas @emilylange -pkgs/by-name/fo/forgejo/ @adamcstephens @bendlas @emilylange - -# Dotnet -/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 @winterqt -/pkgs/build-support/node/fetch-npm-deps @winterqt -/doc/languages-frameworks/javascript.section.md @winterqt - -# OCaml -/pkgs/build-support/ocaml @ulrikstrid -/pkgs/development/compilers/ocaml @ulrikstrid -/pkgs/development/ocaml-modules @ulrikstrid - -# ZFS -pkgs/os-specific/linux/zfs/2_1.nix @raitobezarius -pkgs/os-specific/linux/zfs/generic.nix @raitobezarius -nixos/modules/tasks/filesystems/zfs.nix @raitobezarius -nixos/tests/zfs.nix @raitobezarius - -# Zig -/pkgs/development/compilers/zig @figsoda -/doc/hooks/zig.section.md @figsoda - -# Buildbot -nixos/modules/services/continuous-integration/buildbot @Mic92 @zowoq -nixos/tests/buildbot.nix @Mic92 @zowoq -pkgs/development/tools/continuous-integration/buildbot @Mic92 @zowoq - -# Pretix -pkgs/by-name/pr/pretix/ @mweinelt -pkgs/by-name/pr/pretalx/ @mweinelt -nixos/modules/services/web-apps/pretix.nix @mweinelt -nixos/modules/services/web-apps/pretalx.nix @mweinelt -nixos/tests/web-apps/pretix.nix @mweinelt -nixos/tests/web-apps/pretalx.nix @mweinelt - -# incus/lxc -nixos/maintainers/scripts/incus/ @adamcstephens -nixos/modules/virtualisation/incus.nix @adamcstephens -nixos/modules/virtualisation/lxc* @adamcstephens -nixos/tests/incus/ @adamcstephens -pkgs/by-name/in/incus/ @adamcstephens -pkgs/by-name/lx/lxc* @adamcstephens - -# ExpidusOS, Flutter -/pkgs/development/compilers/flutter @RossComputerGuy -/pkgs/desktops/expidus @RossComputerGuy - -# GNU Tar & Zip -/pkgs/tools/archivers/gnutar @RossComputerGuy -/pkgs/tools/archivers/zip @RossComputerGuy - -# SELinux -/pkgs/os-specific/linux/checkpolicy @RossComputerGuy -/pkgs/os-specific/linux/libselinux @RossComputerGuy -/pkgs/os-specific/linux/libsepol @RossComputerGuy - -# installShellFiles -/pkgs/by-name/in/installShellFiles/* @Ericson2314 -/pkgs/test/install-shell-files/* @Ericson2314 -/doc/hooks/installShellFiles.section.md @Ericson2314 +# This file would be for the native code owner feature of GitHub, +# but is not being used because of its problems, see ci/OWNERS diff --git a/third_party/nixpkgs/.github/OWNERS b/third_party/nixpkgs/.github/OWNERS deleted file mode 100644 index 94f0ef5b69..0000000000 --- a/third_party/nixpkgs/.github/OWNERS +++ /dev/null @@ -1,19 +0,0 @@ -# -# Currently unused! Use CODEOWNERS for now, see workflows/codeowners.yml -# -#################### -# -# This file is used to describe who owns what in this repository. -# Users/teams will get review requests for PRs that change their files. -# -# This file does not replace `meta.maintainers` -# but is instead used for other things than derivations and modules, -# like documentation, package sets, and other assets. -# -# This file uses the same syntax as the natively supported CODEOWNERS file, -# see https://help.github.com/articles/about-codeowners/ for documentation. -# However it comes with some notable differences: -# - There is no need for user/team listed here to have write access. -# - No reviews will be requested for PRs that target the wrong base branch. -# -# Processing of this file is implemented in workflows/codeowners.yml diff --git a/third_party/nixpkgs/.github/workflows/backport.yml b/third_party/nixpkgs/.github/workflows/backport.yml index dba5f9bcf3..5ca7977fa9 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@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 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 ce4b38913c..5a8f20eb71 100644 --- a/third_party/nixpkgs/.github/workflows/basic-eval.yml +++ b/third_party/nixpkgs/.github/workflows/basic-eval.yml @@ -19,7 +19,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@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30 - uses: cachix/cachix-action@ad2ddac53f961de1989924296a1f236fcfbaa4fc # v15 with: diff --git a/third_party/nixpkgs/.github/workflows/check-cherry-picks.yml b/third_party/nixpkgs/.github/workflows/check-cherry-picks.yml index 7e27583445..ee2832ca93 100644 --- a/third_party/nixpkgs/.github/workflows/check-cherry-picks.yml +++ b/third_party/nixpkgs/.github/workflows/check-cherry-picks.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 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 ad053489e3..b9d811aa02 100644 --- a/third_party/nixpkgs/.github/workflows/check-maintainers-sorted.yaml +++ b/third_party/nixpkgs/.github/workflows/check-maintainers-sorted.yaml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 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 c4e39c7cc3..e771386619 100644 --- a/third_party/nixpkgs/.github/workflows/check-nix-format.yml +++ b/third_party/nixpkgs/.github/workflows/check-nix-format.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest if: "!contains(github.event.pull_request.title, '[skip treewide]')" steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 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-nixf-tidy.yml b/third_party/nixpkgs/.github/workflows/check-nixf-tidy.yml index facae2bc00..7facdeee79 100644 --- a/third_party/nixpkgs/.github/workflows/check-nixf-tidy.yml +++ b/third_party/nixpkgs/.github/workflows/check-nixf-tidy.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest if: "!contains(github.event.pull_request.title, '[skip treewide]')" steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 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-shell.yml b/third_party/nixpkgs/.github/workflows/check-shell.yml index 6abb2f982a..0ece4946f6 100644 --- a/third_party/nixpkgs/.github/workflows/check-shell.yml +++ b/third_party/nixpkgs/.github/workflows/check-shell.yml @@ -10,7 +10,7 @@ jobs: name: shell-check-x86_64-linux runs-on: ubuntu-latest steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge @@ -22,7 +22,7 @@ jobs: name: shell-check-aarch64-darwin runs-on: macos-latest steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 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/codeowners.yml b/third_party/nixpkgs/.github/workflows/codeowners.yml index f4c6f23a0a..9d781c6ef0 100644 --- a/third_party/nixpkgs/.github/workflows/codeowners.yml +++ b/third_party/nixpkgs/.github/workflows/codeowners.yml @@ -13,13 +13,9 @@ on: types: [opened, ready_for_review, synchronize, reopened, edited] env: - # TODO: Once confirmed that this works by seeing that the action would request - # reviews from the same people (or refuse for wrong base branches), - # move all entries from CODEOWNERS to OWNERS and change this value here - # OWNERS_FILE: .github/OWNERS - OWNERS_FILE: .github/CODEOWNERS - # Also remove this - DRY_MODE: 1 + OWNERS_FILE: ci/OWNERS + # Don't do anything on draft PRs + DRY_MODE: ${{ github.event.pull_request.draft && '1' || '' }} jobs: # Check that code owners is valid @@ -29,10 +25,17 @@ jobs: steps: - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30 + - uses: cachix/cachix-action@ad2ddac53f961de1989924296a1f236fcfbaa4fc # v15 + if: github.repository_owner == 'NixOS' + with: + # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. + name: nixpkgs-ci + authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' + # Important: Because we use pull_request_target, this checks out the base branch of the PR, not the PR itself. # We later build and run code from the base branch with access to secrets, # so it's important this is not the PRs code. - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 with: path: base @@ -45,7 +48,7 @@ jobs: app-id: ${{ vars.OWNER_APP_ID }} private-key: ${{ secrets.OWNER_APP_PRIVATE_KEY }} - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 with: ref: refs/pull/${{ github.event.number }}/merge path: pr @@ -69,7 +72,7 @@ jobs: # Important: Because we use pull_request_target, this checks out the base branch of the PR, not the PR head. # This is intentional, because we need to request the review of owners as declared in the base branch. - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 - uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0 id: app-token @@ -84,5 +87,3 @@ jobs: run: result/bin/request-reviews.sh ${{ github.repository }} ${{ github.event.number }} "$OWNERS_FILE" env: GH_TOKEN: ${{ steps.app-token.outputs.token }} - # Don't do anything on draft PRs - DRY_MODE: ${{ github.event.pull_request.draft && '1' || '' }} diff --git a/third_party/nixpkgs/.github/workflows/editorconfig.yml b/third_party/nixpkgs/.github/workflows/editorconfig.yml index e26c625c6f..b4ef16a734 100644 --- a/third_party/nixpkgs/.github/workflows/editorconfig.yml +++ b/third_party/nixpkgs/.github/workflows/editorconfig.yml @@ -25,7 +25,7 @@ jobs: - name: print list of changed files run: | cat "$HOME/changed_files" - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 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 1cbbecdbff..2ae4d929c1 100644 --- a/third_party/nixpkgs/.github/workflows/manual-nixos.yml +++ b/third_party/nixpkgs/.github/workflows/manual-nixos.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 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 51ebc06cbd..676a554107 100644 --- a/third_party/nixpkgs/.github/workflows/manual-nixpkgs.yml +++ b/third_party/nixpkgs/.github/workflows/manual-nixpkgs.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 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 f504713e6e..352cb81d87 100644 --- a/third_party/nixpkgs/.github/workflows/nix-parse.yml +++ b/third_party/nixpkgs/.github/workflows/nix-parse.yml @@ -25,7 +25,7 @@ jobs: if [[ -s "$HOME/changed_files" ]]; then echo "CHANGED_FILES=$HOME/changed_files" > "$GITHUB_ENV" fi - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 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/nixpkgs-vet.yml b/third_party/nixpkgs/.github/workflows/nixpkgs-vet.yml index 7bfe973a8c..2dc325b4c6 100644 --- a/third_party/nixpkgs/.github/workflows/nixpkgs-vet.yml +++ b/third_party/nixpkgs/.github/workflows/nixpkgs-vet.yml @@ -26,53 +26,23 @@ jobs: # This should take 1 minute at most, but let's be generous. The default of 6 hours is definitely too long. timeout-minutes: 10 steps: - # This step has to be in this file, because it's needed to determine which revision of the repository to fetch, and we can only use other files from the repository once it's fetched. + # This checks out the base branch because of pull_request_target + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + with: + path: base + sparse-checkout: ci - name: Resolving the merge commit env: GH_TOKEN: ${{ github.token }} run: | - # This checks for mergeability of a pull request as recommended in - # https://docs.github.com/en/rest/guides/using-the-rest-api-to-interact-with-your-git-database?apiVersion=2022-11-28#checking-mergeability-of-pull-requests - - # Retry the API query this many times - retryCount=5 - # Start with 5 seconds, but double every retry - retryInterval=5 - while true; do - echo "Checking whether the pull request can be merged" - prInfo=$(gh api \ - -H "Accept: application/vnd.github+json" \ - -H "X-GitHub-Api-Version: 2022-11-28" \ - /repos/"$GITHUB_REPOSITORY"/pulls/${{ github.event.pull_request.number }}) - mergeable=$(jq -r .mergeable <<< "$prInfo") - mergedSha=$(jq -r .merge_commit_sha <<< "$prInfo") - - if [[ "$mergeable" == "null" ]]; then - if (( retryCount == 0 )); then - echo "Not retrying anymore. It's likely that GitHub is having internal issues: check https://www.githubstatus.com/" - exit 1 - else - (( retryCount -= 1 )) || true - - # null indicates that GitHub is still computing whether it's mergeable - # Wait a couple seconds before trying again - echo "GitHub is still computing whether this PR can be merged, waiting $retryInterval seconds before trying again ($retryCount retries left)" - sleep "$retryInterval" - - (( retryInterval *= 2 )) || true - fi - else - break - fi - done - - if [[ "$mergeable" == "true" ]]; then - echo "The PR can be merged, checking the merge commit $mergedSha" + if mergedSha=$(base/ci/get-merge-commit.sh ${{ github.repository }} ${{ github.event.number }}); then + echo "Checking the merge commit $mergedSha" echo "mergedSha=$mergedSha" >> "$GITHUB_ENV" else - echo "The PR cannot be merged, it has a merge conflict, skipping the rest.." + echo "Skipping the rest..." fi - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + rm -rf base + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 if: env.mergedSha with: # pull_request_target checks out the base branch by default diff --git a/third_party/nixpkgs/.github/workflows/periodic-merge-24h.yml b/third_party/nixpkgs/.github/workflows/periodic-merge-24h.yml index 6101101ac4..a33074797f 100644 --- a/third_party/nixpkgs/.github/workflows/periodic-merge-24h.yml +++ b/third_party/nixpkgs/.github/workflows/periodic-merge-24h.yml @@ -41,7 +41,7 @@ jobs: into: staging-24.05 name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 - 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 946ab30fe3..42b9bdbdd4 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@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 - 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 deleted file mode 100644 index cb5a09c88d..0000000000 --- a/third_party/nixpkgs/.github/workflows/update-terraform-providers.yml +++ /dev/null @@ -1,69 +0,0 @@ -name: "Update terraform-providers" - -on: - #schedule: - # - cron: "0 3 * * *" - workflow_dispatch: - -permissions: - contents: read - -jobs: - tf-providers: - permissions: - contents: write # for peter-evans/create-pull-request to create branch - pull-requests: write # for peter-evans/create-pull-request to create a PR - 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@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30 - with: - nix_path: nixpkgs=channel:nixpkgs-unstable - - name: setup - id: setup - run: | - echo "title=terraform-providers: update $(date -u +"%Y-%m-%d")" >> $GITHUB_OUTPUT - - name: update terraform-providers - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - git config user.name "github-actions[bot]" - echo | nix-shell \ - maintainers/scripts/update.nix \ - --argstr commit true \ - --argstr keep-going true \ - --argstr max-workers 2 \ - --argstr path terraform-providers - - name: get failed updates - run: | - echo 'FAILED<> $GITHUB_ENV - git ls-files --others >> $GITHUB_ENV - echo 'EOF' >> $GITHUB_ENV - # cleanup logs of failed updates so they aren't included in the PR - - name: clean repo - run: | - git clean -f - - name: create PR - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 # v7.0.3 - with: - body: | - Automatic update by [update-terraform-providers](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/update-terraform-providers.yml) action. - - https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }} - - These providers failed to update: - ``` - ${{ env.FAILED }} - ``` - - Check that all providers build with: - ``` - @ofborg build opentofu.full - ``` - If there is more than ten commits in the PR `ofborg` won't build it automatically and you will need to use the above command. - branch: terraform-providers-update - delete-branch: false - title: ${{ steps.setup.outputs.title }} - token: ${{ secrets.GITHUB_TOKEN }} diff --git a/third_party/nixpkgs/CONTRIBUTING.md b/third_party/nixpkgs/CONTRIBUTING.md index f3c3cfe611..bc9927fe10 100644 --- a/third_party/nixpkgs/CONTRIBUTING.md +++ b/third_party/nixpkgs/CONTRIBUTING.md @@ -93,6 +93,8 @@ This section describes in some detail how changes can be made and proposed with 7. Respond to review comments, potential CI failures and potential merge conflicts by updating the pull request. Always keep the pull request in a mergeable state. + This process is covered in more detail from the non-technical side in [I opened a PR, how do I get it merged?](#i-opened-a-pr-how-do-i-get-it-merged). + The custom [OfBorg](https://github.com/NixOS/ofborg) CI system will perform various checks to help ensure code quality, whose results you can see at the bottom of the pull request. See [the OfBorg Readme](https://github.com/NixOS/ofborg#readme) for more details. @@ -193,19 +195,12 @@ The last checkbox is about whether it fits the guidelines in this `CONTRIBUTING. [rebase]: #rebasing-between-branches-ie-from-master-to-staging From time to time, changes between branches must be rebased, for example, if the -number of new rebuilds they would cause is too large for the target branch. When -rebasing, care must be taken to include only the intended changes, otherwise -many CODEOWNERS will be inadvertently requested for review. To achieve this, -rebasing should not be performed directly on the target branch, but on the merge -base between the current and target branch. As an additional precautionary measure, -you should temporarily mark the PR as draft for the duration of the operation. -This reduces the probability of mass-pinging people. (OfBorg might still -request a couple of persons for reviews though.) +number of new rebuilds they would cause is too large for the target branch. In the following example, we assume that the current branch, called `feature`, is based on `master`, and we rebase it onto the merge base between -`master` and `staging` so that the PR can eventually be retargeted to -`staging` without causing a mess. The example uses `upstream` as the remote for `NixOS/nixpkgs.git` +`master` and `staging` so that the PR can be retargeted to +`staging`. The example uses `upstream` as the remote for `NixOS/nixpkgs.git` while `origin` is the remote you are pushing to. @@ -234,36 +229,6 @@ git status git push origin feature --force-with-lease ``` -#### Something went wrong and a lot of people were pinged - -It happens. Remember to be kind, especially to new contributors. -There is no way back, so the pull request should be closed and locked -(if possible). The changes should be re-submitted in a new PR, in which the people -originally involved in the conversation need to manually be pinged again. -No further discussion should happen on the original PR, as a lot of people -are now subscribed to it. - -The following message (or a version thereof) might be left when closing to -describe the situation, since closing and locking without any explanation -is kind of rude: - -```markdown -It looks like you accidentally mass-pinged a bunch of people, which are now subscribed -and getting notifications for everything in this pull request. Unfortunately, they -cannot be automatically unsubscribed from the issue (removing review request does not -unsubscribe), therefore development cannot continue in this pull request anymore. - -Please open a new pull request with your changes, link back to this one and ping the -people actually involved in here over there. - -In order to avoid this in the future, there are instructions for how to properly -rebase between branches in our [contribution guidelines](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#rebasing-between-branches-ie-from-master-to-staging). -Setting your pull request to draft prior to rebasing is strongly recommended. -In draft status, you can preview the list of people that are about to be requested -for review, which allows you to sidestep this issue. -This is not a bulletproof method though, as OfBorg still does review requests even on draft PRs. -``` - ## How to backport pull requests [pr-backport]: #how-to-backport-pull-requests @@ -343,7 +308,7 @@ If you consider having enough knowledge and experience in a topic and would like Container system, boot system and library changes are some examples of the pull requests fitting this category. -## How to merge pull requests +## How to merge pull requests yourself [pr-merge]: #how-to-merge-pull-requests To streamline automated updates, leverage the nixpkgs-merge-bot by simply commenting `@NixOS/nixpkgs-merge-bot merge`. The bot will verify if the following conditions are met, refusing to merge otherwise: @@ -353,10 +318,7 @@ To streamline automated updates, leverage the nixpkgs-merge-bot by simply commen Further, nixpkgs-merge-bot will ensure all ofBorg checks (except the Darwin-related ones) are successfully completed before merging the pull request. Should the checks still be underway, the bot patiently waits for ofBorg to finish before attempting the merge again. -For other pull requests, the *Nixpkgs committers* are people who have been given -permission to merge. - -It is possible for community members that have enough knowledge and experience on a special topic to contribute by merging pull requests. +For other pull requests, please see [I opened a PR, how do I get it merged?](#i-opened-a-pr-how-do-i-get-it-merged). In case the PR is stuck waiting for the original author to apply a trivial change (a typo, capitalisation change, etc.) and the author allowed the members @@ -553,6 +515,7 @@ To get a sense for what changes are considered mass rebuilds, see [previously me - [Commit conventions](./doc/README.md#commit-conventions) for changes to `doc`, the Nixpkgs manual. ### Writing good commit messages +[writing-good-commit-messages]: #writing-good-commit-messages In addition to writing properly formatted commit messages, it's important to include relevant information so other developers can later understand *why* a change was made. While this information usually can be found by digging code, mailing list/Discourse archives, pull request discussions or upstream changes, it may require a lot of work. @@ -651,3 +614,174 @@ Names of files and directories should be in lowercase, with dashes between words As an exception, an explicit conditional expression with null can be used when fixing a important bug without triggering a mass rebuild. If this is done a follow up pull request _should_ be created to change the code to `lib.optional(s)`. + +## I opened a PR, how do I get it merged? +[i-opened-a-pr-how-do-i-get-it-merged]:#i-opened-a-pr-how-do-i-get-it-merged + +In order for your PR to be merged, someone with merge permissions on the repository ("committer") needs to review and merge it. +Because the group of people with merge permissions is mostly a collection of independent unpaid volunteers who do this in their own free time, this can take some time to happen. +It is entirely normal for your PR to sit around without any feedback for days, weeks or sometimes even months. +We strive to avoid the latter cases of course but the reality of it is that this does happen quite frequently. +Even when you get feedback, follow-up feedback may take similarly long. +Don't be intimidated by this and kindly ask for feedback again every so often. +If your change is good it will eventually be merged at some point. + +There are some things you can do to help speed up the process of your PR being merged though. +In order to speed the process up, you need to know what needs to happen before a committer will actually hit the merge button. +This section intends to give a little overview and insight of what happens after you create your PR. + +### The committer's perspective + +PRs have varying quality and even the best people make mistakes. +It is the role of the committer team to assess whether any PR's changes are good changes or not. +In order for any PR to be merged, at least one committer needs to be convinced of its quality enough to merge it. + +Committers typically assess three aspects of your PR: + +1. Whether the change's intention is necessary and desirable +2. Whether the code quality of your changes is good +3. Whether the artefacts produced by the code are good + +If you want your PR to get merged quickly and smoothly, it is in your best interest to help convince committers in these three aspects. + +### How to help committers assess your PR + +For the committer to judge your intention, it's best to explain why you've made your change. +This does not apply to trivial changes like version updates because the intention is obvious (though linking the changelog is appreciated). +For any more nuanced changed or even major version upgrades, it helps if you explain the background behind your change a bit. +E.g. if you're adding a package, explain what it is and why it should be in Nixpkgs. +This goes hand in hand with [Writing good commit messages](#writing-good-commit-messages). + +For the code quality assessment, you cannot do anything yourself as only the committer can do this and they already have your code to look at. +In order to minimise the need for back and forth though, do take a look over your code changes yourself and try to put yourself into the shoes of someone who didn't just write that code. +Would you immediately know what the code does by glancing at it? +If not, reviewers will notice this and will ask you to clarify the code by refactoring it and/or adding a few explanations in code comments. +Doing this preemptively can save you and the committer a lot of time. + +The code artefacts are the hardest for committers to assess because PRs touch all sorts of components: applications, libraries, NixOS modules, editor plugins and many many other things. +Any individual committer can only really assess components that they themselves know how to use however and yet they must still be convinced somehow. +There isn't a good generic solution to this but there are some ways easing the committer's job here: + +- Provide smoke tests that the committer can run without much research or setup. + + Committers usually don't have the time or interest to learn how your component works and how they could test its functionality. + If you can provide a quick guide on how to use the component in a meaningful way or a ready-made command that demonstrates that the component works as expected, the committer can easily convince themselves that your change is good. + If it can be automated, you could even turn this smoke test into an automated NixOS test which reviewers could simply run via Nix. +- Invite other users of the component to try it out and report their findings. + + If a committer sees the testimonials of other users trying your change and it works as expected for them, that too can convince the committer of your PR's quality. +- Describe what you have done to test your PR. + + If you can convince the committer that you have done sufficient quality assurance on your changes and they trust your report, this too can convince them of your PR's quality, albeit not as strongly as the methods above. +- Become a maintainer of the component. + + This isn't something you can do on your first few PRs touching a component but listed maintainers generally receive more trust when it comes to changes to their maintained components and committers may opt to merge changes without deeper review when they see they're done by their respective maintainer. + +Even if you adhere to all of these recommendations, it is still quite possible for your PR to be forgotten or abandoned by any given committer. +Please remain mindful of the fact that they are doing this on their own volition and unpaid in their free time and therefore [owe you nothing](https://mikemcquaid.com/open-source-maintainers-owe-you-nothing/). +Causing a stink in such a situation is a surefire way to get any other potential committer to not want to look at your PR either. +Ask them nicely whether they still intend to review your PR and find yourself another committer to look at your PR if not. + +### How can I get a committer to look at my PR? + +- Simply wait. Reviewers frequently browse open PRs and may happen to run across yours and take a look. +- Get non-committers to review/approve. Many committers filter open PRs for low-hanging fruit that are already been reviewed. +- [@-mention](https://github.blog/news-insights/mention-somebody-they-re-notified/) someone and ask them nicely +- Post in one of the channels made for this purpose if there has been no activity for at least one week + - The current "PRs ready for review" or "PRs already reviewed" threads in the [NixOS Discourse](https://discourse.nixos.org/c/dev/14) (of course choose the one that applies to your situation) + - The [Nixpkgs Review Requests Matrix room](https://matrix.to/#/#review-requests:nixos.org). + +### CI failed or got stuck on my PR, what do I do? + +First ensure that the failure is actually related to your change. +Sometimes, the CI system simply has a hiccup or the check was broken by someone else before you made your changes. +Read through the error message; it's usually quite easy to tell whether it is caused by anything you did by checking whether it mentions the component you touched anywhere. +If it is indeed caused by your change, obviously try to fix it. +Don't be afraid of asking for advice if you're uncertain how to do that, others have likely fixed such issues dozens of times and can help you out. +Your PR is unlikely to be merged if it has a known issue and it is the purpose of CI to alert you aswell as reviewers to these issues. + +ofBorg builds can often get stuck, particularly in PRs targeting `staging` and in builders for the Darwin platform. Reviewers will know how to handle them or when to ignore them. +Don't worry about it. +If there is a build failure however and it happened due to a package related to your change, you need to investigate it of course. +If ofBorg reveals the build to be broken on some platform and you don't have access to that platform, you should set your package's `meta.broken` accordingly. + +When in any doubt, please simply ask via a comment in your PR or through one of the help channels. + +## I received a review on my PR, how do I get it over the finish line? + +In the review process, the committer will have left some sort of feedback on your PR. +They may have immediately approved of your PR or even merged it but the more likely case is that they want you to change a few things or that they require further input. + +A reviewer may have taken a look at the code and it looked good to them ("Diff LGTM") but they still need to be convinced of the artefact's quality. +They might also be waiting on input from other users of the component or its listed maintainer on whether the intention of your PR makes sense for the component. +If you know of people who could help clarify any of this, please bring the PR to their attention. +The current state of the PR is frequently not clearly communicated, so please don't hesitate to ask about it if it's unclear to you. + +It's also possible for the reviewer to not be convinced that your PR is necessary or that the method you've chose to achieve your intention is the right one. + +Please explain your intentions and reasoning to the committer in such a case. +There may be constraints you had to work with which they're not aware of or qualities of your approach that they didn't immediately notice. +(If these weren't clear to the reviewer, that's a good sign you should explain them in your commit message or code comments!) + +There are some further pitfalls and realities which this section intends to make you aware of. + +### A reviewer requested a bunch of insubstantial changes on my PR + +The people involved in Nixpkgs care about code quality because, once in Nixpkgs, it needs to be maintained for many years to come. +It is therefore likely that other people will ask you to do some things in another way or adhere to some standard. +Sometimes however, they also care a bit too much and may ask you to adhere to a personal preference of theirs. +It's not always easy to tell which is which and whether the requests are critically important to merging the PR. +Sometimes another reviewer may also come along with totally different opinions on some points too. + +It is convention to mark review comments that are not critical to the PR as nitpicks but this is not always followed. +As the PR author, you should still take a look at these as they will often reveal best practices and unwritten rules that usually have good reasons behind them and you may want to incorporate them into your modus operandi. + +Please keep in mind that reviewers almost always mean well here. +Their intent is not to denounce your code, they simply want your code to be as good as it can be. +Through their experience, they may also take notice of a seemingly insignificant issues that have caused significant burden before. + +Sometimes however, they can also get a bit carried away and become too perfectionistic. +If you feel some of the requests are unreasonable or merely a matter of personal preference, try to nicely remind the reviewers that you may not intend this code to be 100% perfect or that you have different taste in some regards and press them on whether they think that these requests are *critical* to the PR's success. + +While we do have a set of [official standards for the Nix community](https://github.com/NixOS/rfcs/), we don't have standards for everything and there are often multiple valid ways to achieve the same goal. +Unless there are standards forbidding the patterns used in your code or there are serious technical, maintainability or readability issues with your code, you can insist to keep the code the way you made it and disregard the requests. +Please communicate this clearly though; a simple "I prefer it this way and see no major issue with it" can save you a lot of arguing. + +If you are unsure about some change requests, please ask reviewers *why* they requested them. +This will usually reveal how important they deem it to be and will help educate you about standards, best practices, unwritten rules aswell as preferences people have and why. + +Some committers may have stronger opinions on some things and therefore (understandably) may not want to merge your PR if you don't follow their requests. +It is totally fine to get yourself a second or third opinion in such a case. + +### Committers work on a push-basis + +It's possible for you to get a review but nothing happens afterwards, even if you reply to review comments. +A committer not following up on your PR does not necessarily mean they're disinterested or unresponsive, they may have simply forgotten to follow up on it or had some other circumstances preventing them from doing so. + +Committers typically handle many other PRs besides yours and it is not realistic for them to keep up with all of them to a degree where they could reasonably remember to follow up on all PRs that they had intended following up upon. +If someone left an approving review on your PR and didn't merge a few days later, the most likely case is that they simply forgot. + +Please see it as your responsibility to actively remind reviewers of your open PRs. + +The easiest way to do so is to simply cause them a Github notification. +Github notifies people involved in the PR when you add a comment to your PR, push your PR or re-request their review. +Doing any of that will get you people's attention again. + +It may very well be the case that you have to do this every time you need the committer to follow up upon your PR. +Again, this is a community project so please be mindful of people's circumstances here; be nice when requesting reviews again. + +It may also be the case that the committer has lost interest or isn't familiar enough with the component you're touching to be comfortable merging your PR. +They will likely not immediately state that fact however, so please ask for clarification and don't hesitate to find yourself another committer to take a look at your PR. + +### Nothing helped + +If you followed these guidelines but still got no results or if you feel that you have been wronged in some way, please explicitly reach out to the greater community via its communication channels. + +The [NixOS Discourse](https://discourse.nixos.org/) is a great place to do this as it has historically been the asynchronous medium with the greatest concentration of committers and other people who are significantly involved in Nixpkgs. +There is a dedicated discourse thread [PRs in distress](https://discourse.nixos.org/t/prs-in-distress/3604) where you can link your PR if everything else fails. +The [Nixpkgs / NixOS contributions Matrix channel](https://matrix.to/#/#dev:nixos.org) is the best synchronous channel with the same qualities. + +Please reserve these for cases where you've made a serious effort in trying to get the attention of multiple active committers and provided realistic means for them to assess your PR's quality though. +As mentioned previously, it is unfortunately perfectly normal for a PR to sit around for weeks on end due to the realities of this being a community project. +Please don't blow up situations where progress is happening but is merely not going fast enough for your tastes. +Honking in a traffic jam will not make you go any faster. diff --git a/third_party/nixpkgs/ci/OWNERS b/third_party/nixpkgs/ci/OWNERS new file mode 100644 index 0000000000..8decab1083 --- /dev/null +++ b/third_party/nixpkgs/ci/OWNERS @@ -0,0 +1,407 @@ +# This file is used to describe who owns what in this repository. +# Users/teams will get review requests for PRs that change their files. +# +# This file does not replace `meta.maintainers` +# but is instead used for other things than derivations and modules, +# like documentation, package sets, and other assets. +# +# This file uses the same syntax as the natively supported CODEOWNERS file, +# see https://help.github.com/articles/about-codeowners/ for documentation. +# However it comes with some notable differences: +# - There is no need for user/team listed here to have write access. +# - No reviews will be requested for PRs that target the wrong base branch. +# +# Processing of this file is implemented in workflows/codeowners.yml + +# CI +/.github/workflows @NixOS/Security @Mic92 @zowoq +/.github/workflows/check-nix-format.yml @infinisil +/.github/workflows/nixpkgs-vet.yml @infinisil @philiptaron +/.github/workflows/codeowners.yml @infinisil +/ci/OWNERS @infinisil +/ci @infinisil @philiptaron @NixOS/Security + +# Development support +/.editorconfig @Mic92 @zowoq +/shell.nix @infinisil @NixOS/Security + +# Libraries +/lib @infinisil +/lib/systems @alyssais @ericson2314 +/lib/generators.nix @infinisil @Profpatsch +/lib/cli.nix @infinisil @Profpatsch +/lib/debug.nix @infinisil @Profpatsch +/lib/asserts.nix @infinisil @Profpatsch +/lib/path/* @infinisil +/lib/fileset @infinisil +## Libraries / Module system +/lib/modules.nix @infinisil @roberth +/lib/types.nix @infinisil @roberth +/lib/options.nix @infinisil @roberth +/lib/tests/modules.sh @infinisil @roberth +/lib/tests/modules @infinisil @roberth + +# Nixpkgs Internals +/default.nix @Ericson2314 +/pkgs/top-level/default.nix @Ericson2314 +/pkgs/top-level/impure.nix @Ericson2314 +/pkgs/top-level/stage.nix @Ericson2314 +/pkgs/top-level/splice.nix @Ericson2314 +/pkgs/top-level/release-cross.nix @Ericson2314 +/pkgs/top-level/by-name-overlay.nix @infinisil @philiptaron +/pkgs/stdenv @philiptaron +/pkgs/stdenv/generic @Ericson2314 +/pkgs/stdenv/generic/check-meta.nix @Ericson2314 +/pkgs/stdenv/cross @Ericson2314 +/pkgs/build-support @philiptaron +/pkgs/build-support/cc-wrapper @Ericson2314 +/pkgs/build-support/bintools-wrapper @Ericson2314 +/pkgs/build-support/setup-hooks @Ericson2314 +/pkgs/build-support/setup-hooks/auto-patchelf.sh @layus +/pkgs/build-support/setup-hooks/auto-patchelf.py @layus +/pkgs/pkgs-lib @infinisil +## Format generators/serializers +/pkgs/pkgs-lib/formats/libconfig @h7x4 +/pkgs/pkgs-lib/formats/hocon @h7x4 + +# Nixpkgs build-support +/pkgs/build-support/writers @lassulus @Profpatsch + +# Nixpkgs make-disk-image +/doc/build-helpers/images/makediskimage.section.md @raitobezarius +/nixos/lib/make-disk-image.nix @raitobezarius + +# Nix, the package manager +# @raitobezarius is not "code owner", but is listed here to be notified of changes +# pertaining to the Nix package manager. +# i.e. no authority over those files. +pkgs/tools/package-management/nix/ @NixOS/nix-team @raitobezarius +nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobezarius + +# Nixpkgs documentation +/maintainers/scripts/db-to-md.sh @jtojnar @ryantm +/maintainers/scripts/doc @jtojnar @ryantm + +# Contributor documentation +/CONTRIBUTING.md @infinisil +/.github/PULL_REQUEST_TEMPLATE.md @infinisil +/doc/contributing/ @infinisil +/doc/contributing/contributing-to-documentation.chapter.md @jtojnar @infinisil +/lib/README.md @infinisil +/doc/README.md @infinisil +/nixos/README.md @infinisil +/pkgs/README.md @infinisil +/pkgs/by-name/README.md @infinisil +/maintainers/README.md @infinisil + +# User-facing development documentation +/doc/development.md @infinisil +/doc/development @infinisil + +# NixOS Internals +/nixos/default.nix @infinisil +/nixos/lib/from-env.nix @infinisil +/nixos/lib/eval-config.nix @infinisil +/nixos/modules/system/activation/bootspec.nix @grahamc @cole-h @raitobezarius +/nixos/modules/system/activation/bootspec.cue @grahamc @cole-h @raitobezarius + +# NixOS integration test driver +/nixos/lib/test-driver @tfc + +# NixOS QEMU virtualisation +/nixos/modules/virtualisation/qemu-vm.nix @raitobezarius + +# ACME +/nixos/modules/security/acme @NixOS/acme + +# Systemd +/nixos/modules/system/boot/systemd.nix @NixOS/systemd +/nixos/modules/system/boot/systemd @NixOS/systemd +/nixos/lib/systemd-*.nix @NixOS/systemd +/pkgs/os-specific/linux/systemd @NixOS/systemd + +# Systemd-boot +/nixos/modules/system/boot/loader/systemd-boot @JulienMalka + +# Images and installer media +/nixos/modules/profiles/installation-device.nix @ElvishJerricco +/nixos/modules/installer/cd-dvd/ @ElvishJerricco +/nixos/modules/installer/sd-card/ + +# Amazon +/nixos/modules/virtualisation/amazon-init.nix @arianvp +/nixos/modules/virtualisation/ec2-data.nix @arianvp +/nixos/modules/virtualisation/amazon-options.nix @arianvp +/nixos/modules/virtualisation/amazon-image.nix @arianvp +/nixos/maintainers/scripts/ec2/ @arianvp +/nixos/modules/services/misc/amazon-ssm-agent.nix @arianvp +/nixos/tests/amazon-ssm-agent.nix @arianvp +/nixos/modules/system/boot/grow-partition.nix @arianvp + + + +# Updaters +## update.nix +/maintainers/scripts/update.nix @jtojnar +/maintainers/scripts/update.py @jtojnar +## common-updater-scripts +/pkgs/common-updater/scripts/update-source-version @jtojnar + +# Python-related code and docs +/doc/languages-frameworks/python.section.md @mweinelt @natsukium +/maintainers/scripts/update-python-libraries @natsukium +/pkgs/development/interpreters/python @natsukium +/pkgs/top-level/python-packages.nix @natsukium +/pkgs/top-level/release-python.nix @natsukium + +# Haskell +/doc/languages-frameworks/haskell.section.md @sternenseemann @maralorn +/maintainers/scripts/haskell @sternenseemann @maralorn +/pkgs/development/compilers/ghc @sternenseemann @maralorn +/pkgs/development/haskell-modules @sternenseemann @maralorn +/pkgs/test/haskell @sternenseemann @maralorn +/pkgs/top-level/release-haskell.nix @sternenseemann @maralorn +/pkgs/top-level/haskell-packages.nix @sternenseemann @maralorn + +# Perl +/pkgs/development/interpreters/perl @stigtsp @zakame @marcusramberg +/pkgs/top-level/perl-packages.nix @stigtsp @zakame @marcusramberg +/pkgs/development/perl-modules @stigtsp @zakame @marcusramberg + +# R +/pkgs/applications/science/math/R @jbedo +/pkgs/development/r-modules @jbedo + +# Rust +/pkgs/development/compilers/rust @Mic92 @zowoq @winterqt @figsoda +/pkgs/build-support/rust @zowoq @winterqt @figsoda +/doc/languages-frameworks/rust.section.md @zowoq @winterqt @figsoda + +# C compilers +/pkgs/development/compilers/gcc +/pkgs/development/compilers/llvm @alyssais @RossComputerGuy +/pkgs/development/compilers/emscripten @raitobezarius +/doc/languages-frameworks/emscripten.section.md @raitobezarius + +# Audio +/nixos/modules/services/audio/botamusique.nix @mweinelt +/nixos/modules/services/audio/snapserver.nix @mweinelt +/nixos/tests/botamusique.nix @mweinelt +/nixos/tests/snapcast.nix @mweinelt + +# Browsers +/pkgs/applications/networking/browsers/firefox @mweinelt +/pkgs/applications/networking/browsers/chromium @emilylange +/nixos/tests/chromium.nix @emilylange + +# Certificate Authorities +pkgs/data/misc/cacert/ @ajs124 @lukegb @mweinelt +pkgs/development/libraries/nss/ @ajs124 @lukegb @mweinelt +pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt + +# Jetbrains +/pkgs/applications/editors/jetbrains @edwtjo + +# Licenses +/lib/licenses.nix @alyssais + +# Qt +/pkgs/development/libraries/qt-5 @K900 @NickCao @SuperSandro2000 @ttuegel +/pkgs/development/libraries/qt-6 @K900 @NickCao @SuperSandro2000 @ttuegel + +# KDE / Plasma 5 +/pkgs/applications/kde @K900 @NickCao @SuperSandro2000 @ttuegel +/pkgs/desktops/plasma-5 @K900 @NickCao @SuperSandro2000 @ttuegel +/pkgs/development/libraries/kde-frameworks @K900 @NickCao @SuperSandro2000 @ttuegel + +# KDE / Plasma 6 +/pkgs/kde @K900 @NickCao @SuperSandro2000 @ttuegel +/maintainers/scripts/kde @K900 @NickCao @SuperSandro2000 @ttuegel + +# PostgreSQL and related stuff +/pkgs/servers/sql/postgresql @thoughtpolice +/nixos/modules/services/databases/postgresql.md @thoughtpolice +/nixos/modules/services/databases/postgresql.nix @thoughtpolice +/nixos/tests/postgresql.nix @thoughtpolice + +# Hardened profile & related modules +/nixos/modules/profiles/hardened.nix @joachifm +/nixos/modules/security/lock-kernel-modules.nix @joachifm +/nixos/modules/security/misc.nix @joachifm +/nixos/tests/hardened.nix @joachifm +/pkgs/os-specific/linux/kernel/hardened/config.nix @joachifm + +# Home Automation +/nixos/modules/services/home-automation/home-assistant.nix @mweinelt +/nixos/modules/services/home-automation/zigbee2mqtt.nix @mweinelt +/nixos/tests/home-assistant.nix @mweinelt +/nixos/tests/zigbee2mqtt.nix @mweinelt +/pkgs/servers/home-assistant @mweinelt +/pkgs/tools/misc/esphome @mweinelt + +# Network Time Daemons +/pkgs/by-name/ch/chrony @thoughtpolice +/pkgs/tools/networking/ntp @thoughtpolice +/pkgs/tools/networking/openntpd @thoughtpolice +/nixos/modules/services/networking/ntp @thoughtpolice + +# Network +/pkgs/tools/networking/kea/default.nix @mweinelt +/pkgs/tools/networking/babeld/default.nix @mweinelt +/nixos/modules/services/networking/babeld.nix @mweinelt +/nixos/modules/services/networking/kea.nix @mweinelt +/nixos/modules/services/networking/knot.nix @mweinelt +/nixos/modules/services/monitoring/prometheus/exporters/kea.nix @mweinelt +/nixos/tests/babeld.nix @mweinelt +/nixos/tests/kea.nix @mweinelt +/nixos/tests/knot.nix @mweinelt + +# Web servers +/doc/packages/nginx.section.md @raitobezarius +/pkgs/servers/http/nginx/ @raitobezarius +/nixos/modules/services/web-servers/nginx/ @raitobezarius + +# Dhall +/pkgs/development/dhall-modules @Gabriella439 @Profpatsch @ehmry +/pkgs/development/interpreters/dhall @Gabriella439 @Profpatsch @ehmry + +# Idris +/pkgs/development/idris-modules @Infinisil +/pkgs/development/compilers/idris2 @mattpolzin + +# Bazel +/pkgs/development/tools/build-managers/bazel @Profpatsch + +# NixOS modules for e-mail and dns services +/nixos/modules/services/mail/mailman.nix @peti +/nixos/modules/services/mail/postfix.nix @peti +/nixos/modules/services/networking/bind.nix @peti +/nixos/modules/services/mail/rspamd.nix @peti + +# Emacs +/pkgs/applications/editors/emacs/elisp-packages @NixOS/emacs +/pkgs/applications/editors/emacs @NixOS/emacs +/pkgs/top-level/emacs-packages.nix @NixOS/emacs +/doc/packages/emacs.section.md @NixOS/emacs +/nixos/modules/services/editors/emacs.md @NixOS/emacs + +# Kakoune +/pkgs/applications/editors/kakoune @philiptaron + +# Neovim +/pkgs/applications/editors/neovim @figsoda @teto + +# VimPlugins +/pkgs/applications/editors/vim/plugins @figsoda + +# VsCode Extensions +/pkgs/applications/editors/vscode/extensions + +# PHP interpreter, packages, extensions, tests and documentation +/doc/languages-frameworks/php.section.md @aanderse @drupol @globin @ma27 @talyz +/nixos/tests/php @aanderse @drupol @globin @ma27 @talyz +/pkgs/build-support/php/build-pecl.nix @aanderse @drupol @globin @ma27 @talyz +/pkgs/build-support/php @drupol +/pkgs/development/interpreters/php @jtojnar @aanderse @drupol @globin @ma27 @talyz +/pkgs/development/php-packages @aanderse @drupol @globin @ma27 @talyz +/pkgs/top-level/php-packages.nix @jtojnar @aanderse @drupol @globin @ma27 @talyz + +# Docker tools +/pkgs/build-support/docker @roberth +/nixos/tests/docker-tools* @roberth +/doc/build-helpers/images/dockertools.section.md @roberth + +# Blockchains +/pkgs/applications/blockchains @mmahut @RaghavSood + +# Go +/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 +/pkgs/desktops/gnome/extensions @jtojnar +/pkgs/build-support/make-hardcode-gsettings-patch @jtojnar + +# Cinnamon +/pkgs/by-name/ci/cinnamon-* @mkg20001 +/pkgs/by-name/cj/cjs @mkg20001 +/pkgs/by-name/mu/muffin @mkg20001 +/pkgs/by-name/ne/nemo @mkg20001 +/pkgs/by-name/ne/nemo-* @mkg20001 + +# nim +/pkgs/development/compilers/nim @ehmry + +# terraform providers +/pkgs/applications/networking/cluster/terraform-providers @zowoq + +# Forgejo +nixos/modules/services/misc/forgejo.nix @adamcstephens @bendlas @emilylange +pkgs/by-name/fo/forgejo/ @adamcstephens @bendlas @emilylange + +# Dotnet +/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 @winterqt +/pkgs/build-support/node/fetch-npm-deps @winterqt +/doc/languages-frameworks/javascript.section.md @winterqt + +# OCaml +/pkgs/build-support/ocaml @ulrikstrid +/pkgs/development/compilers/ocaml @ulrikstrid +/pkgs/development/ocaml-modules @ulrikstrid + +# ZFS +pkgs/os-specific/linux/zfs/2_1.nix @raitobezarius +pkgs/os-specific/linux/zfs/generic.nix @raitobezarius +nixos/modules/tasks/filesystems/zfs.nix @raitobezarius +nixos/tests/zfs.nix @raitobezarius + +# Zig +/pkgs/development/compilers/zig @figsoda +/doc/hooks/zig.section.md @figsoda + +# Buildbot +nixos/modules/services/continuous-integration/buildbot @Mic92 @zowoq +nixos/tests/buildbot.nix @Mic92 @zowoq +pkgs/development/tools/continuous-integration/buildbot @Mic92 @zowoq + +# Pretix +pkgs/by-name/pr/pretix/ @mweinelt +pkgs/by-name/pr/pretalx/ @mweinelt +nixos/modules/services/web-apps/pretix.nix @mweinelt +nixos/modules/services/web-apps/pretalx.nix @mweinelt +nixos/tests/web-apps/pretix.nix @mweinelt +nixos/tests/web-apps/pretalx.nix @mweinelt + +# incus/lxc +nixos/maintainers/scripts/incus/ @adamcstephens +nixos/modules/virtualisation/incus.nix @adamcstephens +nixos/modules/virtualisation/lxc* @adamcstephens +nixos/tests/incus/ @adamcstephens +pkgs/by-name/in/incus/ @adamcstephens +pkgs/by-name/lx/lxc* @adamcstephens + +# ExpidusOS, Flutter +/pkgs/development/compilers/flutter @RossComputerGuy +/pkgs/desktops/expidus @RossComputerGuy + +# GNU Tar & Zip +/pkgs/tools/archivers/gnutar @RossComputerGuy +/pkgs/tools/archivers/zip @RossComputerGuy + +# SELinux +/pkgs/os-specific/linux/checkpolicy @RossComputerGuy +/pkgs/os-specific/linux/libselinux @RossComputerGuy +/pkgs/os-specific/linux/libsepol @RossComputerGuy + +# installShellFiles +/pkgs/by-name/in/installShellFiles/* @Ericson2314 +/pkgs/test/install-shell-files/* @Ericson2314 +/doc/hooks/installShellFiles.section.md @Ericson2314 diff --git a/third_party/nixpkgs/ci/README.md b/third_party/nixpkgs/ci/README.md index 40c3d0ed34..11b53c6095 100644 --- a/third_party/nixpkgs/ci/README.md +++ b/third_party/nixpkgs/ci/README.md @@ -41,3 +41,58 @@ Why not just build the tooling right from the PRs Nixpkgs version? - Because it improves security, since we don't have to build potentially untrusted code from PRs. The tool only needs a very minimal Nix evaluation at runtime, which can work with [readonly-mode](https://nixos.org/manual/nix/stable/command-ref/opt-common.html#opt-readonly-mode) and [restrict-eval](https://nixos.org/manual/nix/stable/command-ref/conf-file.html#conf-restrict-eval). +## `get-merge-commit.sh GITHUB_REPO PR_NUMBER` + +Check whether a PR is mergeable and return the test merge commit as +[computed by GitHub](https://docs.github.com/en/rest/guides/using-the-rest-api-to-interact-with-your-git-database?apiVersion=2022-11-28#checking-mergeability-of-pull-requests). + +Arguments: +- `GITHUB_REPO`: The repository of the PR, e.g. `NixOS/nixpkgs` +- `PR_NUMBER`: The PR number, e.g. `1234` + +Exit codes: +- 0: The PR can be merged, the test merge commit hash is returned on stdout +- 1: The PR cannot be merged because it's not open anymore +- 2: The PR cannot be merged because it has a merge conflict +- 3: The merge commit isn't being computed, GitHub is likely having internal issues, unknown if the PR is mergeable + +### Usage + +This script can be used in GitHub Actions workflows as follows: + +```yaml +on: pull_request_target + +# We need a token to query the API, but it doesn't need any special permissions +permissions: {} + +jobs: + build: + name: Build + runs-on: ubuntu-latest + steps: + # Important: Because of `pull_request_target`, this doesn't check out the PR, + # but rather the base branch of the PR, which is needed so we don't run untrusted code + - uses: actions/checkout@ + with: + path: base + sparse-checkout: ci + - name: Resolving the merge commit + env: + GH_TOKEN: ${{ github.token }} + run: | + if mergedSha=$(base/ci/get-merge-commit.sh ${{ github.repository }} ${{ github.event.number }}); then + echo "Checking the merge commit $mergedSha" + echo "mergedSha=$mergedSha" >> "$GITHUB_ENV" + else + # Skipping so that no notifications are sent + echo "Skipping the rest..." + fi + rm -rf base + - uses: actions/checkout@ + # Add this to _all_ subsequent steps to skip them + if: env.mergedSha + with: + ref: ${{ env.mergedSha }} + - ... +``` diff --git a/third_party/nixpkgs/ci/get-merge-commit.sh b/third_party/nixpkgs/ci/get-merge-commit.sh new file mode 100755 index 0000000000..c62bb56dd9 --- /dev/null +++ b/third_party/nixpkgs/ci/get-merge-commit.sh @@ -0,0 +1,62 @@ +#!/usr/bin/env bash +# See ./README.md for docs + +set -euo pipefail + +log() { + echo "$@" >&2 +} + +if (( $# < 2 )); then + log "Usage: $0 GITHUB_REPO PR_NUMBER" + exit 99 +fi +repo=$1 +prNumber=$2 + +# Retry the API query this many times +retryCount=5 +# Start with 5 seconds, but double every retry +retryInterval=5 + +while true; do + log "Checking whether the pull request can be merged" + prInfo=$(gh api \ + -H "Accept: application/vnd.github+json" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + "/repos/$repo/pulls/$prNumber") + + # Non-open PRs won't have their mergeability computed no matter what + state=$(jq -r .state <<< "$prInfo") + if [[ "$state" != open ]]; then + log "PR is not open anymore" + exit 1 + fi + + mergeable=$(jq -r .mergeable <<< "$prInfo") + if [[ "$mergeable" == "null" ]]; then + if (( retryCount == 0 )); then + log "Not retrying anymore. It's likely that GitHub is having internal issues: check https://www.githubstatus.com/" + exit 3 + else + (( retryCount -= 1 )) || true + + # null indicates that GitHub is still computing whether it's mergeable + # Wait a couple seconds before trying again + log "GitHub is still computing whether this PR can be merged, waiting $retryInterval seconds before trying again ($retryCount retries left)" + sleep "$retryInterval" + + (( retryInterval *= 2 )) || true + fi + else + break + fi +done + +if [[ "$mergeable" == "true" ]]; then + log "The PR can be merged" + jq -r .merge_commit_sha <<< "$prInfo" +else + log "The PR has a merge conflict" + exit 2 +fi diff --git a/third_party/nixpkgs/ci/request-reviews/get-reviewers.sh b/third_party/nixpkgs/ci/request-reviews/get-reviewers.sh index d5cd9e0a4f..1107edd9e6 100755 --- a/third_party/nixpkgs/ci/request-reviews/get-reviewers.sh +++ b/third_party/nixpkgs/ci/request-reviews/get-reviewers.sh @@ -10,16 +10,18 @@ log() { echo "$@" >&2 } -if (( "$#" < 5 )); then - log "Usage: $0 GIT_REPO BASE_REF HEAD_REF OWNERS_FILE PR_AUTHOR" +if (( "$#" < 7 )); then + log "Usage: $0 GIT_REPO OWNERS_FILE BASE_REPO BASE_REF HEAD_REF PR_NUMBER PR_AUTHOR" exit 1 fi gitRepo=$1 -baseRef=$2 -headRef=$3 -ownersFile=$4 -prAuthor=$5 +ownersFile=$2 +baseRepo=$3 +baseRef=$4 +headRef=$5 +prNumber=$6 +prAuthor=$7 tmp=$(mktemp -d) trap 'rm -rf "$tmp"' exit @@ -32,8 +34,9 @@ log "This PR touches ${#touchedFiles[@]} files" # remove code owners to avoid pinging them git -C "$gitRepo" show "$baseRef":"$ownersFile" > "$tmp"/codeowners -# Associative arrays with the team/user as the key for easy deduplication -declare -A teams users +# Associative array with the user as the key for easy de-duplication +# Make sure to always lowercase keys to avoid duplicates with different casings +declare -A users=() for file in "${touchedFiles[@]}"; do result=$(codeowners --file "$tmp"/codeowners "$file") @@ -59,29 +62,65 @@ for file in "${touchedFiles[@]}"; do fi # The first regex match is everything after the @ entry=${BASH_REMATCH[1]} - if [[ "$entry" =~ .*/(.*) ]]; then - # Teams look like $org/$team, where we only need $team for the API - # call to request reviews from teams - teams[${BASH_REMATCH[1]}]= + + if [[ "$entry" =~ (.*)/(.*) ]]; then + # Teams look like $org/$team + org=${BASH_REMATCH[1]} + team=${BASH_REMATCH[2]} + + # Instead of requesting a review from the team itself, + # we request reviews from the individual users. + # This is because once somebody from a team reviewed the PR, + # the API doesn't expose that the team was already requested for a review, + # so we wouldn't be able to avoid rerequesting reviews + # without saving some some extra state somewhere + + # We could also consider implementing a more advanced heuristic + # in the future that e.g. only pings one team member, + # but escalates to somebody else if that member doesn't respond in time. + gh api \ + --cache=1h \ + -H "Accept: application/vnd.github+json" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + "/orgs/$org/teams/$team/members" \ + --jq '.[].login' > "$tmp/team-members" + readarray -t members < "$tmp/team-members" + log "Team $entry has these members: ${members[*]}" + + for user in "${members[@]}"; do + users[${user,,}]= + done else # Everything else is a user - users[$entry]= + users[${entry,,}]= fi done done # Cannot request a review from the author -if [[ -v users[$prAuthor] ]]; then +if [[ -v users[${prAuthor,,}] ]]; then log "One or more files are owned by the PR author, ignoring" - unset 'users[$prAuthor]' + unset 'users[${prAuthor,,}]' fi +gh api \ + -H "Accept: application/vnd.github+json" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + "/repos/$baseRepo/pulls/$prNumber/reviews" \ + --jq '.[].user.login' > "$tmp/already-reviewed-by" + +# And we don't want to rerequest reviews from people who already reviewed +while read -r user; do + if [[ -v users[${user,,}] ]]; then + log "User $user is a code owner but has already left a review, ignoring" + unset 'users[${user,,}]' + fi +done < "$tmp/already-reviewed-by" + # Turn it into a JSON for the GitHub API call to request PR reviewers jq -n \ --arg users "${!users[*]}" \ - --arg teams "${!teams[*]}" \ '{ reviewers: $users | split(" "), - team_reviewers: $teams | split(" ") }' diff --git a/third_party/nixpkgs/ci/request-reviews/request-reviews.sh b/third_party/nixpkgs/ci/request-reviews/request-reviews.sh index d62ab309bc..b213545602 100755 --- a/third_party/nixpkgs/ci/request-reviews/request-reviews.sh +++ b/third_party/nixpkgs/ci/request-reviews/request-reviews.sh @@ -60,10 +60,8 @@ git -C "$tmp/nixpkgs.git" remote add fork https://github.com/"$prRepo".git git -C "$tmp/nixpkgs.git" config remote.fork.partialclonefilter tree:0 git -C "$tmp/nixpkgs.git" config remote.fork.promisor true -# This should not conflict with any refs in Nixpkgs -headRef=refs/remotes/fork/pr -# Only fetch into a remote ref, because the local ref namespace is used by Nixpkgs, don't want any conflicts -git -C "$tmp/nixpkgs.git" fetch --no-tags fork "$prBranch":"$headRef" +git -C "$tmp/nixpkgs.git" fetch --no-tags fork "$prBranch" +headRef=$(git -C "$tmp/nixpkgs.git" rev-parse refs/remotes/fork/"$prBranch") log "Checking correctness of the base branch" if ! "$SCRIPT_DIR"/verify-base-branch.sh "$tmp/nixpkgs.git" "$headRef" "$baseRepo" "$baseBranch" "$prRepo" "$prBranch" | tee "$tmp/invalid-base-error" >&2; then @@ -80,7 +78,7 @@ if ! "$SCRIPT_DIR"/verify-base-branch.sh "$tmp/nixpkgs.git" "$headRef" "$baseRep fi log "Getting code owners to request reviews from" -"$SCRIPT_DIR"/get-reviewers.sh "$tmp/nixpkgs.git" "$baseBranch" "$headRef" "$ownersFile" "$prAuthor" > "$tmp/reviewers.json" +"$SCRIPT_DIR"/get-reviewers.sh "$tmp/nixpkgs.git" "$ownersFile" "$baseRepo" "$baseBranch" "$headRef" "$prNumber" "$prAuthor" > "$tmp/reviewers.json" log "Requesting reviews from: $(<"$tmp/reviewers.json")" diff --git a/third_party/nixpkgs/ci/request-reviews/verify-base-branch.sh b/third_party/nixpkgs/ci/request-reviews/verify-base-branch.sh index 17d721c5dd..7be280db8d 100755 --- a/third_party/nixpkgs/ci/request-reviews/verify-base-branch.sh +++ b/third_party/nixpkgs/ci/request-reviews/verify-base-branch.sh @@ -90,8 +90,9 @@ for testBranch in "${devBranches[@]}"; do log -e "\e[33m" echo "The PR's base branch is set to $baseBranch, but $extraCommits commits from the $testBranch branch are included. Make sure you know the [right base branch for your changes](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#branch-conventions), then:" echo "- If the changes should go to the $testBranch branch, [change the base branch](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-base-branch-of-a-pull-request) to $testBranch" - echo "- If the changes should go to the $baseBranch branch, rebase your PR onto the merge base with the $testBranch branch:" - echo " \`\`\`" + echo "- If the changes should go to the $baseBranch branch, rebase your PR onto the merge base with the $baseBranch branch:" + echo " \`\`\`bash" + echo " # git rebase --onto \$(git merge-base upstream/$baseBranch HEAD) \$(git merge-base upstream/$testBranch HEAD)" echo " git rebase --onto $prMergeBase $testMergeBase" echo " git push --force-with-lease" echo " \`\`\`" diff --git a/third_party/nixpkgs/doc/README.md b/third_party/nixpkgs/doc/README.md index 534fc92de5..d54b312da8 100644 --- a/third_party/nixpkgs/doc/README.md +++ b/third_party/nixpkgs/doc/README.md @@ -176,126 +176,138 @@ When needed, each convention explain why it exists, so you can make a decision w Note that these conventions are about the **structure** of the manual (and its source files), not about the content that goes in it. You, as the writer of documentation, are still in charge of its content. -- Put each sentence in its own line. - This makes reviews and suggestions much easier, since GitHub's review system is based on lines. - It also helps identifying long sentences at a glance. +### One sentence per line -- Use the [admonition syntax](#admonitions) for callouts and examples. +Put each sentence in its own line. +This makes reviews and suggestions much easier, since GitHub's review system is based on lines. +It also helps identifying long sentences at a glance. -- Provide at least one example per function, and make examples self-contained. - This is easier to understand for beginners. - It also helps with testing that it actually works – especially once we introduce automation. +### Callouts and examples - Example code should be such that it can be passed to `pkgs.callPackage`. - Instead of something like: +Use the [admonition syntax](#admonitions) for callouts and examples. - ```nix - pkgs.dockerTools.buildLayeredImage { - name = "hello"; - contents = [ pkgs.hello ]; - } - ``` +### Provide self-contained examples - Write something like: +Provide at least one example per function, and make examples self-contained. +This is easier to understand for beginners. +It also helps with testing that it actually works – especially once we introduce automation. - ```nix - { dockerTools, hello }: - dockerTools.buildLayeredImage { - name = "hello"; - contents = [ hello ]; - } - ``` +Example code should be such that it can be passed to `pkgs.callPackage`. +Instead of something like: -- When showing inputs/outputs of any [REPL](https://en.wikipedia.org/wiki/Read%E2%80%93eval%E2%80%93print_loop), such as a shell or the Nix REPL, use a format as you'd see in the REPL, while trying to visually separate inputs from outputs. - This means that for a shell, you should use a format like the following: - ```shell - $ nix-build -A hello '' \ - --option require-sigs false \ - --option trusted-substituters file:///tmp/hello-cache \ - --option substituters file:///tmp/hello-cache - /nix/store/zhl06z4lrfrkw5rp0hnjjfrgsclzvxpm-hello-2.12.1 - ``` - Note how the input is preceded by `$` on the first line and indented on subsequent lines, and how the output is provided as you'd see on the shell. +```nix +pkgs.dockerTools.buildLayeredImage { + name = "hello"; + contents = [ pkgs.hello ]; +} +``` - For the Nix REPL, you should use a format like the following: - ```shell - nix-repl> builtins.attrNames { a = 1; b = 2; } - [ "a" "b" ] - ``` - Note how the input is preceded by `nix-repl>` and the output is provided as you'd see on the Nix REPL. +Write something like: -- When documenting functions or anything that has inputs/outputs and example usage, use nested headings to clearly separate inputs, outputs, and examples. - Keep examples as the last nested heading, and link to the examples wherever applicable in the documentation. +```nix +{ dockerTools, hello }: +dockerTools.buildLayeredImage { + name = "hello"; + contents = [ hello ]; +} +``` - The purpose of this convention is to provide a familiar structure for navigating the manual, so any reader can expect to find content related to inputs in an "inputs" heading, examples in an "examples" heading, and so on. - An example: - ``` - ## buildImage +### REPLs - Some explanation about the function here. - Describe a particular scenario, and point to [](#ex-dockerTools-buildImage), which is an example demonstrating it. +When showing inputs/outputs of any [REPL](https://en.wikipedia.org/wiki/Read%E2%80%93eval%E2%80%93print_loop), such as a shell or the Nix REPL, use a format as you'd see in the REPL, while trying to visually separate inputs from outputs. +This means that for a shell, you should use a format like the following: +```shell +$ nix-build -A hello '' \ + --option require-sigs false \ + --option trusted-substituters file:///tmp/hello-cache \ + --option substituters file:///tmp/hello-cache +/nix/store/zhl06z4lrfrkw5rp0hnjjfrgsclzvxpm-hello-2.12.1 +``` +Note how the input is preceded by `$` on the first line and indented on subsequent lines, and how the output is provided as you'd see on the shell. - ### Inputs +For the Nix REPL, you should use a format like the following: +```shell +nix-repl> builtins.attrNames { a = 1; b = 2; } +[ "a" "b" ] +``` +Note how the input is preceded by `nix-repl>` and the output is provided as you'd see on the Nix REPL. - Documentation for the inputs of `buildImage`. - Perhaps even point to [](#ex-dockerTools-buildImage) again when talking about something specifically linked to it. +### Headings for inputs, outputs and examples - ### Passthru outputs +When documenting functions or anything that has inputs/outputs and example usage, use nested headings to clearly separate inputs, outputs, and examples. +Keep examples as the last nested heading, and link to the examples wherever applicable in the documentation. - Documentation for any passthru outputs of `buildImage`. +The purpose of this convention is to provide a familiar structure for navigating the manual, so any reader can expect to find content related to inputs in an "inputs" heading, examples in an "examples" heading, and so on. +An example: +``` +## buildImage - ### Examples +Some explanation about the function here. +Describe a particular scenario, and point to [](#ex-dockerTools-buildImage), which is an example demonstrating it. - Note that this is the last nested heading in the `buildImage` section. +### Inputs - :::{.example #ex-dockerTools-buildImage} +Documentation for the inputs of `buildImage`. +Perhaps even point to [](#ex-dockerTools-buildImage) again when talking about something specifically linked to it. - # Using `buildImage` +### Passthru outputs - Example of how to use `buildImage` goes here. +Documentation for any passthru outputs of `buildImage`. - ::: - ``` +### Examples -- Use [definition lists](#definition-lists) to document function arguments, and the attributes of such arguments as well as their [types](https://nixos.org/manual/nix/stable/language/values). - For example: +Note that this is the last nested heading in the `buildImage` section. - ```markdown - # pkgs.coolFunction {#pkgs.coolFunction} +:::{.example #ex-dockerTools-buildImage} - `pkgs.coolFunction` *`name`* *`config`* +# Using `buildImage` - Description of what `callPackage` does. +Example of how to use `buildImage` goes here. + +::: +``` + +### Function arguments + +Use [definition lists](#definition-lists) to document function arguments, and the attributes of such arguments as well as their [types](https://nixos.org/manual/nix/stable/language/values). +For example: + +```markdown +# pkgs.coolFunction {#pkgs.coolFunction} + +`pkgs.coolFunction` *`name`* *`config`* + +Description of what `callPackage` does. - ## Inputs {#pkgs-coolFunction-inputs} +## Inputs {#pkgs-coolFunction-inputs} - If something's special about `coolFunction`'s general argument handling, you can say so here. - Otherwise, just describe the single argument or start the arguments' definition list without introduction. +If something's special about `coolFunction`'s general argument handling, you can say so here. +Otherwise, just describe the single argument or start the arguments' definition list without introduction. - *`name`* (String) +*`name`* (String) - : The name of the resulting image. +: The name of the resulting image. - *`config`* (Attribute set) +*`config`* (Attribute set) - : Introduce the parameter. Maybe you have a test to make sure `{ }` is a sensible default; then you can say: these attributes are optional; `{ }` is a valid argument. +: Introduce the parameter. Maybe you have a test to make sure `{ }` is a sensible default; then you can say: these attributes are optional; `{ }` is a valid argument. - `outputHash` (String; _optional_) + `outputHash` (String; _optional_) - : A brief explanation including when and when not to pass this attribute. + : A brief explanation including when and when not to pass this attribute. - : _Default:_ the output path's hash. - ``` + : _Default:_ the output path's hash. +``` - Checklist: - - Start with a synopsis, to show the order of positional arguments. - - Metavariables are in emphasized code spans: ``` *`arg1`* ```. Metavariables are placeholders where users may write arbitrary expressions. This includes positional arguments. - - Attribute names are regular code spans: ``` `attr1` ```. These identifiers can _not_ be picked freely by users, so they are _not_ metavariables. - - _optional_ attributes have a _`Default:`_ if it's easily described as a value. - - _optional_ attributes have a _`Default behavior:`_ if it's not easily described using a value. - - Nix types aren't in code spans, because they are not code - - Nix types are capitalized, to distinguish them from the camelCase Module System types, which _are_ code and behave like functions. +Checklist: +- Start with a synopsis, to show the order of positional arguments. +- Metavariables are in emphasized code spans: ``` *`arg1`* ```. Metavariables are placeholders where users may write arbitrary expressions. This includes positional arguments. +- Attribute names are regular code spans: ``` `attr1` ```. These identifiers can _not_ be picked freely by users, so they are _not_ metavariables. +- _optional_ attributes have a _`Default:`_ if it's easily described as a value. +- _optional_ attributes have a _`Default behavior:`_ if it's not easily described using a value. +- Nix types aren't in code spans, because they are not code +- Nix types are capitalized, to distinguish them from the camelCase Module System types, which _are_ code and behave like functions. #### Examples diff --git a/third_party/nixpkgs/doc/hooks/versionCheckHook.section.md b/third_party/nixpkgs/doc/hooks/versionCheckHook.section.md index 55b9fa916c..b8ff79d5da 100644 --- a/third_party/nixpkgs/doc/hooks/versionCheckHook.section.md +++ b/third_party/nixpkgs/doc/hooks/versionCheckHook.section.md @@ -28,7 +28,7 @@ It does so in a clean environment (using `env --ignore-environment`), and it che The variables that this phase control are: -- `dontVersionCheck`: Disable adding this hook to the [`preDistPhases`](#var-stdenv-preDist). Useful if you do want to load the bash functions of the hook, but run them differently. +- `dontVersionCheck`: Disable adding this hook to the [`preInstallCheckHooks`](#ssec-installCheck-phase). Useful if you do want to load the bash functions of the hook, but run them differently. - `versionCheckProgram`: The full path to the program that should print the `${version}` string. Defaults roughly to `${placeholder "out"}/bin/${pname}`. Using `$out` in the value of this variable won't work, as environment variables from this variable are not expanded by the hook. Hence using `placeholder` is unavoidable. - `versionCheckProgramArg`: The argument that needs to be passed to `versionCheckProgram`. If undefined the hook tries first `--help` and then `--version`. Examples: `version`, `-V`, `-v`. - `preVersionCheck`: A hook to run before the check is done. diff --git a/third_party/nixpkgs/doc/languages-frameworks/cuda.section.md b/third_party/nixpkgs/doc/languages-frameworks/cuda.section.md index 1b2005bb1e..af52a3d31d 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/cuda.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/cuda.section.md @@ -149,3 +149,104 @@ All new projects should use the CUDA redistributables available in [`cudaPackage | Find libraries | `buildPhase` or `patchelf` | Missing dependency on a `lib` or `static` output | Add the missing dependency | The `lib` or `static` output typically contain the libraries | In the scenario you are unable to run the resulting binary: this is arguably the most complicated as it could be any combination of the previous reasons. This type of failure typically occurs when a library attempts to load or open a library it depends on that it does not declare in its `DT_NEEDED` section. As a first step, ensure that dependencies are patched with [`autoAddDriverRunpath`](https://search.nixos.org/packages?channel=unstable&type=packages&query=autoAddDriverRunpath). Failing that, try running the application with [`nixGL`](https://github.com/guibou/nixGL) or a similar wrapper tool. If that works, it likely means that the application is attempting to load a library that is not in the `RPATH` or `RUNPATH` of the binary. + +## Running Docker or Podman containers with CUDA support {#running-docker-or-podman-containers-with-cuda-support} + +It is possible to run Docker or Podman containers with CUDA support. The recommended mechanism to perform this task is to use the [NVIDIA Container Toolkit](https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/latest/index.html). + +The NVIDIA Container Toolkit can be enabled in NixOS like follows: + +```nix +{ + hardware.nvidia-container-toolkit.enable = true; +} +``` + +This will automatically enable a service that generates a CDI specification (located at `/var/run/cdi/nvidia-container-toolkit.json`) based on the auto-detected hardware of your machine. You can check this service by running: + +```ShellSession +$ systemctl status nvidia-container-toolkit-cdi-generator.service +``` + +::: {.note} +Depending on what settings you had already enabled in your system, you might need to restart your machine in order for the NVIDIA Container Toolkit to generate a valid CDI specification for your machine. +::: + +Once that a valid CDI specification has been generated for your machine on boot time, both Podman and Docker (> 25) will use this spec if you provide them with the `--device` flag: + +```ShellSession +$ podman run --rm -it --device=nvidia.com/gpu=all ubuntu:latest nvidia-smi -L +GPU 0: NVIDIA GeForce RTX 4090 (UUID: ) +GPU 1: NVIDIA GeForce RTX 2080 SUPER (UUID: ) +``` + +```ShellSession +$ docker run --rm -it --device=nvidia.com/gpu=all ubuntu:latest nvidia-smi -L +GPU 0: NVIDIA GeForce RTX 4090 (UUID: ) +GPU 1: NVIDIA GeForce RTX 2080 SUPER (UUID: ) +``` + +You can check all the identifiers that have been generated for your auto-detected hardware by checking the contents of the `/var/run/cdi/nvidia-container-toolkit.json` file: + +```ShellSession +$ nix run nixpkgs#jq -- -r '.devices[].name' < /var/run/cdi/nvidia-container-toolkit.json +0 +1 +all +``` + +### Specifying what devices to expose to the container {#specifying-what-devices-to-expose-to-the-container} + +You can choose what devices are exposed to your containers by using the identifier on the generated CDI specification. Like follows: + +```ShellSession +$ podman run --rm -it --device=nvidia.com/gpu=0 ubuntu:latest nvidia-smi -L +GPU 0: NVIDIA GeForce RTX 4090 (UUID: ) +``` + +You can repeat the `--device` argument as many times as necessary if you have multiple GPU's and you want to pick up which ones to expose to the container: + +```ShellSession +$ podman run --rm -it --device=nvidia.com/gpu=0 --device=nvidia.com/gpu=1 ubuntu:latest nvidia-smi -L +GPU 0: NVIDIA GeForce RTX 4090 (UUID: ) +GPU 1: NVIDIA GeForce RTX 2080 SUPER (UUID: ) +``` + +::: {.note} +By default, the NVIDIA Container Toolkit will use the GPU index to identify specific devices. You can change the way to identify what devices to expose by using the `hardware.nvidia-container-toolkit.device-name-strategy` NixOS attribute. +::: + +### Using docker-compose {#using-docker-compose} + +It's possible to expose GPU's to a `docker-compose` environment as well. With a `docker-compose.yaml` file like follows: + +```yaml +services: + some-service: + image: ubuntu:latest + command: sleep infinity + deploy: + resources: + reservations: + devices: + - driver: cdi + device_ids: + - nvidia.com/gpu=all +``` + +In the same manner, you can pick specific devices that will be exposed to the container: + +```yaml +services: + some-service: + image: ubuntu:latest + command: sleep infinity + deploy: + resources: + reservations: + devices: + - driver: cdi + device_ids: + - nvidia.com/gpu=0 + - nvidia.com/gpu=1 +``` diff --git a/third_party/nixpkgs/doc/packages/darwin-builder.section.md b/third_party/nixpkgs/doc/packages/darwin-builder.section.md index ca8519c5bf..06358c7901 100644 --- a/third_party/nixpkgs/doc/packages/darwin-builder.section.md +++ b/third_party/nixpkgs/doc/packages/darwin-builder.section.md @@ -100,7 +100,7 @@ $ sudo launchctl kickstart -k system/org.nixos.nix-daemon darwin-builder = nixpkgs.lib.nixosSystem { system = linuxSystem; modules = [ - "${nixpkgs}/nixos/modules/profiles/macos-builder.nix" + "${nixpkgs}/nixos/modules/profiles/nix-builder-vm.nix" { virtualisation = { host.pkgs = pkgs; darwin-builder.workingDirectory = "/var/lib/darwin-builder"; @@ -158,7 +158,7 @@ in the example below and rebuild. darwin-builder = nixpkgs.lib.nixosSystem { system = linuxSystem; modules = [ - "${nixpkgs}/nixos/modules/profiles/macos-builder.nix" + "${nixpkgs}/nixos/modules/profiles/nix-builder-vm.nix" { virtualisation.host.pkgs = pkgs; virtualisation.darwin-builder.diskSize = 5120; @@ -185,6 +185,6 @@ nix-repl> darwin.linux-builder.nixosConfig.nix.package «derivation /nix/store/...-nix-2.17.0.drv» nix-repl> :p darwin.linux-builder.nixosOptions.virtualisation.memorySize.definitionsWithLocations -[ { file = "/home/user/src/nixpkgs/nixos/modules/profiles/macos-builder.nix"; value = 3072; } ] +[ { file = "/home/user/src/nixpkgs/nixos/modules/profiles/nix-builder-vm.nix"; value = 3072; } ] ``` diff --git a/third_party/nixpkgs/doc/stdenv/passthru.chapter.md b/third_party/nixpkgs/doc/stdenv/passthru.chapter.md index 142b978d58..0c0b03fd0d 100644 --- a/third_party/nixpkgs/doc/stdenv/passthru.chapter.md +++ b/third_party/nixpkgs/doc/stdenv/passthru.chapter.md @@ -79,7 +79,7 @@ Besides tests provided by upstream, that you run in the [`checkPhase`](#ssec-che - They access the package as consumers would, independently from the environment in which it was built - They can be run and debugged without rebuilding the package, which is useful if that takes a long time -- They don't add overhead to each build, as opposed checks added to the [`distPhase`](#ssec-distribution-phase), such as [`versionCheckHook`](#versioncheckhook). +- They don't add overhead to each build, as opposed checks added to the [`installCheckPhase`](#ssec-installCheck-phase), such as [`versionCheckHook`](#versioncheckhook). It is also possible to use `passthru.tests` to test the version with [`testVersion`](#tester-testVersion), but since that is pretty trivial and recommended thing to do, we recommend using [`versionCheckHook`](#versioncheckhook) for that, which has the following advantages over `passthru.tests`: diff --git a/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md b/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md index ce4ec2541f..1c63914727 100644 --- a/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md +++ b/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md @@ -518,8 +518,10 @@ There are a number of variables that control what phases are executed and in wha Specifies the phases. You can change the order in which phases are executed, or add new phases, by setting this variable. If it’s not set, the default value is used, which is `$prePhases unpackPhase patchPhase $preConfigurePhases configurePhase $preBuildPhases buildPhase checkPhase $preInstallPhases installPhase fixupPhase installCheckPhase $preDistPhases distPhase $postPhases`. +The elements of `phases` must not contain spaces. If `phases` is specified as a Nix Language attribute, it should be specified as lists instead of strings. The same rules apply to the `*Phases` variables. + It is discouraged to set this variable, as it is easy to miss some important functionality hidden in some of the less obviously needed phases (like `fixupPhase` which patches the shebang of scripts). -Usually, if you just want to add a few phases, it’s more convenient to set one of the variables below (such as `preInstallPhases`). +Usually, if you just want to add a few phases, it’s more convenient to set one of the `*Phases` variables below. ##### `prePhases` {#var-stdenv-prePhases} diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index ffe0c78b95..5d2d0e1c0e 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -668,6 +668,12 @@ githubId = 19290901; name = "Andrew Brooks"; }; + agilesteel = { + email = "agilesteel@gmail.com"; + github = "agilesteel"; + githubId = 1141462; + name = "Vladyslav Pekker"; + }; aherrmann = { email = "andreash87@gmx.ch"; github = "aherrmann"; @@ -954,6 +960,12 @@ githubId = 49609151; name = "Popa Ioan Alexandru"; }; + alexandru0-dev = { + email = "alexandru.italia32+nixpkgs@gmail.com"; + github = "alexandru0-dev"; + githubId = 45104896; + name = "Alexandru Nechita"; + }; alexarice = { email = "alexrice999@hotmail.co.uk"; github = "alexarice"; @@ -3804,6 +3816,13 @@ githubId = 98980; name = "Chmouel Boudjnah"; }; + chn = { + name = "Haonan Chen"; + email = "chn@chn.moe"; + matrix = "@chn:chn.moe"; + github = "CHN-beta"; + githubId = 35858462; + }; choochootrain = { email = "hurshal@imap.cc"; github = "choochootrain"; @@ -5829,6 +5848,12 @@ githubId = 6872940; name = "Dennis Værum"; }; + dvcorreia = { + email = "dv_correia@hotmail.com"; + name = "Diogo Correia"; + github = "dvcorreia"; + githubId = 20357938; + }; dvn0 = { email = "git@dvn.me"; github = "dvn0"; @@ -7663,6 +7688,12 @@ githubId = 111183546; keys = [ { fingerprint = "58CE D4BE 6B10 149E DA80 A990 2F48 6356 A4CB 30F3"; } ]; }; + genga898 = { + email = "genga898@gmail.com"; + github = "genga898"; + githubId = 84174227; + name = "Emmanuel Genga"; + }; genofire = { name = "genofire"; email = "geno+dev@fireorbit.de"; @@ -8239,6 +8270,13 @@ github = "hacker1024"; githubId = 20849728; }; + hadilq = { + name = "Hadi Lashkari Ghouchani"; + email = "hadilq.dev@gmail.com"; + github = "hadilq"; + githubId = 5190539; + keys = [ { fingerprint = "AD3D 53CB A68A FEC0 8065 BCBB 416A D9E8 E372 C075"; } ]; + }; hagl = { email = "harald@glie.be"; github = "hagl"; @@ -8363,6 +8401,13 @@ githubId = 33969028; name = "Sebastian Hasler"; }; + hasnep = { + name = "Hannes"; + email = "h@nnes.dev"; + matrix = "@hasnep:matrix.org"; + github = "Hasnep"; + githubId = 25184102; + }; hausken = { name = "Hausken"; email = "hauskens-git@disp.lease>"; @@ -11685,6 +11730,13 @@ githubId = 168301; name = "Victor Engmark"; }; + l33tname = { + name = "l33tname"; + email = "hi@l33t.name"; + + github = "Fliiiix"; + githubId = 1682954; + }; l3af = { email = "L3afMeAlon3@gmail.com"; matrix = "@L3afMe:matrix.org"; @@ -13723,6 +13775,13 @@ github = "mi-ael"; githubId = 12199265; }; + miampf = { + email = "miampf@proton.me"; + github = "miampf"; + githubId = 111570799; + name = "Mia Motte Mallon"; + keys = [ { fingerprint = "7008 92AA 6F32 8CAC 8740 0070 EF03 9364 B5B6 886C"; } ]; + }; miangraham = { github = "miangraham"; githubId = 704580; @@ -18371,6 +18430,18 @@ githubId = 1217934; name = "José Romildo Malaquias"; }; + romner-set = { + email = "admin@cynosure.red"; + github = "romner-set"; + githubId = 41077433; + name = "romner-set"; + keys = [ + { + # uploaded to https://keys.openpgp.org + fingerprint = "4B75 244B 0279 9598 FF3B C21F 95FC 58F1 8CFD FAB0"; + } + ]; + }; ronanmacf = { email = "macfhlar@tcd.ie"; github = "RonanMacF"; @@ -22595,6 +22666,13 @@ githubId = 144771550; name = "Luca Uricariu"; }; + voronind = { + email = "hi@voronind.com"; + name = "Dmitry Voronin"; + github = "voronind-com"; + githubId = 22127600; + keys = [ { fingerprint = "3241 FDAD 82A7 E22D 4279 F405 913F 3267 9278 2E1C"; } ]; + }; votava = { email = "votava@gmail.com"; github = "janvotava"; diff --git a/third_party/nixpkgs/maintainers/scripts/fetch-kde-qt.sh b/third_party/nixpkgs/maintainers/scripts/fetch-kde-qt.sh index c43e8ad904..b5d49f8350 100755 --- a/third_party/nixpkgs/maintainers/scripts/fetch-kde-qt.sh +++ b/third_party/nixpkgs/maintainers/scripts/fetch-kde-qt.sh @@ -156,7 +156,7 @@ files_before=$(grep -c 'src = ' "$SRCS") echo "writing output file $SRCS ..." cat >"$SRCS" <.override`](https://nixos.org/manual/nixpkgs/unstable/#sec-pkg-override) provided by `callPackage` shadows such a locally-defined `override` attribute. + - All Cinnamon and XApp packages have been moved to top-level (i.e., `cinnamon.nemo` is now `nemo`). - All GNOME packages have been moved to top-level (i.e., `gnome.nautilus` is now `nautilus`). @@ -205,6 +212,12 @@ - `grafana` has been updated to version 11.1. This version doesn't support setting `http_addr` to a hostname anymore, an IP address is expected. +- `deno` has been updated to v2 which has breaking changes. Upstream will be abandoning v1 soon but for now you can use `deno_1` if you are yet to migrate (will be removed prior to cutting a final 24.11 release). + +- `gogs` has been removed. Upstream development has stalled and it has several + [critical vulnerabilities](https://github.com/gogs/gogs/issues/7777) that weren't addressed + within a year. Consider migrating to `forgejo` or `gitea`. + - `knot-dns` has been updated to version 3.4.x. Check the [migration guide](https://www.knot-dns.cz/docs/latest/html/migration.html#upgrade-3-3-x-to-3-4-x) for breaking changes. - `services.kubernetes.kubelet.clusterDns` now accepts a list of DNS resolvers rather than a single string, bringing the module more in line with the upstream Kubelet configuration schema. @@ -221,6 +234,11 @@ Also be aware that if you have set additional options in `services.wstunnel.{clients,servers}..extraArgs`, that those might have been removed or modified upstream. +- `percona-server_8_4` and `mysql84` now have password authentication via the deprecated `mysql_native_password` disabled by default. This authentication plugin can be enabled via a CLI argument again, for detailed instructions and alternative authentication methods [see upstream documentation](https://dev.mysql.com/doc/refman/8.4/en/native-pluggable-authentication.html). The config file directive `default_authentication_plugin` has been removed. + +- Percona has decided not to follow the LTS/ Innovation release scheme of upstream MySQL and thus [will only create releases for MySQL LTS versions](https://www.percona.com/blog/no-mysql-9-x-innovation-releases-from-percona/). Hence, the package names `percona-server_lts`, `percona-server_innovation`, `percona-xtrabackup_lts` and `percona-xtrabackup_innovation` are deprecated. + - `percona-server` and `percona-server_lts` now point towards the new LTS release `percona-server_8_4`. The previous LTS continues to be supported and is available as `percona-server_8_0`. The same is true for the supporting `percona-xtrabackup` tooling. + - `clang-tools_` packages have been moved into `llvmPackages_` (i.e. `clang-tools_18` is now `llvmPackages_18.clang-tools`). - 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. @@ -265,6 +283,11 @@ - The `mautrix-signal` module was adapted to incorporate the configuration rearrangement that resulted from the update to the mautrix bridgev2 architecture. Pre-0.7.0 configurations should continue to work. In case you want to update your configuration make sure to check the NixOS manual. +- The dhcpcd service (`networking.useDHCP`) has been hardened and now runs exclusively as the "dhcpcd" user. + Users that were relying on the root privileges in `networking.dhcpcd.runHook` will have to write specific [sudo](security.sudo.extraRules) or [polkit](security.polkit.extraConfig) rules to allow dhcpcd to perform privileged actions. + + As part of these changes, the DHCP lease files directory has also been moved from `/var/db/dhcpcd` to `/var/lib/dhcpcd`. This migration is performed automatically, but users may have to update their backup configuration. + - `singularity-tools` have the `storeDir` argument removed from its override interface and use `builtins.storeDir` instead. - Two build helpers in `singularity-tools`, i.e., `mkLayer` and `shellScript`, are deprecated, as they are no longer involved in image-building. Maintainers will remove them in future releases. @@ -313,10 +336,16 @@ Most prominently access to the webinterface and API are now protected by authentication. Retrieve the auto-created admin account from the `frigate.service` journal after upgrading. +- `nodePackages.coc-python` was dropped, as [its upstream is unmaintained](https://github.com/neoclide/coc-python). The associated `vimPlugins.coc-python` was also dropped. + The upstream project recommends using `coc-pyright` or `coc-jedi` as replacements. + +- `forgejo` has been upgraded from version 7.0 to version 9.0, see the release notes for [8.0](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#8-0-0) and [9.0](https://codeberg.org/forgejo/forgejo/milestone/7235). + - `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 `services.forgejo.settings` but takes file paths that will be read before service startup instead of some plaintext value. + `services.forgejo.package` now defaults to `forgejo-lts`, the Long Term Support version of Forgejo. - `forgejo` and `forgejo-lts` no longer support the opt-in feature [PAM (Pluggable Authentication Module)](https://forgejo.org/docs/latest/user/authentication/#pam-pluggable-authentication-module). @@ -497,9 +526,6 @@ - The `services.mxisd` module has been removed as both [mxisd](https://github.com/kamax-matrix/mxisd) and [ma1sd](https://github.com/ma1uta/ma1sd) are not maintained any longer. Consequently the package `pkgs.ma1sd` has also been removed. -- `ffmpeg_5` has been removed. Please use the unversioned `ffmpeg`, - pin a newer version, or if necessary pin `ffmpeg_4` for compatibility. - - The `rss-bridge` service drops the support to load a configuration file from `${config.services.rss-bridge.dataDir}/config.ini.php`. Consider using the `services.rss-bridge.config` option instead. @@ -519,6 +545,12 @@ - `ceph` has been upgraded to v19. See the [Ceph "squid" release notes](https://docs.ceph.com/en/latest/releases/squid/#v19-2-0-squid) for details and recommended upgrade procedure. +- `services.frr` has been refactored to use upstream service scripts. The per-daemon configurations + have been removed in favour of an `integrated-vtysh-config` style config. The daemon submodules + now use the daemon name (e.g. `ospfd`) instead of the protocol name (`ospf`). The daemons `zebra`, + `mgmtd` and `staticd` are always enabled if a config is present. The `vtyListenAddress` and + `vtyListenPort` options have been removed; use `options` or `extraOptions` instead, respectively. + - `opencv2` and `opencv3` have been removed, as they are obsolete and were not used by any other package. External users are encouraged to migrate to OpenCV 4. @@ -546,6 +578,16 @@ - Minimal installer ISOs are no longer built on the small channel. Please obtain installer images from the full release channels. +- The default FFmpeg version is now 7, and FFmpeg 5 has been removed. + Please prefer using the package variants without a version suffix, + or pin FFmpeg 6 or 4 if necessary for compatibility. + Note that we keep old versions around only as required + to support packages in the tree, + and FFmpeg 4 especially should be avoided in favour of newer versions + as it may be removed soon. + +- `openssl` now defaults to the latest version line `3.3.x`, instead of `3.0.x` before. While there should be no major code incompatibilities, newer OpenSSL versions typically strengthen the default security level. This means that you may have to explicitly allow weak ciphers, hashes and key lengths if necessary. See: [OpenSSL security level documentation](https://docs.openssl.org/3.3/man3/SSL_CTX_set_security_level/). + - The `isync` package has been updated to version `1.5.0`, which introduces some breaking changes. See the [compatibility concerns](https://sourceforge.net/projects/isync/files/isync/1.5.0/) for more details. - Legacy package `globalprotect-openconnect` 1.x and related module @@ -558,6 +600,14 @@ - The `rustic` package was upgrade to `0.9.0`, which contains [breaking changes to the config file format](https://github.com/rustic-rs/rustic/releases/tag/v0.9.0). +- `pkgs.formats.ini` and `pkgs.formats.iniWithGlobalSection` with + `listsAsDuplicateKeys` or `listToValue` no longer merge non-list values into + lists by default. Backwards-compatible behavior can be enabled with + `atomsCoercedToLists`. + +- `python3Packages.nose` has been removed, as it has been deprecated and unmaintained for almost a decade and does not work on Python 3.12. + Please switch to `pytest` or another test runner/framework. + ## Other Notable Changes {#sec-release-24.11-notable-changes} @@ -577,6 +627,12 @@ `goModules`, `modRoot`, `vendorHash`, `deleteVendor`, and `proxyVendor` are now passed as derivation attributes. `goModules` and `vendorHash` are no longer placed under `passthru`. +- `buildFlags`/`buildFlagsArray` on `buildGoModule` have been deprecated. 24.11 is the last release where `buildGoModule` accepts these flags (while throwing a warning). + Use the [`ldflags`](https://nixos.org/manual/nixpkgs/unstable/#var-go-ldflags) and/or [`tags`](https://nixos.org/manual/nixpkgs/unstable/#var-go-tags) attributes or + [the environment](https://nixos.org/manual/nixpkgs/unstable/#ssec-go-environment) instead. + +- `buildGoPackage` has been deprecated. 24.11 is the last release with `buildGoPackage` available. + - `hareHook` has been added as the language framework for Hare. From now on, it, not the `hare` package, should be added to `nativeBuildInputs` when building Hare programs. @@ -590,8 +646,6 @@ - `nixosTests` now provide a working IPv6 setup for VLAN 1 by default. -- `services.dhcpcd` is now started with additional systemd sandbox/hardening options for better security. When using `networking.dhcpcd.runHook` these settings are not applied. - - Kanidm can now be provisioned using the new [`services.kanidm.provision`] option, but requires using a patched version available via `pkgs.kanidm.withSecretProvisioning`. - Kanidm previously had an incorrect systemd service type, causing dependent units with an `after` and `requires` directive to start before `kanidm*` finished startup. The module has now been updated in line with upstream recommendations. @@ -618,6 +672,8 @@ The derivation now installs "impl" headers selectively instead of by a wildcard. Use `imgui.src` if you just want to access the unpacked sources. +- The new `boot.loader.systemd-boot.windows` option makes setting up dual-booting with Windows on a different drive easier + - Linux 4.19 has been removed because it will reach its end of life within the lifespan of 24.11 - Unprivileged access to the kernel syslog via `dmesg` is now restricted by default. Users wanting to keep an @@ -657,6 +713,10 @@ - `cargo-tauri.hook` was introduced to help users build [Tauri](https://tauri.app/) projects. It is meant to be used alongside `rustPlatform.buildRustPackage` and Node hooks such as `npmConfigHook`, `pnpm.configHook`, and the new `yarnConfig` +- `power.ups` now powers off UPSs during a power outage event. + This saves UPS battery and ensures that host(s) get back up again when power comes back, even in the scenario when the UPS would have had enough capacity to keep power on during the whole power outage. + If you like the old behaviour of keeping the UPSs on (and emptying the battery) after the host(s) have shut down, and risk not getting a power cycle event to get the host(s) back up, set `power.ups.upsmon.settings.POWERDOWNFLAG = null;`. + - 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 @@ -670,6 +730,12 @@ - ZFS now imports its pools in `postResumeCommands` rather than `postDeviceCommands`. If you had `postDeviceCommands` scripts that depended on ZFS pools being imported, those now need to be in `postResumeCommands`. +- `services.automatic-timezoned.enable = true` will now set `time.timeZone = null`. + This is to avoid silently shadowing a user's explicitly defined timezone without recognition on the user's part. + +- `services.localtimed.enable = true` will now set `time.timeZone = null`. + This is to avoid silently shadowing a user's explicitly defined timezone without recognition on the user's part. + ## Detailed migration information {#sec-release-24.11-migration} ### `sound` options removal {#sec-release-24.11-migration-sound} diff --git a/third_party/nixpkgs/nixos/lib/systemd-lib.nix b/third_party/nixpkgs/nixos/lib/systemd-lib.nix index c5d64c3bd4..ede54318d5 100644 --- a/third_party/nixpkgs/nixos/lib/systemd-lib.nix +++ b/third_party/nixpkgs/nixos/lib/systemd-lib.nix @@ -17,6 +17,7 @@ let filterAttrs flatten flip + hasPrefix head isInt isFloat @@ -196,6 +197,10 @@ in rec { optional (attr ? ${name}) "Systemd ${group} field `${name}' has been removed. See ${see}"; + assertKeyIsSystemdCredential = name: group: attr: + optional (attr ? ${name} && !(hasPrefix "@" attr.${name})) + "Systemd ${group} field `${name}' is not a systemd credential"; + checkUnitConfig = group: checks: attrs: let # We're applied at the top-level type (attrsOf unitOption), so the actual # unit options might contain attributes from mkOverride and mkIf that we need to diff --git a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/driver.py b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/driver.py index 01b64b92e9..0f01bd6d0a 100644 --- a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/driver.py +++ b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/driver.py @@ -99,7 +99,16 @@ class Driver: with self.logger.nested("cleanup"): self.race_timer.cancel() for machine in self.machines: - machine.release() + try: + machine.release() + except Exception as e: + self.logger.error(f"Error during cleanup of {machine.name}: {e}") + + for vlan in self.vlans: + try: + vlan.stop() + except Exception as e: + self.logger.error(f"Error during cleanup of vlan{vlan.nr}: {e}") def subtest(self, name: str) -> Iterator[None]: """Group logs under a given test name""" diff --git a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/machine.py b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/machine.py index 3a1d5bc1be..7a602ce660 100644 --- a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/machine.py +++ b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/machine.py @@ -1234,6 +1234,9 @@ class Machine: self.monitor.close() self.serial_thread.join() + if self.qmp_client: + self.qmp_client.close() + def run_callbacks(self) -> None: for callback in self.callbacks: callback() diff --git a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/qmp.py b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/qmp.py index 62ca6d7d5b..99c02ca1c1 100644 --- a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/qmp.py +++ b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/qmp.py @@ -49,7 +49,7 @@ class QMPSession: sock.connect(str(path)) return cls(sock) - def __del__(self) -> None: + def close(self) -> None: self.sock.close() def _wait_for_new_result(self) -> dict[str, str]: diff --git a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/vlan.py b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/vlan.py index 9340fc92ed..03ecbe25e8 100644 --- a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/vlan.py +++ b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/vlan.py @@ -59,7 +59,7 @@ class VLan: self.logger.info(f"running vlan (pid {self.pid}; ctl {self.socket_dir})") - def __del__(self) -> None: + def stop(self) -> None: self.logger.info(f"kill vlan (pid {self.pid})") self.fd.close() self.process.terminate() diff --git a/third_party/nixpkgs/nixos/modules/config/resolvconf.nix b/third_party/nixpkgs/nixos/modules/config/resolvconf.nix index 3609b1ba47..f6241e9bf9 100644 --- a/third_party/nixpkgs/nixos/modules/config/resolvconf.nix +++ b/third_party/nixpkgs/nixos/modules/config/resolvconf.nix @@ -114,6 +114,15 @@ in ''; }; + subscriberFiles = lib.mkOption { + type = lib.types.listOf lib.types.path; + default = []; + description = '' + Files written by resolvconf updates + ''; + internal = true; + }; + }; }; @@ -132,6 +141,10 @@ in } (lib.mkIf cfg.enable { + users.groups.resolvconf = {}; + + networking.resolvconf.subscriberFiles = [ "/etc/resolv.conf" ]; + networking.resolvconf.package = pkgs.openresolv; environment.systemPackages = [ cfg.package ]; @@ -143,12 +156,15 @@ in wants = [ "network-pre.target" ]; wantedBy = [ "multi-user.target" ]; restartTriggers = [ config.environment.etc."resolvconf.conf".source ]; + serviceConfig.Type = "oneshot"; + serviceConfig.RemainAfterExit = true; - serviceConfig = { - Type = "oneshot"; - ExecStart = "${cfg.package}/bin/resolvconf -u"; - RemainAfterExit = true; - }; + script = '' + ${lib.getExe cfg.package} -u + files=(/run/resolvconf ${lib.escapeShellArgs cfg.subscriberFiles}) + chgrp -R resolvconf "''${files[@]}" + chmod -R g=u "''${files[@]}" + ''; }; }) diff --git a/third_party/nixpkgs/nixos/modules/hardware/steam-hardware.nix b/third_party/nixpkgs/nixos/modules/hardware/steam-hardware.nix index aed008b588..bd1e6ae8f7 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/steam-hardware.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/steam-hardware.nix @@ -16,7 +16,7 @@ in config = lib.mkIf cfg.enable { services.udev.packages = [ - pkgs.steamPackages.steam + pkgs.steam-unwrapped ]; # The uinput module needs to be loaded in order to trigger the udev rules diff --git a/third_party/nixpkgs/nixos/modules/hardware/system-76.nix b/third_party/nixpkgs/nixos/modules/hardware/system-76.nix index ca40ee0ebb..d81c59fbc9 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/system-76.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/system-76.nix @@ -36,7 +36,7 @@ let }; }; - power-pkg = config.boot.kernelPackages.system76-power; + power-pkg = pkgs.system76-power; powerConfig = mkIf cfg.power-daemon.enable { # Make system76-power usable by root from the command line. environment.systemPackages = [ power-pkg ]; diff --git a/third_party/nixpkgs/nixos/modules/hardware/video/webcam/ipu6.nix b/third_party/nixpkgs/nixos/modules/hardware/video/webcam/ipu6.nix index ae54e24ee2..803902530d 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/video/webcam/ipu6.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/video/webcam/ipu6.nix @@ -26,9 +26,9 @@ in config = mkIf cfg.enable { - # Module is upstream as of 6.10 - boot.extraModulePackages = with config.boot.kernelPackages; - optional (kernelOlder "6.10") ipu6-drivers; + # Module is upstream as of 6.10, + # but still needs various out-of-tree i2c and the `intel-ipu6-psys` kernel driver + boot.extraModulePackages = with config.boot.kernelPackages; [ ipu6-drivers ]; hardware.firmware = with pkgs; [ ipu6-camera-bins diff --git a/third_party/nixpkgs/nixos/modules/installer/netboot/netboot.nix b/third_party/nixpkgs/nixos/modules/installer/netboot/netboot.nix index 167c2b5218..adcc10316f 100644 --- a/third_party/nixpkgs/nixos/modules/installer/netboot/netboot.nix +++ b/third_party/nixpkgs/nixos/modules/installer/netboot/netboot.nix @@ -9,12 +9,7 @@ with lib; options = { netboot.squashfsCompression = mkOption { - default = with pkgs.stdenv.hostPlatform; "xz -Xdict-size 100% " - + lib.optionalString isx86 "-Xbcj x86" - # Untested but should also reduce size for these platforms - + lib.optionalString isAarch "-Xbcj arm" - + lib.optionalString (isPower && is32bit && isBigEndian) "-Xbcj powerpc" - + lib.optionalString (isSparc) "-Xbcj sparc"; + default = "zstd -Xcompression-level 19"; description = '' Compression settings to use for the squashfs nix store. ''; 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 a9ef9b3e31..0bc5787af6 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,8 @@ { - x86_64-linux = "/nix/store/vhv7ckr0winivvwfqxd54d6pgq2hx1is-nix-2.18.8"; - i686-linux = "/nix/store/8x7rmgi225r5kygpf17swvk3vll0c61y-nix-2.18.8"; - aarch64-linux = "/nix/store/sbyj0rb1wd314zfxpf834d0clvxrxmv3-nix-2.18.8"; - x86_64-darwin = "/nix/store/vsy1wl865md71qv177nchj0aj5p26pkl-nix-2.18.8"; - aarch64-darwin = "/nix/store/54kqc2da3fjyjgzab4vaszxjmdvii6yk-nix-2.18.8"; + x86_64-linux = "/nix/store/2nhrwv91g6ycpyxvhmvc0xs8p92wp4bk-nix-2.24.9"; + i686-linux = "/nix/store/idaxj9ji6ggpn1h47a35mf0c8ns4ma39-nix-2.24.9"; + aarch64-linux = "/nix/store/7b5q44l2p70bf6m6dprr8f0587ypwq1z-nix-2.24.9"; + riscv64-linux = "/nix/store/mgw3il1qk59750g5hbf02km79rgyx00y-nix-riscv64-unknown-linux-gnu-2.24.9"; + x86_64-darwin = "/nix/store/rp8rc0pfgham7d7spj5s9syzb138dmmd-nix-2.24.9"; + aarch64-darwin = "/nix/store/1n95r340s7p3vdwqh7m94q0a42crahqq-nix-2.24.9"; } diff --git a/third_party/nixpkgs/nixos/modules/misc/ids.nix b/third_party/nixpkgs/nixos/modules/misc/ids.nix index ed016b552e..8b0127dc29 100644 --- a/third_party/nixpkgs/nixos/modules/misc/ids.nix +++ b/third_party/nixpkgs/nixos/modules/misc/ids.nix @@ -296,7 +296,7 @@ in sickbeard = 265; headphones = 266; # couchpotato = 267; # unused, removed 2022-01-01 - gogs = 268; + # gogs = 268; # unused, removed in 2024-10-12 #pdns-recursor = 269; # dynamically allocated as of 2020-20-18 #kresd = 270; # switched to "knot-resolver" with dynamic ID rpc = 271; @@ -607,7 +607,7 @@ in sickbeard = 265; headphones = 266; # couchpotato = 267; # unused, removed 2022-01-01 - gogs = 268; + # gogs = 268; # unused, removed in 2024-10-12 #kresd = 270; # switched to "knot-resolver" with dynamic ID #rpc = 271; # unused #geoip = 272; # unused diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index c86a571cc0..6ac03cca94 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -215,7 +215,7 @@ ./programs/iftop.nix ./programs/i3lock.nix ./programs/iio-hyprland.nix - ./programs/immersed-vr.nix + ./programs/immersed.nix ./programs/iotop.nix ./programs/java.nix ./programs/joycond-cemuhook.nix @@ -759,7 +759,6 @@ ./services/misc/gitlab.nix ./services/misc/gitolite.nix ./services/misc/gitweb.nix - ./services/misc/gogs.nix ./services/misc/gollum.nix ./services/misc/gotenberg.nix ./services/misc/gpsd.nix @@ -966,6 +965,7 @@ ./services/network-filesystems/rsyncd.nix ./services/network-filesystems/samba-wsdd.nix ./services/network-filesystems/samba.nix + ./services/network-filesystems/saunafs.nix ./services/network-filesystems/tahoe.nix ./services/network-filesystems/u9fs.nix ./services/network-filesystems/webdav-server-rs.nix @@ -980,6 +980,7 @@ ./services/networking/aria2.nix ./services/networking/asterisk.nix ./services/networking/atftpd.nix + ./services/networking/atticd.nix ./services/networking/autossh.nix ./services/networking/avahi-daemon.nix ./services/networking/babeld.nix @@ -1276,6 +1277,7 @@ ./services/networking/xray.nix ./services/networking/xrdp.nix ./services/networking/yggdrasil.nix + ./services/networking/zapret.nix ./services/networking/zerobin.nix ./services/networking/zeronet.nix ./services/networking/zerotierone.nix diff --git a/third_party/nixpkgs/nixos/modules/profiles/macos-builder.nix b/third_party/nixpkgs/nixos/modules/profiles/macos-builder.nix index 08b2fce400..896bb6bc9f 100644 --- a/third_party/nixpkgs/nixos/modules/profiles/macos-builder.nix +++ b/third_party/nixpkgs/nixos/modules/profiles/macos-builder.nix @@ -1,256 +1,5 @@ -{ config, lib, options, ... }: - -let - keysDirectory = "/var/keys"; - - user = "builder"; - - keyType = "ed25519"; - - cfg = config.virtualisation.darwin-builder; - +let lib = import ../../../lib; in - -{ - imports = [ - ../virtualisation/qemu-vm.nix - - # Avoid a dependency on stateVersion - { - disabledModules = [ - ../virtualisation/nixos-containers.nix - ../services/x11/desktop-managers/xterm.nix - ]; - # swraid's default depends on stateVersion - config.boot.swraid.enable = false; - options.boot.isContainer = lib.mkOption { default = false; internal = true; }; - } - ]; - - options.virtualisation.darwin-builder = with lib; { - diskSize = mkOption { - default = 20 * 1024; - type = types.int; - example = 30720; - description = "The maximum disk space allocated to the runner in MB"; - }; - memorySize = mkOption { - default = 3 * 1024; - type = types.int; - example = 8192; - description = "The runner's memory in MB"; - }; - min-free = mkOption { - default = 1024 * 1024 * 1024; - type = types.int; - example = 1073741824; - description = '' - The threshold (in bytes) of free disk space left at which to - start garbage collection on the runner - ''; - }; - max-free = mkOption { - default = 3 * 1024 * 1024 * 1024; - type = types.int; - example = 3221225472; - description = '' - The threshold (in bytes) of free disk space left at which to - stop garbage collection on the runner - ''; - }; - workingDirectory = mkOption { - default = "."; - type = types.str; - example = "/var/lib/darwin-builder"; - description = '' - The working directory to use to run the script. When running - as part of a flake will need to be set to a non read-only filesystem. - ''; - }; - hostPort = mkOption { - default = 31022; - type = types.int; - example = 22; - description = '' - The localhost host port to forward TCP to the guest port. - ''; - }; - }; - - config = { - # The builder is not intended to be used interactively - documentation.enable = false; - - environment.etc = { - "ssh/ssh_host_ed25519_key" = { - mode = "0600"; - - source = ./keys/ssh_host_ed25519_key; - }; - - "ssh/ssh_host_ed25519_key.pub" = { - mode = "0644"; - - source = ./keys/ssh_host_ed25519_key.pub; - }; - }; - - # DNS fails for QEMU user networking (SLiRP) on macOS. See: - # - # https://github.com/utmapp/UTM/issues/2353 - # - # This works around that by using a public DNS server other than the DNS - # server that QEMU provides (normally 10.0.2.3) - networking.nameservers = [ "8.8.8.8" ]; - - # The linux builder is a lightweight VM for remote building; not evaluation. - nix.channel.enable = false; - - # Deployment is by image. - # TODO system.switch.enable = false;? - system.disableInstallerTools = true; - - nix.settings = { - auto-optimise-store = true; - - min-free = cfg.min-free; - - max-free = cfg.max-free; - - trusted-users = [ user ]; - }; - - services = { - getty.autologinUser = user; - - openssh = { - enable = true; - - authorizedKeysFiles = [ "${keysDirectory}/%u_${keyType}.pub" ]; - }; - }; - - system.build.macos-builder-installer = - let - privateKey = "/etc/nix/${user}_${keyType}"; - - publicKey = "${privateKey}.pub"; - - # This installCredentials script is written so that it's as easy as - # possible for a user to audit before confirming the `sudo` - installCredentials = hostPkgs.writeShellScript "install-credentials" '' - set -euo pipefail - - KEYS="''${1}" - INSTALL=${hostPkgs.coreutils}/bin/install - "''${INSTALL}" -g nixbld -m 600 "''${KEYS}/${user}_${keyType}" ${privateKey} - "''${INSTALL}" -g nixbld -m 644 "''${KEYS}/${user}_${keyType}.pub" ${publicKey} - ''; - - hostPkgs = config.virtualisation.host.pkgs; - - script = hostPkgs.writeShellScriptBin "create-builder" ( - '' - set -euo pipefail - '' + - # When running as non-interactively as part of a DarwinConfiguration the working directory - # must be set to a writeable directory. - (if cfg.workingDirectory != "." then '' - ${hostPkgs.coreutils}/bin/mkdir --parent "${cfg.workingDirectory}" - cd "${cfg.workingDirectory}" - '' else "") + '' - KEYS="''${KEYS:-./keys}" - ${hostPkgs.coreutils}/bin/mkdir --parent "''${KEYS}" - PRIVATE_KEY="''${KEYS}/${user}_${keyType}" - PUBLIC_KEY="''${PRIVATE_KEY}.pub" - if [ ! -e "''${PRIVATE_KEY}" ] || [ ! -e "''${PUBLIC_KEY}" ]; then - ${hostPkgs.coreutils}/bin/rm --force -- "''${PRIVATE_KEY}" "''${PUBLIC_KEY}" - ${hostPkgs.openssh}/bin/ssh-keygen -q -f "''${PRIVATE_KEY}" -t ${keyType} -N "" -C 'builder@localhost' - fi - if ! ${hostPkgs.diffutils}/bin/cmp "''${PUBLIC_KEY}" ${publicKey}; then - (set -x; sudo --reset-timestamp ${installCredentials} "''${KEYS}") - fi - KEYS="$(${hostPkgs.nix}/bin/nix-store --add "$KEYS")" ${lib.getExe config.system.build.vm} - ''); - - in - script.overrideAttrs (old: { - pos = __curPos; # sets meta.position to point here; see script binding above for package definition - meta = (old.meta or { }) // { - platforms = lib.platforms.darwin; - }; - passthru = (old.passthru or { }) // { - # Let users in the repl inspect the config - nixosConfig = config; - nixosOptions = options; - }; - }); - - system = { - # To prevent gratuitous rebuilds on each change to Nixpkgs - nixos.revision = null; - - # to be updated by module maintainers, see nixpkgs#325610 - stateVersion = "24.05"; - }; - - users.users."${user}" = { - isNormalUser = true; - }; - - security.polkit.enable = true; - - security.polkit.extraConfig = '' - polkit.addRule(function(action, subject) { - if (action.id === "org.freedesktop.login1.power-off" && subject.user === "${user}") { - return "yes"; - } else { - return "no"; - } - }) - ''; - - virtualisation = { - diskSize = cfg.diskSize; - - memorySize = cfg.memorySize; - - forwardPorts = [ - { from = "host"; guest.port = 22; host.port = cfg.hostPort; } - ]; - - # Disable graphics for the builder since users will likely want to run it - # non-interactively in the background. - graphics = false; - - sharedDirectories.keys = { - source = "\"$KEYS\""; - target = keysDirectory; - }; - - # If we don't enable this option then the host will fail to delegate builds - # to the guest, because: - # - # - The host will lock the path to build - # - The host will delegate the build to the guest - # - The guest will attempt to lock the same path and fail because - # the lockfile on the host is visible on the guest - # - # Snapshotting the host's /nix/store as an image isolates the guest VM's - # /nix/store from the host's /nix/store, preventing this problem. - useNixStoreImage = true; - - # Obviously the /nix/store needs to be writable on the guest in order for it - # to perform builds. - writableStore = true; - - # This ensures that anything built on the guest isn't lost when the guest is - # restarted. - writableStoreUseTmpfs = false; - - # Pass certificates from host to the guest otherwise when custom CA certificates - # are required we can't use the cached builder. - useHostCerts = true; - }; - }; -} + lib.warnIf (lib.isInOldestRelease 2411) + "nixos/modules/profiles/macos-builder.nix has moved to nixos/modules/profiles/nix-builder-vm.nix; please update your NixOS imports." + ./nix-builder-vm.nix diff --git a/third_party/nixpkgs/nixos/modules/profiles/nix-builder-vm.nix b/third_party/nixpkgs/nixos/modules/profiles/nix-builder-vm.nix new file mode 100644 index 0000000000..fcaca974f3 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/profiles/nix-builder-vm.nix @@ -0,0 +1,284 @@ +/* + This profile uses NixOS to create a remote builder VM to build Linux packages, + which can be used to build packages for Linux on other operating systems; + primarily macOS. + + It contains both the relevant guest settings as well as an installer script + that manages it as a QEMU virtual machine on the host. +*/ +{ + config, + lib, + options, + ... +}: + +let + keysDirectory = "/var/keys"; + + user = "builder"; + + keyType = "ed25519"; + + cfg = config.virtualisation.darwin-builder; + +in + +{ + imports = [ + ../virtualisation/qemu-vm.nix + + # Avoid a dependency on stateVersion + { + disabledModules = [ + ../virtualisation/nixos-containers.nix + ../services/x11/desktop-managers/xterm.nix + ]; + # swraid's default depends on stateVersion + config.boot.swraid.enable = false; + options.boot.isContainer = lib.mkOption { + default = false; + internal = true; + }; + } + ]; + + options.virtualisation.darwin-builder = with lib; { + diskSize = mkOption { + default = 20 * 1024; + type = types.int; + example = 30720; + description = "The maximum disk space allocated to the runner in MB"; + }; + memorySize = mkOption { + default = 3 * 1024; + type = types.int; + example = 8192; + description = "The runner's memory in MB"; + }; + min-free = mkOption { + default = 1024 * 1024 * 1024; + type = types.int; + example = 1073741824; + description = '' + The threshold (in bytes) of free disk space left at which to + start garbage collection on the runner + ''; + }; + max-free = mkOption { + default = 3 * 1024 * 1024 * 1024; + type = types.int; + example = 3221225472; + description = '' + The threshold (in bytes) of free disk space left at which to + stop garbage collection on the runner + ''; + }; + workingDirectory = mkOption { + default = "."; + type = types.str; + example = "/var/lib/darwin-builder"; + description = '' + The working directory to use to run the script. When running + as part of a flake will need to be set to a non read-only filesystem. + ''; + }; + hostPort = mkOption { + default = 31022; + type = types.int; + example = 22; + description = '' + The localhost host port to forward TCP to the guest port. + ''; + }; + }; + + config = { + # The builder is not intended to be used interactively + documentation.enable = false; + + environment.etc = { + "ssh/ssh_host_ed25519_key" = { + mode = "0600"; + + source = ./keys/ssh_host_ed25519_key; + }; + + "ssh/ssh_host_ed25519_key.pub" = { + mode = "0644"; + + source = ./keys/ssh_host_ed25519_key.pub; + }; + }; + + # DNS fails for QEMU user networking (SLiRP) on macOS. See: + # + # https://github.com/utmapp/UTM/issues/2353 + # + # This works around that by using a public DNS server other than the DNS + # server that QEMU provides (normally 10.0.2.3) + networking.nameservers = [ "8.8.8.8" ]; + + # The linux builder is a lightweight VM for remote building; not evaluation. + nix.channel.enable = false; + + # Deployment is by image. + # TODO system.switch.enable = false;? + system.disableInstallerTools = true; + + nix.settings = { + auto-optimise-store = true; + + min-free = cfg.min-free; + + max-free = cfg.max-free; + + trusted-users = [ user ]; + }; + + services = { + getty.autologinUser = user; + + openssh = { + enable = true; + + authorizedKeysFiles = [ "${keysDirectory}/%u_${keyType}.pub" ]; + }; + }; + + system.build.macos-builder-installer = + let + privateKey = "/etc/nix/${user}_${keyType}"; + + publicKey = "${privateKey}.pub"; + + # This installCredentials script is written so that it's as easy as + # possible for a user to audit before confirming the `sudo` + installCredentials = hostPkgs.writeShellScript "install-credentials" '' + set -euo pipefail + + KEYS="''${1}" + INSTALL=${hostPkgs.coreutils}/bin/install + "''${INSTALL}" -g nixbld -m 600 "''${KEYS}/${user}_${keyType}" ${privateKey} + "''${INSTALL}" -g nixbld -m 644 "''${KEYS}/${user}_${keyType}.pub" ${publicKey} + ''; + + hostPkgs = config.virtualisation.host.pkgs; + + script = hostPkgs.writeShellScriptBin "create-builder" ( + '' + set -euo pipefail + '' + + + # When running as non-interactively as part of a DarwinConfiguration the working directory + # must be set to a writeable directory. + ( + if cfg.workingDirectory != "." then + '' + ${hostPkgs.coreutils}/bin/mkdir --parent "${cfg.workingDirectory}" + cd "${cfg.workingDirectory}" + '' + else + "" + ) + + '' + KEYS="''${KEYS:-./keys}" + ${hostPkgs.coreutils}/bin/mkdir --parent "''${KEYS}" + PRIVATE_KEY="''${KEYS}/${user}_${keyType}" + PUBLIC_KEY="''${PRIVATE_KEY}.pub" + if [ ! -e "''${PRIVATE_KEY}" ] || [ ! -e "''${PUBLIC_KEY}" ]; then + ${hostPkgs.coreutils}/bin/rm --force -- "''${PRIVATE_KEY}" "''${PUBLIC_KEY}" + ${hostPkgs.openssh}/bin/ssh-keygen -q -f "''${PRIVATE_KEY}" -t ${keyType} -N "" -C 'builder@localhost' + fi + if ! ${hostPkgs.diffutils}/bin/cmp "''${PUBLIC_KEY}" ${publicKey}; then + (set -x; sudo --reset-timestamp ${installCredentials} "''${KEYS}") + fi + KEYS="$(${hostPkgs.nix}/bin/nix-store --add "$KEYS")" ${lib.getExe config.system.build.vm} + '' + ); + + in + script.overrideAttrs (old: { + pos = __curPos; # sets meta.position to point here; see script binding above for package definition + meta = (old.meta or { }) // { + platforms = lib.platforms.darwin; + }; + passthru = (old.passthru or { }) // { + # Let users in the repl inspect the config + nixosConfig = config; + nixosOptions = options; + }; + }); + + system = { + # To prevent gratuitous rebuilds on each change to Nixpkgs + nixos.revision = null; + + # to be updated by module maintainers, see nixpkgs#325610 + stateVersion = "24.05"; + }; + + users.users."${user}" = { + isNormalUser = true; + }; + + security.polkit.enable = true; + + security.polkit.extraConfig = '' + polkit.addRule(function(action, subject) { + if (action.id === "org.freedesktop.login1.power-off" && subject.user === "${user}") { + return "yes"; + } else { + return "no"; + } + }) + ''; + + virtualisation = { + diskSize = cfg.diskSize; + + memorySize = cfg.memorySize; + + forwardPorts = [ + { + from = "host"; + guest.port = 22; + host.port = cfg.hostPort; + } + ]; + + # Disable graphics for the builder since users will likely want to run it + # non-interactively in the background. + graphics = false; + + sharedDirectories.keys = { + source = "\"$KEYS\""; + target = keysDirectory; + }; + + # If we don't enable this option then the host will fail to delegate builds + # to the guest, because: + # + # - The host will lock the path to build + # - The host will delegate the build to the guest + # - The guest will attempt to lock the same path and fail because + # the lockfile on the host is visible on the guest + # + # Snapshotting the host's /nix/store as an image isolates the guest VM's + # /nix/store from the host's /nix/store, preventing this problem. + useNixStoreImage = true; + + # Obviously the /nix/store needs to be writable on the guest in order for it + # to perform builds. + writableStore = true; + + # This ensures that anything built on the guest isn't lost when the guest is + # restarted. + writableStoreUseTmpfs = false; + + # Pass certificates from host to the guest otherwise when custom CA certificates + # are required we can't use the cached builder. + useHostCerts = true; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/programs/gamemode.nix b/third_party/nixpkgs/nixos/modules/programs/gamemode.nix index 14892f9c6e..bd3248c1c5 100644 --- a/third_party/nixpkgs/nixos/modules/programs/gamemode.nix +++ b/third_party/nixpkgs/nixos/modules/programs/gamemode.nix @@ -2,7 +2,7 @@ let cfg = config.programs.gamemode; - settingsFormat = pkgs.formats.ini { }; + settingsFormat = pkgs.formats.ini { listsAsDuplicateKeys = true; }; configFile = settingsFormat.generate "gamemode.ini" cfg.settings; in { diff --git a/third_party/nixpkgs/nixos/modules/programs/gpu-screen-recorder.nix b/third_party/nixpkgs/nixos/modules/programs/gpu-screen-recorder.nix index 39d0e25452..5a9401943d 100644 --- a/third_party/nixpkgs/nixos/modules/programs/gpu-screen-recorder.nix +++ b/third_party/nixpkgs/nixos/modules/programs/gpu-screen-recorder.nix @@ -1,14 +1,20 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.programs.gpu-screen-recorder; package = cfg.package.override { inherit (config.security) wrapperDir; }; -in { +in +{ options = { programs.gpu-screen-recorder = { - package = lib.mkPackageOption pkgs "gpu-screen-recorder" {}; + package = lib.mkPackageOption pkgs "gpu-screen-recorder" { }; enable = lib.mkOption { type = lib.types.bool; @@ -28,12 +34,6 @@ in { capabilities = "cap_sys_admin+ep"; source = "${package}/bin/gsr-kms-server"; }; - security.wrappers."gpu-screen-recorder" = { - owner = "root"; - group = "root"; - capabilities = "cap_sys_nice+ep"; - source = "${package}/bin/gpu-screen-recorder"; - }; }; meta.maintainers = with lib.maintainers; [ timschumi ]; diff --git a/third_party/nixpkgs/nixos/modules/programs/immersed-vr.nix b/third_party/nixpkgs/nixos/modules/programs/immersed-vr.nix deleted file mode 100644 index 57edb3cbae..0000000000 --- a/third_party/nixpkgs/nixos/modules/programs/immersed-vr.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -let - cfg = config.programs.immersed-vr; -in -{ - - options = { - programs.immersed-vr = { - enable = lib.mkEnableOption "immersed-vr"; - - package = lib.mkPackageOption pkgs "immersed-vr" {}; - }; - }; - - config = lib.mkIf cfg.enable { - boot = { - kernelModules = [ "v4l2loopback" "snd-aloop" ]; - extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ]; - extraModprobeConfig = '' - options v4l2loopback exclusive_caps=1 card_label="v4l2loopback Virtual Camera" - ''; - }; - - environment.systemPackages = [ cfg.package ]; - }; - - meta.maintainers = pkgs.immersed-vr.meta.maintainers; -} diff --git a/third_party/nixpkgs/nixos/modules/programs/immersed.nix b/third_party/nixpkgs/nixos/modules/programs/immersed.nix new file mode 100644 index 0000000000..0fb217b91d --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/programs/immersed.nix @@ -0,0 +1,49 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.programs.immersed; +in +{ + imports = [ + (lib.mkRenamedOptionModule + [ + "programs" + "immersed-vr" + ] + [ + "programs" + "immersed" + ] + ) + ]; + + options = { + programs.immersed = { + enable = lib.mkEnableOption "immersed"; + + package = lib.mkPackageOption pkgs "immersed" { }; + }; + }; + + config = lib.mkIf cfg.enable { + boot = { + kernelModules = [ + "v4l2loopback" + "snd-aloop" + ]; + extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ]; + extraModprobeConfig = '' + options v4l2loopback exclusive_caps=1 card_label="v4l2loopback Virtual Camera" + ''; + }; + + environment.systemPackages = [ cfg.package ]; + }; + + meta.maintainers = pkgs.immersed.meta.maintainers; +} diff --git a/third_party/nixpkgs/nixos/modules/programs/steam.nix b/third_party/nixpkgs/nixos/modules/programs/steam.nix index 92e6f4ccae..dab8425721 100644 --- a/third_party/nixpkgs/nixos/modules/programs/steam.nix +++ b/third_party/nixpkgs/nixos/modules/programs/steam.nix @@ -31,7 +31,7 @@ in { default = pkgs.steam; defaultText = lib.literalExpression "pkgs.steam"; example = lib.literalExpression '' - pkgs.steam-small.override { + pkgs.steam.override { extraEnv = { MANGOHUD = true; OBS_VKCAPTURE = true; diff --git a/third_party/nixpkgs/nixos/modules/security/pam.nix b/third_party/nixpkgs/nixos/modules/security/pam.nix index 2ff08cbfde..acd0673877 100644 --- a/third_party/nixpkgs/nixos/modules/security/pam.nix +++ b/third_party/nixpkgs/nixos/modules/security/pam.nix @@ -287,6 +287,18 @@ let ''; }; + rssh = lib.mkOption { + default = false; + type = lib.types.bool; + description = '' + If set, the calling user's SSH agent is used to authenticate + against the configured keys. This module works in a manner + similar to pam_ssh_agent_auth, but supports a wider range + of SSH key types, including those protected by security + keys (FIDO2). + ''; + }; + duoSecurity = { enable = lib.mkOption { default = false; @@ -673,6 +685,7 @@ let { name = "ssh_agent_auth"; enable = config.security.pam.sshAgentAuth.enable && cfg.sshAgentAuth; control = "sufficient"; modulePath = "${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so"; settings = { file = lib.concatStringsSep ":" config.security.pam.sshAgentAuth.authorizedKeysFiles; }; } + (let inherit (config.security.pam) rssh; in { name = "rssh"; enable = rssh.enable && cfg.rssh; control = "sufficient"; modulePath = "${pkgs.pam_rssh}/lib/libpam_rssh.so"; inherit (rssh) settings; }) (let p11 = config.security.pam.p11; in { name = "p11"; enable = cfg.p11Auth; control = p11.control; modulePath = "${pkgs.pam_p11}/lib/security/pam_p11.so"; args = [ "${pkgs.opensc}/lib/opensc-pkcs11.so" ]; }) @@ -950,8 +963,9 @@ let value.source = pkgs.writeText "${name}.pam" service.text; }; - optionalSudoConfigForSSHAgentAuth = lib.optionalString config.security.pam.sshAgentAuth.enable '' - # Keep SSH_AUTH_SOCK so that pam_ssh_agent_auth.so can do its magic. + optionalSudoConfigForSSHAgentAuth = lib.optionalString + (config.security.pam.sshAgentAuth.enable || config.security.pam.rssh.enable) '' + # Keep SSH_AUTH_SOCK so that pam_ssh_agent_auth.so and libpam_rssh.so can do their magic. Defaults env_keep+=SSH_AUTH_SOCK ''; @@ -1068,6 +1082,55 @@ in }; }; + security.pam.rssh = { + enable = lib.mkEnableOption "authenticating using a signature performed by the ssh-agent"; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = moduleSettingsType; + options = { + auth_key_file = lib.mkOption { + type = with lib.types; nullOr nonEmptyStr; + description = '' + Path to file with trusted public keys in OpenSSH's `authorized_keys` format. The following + variables are expanded to the respective PAM items: + + - `service`: `PAM_SERVICE`, the service name, + - `user`: `PAM_USER`, the username of the entity under whose identity service will be given, + - `tty`: `PAM_TTY`, the terminal name, + - `rhost`: `PAM_RHOST`, the requesting hostname, and + - `ruser`: `PAM_RUSER`, the requesting entity. + + These PAM items are explained in {manpage}`pam_get_item(3)`. + + Variables may be specified as `$var`, `''${var}` or `''${var:defaultValue}`. + + ::: {.note} + Specifying user-writeable files here results in an insecure configuration: a malicious process + can then edit such an `authorized_keys` file and bypass the ssh-agent-based authentication. + + This option is ignored if {option}`security.pam.rssh.settings.authorized_keys_command` is set. + + If both this option and {option}`security.pam.rssh.settings.authorized_keys_command` are unset, + the keys will be read from `''${HOME}/.ssh/authorized_keys`, which should be considered + insecure. + ''; + default = "/etc/ssh/authorized_keys.d/$ruser"; + }; + }; + }; + + default = { }; + description = '' + Options to pass to the pam_rssh module. Refer to + + for supported values. + + ${moduleSettingsDescription} + ''; + }; + }; + security.pam.enableOTPW = lib.mkEnableOption "the OTPW (one-time password) PAM module"; security.pam.dp9ik = { @@ -1512,16 +1575,30 @@ in Did you forget to set `services.openssh.enable` ? ''; } + { + assertion = with config.security.pam.rssh; + enable -> (settings.auth_key_file or null != null || settings.authorized_keys_command or null != null); + message = '' + security.pam.rssh.enable requires either security.pam.rssh.settings.auth_key_file or + security.pam.rssh.settings.authorized_keys_command to be set. + ''; + } ]; warnings = lib.optional - (with lib; with config.security.pam.sshAgentAuth; + (with config.security.pam.sshAgentAuth; enable && lib.any (s: lib.hasPrefix "%h" s || lib.hasPrefix "~" s) authorizedKeysFiles) ''config.security.pam.sshAgentAuth.authorizedKeysFiles contains files in the user's home directory. Specifying user-writeable files there result in an insecure configuration: a malicious process can then edit such an authorized_keys file and bypass the ssh-agent-based authentication. See https://github.com/NixOS/nixpkgs/issues/31611 + '' ++ lib.optional + (with config.security.pam.rssh; + enable && settings.auth_key_file or null != null && settings.authorized_keys_command or null != null) '' + security.pam.rssh.settings.auth_key_file will be ignored as + security.pam.rssh.settings.authorized_keys_command has been specified. + Explictly set the former to null to silence this warning. ''; environment.systemPackages = diff --git a/third_party/nixpkgs/nixos/modules/services/audio/snapserver.nix b/third_party/nixpkgs/nixos/modules/services/audio/snapserver.nix index 20186016af..c1e5f8cf43 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/snapserver.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/snapserver.nix @@ -186,7 +186,8 @@ in { http.docRoot = lib.mkOption { type = with lib.types; nullOr path; - default = null; + default = pkgs.snapweb; + defaultText = lib.literalExpression "pkgs.snapweb"; description = '' Path to serve from the HTTP servers root. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/github-runner/service.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/github-runner/service.nix index 4b1fc230c2..ab2ebb7a49 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/github-runner/service.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/github-runner/service.nix @@ -19,7 +19,9 @@ with lib; ]) ); - config.systemd.services = flip mapAttrs' config.services.github-runners (name: cfg: + config.systemd.services = + let enabledRunners = filterAttrs (_: cfg: cfg.enable) config.services.github-runners; + in (flip mapAttrs' enabledRunners (name: cfg: let svcName = "github-runner-${name}"; systemdDir = "github-runner/${name}"; @@ -296,5 +298,5 @@ with lib; cfg.serviceOverrides ]; } - ); + )); } diff --git a/third_party/nixpkgs/nixos/modules/services/databases/mysql.nix b/third_party/nixpkgs/nixos/modules/services/databases/mysql.nix index 4b2e83e71e..d7c731def1 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/mysql.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/mysql.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.mysql; @@ -9,7 +6,7 @@ let isMariaDB = lib.getName cfg.package == lib.getName pkgs.mariadb; isOracle = lib.getName cfg.package == lib.getName pkgs.mysql80; # Oracle MySQL has supported "notify" service type since 8.0 - hasNotify = isMariaDB || (isOracle && versionAtLeast cfg.package.version "8.0"); + hasNotify = isMariaDB || (isOracle && lib.versionAtLeast cfg.package.version "8.0"); mysqldOptions = "--user=${cfg.user} --datadir=${cfg.dataDir} --basedir=${cfg.package}"; @@ -21,11 +18,11 @@ in { imports = [ - (mkRemovedOptionModule [ "services" "mysql" "pidDir" ] "Don't wait for pidfiles, describe dependencies through systemd.") - (mkRemovedOptionModule [ "services" "mysql" "rootPassword" ] "Use socket authentication or set the password outside of the nix store.") - (mkRemovedOptionModule [ "services" "mysql" "extraOptions" ] "Use services.mysql.settings.mysqld instead.") - (mkRemovedOptionModule [ "services" "mysql" "bind" ] "Use services.mysql.settings.mysqld.bind-address instead.") - (mkRemovedOptionModule [ "services" "mysql" "port" ] "Use services.mysql.settings.mysqld.port instead.") + (lib.mkRemovedOptionModule [ "services" "mysql" "pidDir" ] "Don't wait for pidfiles, describe dependencies through systemd.") + (lib.mkRemovedOptionModule [ "services" "mysql" "rootPassword" ] "Use socket authentication or set the password outside of the nix store.") + (lib.mkRemovedOptionModule [ "services" "mysql" "extraOptions" ] "Use services.mysql.settings.mysqld instead.") + (lib.mkRemovedOptionModule [ "services" "mysql" "bind" ] "Use services.mysql.settings.mysqld.bind-address instead.") + (lib.mkRemovedOptionModule [ "services" "mysql" "port" ] "Use services.mysql.settings.mysqld.port instead.") ]; ###### interface @@ -34,18 +31,18 @@ in services.mysql = { - enable = mkEnableOption "MySQL server"; + enable = lib.mkEnableOption "MySQL server"; - package = mkOption { - type = types.package; - example = literalExpression "pkgs.mariadb"; + package = lib.mkOption { + type = lib.types.package; + example = lib.literalExpression "pkgs.mariadb"; description = '' Which MySQL derivation to use. MariaDB packages are supported too. ''; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "mysql"; description = '' User account under which MySQL runs. @@ -58,8 +55,8 @@ in ''; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; default = "mysql"; description = '' Group account under which MySQL runs. @@ -72,8 +69,8 @@ in ''; }; - dataDir = mkOption { - type = types.path; + dataDir = lib.mkOption { + type = lib.types.path; example = "/var/lib/mysql"; description = '' The data directory for MySQL. @@ -85,8 +82,8 @@ in ''; }; - configFile = mkOption { - type = types.path; + configFile = lib.mkOption { + type = lib.types.path; default = configFile; defaultText = '' A configuration file automatically generated by NixOS. @@ -95,7 +92,7 @@ in Override the configuration file used by MySQL. By default, NixOS generates one automatically from {option}`services.mysql.settings`. ''; - example = literalExpression '' + example = lib.literalExpression '' pkgs.writeText "my.cnf" ''' [mysqld] datadir = /var/lib/mysql @@ -107,7 +104,7 @@ in ''; }; - settings = mkOption { + settings = lib.mkOption { type = format.type; default = {}; description = '' @@ -123,7 +120,7 @@ in `1`, or `0`. See the provided example below. ::: ''; - example = literalExpression '' + example = lib.literalExpression '' { mysqld = { key_buffer_size = "6G"; @@ -139,17 +136,17 @@ in ''; }; - initialDatabases = mkOption { - type = types.listOf (types.submodule { + initialDatabases = lib.mkOption { + type = lib.types.listOf (lib.types.submodule { options = { - name = mkOption { - type = types.str; + name = lib.mkOption { + type = lib.types.str; description = '' The name of the database to create. ''; }; - schema = mkOption { - type = types.nullOr types.path; + schema = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; description = '' The initial schema of the database; if null (the default), @@ -163,7 +160,7 @@ in List of database names and their initial schemas that should be used to create databases on the first startup of MySQL. The schema attribute is optional: If not specified, an empty database is created. ''; - example = literalExpression '' + example = lib.literalExpression '' [ { name = "foodatabase"; schema = ./foodatabase.sql; } { name = "bardatabase"; } @@ -171,14 +168,14 @@ in ''; }; - initialScript = mkOption { - type = types.nullOr types.path; + initialScript = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; description = "A file containing SQL statements to be executed on the first startup. Can be used for granting certain permissions on the database."; }; - ensureDatabases = mkOption { - type = types.listOf types.str; + ensureDatabases = lib.mkOption { + type = lib.types.listOf lib.types.str; default = []; description = '' Ensures that the specified databases exist. @@ -192,17 +189,17 @@ in ]; }; - ensureUsers = mkOption { - type = types.listOf (types.submodule { + ensureUsers = lib.mkOption { + type = lib.types.listOf (lib.types.submodule { options = { - name = mkOption { - type = types.str; + name = lib.mkOption { + type = lib.types.str; description = '' Name of the user to ensure. ''; }; - ensurePermissions = mkOption { - type = types.attrsOf types.str; + ensurePermissions = lib.mkOption { + type = lib.types.attrsOf lib.types.str; default = {}; description = '' Permissions to ensure for the user, specified as attribute set. @@ -216,7 +213,7 @@ in [GRANT syntax](https://mariadb.com/kb/en/library/grant/). The attributes are used as `GRANT ''${attrName} ON ''${attrValue}`. ''; - example = literalExpression '' + example = lib.literalExpression '' { "database.*" = "ALL PRIVILEGES"; "*.*" = "SELECT, LOCK TABLES"; @@ -234,7 +231,7 @@ in option is changed. This means that users created and permissions assigned once through this option or otherwise have to be removed manually. ''; - example = literalExpression '' + example = lib.literalExpression '' [ { name = "nextcloud"; @@ -253,40 +250,40 @@ in }; replication = { - role = mkOption { - type = types.enum [ "master" "slave" "none" ]; + role = lib.mkOption { + type = lib.types.enum [ "master" "slave" "none" ]; default = "none"; description = "Role of the MySQL server instance."; }; - serverId = mkOption { - type = types.int; + serverId = lib.mkOption { + type = lib.types.int; default = 1; description = "Id of the MySQL server instance. This number must be unique for each instance."; }; - masterHost = mkOption { - type = types.str; + masterHost = lib.mkOption { + type = lib.types.str; description = "Hostname of the MySQL master server."; }; - slaveHost = mkOption { - type = types.str; + slaveHost = lib.mkOption { + type = lib.types.str; description = "Hostname of the MySQL slave server."; }; - masterUser = mkOption { - type = types.str; + masterUser = lib.mkOption { + type = lib.types.str; description = "Username of the MySQL replication user."; }; - masterPassword = mkOption { - type = types.str; + masterPassword = lib.mkOption { + type = lib.types.str; description = "Password of the MySQL replication user."; }; - masterPort = mkOption { - type = types.port; + masterPort = lib.mkOption { + type = lib.types.port; default = 3306; description = "Port number on which the MySQL master server runs."; }; @@ -298,30 +295,30 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { services.mysql.dataDir = - mkDefault (if versionAtLeast config.system.stateVersion "17.09" then "/var/lib/mysql" + lib.mkDefault (if lib.versionAtLeast config.system.stateVersion "17.09" then "/var/lib/mysql" else "/var/mysql"); - services.mysql.settings.mysqld = mkMerge [ + services.mysql.settings.mysqld = lib.mkMerge [ { datadir = cfg.dataDir; - port = mkDefault 3306; + port = lib.mkDefault 3306; } - (mkIf (cfg.replication.role == "master" || cfg.replication.role == "slave") { + (lib.mkIf (cfg.replication.role == "master" || cfg.replication.role == "slave") { log-bin = "mysql-bin-${toString cfg.replication.serverId}"; log-bin-index = "mysql-bin-${toString cfg.replication.serverId}.index"; relay-log = "mysql-relay-bin"; server-id = cfg.replication.serverId; binlog-ignore-db = [ "information_schema" "performance_schema" "mysql" ]; }) - (mkIf (!isMariaDB) { + (lib.mkIf (!isMariaDB) { plugin-load-add = "auth_socket.so"; }) ]; - users.users = optionalAttrs (cfg.user == "mysql") { + users.users = lib.optionalAttrs (cfg.user == "mysql") { mysql = { description = "MySQL server user"; group = cfg.group; @@ -329,7 +326,7 @@ in }; }; - users.groups = optionalAttrs (cfg.group == "mysql") { + users.groups = lib.optionalAttrs (cfg.group == "mysql") { mysql.gid = config.ids.gids.mysql; }; @@ -380,7 +377,7 @@ in # The super user account to use on *first* run of MySQL server superUser = if isMariaDB then cfg.user else "root"; in '' - ${optionalString (!hasNotify) '' + ${lib.optionalString (!hasNotify) '' # Wait until the MySQL server is available for use while [ ! -e /run/mysqld/mysqld.sock ] do @@ -397,13 +394,13 @@ in echo "GRANT ALL PRIVILEGES ON *.* TO '${cfg.user}'@'localhost' WITH GRANT OPTION;" ) | ${cfg.package}/bin/mysql -u ${superUser} -N - ${concatMapStrings (database: '' + ${lib.concatMapStrings (database: '' # Create initial databases if ! test -e "${cfg.dataDir}/${database.name}"; then echo "Creating initial database: ${database.name}" ( echo 'create database `${database.name}`;' - ${optionalString (database.schema != null) '' + ${lib.optionalString (database.schema != null) '' echo 'use `${database.name}`;' # TODO: this silently falls through if database.schema does not exist, @@ -420,7 +417,7 @@ in fi '') cfg.initialDatabases} - ${optionalString (cfg.replication.role == "master") + ${lib.optionalString (cfg.replication.role == "master") '' # Set up the replication master @@ -431,7 +428,7 @@ in ) | ${cfg.package}/bin/mysql -u ${superUser} -N ''} - ${optionalString (cfg.replication.role == "slave") + ${lib.optionalString (cfg.replication.role == "slave") '' # Set up the replication slave @@ -441,7 +438,7 @@ in ) | ${cfg.package}/bin/mysql -u ${superUser} -N ''} - ${optionalString (cfg.initialScript != null) + ${lib.optionalString (cfg.initialScript != null) '' # Execute initial script # using toString to avoid copying the file to nix store if given as path instead of string, @@ -452,25 +449,25 @@ in rm ${cfg.dataDir}/mysql_init fi - ${optionalString (cfg.ensureDatabases != []) '' + ${lib.optionalString (cfg.ensureDatabases != []) '' ( - ${concatMapStrings (database: '' + ${lib.concatMapStrings (database: '' echo "CREATE DATABASE IF NOT EXISTS \`${database}\`;" '') cfg.ensureDatabases} ) | ${cfg.package}/bin/mysql -N ''} - ${concatMapStrings (user: + ${lib.concatMapStrings (user: '' ( echo "CREATE USER IF NOT EXISTS '${user.name}'@'localhost' IDENTIFIED WITH ${if isMariaDB then "unix_socket" else "auth_socket"};" - ${concatStringsSep "\n" (mapAttrsToList (database: permission: '' + ${lib.concatStringsSep "\n" (lib.mapAttrsToList (database: permission: '' echo "GRANT ${permission} ON ${database} TO '${user.name}'@'localhost';" '') user.ensurePermissions)} ) | ${cfg.package}/bin/mysql -N '') cfg.ensureUsers} ''; - serviceConfig = mkMerge [ + serviceConfig = lib.mkMerge [ { Type = if hasNotify then "notify" else "simple"; Restart = "on-abort"; @@ -506,7 +503,7 @@ in # System Call Filtering SystemCallArchitectures = "native"; } - (mkIf (cfg.dataDir == "/var/lib/mysql") { + (lib.mkIf (cfg.dataDir == "/var/lib/mysql") { StateDirectory = "mysql"; StateDirectoryMode = "0700"; }) diff --git a/third_party/nixpkgs/nixos/modules/services/databases/redis.nix b/third_party/nixpkgs/nixos/modules/services/databases/redis.nix index 7a3f408aa9..43829b13c6 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/redis.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/redis.nix @@ -72,7 +72,28 @@ in { defaultText = literalExpression '' if name == "" then "redis" else "redis-''${name}" ''; - description = "The username and groupname for redis-server."; + description = '' + User account under which this instance of redis-server runs. + + ::: {.note} + If left as the default value this user will automatically be + created on system activation, otherwise you are responsible for + ensuring the user exists before the redis service starts. + ''; + }; + + group = mkOption { + type = types.str; + default = config.user; + defaultText = literalExpression "config.user"; + description = '' + Group account under which this instance of redis-server runs. + + ::: {.note} + If left as the default value this group will automatically be + created on system activation, otherwise you are responsible for + ensuring the group exists before the redis service starts. + ''; }; port = mkOption { @@ -337,7 +358,7 @@ in { redisConfStore = redisConfig conf.settings; in '' touch "${redisConfVar}" "${redisConfRun}" - chown '${conf.user}' "${redisConfVar}" "${redisConfRun}" + chown '${conf.user}':'${conf.group}' "${redisConfVar}" "${redisConfRun}" chmod 0600 "${redisConfVar}" "${redisConfRun}" if [ ! -s ${redisConfVar} ]; then echo 'include "${redisConfRun}"' > "${redisConfVar}" @@ -353,7 +374,7 @@ in { Type = "notify"; # User and group User = conf.user; - Group = conf.user; + Group = conf.group; # Runtime directory and mode RuntimeDirectory = redisName name; RuntimeDirectoryMode = "0750"; diff --git a/third_party/nixpkgs/nixos/modules/services/desktop-managers/lomiri.nix b/third_party/nixpkgs/nixos/modules/services/desktop-managers/lomiri.nix index 310657179f..75834eab0c 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktop-managers/lomiri.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktop-managers/lomiri.nix @@ -16,7 +16,6 @@ in { libayatana-common ubports-click ]) ++ (with pkgs.lomiri; [ - content-hub hfd-service history-service libusermetrics @@ -24,6 +23,7 @@ in { lomiri-calculator-app lomiri-camera-app lomiri-clock-app + lomiri-content-hub lomiri-docviewer-app lomiri-download-manager lomiri-filemanager-app @@ -129,7 +129,7 @@ in { environment.pathsToLink = [ # Configs for inter-app data exchange system - "/share/content-hub/peers" + "/share/lomiri-content-hub/peers" # Configs for inter-app URL requests "/share/lomiri-url-dispatcher/urls" # Splash screens & other images for desktop apps launched via lomiri-app-launch @@ -194,10 +194,6 @@ in { }; users.groups.usermetrics = { }; - - # TODO content-hub cannot pass files between applications without asking AA for permissions. And alot of the Lomiri stack is designed with AA availability in mind. This might be a requirement to be closer to upstream? - # But content-hub currently fails to pass files between applications even with AA enabled, and we can get away without AA in many places. Let's see how this develops before requiring this for good. - # security.apparmor.enable = true; }; meta.maintainers = lib.teams.lomiri.members; 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 f5018c4c29..af7b27f28e 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktop-managers/plasma6.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktop-managers/plasma6.nix @@ -249,10 +249,11 @@ in { xdg.portal.enable = true; xdg.portal.extraPortals = [ + kdePackages.kwallet kdePackages.xdg-desktop-portal-kde pkgs.xdg-desktop-portal-gtk ]; - xdg.portal.configPackages = mkDefault [kdePackages.xdg-desktop-portal-kde]; + xdg.portal.configPackages = mkDefault [kdePackages.plasma-workspace]; services.pipewire.enable = mkDefault true; # Enable screen reader by default diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/system76-scheduler.nix b/third_party/nixpkgs/nixos/modules/services/desktops/system76-scheduler.nix index b021ae6bfb..b8f80276ef 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/system76-scheduler.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/system76-scheduler.nix @@ -95,8 +95,8 @@ in { package = mkOption { type = types.package; - default = config.boot.kernelPackages.system76-scheduler; - defaultText = literalExpression "config.boot.kernelPackages.system76-scheduler"; + default = pkgs.system76-scheduler; + defaultText = literalExpression "pkgs.system76-scheduler"; description = "Which System76-Scheduler package to use."; }; @@ -252,7 +252,7 @@ in { # No custom settings: just use stock configuration with a fix for Pipewire "system76-scheduler/config.kdl".source = "${cfg.package}/data/config.kdl"; "system76-scheduler/process-scheduler/00-dist.kdl".source = "${cfg.package}/data/pop_os.kdl"; - "system76-scheduler/process-scheduler/01-fix-pipewire-paths.kdl".source = ../../../../pkgs/os-specific/linux/system76-scheduler/01-fix-pipewire-paths.kdl; + "system76-scheduler/process-scheduler/01-fix-pipewire-paths.kdl".source = ../../../../pkgs/by-name/sy/system76-scheduler/01-fix-pipewire-paths.kdl; }) (let diff --git a/third_party/nixpkgs/nixos/modules/services/development/jupyter/default.nix b/third_party/nixpkgs/nixos/modules/services/development/jupyter/default.nix index b3991fa4c2..d9687fdbf7 100644 --- a/third_party/nixpkgs/nixos/modules/services/development/jupyter/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/development/jupyter/default.nix @@ -185,7 +185,7 @@ in { }) (lib.mkIf (cfg.enable && (cfg.user == "jupyter")) { users.extraUsers.jupyter = { - extraGroups = [ cfg.group ]; + inherit (cfg) group; home = "/var/lib/jupyter"; createHome = true; isSystemUser = true; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix b/third_party/nixpkgs/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix index a188c16141..450651e8b6 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix @@ -77,50 +77,63 @@ }; - config = { + config = lib.mkIf config.hardware.nvidia-container-toolkit.enable { + virtualisation.docker = { + daemon.settings = lib.mkIf + (lib.versionAtLeast config.virtualisation.docker.package.version "25") { + features.cdi = true; + }; - virtualisation.docker.daemon.settings = lib.mkIf - (config.hardware.nvidia-container-toolkit.enable && - (lib.versionAtLeast config.virtualisation.docker.package.version "25")) { - features.cdi = true; - }; + rootless.daemon.settings = lib.mkIf + (config.virtualisation.docker.rootless.enable && + (lib.versionAtLeast config.virtualisation.docker.package.version "25")) { + features.cdi = true; + }; + }; - hardware.nvidia-container-toolkit.mounts = let - nvidia-driver = config.hardware.nvidia.package; - in (lib.mkMerge [ - [{ hostPath = pkgs.addDriverRunpath.driverLink; - containerPath = pkgs.addDriverRunpath.driverLink; } - { hostPath = "${lib.getLib nvidia-driver}/etc"; - containerPath = "${lib.getLib nvidia-driver}/etc"; } - { hostPath = "${lib.getLib nvidia-driver}/share"; - containerPath = "${lib.getLib nvidia-driver}/share"; } - { hostPath = "${lib.getLib pkgs.glibc}/lib"; - containerPath = "${lib.getLib pkgs.glibc}/lib"; } - { hostPath = "${lib.getLib pkgs.glibc}/lib64"; - containerPath = "${lib.getLib pkgs.glibc}/lib64"; }] - (lib.mkIf config.hardware.nvidia-container-toolkit.mount-nvidia-executables - [{ hostPath = lib.getExe' nvidia-driver "nvidia-cuda-mps-control"; - containerPath = "/usr/bin/nvidia-cuda-mps-control"; } - { hostPath = lib.getExe' nvidia-driver "nvidia-cuda-mps-server"; - containerPath = "/usr/bin/nvidia-cuda-mps-server"; } - { hostPath = lib.getExe' nvidia-driver "nvidia-debugdump"; - containerPath = "/usr/bin/nvidia-debugdump"; } - { hostPath = lib.getExe' nvidia-driver "nvidia-powerd"; - containerPath = "/usr/bin/nvidia-powerd"; } - { hostPath = lib.getExe' nvidia-driver "nvidia-smi"; - containerPath = "/usr/bin/nvidia-smi"; }]) - # nvidia-docker 1.0 uses /usr/local/nvidia/lib{,64} - # e.g. - # - https://gitlab.com/nvidia/container-images/cuda/-/blob/e3ff10eab3a1424fe394899df0e0f8ca5a410f0f/dist/12.3.1/ubi9/base/Dockerfile#L44 - # - https://github.com/NVIDIA/nvidia-docker/blob/01d2c9436620d7dde4672e414698afe6da4a282f/src/nvidia/volumes.go#L104-L173 - (lib.mkIf config.hardware.nvidia-container-toolkit.mount-nvidia-docker-1-directories - [{ hostPath = "${lib.getLib nvidia-driver}/lib"; - containerPath = "/usr/local/nvidia/lib"; } - { hostPath = "${lib.getLib nvidia-driver}/lib"; - containerPath = "/usr/local/nvidia/lib64"; }]) - ]); + hardware = { + graphics.enable = lib.mkIf (!config.hardware.nvidia.datacenter.enable) true; - systemd.services.nvidia-container-toolkit-cdi-generator = lib.mkIf config.hardware.nvidia-container-toolkit.enable { + nvidia-container-toolkit.mounts = let + nvidia-driver = config.hardware.nvidia.package; + in (lib.mkMerge [ + [{ hostPath = pkgs.addDriverRunpath.driverLink; + containerPath = pkgs.addDriverRunpath.driverLink; } + { hostPath = "${lib.getLib nvidia-driver}/etc"; + containerPath = "${lib.getLib nvidia-driver}/etc"; } + { hostPath = "${lib.getLib nvidia-driver}/share"; + containerPath = "${lib.getLib nvidia-driver}/share"; } + { hostPath = "${lib.getLib pkgs.glibc}/lib"; + containerPath = "${lib.getLib pkgs.glibc}/lib"; } + { hostPath = "${lib.getLib pkgs.glibc}/lib64"; + containerPath = "${lib.getLib pkgs.glibc}/lib64"; }] + (lib.mkIf config.hardware.nvidia-container-toolkit.mount-nvidia-executables + [{ hostPath = lib.getExe' nvidia-driver "nvidia-cuda-mps-control"; + containerPath = "/usr/bin/nvidia-cuda-mps-control"; } + { hostPath = lib.getExe' nvidia-driver "nvidia-cuda-mps-server"; + containerPath = "/usr/bin/nvidia-cuda-mps-server"; } + { hostPath = lib.getExe' nvidia-driver "nvidia-debugdump"; + containerPath = "/usr/bin/nvidia-debugdump"; } + { hostPath = lib.getExe' nvidia-driver "nvidia-powerd"; + containerPath = "/usr/bin/nvidia-powerd"; } + { hostPath = lib.getExe' nvidia-driver "nvidia-smi"; + containerPath = "/usr/bin/nvidia-smi"; }]) + # nvidia-docker 1.0 uses /usr/local/nvidia/lib{,64} + # e.g. + # - https://gitlab.com/nvidia/container-images/cuda/-/blob/e3ff10eab3a1424fe394899df0e0f8ca5a410f0f/dist/12.3.1/ubi9/base/Dockerfile#L44 + # - https://github.com/NVIDIA/nvidia-docker/blob/01d2c9436620d7dde4672e414698afe6da4a282f/src/nvidia/volumes.go#L104-L173 + (lib.mkIf config.hardware.nvidia-container-toolkit.mount-nvidia-docker-1-directories + [{ hostPath = "${lib.getLib nvidia-driver}/lib"; + containerPath = "/usr/local/nvidia/lib"; } + { hostPath = "${lib.getLib nvidia-driver}/lib"; + containerPath = "/usr/local/nvidia/lib64"; }]) + ]); + }; + + services.xserver.videoDrivers = lib.mkIf + (!config.hardware.nvidia.datacenter.enable) [ "nvidia" ]; + + systemd.services.nvidia-container-toolkit-cdi-generator = { description = "Container Device Interface (CDI) for Nvidia generator"; wantedBy = [ "multi-user.target" ]; after = [ "systemd-udev-settle.service" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/stalwart-mail.nix b/third_party/nixpkgs/nixos/modules/services/mail/stalwart-mail.nix index aabe46d607..9985e49067 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/stalwart-mail.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/stalwart-mail.nix @@ -82,6 +82,7 @@ in { ) { webadmin = lib.mkDefault "file://${cfg.package.webadmin}/webadmin.zip"; }; + webadmin.path = "/var/cache/stalwart-mail"; }; # This service stores a potentially large amount of data. @@ -117,6 +118,7 @@ in { StandardOutput = "journal"; StandardError = "journal"; + CacheDirectory = "stalwart-mail"; StateDirectory = "stalwart-mail"; # Bind standard privileged ports diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gogs.nix b/third_party/nixpkgs/nixos/modules/services/misc/gogs.nix deleted file mode 100644 index a2c1ad0779..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/misc/gogs.nix +++ /dev/null @@ -1,271 +0,0 @@ -{ config, lib, options, pkgs, ... }: -let - cfg = config.services.gogs; - opt = options.services.gogs; - configFile = pkgs.writeText "app.ini" '' - BRAND_NAME = ${cfg.appName} - RUN_USER = ${cfg.user} - RUN_MODE = prod - - [database] - TYPE = ${cfg.database.type} - HOST = ${cfg.database.host}:${toString cfg.database.port} - NAME = ${cfg.database.name} - USER = ${cfg.database.user} - PASSWORD = #dbpass# - PATH = ${cfg.database.path} - - [repository] - ROOT = ${cfg.repositoryRoot} - - [server] - DOMAIN = ${cfg.domain} - HTTP_ADDR = ${cfg.httpAddress} - HTTP_PORT = ${toString cfg.httpPort} - EXTERNAL_URL = ${cfg.rootUrl} - - [session] - COOKIE_NAME = session - COOKIE_SECURE = ${lib.boolToString cfg.cookieSecure} - - [security] - SECRET_KEY = #secretkey# - INSTALL_LOCK = true - - [log] - ROOT_PATH = ${cfg.stateDir}/log - - ${cfg.extraConfig} - ''; -in - -{ - options = { - services.gogs = { - enable = lib.mkOption { - default = false; - type = lib.types.bool; - description = "Enable Go Git Service."; - }; - - useWizard = lib.mkOption { - default = false; - type = lib.types.bool; - description = "Do not generate a configuration and use Gogs' installation wizard instead. The first registered user will be administrator."; - }; - - stateDir = lib.mkOption { - default = "/var/lib/gogs"; - type = lib.types.str; - description = "Gogs data directory."; - }; - - user = lib.mkOption { - type = lib.types.str; - default = "gogs"; - description = "User account under which Gogs runs."; - }; - - group = lib.mkOption { - type = lib.types.str; - default = "gogs"; - description = "Group account under which Gogs runs."; - }; - - database = { - type = lib.mkOption { - type = lib.types.enum [ "sqlite3" "mysql" "postgres" ]; - example = "mysql"; - default = "sqlite3"; - description = "Database engine to use."; - }; - - host = lib.mkOption { - type = lib.types.str; - default = "127.0.0.1"; - description = "Database host address."; - }; - - port = lib.mkOption { - type = lib.types.port; - default = 3306; - description = "Database host port."; - }; - - name = lib.mkOption { - type = lib.types.str; - default = "gogs"; - description = "Database name."; - }; - - user = lib.mkOption { - type = lib.types.str; - default = "gogs"; - description = "Database user."; - }; - - password = lib.mkOption { - type = lib.types.str; - default = ""; - description = '' - The password corresponding to {option}`database.user`. - Warning: this is stored in cleartext in the Nix store! - Use {option}`database.passwordFile` instead. - ''; - }; - - passwordFile = lib.mkOption { - type = lib.types.nullOr lib.types.path; - default = null; - example = "/run/keys/gogs-dbpassword"; - description = '' - A file containing the password corresponding to - {option}`database.user`. - ''; - }; - - path = lib.mkOption { - type = lib.types.str; - default = "${cfg.stateDir}/data/gogs.db"; - defaultText = lib.literalExpression ''"''${config.${opt.stateDir}}/data/gogs.db"''; - description = "Path to the sqlite3 database file."; - }; - }; - - appName = lib.mkOption { - type = lib.types.str; - default = "Gogs: Go Git Service"; - description = "Application name."; - }; - - repositoryRoot = lib.mkOption { - type = lib.types.str; - default = "${cfg.stateDir}/repositories"; - defaultText = lib.literalExpression ''"''${config.${opt.stateDir}}/repositories"''; - description = "Path to the git repositories."; - }; - - domain = lib.mkOption { - type = lib.types.str; - default = "localhost"; - description = "Domain name of your server."; - }; - - rootUrl = lib.mkOption { - type = lib.types.str; - default = "http://localhost:3000/"; - description = "Full public URL of Gogs server."; - }; - - httpAddress = lib.mkOption { - type = lib.types.str; - default = "0.0.0.0"; - description = "HTTP listen address."; - }; - - httpPort = lib.mkOption { - type = lib.types.port; - default = 3000; - description = "HTTP listen port."; - }; - - cookieSecure = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Marks session cookies as "secure" as a hint for browsers to only send - them via HTTPS. This option is recommend, if Gogs is being served over HTTPS. - ''; - }; - - extraConfig = lib.mkOption { - type = lib.types.str; - default = ""; - description = "Configuration lines appended to the generated Gogs configuration file."; - }; - }; - }; - - config = lib.mkIf cfg.enable { - - systemd.services.gogs = { - description = "Gogs (Go Git Service)"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - path = [ pkgs.gogs ]; - - preStart = let - runConfig = "${cfg.stateDir}/custom/conf/app.ini"; - secretKey = "${cfg.stateDir}/custom/conf/secret_key"; - in '' - mkdir -p ${cfg.stateDir} - - # copy custom configuration and generate a random secret key if needed - ${lib.optionalString (cfg.useWizard == false) '' - mkdir -p ${cfg.stateDir}/custom/conf - cp -f ${configFile} ${runConfig} - - if [ ! -e ${secretKey} ]; then - head -c 16 /dev/urandom | base64 > ${secretKey} - fi - - KEY=$(head -n1 ${secretKey}) - DBPASS=$(head -n1 ${cfg.database.passwordFile}) - sed -e "s,#secretkey#,$KEY,g" \ - -e "s,#dbpass#,$DBPASS,g" \ - -i ${runConfig} - ''} - - mkdir -p ${cfg.repositoryRoot} - # update all hooks' binary paths - HOOKS=$(find ${cfg.repositoryRoot} -mindepth 4 -maxdepth 4 -type f -wholename "*git/hooks/*") - if [ "$HOOKS" ] - then - sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gogs,${pkgs.gogs}/bin/gogs,g' $HOOKS - sed -ri 's,/nix/store/[a-z0-9.-]+/bin/env,${pkgs.coreutils}/bin/env,g' $HOOKS - sed -ri 's,/nix/store/[a-z0-9.-]+/bin/bash,${pkgs.bash}/bin/bash,g' $HOOKS - sed -ri 's,/nix/store/[a-z0-9.-]+/bin/perl,${pkgs.perl}/bin/perl,g' $HOOKS - fi - ''; - - serviceConfig = { - Type = "simple"; - User = cfg.user; - Group = cfg.group; - WorkingDirectory = cfg.stateDir; - ExecStart = "${pkgs.gogs}/bin/gogs web"; - Restart = "always"; - UMask = "0027"; - }; - - environment = { - USER = cfg.user; - HOME = cfg.stateDir; - GOGS_WORK_DIR = cfg.stateDir; - }; - }; - - users = lib.mkIf (cfg.user == "gogs") { - users.gogs = { - description = "Go Git Service"; - uid = config.ids.uids.gogs; - group = "gogs"; - home = cfg.stateDir; - createHome = true; - shell = pkgs.bash; - }; - groups.gogs.gid = config.ids.gids.gogs; - }; - - warnings = lib.optional (cfg.database.password != "") - ''config.services.gogs.database.password will be stored as plaintext - in the Nix store. Use database.passwordFile instead.''; - - # Create database passwordFile default when password is configured. - services.gogs.database.passwordFile = - (lib.mkDefault (toString (pkgs.writeTextFile { - name = "gogs-database-password"; - text = cfg.database.password; - }))); - }; -} diff --git a/third_party/nixpkgs/nixos/modules/services/misc/redmine.nix b/third_party/nixpkgs/nixos/modules/services/misc/redmine.nix index 549228a4da..4cd2f35113 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/redmine.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/redmine.nix @@ -436,6 +436,30 @@ in TimeoutSec = "300"; WorkingDirectory = "${cfg.package}/share/redmine"; ExecStart="${bundle} exec rails server -u webrick -e production -b ${toString cfg.address} -p ${toString cfg.port} -P '${cfg.stateDir}/redmine.pid'"; + AmbientCapabilities = ""; + CapabilityBoundingSet = ""; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "noaccess"; + ProtectSystem = "full"; + RemoveIPC = true; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + UMask = 027; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/ups.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/ups.nix index 9361393d91..272f6f38f5 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/ups.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/ups.nix @@ -309,8 +309,10 @@ let defaultText = lib.literalMD '' { MINSUPPLIES = 1; - RUN_AS_USER = "root"; + MONITOR = NOTIFYCMD = "''${pkgs.nut}/bin/upssched"; + POWERDOWNFLAG = "/run/killpower"; + RUN_AS_USER = "root"; SHUTDOWNCMD = "''${pkgs.systemd}/bin/shutdown now"; } ''; @@ -330,11 +332,12 @@ let config = { enable = lib.mkDefault (lib.elem cfg.mode [ "standalone" "netserver" "netclient" ]); settings = { - RUN_AS_USER = "root"; # TODO: replace 'root' by another username. MINSUPPLIES = lib.mkDefault 1; - NOTIFYCMD = lib.mkDefault "${pkgs.nut}/bin/upssched"; - SHUTDOWNCMD = lib.mkDefault "${pkgs.systemd}/bin/shutdown now"; MONITOR = lib.flip lib.mapAttrsToList cfg.upsmon.monitor (name: monitor: with monitor; [ system powerValue user "\"@upsmon_password_${name}@\"" type ]); + NOTIFYCMD = lib.mkDefault "${pkgs.nut}/bin/upssched"; + POWERDOWNFLAG = lib.mkDefault "/run/killpower"; + RUN_AS_USER = "root"; # TODO: replace 'root' by another username. + SHUTDOWNCMD = lib.mkDefault "${pkgs.systemd}/bin/shutdown now"; }; }; }; @@ -574,6 +577,24 @@ in ]; }; + systemd.services.ups-killpower = lib.mkIf (cfg.upsmon.settings.POWERDOWNFLAG != null) { + enable = cfg.upsd.enable; + description = "UPS Kill Power"; + wantedBy = [ "shutdown.target" ]; + after = [ "shutdown.target" ]; + before = [ "final.target" ]; + unitConfig = { + ConditionPathExists = cfg.upsmon.settings.POWERDOWNFLAG; + DefaultDependencies = "no"; + }; + environment = envVars; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkgs.nut}/bin/upsdrvctl shutdown"; + Slice = "system-ups.slice"; + }; + }; + environment.etc = { "nut/nut.conf".source = pkgs.writeText "nut.conf" '' diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/saunafs.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/saunafs.nix new file mode 100644 index 0000000000..5c3c513c06 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/saunafs.nix @@ -0,0 +1,287 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.saunafs; + + settingsFormat = + let + listSep = " "; + allowedTypes = with lib.types; [ + bool + int + float + str + ]; + valueToString = + val: + if lib.isList val then + lib.concatStringsSep listSep (map (x: valueToString x) val) + else if lib.isBool val then + (if val then "1" else "0") + else + toString val; + + in + { + type = + let + valueType = + lib.types.oneOf ( + [ + (lib.types.listOf valueType) + ] + ++ allowedTypes + ) + // { + description = "Flat key-value file"; + }; + in + lib.types.attrsOf valueType; + + generate = + name: value: + pkgs.writeText name ( + lib.concatStringsSep "\n" (lib.mapAttrsToList (key: val: "${key} = ${valueToString val}") value) + ); + }; + + initTool = pkgs.writeShellScriptBin "sfsmaster-init" '' + if [ ! -e ${cfg.master.settings.DATA_PATH}/metadata.sfs ]; then + cp --update=none ${pkgs.saunafs}/var/lib/saunafs/metadata.sfs.empty ${cfg.master.settings.DATA_PATH}/metadata.sfs + chmod +w ${cfg.master.settings.DATA_PATH}/metadata.sfs + fi + ''; + + # master config file + masterCfg = settingsFormat.generate "sfsmaster.cfg" cfg.master.settings; + + # metalogger config file + metaloggerCfg = settingsFormat.generate "sfsmetalogger.cfg" cfg.metalogger.settings; + + # chunkserver config file + chunkserverCfg = settingsFormat.generate "sfschunkserver.cfg" cfg.chunkserver.settings; + + # generic template for all daemons + systemdService = name: extraConfig: configFile: { + wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; + after = [ + "network.target" + "network-online.target" + ]; + + serviceConfig = { + Type = "forking"; + ExecStart = "${pkgs.saunafs}/bin/sfs${name} -c ${configFile} start"; + ExecStop = "${pkgs.saunafs}/bin/sfs${name} -c ${configFile} stop"; + ExecReload = "${pkgs.saunafs}/bin/sfs${name} -c ${configFile} reload"; + } // extraConfig; + }; + +in +{ + ###### interface + + options = { + services.saunafs = { + masterHost = lib.mkOption { + type = lib.types.str; + default = null; + description = "IP or hostname name of master host."; + }; + + sfsUser = lib.mkOption { + type = lib.types.str; + default = "saunafs"; + description = "Run daemons as user."; + }; + + client.enable = lib.mkEnableOption "Saunafs client"; + + master = { + enable = lib.mkOption { + type = lib.types.bool; + description = '' + Enable Saunafs master daemon. + + You need to run `sfsmaster-init` on a freshly installed master server to + initialize the `DATA_PATH` directory. + ''; + default = false; + }; + + exports = lib.mkOption { + type = with lib.types; listOf str; + default = null; + description = "Paths to exports file (see {manpage}`sfsexports.cfg(5)`)."; + example = lib.literalExpression '' + [ "* / rw,alldirs,admin,maproot=0:0" ]; + ''; + }; + + openFirewall = lib.mkOption { + type = lib.types.bool; + description = "Whether to automatically open the necessary ports in the firewall."; + default = false; + }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = settingsFormat.type; + + options.DATA_PATH = lib.mkOption { + type = lib.types.str; + default = "/var/lib/saunafs/master"; + description = "Data storage directory."; + }; + }; + + description = "Contents of config file ({manpage}`sfsmaster.cfg(5)`)."; + }; + }; + + metalogger = { + enable = lib.mkEnableOption "Saunafs metalogger daemon"; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = settingsFormat.type; + + options.DATA_PATH = lib.mkOption { + type = lib.types.str; + default = "/var/lib/saunafs/metalogger"; + description = "Data storage directory"; + }; + }; + + description = "Contents of metalogger config file (see {manpage}`sfsmetalogger.cfg(5)`)."; + }; + }; + + chunkserver = { + enable = lib.mkEnableOption "Saunafs chunkserver daemon"; + + openFirewall = lib.mkOption { + type = lib.types.bool; + description = "Whether to automatically open the necessary ports in the firewall."; + default = false; + }; + + hdds = lib.mkOption { + type = with lib.types; listOf str; + default = null; + + example = lib.literalExpression '' + [ "/mnt/hdd1" ]; + ''; + + description = '' + Mount points to be used by chunkserver for storage (see {manpage}`sfshdd.cfg(5)`). + + Note, that these mount points must writeable by the user defined by the saunafs user. + ''; + }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = settingsFormat.type; + + options.DATA_PATH = lib.mkOption { + type = lib.types.str; + default = "/var/lib/saunafs/chunkserver"; + description = "Directory for chunck meta data"; + }; + }; + + description = "Contents of chunkserver config file (see {manpage}`sfschunkserver.cfg(5)`)."; + }; + }; + }; + }; + + ###### implementation + + config = + lib.mkIf (cfg.client.enable || cfg.master.enable || cfg.metalogger.enable || cfg.chunkserver.enable) + { + + warnings = [ + (lib.mkIf (cfg.sfsUser == "root") "Running saunafs services as root is not recommended.") + ]; + + # Service settings + services.saunafs = { + master.settings = lib.mkIf cfg.master.enable { + WORKING_USER = cfg.sfsUser; + EXPORTS_FILENAME = toString ( + pkgs.writeText "sfsexports.cfg" (lib.concatStringsSep "\n" cfg.master.exports) + ); + }; + + metalogger.settings = lib.mkIf cfg.metalogger.enable { + WORKING_USER = cfg.sfsUser; + MASTER_HOST = cfg.masterHost; + }; + + chunkserver.settings = lib.mkIf cfg.chunkserver.enable { + WORKING_USER = cfg.sfsUser; + MASTER_HOST = cfg.masterHost; + HDD_CONF_FILENAME = toString ( + pkgs.writeText "sfshdd.cfg" (lib.concatStringsSep "\n" cfg.chunkserver.hdds) + ); + }; + }; + + # Create system user account for daemons + users = + lib.mkIf + (cfg.sfsUser != "root" && (cfg.master.enable || cfg.metalogger.enable || cfg.chunkserver.enable)) + { + users."${cfg.sfsUser}" = { + isSystemUser = true; + description = "saunafs daemon user"; + group = "saunafs"; + }; + groups."${cfg.sfsUser}" = { }; + }; + + environment.systemPackages = + (lib.optional cfg.client.enable pkgs.saunafs) ++ (lib.optional cfg.master.enable initTool); + + networking.firewall.allowedTCPPorts = + (lib.optionals cfg.master.openFirewall [ + 9419 + 9420 + 9421 + ]) + ++ (lib.optional cfg.chunkserver.openFirewall 9422); + + # Ensure storage directories exist + systemd.tmpfiles.rules = + lib.optional cfg.master.enable "d ${cfg.master.settings.DATA_PATH} 0700 ${cfg.sfsUser} ${cfg.sfsUser} -" + ++ lib.optional cfg.metalogger.enable "d ${cfg.metalogger.settings.DATA_PATH} 0700 ${cfg.sfsUser} ${cfg.sfsUser} -" + ++ lib.optional cfg.chunkserver.enable "d ${cfg.chunkserver.settings.DATA_PATH} 0700 ${cfg.sfsUser} ${cfg.sfsUser} -"; + + # Service definitions + systemd.services.sfs-master = lib.mkIf cfg.master.enable ( + systemdService "master" { + TimeoutStartSec = 1800; + TimeoutStopSec = 1800; + Restart = "no"; + } masterCfg + ); + + systemd.services.sfs-metalogger = lib.mkIf cfg.metalogger.enable ( + systemdService "metalogger" { Restart = "on-abort"; } metaloggerCfg + ); + + systemd.services.sfs-chunkserver = lib.mkIf cfg.chunkserver.enable ( + systemdService "chunkserver" { Restart = "on-abort"; } chunkserverCfg + ); + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/atticd.nix b/third_party/nixpkgs/nixos/modules/services/networking/atticd.nix new file mode 100644 index 0000000000..3984c434c6 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/atticd.nix @@ -0,0 +1,234 @@ +{ + lib, + pkgs, + config, + ... +}: + +let + inherit (lib) types; + + cfg = config.services.atticd; + + format = pkgs.formats.toml { }; + + checkedConfigFile = + pkgs.runCommand "checked-attic-server.toml" + { + configFile = format.generate "server.toml" cfg.settings; + } + '' + export ATTIC_SERVER_TOKEN_RS256_SECRET_BASE64="$(${lib.getExe pkgs.openssl} genrsa -traditional 4096 | ${pkgs.coreutils}/bin/base64 -w0)" + export ATTIC_SERVER_DATABASE_URL="sqlite://:memory:" + ${lib.getExe cfg.package} --mode check-config -f $configFile + cat <$configFile >$out + ''; + + atticadmShim = pkgs.writeShellScript "atticadm" '' + if [ -n "$ATTICADM_PWD" ]; then + cd "$ATTICADM_PWD" + if [ "$?" != "0" ]; then + >&2 echo "Warning: Failed to change directory to $ATTICADM_PWD" + fi + fi + + exec ${cfg.package}/bin/atticadm -f ${checkedConfigFile} "$@" + ''; + + atticadmWrapper = pkgs.writeShellScriptBin "atticd-atticadm" '' + exec systemd-run \ + --quiet \ + --pipe \ + --pty \ + --same-dir \ + --wait \ + --collect \ + --service-type=exec \ + --property=EnvironmentFile=${cfg.environmentFile} \ + --property=DynamicUser=yes \ + --property=User=${cfg.user} \ + --property=Environment=ATTICADM_PWD=$(pwd) \ + --working-directory / \ + -- \ + ${atticadmShim} "$@" + ''; + + hasLocalPostgresDB = + let + url = cfg.settings.database.url or ""; + localStrings = [ + "localhost" + "127.0.0.1" + "/run/postgresql" + ]; + hasLocalStrings = lib.any (lib.flip lib.hasInfix url) localStrings; + in + config.services.postgresql.enable && lib.hasPrefix "postgresql://" url && hasLocalStrings; +in +{ + options = { + services.atticd = { + enable = lib.mkEnableOption "the atticd, the Nix Binary Cache server"; + + package = lib.mkPackageOption pkgs "attic-server" { }; + + environmentFile = lib.mkOption { + description = '' + Path to an EnvironmentFile containing required environment + variables: + + - ATTIC_SERVER_TOKEN_RS256_SECRET_BASE64: The base64-encoded RSA PEM PKCS1 of the + RS256 JWT secret. Generate it with `openssl genrsa -traditional 4096 | base64 -w0`. + ''; + type = types.nullOr types.path; + default = null; + }; + + user = lib.mkOption { + description = '' + The group under which attic runs. + ''; + type = types.str; + default = "atticd"; + }; + + group = lib.mkOption { + description = '' + The user under which attic runs. + ''; + type = types.str; + default = "atticd"; + }; + + settings = lib.mkOption { + description = '' + Structured configurations of atticd. + See https://github.com/zhaofengli/attic/blob/main/server/src/config-template.toml + ''; + type = format.type; + default = { }; + }; + + mode = lib.mkOption { + description = '' + Mode in which to run the server. + + 'monolithic' runs all components, and is suitable for single-node deployments. + + 'api-server' runs only the API server, and is suitable for clustering. + + 'garbage-collector' only runs the garbage collector periodically. + + A simple NixOS-based Attic deployment will typically have one 'monolithic' and any number of 'api-server' nodes. + + There are several other supported modes that perform one-off operations, but these are the only ones that make sense to run via the NixOS module. + ''; + type = lib.types.enum [ + "monolithic" + "api-server" + "garbage-collector" + ]; + default = "monolithic"; + }; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = cfg.environmentFile != null; + message = '' + is not set. + + Run `openssl genrsa -traditional 4096 | base64 -w0` and create a file with the following contents: + + ATTIC_SERVER_TOKEN_RS256_SECRET="output from command" + + Then, set `services.atticd.environmentFile` to the quoted absolute path of the file. + ''; + } + ]; + + services.atticd.settings = { + chunking = lib.mkDefault { + nar-size-threshold = 65536; + min-size = 16384; # 16 KiB + avg-size = 65536; # 64 KiB + max-size = 262144; # 256 KiB + }; + + database.url = lib.mkDefault "sqlite:///var/lib/atticd/server.db?mode=rwc"; + + # "storage" is internally tagged + # if the user sets something the whole thing must be replaced + storage = lib.mkDefault { + type = "local"; + path = "/var/lib/atticd/storage"; + }; + }; + + systemd.services.atticd = { + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ] ++ lib.optionals hasLocalPostgresDB [ "postgresql.service" ]; + requires = lib.optionals hasLocalPostgresDB [ "postgresql.service" ]; + wants = [ "network-online.target" ]; + + serviceConfig = { + ExecStart = "${lib.getExe cfg.package} -f ${checkedConfigFile} --mode ${cfg.mode}"; + EnvironmentFile = cfg.environmentFile; + StateDirectory = "atticd"; # for usage with local storage and sqlite + DynamicUser = true; + User = cfg.user; + Group = cfg.group; + Restart = "on-failure"; + RestartSec = 10; + + CapabilityBoundingSet = [ "" ]; + DeviceAllow = ""; + DevicePolicy = "closed"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + ReadWritePaths = + let + path = cfg.settings.storage.path; + isDefaultStateDirectory = path == "/var/lib/atticd" || lib.hasPrefix "/var/lib/atticd/" path; + in + lib.optionals (cfg.settings.storage.type or "" == "local" && !isDefaultStateDirectory) [ path ]; + RemoveIPC = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@resources" + "~@privileged" + ]; + UMask = "0077"; + }; + }; + + environment.systemPackages = [ + atticadmWrapper + ]; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/dhcpcd.nix b/third_party/nixpkgs/nixos/modules/services/networking/dhcpcd.nix index 50780a2473..a7c896cb28 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/dhcpcd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/dhcpcd.nix @@ -10,7 +10,7 @@ let enableDHCP = config.networking.dhcpcd.enable && (config.networking.useDHCP || lib.any (i: i.useDHCP == true) interfaces); - enableNTPService = (config.services.ntp.enable || config.services.ntpd-rs.enable || config.services.openntpd.enable || config.services.chrony.enable); + useResolvConf = config.networking.resolvconf.enable; # Don't start dhcpcd on explicitly configured interfaces or on # interfaces that are part of a bridge, bond or sit device. @@ -88,23 +88,6 @@ let ${cfg.extraConfig} ''; - exitHook = pkgs.writeText "dhcpcd.exit-hook" '' - ${lib.optionalString enableNTPService '' - if [ "$reason" = BOUND -o "$reason" = REBOOT ]; then - # Restart ntpd. We need to restart it to make sure that it will actually do something: - # if ntpd cannot resolve the server hostnames in its config file, then it will never do - # anything ever again ("couldn't resolve ..., giving up on it"), so we silently lose - # time synchronisation. This also applies to openntpd. - ${lib.optionalString config.services.ntp.enable "/run/current-system/systemd/bin/systemctl try-reload-or-restart ntpd.service || true"} - ${lib.optionalString config.services.ntpd-rs.enable "/run/current-system/systemd/bin/systemctl try-reload-or-restart ntpd-rs.service || true"} - ${lib.optionalString config.services.openntpd.enable "/run/current-system/systemd/bin/systemctl try-reload-or-restart openntpd.service || true"} - ${lib.optionalString config.services.chrony.enable "/run/current-system/systemd/bin/systemctl try-reload-or-restart chronyd.service || true"} - fi - ''} - - ${cfg.runHook} - ''; - in { @@ -181,6 +164,19 @@ in description = '' Shell code that will be run after all other hooks. See `man dhcpcd-run-hooks` for details on what is possible. + + ::: {.note} + To use sudo or similar tools in your script you may have to set: + + systemd.services.dhcpcd.serviceConfig.NoNewPrivileges = false; + + In addition, as most of the filesystem is inaccessible to dhcpcd + by default, you may want to define some exceptions, e.g. + + systemd.services.dhcpcd.serviceConfig.ReadOnlyPaths = [ + "/run/user/1000/bus" # to send desktop notifications + ]; + ::: ''; }; @@ -206,22 +202,6 @@ in config = lib.mkIf enableDHCP { - assertions = [ { - # dhcpcd doesn't start properly with malloc ∉ [ jemalloc libc mimalloc scudo ] - # see https://github.com/NixOS/nixpkgs/issues/151696 - assertion = - dhcpcd.enablePrivSep - -> lib.elem config.environment.memoryAllocator.provider [ "jemalloc" "libc" "mimalloc" "scudo" ]; - message = '' - dhcpcd with privilege separation is incompatible with chosen system malloc. - Currently `graphene-hardened` allocator is known to be broken. - To disable dhcpcd's privilege separation, overlay Nixpkgs and override dhcpcd - to set `enablePrivSep = false`. - ''; - } ]; - - environment.etc."dhcpcd.conf".source = dhcpcdConf; - systemd.services.dhcpcd = let cfgN = config.networking; hasDefaultGatewaySet = (cfgN.defaultGateway != null && cfgN.defaultGateway.address != "") @@ -230,10 +210,11 @@ in { description = "DHCP Client"; wantedBy = [ "multi-user.target" ] ++ lib.optional (!hasDefaultGatewaySet) "network-online.target"; - wants = [ "network.target" ]; + wants = [ "network.target" "resolvconf.service" ]; + after = [ "resolvconf.service" ]; before = [ "network-online.target" ]; - restartTriggers = lib.optional (enableNTPService || cfg.runHook != "") [ exitHook ]; + restartTriggers = [ cfg.runHook ]; # Stopping dhcpcd during a reconfiguration is undesirable # because it brings down the network interfaces configured by @@ -247,46 +228,64 @@ in serviceConfig = { Type = "forking"; PIDFile = "/run/dhcpcd/pid"; + SupplementaryGroups = lib.optional useResolvConf "resolvconf"; + User = "dhcpcd"; + Group = "dhcpcd"; + StateDirectory = "dhcpcd"; RuntimeDirectory = "dhcpcd"; + + ExecStartPre = "+${pkgs.writeShellScript "migrate-dhcpcd" '' + # migrate from old database directory + if test -f /var/db/dhcpcd/duid; then + echo 'migrating DHCP leases from /var/db/dhcpcd to /var/lib/dhcpcd ...' + mv /var/db/dhcpcd/* -t /var/lib/dhcpcd + chown dhcpcd:dhcpcd /var/lib/dhcpcd/* + rmdir /var/db/dhcpcd || true + echo done + fi + ''}"; + ExecStart = "@${dhcpcd}/sbin/dhcpcd dhcpcd --quiet ${lib.optionalString cfg.persistent "--persistent"} --config ${dhcpcdConf}"; ExecReload = "${dhcpcd}/sbin/dhcpcd --rebind"; Restart = "always"; - } // lib.optionalAttrs (cfg.runHook == "") { - # Proc filesystem - ProcSubset = "all"; - ProtectProc = "invisible"; - # Access write directories - UMask = "0027"; - # Capabilities - CapabilityBoundingSet = [ "CAP_NET_ADMIN" "CAP_NET_BIND_SERVICE" "CAP_NET_RAW" "CAP_SETGID" "CAP_SETUID" "CAP_SYS_CHROOT" ]; - # Security - NoNewPrivileges = true; - # Sandboxing - ProtectSystem = true; - ProtectHome = true; - PrivateTmp = true; - PrivateDevices = true; - PrivateUsers = false; - ProtectHostname = true; - ProtectClock = true; - ProtectKernelTunables = false; - ProtectKernelModules = true; - ProtectKernelLogs = true; - ProtectControlGroups = true; - RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" "AF_NETLINK" "AF_PACKET" ]; - RestrictNamespaces = true; + AmbientCapabilities = [ "CAP_NET_ADMIN" "CAP_NET_RAW" "CAP_NET_BIND_SERVICE" ]; + ReadWritePaths = [ "/proc/sys/net/ipv6" ] + ++ lib.optionals useResolvConf ([ "/run/resolvconf" ] ++ config.networking.resolvconf.subscriberFiles); + DeviceAllow = ""; LockPersonality = true; MemoryDenyWriteExecute = true; + NoNewPrivileges = lib.mkDefault true; # may be disabled for sudo in runHook + PrivateDevices = true; + PrivateMounts = true; + PrivateTmp = true; + PrivateUsers = false; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = "tmpfs"; # allow exceptions to be added to ReadOnlyPaths, etc. + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" "AF_NETLINK" "AF_PACKET" ]; + RestrictNamespaces = true; RestrictRealtime = true; RestrictSUIDSGID = true; - RemoveIPC = true; - PrivateMounts = true; - # System Call Filtering + SystemCallFilter = [ + "@system-service" + "~@aio" "~@chown" "~@keyring" "~@memlock" + ]; SystemCallArchitectures = "native"; - SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @resources" "chroot" "gettid" "setgroups" "setuid" ]; + UMask = "0027"; }; }; + # Note: the service could run with `DynamicUser`, however that makes + # impossible (for no good reason, see systemd issue #20495) to disable + # `NoNewPrivileges` or `ProtectHome`, which users may want to in order + # to run certain scripts in `networking.dhcpcd.runHook`. users.users.dhcpcd = { isSystemUser = true; group = "dhcpcd"; @@ -295,9 +294,7 @@ in environment.systemPackages = [ dhcpcd ]; - environment.etc."dhcpcd.exit-hook" = lib.mkIf (enableNTPService || cfg.runHook != "") { - source = exitHook; - }; + environment.etc."dhcpcd.exit-hook".text = cfg.runHook; powerManagement.resumeCommands = lib.mkIf config.systemd.services.dhcpcd.enable '' diff --git a/third_party/nixpkgs/nixos/modules/services/networking/dnsmasq.nix b/third_party/nixpkgs/nixos/modules/services/networking/dnsmasq.nix index 633e37ad25..dfa6b80351 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/dnsmasq.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/dnsmasq.nix @@ -133,6 +133,11 @@ in dnsmasq_conf=/etc/dnsmasq-conf.conf dnsmasq_resolv=/etc/dnsmasq-resolv.conf ''; + + subscriberFiles = [ + "/etc/dnsmasq-conf.conf" + "/etc/dnsmasq-resolv.conf" + ]; }; systemd.services.dnsmasq = { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/fedimintd.nix b/third_party/nixpkgs/nixos/modules/services/networking/fedimintd.nix index 1ede3a5055..c7d93854e2 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/fedimintd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/fedimintd.nix @@ -63,7 +63,7 @@ let }; url = mkOption { type = types.str; - example = "fedimint://p2p.myfedimint.com"; + example = "fedimint://p2p.myfedimint.com:8173"; description = '' Public address for p2p connections from peers ''; @@ -159,6 +159,12 @@ let example = "api.myfedimint.com"; description = "Public domain of the API address of the reverse proxy/tls terminator."; }; + path = mkOption { + type = types.str; + example = "/"; + default = "/ws/"; + description = "Path to host the API on and forward to the daemon's api port"; + }; config = mkOption { type = types.submodule ( recursiveUpdate (import ../web-servers/nginx/vhost-options.nix { @@ -286,8 +292,7 @@ in # overriden by default value from vhost-options.nix enableACME = mkOverride 99 true; forceSSL = mkOverride 99 true; - # Currently Fedimint API only support JsonRPC on `/ws/` endpoint, so no need to handle `/` - locations."/ws/" = { + locations.${cfg.nginx.path} = { proxyPass = "http://127.0.0.1:${toString cfg.api.port}/"; proxyWebsockets = true; extraConfig = '' diff --git a/third_party/nixpkgs/nixos/modules/services/networking/frr.nix b/third_party/nixpkgs/nixos/modules/services/networking/frr.nix index fd5673651f..a70d1dd655 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/frr.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/frr.nix @@ -1,10 +1,55 @@ { config, lib, pkgs, ... }: + let cfg = config.services.frr; - services = [ - "static" + daemons = [ + "bgpd" + "ospfd" + "ospf6d" + "ripd" + "ripngd" + "isisd" + "pimd" + "pim6d" + "ldpd" + "nhrpd" + "eigrpd" + "babeld" + "sharpd" + "pbrd" + "bfdd" + "fabricd" + "vrrpd" + "pathd" + ]; + + daemonDefaultOptions = { + zebra = "-A 127.0.0.1 -s 90000000"; + mgmtd = "-A 127.0.0.1"; + bgpd = "-A 127.0.0.1"; + ospfd = "-A 127.0.0.1"; + ospf6d = "-A ::1"; + ripd = "-A 127.0.0.1"; + ripngd = "-A ::1"; + isisd = "-A 127.0.0.1"; + pimd = "-A 127.0.0.1"; + pim6d = "-A ::1"; + ldpd = "-A 127.0.0.1"; + nhrpd = "-A 127.0.0.1"; + eigrpd = "-A 127.0.0.1"; + babeld = "-A 127.0.0.1"; + sharpd = "-A 127.0.0.1"; + pbrd = "-A 127.0.0.1"; + staticd = "-A 127.0.0.1"; + bfdd = "-A 127.0.0.1"; + fabricd = "-A 127.0.0.1"; + vrrpd = "-A 127.0.0.1"; + pathd = "-A 127.0.0.1"; + }; + + renamedServices = [ "bgp" "ospf" "ospf6" @@ -22,210 +67,194 @@ let "fabric" ]; - allServices = services ++ [ "zebra" "mgmt" ]; + obsoleteServices = renamedServices ++ [ "static" "mgmt" "zebra" ]; + + allDaemons = builtins.attrNames daemonDefaultOptions; isEnabled = service: cfg.${service}.enable; - daemonName = service: if service == "zebra" then service else "${service}d"; + daemonLine = d: "${d}=${if isEnabled d then "yes" else "no"}"; - configFile = service: - let - scfg = cfg.${service}; - in - if scfg.configFile != null then scfg.configFile - else pkgs.writeText "${daemonName service}.conf" - '' - ! FRR ${daemonName service} configuration - ! - hostname ${config.networking.hostName} - log syslog - service password-encryption - ! - ${scfg.config} - ! - end - ''; + configFile = + if cfg.configFile != null then + cfg.configFile + else + pkgs.writeText "frr.conf" '' + ! FRR configuration + ! + hostname ${config.networking.hostName} + log syslog + service password-encryption + service integrated-vtysh-config + ! + ${cfg.config} + ! + end + ''; - serviceOptions = service: + serviceOptions = + service: { - enable = lib.mkEnableOption "the FRR ${lib.toUpper service} routing protocol"; - - configFile = lib.mkOption { - type = lib.types.nullOr lib.types.path; - default = null; - example = "/etc/frr/${daemonName service}.conf"; + options = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ daemonDefaultOptions.${service} ]; description = '' - Configuration file to use for FRR ${daemonName service}. - By default the NixOS generated files are used. + Options for the FRR ${service} daemon. ''; }; - - config = lib.mkOption { - type = lib.types.lines; - default = ""; - example = - let - examples = { - rip = '' - router rip - network 10.0.0.0/8 - ''; - - ospf = '' - router ospf - network 10.0.0.0/8 area 0 - ''; - - bgp = '' - router bgp 65001 - neighbor 10.0.0.1 remote-as 65001 - ''; - }; - in - examples.${service} or ""; - description = '' - ${daemonName service} configuration statements. - ''; - }; - - vtyListenAddress = lib.mkOption { - type = lib.types.str; - default = "localhost"; - description = '' - Address to bind to for the VTY interface. - ''; - }; - - vtyListenPort = lib.mkOption { - type = lib.types.nullOr lib.types.int; - default = null; - description = '' - TCP Port to bind to for the VTY interface. - ''; - }; - extraOptions = lib.mkOption { type = lib.types.listOf lib.types.str; - default = []; + default = [ ]; description = '' - Extra options for the daemon. + Extra options to be appended to the FRR ${service} daemon options. ''; }; - }; + } + // (if (builtins.elem service daemons) then { enable = lib.mkEnableOption "FRR ${service}"; } else { }); in { ###### interface - imports = [ - { - options.services.frr = { - zebra = (serviceOptions "zebra") // { - enable = lib.mkOption { - type = lib.types.bool; - default = lib.any isEnabled services; + imports = + [ + { + options.services.frr = { + configFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + example = "/etc/frr/frr.conf"; description = '' - Whether to enable the Zebra routing manager. - - The Zebra routing manager is automatically enabled - if any routing protocols are configured. + Configuration file to use for FRR. + By default the NixOS generated files are used. + ''; + }; + config = lib.mkOption { + type = lib.types.lines; + default = ""; + example = '' + router rip + network 10.0.0.0/8 + router ospf + network 10.0.0.0/8 area 0 + router bgp 65001 + neighbor 10.0.0.1 remote-as 65001 + ''; + description = '' + FRR configuration statements. + ''; + }; + openFilesLimit = lib.mkOption { + type = lib.types.ints.unsigned; + default = 1024; + description = '' + This is the maximum number of FD's that will be available. Use a + reasonable value for your setup if you are expecting a large number + of peers in say BGP. ''; }; }; - mgmt = (serviceOptions "mgmt") // { - enable = lib.mkOption { - type = lib.types.bool; - default = isEnabled "static"; - defaultText = lib.literalExpression "config.services.frr.static.enable"; - description = '' - Whether to enable the Configuration management daemon. - - The Configuration management daemon is automatically - enabled if needed, at the moment this is when staticd - is enabled. - ''; - }; - }; - }; - } - { options.services.frr = (lib.genAttrs services serviceOptions); } - ]; + } + { options.services.frr = (lib.genAttrs allDaemons serviceOptions); } + (lib.mkRemovedOptionModule [ "services" "frr" "zebra" "enable" ] "FRR zebra is always enabled") + ] + ++ (map (d: lib.mkRenamedOptionModule [ "services" "frr" d "enable" ] [ "services" "frr" "${d}d" "enable" ]) renamedServices) + ++ (map (d: lib.mkRenamedOptionModule [ "services" "frr" d "extraOptions" ] [ "services" "frr" "${d}d" "extraOptions" ]) (renamedServices ++ [ "static" "mgmt" ])) + ++ (map (d: lib.mkRemovedOptionModule [ "services" "frr" d "enable" ] "FRR ${d}d is always enabled") [ "static" "mgmt" ]) + ++ (map (d: lib.mkRemovedOptionModule [ "services" "frr" d "config" ] "FRR switched to integrated-vtysh-config, please use services.frr.config") obsoleteServices) + ++ (map (d: lib.mkRemovedOptionModule [ "services" "frr" d "configFile" ] "FRR switched to integrated-vtysh-config, please use services.frr.config or services.frr.configFile") obsoleteServices) + ++ (map (d: lib.mkRemovedOptionModule [ "services" "frr" d "vtyListenAddress" ] "Please change -A option in services.frr.${d}.options instead") obsoleteServices) + ++ (map (d: lib.mkRemovedOptionModule [ "services" "frr" d "vtyListenPort" ] "Please use `-P «vtyListenPort»` option with services.frr.${d}.extraOptions instead, or change services.frr.${d}.options accordingly") obsoleteServices) + ; ###### implementation - config = lib.mkIf (lib.any isEnabled allServices) { - - environment.systemPackages = [ - pkgs.frr # for the vtysh tool - ]; - - users.users.frr = { - description = "FRR daemon user"; - isSystemUser = true; - group = "frr"; - }; - - users.groups = { - frr = {}; - # Members of the frrvty group can use vtysh to inspect the FRR daemons - frrvty = { members = [ "frr" ]; }; - }; - - environment.etc = let - mkEtcLink = service: { - name = "frr/${daemonName service}.conf"; - value.source = configFile service; - }; + config = + let + daemonList = lib.concatStringsSep "\n" (map daemonLine daemons); + daemonOptionLine = d: "${d}_options=\"${lib.concatStringsSep " " (cfg.${d}.options ++ cfg.${d}.extraOptions)}\""; + daemonOptions = lib.concatStringsSep "\n" (map daemonOptionLine allDaemons); in - (builtins.listToAttrs - (map mkEtcLink (lib.filter isEnabled allServices))) // { - "frr/vtysh.conf".text = ""; + lib.mkIf (lib.any isEnabled daemons || cfg.configFile != null || cfg.config != "") { + + environment.systemPackages = [ + pkgs.frr # for the vtysh tool + ]; + + users.users.frr = { + description = "FRR daemon user"; + isSystemUser = true; + group = "frr"; }; - systemd.tmpfiles.rules = [ - "d /run/frr 0750 frr frr -" - ]; + users.groups = { + frr = { }; + # Members of the frrvty group can use vtysh to inspect the FRR daemons + frrvty = { + members = [ "frr" ]; + }; + }; - systemd.services = - let - frrService = service: - let - scfg = cfg.${service}; - daemon = daemonName service; - in - lib.nameValuePair daemon ({ - wantedBy = [ "multi-user.target" ]; - after = [ "network-pre.target" "systemd-sysctl.service" ] ++ lib.optionals (service != "zebra") [ "zebra.service" ]; - bindsTo = lib.optionals (service != "zebra") [ "zebra.service" ]; - wants = [ "network.target" ]; + environment.etc = { + "frr/frr.conf".source = configFile; + "frr/vtysh.conf".text = '' + service integrated-vtysh-config + ''; + "frr/daemons".text = '' + # This file tells the frr package which daemons to start. + # + # The watchfrr, zebra and staticd daemons are always started. + # + # This part is auto-generated from services.frr..enable config + ${daemonList} - description = if service == "zebra" then "FRR Zebra routing manager" - else "FRR ${lib.toUpper service} routing daemon"; + # If this option is set the /etc/init.d/frr script automatically loads + # the config via "vtysh -b" when the servers are started. + # + vtysh_enable=yes - unitConfig.Documentation = if service == "zebra" then "man:zebra(8)" - else "man:${daemon}(8) man:zebra(8)"; + # This part is auto-generated from services.frr..options or + # services.frr..extraOptions + ${daemonOptions} + ''; + }; - restartTriggers = lib.mkIf (service != "mgmt") [ - (configFile service) - ]; - reloadIfChanged = (service != "mgmt"); + systemd.tmpfiles.rules = [ "d /run/frr 0750 frr frr -" ]; - serviceConfig = { - PIDFile = "frr/${daemon}.pid"; - ExecStart = "${pkgs.frr}/libexec/frr/${daemon}" - + lib.optionalString (scfg.vtyListenAddress != "") " -A ${scfg.vtyListenAddress}" - + lib.optionalString (scfg.vtyListenPort != null) " -P ${toString scfg.vtyListenPort}" - + " " + (lib.concatStringsSep " " scfg.extraOptions); - ExecReload = lib.mkIf (service != "mgmt") "${pkgs.python3.interpreter} ${pkgs.frr}/libexec/frr/frr-reload.py --reload --daemon ${daemon} --bindir ${pkgs.frr}/bin --rundir /run/frr /etc/frr/${daemon}.conf"; - Restart = "on-abnormal"; - }; - }); - in - lib.listToAttrs (map frrService (lib.filter isEnabled allServices)); - - }; + systemd.services.frr = { + description = "FRRouting"; + documentation = [ "https://frrouting.readthedocs.io/en/latest/setup.html" ]; + wants = [ "network.target" ]; + after = [ + "network-pre.target" + "systemd-sysctl.service" + ]; + before = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + startLimitIntervalSec = 180; + reloadIfChanged = true; + restartTriggers = [ + configFile + daemonList + ]; + serviceConfig = { + Nice = -5; + Type = "forking"; + NotifyAccess = "all"; + StartLimitBurst = "3"; + TimeoutSec = 120; + WatchdogSec = 60; + RestartSec = 5; + Restart = "always"; + LimitNOFILE = cfg.openFilesLimit; + PIDFile = "/run/frr/watchfrr.pid"; + ExecStart = "${pkgs.frr}/libexec/frr/frrinit.sh start"; + ExecStop = "${pkgs.frr}/libexec/frr/frrinit.sh stop"; + ExecReload = "${pkgs.frr}/libexec/frr/frrinit.sh reload"; + }; + }; + }; meta.maintainers = with lib.maintainers; [ woffs ]; - } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/headscale.nix b/third_party/nixpkgs/nixos/modules/services/networking/headscale.nix index 622a13fe7b..9261ec03c5 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/headscale.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/headscale.nix @@ -20,6 +20,11 @@ settingsFormat = pkgs.formats.yaml {}; configFile = settingsFormat.generate "headscale.yaml" cfg.settings; cliConfigFile = settingsFormat.generate "headscale.yaml" cliConfig; + + assertRemovedOption = option: message: { + assertion = !lib.hasAttrByPath option cfg; + message = "The option `services.headscale.${lib.options.showOption option}` was removed. " + message; + }; in { options = { services.headscale = { @@ -82,21 +87,6 @@ in { type = lib.types.submodule { freeformType = settingsFormat.type; - imports = with lib; [ - (mkAliasOptionModule ["acl_policy_path"] ["policy" "path"]) - (mkAliasOptionModule ["db_host"] ["database" "postgres" "host"]) - (mkAliasOptionModule ["db_name"] ["database" "postgres" "name"]) - (mkAliasOptionModule ["db_password_file"] ["database" "postgres" "password_file"]) - (mkAliasOptionModule ["db_path"] ["database" "sqlite" "path"]) - (mkAliasOptionModule ["db_port"] ["database" "postgres" "port"]) - (mkAliasOptionModule ["db_type"] ["database" "type"]) - (mkAliasOptionModule ["db_user"] ["database" "postgres" "user"]) - (mkAliasOptionModule ["dns_config" "base_domain"] ["dns" "base_domain"]) - (mkAliasOptionModule ["dns_config" "domains"] ["dns" "search_domains"]) - (mkAliasOptionModule ["dns_config" "magic_dns"] ["dns" "magic_dns"]) - (mkAliasOptionModule ["dns_config" "nameservers"] ["dns" "nameservers" "global"]) - ]; - options = { server_url = lib.mkOption { type = lib.types.str; @@ -299,7 +289,6 @@ in { default = true; description = '' Whether to use [MagicDNS](https://tailscale.com/kb/1081/magicdns/). - Only works if there is at least a nameserver defined. ''; example = false; }; @@ -309,11 +298,13 @@ in { default = ""; description = '' Defines the base domain to create the hostnames for MagicDNS. - {option}`baseDomain` must be a FQDNs, without the trailing dot. - The FQDN of the hosts will be - `hostname.namespace.base_domain` (e.g. - `myhost.mynamespace.example.com`). + This domain must be different from the {option}`server_url` + domain. + {option}`base_domain` must be a FQDN, without the trailing dot. + The FQDN of the hosts will be `hostname.base_domain` (e.g. + `myhost.tailnet.example.com`). ''; + example = "tailnet.example.com"; }; nameservers = { @@ -500,6 +491,30 @@ in { ]; config = lib.mkIf cfg.enable { + assertions = [ + { + # This is stricter than it needs to be but is exactly what upstream does: + # https://github.com/kradalby/headscale/blob/adc084f20f843d7963c999764fa83939668d2d2c/hscontrol/types/config.go#L799 + assertion = with cfg.settings; dns.use_username_in_magic_dns or false || dns.base_domain == "" || !lib.hasInfix dns.base_domain server_url; + message = "server_url cannot contain the base_domain, this will cause the headscale server and embedded DERP to become unreachable from the Tailscale node."; + } + { + assertion = with cfg.settings; dns.magic_dns -> dns.base_domain != ""; + message = "dns.base_domain must be set when using MagicDNS"; + } + (assertRemovedOption ["settings" "acl_policy_path"] "Use `policy.path` instead.") + (assertRemovedOption ["settings" "db_host"] "Use `database.postgres.host` instead.") + (assertRemovedOption ["settings" "db_name"] "Use `database.postgres.name` instead.") + (assertRemovedOption ["settings" "db_password_file"] "Use `database.postgres.password_file` instead.") + (assertRemovedOption ["settings" "db_path"] "Use `database.sqlite.path` instead.") + (assertRemovedOption ["settings" "db_port"] "Use `database.postgres.port` instead.") + (assertRemovedOption ["settings" "db_type"] "Use `database.type` instead.") + (assertRemovedOption ["settings" "db_user"] "Use `database.postgres.user` instead.") + (assertRemovedOption ["settings" "dns_config"] "Use `dns` instead.") + (assertRemovedOption ["settings" "dns_config" "domains"] "Use `dns.search_domains` instead.") + (assertRemovedOption ["settings" "dns_config" "nameservers"] "Use `dns.nameservers.global` instead.") + ]; + services.headscale.settings = lib.mkMerge [ cliConfig { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/knot.nix b/third_party/nixpkgs/nixos/modules/services/networking/knot.nix index 145b4ad1dd..d174edb0fc 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/knot.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/knot.nix @@ -337,6 +337,7 @@ in { SystemCallFilter = [ "@system-service" "~@privileged" + "@chown" ] ++ optionals (cfg.enableXDP) [ "bpf" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/kresd.nix b/third_party/nixpkgs/nixos/modules/services/networking/kresd.nix index 892f863aac..4c1d6c50d8 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/kresd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/kresd.nix @@ -62,6 +62,7 @@ in { default = ""; description = '' Extra lines to be added verbatim to the generated configuration file. + See upstream documentation for more details. ''; }; listenPlain = lib.mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix b/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix index 85676d29f2..c47a684571 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix @@ -349,6 +349,7 @@ in RestrictRealtime = true; SystemCallArchitectures = "native"; SystemCallFilter = "@system-service"; + UMask = 027; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/resilio.nix b/third_party/nixpkgs/nixos/modules/services/networking/resilio.nix index 02773d78b1..f9c682f168 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/resilio.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/resilio.nix @@ -5,8 +5,6 @@ with lib; let cfg = config.services.resilio; - resilioSync = pkgs.resilio-sync; - sharedFoldersRecord = map (entry: { dir = entry.directory; @@ -83,6 +81,8 @@ in ''; }; + package = mkPackageOption pkgs "resilio-sync" { }; + deviceName = mkOption { type = types.str; example = "Voltron"; @@ -285,7 +285,7 @@ in RuntimeDirectory = "rslsync"; ExecStartPre = "${createConfig}/bin/create-resilio-config"; ExecStart = '' - ${resilioSync}/bin/rslsync --nodaemon --config ${runConfigPath} + ${lib.getExe cfg.package} --nodaemon --config ${runConfigPath} ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/shorewall.nix b/third_party/nixpkgs/nixos/modules/services/networking/shorewall.nix index 05087aaa8b..8d05543e90 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/shorewall.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/shorewall.nix @@ -58,7 +58,7 @@ in { install -D -d -m 750 /var/lib/shorewall install -D -d -m 755 /var/lock/subsys touch /var/log/shorewall.log - chown 750 /var/log/shorewall.log + chmod 750 /var/log/shorewall.log ''; }; environment = { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/shorewall6.nix b/third_party/nixpkgs/nixos/modules/services/networking/shorewall6.nix index 1eab3284d1..3088e59fa9 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/shorewall6.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/shorewall6.nix @@ -58,7 +58,7 @@ in { install -D -d -m 750 /var/lib/shorewall6 install -D -d -m 755 /var/lock/subsys touch /var/log/shorewall6.log - chown 750 /var/log/shorewall6.log + chmod 750 /var/log/shorewall6.log ''; }; environment = { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/zapret.nix b/third_party/nixpkgs/nixos/modules/services/networking/zapret.nix new file mode 100644 index 0000000000..53309b0469 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/zapret.nix @@ -0,0 +1,159 @@ +{ + lib, + config, + pkgs, + ... +}: +let + cfg = config.services.zapret; + + whitelist = lib.optionalString ( + cfg.whitelist != null + ) "--hostlist ${pkgs.writeText "zapret-whitelist" (lib.concatStringsSep "\n" cfg.whitelist)}"; + + blacklist = + lib.optionalString (cfg.blacklist != null) + "--hostlist-exclude ${pkgs.writeText "zapret-blacklist" (lib.concatStringsSep "\n" cfg.blacklist)}"; + + ports = if cfg.httpSupport then "80,443" else "443"; +in +{ + options.services.zapret = { + enable = lib.mkEnableOption "the Zapret DPI bypass service."; + package = lib.mkPackageOption pkgs "zapret" { }; + params = lib.mkOption { + default = [ ]; + type = with lib.types; listOf str; + example = '' + [ + "--dpi-desync=fake,disorder2" + "--dpi-desync-ttl=1" + "--dpi-desync-autottl=2" + ]; + ''; + description = '' + Specify the bypass parameters for Zapret binary. + There are no universal parameters as they vary between different networks, so you'll have to find them yourself. + + This can be done by running the `blockcheck` binary from zapret package, i.e. `nix-shell -p zapret --command blockcheck`. + It'll try different params and then tell you which params are working for your network. + ''; + }; + whitelist = lib.mkOption { + default = null; + type = with lib.types; nullOr (listOf str); + example = '' + [ + "youtube.com" + "googlevideo.com" + "ytimg.com" + "youtu.be" + ] + ''; + description = '' + Specify a list of domains to bypass. All other domains will be ignored. + You can specify either whitelist or blacklist, but not both. + If neither are specified, then bypass all domains. + + It is recommended to specify the whitelist. This will make sure that other resources won't be affected by this service. + ''; + }; + blacklist = lib.mkOption { + default = null; + type = with lib.types; nullOr (listOf str); + example = '' + [ + "example.com" + ] + ''; + description = '' + Specify a list of domains NOT to bypass. All other domains will be bypassed. + You can specify either whitelist or blacklist, but not both. + If neither are specified, then bypass all domains. + ''; + }; + qnum = lib.mkOption { + default = 200; + type = lib.types.int; + description = '' + Routing queue number. + Only change this if you already use the default queue number somewhere else. + ''; + }; + configureFirewall = lib.mkOption { + default = true; + type = lib.types.bool; + description = '' + Whether to setup firewall routing so that system http(s) traffic is forwarded via this service. + Disable if you want to set it up manually. + ''; + }; + httpSupport = lib.mkOption { + default = true; + type = lib.types.bool; + description = '' + Whether to route http traffic on port 80. + Http bypass rarely works and you might want to disable it if you don't utilise http connections. + ''; + }; + }; + + config = lib.mkIf cfg.enable ( + lib.mkMerge [ + { + assertions = [ + { + assertion = (cfg.whitelist == null) || (cfg.blacklist == null); + message = "Can't specify both whitelist and blacklist."; + } + { + assertion = (builtins.length cfg.params) != 0; + message = "You have to specify zapret parameters. See the params option's description."; + } + ]; + + systemd.services.zapret = { + description = "DPI bypass service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + ExecStart = "${cfg.package}/bin/nfqws --pidfile=/run/nfqws.pid ${lib.concatStringsSep " " cfg.params} ${whitelist} ${blacklist} --qnum=${toString cfg.qnum}"; + Type = "simple"; + PIDFile = "/run/nfqws.pid"; + Restart = "always"; + RuntimeMaxSec = "1h"; # This service loves to crash silently or cause network slowdowns. It also restarts instantly. In my experience restarting it hourly provided the best experience. + + # hardening + DevicePolicy = "closed"; + KeyringMode = "private"; + PrivateTmp = true; + PrivateMounts = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectSystem = "strict"; + ProtectProc = "invisible"; + RemoveIPC = true; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + }; + }; + } + + # Route system traffic via service for specified ports. + (lib.mkIf cfg.configureFirewall { + networking.firewall.extraCommands = '' + iptables -t mangle -I POSTROUTING -p tcp -m multiport --dports ${ports} -m connbytes --connbytes-dir=original --connbytes-mode=packets --connbytes 1:6 -m mark ! --mark 0x40000000/0x40000000 -j NFQUEUE --queue-num ${toString cfg.qnum} --queue-bypass + ''; + }) + ] + ); + + meta.maintainers = with lib.maintainers; [ + voronind + nishimara + ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/system/automatic-timezoned.nix b/third_party/nixpkgs/nixos/modules/services/system/automatic-timezoned.nix index 6150aa22cf..50f84f39af 100644 --- a/third_party/nixpkgs/nixos/modules/services/system/automatic-timezoned.nix +++ b/third_party/nixpkgs/nixos/modules/services/system/automatic-timezoned.nix @@ -16,6 +16,11 @@ in timezone up-to-date based on the current location. It uses geoclue2 to determine the current location and systemd-timedated to actually set the timezone. + + To avoid silent overriding by the service, if you have explicitly set a + timezone, either remove it or ensure that it is set with a lower priority + than the default value using `lib.mkDefault` or `lib.mkOverride`. This is + to make the choice deliberate. An error will be presented otherwise. ''; }; package = mkPackageOption pkgs "automatic-timezoned" { }; @@ -23,6 +28,10 @@ in }; config = mkIf cfg.enable { + # This will give users an error if they have set an explicit time + # zone, rather than having the service silently override it. + time.timeZone = null; + security.polkit.extraConfig = '' polkit.addRule(function(action, subject) { if (action.id == "org.freedesktop.timedate1.set-timezone" diff --git a/third_party/nixpkgs/nixos/modules/services/system/localtimed.nix b/third_party/nixpkgs/nixos/modules/services/system/localtimed.nix index bd83d227aa..70d65f4d2b 100644 --- a/third_party/nixpkgs/nixos/modules/services/system/localtimed.nix +++ b/third_party/nixpkgs/nixos/modules/services/system/localtimed.nix @@ -16,6 +16,11 @@ in { Enable `localtimed`, a simple daemon for keeping the system timezone up-to-date based on the current location. It uses geoclue2 to determine the current location. + + To avoid silent overriding by the service, if you have explicitly set a + timezone, either remove it or ensure that it is set with a lower priority + than the default value using `lib.mkDefault` or `lib.mkOverride`. This is + to make the choice deliberate. An error will be presented otherwise. ''; }; package = mkPackageOption pkgs "localtime" { }; @@ -24,6 +29,10 @@ in { }; config = mkIf cfg.enable { + # This will give users an error if they have set an explicit time + # zone, rather than having the service silently override it. + time.timeZone = null; + services.geoclue2.appConfig.localtimed = { isAllowed = true; isSystem = true; diff --git a/third_party/nixpkgs/nixos/modules/services/system/userborn.nix b/third_party/nixpkgs/nixos/modules/services/system/userborn.nix index 07e8be3426..bd3f2175b1 100644 --- a/third_party/nixpkgs/nixos/modules/services/system/userborn.nix +++ b/third_party/nixpkgs/nixos/modules/services/system/userborn.nix @@ -100,7 +100,7 @@ in lib.nameValuePair (toString opts.home) { d = { mode = opts.homeMode; - user = username; + user = opts.name; inherit (opts) group; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/video/go2rtc/default.nix b/third_party/nixpkgs/nixos/modules/services/video/go2rtc/default.nix index 3121ce4737..f74c172907 100644 --- a/third_party/nixpkgs/nixos/modules/services/video/go2rtc/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/video/go2rtc/default.nix @@ -55,8 +55,8 @@ in ffmpeg = { bin = mkOption { type = path; - default = lib.getExe pkgs.ffmpeg_7-headless; - defaultText = literalExpression "lib.getExe pkgs.ffmpeg_7-headless"; + default = lib.getExe pkgs.ffmpeg-headless; + defaultText = literalExpression "lib.getExe pkgs.ffmpeg-headless"; description = '' The ffmpeg package to use for transcoding. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/wayland/hypridle.nix b/third_party/nixpkgs/nixos/modules/services/wayland/hypridle.nix index ee35812fd4..231a0b7f93 100644 --- a/third_party/nixpkgs/nixos/modules/services/wayland/hypridle.nix +++ b/third_party/nixpkgs/nixos/modules/services/wayland/hypridle.nix @@ -17,7 +17,10 @@ in config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; - systemd.packages = [ cfg.package ]; + systemd = { + packages = [ cfg.package ]; + user.services.hypridle.wantedBy = [ "graphical-session.target" ]; + }; }; meta.maintainers = with lib.maintainers; [ johnrtitor ]; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix index a075070f38..b288a08efd 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix @@ -49,10 +49,10 @@ let in if isString v then toPhpString v # NOTE: If any value contains a , (comma) this will not get escaped - else if isList v && any lib.strings.isCoercibleToString v then toPhpString (concatMapStringsSep "," toString v) + else if isList v && strings.isConvertibleWithToString v then toPhpString (concatMapStringsSep "," toString v) else if isInt v then toString v else if isBool v then toString (if v then 1 else 0) - else if isHasAttr "_file" then "trim(file_get_contents(${toPhpString v._file}))" + else if isHasAttr "_file" then "trim(file_get_contents(${toPhpString (toString v._file)}))" else if isHasAttr "_raw" then v._raw else abort "The dokuwiki localConf value ${lib.generators.toPretty {} v} can not be encoded." ; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/freshrss.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/freshrss.nix index 9a65566765..9622913fec 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/freshrss.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/freshrss.nix @@ -4,8 +4,6 @@ with lib; let cfg = config.services.freshrss; - poolName = "freshrss"; - extension-env = pkgs.buildEnv { name = "freshrss-extensions"; paths = cfg.extensions; @@ -141,8 +139,8 @@ in }; pool = mkOption { - type = types.str; - default = poolName; + type = types.nullOr types.str; + default = "freshrss"; description = '' Name of the php-fpm pool to use and setup. If not specified, a pool will be created with default values. @@ -235,8 +233,8 @@ in }; # Set up phpfpm pool - services.phpfpm.pools = mkIf (cfg.pool == poolName) { - ${poolName} = { + services.phpfpm.pools = mkIf (cfg.pool != null) { + ${cfg.pool} = { user = "freshrss"; settings = { "listen.owner" = "nginx"; @@ -271,9 +269,9 @@ in let settingsFlags = concatStringsSep " \\\n " (mapAttrsToList (k: v: "${k} ${toString v}") { - "--default_user" = ''"${cfg.defaultUser}"''; - "--auth_type" = ''"${cfg.authType}"''; - "--base_url" = ''"${cfg.baseUrl}"''; + "--default-user" = ''"${cfg.defaultUser}"''; + "--auth-type" = ''"${cfg.authType}"''; + "--base-url" = ''"${cfg.baseUrl}"''; "--language" = ''"${cfg.language}"''; "--db-type" = ''"${cfg.database.type}"''; # The following attributes are optional depending on the type of diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/gerrit.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/gerrit.nix index 573c9d0d7d..acb2dfeeff 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/gerrit.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/gerrit.nix @@ -222,6 +222,27 @@ in StandardOutput = "journal"; StateDirectory = "gerrit"; WorkingDirectory = "%S/gerrit"; + AmbientCapabilities = ""; + CapabilityBoundingSet = ""; + LockPersonality = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "noaccess"; + ProtectSystem = "full"; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + UMask = 027; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/immich.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/immich.nix index c1a30c6ff2..7973adccb7 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/immich.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/immich.nix @@ -91,7 +91,7 @@ in }; port = mkOption { type = types.port; - default = 3001; + default = 2283; description = "The port that immich will listen on."; }; openFirewall = mkOption { @@ -227,7 +227,6 @@ in services.redis.servers = mkIf cfg.redis.enable { immich = { enable = true; - user = cfg.user; port = cfg.redis.port; bind = mkIf (!isRedisUnixSocket) cfg.redis.host; }; @@ -286,6 +285,10 @@ in RuntimeDirectory = "immich"; User = cfg.user; Group = cfg.group; + # ensure that immich-server has permission to connect to the redis socket. + SupplementaryGroups = mkIf (cfg.redis.enable && isRedisUnixSocket) [ + config.services.redis.servers.immich.group + ]; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/invoiceplane.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/invoiceplane.nix index 9a9f180b21..b60dbe3f7b 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/invoiceplane.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/invoiceplane.nix @@ -31,7 +31,7 @@ let mkPhpValue = v: if isString v then escapeShellArg v # NOTE: If any value contains a , (comma) this will not get escaped - else if isList v && any lib.strings.isCoercibleToString v then escapeShellArg (concatMapStringsSep "," toString v) + else if isList v && strings.isConvertibleWithToString v then escapeShellArg (concatMapStringsSep "," toString v) else if isInt v then toString v else if isBool v then boolToString v else abort "The Invoiceplane config value ${lib.generators.toPretty {} v} can not be encoded." diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix index 5c383e9f16..a3a2bbd1ec 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix @@ -12,9 +12,12 @@ let RAILS_ENV = "production"; NODE_ENV = "production"; + BOOTSNAP_CACHE_DIR="/var/cache/mastodon/precompile"; LD_PRELOAD = "${pkgs.jemalloc}/lib/libjemalloc.so"; - # mastodon-web concurrency. + MASTODON_USE_LIBVIPS = "true"; + + # Concurrency mastodon-web WEB_CONCURRENCY = toString cfg.webProcesses; MAX_THREADS = toString cfg.webThreads; @@ -24,7 +27,7 @@ let DB_NAME = cfg.database.name; LOCAL_DOMAIN = cfg.localDomain; SMTP_SERVER = cfg.smtp.host; - SMTP_PORT = toString(cfg.smtp.port); + SMTP_PORT = toString cfg.smtp.port; SMTP_FROM_ADDRESS = cfg.smtp.fromAddress; PAPERCLIP_ROOT_PATH = "/var/lib/mastodon/public-system"; PAPERCLIP_ROOT_URL = "/system"; @@ -33,12 +36,12 @@ let TRUSTED_PROXY_IP = cfg.trustedProxy; } // lib.optionalAttrs (cfg.redis.host != null) { REDIS_HOST = cfg.redis.host; } - // lib.optionalAttrs (cfg.redis.port != null) { REDIS_PORT = toString(cfg.redis.port); } + // lib.optionalAttrs (cfg.redis.port != null) { REDIS_PORT = toString cfg.redis.port; } // lib.optionalAttrs (cfg.redis.createLocally && cfg.redis.enableUnixSocket) { REDIS_URL = "unix://${config.services.redis.servers.mastodon.unixSocket}"; } // lib.optionalAttrs (cfg.database.host != "/run/postgresql" && cfg.database.port != null) { DB_PORT = toString cfg.database.port; } // lib.optionalAttrs cfg.smtp.authenticate { SMTP_LOGIN = cfg.smtp.user; } // lib.optionalAttrs (cfg.elasticsearch.host != null) { ES_HOST = cfg.elasticsearch.host; } - // lib.optionalAttrs (cfg.elasticsearch.host != null) { ES_PORT = toString(cfg.elasticsearch.port); } + // lib.optionalAttrs (cfg.elasticsearch.host != null) { ES_PORT = toString cfg.elasticsearch.port; } // lib.optionalAttrs (cfg.elasticsearch.host != null) { ES_PRESET = cfg.elasticsearch.preset; } // lib.optionalAttrs (cfg.elasticsearch.user != null) { ES_USER = cfg.elasticsearch.user; } // cfg.extraConfig; @@ -51,6 +54,9 @@ let Group = cfg.group; # Working directory WorkingDirectory = cfg.package; + # Cache directory and mode + CacheDirectory = "mastodon"; + CacheDirectoryMode = "0750"; # State directory and mode StateDirectory = "mastodon"; StateDirectoryMode = "0750"; @@ -127,7 +133,7 @@ let description = "Mastodon sidekiq${jobClassLabel}"; wantedBy = [ "mastodon.target" ]; environment = env // { - PORT = toString(cfg.sidekiqPort); + PORT = toString cfg.sidekiqPort; DB_POOL = threads; }; serviceConfig = { @@ -309,7 +315,7 @@ in { Voluntary Application Server Identification. A new keypair can be generated by running: - `nix build -f '' mastodon; cd result; bin/rake webpush:generate_keys` + `nix build -f '' mastodon; cd result; RAILS_ENV=production bin/rake webpush:generate_keys` If {option}`mastodon.vapidPrivateKeyFile`does not exist, it and this file will be created with a new keypair. @@ -324,12 +330,57 @@ in { type = lib.types.str; }; + activeRecordEncryptionDeterministicKeyFile = lib.mkOption { + description = '' + This key must be set to enable the Active Record Encryption feature within + Rails that Mastodon uses to encrypt and decrypt some database attributes. + A new Active Record keys can be generated by running: + + `nix build -f '' mastodon; cd result; RAILS_ENV=production ./bin/rails db:encryption:init` + + If this file does not exist, it will be created with a new Active Record + keys. + ''; + default = "/var/lib/mastodon/secrets/active-record-encryption-deterministic-key"; + type = lib.types.str; + }; + + activeRecordEncryptionKeyDerivationSaltFile = lib.mkOption { + description = '' + This key must be set to enable the Active Record Encryption feature within + Rails that Mastodon uses to encrypt and decrypt some database attributes. + A new Active Record keys can be generated by running: + + `nix build -f '' mastodon; cd result; RAILS_ENV=production ./bin/rails db:encryption:init` + + If this file does not exist, it will be created with a new Active Record + keys. + ''; + default = "/var/lib/mastodon/secrets/active-record-encryption-key-derivation-salt"; + type = lib.types.str; + }; + + activeRecordEncryptionPrimaryKeyFile = lib.mkOption { + description = '' + This key must be set to enable the Active Record Encryption feature within + Rails that Mastodon uses to encrypt and decrypt some database attributes. + A new Active Record keys can be generated by running: + + `nix build -f '' mastodon; cd result; RAILS_ENV=production ./bin/rails db:encryption:init` + + If this file does not exist, it will be created with a new Active Record + keys. + ''; + default = "/var/lib/mastodon/secrets/active-record-encryption-primary-key"; + type = lib.types.str; + }; + secretKeyBaseFile = lib.mkOption { description = '' Path to file containing the secret key base. A new secret key base can be generated by running: - `nix build -f '' mastodon; cd result; bin/rake secret` + `nix build -f '' mastodon; cd result; bin/bundle exec rails secret` If this file does not exist, it will be created with a new secret key base. ''; @@ -342,7 +393,7 @@ in { Path to file containing the OTP secret. A new OTP secret can be generated by running: - `nix build -f '' mastodon; cd result; bin/rake secret` + `nix build -f '' mastodon; cd result; bin/bundle exec rails secret` If this file does not exist, it will be created with a new OTP secret. ''; @@ -708,13 +759,28 @@ in { script = '' umask 077 + if ! test -d /var/cache/mastodon/precompile; then + ${cfg.package}/bin/bundle exec bootsnap precompile --gemfile ${cfg.package}/app ${cfg.package}/lib + fi + if ! test -f ${cfg.activeRecordEncryptionDeterministicKeyFile}; then + mkdir -p $(dirname ${cfg.activeRecordEncryptionDeterministicKeyFile}) + bin/rails db:encryption:init | grep --only-matching "ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=[^ ]\+" | sed 's/^ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=//' > ${cfg.activeRecordEncryptionDeterministicKeyFile} + fi + if ! test -f ${cfg.activeRecordEncryptionKeyDerivationSaltFile}; then + mkdir -p $(dirname ${cfg.activeRecordEncryptionKeyDerivationSaltFile}) + bin/rails db:encryption:init | grep --only-matching "ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=[^ ]\+" | sed 's/^ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=//' > ${cfg.activeRecordEncryptionKeyDerivationSaltFile} + fi + if ! test -f ${cfg.activeRecordEncryptionPrimaryKeyFile}; then + mkdir -p $(dirname ${cfg.activeRecordEncryptionPrimaryKeyFile}) + bin/rails db:encryption:init | grep --only-matching "ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=[^ ]\+" | sed 's/^ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=//' > ${cfg.activeRecordEncryptionPrimaryKeyFile} + fi if ! test -f ${cfg.secretKeyBaseFile}; then mkdir -p $(dirname ${cfg.secretKeyBaseFile}) - bin/rake secret > ${cfg.secretKeyBaseFile} + bin/bundle exec rails secret > ${cfg.secretKeyBaseFile} fi if ! test -f ${cfg.otpSecretFile}; then mkdir -p $(dirname ${cfg.otpSecretFile}) - bin/rake secret > ${cfg.otpSecretFile} + bin/bundle exec rails secret > ${cfg.otpSecretFile} fi if ! test -f ${cfg.vapidPrivateKeyFile}; then mkdir -p $(dirname ${cfg.vapidPrivateKeyFile}) $(dirname ${cfg.vapidPublicKeyFile}) @@ -724,6 +790,9 @@ in { fi cat > /var/lib/mastodon/.secrets_env <&2 exit 1 } ${pkgs.util-linuxMinimal}/bin/findmnt ${efiSysMountPoint} > /dev/null || fail efiSysMountPoint ${efiSysMountPoint} - ${lib.optionalString - (cfg.xbootldrMountPoint != null) - "${pkgs.util-linuxMinimal}/bin/findmnt ${cfg.xbootldrMountPoint} > /dev/null || fail xbootldrMountPoint ${cfg.xbootldrMountPoint}"} + ${lib.optionalString (cfg.xbootldrMountPoint != null) + "${pkgs.util-linuxMinimal}/bin/findmnt ${cfg.xbootldrMountPoint} > /dev/null || fail xbootldrMountPoint ${cfg.xbootldrMountPoint}" + } ''; copyExtraFiles = pkgs.writeShellScript "copy-extra-files" '' empty_file=$(${pkgs.coreutils}/bin/mktemp) - ${concatStrings (mapAttrsToList (n: v: '' - ${pkgs.coreutils}/bin/install -Dp "${v}" "${bootMountPoint}/"${escapeShellArg n} - ${pkgs.coreutils}/bin/install -D $empty_file "${bootMountPoint}/${nixosDir}/.extra-files/"${escapeShellArg n} - '') cfg.extraFiles)} + ${concatStrings ( + mapAttrsToList (n: v: '' + ${pkgs.coreutils}/bin/install -Dp "${v}" "${bootMountPoint}/"${escapeShellArg n} + ${pkgs.coreutils}/bin/install -D $empty_file "${bootMountPoint}/${nixosDir}/.extra-files/"${escapeShellArg n} + '') cfg.extraFiles + )} - ${concatStrings (mapAttrsToList (n: v: '' - ${pkgs.coreutils}/bin/install -Dp "${pkgs.writeText n v}" "${bootMountPoint}/loader/entries/"${escapeShellArg n} - ${pkgs.coreutils}/bin/install -D $empty_file "${bootMountPoint}/${nixosDir}/.extra-files/loader/entries/"${escapeShellArg n} - '') cfg.extraEntries)} + ${concatStrings ( + mapAttrsToList (n: v: '' + ${pkgs.coreutils}/bin/install -Dp "${pkgs.writeText n v}" "${bootMountPoint}/loader/entries/"${escapeShellArg n} + ${pkgs.coreutils}/bin/install -D $empty_file "${bootMountPoint}/${nixosDir}/.extra-files/loader/entries/"${escapeShellArg n} + '') cfg.extraEntries + )} ''; }; @@ -91,23 +111,61 @@ let ${systemdBootBuilder}/bin/systemd-boot "$@" ${cfg.extraInstallCommands} ''; -in { +in +{ meta.maintainers = with lib.maintainers; [ julienmalka ]; - imports = - [ (mkRenamedOptionModule [ "boot" "loader" "gummiboot" "enable" ] [ "boot" "loader" "systemd-boot" "enable" ]) - (lib.mkChangedOptionModule - [ "boot" "loader" "systemd-boot" "memtest86" "entryFilename" ] - [ "boot" "loader" "systemd-boot" "memtest86" "sortKey" ] - (config: lib.strings.removeSuffix ".conf" config.boot.loader.systemd-boot.memtest86.entryFilename) - ) - (lib.mkChangedOptionModule - [ "boot" "loader" "systemd-boot" "netbootxyz" "entryFilename" ] - [ "boot" "loader" "systemd-boot" "netbootxyz" "sortKey" ] - (config: lib.strings.removeSuffix ".conf" config.boot.loader.systemd-boot.netbootxyz.entryFilename) - ) - ]; + imports = [ + (mkRenamedOptionModule + [ + "boot" + "loader" + "gummiboot" + "enable" + ] + [ + "boot" + "loader" + "systemd-boot" + "enable" + ] + ) + (lib.mkChangedOptionModule + [ + "boot" + "loader" + "systemd-boot" + "memtest86" + "entryFilename" + ] + [ + "boot" + "loader" + "systemd-boot" + "memtest86" + "sortKey" + ] + (config: lib.strings.removeSuffix ".conf" config.boot.loader.systemd-boot.memtest86.entryFilename) + ) + (lib.mkChangedOptionModule + [ + "boot" + "loader" + "systemd-boot" + "netbootxyz" + "entryFilename" + ] + [ + "boot" + "loader" + "systemd-boot" + "netbootxyz" + "sortKey" + ] + (config: lib.strings.removeSuffix ".conf" config.boot.loader.systemd-boot.netbootxyz.entryFilename) + ) + ]; options.boot.loader.systemd-boot = { enable = mkOption { @@ -124,7 +182,7 @@ in { sortKey = mkOption { default = "nixos"; - type = lib.types.str; + type = types.str; description = '' The sort key used for the NixOS bootloader entries. This key determines sorting relative to non-NixOS entries. @@ -218,7 +276,15 @@ in { consoleMode = mkOption { default = "keep"; - type = types.enum [ "0" "1" "2" "5" "auto" "max" "keep" ]; + type = types.enum [ + "0" + "1" + "2" + "5" + "auto" + "max" + "keep" + ]; description = '' The resolution of the console. The following values are valid: @@ -281,9 +347,32 @@ in { }; }; + edk2-uefi-shell = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Make the EDK2 UEFI Shell available from the systemd-boot menu. + It can be used to manually boot other operating systems or for debugging. + ''; + }; + + sortKey = mkOption { + type = types.str; + default = "o_edk2-uefi-shell"; + description = '' + `systemd-boot` orders the menu entries by their sort keys, + so if you want something to appear after all the NixOS entries, + it should start with {file}`o` or onwards. + + See also {option}`boot.loader.systemd-boot.sortKey`.. + ''; + }; + }; + extraEntries = mkOption { type = types.attrsOf types.lines; - default = {}; + default = { }; example = literalExpression '' { "memtest86.conf" = ''' title Memtest86+ @@ -306,7 +395,7 @@ in { extraFiles = mkOption { type = types.attrsOf types.path; - default = {}; + default = { }; example = literalExpression '' { "efi/memtest86/memtest.efi" = "''${pkgs.memtest86plus}/memtest.efi"; } ''; @@ -349,40 +438,126 @@ in { Windows can unseal the encryption key. ''; }; + + windows = mkOption { + default = { }; + description = '' + Make Windows bootable from systemd-boot. This option is not necessary when Windows and + NixOS use the same EFI System Partition (ESP). In that case, Windows will automatically be + detected by systemd-boot. + + However, if Windows is installed on a separate drive or ESP, you can use this option to add + a menu entry for each installation manually. + + The attribute name is used for the title of the menu entry and internal file names. + ''; + example = literalExpression '' + { + "10".efiDeviceHandle = "HD0c3"; + "11-ame" = { + title = "Windows 11 Ameliorated Edition"; + efiDeviceHandle = "HD0b1"; + }; + "11-home" = { + title = "Windows 11 Home"; + efiDeviceHandle = "FS1"; + sortKey = "z_windows"; + }; + } + ''; + type = types.attrsOf ( + types.submodule ( + { name, ... }: + { + options = { + efiDeviceHandle = mkOption { + type = types.str; + example = "HD1b3"; + description = '' + The device handle of the EFI System Partition (ESP) where the Windows bootloader is + located. This is the device handle that the EDK2 UEFI Shell uses to load the + bootloader. + + To find this handle, follow these steps: + 1. Set {option}`boot.loader.systemd-boot.edk2-uefi-shell.enable` to `true` + 2. Run `nixos-rebuild boot` + 3. Reboot and select "EDK2 UEFI Shell" from the systemd-boot menu + 4. Run `map -c` to list all consistent device handles + 5. For each device handle (for example, `HD0c1`), run `ls HD0c1:\EFI` + 6. If the output contains the directory `Microsoft`, you might have found the correct device handle + 7. Run `HD0c1:\EFI\Microsoft\Boot\Bootmgfw.efi` to check if Windows boots correctly + 8. If it does, this device handle is the one you need (in this example, `HD0c1`) + + This option is required, there is no useful default. + ''; + }; + + title = mkOption { + type = types.str; + example = "Michaelsoft Binbows"; + default = "Windows ${name}"; + defaultText = ''attribute name of this entry, prefixed with "Windows "''; + description = '' + The title of the boot menu entry. + ''; + }; + + sortKey = mkOption { + type = types.str; + default = "o_windows_${name}"; + defaultText = ''attribute name of this entry, prefixed with "o_windows_"''; + description = '' + `systemd-boot` orders the menu entries by their sort keys, + so if you want something to appear after all the NixOS entries, + it should start with {file}`o` or onwards. + + See also {option}`boot.loader.systemd-boot.sortKey`.. + ''; + }; + }; + } + ) + ); + }; }; config = mkIf cfg.enable { - assertions = [ - { - assertion = (hasPrefix "/" efi.efiSysMountPoint); - message = "The ESP mount point '${toString efi.efiSysMountPoint}' must be an absolute path"; - } - { - assertion = cfg.xbootldrMountPoint == null || (hasPrefix "/" cfg.xbootldrMountPoint); - message = "The XBOOTLDR mount point '${toString cfg.xbootldrMountPoint}' must be an absolute path"; - } - { - assertion = cfg.xbootldrMountPoint != efi.efiSysMountPoint; - message = "The XBOOTLDR mount point '${toString cfg.xbootldrMountPoint}' cannot be the same as the ESP mount point '${toString efi.efiSysMountPoint}'"; - } - { - assertion = (config.boot.kernelPackages.kernel.features or { efiBootStub = true; }) ? efiBootStub; - message = "This kernel does not support the EFI boot stub"; - } - { - assertion = cfg.installDeviceTree -> config.hardware.deviceTree.enable -> config.hardware.deviceTree.name != null; - message = "Cannot install devicetree without 'config.hardware.deviceTree.enable' enabled and 'config.hardware.deviceTree.name' set"; - } - ] ++ concatMap (filename: [ - { - assertion = !(hasInfix "/" filename); - message = "boot.loader.systemd-boot.extraEntries.${lib.strings.escapeNixIdentifier filename} is invalid: entries within folders are not supported"; - } - { - assertion = hasSuffix ".conf" filename; - message = "boot.loader.systemd-boot.extraEntries.${lib.strings.escapeNixIdentifier filename} is invalid: entries must have a .conf file extension"; - } - ]) (builtins.attrNames cfg.extraEntries) + assertions = + [ + { + assertion = (hasPrefix "/" efi.efiSysMountPoint); + message = "The ESP mount point '${toString efi.efiSysMountPoint}' must be an absolute path"; + } + { + assertion = cfg.xbootldrMountPoint == null || (hasPrefix "/" cfg.xbootldrMountPoint); + message = "The XBOOTLDR mount point '${toString cfg.xbootldrMountPoint}' must be an absolute path"; + } + { + assertion = cfg.xbootldrMountPoint != efi.efiSysMountPoint; + message = "The XBOOTLDR mount point '${toString cfg.xbootldrMountPoint}' cannot be the same as the ESP mount point '${toString efi.efiSysMountPoint}'"; + } + { + assertion = (config.boot.kernelPackages.kernel.features or { efiBootStub = true; }) ? efiBootStub; + message = "This kernel does not support the EFI boot stub"; + } + { + assertion = + cfg.installDeviceTree + -> config.hardware.deviceTree.enable + -> config.hardware.deviceTree.name != null; + message = "Cannot install devicetree without 'config.hardware.deviceTree.enable' enabled and 'config.hardware.deviceTree.name' set"; + } + ] + ++ concatMap (filename: [ + { + assertion = !(hasInfix "/" filename); + message = "boot.loader.systemd-boot.extraEntries.${lib.strings.escapeNixIdentifier filename} is invalid: entries within folders are not supported"; + } + { + assertion = hasSuffix ".conf" filename; + message = "boot.loader.systemd-boot.extraEntries.${lib.strings.escapeNixIdentifier filename} is invalid: entries must have a .conf file extension"; + } + ]) (builtins.attrNames cfg.extraEntries) ++ concatMap (filename: [ { assertion = !(hasPrefix "/" filename); @@ -396,7 +571,13 @@ in { assertion = !(hasInfix "nixos/.extra-files" (toLower filename)); message = "boot.loader.systemd-boot.extraFiles.${lib.strings.escapeNixIdentifier filename} is invalid: files cannot be placed in the nixos/.extra-files directory"; } - ]) (builtins.attrNames cfg.extraFiles); + ]) (builtins.attrNames cfg.extraFiles) + ++ concatMap (winVersion: [ + { + assertion = lib.match "^[-_0-9A-Za-z]+$" winVersion != null; + message = "boot.loader.systemd-boot.windows.${winVersion} is invalid: key must only contain alphanumeric characters, hyphens, and underscores"; + } + ]) (builtins.attrNames cfg.windows); boot.loader.grub.enable = mkDefault false; @@ -409,24 +590,44 @@ in { (mkIf cfg.netbootxyz.enable { "efi/netbootxyz/netboot.xyz.efi" = "${pkgs.netbootxyz-efi}"; }) + (mkIf (cfg.edk2-uefi-shell.enable || cfg.windows != { }) { + ${edk2ShellEspPath} = "${pkgs.edk2-uefi-shell}/shell.efi"; + }) ]; - boot.loader.systemd-boot.extraEntries = mkMerge [ - (mkIf cfg.memtest86.enable { - "memtest86.conf" = '' - title Memtest86+ - efi /efi/memtest86/memtest.efi - sort-key ${cfg.memtest86.sortKey} + boot.loader.systemd-boot.extraEntries = mkMerge ( + [ + (mkIf cfg.memtest86.enable { + "memtest86.conf" = '' + title Memtest86+ + efi /efi/memtest86/memtest.efi + sort-key ${cfg.memtest86.sortKey} + ''; + }) + (mkIf cfg.netbootxyz.enable { + "netbootxyz.conf" = '' + title netboot.xyz + efi /efi/netbootxyz/netboot.xyz.efi + sort-key ${cfg.netbootxyz.sortKey} + ''; + }) + (mkIf cfg.edk2-uefi-shell.enable { + "edk2-uefi-shell.conf" = '' + title EDK2 UEFI Shell + efi /${edk2ShellEspPath} + sort-key ${cfg.edk2-uefi-shell.sortKey} + ''; + }) + ] + ++ (mapAttrsToList (winVersion: cfg: { + "windows_${winVersion}.conf" = '' + title ${cfg.title} + efi /${edk2ShellEspPath} + options -nointerrupt -nomap -noversion ${cfg.efiDeviceHandle}:EFI\Microsoft\Boot\Bootmgfw.efi + sort-key ${cfg.sortKey} ''; - }) - (mkIf cfg.netbootxyz.enable { - "netbootxyz.conf" = '' - title netboot.xyz - efi /efi/netbootxyz/netboot.xyz.efi - sort-key ${cfg.netbootxyz.sortKey} - ''; - }) - ]; + }) cfg.windows) + ); boot.bootspec.extensions."org.nixos.systemd-boot" = { inherit (config.boot.loader.systemd-boot) sortKey; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix index 94a5de7e2b..c56a5b3bfd 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix @@ -411,11 +411,14 @@ let (assertValueOneOf "Layer2SpecificHeader" [ "none" "default" ]) ]; - # NOTE The PrivateKey directive is missing on purpose here, please - # do not add it to this list. The nix store is world-readable let's - # refrain ourselves from providing a footgun. + # NOTE Check whether the key starts with an @, in which case it is + # interpreted as the name of the credential from which the actual key + # shall be read by systemd-creds. + # Do not remove this check as the nix store is world-readable. sectionWireGuard = checkUnitConfig "WireGuard" [ + (assertKeyIsSystemdCredential "PrivateKey") (assertOnlyFields [ + "PrivateKey" "PrivateKeyFile" "ListenPort" "FirewallMark" @@ -426,12 +429,15 @@ let (assertRange "FirewallMark" 1 4294967295) ]; - # NOTE The PresharedKey directive is missing on purpose here, please - # do not add it to this list. The nix store is world-readable,let's - # refrain ourselves from providing a footgun. + # NOTE Check whether the key starts with an @, in which case it is + # interpreted as the name of the credential from which the actual key + # shall be read by systemd-creds. + # Do not remove this check as the nix store is world-readable. sectionWireGuardPeer = checkUnitConfigWithLegacyKey "wireguardPeerConfig" "WireGuardPeer" [ + (assertKeyIsSystemdCredential "PresharedKey") (assertOnlyFields [ "PublicKey" + "PresharedKey" "PresharedKeyFile" "AllowedIPs" "Endpoint" diff --git a/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix b/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix index b3237aa7f0..64077125ca 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix @@ -349,13 +349,7 @@ let { object = "${modulesClosure}/lib"; symlink = "/lib"; } - { object = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" { - src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; - preferLocalBuild = true; - } '' - target=$out - ${pkgs.buildPackages.perl}/bin/perl -0pe 's/## file: iwlwifi.conf(.+?)##/##/s;' $src > $out - ''; + { object = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; symlink = "/etc/modprobe.d/ubuntu.conf"; } { object = config.environment.etc."modprobe.d/nixos.conf".source; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix index fc2e5ddab1..1915fef59c 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix @@ -437,9 +437,7 @@ in { "/etc/sysctl.d/nixos.conf".text = "kernel.modprobe = /sbin/modprobe"; "/etc/modprobe.d/systemd.conf".source = "${cfg.package}/lib/modprobe.d/systemd.conf"; - "/etc/modprobe.d/ubuntu.conf".source = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" { } '' - ${pkgs.buildPackages.perl}/bin/perl -0pe 's/## file: iwlwifi.conf(.+?)##/##/s;' $src > $out - ''; + "/etc/modprobe.d/ubuntu.conf".source = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; "/etc/modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases; "/etc/os-release".source = config.boot.initrd.osRelease; @@ -507,12 +505,20 @@ in { in nameValuePair "${n}.automount" (automountToUnit v)) cfg.automounts); - services.initrd-nixos-activation = { - after = [ "initrd-fs.target" ]; + services.initrd-find-nixos-closure = { + description = "Find NixOS closure"; + + unitConfig = { + RequiresMountsFor = "/sysroot/nix/store"; + DefaultDependencies = false; + }; + before = [ "shutdown.target" ]; + conflicts = [ "shutdown.target" ]; requiredBy = [ "initrd.target" ]; - unitConfig.AssertPathExists = "/etc/initrd-release"; - serviceConfig.Type = "oneshot"; - description = "NixOS Activation"; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; script = /* bash */ '' set -uo pipefail @@ -542,6 +548,8 @@ in { # Assume the directory containing the init script is the closure. closure="$(dirname "$closure")" + ln --symbolic "$closure" /nixos-closure + # If we are not booting a NixOS closure (e.g. init=/bin/sh), # we don't know what root to prepare so we don't do anything if ! [ -x "/sysroot$(readlink "/sysroot$closure/prepare-root" || echo "$closure/prepare-root")" ]; then @@ -550,12 +558,48 @@ in { exit 0 fi echo 'NEW_INIT=' > /etc/switch-root.conf + ''; + }; + # We need to propagate /run for things like /run/booted-system + # and /run/current-system. + mounts = [ + { + where = "/sysroot/run"; + what = "/run"; + options = "bind"; + unitConfig = { + # See the comment on the mount unit for /run/etc-metadata + DefaultDependencies = false; + }; + requiredBy = [ "initrd-fs.target" ]; + before = [ "initrd-fs.target" ]; + } + ]; - # We need to propagate /run for things like /run/booted-system - # and /run/current-system. - mkdir -p /sysroot/run - mount --bind /run /sysroot/run + services.initrd-nixos-activation = { + requires = [ + config.boot.initrd.systemd.services.initrd-find-nixos-closure.name + ]; + after = [ + "initrd-fs.target" + config.boot.initrd.systemd.services.initrd-find-nixos-closure.name + ]; + requiredBy = [ "initrd.target" ]; + unitConfig = { + AssertPathExists = "/etc/initrd-release"; + RequiresMountsFor = [ + "/sysroot/run" + ]; + }; + serviceConfig.Type = "oneshot"; + description = "NixOS Activation"; + + script = /* bash */ '' + set -uo pipefail + export PATH="/bin:${cfg.package.util-linux}/bin" + + closure="$(realpath /nixos-closure)" # Initialize the system export IN_NIXOS_SYSTEMD_STAGE1=true diff --git a/third_party/nixpkgs/nixos/modules/system/etc/etc-activation.nix b/third_party/nixpkgs/nixos/modules/system/etc/etc-activation.nix index 6c6352b041..944920e923 100644 --- a/third_party/nixpkgs/nixos/modules/system/etc/etc-activation.nix +++ b/third_party/nixpkgs/nixos/modules/system/etc/etc-activation.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, lib, pkgs, ... }: { @@ -34,12 +34,30 @@ mounts = [ { where = "/run/etc-metadata"; - what = "/sysroot${config.system.build.etcMetadataImage}"; + what = "/etc-metadata-image"; type = "erofs"; options = "loop"; - unitConfig.RequiresMountsFor = [ - "/sysroot/nix/store" + unitConfig = { + # Since this unit depends on the nix store being mounted, it cannot + # be a dependency of local-fs.target, because if it did, we'd have + # local-fs.target ordered after the nix store mount which would cause + # things like network.target to only become active after the nix store + # has been mounted. + # This breaks for instance setups where sshd needs to be up before + # any encrypted disks can be mounted. + DefaultDependencies = false; + RequiresMountsFor = [ + "/sysroot/nix/store" + ]; + }; + requires = [ + config.boot.initrd.systemd.services.initrd-find-etc.name ]; + after = [ + config.boot.initrd.systemd.services.initrd-find-etc.name + ]; + requiredBy = [ "initrd-fs.target" ]; + before = [ "initrd-fs.target" ]; } { where = "/sysroot/etc"; @@ -49,7 +67,7 @@ "relatime" "redirect_dir=on" "metacopy=on" - "lowerdir=/run/etc-metadata::/sysroot${config.system.build.etcBasedir}" + "lowerdir=/run/etc-metadata::/etc-basedir" ] ++ lib.optionals config.system.etc.overlay.mutable [ "rw" "upperdir=/sysroot/.rw-etc/upper" @@ -59,28 +77,77 @@ ]); requiredBy = [ "initrd-fs.target" ]; before = [ "initrd-fs.target" ]; - requires = lib.mkIf config.system.etc.overlay.mutable [ "rw-etc.service" ]; - after = lib.mkIf config.system.etc.overlay.mutable [ "rw-etc.service" ]; - unitConfig.RequiresMountsFor = [ - "/sysroot/nix/store" - "/run/etc-metadata" + requires = [ + config.boot.initrd.systemd.services.initrd-find-etc.name + ] ++ lib.optionals config.system.etc.overlay.mutable [ + config.boot.initrd.systemd.services."rw-etc".name ]; + after = [ + config.boot.initrd.systemd.services.initrd-find-etc.name + ] ++ lib.optionals config.system.etc.overlay.mutable [ + config.boot.initrd.systemd.services."rw-etc".name + ]; + unitConfig = { + RequiresMountsFor = [ + "/sysroot/nix/store" + "/run/etc-metadata" + ]; + DefaultDependencies = false; + }; } ]; - services = lib.mkIf config.system.etc.overlay.mutable { - rw-etc = { - unitConfig = { - DefaultDependencies = false; - RequiresMountsFor = "/sysroot"; + services = lib.mkMerge [ + (lib.mkIf config.system.etc.overlay.mutable { + rw-etc = { + requiredBy = [ "initrd-fs.target" ]; + before = [ "initrd-fs.target" ]; + unitConfig = { + DefaultDependencies = false; + RequiresMountsFor = "/sysroot"; + }; + serviceConfig = { + Type = "oneshot"; + ExecStart = '' + /bin/mkdir -p -m 0755 /sysroot/.rw-etc/upper /sysroot/.rw-etc/work + ''; + }; }; - serviceConfig = { - Type = "oneshot"; - ExecStart = '' - /bin/mkdir -p -m 0755 /sysroot/.rw-etc/upper /sysroot/.rw-etc/work + }) + { + initrd-find-etc = { + description = "Find the path to the etc metadata image and based dir"; + requires = [ + config.boot.initrd.systemd.services.initrd-find-nixos-closure.name + ]; + after = [ + config.boot.initrd.systemd.services.initrd-find-nixos-closure.name + ]; + before = [ "shutdown.target" ]; + conflicts = [ "shutdown.target" ]; + requiredBy = [ "initrd.target" ]; + unitConfig = { + DefaultDependencies = false; + RequiresMountsFor = "/sysroot/nix/store"; + }; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + + script = /* bash */ '' + set -uo pipefail + + closure="$(realpath /nixos-closure)" + + metadata_image="$(chroot /sysroot ${lib.getExe' pkgs.coreutils "realpath"} "$closure/etc-metadata-image")" + ln -s "/sysroot$metadata_image" /etc-metadata-image + + basedir="$(chroot /sysroot ${lib.getExe' pkgs.coreutils "realpath"} "$closure/etc-basedir")" + ln -s "/sysroot$basedir" /etc-basedir ''; }; - }; - }; + } + ]; }; }) diff --git a/third_party/nixpkgs/nixos/modules/tasks/bcache.nix b/third_party/nixpkgs/nixos/modules/tasks/bcache.nix index ba34498746..d2c816d663 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/bcache.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/bcache.nix @@ -11,6 +11,8 @@ in { Whether to enable bcache support in the initrd. ''; + default = config.boot.initrd.systemd.enable && config.boot.bcache.enable; + defaultText = lib.literalExpression "config.boot.initrd.systemd.enable && config.boot.bcache.enable"; }; config = lib.mkIf cfg.enable { diff --git a/third_party/nixpkgs/nixos/modules/tasks/lvm.nix b/third_party/nixpkgs/nixos/modules/tasks/lvm.nix index 0b62872596..4d1018978e 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/lvm.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/lvm.nix @@ -31,6 +31,8 @@ in { Whether to enable booting from LVM2 in the initrd. ''; + default = config.boot.initrd.systemd.enable && config.services.lvm.enable; + defaultText = lib.literalExpression "config.boot.initrd.systemd.enable && config.services.lvm.enable"; }; config = mkMerge [ diff --git a/third_party/nixpkgs/nixos/modules/testing/test-instrumentation.nix b/third_party/nixpkgs/nixos/modules/testing/test-instrumentation.nix index 0f551dcbd6..050c817e87 100644 --- a/third_party/nixpkgs/nixos/modules/testing/test-instrumentation.nix +++ b/third_party/nixpkgs/nixos/modules/testing/test-instrumentation.nix @@ -90,6 +90,7 @@ in contents."/etc/systemd/journald.conf".text = '' [Journal] ForwardToConsole=yes + TTYPath=/dev/${qemu-common.qemuSerialDevice} MaxLevelConsole=debug ''; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/ec2-data.nix b/third_party/nixpkgs/nixos/modules/virtualisation/ec2-data.nix index 036c8c5933..2da271a592 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/ec2-data.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/ec2-data.nix @@ -34,7 +34,7 @@ with lib; if ! [ -e /root/.ssh/authorized_keys ]; then echo "obtaining SSH key..." mkdir -p /root/.ssh - chown 0700 /root/.ssh + chmod 0700 /root/.ssh if [ -s /etc/ec2-metadata/public-keys-0-openssh-key ]; then (umask 177; cat /etc/ec2-metadata/public-keys-0-openssh-key >> /root/.ssh/authorized_keys) echo "new key added to authorized_keys" @@ -47,7 +47,7 @@ with lib; userData=/etc/ec2-metadata/user-data mkdir -p /etc/ssh - chown 0755 /etc/ssh + chmod 0755 /etc/ssh if [ -s "$userData" ]; then key="$(sed 's/|/\n/g; s/SSH_HOST_DSA_KEY://; t; d' $userData)" @@ -90,4 +90,6 @@ with lib; }; }; + + meta.maintainers = with maintainers; [ arianvp ]; } diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/ec2-metadata-fetcher.sh b/third_party/nixpkgs/nixos/modules/virtualisation/ec2-metadata-fetcher.sh index 5e0a908ee6..66a05e7a43 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/ec2-metadata-fetcher.sh +++ b/third_party/nixpkgs/nixos/modules/virtualisation/ec2-metadata-fetcher.sh @@ -1,6 +1,6 @@ metaDir=/etc/ec2-metadata mkdir -p "$metaDir" -chown 0755 "$metaDir" +chmod 0755 "$metaDir" rm -f "$metaDir/*" get_imds_token() { diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix index edefb4c227..c6084e5590 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix @@ -141,6 +141,7 @@ let --absolute-names \ --verbatim-files-from \ --transform 'flags=rSh;s|/nix/store/||' \ + --transform 'flags=rSh;s|~nix~case~hack~[[:digit:]]\+||g' \ --files-from ${hostPkgs.closureInfo { rootPaths = [ config.system.build.toplevel regInfo ]; }}/store-paths \ | ${hostPkgs.erofs-utils}/bin/mkfs.erofs \ --quiet \ diff --git a/third_party/nixpkgs/nixos/tests/activation/etc-overlay-immutable.nix b/third_party/nixpkgs/nixos/tests/activation/etc-overlay-immutable.nix index 6d56db43f0..601ac77cbd 100644 --- a/third_party/nixpkgs/nixos/tests/activation/etc-overlay-immutable.nix +++ b/third_party/nixpkgs/nixos/tests/activation/etc-overlay-immutable.nix @@ -15,6 +15,10 @@ boot.kernelPackages = pkgs.linuxPackages_latest; time.timeZone = "Utc"; + # The standard resolvconf service tries to write to /etc and crashes, + # which makes nixos-rebuild exit uncleanly when switching into the new generation + services.resolved.enable = true; + environment.etc = { "mountpoint/.keep".text = "keep"; "filemount".text = "keep"; @@ -26,6 +30,13 @@ }; testScript = '' + with subtest("/run/etc-metadata/ is mounted"): + print(machine.succeed("mountpoint /run/etc-metadata")) + + with subtest("No temporary files leaked into stage 2"): + machine.succeed("[ ! -e /etc-metadata-image ]") + machine.succeed("[ ! -e /etc-basedir ]") + with subtest("/etc is mounted as an overlay"): machine.succeed("findmnt --kernel --type overlay /etc") @@ -50,6 +61,9 @@ with subtest("switching to the same generation"): machine.succeed("/run/current-system/bin/switch-to-configuration test") + with subtest("the initrd didn't get rebuilt"): + machine.succeed("test /run/current-system/initrd -ef /run/current-system/specialisation/new-generation/initrd") + with subtest("switching to a new generation"): machine.fail("stat /etc/newgen") diff --git a/third_party/nixpkgs/nixos/tests/activation/etc-overlay-mutable.nix b/third_party/nixpkgs/nixos/tests/activation/etc-overlay-mutable.nix index 8561ff7fd2..fe61652124 100644 --- a/third_party/nixpkgs/nixos/tests/activation/etc-overlay-mutable.nix +++ b/third_party/nixpkgs/nixos/tests/activation/etc-overlay-mutable.nix @@ -18,12 +18,22 @@ }; testScript = '' + with subtest("/run/etc-metadata/ is mounted"): + print(machine.succeed("mountpoint /run/etc-metadata")) + + with subtest("No temporary files leaked into stage 2"): + machine.succeed("[ ! -e /etc-metadata-image ]") + machine.succeed("[ ! -e /etc-basedir ]") + with subtest("/etc is mounted as an overlay"): machine.succeed("findmnt --kernel --type overlay /etc") with subtest("switching to the same generation"): machine.succeed("/run/current-system/bin/switch-to-configuration test") + with subtest("the initrd didn't get rebuilt"): + machine.succeed("test /run/current-system/initrd -ef /run/current-system/specialisation/new-generation/initrd") + with subtest("switching to a new generation"): machine.fail("stat /etc/newgen") machine.succeed("echo -n 'mutable' > /etc/mutable") diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index 0e2a21803c..8ddcc779ea 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -136,6 +136,7 @@ in { artalk = handleTest ./artalk.nix {}; atd = handleTest ./atd.nix {}; atop = handleTest ./atop.nix {}; + atticd = runTest ./atticd.nix; atuin = handleTest ./atuin.nix {}; audiobookshelf = handleTest ./audiobookshelf.nix {}; auth-mysql = handleTest ./auth-mysql.nix {}; @@ -889,6 +890,7 @@ in { samba-wsdd = handleTest ./samba-wsdd.nix {}; sane = handleTest ./sane.nix {}; sanoid = handleTest ./sanoid.nix {}; + saunafs = handleTest ./saunafs.nix {}; scaphandre = handleTest ./scaphandre.nix {}; schleuder = handleTest ./schleuder.nix {}; scion-freestanding-deployment = handleTest ./scion/freestanding-deployment {}; @@ -1070,6 +1072,7 @@ in { unbound = handleTest ./unbound.nix {}; unifi = handleTest ./unifi.nix {}; unit-php = handleTest ./web-servers/unit-php.nix {}; + unit-perl = handleTest ./web-servers/unit-perl.nix {}; upnp.iptables = handleTest ./upnp.nix { useNftables = false; }; upnp.nftables = handleTest ./upnp.nix { useNftables = true; }; uptermd = handleTest ./uptermd.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/atticd.nix b/third_party/nixpkgs/nixos/tests/atticd.nix new file mode 100644 index 0000000000..4193d75d2a --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/atticd.nix @@ -0,0 +1,92 @@ +{ lib, pkgs, ... }: + +let + accessKey = "BKIKJAA5BMMU2RHO6IBB"; + secretKey = "V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12"; + + minioCredentialsFile = pkgs.writeText "minio-credentials-full" '' + MINIO_ROOT_USER=${accessKey} + MINIO_ROOT_PASSWORD=${secretKey} + ''; + environmentFile = pkgs.runCommand "atticd-env" { } '' + echo ATTIC_SERVER_TOKEN_RS256_SECRET_BASE64="$(${lib.getExe pkgs.openssl} genrsa -traditional 4096 | ${pkgs.coreutils}/bin/base64 -w0)" > $out + ''; +in + +{ + name = "atticd"; + + nodes = { + local = { + services.atticd = { + enable = true; + + inherit environmentFile; + }; + + environment.systemPackages = [ + pkgs.attic-client + ]; + }; + + s3 = { + services.atticd = { + enable = true; + settings = { + storage = { + type = "s3"; + bucket = "attic"; + region = "us-east-1"; + endpoint = "http://127.0.0.1:9000"; + + credentials = { + access_key_id = accessKey; + secret_access_key = secretKey; + }; + }; + }; + + inherit environmentFile; + }; + + services.minio = { + enable = true; + rootCredentialsFile = minioCredentialsFile; + }; + + environment.systemPackages = [ + pkgs.attic-client + pkgs.minio-client + ]; + }; + }; + + testScript = # python + '' + start_all() + + with subtest("local storage push"): + local.wait_for_unit("atticd.service") + token = local.succeed("atticd-atticadm make-token --sub stop --validity 1y --create-cache '*' --pull '*' --push '*' --delete '*' --configure-cache '*' --configure-cache-retention '*'").strip() + + local.succeed(f"attic login local http://localhost:8080 {token}") + local.succeed("attic cache create test-cache") + local.succeed("attic push test-cache ${environmentFile}") + + with subtest("s3 storage push"): + s3.wait_for_unit("atticd.service") + s3.wait_for_unit("minio.service") + s3.wait_for_open_port(9000) + s3.succeed( + "mc config host add minio " + + "http://localhost:9000 " + + "${accessKey} ${secretKey} --api s3v4", + "mc mb minio/attic", + ) + token = s3.succeed("atticd-atticadm make-token --sub stop --validity 1y --create-cache '*' --pull '*' --push '*' --delete '*' --configure-cache '*' --configure-cache-retention '*'").strip() + + s3.succeed(f"attic login s3 http://localhost:8080 {token}") + s3.succeed("attic cache create test-cache") + s3.succeed("attic push test-cache ${environmentFile}") + ''; +} diff --git a/third_party/nixpkgs/nixos/tests/chrony.nix b/third_party/nixpkgs/nixos/tests/chrony.nix index 2dcc363728..9582ab14bb 100644 --- a/third_party/nixpkgs/nixos/tests/chrony.nix +++ b/third_party/nixpkgs/nixos/tests/chrony.nix @@ -13,8 +13,6 @@ import ./make-test-python.nix ({ lib, ... }: specialisation.hardened.configuration = { services.chrony.enableMemoryLocking = true; environment.memoryAllocator.provider = "graphene-hardened"; - # dhcpcd privsep is incompatible with graphene-hardened - networking.useNetworkd = true; }; }; }; diff --git a/third_party/nixpkgs/nixos/tests/croc.nix b/third_party/nixpkgs/nixos/tests/croc.nix index 5d709eb3d1..2e910f5252 100644 --- a/third_party/nixpkgs/nixos/tests/croc.nix +++ b/third_party/nixpkgs/nixos/tests/croc.nix @@ -3,11 +3,11 @@ let client = { pkgs, ... }: { environment.systemPackages = [ pkgs.croc ]; }; - pass = pkgs.writeText "pass" "PassRelay"; + pass = "PassRelay"; in { name = "croc"; meta = with pkgs.lib.maintainers; { - maintainers = [ hax404 julm ]; + maintainers = [ equirosa SuperSandro2000 ]; }; nodes = { @@ -38,12 +38,12 @@ in { sender.execute("echo Hello World > testfile01.txt") sender.execute("echo Hello Earth > testfile02.txt") sender.execute( - "croc --pass ${pass} --relay relay send --code topSecret testfile01.txt testfile02.txt >&2 &" + "env CROC_SECRET=topSecret croc --pass ${pass} --relay relay send testfile01.txt testfile02.txt >&2 &" ) # receive the testfiles and check them receiver.succeed( - "croc --pass ${pass} --yes --relay relay topSecret" + "env CROC_SECRET=topSecret croc --pass ${pass} --yes --relay relay" ) assert "Hello World" in receiver.succeed("cat testfile01.txt") assert "Hello Earth" in receiver.succeed("cat testfile02.txt") diff --git a/third_party/nixpkgs/nixos/tests/endlessh-go.nix b/third_party/nixpkgs/nixos/tests/endlessh-go.nix index b261dbf1c5..70ec7d8166 100644 --- a/third_party/nixpkgs/nixos/tests/endlessh-go.nix +++ b/third_party/nixpkgs/nixos/tests/endlessh-go.nix @@ -44,15 +44,19 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: server.wait_for_unit("endlessh-go.service") server.wait_for_open_port(2222) server.wait_for_open_port(9229) + server.fail("curl -sSf server:9229/metrics | grep -q endlessh_client_closed_count_total") client.succeed("nc -dvW5 server 2222") - client.succeed("curl -kv server:9229/metrics") + server.succeed("curl -sSf server:9229/metrics | grep -q endlessh_client_closed_count_total") + client.fail("curl -sSfm 5 server:9229/metrics") with subtest("Privileged"): activate_specialisation("privileged") server.wait_for_unit("endlessh-go.service") server.wait_for_open_port(22) server.wait_for_open_port(92) + server.fail("curl -sSf server:92/metrics | grep -q endlessh_client_closed_count_total") client.succeed("nc -dvW5 server 22") - client.succeed("curl -kv server:92/metrics") + server.succeed("curl -sSf server:92/metrics | grep -q endlessh_client_closed_count_total") + client.fail("curl -sSfm 5 server:92/metrics") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/frr.nix b/third_party/nixpkgs/nixos/tests/frr.nix index edd702dc60..a975d4b402 100644 --- a/third_party/nixpkgs/nixos/tests/frr.nix +++ b/third_party/nixpkgs/nixos/tests/frr.nix @@ -38,7 +38,11 @@ import ./make-test-python.nix ({ pkgs, ... }: { nodes, ... }: { virtualisation.vlans = [ 1 ]; - networking.defaultGateway = ifAddr nodes.router1 "eth1"; + services.frr = { + config = '' + ip route 192.168.0.0/16 ${ifAddr nodes.router1 "eth1"} + ''; + }; }; router1 = @@ -47,13 +51,13 @@ import ./make-test-python.nix ({ pkgs, ... }: virtualisation.vlans = [ 1 2 ]; boot.kernel.sysctl."net.ipv4.ip_forward" = "1"; networking.firewall.extraCommands = "iptables -A nixos-fw -i eth2 -p ospfigp -j ACCEPT"; - services.frr.ospf = { - enable = true; + services.frr = { + ospfd.enable = true; config = ospfConf1; }; specialisation.ospf.configuration = { - services.frr.ospf.config = ospfConf2; + services.frr.config = ospfConf2; }; }; @@ -63,8 +67,8 @@ import ./make-test-python.nix ({ pkgs, ... }: virtualisation.vlans = [ 3 2 ]; boot.kernel.sysctl."net.ipv4.ip_forward" = "1"; networking.firewall.extraCommands = "iptables -A nixos-fw -i eth2 -p ospfigp -j ACCEPT"; - services.frr.ospf = { - enable = true; + services.frr = { + ospfd.enable = true; config = ospfConf2; }; }; @@ -73,7 +77,11 @@ import ./make-test-python.nix ({ pkgs, ... }: { nodes, ... }: { virtualisation.vlans = [ 3 ]; - networking.defaultGateway = ifAddr nodes.router2 "eth1"; + services.frr = { + config = '' + ip route 192.168.0.0/16 ${ifAddr nodes.router2 "eth1"} + ''; + }; }; }; @@ -86,10 +94,9 @@ import ./make-test-python.nix ({ pkgs, ... }: for machine in client, router1, router2, server: machine.wait_for_unit("network.target") - with subtest("Wait for Zebra and OSPFD"): - for gw in router1, router2: - gw.wait_for_unit("zebra") - gw.wait_for_unit("ospfd") + with subtest("Wait for FRR"): + for gw in client, router1, router2, server: + gw.wait_for_unit("frr") router1.succeed("${nodes.router1.config.system.build.toplevel}/specialisation/ospf/bin/switch-to-configuration test >&2") diff --git a/third_party/nixpkgs/nixos/tests/gerrit.nix b/third_party/nixpkgs/nixos/tests/gerrit.nix index 8ae9e89cf6..4630f94129 100644 --- a/third_party/nixpkgs/nixos/tests/gerrit.nix +++ b/third_party/nixpkgs/nixos/tests/gerrit.nix @@ -1,12 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: -let - lfs = pkgs.fetchurl { - url = "https://gerrit-ci.gerritforge.com/job/plugin-lfs-bazel-master/90/artifact/bazel-bin/plugins/lfs/lfs.jar"; - sha256 = "023b0kd8djm3cn1lf1xl67yv3j12yl8bxccn42lkfmwxjwjfqw6h"; - }; - -in { +{ name = "gerrit"; meta = with pkgs.lib.maintainers; { @@ -25,12 +19,9 @@ in { listenAddress = "[::]:80"; jvmHeapLimit = "1g"; - plugins = [ lfs ]; builtinPlugins = [ "hooks" "webhooks" ]; settings = { gerrit.canonicalWebUrl = "http://server"; - lfs.plugin = "lfs"; - plugins.allowRemoteAdmin = true; sshd.listenAddress = "[::]:2222"; sshd.advertisedAddress = "[::]:2222"; }; diff --git a/third_party/nixpkgs/nixos/tests/github-runner.nix b/third_party/nixpkgs/nixos/tests/github-runner.nix index 033365d692..f3e4b70fa5 100644 --- a/third_party/nixpkgs/nixos/tests/github-runner.nix +++ b/third_party/nixpkgs/nixos/tests/github-runner.nix @@ -11,6 +11,12 @@ import ./make-test-python.nix ({ pkgs, ... }: tokenFile = builtins.toFile "github-runner.token" "not-so-secret"; }; + services.github-runners.test-disabled = { + enable = false; + url = "https://github.com/yaxitech"; + tokenFile = builtins.toFile "github-runner.token" "not-so-secret"; + }; + systemd.services.dummy-github-com = { wantedBy = [ "multi-user.target" ]; before = [ "github-runner-test.service" ]; @@ -33,5 +39,7 @@ import ./make-test-python.nix ({ pkgs, ... }: assert "Self-hosted runner registration" in out, "did not read runner registration header" machine.wait_until_succeeds("test -f /tmp/registration-connect") + + machine.fail("systemctl list-unit-files | grep test-disabled") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/hardened.nix b/third_party/nixpkgs/nixos/tests/hardened.nix index e38834961e..0c43e3523d 100644 --- a/third_party/nixpkgs/nixos/tests/hardened.nix +++ b/third_party/nixpkgs/nixos/tests/hardened.nix @@ -11,11 +11,6 @@ import ./make-test-python.nix ({ pkgs, ... } : { imports = [ ../modules/profiles/hardened.nix ]; environment.memoryAllocator.provider = "graphene-hardened"; nix.settings.sandbox = false; - nixpkgs.overlays = [ - (final: super: { - dhcpcd = super.dhcpcd.override { enablePrivSep = false; }; - }) - ]; virtualisation.emptyDiskImages = [ 4096 ]; boot.initrd.postDeviceCommands = '' ${pkgs.dosfstools}/bin/mkfs.vfat -n EFISYS /dev/vdb diff --git a/third_party/nixpkgs/nixos/tests/headscale.nix b/third_party/nixpkgs/nixos/tests/headscale.nix index 80188b65db..15f7c7be2a 100644 --- a/third_party/nixpkgs/nixos/tests/headscale.nix +++ b/third_party/nixpkgs/nixos/tests/headscale.nix @@ -38,6 +38,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: region_id = 999; stun_listen_addr = "0.0.0.0:${toString stunPort}"; }; + dns.base_domain = "tailnet"; }; }; nginx = { @@ -77,6 +78,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: # Check that they are reachable from the tailnet peer1.wait_until_succeeds("tailscale ping peer2") - peer2.wait_until_succeeds("tailscale ping peer1") + peer2.wait_until_succeeds("tailscale ping peer1.tailnet") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/installed-tests/geocode-glib.nix b/third_party/nixpkgs/nixos/tests/installed-tests/geocode-glib.nix index fcb38c96ab..76a32ee284 100644 --- a/third_party/nixpkgs/nixos/tests/installed-tests/geocode-glib.nix +++ b/third_party/nixpkgs/nixos/tests/installed-tests/geocode-glib.nix @@ -4,8 +4,10 @@ makeInstalledTest { testConfig = { i18n.supportedLocales = [ "en_US.UTF-8/UTF-8" - # The tests require this locale available. + # The tests require these locales. "en_GB.UTF-8/UTF-8" + "cs_CZ.UTF-8/UTF-8" + "sv_SE.UTF-8/UTF-8" ]; }; diff --git a/third_party/nixpkgs/nixos/tests/installed-tests/xdg-desktop-portal.nix b/third_party/nixpkgs/nixos/tests/installed-tests/xdg-desktop-portal.nix index 90529d37ee..d40317faeb 100644 --- a/third_party/nixpkgs/nixos/tests/installed-tests/xdg-desktop-portal.nix +++ b/third_party/nixpkgs/nixos/tests/installed-tests/xdg-desktop-portal.nix @@ -3,7 +3,20 @@ makeInstalledTest { tested = pkgs.xdg-desktop-portal; - # Ton of breakage. - # https://github.com/flatpak/xdg-desktop-portal/pull/428 - meta.broken = true; + # Red herring + # Failed to load RealtimeKit property: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name org.freedesktop.RealtimeKit1 was not provided by any .service files + # Maybe a red herring, enabling PipeWire doesn't fix the location test. + # Failed connect to PipeWire: Couldn't connect to PipeWire + testConfig = { + environment.variables = { + TEST_IN_CI = 1; + XDG_DATA_DIRS = "${pkgs.xdg-desktop-portal.installedTests}/share/installed-tests/xdg-desktop-portal/share"; + }; + # Broken, see comment in the package file. + #services.geoclue2 = { + # enable = true; + # enableDemoAgent = true; + #}; + #location.provider = "geoclue2"; + }; } diff --git a/third_party/nixpkgs/nixos/tests/lomiri.nix b/third_party/nixpkgs/nixos/tests/lomiri.nix index 95a3cd0dd9..1ff68e85b9 100644 --- a/third_party/nixpkgs/nixos/tests/lomiri.nix +++ b/third_party/nixpkgs/nixos/tests/lomiri.nix @@ -4,6 +4,52 @@ let user = "alice"; description = "Alice Foobar"; password = "foobar"; + + # tmpfiles setup to make OCRing on terminal output more reliable + terminalOcrTmpfilesSetup = + { + pkgs, + lib, + config, + }: + let + white = "255, 255, 255"; + black = "0, 0, 0"; + colorSection = color: { + Color = color; + Bold = true; + Transparency = false; + }; + terminalColors = pkgs.writeText "customized.colorscheme" ( + lib.generators.toINI { } { + Background = colorSection white; + Foreground = colorSection black; + Color2 = colorSection black; + Color2Intense = colorSection black; + } + ); + terminalConfig = pkgs.writeText "terminal.ubports.conf" ( + lib.generators.toINI { } { + General = { + colorScheme = "customized"; + fontSize = "16"; + fontStyle = "Inconsolata"; + }; + } + ); + confBase = "${config.users.users.${user}.home}/.config"; + userDirArgs = { + mode = "0700"; + user = user; + group = "users"; + }; + in + { + "${confBase}".d = userDirArgs; + "${confBase}/terminal.ubports".d = userDirArgs; + "${confBase}/terminal.ubports/customized.colorscheme".L.argument = "${terminalColors}"; + "${confBase}/terminal.ubports/terminal.ubports.conf".L.argument = "${terminalConfig}"; + }; in { greeter = makeTest ( @@ -154,47 +200,9 @@ in }; # Help with OCR - systemd.tmpfiles.settings = - let - white = "255, 255, 255"; - black = "0, 0, 0"; - colorSection = color: { - Color = color; - Bold = true; - Transparency = false; - }; - terminalColors = pkgs.writeText "customized.colorscheme" ( - lib.generators.toINI { } { - Background = colorSection white; - Foreground = colorSection black; - Color2 = colorSection black; - Color2Intense = colorSection black; - } - ); - terminalConfig = pkgs.writeText "terminal.ubports.conf" ( - lib.generators.toINI { } { - General = { - colorScheme = "customized"; - fontSize = "16"; - fontStyle = "Inconsolata"; - }; - } - ); - confBase = "${config.users.users.${user}.home}/.config"; - userDirArgs = { - mode = "0700"; - user = user; - group = "users"; - }; - in - { - "10-lomiri-test-setup" = { - "${confBase}".d = userDirArgs; - "${confBase}/terminal.ubports".d = userDirArgs; - "${confBase}/terminal.ubports/customized.colorscheme".L.argument = "${terminalColors}"; - "${confBase}/terminal.ubports/terminal.ubports.conf".L.argument = "${terminalConfig}"; - }; - }; + systemd.tmpfiles.settings = { + "10-lomiri-test-setup" = terminalOcrTmpfilesSetup { inherit pkgs lib config; }; + }; }; enableOCR = true; @@ -360,58 +368,20 @@ in }; variables = { - # So we can test what content-hub is working behind the scenes - CONTENT_HUB_LOGGING_LEVEL = "2"; + # So we can test what lomiri-content-hub is working behind the scenes + LOMIRI_CONTENT_HUB_LOGGING_LEVEL = "2"; }; systemPackages = with pkgs; [ - # For a convenient way of kicking off content-hub peer collection - lomiri.content-hub.examples + # For a convenient way of kicking off lomiri-content-hub peer collection + lomiri.lomiri-content-hub.examples ]; }; # Help with OCR - systemd.tmpfiles.settings = - let - white = "255, 255, 255"; - black = "0, 0, 0"; - colorSection = color: { - Color = color; - Bold = true; - Transparency = false; - }; - terminalColors = pkgs.writeText "customized.colorscheme" ( - lib.generators.toINI { } { - Background = colorSection white; - Foreground = colorSection black; - Color2 = colorSection black; - Color2Intense = colorSection black; - } - ); - terminalConfig = pkgs.writeText "terminal.ubports.conf" ( - lib.generators.toINI { } { - General = { - colorScheme = "customized"; - fontSize = "16"; - fontStyle = "Inconsolata"; - }; - } - ); - confBase = "${config.users.users.${user}.home}/.config"; - userDirArgs = { - mode = "0700"; - user = user; - group = "users"; - }; - in - { - "10-lomiri-test-setup" = { - "${confBase}".d = userDirArgs; - "${confBase}/terminal.ubports".d = userDirArgs; - "${confBase}/terminal.ubports/customized.colorscheme".L.argument = "${terminalColors}"; - "${confBase}/terminal.ubports/terminal.ubports.conf".L.argument = "${terminalConfig}"; - }; - }; + systemd.tmpfiles.settings = { + "10-lomiri-test-setup" = terminalOcrTmpfilesSetup { inherit pkgs lib config; }; + }; }; enableOCR = true; @@ -484,9 +454,9 @@ in # lomiri-terminal-app has a separate VM test to test its basic functionality - # for the LSS content-hub test to work reliably, we need to kick off peer collecting - machine.send_chars("content-hub-test-importer\n") - wait_for_text(r"(/build/source|hub.cpp|handler.cpp|void|virtual|const)") # awaiting log messages from content-hub + # for the LSS lomiri-content-hub test to work reliably, we need to kick off peer collecting + machine.send_chars("lomiri-content-hub-test-importer\n") + wait_for_text(r"(/build/source|hub.cpp|handler.cpp|void|virtual|const)") # awaiting log messages from lomiri-content-hub machine.send_key("ctrl-c") # Doing this here, since we need an in-session shell & separately starting a terminal again wastes time @@ -510,7 +480,7 @@ in wait_for_text("Rotation Lock") machine.screenshot("settings_open") - # lomiri-system-settings has a separate VM test, only test Lomiri-specific content-hub functionalities here + # lomiri-system-settings has a separate VM test, only test Lomiri-specific lomiri-content-hub functionalities here # Make fullscreen, can't navigate to Background plugin via keyboard unless window has non-phone-like aspect ratio toggle_maximise() @@ -536,7 +506,7 @@ in # Peers should be loaded wait_for_text("Morph") # or Gallery, but Morph is already packaged - machine.screenshot("settings_content-hub_peers") + machine.screenshot("settings_lomiri-content-hub_peers") # Select Morph as content source mouse_click(370, 100) @@ -544,11 +514,11 @@ in # Expect Morph to be brought into the foreground, with its Downloads page open wait_for_text("No downloads") - # If content-hub encounters a problem, it may have crashed the original application issuing the request. + # If lomiri-content-hub encounters a problem, it may have crashed the original application issuing the request. # Check that it's still alive machine.succeed("pgrep -u ${user} -f lomiri-system-settings") - machine.screenshot("content-hub_exchange") + machine.screenshot("lomiri-content-hub_exchange") # Testing any more would require more applications & setup, the fact that it's already being attempted is a good sign machine.send_key("esc") @@ -732,8 +702,17 @@ in # Help with OCR fonts.packages = [ pkgs.inconsolata ]; - # Non-QWERTY keymap to test keymap patch - services.xserver.xkb.layout = "de"; + services.xserver.xkb.layout = lib.strings.concatStringsSep "," [ + # Start with a non-QWERTY keymap to test keymap patch + "de" + # Then a QWERTY one to test switching + "us" + ]; + + # Help with OCR + systemd.tmpfiles.settings = { + "10-lomiri-test-setup" = terminalOcrTmpfilesSetup { inherit pkgs lib config; }; + }; }; enableOCR = true; @@ -784,6 +763,30 @@ in machine.send_chars("touch ${pwInput}\n") machine.wait_for_file("/home/alice/${pwOutput}", 10) + # Issues with this keybind: input leaks to focused surface, may open launcher + # Don't have the keyboard indicator to handle this better + machine.send_key("meta_l-spc") + machine.wait_for_console_text('SET KEYMAP "us"') + + # Handle keybind fallout + machine.sleep(10) # wait for everything to settle + machine.send_key("esc") # close launcher in case it was opened + machine.sleep(2) # wait for animation to finish + # Make sure input leaks are gone + machine.send_key("backspace") + machine.send_key("backspace") + machine.send_key("backspace") + machine.send_key("backspace") + machine.send_key("backspace") + machine.send_key("backspace") + machine.send_key("backspace") + machine.send_key("backspace") + machine.send_key("backspace") + machine.send_key("backspace") + + machine.send_chars("touch ${pwInput}\n") + machine.wait_for_file("/home/alice/${pwInput}", 10) + machine.send_key("alt-f4") ''; } diff --git a/third_party/nixpkgs/nixos/tests/mysql/common.nix b/third_party/nixpkgs/nixos/tests/mysql/common.nix index ad54b0e00c..079eff163b 100644 --- a/third_party/nixpkgs/nixos/tests/mysql/common.nix +++ b/third_party/nixpkgs/nixos/tests/mysql/common.nix @@ -4,7 +4,7 @@ inherit (pkgs) mysql80; }; perconaPackages = { - inherit (pkgs) percona-server_lts percona-server_innovation; + inherit (pkgs) percona-server_8_0 percona-server_8_4; }; mkTestName = pkg: "mariadb_${builtins.replaceStrings ["."] [""] (lib.versions.majorMinor pkg.version)}"; } diff --git a/third_party/nixpkgs/nixos/tests/nebula.nix b/third_party/nixpkgs/nixos/tests/nebula.nix index 6c468153d5..124be23321 100644 --- a/third_party/nixpkgs/nixos/tests/nebula.nix +++ b/third_party/nixpkgs/nixos/tests/nebula.nix @@ -136,9 +136,9 @@ in ${name}.start() ${name}.succeed( "mkdir -p /root/.ssh", - "chown 700 /root/.ssh", + "chmod 700 /root/.ssh", "cat '${snakeOilPrivateKey}' > /root/.ssh/id_snakeoil", - "chown 600 /root/.ssh/id_snakeoil", + "chmod 600 /root/.ssh/id_snakeoil", "mkdir -p /root" ) ''; diff --git a/third_party/nixpkgs/nixos/tests/networking/networkd-and-scripted.nix b/third_party/nixpkgs/nixos/tests/networking/networkd-and-scripted.nix index 777c00f74e..1b6c12eb58 100644 --- a/third_party/nixpkgs/nixos/tests/networking/networkd-and-scripted.nix +++ b/third_party/nixpkgs/nixos/tests/networking/networkd-and-scripted.nix @@ -132,6 +132,14 @@ let client.wait_until_succeeds("ip addr show dev enp2s0 | grep -q '192.168.2'") client.wait_until_succeeds("ip addr show dev enp2s0 | grep -q 'fd00:1234:5678:2:'") + with subtest("Wait until we have received the nameservers"): + if "${builtins.toJSON networkd}" == "true": + client.wait_until_succeeds("resolvectl status enp2s0 | grep -q 2001:db8::1") + client.wait_until_succeeds("resolvectl status enp2s0 | grep -q 192.168.2.1") + else: + client.wait_until_succeeds("resolvconf -l | grep -q 2001:db8::1") + client.wait_until_succeeds("resolvconf -l | grep -q 192.168.2.1") + with subtest("Test vlan 1"): client.wait_until_succeeds("ping -c 1 192.168.1.1") client.wait_until_succeeds("ping -c 1 fd00:1234:5678:1::1") diff --git a/third_party/nixpkgs/nixos/tests/networking/router.nix b/third_party/nixpkgs/nixos/tests/networking/router.nix index e0ad7fa015..fab21c9e78 100644 --- a/third_party/nixpkgs/nixos/tests/networking/router.nix +++ b/third_party/nixpkgs/nixos/tests/networking/router.nix @@ -72,6 +72,7 @@ AdvSendAdvert on; AdvManagedFlag on; AdvOtherConfigFlag on; + RDNSS 2001:db8::1 {}; prefix fd00:1234:5678:${toString n}::/64 { AdvAutonomous off; diff --git a/third_party/nixpkgs/nixos/tests/nix/upgrade.nix b/third_party/nixpkgs/nixos/tests/nix/upgrade.nix index c55441586b..e4cd0cb09b 100644 --- a/third_party/nixpkgs/nixos/tests/nix/upgrade.nix +++ b/third_party/nixpkgs/nixos/tests/nix/upgrade.nix @@ -7,17 +7,6 @@ let ${pkgs.system} = "${nixVersions.latest}"; }''; - inputDrv = import ../.. { - configuration = { - imports = [ nixos-module ]; - nix.package = nixVersions.latest; - boot.isContainer = true; - - users.users.alice.isNormalUser = true; - }; - system = pkgs.system; - }; - nixos-module = builtins.toFile "nixos-module.nix" '' { lib, pkgs, modulesPath, ... }: { @@ -53,8 +42,13 @@ pkgs.testers.nixosTest { nix.package = nixVersions.stable; system.extraDependencies = [ fallback-paths-external - inputDrv.system ]; + + specialisation.newer-nix.configuration = { + nix.package = lib.mkForce nixVersions.latest; + + users.users.alice.isNormalUser = true; + }; }; testScript = '' @@ -91,7 +85,7 @@ pkgs.testers.nixosTest { with subtest("upgrade-via-switch-to-configuration"): # not using nixos-rebuild due to nix-instantiate being called and forcing all drv's to be rebuilt - print(machine.succeed("${inputDrv.system.outPath}/bin/switch-to-configuration switch")) + print(machine.succeed("/run/current-system/specialisation/newer-nix/bin/switch-to-configuration switch")) result = machine.succeed("nix --version") print(result) diff --git a/third_party/nixpkgs/nixos/tests/nixos-rebuild-target-host.nix b/third_party/nixpkgs/nixos/tests/nixos-rebuild-target-host.nix index bf80b2fa66..4a210f94fd 100644 --- a/third_party/nixpkgs/nixos/tests/nixos-rebuild-target-host.nix +++ b/third_party/nixpkgs/nixos/tests/nixos-rebuild-target-host.nix @@ -24,6 +24,8 @@ import ./make-test-python.nix ({ pkgs, ... }: { system.build.privateKey = snakeOilPrivateKey; system.build.publicKey = snakeOilPublicKey; + # needed to provide STC implementation for target + system.switch.enable = true; }; target = { nodes, lib, ... }: let diff --git a/third_party/nixpkgs/nixos/tests/saunafs.nix b/third_party/nixpkgs/nixos/tests/saunafs.nix new file mode 100644 index 0000000000..49d9861757 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/saunafs.nix @@ -0,0 +1,122 @@ +import ./make-test-python.nix ( + { pkgs, lib, ... }: + + let + master = + { pkgs, ... }: + { + # data base is stored in memory + # server may crash with default memory size + virtualisation.memorySize = 1024; + + services.saunafs.master = { + enable = true; + openFirewall = true; + exports = [ + "* / rw,alldirs,maproot=0:0" + ]; + }; + }; + + chunkserver = + { pkgs, ... }: + { + virtualisation.emptyDiskImages = [ 4096 ]; + boot.initrd.postDeviceCommands = '' + ${pkgs.e2fsprogs}/bin/mkfs.ext4 -L data /dev/vdb + ''; + + fileSystems = pkgs.lib.mkVMOverride { + "/data" = { + device = "/dev/disk/by-label/data"; + fsType = "ext4"; + }; + }; + + services.saunafs = { + masterHost = "master"; + chunkserver = { + openFirewall = true; + enable = true; + hdds = [ "/data" ]; + + # The test image is too small and gets set to "full" + settings.HDD_LEAVE_SPACE_DEFAULT = "100M"; + }; + }; + }; + + metalogger = + { pkgs, ... }: + { + services.saunafs = { + masterHost = "master"; + metalogger.enable = true; + }; + }; + + client = + { pkgs, lib, ... }: + { + services.saunafs.client.enable = true; + # systemd.tmpfiles.rules = [ "d /sfs 755 root root -" ]; + systemd.network.enable = true; + + # Use networkd to have properly functioning + # network-online.target + networking = { + useDHCP = false; + useNetworkd = true; + }; + + systemd.mounts = [ + { + requires = [ "network-online.target" ]; + after = [ "network-online.target" ]; + wantedBy = [ "remote-fs.target" ]; + type = "saunafs"; + what = "master:/"; + where = "/sfs"; + } + ]; + }; + + in + { + name = "saunafs"; + + meta.maintainers = [ lib.maintainers.markuskowa ]; + + nodes = { + inherit master metalogger; + chunkserver1 = chunkserver; + chunkserver2 = chunkserver; + client1 = client; + client2 = client; + }; + + testScript = '' + # prepare master server + master.start() + master.wait_for_unit("multi-user.target") + master.succeed("sfsmaster-init") + master.succeed("systemctl restart sfs-master") + master.wait_for_unit("sfs-master.service") + + metalogger.wait_for_unit("sfs-metalogger.service") + + # Setup chunkservers + for chunkserver in [chunkserver1, chunkserver2]: + chunkserver.wait_for_unit("multi-user.target") + chunkserver.succeed("chown saunafs:saunafs /data") + chunkserver.succeed("systemctl restart sfs-chunkserver") + chunkserver.wait_for_unit("sfs-chunkserver.service") + + for client in [client1, client2]: + client.wait_for_unit("multi-user.target") + + client1.succeed("echo test > /sfs/file") + client2.succeed("grep test /sfs/file") + ''; + } +) diff --git a/third_party/nixpkgs/nixos/tests/sing-box.nix b/third_party/nixpkgs/nixos/tests/sing-box.nix index 2693d9275f..a8a287586a 100644 --- a/third_party/nixpkgs/nixos/tests/sing-box.nix +++ b/third_party/nixpkgs/nixos/tests/sing-box.nix @@ -44,13 +44,17 @@ import ./make-test-python.nix ( type = "tun"; tag = "inbound:tun"; interface_name = "tun0"; - inet4_address = "172.16.0.1/30"; - inet6_address = "fd00::1/126"; + address = [ + "172.16.0.1/30" + "fd00::1/126" + ]; auto_route = true; - inet4_route_address = [ + iproute2_table_index = 2024; + iproute2_rule_index = 9001; + route_address = [ "${hosts."${target_host}"}/32" ]; - inet4_route_exclude_address = [ + route_exclude_address = [ "${hosts."${server_host}"}/32" ]; strict_route = false; @@ -513,9 +517,14 @@ import ./make-test-python.nix ( with subtest("tun"): tun.wait_for_unit("sing-box.service") - tun.wait_for_unit("sys-devices-virtual-net-tun0.device") - tun.wait_until_succeeds("ip route get ${hosts."${target_host}"} | grep 'dev tun0'") - tun.succeed("ip addr show tun0") + tun.wait_for_unit("sys-devices-virtual-net-${tunInbound.interface_name}.device") + tun.wait_until_succeeds("ip route get ${hosts."${target_host}"} | grep 'dev ${tunInbound.interface_name}'") + tun.succeed("ip addr show ${tunInbound.interface_name}") + tun.succeed("ip route show table ${toString tunInbound.iproute2_table_index} | grep ${tunInbound.interface_name}") + assert ( + tun.succeed("ip rule list table ${toString tunInbound.iproute2_table_index} | sort | head -1 | awk -F: '{print $1}' | tr -d '\n'") + == "${toString tunInbound.iproute2_rule_index}" + ) test_curl(tun) with subtest("wireguard"): @@ -530,8 +539,8 @@ import ./make-test-python.nix ( with subtest("fakeip"): fakeip.wait_for_unit("sing-box.service") - fakeip.wait_for_unit("sys-devices-virtual-net-tun0.device") - fakeip.wait_until_succeeds("ip route get ${hosts."${target_host}"} | grep 'dev tun0'") + fakeip.wait_for_unit("sys-devices-virtual-net-${tunInbound.interface_name}.device") + fakeip.wait_until_succeeds("ip route get ${hosts."${target_host}"} | grep 'dev ${tunInbound.interface_name}'") fakeip.succeed("dig +short A ${target_host} @${target_host} | grep '^198.18.'") ''; diff --git a/third_party/nixpkgs/nixos/tests/systemd-boot.nix b/third_party/nixpkgs/nixos/tests/systemd-boot.nix index 79bfcb84eb..812d6088ed 100644 --- a/third_party/nixpkgs/nixos/tests/systemd-boot.nix +++ b/third_party/nixpkgs/nixos/tests/systemd-boot.nix @@ -1,6 +1,7 @@ -{ system ? builtins.currentSystem, - config ? {}, - pkgs ? import ../.. { inherit system config; } +{ + system ? builtins.currentSystem, + config ? { }, + pkgs ? import ../.. { inherit system config; }, }: with import ../lib/testing-python.nix { inherit system pkgs; }; @@ -16,7 +17,13 @@ let system.switch.enable = true; }; - commonXbootldr = { config, lib, pkgs, ... }: + commonXbootldr = + { + config, + lib, + pkgs, + ... + }: let diskImage = import ../lib/make-disk-image.nix { inherit config lib pkgs; @@ -85,7 +92,10 @@ in { basic = makeTest { name = "systemd-boot"; - meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer julienmalka ]; + meta.maintainers = with pkgs.lib.maintainers; [ + danielfullmer + julienmalka + ]; nodes.machine = common; @@ -117,22 +127,25 @@ in virtualisation.useSecureBoot = true; }; - testScript = let - efiArch = pkgs.stdenv.hostPlatform.efiArch; - in { nodes, ... }: '' - machine.start(allow_reboot=True) - machine.wait_for_unit("multi-user.target") + testScript = + let + efiArch = pkgs.stdenv.hostPlatform.efiArch; + in + { nodes, ... }: + '' + machine.start(allow_reboot=True) + machine.wait_for_unit("multi-user.target") - machine.succeed("sbctl create-keys") - machine.succeed("sbctl enroll-keys --yes-this-might-brick-my-machine") - machine.succeed('sbctl sign /boot/EFI/systemd/systemd-boot${efiArch}.efi') - machine.succeed('sbctl sign /boot/EFI/BOOT/BOOT${toUpper efiArch}.EFI') - machine.succeed('sbctl sign /boot/EFI/nixos/*${nodes.machine.system.boot.loader.kernelFile}.efi') + machine.succeed("sbctl create-keys") + machine.succeed("sbctl enroll-keys --yes-this-might-brick-my-machine") + machine.succeed('sbctl sign /boot/EFI/systemd/systemd-boot${efiArch}.efi') + machine.succeed('sbctl sign /boot/EFI/BOOT/BOOT${toUpper efiArch}.EFI') + machine.succeed('sbctl sign /boot/EFI/nixos/*${nodes.machine.system.boot.loader.kernelFile}.efi') - machine.reboot() + machine.reboot() - assert "Secure Boot: enabled (user)" in machine.succeed("bootctl status") - ''; + assert "Secure Boot: enabled (user)" in machine.succeed("bootctl status") + ''; }; basicXbootldr = makeTest { @@ -141,80 +154,97 @@ in nodes.machine = commonXbootldr; - testScript = { nodes, ... }: '' - ${customDiskImage nodes} + testScript = + { nodes, ... }: + '' + ${customDiskImage nodes} - machine.start() - machine.wait_for_unit("multi-user.target") + machine.start() + machine.wait_for_unit("multi-user.target") - machine.succeed("test -e /efi/EFI/systemd/systemd-bootx64.efi") - machine.succeed("test -e /boot/loader/entries/nixos-generation-1.conf") + machine.succeed("test -e /efi/EFI/systemd/systemd-bootx64.efi") + machine.succeed("test -e /boot/loader/entries/nixos-generation-1.conf") - # Ensure we actually booted using systemd-boot - # Magic number is the vendor UUID used by systemd-boot. - machine.succeed( - "test -e /sys/firmware/efi/efivars/LoaderEntrySelected-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f" - ) + # Ensure we actually booted using systemd-boot + # Magic number is the vendor UUID used by systemd-boot. + machine.succeed( + "test -e /sys/firmware/efi/efivars/LoaderEntrySelected-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f" + ) - # "bootctl install" should have created an EFI entry - machine.succeed('efibootmgr | grep "Linux Boot Manager"') - ''; + # "bootctl install" should have created an EFI entry + machine.succeed('efibootmgr | grep "Linux Boot Manager"') + ''; }; # Check that specialisations create corresponding boot entries. specialisation = makeTest { name = "systemd-boot-specialisation"; - meta.maintainers = with pkgs.lib.maintainers; [ lukegb julienmalka ]; + meta.maintainers = with pkgs.lib.maintainers; [ + lukegb + julienmalka + ]; - nodes.machine = { pkgs, lib, ... }: { - imports = [ common ]; - specialisation.something.configuration = { - boot.loader.systemd-boot.sortKey = "something"; + nodes.machine = + { pkgs, lib, ... }: + { + imports = [ common ]; + specialisation.something.configuration = { + boot.loader.systemd-boot.sortKey = "something"; - # Since qemu will dynamically create a devicetree blob when starting - # up, it is not straight forward to create an export of that devicetree - # blob without knowing before-hand all the flags we would pass to qemu - # (we would then be able to use `dumpdtb`). Thus, the following config - # will not boot, but it does allow us to assert that the boot entry has - # the correct contents. - boot.loader.systemd-boot.installDeviceTree = pkgs.stdenv.hostPlatform.isAarch64; - hardware.deviceTree.name = "dummy.dtb"; - hardware.deviceTree.package = lib.mkForce (pkgs.runCommand "dummy-devicetree-package" { } '' - mkdir -p $out - cp ${pkgs.emptyFile} $out/dummy.dtb - ''); + # Since qemu will dynamically create a devicetree blob when starting + # up, it is not straight forward to create an export of that devicetree + # blob without knowing before-hand all the flags we would pass to qemu + # (we would then be able to use `dumpdtb`). Thus, the following config + # will not boot, but it does allow us to assert that the boot entry has + # the correct contents. + boot.loader.systemd-boot.installDeviceTree = pkgs.stdenv.hostPlatform.isAarch64; + hardware.deviceTree.name = "dummy.dtb"; + hardware.deviceTree.package = lib.mkForce ( + pkgs.runCommand "dummy-devicetree-package" { } '' + mkdir -p $out + cp ${pkgs.emptyFile} $out/dummy.dtb + '' + ); + }; }; - }; - testScript = { nodes, ... }: '' - machine.start() - machine.wait_for_unit("multi-user.target") + testScript = + { nodes, ... }: + '' + machine.start() + machine.wait_for_unit("multi-user.target") - machine.succeed( - "test -e /boot/loader/entries/nixos-generation-1-specialisation-something.conf" - ) - machine.succeed( - "grep -q 'title NixOS (something)' /boot/loader/entries/nixos-generation-1-specialisation-something.conf" - ) - machine.succeed( - "grep 'sort-key something' /boot/loader/entries/nixos-generation-1-specialisation-something.conf" - ) - '' + pkgs.lib.optionalString pkgs.stdenv.hostPlatform.isAarch64 '' - machine.succeed( - r"grep 'devicetree /EFI/nixos/[a-z0-9]\{32\}.*dummy' /boot/loader/entries/nixos-generation-1-specialisation-something.conf" - ) - ''; + machine.succeed( + "test -e /boot/loader/entries/nixos-generation-1-specialisation-something.conf" + ) + machine.succeed( + "grep -q 'title NixOS (something)' /boot/loader/entries/nixos-generation-1-specialisation-something.conf" + ) + machine.succeed( + "grep 'sort-key something' /boot/loader/entries/nixos-generation-1-specialisation-something.conf" + ) + '' + + pkgs.lib.optionalString pkgs.stdenv.hostPlatform.isAarch64 '' + machine.succeed( + r"grep 'devicetree /EFI/nixos/[a-z0-9]\{32\}.*dummy' /boot/loader/entries/nixos-generation-1-specialisation-something.conf" + ) + ''; }; # Boot without having created an EFI entry--instead using default "/EFI/BOOT/BOOTX64.EFI" fallback = makeTest { name = "systemd-boot-fallback"; - meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer julienmalka ]; + meta.maintainers = with pkgs.lib.maintainers; [ + danielfullmer + julienmalka + ]; - nodes.machine = { pkgs, lib, ... }: { - imports = [ common ]; - boot.loader.efi.canTouchEfiVariables = mkForce false; - }; + nodes.machine = + { pkgs, lib, ... }: + { + imports = [ common ]; + boot.loader.efi.canTouchEfiVariables = mkForce false; + }; testScript = '' machine.start() @@ -235,7 +265,10 @@ in update = makeTest { name = "systemd-boot-update"; - meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer julienmalka ]; + meta.maintainers = with pkgs.lib.maintainers; [ + danielfullmer + julienmalka + ]; nodes.machine = common; @@ -270,29 +303,35 @@ in ''; }; - memtest86 = with pkgs.lib; optionalAttrs (meta.availableOn { inherit system; } pkgs.memtest86plus) (makeTest { - name = "systemd-boot-memtest86"; - meta.maintainers = with maintainers; [ julienmalka ]; + memtest86 = + with pkgs.lib; + optionalAttrs (meta.availableOn { inherit system; } pkgs.memtest86plus) (makeTest { + name = "systemd-boot-memtest86"; + meta.maintainers = with maintainers; [ julienmalka ]; - nodes.machine = { pkgs, lib, ... }: { - imports = [ common ]; - boot.loader.systemd-boot.memtest86.enable = true; - }; + nodes.machine = + { pkgs, lib, ... }: + { + imports = [ common ]; + boot.loader.systemd-boot.memtest86.enable = true; + }; - testScript = '' - machine.succeed("test -e /boot/loader/entries/memtest86.conf") - machine.succeed("test -e /boot/efi/memtest86/memtest.efi") - ''; - }); + testScript = '' + machine.succeed("test -e /boot/loader/entries/memtest86.conf") + machine.succeed("test -e /boot/efi/memtest86/memtest.efi") + ''; + }); netbootxyz = makeTest { name = "systemd-boot-netbootxyz"; meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ]; - nodes.machine = { pkgs, lib, ... }: { - imports = [ common ]; - boot.loader.systemd-boot.netbootxyz.enable = true; - }; + nodes.machine = + { pkgs, lib, ... }: + { + imports = [ common ]; + boot.loader.systemd-boot.netbootxyz.enable = true; + }; testScript = '' machine.succeed("test -e /boot/loader/entries/netbootxyz.conf") @@ -300,15 +339,77 @@ in ''; }; + edk2-uefi-shell = makeTest { + name = "systemd-boot-edk2-uefi-shell"; + meta.maintainers = with pkgs.lib.maintainers; [ iFreilicht ]; + + nodes.machine = { ... }: { + imports = [ common ]; + boot.loader.systemd-boot.edk2-uefi-shell.enable = true; + }; + + testScript = '' + machine.succeed("test -e /boot/loader/entries/edk2-uefi-shell.conf") + machine.succeed("test -e /boot/efi/edk2-uefi-shell/shell.efi") + ''; + }; + + windows = makeTest { + name = "systemd-boot-windows"; + meta.maintainers = with pkgs.lib.maintainers; [ iFreilicht ]; + + nodes.machine = { ... }: { + imports = [ common ]; + boot.loader.systemd-boot.windows = { + "7" = { + efiDeviceHandle = "HD0c1"; + sortKey = "before_all_others"; + }; + "Ten".efiDeviceHandle = "FS0"; + "11" = { + title = "Title with-_-punctuation ...?!"; + efiDeviceHandle = "HD0d4"; + sortKey = "zzz"; + }; + }; + }; + + testScript = '' + machine.succeed("test -e /boot/efi/edk2-uefi-shell/shell.efi") + + machine.succeed("test -e /boot/loader/entries/windows_7.conf") + machine.succeed("test -e /boot/loader/entries/windows_Ten.conf") + machine.succeed("test -e /boot/loader/entries/windows_11.conf") + + machine.succeed("grep 'efi /efi/edk2-uefi-shell/shell.efi' /boot/loader/entries/windows_7.conf") + machine.succeed("grep 'efi /efi/edk2-uefi-shell/shell.efi' /boot/loader/entries/windows_Ten.conf") + machine.succeed("grep 'efi /efi/edk2-uefi-shell/shell.efi' /boot/loader/entries/windows_11.conf") + + machine.succeed("grep 'HD0c1:EFI\\\\Microsoft\\\\Boot\\\\Bootmgfw.efi' /boot/loader/entries/windows_7.conf") + machine.succeed("grep 'FS0:EFI\\\\Microsoft\\\\Boot\\\\Bootmgfw.efi' /boot/loader/entries/windows_Ten.conf") + machine.succeed("grep 'HD0d4:EFI\\\\Microsoft\\\\Boot\\\\Bootmgfw.efi' /boot/loader/entries/windows_11.conf") + + machine.succeed("grep 'sort-key before_all_others' /boot/loader/entries/windows_7.conf") + machine.succeed("grep 'sort-key o_windows_Ten' /boot/loader/entries/windows_Ten.conf") + machine.succeed("grep 'sort-key zzz' /boot/loader/entries/windows_11.conf") + + machine.succeed("grep 'title Windows 7' /boot/loader/entries/windows_7.conf") + machine.succeed("grep 'title Windows Ten' /boot/loader/entries/windows_Ten.conf") + machine.succeed('grep "title Title with-_-punctuation ...?!" /boot/loader/entries/windows_11.conf') + ''; + }; + memtestSortKey = makeTest { name = "systemd-boot-memtest-sortkey"; meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ]; - nodes.machine = { pkgs, lib, ... }: { - imports = [ common ]; - boot.loader.systemd-boot.memtest86.enable = true; - boot.loader.systemd-boot.memtest86.sortKey = "apple"; - }; + nodes.machine = + { pkgs, lib, ... }: + { + imports = [ common ]; + boot.loader.systemd-boot.memtest86.enable = true; + boot.loader.systemd-boot.memtest86.sortKey = "apple"; + }; testScript = '' machine.succeed("test -e /boot/loader/entries/memtest86.conf") @@ -321,35 +422,41 @@ in name = "systemd-boot-entry-filename-xbootldr"; meta.maintainers = with pkgs.lib.maintainers; [ sdht0 ]; - nodes.machine = { pkgs, lib, ... }: { - imports = [ commonXbootldr ]; - boot.loader.systemd-boot.memtest86.enable = true; - }; + nodes.machine = + { pkgs, lib, ... }: + { + imports = [ commonXbootldr ]; + boot.loader.systemd-boot.memtest86.enable = true; + }; - testScript = { nodes, ... }: '' - ${customDiskImage nodes} + testScript = + { nodes, ... }: + '' + ${customDiskImage nodes} - machine.start() - machine.wait_for_unit("multi-user.target") + machine.start() + machine.wait_for_unit("multi-user.target") - machine.succeed("test -e /efi/EFI/systemd/systemd-bootx64.efi") - machine.succeed("test -e /boot/loader/entries/memtest86.conf") - machine.succeed("test -e /boot/EFI/memtest86/memtest.efi") - ''; + machine.succeed("test -e /efi/EFI/systemd/systemd-bootx64.efi") + machine.succeed("test -e /boot/loader/entries/memtest86.conf") + machine.succeed("test -e /boot/EFI/memtest86/memtest.efi") + ''; }; extraEntries = makeTest { name = "systemd-boot-extra-entries"; meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ]; - nodes.machine = { pkgs, lib, ... }: { - imports = [ common ]; - boot.loader.systemd-boot.extraEntries = { - "banana.conf" = '' - title banana - ''; + nodes.machine = + { pkgs, lib, ... }: + { + imports = [ common ]; + boot.loader.systemd-boot.extraEntries = { + "banana.conf" = '' + title banana + ''; + }; }; - }; testScript = '' machine.succeed("test -e /boot/loader/entries/banana.conf") @@ -361,12 +468,14 @@ in name = "systemd-boot-extra-files"; meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ]; - nodes.machine = { pkgs, lib, ... }: { - imports = [ common ]; - boot.loader.systemd-boot.extraFiles = { - "efi/fruits/tomato.efi" = pkgs.netbootxyz-efi; + nodes.machine = + { pkgs, lib, ... }: + { + imports = [ common ]; + boot.loader.systemd-boot.extraFiles = { + "efi/fruits/tomato.efi" = pkgs.netbootxyz-efi; + }; }; - }; testScript = '' machine.succeed("test -e /boot/efi/fruits/tomato.efi") @@ -381,55 +490,62 @@ in nodes = { inherit common; - machine = { pkgs, nodes, ... }: { - imports = [ common ]; - boot.loader.systemd-boot.extraFiles = { - "efi/fruits/tomato.efi" = pkgs.netbootxyz-efi; + machine = + { pkgs, nodes, ... }: + { + imports = [ common ]; + boot.loader.systemd-boot.extraFiles = { + "efi/fruits/tomato.efi" = pkgs.netbootxyz-efi; + }; + + # These are configs for different nodes, but we'll use them here in `machine` + system.extraDependencies = [ + nodes.common.system.build.toplevel + nodes.with_netbootxyz.system.build.toplevel + ]; }; - # These are configs for different nodes, but we'll use them here in `machine` - system.extraDependencies = [ - nodes.common.system.build.toplevel - nodes.with_netbootxyz.system.build.toplevel - ]; - }; - - with_netbootxyz = { pkgs, ... }: { - imports = [ common ]; - boot.loader.systemd-boot.netbootxyz.enable = true; - }; + with_netbootxyz = + { pkgs, ... }: + { + imports = [ common ]; + boot.loader.systemd-boot.netbootxyz.enable = true; + }; }; - testScript = { nodes, ... }: let - originalSystem = nodes.machine.system.build.toplevel; - baseSystem = nodes.common.system.build.toplevel; - finalSystem = nodes.with_netbootxyz.system.build.toplevel; - in '' - machine.succeed("test -e /boot/efi/fruits/tomato.efi") - machine.succeed("test -e /boot/efi/nixos/.extra-files/efi/fruits/tomato.efi") + testScript = + { nodes, ... }: + let + originalSystem = nodes.machine.system.build.toplevel; + baseSystem = nodes.common.system.build.toplevel; + finalSystem = nodes.with_netbootxyz.system.build.toplevel; + in + '' + machine.succeed("test -e /boot/efi/fruits/tomato.efi") + machine.succeed("test -e /boot/efi/nixos/.extra-files/efi/fruits/tomato.efi") - with subtest("remove files when no longer needed"): - machine.succeed("${baseSystem}/bin/switch-to-configuration boot") - machine.fail("test -e /boot/efi/fruits/tomato.efi") - machine.fail("test -d /boot/efi/fruits") - machine.succeed("test -d /boot/efi/nixos/.extra-files") - machine.fail("test -e /boot/efi/nixos/.extra-files/efi/fruits/tomato.efi") - machine.fail("test -d /boot/efi/nixos/.extra-files/efi/fruits") + with subtest("remove files when no longer needed"): + machine.succeed("${baseSystem}/bin/switch-to-configuration boot") + machine.fail("test -e /boot/efi/fruits/tomato.efi") + machine.fail("test -d /boot/efi/fruits") + machine.succeed("test -d /boot/efi/nixos/.extra-files") + machine.fail("test -e /boot/efi/nixos/.extra-files/efi/fruits/tomato.efi") + machine.fail("test -d /boot/efi/nixos/.extra-files/efi/fruits") - with subtest("files are added back when needed again"): - machine.succeed("${originalSystem}/bin/switch-to-configuration boot") - machine.succeed("test -e /boot/efi/fruits/tomato.efi") - machine.succeed("test -e /boot/efi/nixos/.extra-files/efi/fruits/tomato.efi") + with subtest("files are added back when needed again"): + machine.succeed("${originalSystem}/bin/switch-to-configuration boot") + machine.succeed("test -e /boot/efi/fruits/tomato.efi") + machine.succeed("test -e /boot/efi/nixos/.extra-files/efi/fruits/tomato.efi") - with subtest("simultaneously removing and adding files works"): - machine.succeed("${finalSystem}/bin/switch-to-configuration boot") - machine.fail("test -e /boot/efi/fruits/tomato.efi") - machine.fail("test -e /boot/efi/nixos/.extra-files/efi/fruits/tomato.efi") - machine.succeed("test -e /boot/loader/entries/netbootxyz.conf") - machine.succeed("test -e /boot/efi/netbootxyz/netboot.xyz.efi") - machine.succeed("test -e /boot/efi/nixos/.extra-files/loader/entries/netbootxyz.conf") - machine.succeed("test -e /boot/efi/nixos/.extra-files/efi/netbootxyz/netboot.xyz.efi") - ''; + with subtest("simultaneously removing and adding files works"): + machine.succeed("${finalSystem}/bin/switch-to-configuration boot") + machine.fail("test -e /boot/efi/fruits/tomato.efi") + machine.fail("test -e /boot/efi/nixos/.extra-files/efi/fruits/tomato.efi") + machine.succeed("test -e /boot/loader/entries/netbootxyz.conf") + machine.succeed("test -e /boot/efi/netbootxyz/netboot.xyz.efi") + machine.succeed("test -e /boot/efi/nixos/.extra-files/loader/entries/netbootxyz.conf") + machine.succeed("test -e /boot/efi/nixos/.extra-files/efi/netbootxyz/netboot.xyz.efi") + ''; }; garbage-collect-entry = makeTest { @@ -438,17 +554,20 @@ in nodes = { inherit common; - machine = { pkgs, nodes, ... }: { - imports = [ common ]; + machine = + { pkgs, nodes, ... }: + { + imports = [ common ]; - # These are configs for different nodes, but we'll use them here in `machine` - system.extraDependencies = [ - nodes.common.system.build.toplevel - ]; - }; + # These are configs for different nodes, but we'll use them here in `machine` + system.extraDependencies = [ + nodes.common.system.build.toplevel + ]; + }; }; - testScript = { nodes, ... }: + testScript = + { nodes, ... }: let baseSystem = nodes.common.system.build.toplevel; in @@ -461,19 +580,18 @@ in ''; }; - no-bootspec = makeTest - { - name = "systemd-boot-no-bootspec"; - meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ]; + no-bootspec = makeTest { + name = "systemd-boot-no-bootspec"; + meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ]; - nodes.machine = { - imports = [ common ]; - boot.bootspec.enable = false; - }; - - testScript = '' - machine.start() - machine.wait_for_unit("multi-user.target") - ''; + nodes.machine = { + imports = [ common ]; + boot.bootspec.enable = false; }; + + testScript = '' + machine.start() + machine.wait_for_unit("multi-user.target") + ''; + }; } diff --git a/third_party/nixpkgs/nixos/tests/systemd-initrd-simple.nix b/third_party/nixpkgs/nixos/tests/systemd-initrd-simple.nix index 2b7283a821..b61cb8ddae 100644 --- a/third_party/nixpkgs/nixos/tests/systemd-initrd-simple.nix +++ b/third_party/nixpkgs/nixos/tests/systemd-initrd-simple.nix @@ -29,6 +29,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { machine.succeed("[ -e /dev/shm ]") # /dev/shm machine.succeed("[ -e /dev/pts/ptmx ]") # /dev/pts machine.succeed("[ -e /run/keys ]") # /run/keys + # /nixos-closure didn't leak into stage-2 + machine.succeed("[ ! -e /nixos-closure ]") with subtest("groups work"): machine.fail("journalctl -b 0 | grep 'systemd-udevd.*Unknown group.*ignoring'") diff --git a/third_party/nixpkgs/nixos/tests/systemd-networkd.nix b/third_party/nixpkgs/nixos/tests/systemd-networkd.nix index a595fb9cba..34272f9b04 100644 --- a/third_party/nixpkgs/nixos/tests/systemd-networkd.nix +++ b/third_party/nixpkgs/nixos/tests/systemd-networkd.nix @@ -1,4 +1,4 @@ -let generateNodeConf = { lib, pkgs, config, privk, pubk, peerId, nodeId, ...}: { +let generateNodeConf = { lib, pkgs, config, privk, pubk, systemdCreds, peerId, nodeId, ...}: { imports = [ common/user-account.nix ]; systemd.services.systemd-networkd.environment.SYSTEMD_LOG_LEVEL = "debug"; networking.useNetworkd = true; @@ -6,6 +6,7 @@ let generateNodeConf = { lib, pkgs, config, privk, pubk, peerId, nodeId, ...}: { networking.firewall.enable = false; virtualisation.vlans = [ 1 ]; environment.systemPackages = with pkgs; [ wireguard-tools ]; + environment.etc."credstore/network.wireguard.private" = lib.mkIf systemdCreds { text = privk; }; systemd.network = { enable = true; config = { @@ -15,11 +16,14 @@ let generateNodeConf = { lib, pkgs, config, privk, pubk, peerId, nodeId, ...}: { "90-wg0" = { netdevConfig = { Kind = "wireguard"; Name = "wg0"; }; wireguardConfig = { + # Test storing wireguard private key using systemd credentials. + PrivateKey = lib.mkIf systemdCreds "@network.wireguard.private"; + # NOTE: we're storing the wireguard private key in the # store for this test. Do not do this in the real # world. Keep in mind the nix store is # world-readable. - PrivateKeyFile = pkgs.writeText "wg0-priv" privk; + PrivateKeyFile = lib.mkIf (!systemdCreds) (pkgs.writeText "wg0-priv" privk); ListenPort = 51820; FirewallMark = 42; }; @@ -74,6 +78,7 @@ in import ./make-test-python.nix ({pkgs, ... }: { let localConf = { privk = "GDiXWlMQKb379XthwX0haAbK6hTdjblllpjGX0heP00="; pubk = "iRxpqj42nnY0Qz8MAQbSm7bXxXP5hkPqWYIULmvW+EE="; + systemdCreds = false; nodeId = "1"; peerId = "2"; }; @@ -83,6 +88,7 @@ in import ./make-test-python.nix ({pkgs, ... }: { let localConf = { privk = "eHxSI2jwX/P4AOI0r8YppPw0+4NZnjOxfbS5mt06K2k="; pubk = "27s0OvaBBdHoJYkH9osZpjpgSOVNw+RaKfboT/Sfq0g="; + systemdCreds = true; nodeId = "2"; peerId = "1"; }; diff --git a/third_party/nixpkgs/nixos/tests/timescaledb.nix b/third_party/nixpkgs/nixos/tests/timescaledb.nix index ba0a3cec60..8ee788daea 100644 --- a/third_party/nixpkgs/nixos/tests/timescaledb.nix +++ b/third_party/nixpkgs/nixos/tests/timescaledb.nix @@ -83,7 +83,7 @@ let ''; }; - applicablePostgresqlVersions = filterAttrs (_: value: versionAtLeast value.version "12") postgresql-versions; + applicablePostgresqlVersions = filterAttrs (_: value: versionAtLeast value.version "14") postgresql-versions; in mapAttrs' (name: package: { diff --git a/third_party/nixpkgs/nixos/tests/tmate-ssh-server.nix b/third_party/nixpkgs/nixos/tests/tmate-ssh-server.nix index 9f4d7aa379..593663a13a 100644 --- a/third_party/nixpkgs/nixos/tests/tmate-ssh-server.nix +++ b/third_party/nixpkgs/nixos/tests/tmate-ssh-server.nix @@ -6,9 +6,9 @@ let setUpPrivateKey = name: '' ${name}.succeed( "mkdir -p /root/.ssh", - "chown 700 /root/.ssh", + "chmod 700 /root/.ssh", "cat '${snakeOilPrivateKey}' > /root/.ssh/id_snakeoil", - "chown 600 /root/.ssh/id_snakeoil", + "chmod 600 /root/.ssh/id_snakeoil", ) ${name}.wait_for_file("/root/.ssh/id_snakeoil") ''; diff --git a/third_party/nixpkgs/nixos/tests/web-apps/immich.nix b/third_party/nixpkgs/nixos/tests/web-apps/immich.nix index f03b9290f7..8004afd93c 100644 --- a/third_party/nixpkgs/nixos/tests/web-apps/immich.nix +++ b/third_party/nixpkgs/nixos/tests/web-apps/immich.nix @@ -26,24 +26,24 @@ import ../make-test-python.nix ( machine.wait_for_unit("immich-server.service") - machine.wait_for_open_port(3001) # Server + machine.wait_for_open_port(2283) # Server machine.wait_for_open_port(3003) # Machine learning - machine.succeed("curl --fail http://localhost:3001/") + machine.succeed("curl --fail http://localhost:2283/") machine.succeed(""" - curl -H 'Content-Type: application/json' --data '{ "email": "test@example.com", "name": "Admin", "password": "admin" }' -X POST http://localhost:3001/api/auth/admin-sign-up + curl -H 'Content-Type: application/json' --data '{ "email": "test@example.com", "name": "Admin", "password": "admin" }' -X POST http://localhost:2283/api/auth/admin-sign-up """) res = machine.succeed(""" - curl -H 'Content-Type: application/json' --data '{ "email": "test@example.com", "password": "admin" }' -X POST http://localhost:3001/api/auth/login + curl -H 'Content-Type: application/json' --data '{ "email": "test@example.com", "password": "admin" }' -X POST http://localhost:2283/api/auth/login """) token = json.loads(res)['accessToken'] res = machine.succeed(""" - curl -H 'Content-Type: application/json' -H 'Cookie: immich_access_token=%s' --data '{ "name": "API Key", "permissions": ["all"] }' -X POST http://localhost:3001/api/api-keys + curl -H 'Content-Type: application/json' -H 'Cookie: immich_access_token=%s' --data '{ "name": "API Key", "permissions": ["all"] }' -X POST http://localhost:2283/api/api-keys """ % token) key = json.loads(res)['secret'] - machine.succeed(f"immich login http://localhost:3001/api {key}") + machine.succeed(f"immich login http://localhost:2283/api {key}") res = machine.succeed("immich server-info") print(res) ''; diff --git a/third_party/nixpkgs/nixos/tests/web-apps/snipe-it.nix b/third_party/nixpkgs/nixos/tests/web-apps/snipe-it.nix index 123d774205..b04bd51683 100644 --- a/third_party/nixpkgs/nixos/tests/web-apps/snipe-it.nix +++ b/third_party/nixpkgs/nixos/tests/web-apps/snipe-it.nix @@ -65,7 +65,9 @@ in { with subtest("Circumvent the pre-flight setup by just writing some settings into the database ourself"): snipeit.succeed( """ - mysql -D ${nodes.snipeit.services.snipe-it.database.name} -e "INSERT INTO settings (id, user_id, site_name) VALUES ('1', '1', '${siteName}');" + mysql -D ${nodes.snipeit.services.snipe-it.database.name} -e " + INSERT INTO settings (id, site_name, login_remote_user_custom_logout_url, login_remote_user_header_name) + VALUES ('1', '${siteName}', 'https://whatever.invalid', 'whatever');" """ ) diff --git a/third_party/nixpkgs/nixos/tests/web-servers/unit-perl.nix b/third_party/nixpkgs/nixos/tests/web-servers/unit-perl.nix new file mode 100644 index 0000000000..e632221747 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/web-servers/unit-perl.nix @@ -0,0 +1,46 @@ +import ../make-test-python.nix ( + { pkgs, ... }: + let + testdir = pkgs.writeTextDir "www/app.psgi" '' + my $app = sub { + return [ + "200", + [ "Content-Type" => "text/plain" ], + [ "Hello, Perl on Unit!" ], + ]; + }; + ''; + + in + { + name = "unit-perl-test"; + meta.maintainers = with pkgs.lib.maintainers; [ sgo ]; + + nodes.machine = + { + config, + lib, + pkgs, + ... + }: + { + services.unit = { + enable = true; + config = pkgs.lib.strings.toJSON { + listeners."*:8080".application = "perl"; + applications.perl = { + type = "perl"; + script = "${testdir}/www/app.psgi"; + }; + }; + }; + }; + testScript = '' + machine.wait_for_unit("unit.service") + machine.wait_for_open_port(8080) + + response = machine.succeed("curl -f -vvv -s http://127.0.0.1:8080/") + assert "Hello, Perl on Unit!" in response, "Hello world" + ''; + } +) diff --git a/third_party/nixpkgs/pkgs/applications/audio/ardour/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ardour/default.nix index bb969408ba..66a62f6190 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ardour/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ardour/default.nix @@ -64,14 +64,14 @@ }: stdenv.mkDerivation rec { pname = "ardour"; - version = "8.6"; + version = "8.8"; # We can't use `fetchFromGitea` here, as attempting to fetch release archives from git.ardour.org # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info. src = fetchgit { url = "git://git.ardour.org/ardour/ardour.git"; rev = version; - hash = "sha256-sMp24tjtX8fZJWc7dvb+9e6pEflT4ugoOZjDis6/3nM="; + hash = "sha256-S96hlk4M+38OjjF3T6lhDm3cBjN5t4y6EeYRmvAmVfE="; }; bundledContent = fetchzip { diff --git a/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix b/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix deleted file mode 100644 index 85ceb93f48..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix +++ /dev/null @@ -1,208 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, makeWrapper -, wrapGAppsHook3 -, pkg-config -, python3 -, gettext -, file -, libvorbis -, libmad -, libjack2 -, lv2 -, lilv -, mpg123 -, opusfile -, rapidjson -, serd -, sord -, sqlite -, sratom -, suil -, libsndfile -, soxr -, flac -, lame -, twolame -, expat -, libid3tag -, libopus -, libuuid -, ffmpeg_7 -, soundtouch -, pcre -, portaudio # given up fighting their portaudio.patch? -, portmidi -, linuxHeaders -, alsa-lib -, at-spi2-core -, dbus -, libepoxy -, libXdmcp -, libXtst -, libpthreadstubs -, libsbsms_2_3_0 -, libselinux -, libsepol -, libxkbcommon -, util-linux -, wavpack -, wxGTK32 -, gtk3 -, libpng -, libjpeg -, AppKit -, CoreAudioKit -}: - -# TODO -# 1. detach sbsms - -stdenv.mkDerivation rec { - pname = "audacity"; - version = "3.6.4"; - - src = fetchFromGitHub { - owner = "audacity"; - repo = "audacity"; - rev = "Audacity-${version}"; - hash = "sha256-72k79UFxhk8JUCnMzbU9lZ0Ua3Ui41EkhPGSnGkf9mE="; - }; - - postPatch = '' - mkdir src/private - substituteInPlace scripts/build/macOS/fix_bundle.py \ - --replace "path.startswith('/usr/lib/')" "path.startswith('${builtins.storeDir}')" - '' + lib.optionalString stdenv.hostPlatform.isLinux '' - substituteInPlace libraries/lib-files/FileNames.cpp \ - --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h - '' + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0") '' - sed -z -i "s/NSAppearanceName.*systemAppearance//" src/AudacityApp.mm - ''; - - nativeBuildInputs = [ - cmake - gettext - pkg-config - python3 - makeWrapper - wrapGAppsHook3 - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - linuxHeaders - ]; - - buildInputs = [ - expat - ffmpeg_7 - file - flac - gtk3 - lame - libid3tag - libjack2 - libmad - libopus - libsbsms_2_3_0 - libsndfile - libvorbis - lilv - lv2 - mpg123 - opusfile - pcre - portmidi - rapidjson - serd - sord - soundtouch - soxr - sqlite - sratom - suil - twolame - portaudio - wavpack - wxGTK32 - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib # for portaudio - at-spi2-core - dbus - libepoxy - libXdmcp - libXtst - libpthreadstubs - libxkbcommon - libselinux - libsepol - libuuid - util-linux - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - CoreAudioKit # for portaudio - libpng - libjpeg - ]; - - cmakeFlags = [ - "-DAUDACITY_BUILD_LEVEL=2" - "-DAUDACITY_REV_LONG=nixpkgs" - "-DAUDACITY_REV_TIME=nixpkgs" - "-DDISABLE_DYNAMIC_LOADING_FFMPEG=ON" - "-Daudacity_conan_enabled=Off" - "-Daudacity_use_ffmpeg=loaded" - "-Daudacity_has_vst3=Off" - "-Daudacity_has_crashreports=Off" - - # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ - "-DCMAKE_SKIP_BUILD_RPATH=ON" - - # Fix duplicate store paths - "-DCMAKE_INSTALL_LIBDIR=lib" - ]; - - # [ 57%] Generating LightThemeAsCeeCode.h... - # ../../utils/image-compiler: error while loading shared libraries: - # lib-theme.so: cannot open shared object file: No such file or directory - preBuild = '' - export LD_LIBRARY_PATH=$PWD/Release/lib/audacity - ''; - - doCheck = false; # Test fails - - dontWrapGApps = true; - - # Replace audacity's wrapper, to: - # - put it in the right place, it shouldn't be in "$out/audacity" - # - Add the ffmpeg dynamic dependency - postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' - wrapProgram "$out/bin/audacity" \ - "''${gappsWrapperArgs[@]}" \ - --prefix LD_LIBRARY_PATH : "$out/lib/audacity":${lib.makeLibraryPath [ ffmpeg_7 ]} \ - --suffix AUDACITY_MODULES_PATH : "$out/lib/audacity/modules" \ - --suffix AUDACITY_PATH : "$out/share/audacity" - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p $out/{Applications,bin} - mv $out/Audacity.app $out/Applications/ - makeWrapper $out/Applications/Audacity.app/Contents/MacOS/Audacity $out/bin/audacity - ''; - - meta = with lib; { - description = "Sound editor with graphical UI"; - mainProgram = "audacity"; - homepage = "https://www.audacityteam.org"; - changelog = "https://github.com/audacity/audacity/releases"; - license = with licenses; [ - gpl2Plus - # Must be GPL3 when building with "technologies that require it, - # such as the VST3 audio plugin interface". - # https://github.com/audacity/audacity/discussions/2142. - gpl3 - # Documentation. - cc-by-30 - ]; - maintainers = with maintainers; [ veprbl wegank ]; - platforms = platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/audio/bespokesynth/default.nix b/third_party/nixpkgs/pkgs/applications/audio/bespokesynth/default.nix index 83c5af0a53..01b98999ce 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bespokesynth/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bespokesynth/default.nix @@ -24,7 +24,7 @@ , xcbutilkeysyms , xcb-util-cursor , gtk3 -, webkitgtk +, webkitgtk_4_0 , python3 , curl , pcre @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { libXScrnSaver curl gtk3 - webkitgtk + webkitgtk_4_0 freetype libGL libusb1 diff --git a/third_party/nixpkgs/pkgs/applications/audio/dr14_tmeter/default.nix b/third_party/nixpkgs/pkgs/applications/audio/dr14_tmeter/default.nix index 6ae27b93f2..90ce4b28a0 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/dr14_tmeter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/dr14_tmeter/default.nix @@ -25,6 +25,6 @@ python3Packages.buildPythonApplication rec { mainProgram = "dr14_tmeter"; license = licenses.gpl3Plus; homepage = "http://dr14tmeter.sourceforge.net/"; - maintainers = [ maintainers.adisbladis ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/exaile/default.nix b/third_party/nixpkgs/pkgs/applications/audio/exaile/default.nix index 9d5c69858a..5387069072 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/exaile/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/exaile/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub , gobject-introspection, makeWrapper, wrapGAppsHook3 , gtk3, gst_all_1, python3 -, gettext, adwaita-icon-theme, help2man, keybinder3, libnotify, librsvg, streamripper, udisks, webkitgtk +, gettext, adwaita-icon-theme, help2man, keybinder3, libnotify, librsvg, streamripper, udisks, webkitgtk_4_0 , iconTheme ? adwaita-icon-theme , deviceDetectionSupport ? true , documentationSupport ? true @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { ++ lib.optional multimediaKeySupport keybinder3 ++ lib.optional (musicBrainzSupport || cdMetadataSupport) python3.pkgs.musicbrainzngs ++ lib.optional podcastSupport python3.pkgs.feedparser - ++ lib.optional wikipediaSupport webkitgtk; + ++ lib.optional wikipediaSupport webkitgtk_4_0; nativeCheckInputs = with python3.pkgs; [ pytest diff --git a/third_party/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix b/third_party/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix index d02f87642f..bbb71ab8c8 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "fluidsynth"; - version = "2.3.5"; + version = "2.3.6"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; rev = "v${version}"; - hash = "sha256-CzKfvQzhF4Mz2WZaJM/Nt6XjF6ThlX4jyQSaXfZukG8="; + hash = "sha256-bmA4eUh7MC4dXPsOOi9Q5jneSE5OGUWrztv+46LxaW0="; }; outputs = [ "out" "dev" "man" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/keyfinder-cli/default.nix b/third_party/nixpkgs/pkgs/applications/audio/keyfinder-cli/default.nix index 1a4ac86cc2..8c6e2692a6 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/keyfinder-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/keyfinder-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ffmpeg_7, libkeyfinder, fftw }: +{ lib, stdenv, fetchFromGitHub, ffmpeg, libkeyfinder, fftw }: stdenv.mkDerivation rec { pname = "keyfinder-cli"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hash = "sha256-9/+wzPTaQ5PfPiqTZ5EuHdswXJgfgnvAul/FeeDbbJA="; }; - buildInputs = [ ffmpeg_7 libkeyfinder fftw ]; + buildInputs = [ ffmpeg libkeyfinder fftw ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/librespot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/librespot/default.nix index c6c274f60d..660762b58d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/librespot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/librespot/default.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "librespot"; - version = "0.4.2"; + version = "0.5.0"; src = fetchFromGitHub { owner = "librespot-org"; repo = "librespot"; rev = "v${version}"; - sha256 = "sha256-DtF6asSlLdC2m/0JTBo4YUx9HgsojpfiqVdqaIwniKA="; + sha256 = "sha256-/YMICsrUMYqiL5jMlb5BbZPlHfL9btbWiv/Kt2xhRW4="; }; - cargoHash = "sha256-tbDlWP0sUIa0W9HhdYNOvo9cGeqFemclhA7quh7f/Rw="; + cargoHash = "sha256-UOvGvseWaEqqjuvTewDfkBeR730cKMQCq55weYmu15Y="; nativeBuildInputs = [ pkg-config makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook diff --git a/third_party/nixpkgs/pkgs/applications/audio/mbrola/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mbrola/default.nix index 888ae82cdb..c67d30fc3d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mbrola/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mbrola/default.nix @@ -26,6 +26,10 @@ let # required for cross compilation makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + installPhase = '' runHook preInstall install -D Bin/mbrola $out/bin/mbrola @@ -49,4 +53,3 @@ in ln -s '${mbrola-voices}/data' "$out/share/mbrola/voices" ln -s '${bin}/bin' "$out/" '' - diff --git a/third_party/nixpkgs/pkgs/applications/audio/miniaudicle/default.nix b/third_party/nixpkgs/pkgs/applications/audio/miniaudicle/default.nix index 25ab4f7c6b..7899e40806 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/miniaudicle/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/miniaudicle/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miniaudicle"; - version = "1.5.2.0"; + version = "1.5.3.0"; src = fetchFromGitHub { owner = "ccrma"; repo = "miniAudicle"; rev = "chuck-${finalAttrs.version}"; - hash = "sha256-jpPF2Qx/6tiotsj92m1XmxsEUgtm5029ijpu3O8B9qM="; + hash = "sha256-iLmTliJXaYDM5X+s3HsXLFO2qonh18BaiWiTdDXKWjk="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/moc/default.nix b/third_party/nixpkgs/pkgs/applications/audio/moc/default.nix index 6039654d76..eae8f02fe1 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/moc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/moc/default.nix @@ -16,7 +16,7 @@ , musepackSupport ? true, libmpc, libmpcdec, taglib , vorbisSupport ? true, libvorbis , speexSupport ? true, speex -, ffmpegSupport ? true, ffmpeg_7 +, ffmpegSupport ? true, ffmpeg , sndfileSupport ? true, libsndfile , wavpackSupport ? true, wavpack # Misc @@ -74,7 +74,7 @@ stdenv.mkDerivation { ++ lib.optionals musepackSupport [ libmpc libmpcdec taglib ] ++ lib.optional vorbisSupport libvorbis ++ lib.optional speexSupport speex - ++ lib.optional ffmpegSupport ffmpeg_7 + ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional sndfileSupport libsndfile ++ lib.optional wavpackSupport wavpack # Misc diff --git a/third_party/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix b/third_party/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix index f1101e7c79..a46362b7f8 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "10.74"; + version = "10.76"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${ builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-AxRADWS5Ka62NLj6IqX5uF39mPxoWy+zQZQ7A2+DM7Y="; + hash = "sha256-ropQZraOombq6zG5vXU/kBtQggy30ErbU79gbEtrIxs="; stripRoot = false; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/mpg123/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mpg123/default.nix index f7480557eb..9fe4e925c1 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mpg123/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mpg123/default.nix @@ -22,11 +22,11 @@ assert withConplay -> !libOnly; stdenv.mkDerivation rec { pname = "${lib.optionalString libOnly "lib"}mpg123"; - version = "1.32.6"; + version = "1.32.7"; src = fetchurl { url = "mirror://sourceforge/mpg123/mpg123-${version}.tar.bz2"; - hash = "sha256-zN0dCrwx1z2LQ1/GWMeQSdCpBbMGabakKgOtFp3GCeY="; + hash = "sha256-PIkZJDcHlRysDjw5u/KGU7yv/EPJj/FoAaJzUNuPDyE="; }; outputs = [ "out" "dev" "man" ] ++ lib.optional withConplay "conplay"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix deleted file mode 100644 index d2d428963b..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, rustPlatform -, pkg-config -, ncurses -, openssl -, Cocoa -, withALSA ? false, alsa-lib -, withClipboard ? true, libxcb, python3 -, withCover ? false, ueberzug -, withPulseAudio ? true, libpulseaudio -, withPortAudio ? false, portaudio -, withMPRIS ? true, withNotify ? true, dbus -, withCrossterm ? true -, nix-update-script -, testers -, ncspot -}: - -rustPlatform.buildRustPackage rec { - pname = "ncspot"; - version = "1.1.2"; - - src = fetchFromGitHub { - owner = "hrkfdn"; - repo = "ncspot"; - rev = "v${version}"; - hash = "sha256-Lt2IuoiXYgSVPi4u8y16u9m5ya4HdpQme6snvNJrwso="; - }; - - cargoHash = "sha256-JJTnaq0JLWHQxAbDpzDRPi5B+ePlQNlDOAsugPah7j4="; - - nativeBuildInputs = [ pkg-config ] - ++ lib.optional withClipboard python3; - - buildInputs = [ ncurses ] - ++ lib.optional stdenv.hostPlatform.isLinux openssl - ++ lib.optional withALSA alsa-lib - ++ lib.optional withClipboard libxcb - ++ lib.optional withCover ueberzug - ++ lib.optional withPulseAudio libpulseaudio - ++ lib.optional withPortAudio portaudio - ++ lib.optional (withMPRIS || withNotify) dbus - ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; - - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DNCURSES_UNCTRL_H_incl"; - - buildNoDefaultFeatures = true; - - buildFeatures = [ "cursive/pancurses-backend" ] - ++ lib.optional withALSA "alsa_backend" - ++ lib.optional withClipboard "share_clipboard" - ++ lib.optional withCover "cover" - ++ lib.optional withPulseAudio "pulseaudio_backend" - ++ lib.optional withPortAudio "portaudio_backend" - ++ lib.optional withMPRIS "mpris" - ++ lib.optional withCrossterm "crossterm_backend" - ++ lib.optional withNotify "notify"; - - postInstall = '' - install -D --mode=444 $src/misc/ncspot.desktop $out/share/applications/${pname}.desktop - install -D --mode=444 $src/images/logo.svg $out/share/icons/hicolor/scalable/apps/${pname}.png - ''; - - passthru = { - updateScript = nix-update-script { }; - tests.version = testers.testVersion { package = ncspot; }; - }; - - meta = with lib; { - description = "Cross-platform ncurses Spotify client written in Rust, inspired by ncmpc and the likes"; - homepage = "https://github.com/hrkfdn/ncspot"; - changelog = "https://github.com/hrkfdn/ncspot/releases/tag/v${version}"; - license = licenses.bsd2; - maintainers = with maintainers; [ liff ]; - mainProgram = "ncspot"; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/audio/pbpctrl/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pbpctrl/default.nix index 9567a75de6..282fa976de 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pbpctrl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pbpctrl/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "pbpctrl"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "qzed"; repo = "${pname}"; rev = "v${version}"; - hash = "sha256-tOdKXYfeO+HsYIDDU3fDb76ytRHVOcIqffEjFnLwOTI="; + hash = "sha256-V7wfEXJ0tVQNsi1OFU1Dk2d9ImsNFRriGutpJzh2tV8="; }; - cargoHash = "sha256-yP4tsXCAPE1KUDU5oBIejL4kACK1dNXK7Kmw37VMexM="; + cargoHash = "sha256-8D+WD5bOxoUhw4a7SUr+D2gn1NA7OkmoCcALO9HY8Qk="; nativeBuildInputs = [ pkg-config protobuf ]; buildInputs = [ dbus ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/pianobar/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pianobar/default.nix index 11116c7ffa..b1a4825a88 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pianobar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pianobar/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, pkg-config, libao, json_c, libgcrypt, ffmpeg_7, curl }: +{ fetchFromGitHub, lib, stdenv, pkg-config, libao, json_c, libgcrypt, ffmpeg, curl }: stdenv.mkDerivation rec { pname = "pianobar"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libao json_c libgcrypt ffmpeg_7 curl + libao json_c libgcrypt ffmpeg curl ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix index 7807751236..5b83e9968a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, appimageTools }: +{ lib, fetchurl, appimageTools, makeWrapper }: let pname = "plexamp"; @@ -23,6 +23,9 @@ appimageTools.wrapType2 { $out/share/icons/hicolor/scalable/apps/plexamp.svg substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram "$out/bin/plexamp" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" ''; passthru.updateScript = ./update-plexamp.sh; diff --git a/third_party/nixpkgs/pkgs/applications/audio/plugdata/default.nix b/third_party/nixpkgs/pkgs/applications/audio/plugdata/default.nix index e58e5aabcd..6998cb00ea 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/plugdata/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/plugdata/default.nix @@ -8,7 +8,7 @@ , pkg-config , alsa-lib , freetype -, webkitgtk +, webkitgtk_4_0 , zenity , curl , xorg @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { alsa-lib curl freetype - webkitgtk + webkitgtk_4_0 xorg.libX11 xorg.libXcursor xorg.libXext diff --git a/third_party/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix b/third_party/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix index 85df0f595f..bf47712e32 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.5"; + version = "0.7.8"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-EMBoP0gmJ1JwjkCc1UjTM4BgeYhFSFhUOD14rJRow1o="; + sha256 = "sha256-Ap2iSYalsyzUq/MvKUim3l29FFYid0FLUBKQ29FyWDg="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/quodlibet/default.nix b/third_party/nixpkgs/pkgs/applications/audio/quodlibet/default.nix index a47b01b8cf..7a0063238d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/quodlibet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/quodlibet/default.nix @@ -21,7 +21,7 @@ libmodplug, librsvg, libsoup, - webkitgtk, + webkitgtk_4_0, # optional features withDbusPython ? false, @@ -90,7 +90,7 @@ python3.pkgs.buildPythonApplication { libappindicator-gtk3 libmodplug libsoup - webkitgtk + webkitgtk_4_0 ] ++ lib.optionals (withXineBackend) [ xine-lib ] ++ lib.optionals (withGstreamerBackend) ( diff --git a/third_party/nixpkgs/pkgs/applications/audio/rymcast/default.nix b/third_party/nixpkgs/pkgs/applications/audio/rymcast/default.nix index 06e711941a..4fecaf3737 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/rymcast/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/rymcast/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchzip, autoPatchelfHook, makeWrapper -, alsa-lib, curl, gtk3, webkitgtk, zenity }: +, alsa-lib, curl, gtk3, webkitgtk_4_0, zenity }: stdenv.mkDerivation rec { pname = "rymcast"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; - buildInputs = [ alsa-lib curl gtk3 stdenv.cc.cc.lib webkitgtk zenity ]; + buildInputs = [ alsa-lib curl gtk3 stdenv.cc.cc.lib webkitgtk_4_0 zenity ]; installPhase = '' mkdir -p "$out/bin" diff --git a/third_party/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix index f80707c96f..8fab5a4e54 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sidplayfp"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "sidplayfp"; rev = "v${finalAttrs.version}"; - hash = "sha256-07Pwh7qbw6Emr5+F89v9i2ARdSosukjjuarJ+uZR7xY="; + hash = "sha256-PT0WijNvcF7opTVxpj6oRb514Alz12gZCSMYa4bqyrY="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/applications/audio/sonobus/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sonobus/default.nix index d8a69ecd9a..bbf52c11b9 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sonobus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sonobus/default.nix @@ -16,7 +16,7 @@ , libopus , curl , gtk3 -, webkitgtk +, webkitgtk_4_0 }: stdenv.mkDerivation (finalAttrs: { @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { libopus curl gtk3 - webkitgtk + webkitgtk_4_0 ]; runtimeDependencies = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix index 7fedaf3c2f..58ac8f60ff 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix @@ -44,13 +44,13 @@ let in stdenv.mkDerivation rec { pname = "strawberry"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - hash = "sha256-86AMmp8R9/NibTsMFTTFcMeIqZ5x8din9RcBvhGO9xg="; + hash = "sha256-yca1BJWhSUVamqSKfvEzU3xbzdR+kwfSs0pyS08oUR0="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/surge-XT/default.nix b/third_party/nixpkgs/pkgs/applications/audio/surge-XT/default.nix index 3169cddfa7..6fd7f9caaa 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/surge-XT/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/surge-XT/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "surge-XT"; - version = "1.3.2"; + version = "1.3.4"; src = fetchFromGitHub { owner = "surge-synthesizer"; repo = "surge"; rev = "release_xt_${version}"; fetchSubmodules = true; - hash = "sha256-r8CZxjmH9lfCizc95jRB4je+R/74zMqRMlGIZxxxriw="; + hash = "sha256-4b0H3ZioiXFc4KCeQReobwQZJBl6Ep2/8JlRIwvq/hQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/tonelib-zoom/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tonelib-zoom/default.nix index e5adc356b6..af5dd750c5 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/tonelib-zoom/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/tonelib-zoom/default.nix @@ -12,7 +12,7 @@ , libXrandr , libXrender , libjack2 -, webkitgtk +, webkitgtk_4_0 }: stdenv.mkDerivation rec { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { alsa-lib freetype libglvnd - webkitgtk + webkitgtk_4_0 ] ++ runtimeDependencies; runtimeDependencies = map lib.getLib [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/tunefish/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tunefish/default.nix index df7564abcf..8c2855d732 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/tunefish/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/tunefish/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, python3 -, alsa-lib, curl, freetype, gtk3, libGL, libX11, libXext, libXinerama, webkitgtk +, alsa-lib, curl, freetype, gtk3, libGL, libX11, libXext, libXinerama, webkitgtk_4_0 }: stdenv.mkDerivation { @@ -15,7 +15,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkg-config python3 ]; - buildInputs = [ alsa-lib curl freetype gtk3 libGL libX11 libXext libXinerama webkitgtk ]; + buildInputs = [ alsa-lib curl freetype gtk3 libGL libX11 libXext libXinerama webkitgtk_4_0 ]; postPatch = '' patchShebangs src/tunefish4/generate-lv2-ttl.py diff --git a/third_party/nixpkgs/pkgs/applications/audio/vocal/default.nix b/third_party/nixpkgs/pkgs/applications/audio/vocal/default.nix index ee97a92ac3..7633ab22e2 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/vocal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/vocal/default.nix @@ -12,7 +12,7 @@ , glib , glib-networking , libxml2 -, webkitgtk +, webkitgtk_4_0 , clutter-gtk , clutter-gst , libunity @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { libunity pantheon.granite sqlite - webkitgtk + webkitgtk_4_0 glib-networking ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/alfis/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/alfis/default.nix index 7e9981cc39..50a100254e 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/alfis/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/alfis/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, pkg-config, makeWrapper, - webkitgtk, + webkitgtk_4_0, zenity, Cocoa, Security, @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security - ++ lib.optional (withGui && stdenv.hostPlatform.isLinux) webkitgtk + ++ lib.optional (withGui && stdenv.hostPlatform.isLinux) webkitgtk_4_0 ++ lib.optionals (withGui && stdenv.hostPlatform.isDarwin) [ Cocoa WebKit diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin/default.nix index e3eb1cf3bc..e56d332cf5 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin/default.nix @@ -34,24 +34,16 @@ let in stdenv.mkDerivation rec { pname = if withGui then "bitcoin" else "bitcoind"; - version = "27.1"; + version = "28.0"; src = fetchurl { urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; # hash retrieved from signed SHA256SUMS - sha256 = "0c1051fd921b8fae912f5c2dfd86b085ab45baa05cd7be4585b10b4d1818f3da"; + sha256 = "700ae2d1e204602eb07f2779a6e6669893bc96c0dca290593f80ff8e102ff37f"; }; - patches = [ - # upnp: fix build with miniupnpc 2.2.8 - (fetchpatch2 { - url = "https://github.com/bitcoin/bitcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1"; - hash = "sha256-oDvHUvwAEp0LJCf6QBESn38Bu359TcPpLhvuLX3sm6M="; - }) - ]; - nativeBuildInputs = [ autoreconfHook pkg-config installShellFiles ] ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ] diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/clboss/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/clboss/default.nix index 2695198bf0..e443aac8d0 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/clboss/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/clboss/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchFromGitHub +, fetchzip , autoconf-archive , autoreconfHook , pkg-config @@ -11,13 +11,12 @@ stdenv.mkDerivation rec { pname = "clboss"; - version = "0.13.3"; + version = "0.14.0"; - src = fetchFromGitHub { - owner = "ZmnSCPxj"; - repo = "clboss"; - rev = "v${version}"; - hash = "sha256-T61rkTEGLCZrEBp1WFhHnQ7DQyhctMf5lgbOs6u9E0o="; + # The release tarball includes the pre-generated file `commit_hash.h` that is required for building + src = fetchzip { + url = "https://github.com/ZmnSCPxj/clboss/releases/download/v${version}/clboss-v${version}.tar.gz"; + hash = "sha256-Qp8br4ZxiqaxFZ6Tb+wFpqp2APmnU9QdNkM8MyGAtrw="; }; nativeBuildInputs = [ autoconf-archive autoreconfHook pkg-config libev curlWithGnuTls sqlite ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix index ba24148ed5..f44cadc785 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "5.0.22"; + version = "5.0.23"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-fuea76l6kIjk9n/LlktZmJ1B8wiwSfEeHUkTr+I1a2c="; + sha256 = "sha256-bVvqsgfsIlAUwbTbFAYbI+Dtgbxv71cMlDpaReTE56Q="; }; nativeBuildInputs = [ makeWrapper ]; 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 758552ce02..28d9f496ae 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix @@ -60,12 +60,15 @@ , usbutils , which , runCommand +, wayland , xkeyboard_config , xorg , zlib , makeDesktopItem , tiling_wm # if we are using a tiling wm, need to set _JAVA_AWT_WM_NONREPARENTING in wrapper , androidenv + +, forceWayland ? false }: let @@ -176,7 +179,11 @@ let # For GTKLookAndFeel gtk2 glib - ]}" + + # For wayland support + wayland + ]}" \ + ${lib.optionalString forceWayland "--add-flags -Dawt.toolkit.name=WLToolkit"} # AS launches LLDBFrontend with a custom LD_LIBRARY_PATH wrapProgram $(find $out -name LLDBFrontend) --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/bluefish/default.nix b/third_party/nixpkgs/pkgs/applications/editors/bluefish/default.nix index d560254ee1..09795194bf 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/bluefish/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/bluefish/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "bluefish"; - version = "2.2.15"; + version = "2.2.16"; src = fetchurl { url = "mirror://sourceforge/bluefish/bluefish-${version}.tar.bz2"; - sha256 = "sha256-YUPlHGtVedWW86moXg8NhYDJ9Y+ChXWxGYgODKHZQbw="; + sha256 = "sha256-FOZHb87o+jJvf2Px9pPSUhlfncsWrw/jyRXEmbr13XQ="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/eclipse/build-eclipse.nix b/third_party/nixpkgs/pkgs/applications/editors/eclipse/build-eclipse.nix index 46642d6755..dfb2fd38b9 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -1,5 +1,5 @@ { lib, stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender -, zlib, jdk, glib, glib-networking, gtk, libXtst, libsecret, gsettings-desktop-schemas, webkitgtk +, zlib, jdk, glib, glib-networking, gtk, libXtst, libsecret, gsettings-desktop-schemas, webkitgtk_4_0 , makeWrapper, perl, ... }: { name, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null, description, productVersion }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ fontconfig freetype glib gsettings-desktop-schemas gtk jdk libX11 libXrender libXtst libsecret zlib - ] ++ lib.optional (webkitgtk != null) webkitgtk; + ] ++ lib.optional (webkitgtk_4_0 != null) webkitgtk_4_0; buildCommand = '' # Unpack tarball. @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk libXtst libsecret ] ++ lib.optional (webkitgtk != null) webkitgtk)} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk libXtst libsecret ] ++ lib.optional (webkitgtk_4_0 != null) webkitgtk_4_0)} \ --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-configuration \$HOME/.eclipse/''${productId}_${productVersion}/configuration" diff --git a/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix b/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix index 9c1963554c..2e1501d635 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, makeDesktopItem, makeWrapper , freetype, fontconfig, libX11, libXrender, zlib , glib, gtk3, gtk2, libXtst, jdk, jdk8, gsettings-desktop-schemas -, webkitgtk ? null # for internal web browser +, webkitgtk_4_0 ? null # for internal web browser , buildEnv, runCommand , callPackage }: @@ -29,7 +29,7 @@ in rec { # work around https://bugs.eclipse.org/bugs/show_bug.cgi?id=476075#c3 buildEclipseUnversioned = callPackage ./build-eclipse.nix { inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib - jdk glib gtk libXtst gsettings-desktop-schemas webkitgtk + jdk glib gtk libXtst gsettings-desktop-schemas webkitgtk_4_0 makeWrapper; }; buildEclipse = eclipseData: buildEclipseUnversioned (eclipseData // { productVersion = "${platform_major}.${platform_minor}"; }); diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/build-support/elpa2nix.el b/third_party/nixpkgs/pkgs/applications/editors/emacs/build-support/elpa2nix.el index 64587c0fad..b0b4ecedc3 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/build-support/elpa2nix.el +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/build-support/elpa2nix.el @@ -31,3 +31,12 @@ The file can either be a tar file or an Emacs Lisp file." ;; Allow installing package tarfiles larger than 10MB (setq large-file-warning-threshold nil) + +(let ((flag (getenv "turnCompilationWarningToError"))) + (when (and flag + (not (string-empty-p flag))) + (setq byte-compile-error-on-warn t))) + +(let ((flag (getenv "ignoreCompilationError"))) + (when (string-empty-p flag) + (setq byte-compile-debug t))) diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/build-support/emacs-funcs.sh b/third_party/nixpkgs/pkgs/applications/editors/emacs/build-support/emacs-funcs.sh index e1e6a3b622..b6b2a3bd37 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/build-support/emacs-funcs.sh +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/build-support/emacs-funcs.sh @@ -20,15 +20,4 @@ addEmacsVars () { if [ -n "${addEmacsNativeLoadPath:-}" ]; then addToEmacsNativeLoadPath "$1/share/emacs/native-lisp" fi - - # Add sub paths to the Emacs load path if it is a directory - # containing .el files. This is necessary to build some packages, - # e.g., using trivialBuild. - for lispDir in \ - "$1/share/emacs/site-lisp/"* \ - "$1/share/emacs/site-lisp/elpa/"*; do - if [[ -d $lispDir && "$(echo "$lispDir"/*.el)" ]] ; then - addToEmacsLoadPath "$lispDir" - fi - done } diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/build-support/generic.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/build-support/generic.nix index 3ff10ee865..f5b60305fc 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/build-support/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/build-support/generic.nix @@ -33,7 +33,7 @@ libBuildHelper.extendMkDerivation' stdenv.mkDerivation (finalAttrs: , postInstall ? "" , meta ? {} , turnCompilationWarningToError ? false -, ignoreCompilationError ? true +, ignoreCompilationError ? false , ... }@args: @@ -64,6 +64,8 @@ libBuildHelper.extendMkDerivation' stdenv.mkDerivation (finalAttrs: setupHook = args.setupHook or setupHook; + inherit turnCompilationWarningToError ignoreCompilationError; + meta = { broken = false; platforms = emacs.meta.platforms; @@ -76,8 +78,6 @@ libBuildHelper.extendMkDerivation' stdenv.mkDerivation (finalAttrs: addEmacsNativeLoadPath = args.addEmacsNativeLoadPath or true; - inherit turnCompilationWarningToError ignoreCompilationError; - postInstall = '' # Besides adding the output directory to the native load path, make sure # the current package's elisp files are in the load path, otherwise @@ -86,10 +86,16 @@ libBuildHelper.extendMkDerivation' stdenv.mkDerivation (finalAttrs: source ${./emacs-funcs.sh} addEmacsVars "$out" - find $out/share/emacs -type f -name '*.el' -print0 \ + # package-activate-all is used to activate packages. In other builder + # helpers, package-initialize is used for this purpose because + # package-activate-all is not available before Emacs 27. + find $out/share/emacs -type f -name '*.el' -not -name ".dir-locals.el" -print0 \ | xargs --verbose -0 -I {} -n 1 -P $NIX_BUILD_CORES sh -c \ "emacs \ --batch \ + -f package-activate-all \ + --eval '(setq native-comp-eln-load-path (cdr native-comp-eln-load-path))' \ + --eval '(let ((default-directory \"$out/share/emacs/site-lisp\")) (normal-top-level-add-subdirs-to-load-path))' \ --eval '(setq large-file-warning-threshold nil)' \ --eval '(setq byte-compile-error-on-warn ${if finalAttrs.turnCompilationWarningToError then "t" else "nil"})' \ -f batch-native-compile {} \ diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/build-support/melpa.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/build-support/melpa.nix index e129e3ebde..a6e6e7c5d4 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/build-support/melpa.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/build-support/melpa.nix @@ -12,8 +12,8 @@ let src = fetchFromGitHub { owner = "melpa"; repo = "package-build"; - rev = "c48aa078c01b4f07b804270c4583a0a58ffea1c0"; - sha256 = "sha256-MzPj375upIiYXdQR+wWXv3A1zMqbSrZlH0taLuxx/1M="; + rev = "d5661f1f1996a893fbcbacb4d290c57acab4fb0e"; + hash = "sha256-zVhFR2kLLkCKC+esPBbIk3qOa033YND1HF9GiNI4JM8="; }; patches = [ ./package-build-dont-use-mtime.patch ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/build-support/melpa2nix.el b/third_party/nixpkgs/pkgs/applications/editors/emacs/build-support/melpa2nix.el index 3de77dbf5e..91706e92f7 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/build-support/melpa2nix.el +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/build-support/melpa2nix.el @@ -1,6 +1,3 @@ -(require 'package) -(package-initialize) - (require 'package-recipe) (require 'package-build) diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/build-support/trivial.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/build-support/trivial.nix index 8c515363f4..2e4da1ca8e 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/build-support/trivial.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/build-support/trivial.nix @@ -19,7 +19,7 @@ args: foundMakefile=1 fi - emacs -L . --batch -f batch-byte-compile *.el + emacs -l package -f package-initialize -L . --batch -f batch-byte-compile *.el runHook postBuild ''; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix index 56cdd8ad73..fc77ac423b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix @@ -4,6 +4,14 @@ self: super: let libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary; + inherit (import ./lib-override-helper.nix pkgs lib) + addPackageRequires + addPackageRequiresIfOlder + ignoreCompilationError + ignoreCompilationErrorIfOlder + mkHome + mkHomeIfOlder + ; in { cl-lib = null; # builtin @@ -54,6 +62,64 @@ in } ); + # native-compiler-error-empty-byte in old versions + ada-ref-man = ignoreCompilationErrorIfOlder super.ada-ref-man "2020.1.0.20201129.190419"; + + # elisp error in old versions + ampc = ignoreCompilationErrorIfOlder super.ampc "0.2.0.20240220.181558"; + + auctex = mkHome super.auctex; + + auctex-cont-latexmk = mkHome super.auctex-cont-latexmk; + + auctex-label-numbers = mkHome super.auctex-label-numbers; + + # missing optional dependencies https://codeberg.org/rahguzar/consult-hoogle/issues/4 + consult-hoogle = addPackageRequiresIfOlder super.consult-hoogle [ self.consult ] "0.2.2"; + + # missing optional dependencies https://github.com/jacksonrayhamilton/context-coloring/issues/10 + context-coloring = addPackageRequires super.context-coloring [ self.js2-mode ]; + + cpio-mode = ignoreCompilationError super.cpio-mode; # elisp error + + # fixed in https://git.savannah.gnu.org/cgit/emacs/elpa.git/commit/?h=externals/dbus-codegen&id=cfc46758c6252a602eea3dbc179f8094ea2a1a85 + dbus-codegen = ignoreCompilationErrorIfOlder super.dbus-codegen "0.1.0.20201127.221326"; # elisp error + + ebdb = super.ebdb.overrideAttrs ( + finalAttrs: previousAttrs: + let + applyOrgRoamMissingPatch = lib.versionOlder finalAttrs.version "0.8.22.0.20240205.070828"; + in + { + dontUnpack = !applyOrgRoamMissingPatch; + patches = + if applyOrgRoamMissingPatch then + previousAttrs.patches or [ ] + ++ [ + (pkgs.fetchpatch { + name = "fix-comilation-error-about-missing-org-roam.patch"; + url = "https://github.com/girzel/ebdb/commit/058f30a996eb9074feac8f94db4eb49e85ae08f1.patch"; + hash = "sha256-UI72N3lCgro6bG75sWnbw9truREToQHEzZ1TeQAIMjo="; + }) + ] + else + previousAttrs.patches or null; + preBuild = + if applyOrgRoamMissingPatch then + previousAttrs.preBuild or "" + + "\n" + + '' + pushd .. + local content_directory=$ename-$version + src=$PWD/$content_directory.tar + tar --create --verbose --file=$src $content_directory + popd + '' + else + previousAttrs.preBuild or null; + } + ); + eglot = super.eglot.overrideAttrs ( finalAttrs: previousAttrs: { postInstall = @@ -99,6 +165,29 @@ in }; }); + notes-mode = (mkHome super.notes-mode).overrideAttrs (old: { + dontUnpack = false; + buildInputs = old.buildInputs or [ ] ++ [ pkgs.perl ]; + nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ pkgs.perl ]; + preInstall = + old.preInstall or "" + + "\n" + + '' + patchShebangs --build mkconfig + pushd .. + local content_directory=$ename-$version + src=$PWD/$content_directory.tar + tar --create --verbose --file=$src $content_directory + popd + ''; + postFixup = + old.postFixup or "" + + "\n" + + '' + patchShebangs --host --update $out/share/emacs/site-lisp/elpa/$ename-$version/mkconfig + ''; + }); + plz = super.plz.overrideAttrs (old: { dontUnpack = false; postPatch = @@ -117,10 +206,25 @@ in ''; }); + # https://sourceware.org/bugzilla/show_bug.cgi?id=32185 + poke = addPackageRequires super.poke [ self.poke-mode ]; + pq = super.pq.overrideAttrs (old: { buildInputs = old.buildInputs or [ ] ++ [ pkgs.postgresql ]; }); + preview-auto = mkHome super.preview-auto; + + preview-tailor = mkHome super.preview-tailor; + + # https://debbugs.gnu.org/cgi/bugreport.cgi?bug=73325 + psgml = ignoreCompilationError super.psgml; # elisp error + + # native-ice https://github.com/mattiase/relint/issues/15 + relint = ignoreCompilationError super.relint; + + shen-mode = ignoreCompilationErrorIfOlder super.shen-mode "0.1.0.20221221.82050"; # elisp error + # native compilation for tests/seq-tests.el never ends # delete tests/seq-tests.el to workaround this seq = super.seq.overrideAttrs (old: { @@ -136,6 +240,26 @@ in ''; }); + # https://github.com/alphapapa/taxy.el/issues/3 + taxy = super.taxy.overrideAttrs (old: { + dontUnpack = false; + postUnpack = + old.postUnpack or "" + + "\n" + + '' + local content_directory=$ename-$version + rm --verbose --recursive $content_directory/examples + src=$PWD/$content_directory.tar + tar --create --verbose --file=$src $content_directory + ''; + }); + + tex-parens = mkHomeIfOlder super.tex-parens "0.4.0.20240630.70456"; + + timerfunctions = ignoreCompilationErrorIfOlder super.timerfunctions "1.4.2.0.20201129.225252"; + + wisitoken-grammar-mode = ignoreCompilationError super.wisitoken-grammar-mode; # elisp error + xeft = super.xeft.overrideAttrs (old: { dontUnpack = false; buildInputs = old.buildInputs or [ ] ++ [ pkgs.xapian ]; @@ -153,4 +277,7 @@ in rm $outd/xapian-lite.cc $outd/emacs-module.h $outd/emacs-module-prelude.h $outd/demo.gif $outd/Makefile ''; }); + + # native-ice https://github.com/mattiase/xr/issues/9 + xr = ignoreCompilationError super.xr; } 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 5744eaa4e5..0db019dddb 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 @@ -26,7 +26,7 @@ formats commits for you. self: let - inherit (import ./lib-override-helper.nix pkgs) + inherit (import ./lib-override-helper.nix pkgs lib) markBroken ; 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 d20a224970..64c05ba315 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 @@ -26,7 +26,7 @@ formats commits for you. self: let - inherit (import ./lib-override-helper.nix pkgs) + inherit (import ./lib-override-helper.nix pkgs lib) markBroken ; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix index 74d185641e..6eddcc2f9f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix @@ -1,6 +1,27 @@ -pkgs: +pkgs: lib: rec { + addPackageRequires = + pkg: packageRequires: addPackageRequiresWhen pkg packageRequires (finalAttrs: previousAttrs: true); + + addPackageRequiresIfOlder = + pkg: packageRequires: version: + addPackageRequiresWhen pkg packageRequires ( + finalAttrs: previousAttrs: lib.versionOlder finalAttrs.version version + ); + + addPackageRequiresWhen = + pkg: packageRequires: predicate: + pkg.overrideAttrs ( + finalAttrs: previousAttrs: { + packageRequires = + if predicate finalAttrs previousAttrs then + previousAttrs.packageRequires or [ ] ++ packageRequires + else + previousAttrs.packageRequires or null; + } + ); + buildWithGit = pkg: pkg.overrideAttrs (previousAttrs: { @@ -18,6 +39,34 @@ rec { fix-rtags = pkg: dontConfigure (externalSrc pkg pkgs.rtags); + fixRequireHelmCore = + pkg: + pkg.overrideAttrs (previousAttrs: { + postPatch = + previousAttrs.postPatch or "" + + "\n" + + '' + substituteInPlace $ename.el \ + --replace-fail "(require 'helm)" "(require 'helm-core)" + ''; + }); + + ignoreCompilationError = pkg: ignoreCompilationErrorWhen pkg (finalAttrs: previousAttrs: true); + + ignoreCompilationErrorIfOlder = + pkg: version: + ignoreCompilationErrorWhen pkg ( + finalAttrs: previousAttrs: lib.versionOlder finalAttrs.version version + ); + + ignoreCompilationErrorWhen = + pkg: predicate: + pkg.overrideAttrs ( + finalAttrs: previousAttrs: { + ignoreCompilationError = predicate finalAttrs previousAttrs; + } + ); + markBroken = pkg: pkg.overrideAttrs (previousAttrs: { @@ -25,4 +74,25 @@ rec { broken = true; }; }); + + mkHome = pkg: mkHomeWhen pkg (finalAttrs: previousAttrs: true); + + mkHomeIfOlder = + pkg: version: + mkHomeWhen pkg (finalAttrs: previousAttrs: lib.versionOlder finalAttrs.version version); + + mkHomeWhen = + pkg: predicate: + pkg.overrideAttrs ( + finalAttrs: previousAttrs: { + preInstall = + if predicate finalAttrs previousAttrs then + '' + HOME=$(mktemp -d) + '' + + previousAttrs.preInstall or "" + else + previousAttrs.preInstall or null; + } + ); } diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/package.nix index f24a1e6682..07e909b34a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/package.nix @@ -23,8 +23,6 @@ melpaBuild { popon ]; - ignoreCompilationError = false; - passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/package.nix index 8a37b99d8b..1e411af1a8 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/package.nix @@ -15,8 +15,6 @@ melpaBuild { files = ''("acm/*.el" "acm/icons")''; - ignoreCompilationError = false; - meta = { description = "Asynchronous Completion Menu"; homepage = "https://github.com/manateelazycat/lsp-bridge"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda2-mode/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda2-mode/package.nix index d02b2b29ce..5eec518036 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda2-mode/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda2-mode/package.nix @@ -8,8 +8,6 @@ melpaBuild { files = ''("src/data/emacs-mode/*.el")''; - ignoreCompilationError = false; - meta = { inherit (Agda.meta) homepage license; description = "Agda2-mode for Emacs extracted from Agda package"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix index 4334fce6ec..654c260745 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix @@ -46,8 +46,6 @@ melpaBuild (finalAttrs: { shut-up ]; - ignoreCompilationError = false; - strictDeps = true; # use melpaVersion so that it works for unstable releases too diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/default.nix index de7c69fd4d..59be7f543d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/default.nix @@ -25,8 +25,6 @@ melpaBuild { }) ]; - ignoreCompilationError = false; - passthru.updateScript = gitUpdater { }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/package.nix index 7c047fe32f..13d06e451d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/package.nix @@ -16,6 +16,9 @@ melpaBuild { hash = "sha256-7E8r56dzfD06tsQEnqU5mWSbwz9x9QPbzken2J/fhlg="; }; + # https://github.com/NixOS/nixpkgs/issues/335408 + ignoreCompilationError = true; + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix index cbeee76c17..c70ec74ee7 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix @@ -30,8 +30,6 @@ melpaBuild { propagatedUserEnvPkgs = [ gh ]; - ignoreCompilationError = false; - passthru.updateScript = unstableGitUpdater { }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/package.nix index 058aa722ef..5a352c5c3b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/package.nix @@ -13,8 +13,6 @@ melpaBuild { hash = "sha256-JCrmS3FSGDHSR+eAR0X/uO0nAgd3TUmFxwEVH5+KV+4="; }; - ignoreCompilationError = false; - meta = { homepage = "https://www.emacswiki.org/emacs/control-lock.el"; description = "Like caps-lock, but for your control key"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix index 37f8c81ce0..2225dff087 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix @@ -30,8 +30,6 @@ melpaBuild { propagatedUserEnvPkgs = [ nodejs ]; - ignoreCompilationError = false; - meta = { description = "Unofficial copilot plugin for Emacs"; homepage = "https://github.com/copilot-emacs/copilot.el"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix index d37153261e..ae10492957 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix @@ -6,15 +6,13 @@ melpaBuild rec { pname = "ebuild-mode"; - version = "1.72"; + version = "1.75"; src = fetchzip { url = "https://gitweb.gentoo.org/proj/ebuild-mode.git/snapshot/ebuild-mode-${version}.tar.bz2"; - hash = "sha256-GFEDWT88Boz/DxEcmFgf7u2NOoMjAN05yRiYwoYtvXc="; + hash = "sha256-zEJCjSL90Ok2bUbLNcEK3vWcQSOyfrWvctHqZACfdIc="; }; - ignoreCompilationError = false; - meta = { homepage = "https://gitweb.gentoo.org/proj/ebuild-mode.git/"; description = "Major modes for Gentoo package files"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix index fe4d9d33ee..b69423e583 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix @@ -21,8 +21,6 @@ melpaBuild { files = ''(:defaults "msg")''; - ignoreCompilationError = false; - passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix index 59e0b6b03f..1289b1effd 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix @@ -29,8 +29,6 @@ melpaBuild { make CXX=$CXX ''; - ignoreCompilationError = false; - passthru.updateScript = unstableGitUpdater { }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/package.nix index aa5be89a9b..fea6905e6f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/package.nix @@ -16,8 +16,6 @@ melpaBuild { hash = "sha256-DIGvnotSQYIgHxGxtyCALHd8ZbrfkmdvjLXlkcqQ6v4="; }; - ignoreCompilationError = false; - passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/package.nix index 2140665296..57249b72fb 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/package.nix @@ -23,8 +23,6 @@ melpaBuild { markdown-mode ]; - ignoreCompilationError = false; - passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/package.nix index 4c615d0e6c..93d963a09e 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/package.nix @@ -17,8 +17,6 @@ melpaBuild { hash = "sha256-er+knxqAejgKAtOnhqHfsGN286biHFdeMIUlbW7JyYw="; }; - ignoreCompilationError = false; - passthru.updateScript = unstableGitUpdater { }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/package.nix index 66f6f8c59c..b1a490fb2c 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/package.nix @@ -16,8 +16,6 @@ melpaBuild { hash = "sha256-xwVCAdxnIRHrFNWvtlM3u6CShsUiGgl1CiBTsp2x7IM="; }; - ignoreCompilationError = false; - passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/gn-mode-from-sources/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/gn-mode-from-sources/package.nix index 8b554081d1..ae73bf0d64 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/gn-mode-from-sources/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/gn-mode-from-sources/package.nix @@ -18,8 +18,6 @@ melpaBuild { --replace-fail ";;; gn-mode.el - " ";;; gn-mode.el --- " ''; - ignoreCompilationError = false; - meta = { inherit (gn.meta) homepage license; maintainers = with lib.maintainers; [ rennsax ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/package.nix index cb81a81cc4..0b8b510804 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/package.nix @@ -16,8 +16,6 @@ melpaBuild { hash = "sha256-3QDw4W3FbFvb2zpkDHAo9BJKxs3LaehyvUVJPKqS9RE="; }; - ignoreCompilationError = false; - passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/package.nix index 4a03ad5d97..8e99b427cb 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/package.nix @@ -22,8 +22,6 @@ melpaBuild { helm ]; - ignoreCompilationError = false; - meta = { homepage = "https://github.com/emacsmirror/helm-words"; description = "Helm extension for looking up words in dictionaries and thesauri"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/hsc3-mode/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/hsc3-mode/package.nix index d44afbeaf3..efa79b9ebb 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/hsc3-mode/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/hsc3-mode/package.nix @@ -16,8 +16,6 @@ melpaBuild { packageRequires = [ haskell-mode ]; - ignoreCompilationError = false; - meta = { inherit (hsc3.meta) homepage license; description = "Emacs mode for hsc3"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/icicles/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/icicles/package.nix index 0228bd8f41..59b584d9f9 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/icicles/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/icicles/package.nix @@ -16,8 +16,6 @@ melpaBuild { hash = "sha256-Xbt0D9EgmvN1hDTeLbdxq1ARHObj8M4GfH2sbFILRTI="; }; - ignoreCompilationError = false; - passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix index d9510a9c3e..2a7b7b571d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix @@ -24,8 +24,6 @@ melpaBuild { prop-menu ]; - ignoreCompilationError = false; - passthru.updateScript = gitUpdater { }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/package.nix index 8bc3a667b1..84dd7a1941 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/package.nix @@ -17,8 +17,6 @@ melpaBuild { hash = "sha256-h/jkIWjkLFbtBp9F+lhA3CulYy2XaeloLmexR0CDm3E="; }; - ignoreCompilationError = false; - passthru.updateScript = unstableGitUpdater { }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/package.nix index 72f4141df7..c97d3cc2d4 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/package.nix @@ -16,8 +16,6 @@ melpaBuild { hash = "sha256-Xli7TxBenl5cDMJv3Qz7ZELFpvJKStMploLpf9a+uoA="; }; - ignoreCompilationError = false; - passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/jam-mode/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/jam-mode/package.nix index 74e25b096b..418f201fa9 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/jam-mode/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/jam-mode/package.nix @@ -27,8 +27,6 @@ melpaBuild rec { mv tmp.el jam-mode.el ''; - ignoreCompilationError = false; - meta = { description = "Emacs major mode for editing Jam files"; license = lib.licenses.gpl2Plus; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/package.nix index befbf9df19..9fef79b331 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/package.nix @@ -9,8 +9,6 @@ melpaBuild { "llvm/utils/emacs/README") ''; - ignoreCompilationError = false; - meta = { inherit (llvmPackages.llvm.meta) homepage license; description = "Major mode for the LLVM assembler language"; 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 69c97d475d..f7e57946bb 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 @@ -24,18 +24,19 @@ let setuptools sexpdata six + watchdog ] ); in melpaBuild { pname = "lsp-bridge"; - version = "0-unstable-2024-10-04"; + version = "0-unstable-2024-10-07"; src = fetchFromGitHub { owner = "manateelazycat"; repo = "lsp-bridge"; - rev = "2d0cd0bea3bd503ca3bb7bcf4a6a78af091c7ecc"; - hash = "sha256-q6xIYUhXTqGeR9tnjd1xnCOnOeOMypJN6vfGjZDuIIM="; + rev = "f726a341c283a5b84d3587cf84e40817b8ec72c6"; + hash = "sha256-JL02pYjM5DyUt5wCNN0UnLVSXv9DCfSaSBGy5PzLvyA="; }; patches = [ @@ -86,8 +87,6 @@ melpaBuild { __darwinAllowLocalNetworking = true; - ignoreCompilationError = false; - passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix index cd2ed9b873..ce74888182 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix @@ -10,16 +10,16 @@ let in rustPlatform.buildRustPackage { pname = "lspce-module"; - version = "1.1.0-unstable-2024-07-29"; + version = "1.1.0-unstable-2024-09-07"; src = fetchFromGitHub { owner = "zbelial"; repo = "lspce"; - rev = "e954e4d77aeb45deb14182631f3d5aa9bcc9e587"; - hash = "sha256-9AUffkdgvVbHRIrHQPVl36plIfGxf3vsN9JCuFe0P6Q="; + rev = "4bf1fa9d3d8b17eb6ae628e93018ee8f020565ba"; + hash = "sha256-OeDUQXqVBUfKjYt5oSmfl2N/19PFYIbPXfFqloai0LQ="; }; - cargoHash = "sha256-wrrdXX/rEVxmHdyblm4I9iHD3bPoDd1KlBe3ODeGFeM="; + cargoHash = "sha256-VMGdB4dF3Ccxl6DifdXFH4+XVT7RoeqI/l/AR/epg4o="; checkFlags = [ # flaky test diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/package.nix index 55a07cd66e..78325d90bf 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/package.nix @@ -24,8 +24,6 @@ melpaBuild { # to compile lspce.el, it needs lspce-module.so files = ''(:defaults "${lib.getLib lspce-module}/lib/lspce-module.*")''; - ignoreCompilationError = false; - passthru = { inherit lspce-module; updateScript = nix-update-script { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix index b1c378cf31..240cde0063 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix @@ -26,8 +26,6 @@ elpaBuild { tar --create --verbose --file=$src $content_directory ''; - ignoreCompilationError = false; - meta = removeAttrs mu.meta [ "mainProgram" ] // { description = "Full-featured e-mail client"; maintainers = mu.meta.maintainers ++ (with lib.maintainers; [ linj ]); diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix index 7554fd5983..055c09a05f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix @@ -59,8 +59,6 @@ melpaBuild { install -D --target-directory=$out/bin notdeft-xapian ''; - ignoreCompilationError = false; - passthru = { updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/package.nix index 94499d7152..ac208e29db 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/package.nix @@ -15,8 +15,6 @@ melpaBuild { popd ''; - ignoreCompilationError = false; - meta = { description = "Emacs ott mode (from ott sources)"; inherit (ott.meta) homepage license; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/package.nix index a0ae4574e4..f6ec804871 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/package.nix @@ -26,8 +26,6 @@ melpaBuild { install -Dm644 -t ''${!outputDoc}/share/doc/pod-mode/ ChangeLog README ''; - ignoreCompilationError = false; - meta = { homepage = "https://metacpan.org/dist/pod-mode"; description = "Major mode for editing .pod-files"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/package.nix index c5e20aae5e..feab7350ca 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/package.nix @@ -22,8 +22,6 @@ melpaBuild { hash = "sha256-DJJfjbu27Gi7Nzsa1cdi8nIQowKH8ZxgQBwfXLB0Q/I="; }; - ignoreCompilationError = false; - meta = { description = "Major mode for Prisma Schema Language"; license = lib.licenses.gpl2Only; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog-mode/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog-mode/package.nix index 8175985519..41c9363fbf 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog-mode/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog-mode/package.nix @@ -19,8 +19,6 @@ melpaBuild { --replace-fail ";; prolog.el ---" ";;; prolog.el ---" ''; - ignoreCompilationError = false; - meta = { homepage = "https://bruda.ca/emacs/prolog_mode_for_emacs/"; description = "Prolog mode for Emacs"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix index b44b2281d5..aee5c8ba2d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix @@ -19,8 +19,6 @@ melpaBuild { hash = "sha256-/8T1VTYkKUxlNWXuuS54S5jpl4UxJBbgSuWc17a/VyM="; }; - ignoreCompilationError = false; - passthru.updateScript = gitUpdater { }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix index b020d158f3..495e274735 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix @@ -14,6 +14,9 @@ melpaBuild rec { hash = "sha256-lc6NIX+lx97qCs5JqG7x0iVE6ki09Gy7DEQuPW2c+7s="; }; + # https://github.com/NixOS/nixpkgs/issues/335421 + ignoreCompilationError = true; + meta = { /* installation: add to your ~/.emacs diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/package.nix index ee50bda060..7cf5a63f4b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/package.nix @@ -17,8 +17,6 @@ melpaBuild { hash = "sha256-D36qiRi5OTZrBtJ/bD/javAWizZ8NLlC/YP4rdLCSsw="; }; - ignoreCompilationError = false; - passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/package.nix index 8454c581e2..0227fcefc1 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/package.nix @@ -13,8 +13,6 @@ melpaBuild { hash = "sha256-VXz3pO6N94XM8FzLSAoYrj3NEh4wp0UiuG6ad8M7nVU="; }; - ignoreCompilationError = false; - meta = { homepage = "https://www.emacswiki.org/emacs/sv-kalender.el"; description = "Swedish calendar for Emacs"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/texpresso/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/texpresso/default.nix index f92bfed79c..ca83eb04a3 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/texpresso/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/texpresso/default.nix @@ -10,8 +10,6 @@ melpaBuild { files = ''("emacs/*.el")''; - ignoreCompilationError = false; - meta = { inherit (texpresso.meta) homepage license; description = "Emacs mode for TeXpresso"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix index a0e8969f46..5f04332db1 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix @@ -44,8 +44,6 @@ melpaStablePackages.tree-sitter-langs.overrideAttrs(old: { fi '') plugins); - ignoreCompilationError = false; - passthru = old.passthru or {} // { inherit plugins; withPlugins = fn: final.tree-sitter-langs.override { plugins = fn tree-sitter-grammars; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix index cb020bc7ef..bf23d0caf9 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix @@ -42,8 +42,6 @@ in melpaBuild { files = ''("core/*.el" "${tsc-dyn}/lib/*")''; - ignoreCompilationError = false; - passthru = { inherit tsc-dyn; updateScript = nix-update-script { attrPath = "emacsPackages.tsc.tsc-dyn"; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/package.nix index 0d000a43d7..d5b597bdf4 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/package.nix @@ -20,8 +20,6 @@ melpaBuild { dontConfigure = true; - ignoreCompilationError = false; - meta = { description = "Major mode for editing Ur/Web"; inherit (urweb.meta) license homepage; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix index 94e3d17828..5107bd77f6 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix @@ -49,8 +49,6 @@ melpaBuild { el-patch ]; - ignoreCompilationError = false; - passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/wat-mode/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/wat-mode/package.nix index da9bde05eb..e4bb260d14 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/wat-mode/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/wat-mode/package.nix @@ -16,8 +16,6 @@ melpaBuild { hash = "sha256-jV5V3TRY+D3cPSz3yFwVWn9yInhGOYIaUTPEhsOBxto="; }; - ignoreCompilationError = false; - passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/package.nix index 41c0fcc1fd..2981cb8f47 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/package.nix @@ -13,8 +13,6 @@ melpaBuild { hash = "sha256-ceCOBFfixmGVB3kaSvOv1YZThC2pleYnS8gXhLrjhA8="; }; - ignoreCompilationError = false; - meta = { homepage = "https://www.emacswiki.org/emacs/yes-no.el"; description = "Specify use of `y-or-n-p' or `yes-or-no-p' on a case-by-case basis"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/package.nix index b8bb5cd8dc..d3e5a5cfbb 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/package.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/package.nix @@ -16,8 +16,6 @@ melpaBuild { hash = "sha256-Etl95rcoRACDPjcTPQqYK2L+w8OZbOrTrRT0JadMdH4="; }; - ignoreCompilationError = false; - passthru.updateScript = unstableGitUpdater { }; meta = { 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 e680e1f7e6..2748889309 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 @@ -30,12 +30,18 @@ in { lib, pkgs }: variant: self: let - inherit (import ./lib-override-helper.nix pkgs) + inherit (import ./lib-override-helper.nix pkgs lib) + addPackageRequires + addPackageRequiresIfOlder buildWithGit dontConfigure externalSrc fix-rtags + fixRequireHelmCore + ignoreCompilationError + ignoreCompilationErrorIfOlder markBroken + mkHome ; generateMelpa = lib.makeOverridable ({ archiveJson ? defaultArchive @@ -131,7 +137,7 @@ let } // { # Expects bash to be at /bin/bash - ac-rtags = fix-rtags super.ac-rtags; + ac-rtags = ignoreCompilationError (fix-rtags super.ac-rtags); # elisp error age = super.age.overrideAttrs (attrs: { postPatch = attrs.postPatch or "" + '' @@ -144,7 +150,8 @@ let inherit (self.melpaPackages) powerline; }; - auto-complete-clang-async = super.auto-complete-clang-async.overrideAttrs (old: { + # https://github.com/Golevka/emacs-clang-complete-async/issues/90 + auto-complete-clang-async = (addPackageRequires super.auto-complete-clang-async [ self.auto-complete ]).overrideAttrs (old: { buildInputs = old.buildInputs ++ [ pkgs.llvmPackages.llvm ]; CFLAGS = "-I${pkgs.llvmPackages.libclang.lib}/include"; LDFLAGS = "-L${pkgs.llvmPackages.libclang.lib}/lib"; @@ -157,7 +164,7 @@ let # upstream issue: missing package version cmake-mode = dontConfigure super.cmake-mode; - company-rtags = fix-rtags super.company-rtags; + company-rtags = ignoreCompilationError (fix-rtags super.company-rtags); # elisp error easy-kill-extras = super.easy-kill-extras.override { inherit (self.melpaPackages) easy-kill; @@ -226,7 +233,7 @@ let inherit (self.melpaPackages) ess ctable popup; }; - flycheck-rtags = fix-rtags super.flycheck-rtags; + flycheck-rtags = ignoreCompilationError (fix-rtags super.flycheck-rtags); # elisp error pdf-tools = super.pdf-tools.overrideAttrs (old: { # Temporary work around for: @@ -313,7 +320,7 @@ let HOME = "/tmp"; }); - ivy-rtags = fix-rtags super.ivy-rtags; + ivy-rtags = ignoreCompilationError (fix-rtags super.ivy-rtags); # elisp error jinx = super.jinx.overrideAttrs (old: let libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary; @@ -392,7 +399,7 @@ let magit-tbdiff = buildWithGit super.magit-tbdiff; - magit-topgit = buildWithGit super.magit-topgit; + magit-topgit = ignoreCompilationError (buildWithGit super.magit-topgit); # elisp error magit-vcsh = buildWithGit super.magit-vcsh; @@ -406,7 +413,7 @@ let magit-gitflow = buildWithGit super.magit-gitflow; - magithub = buildWithGit super.magithub; + magithub = ignoreCompilationError (buildWithGit super.magithub); # elisp error magit-svn = buildWithGit super.magit-svn; @@ -426,9 +433,7 @@ let jist = buildWithGit super.jist; - mandoku = buildWithGit super.mandoku; - - mandoku-tls = buildWithGit super.mandoku-tls; + mandoku = addPackageRequires super.mandoku [ self.git ]; # upstream is archived magit-p4 = buildWithGit super.magit-p4; @@ -465,7 +470,8 @@ let }); # upstream issue: missing file header - mhc = super.mhc.override { + # elisp error + mhc = (ignoreCompilationError super.mhc).override { inherit (self.melpaPackages) calfw; }; @@ -482,7 +488,7 @@ let ''; }); - rtags = dontConfigure (externalSrc super.rtags pkgs.rtags); + rtags = ignoreCompilationError (dontConfigure (externalSrc super.rtags pkgs.rtags)); # elisp error rtags-xref = dontConfigure super.rtags; @@ -496,12 +502,21 @@ let ''; }); - shm = super.shm.overrideAttrs (attrs: { - propagatedUserEnvPkgs = [ pkgs.haskellPackages.structured-haskell-mode ]; - }); + # https://github.com/projectional-haskell/structured-haskell-mode/issues/165 + shm = + (addPackageRequires super.shm [ + self.haskell-mode + self.hindent + ]).overrideAttrs + (attrs: { + propagatedUserEnvPkgs = attrs.propagatedUserEnvPkgs or [ ] ++ [ + pkgs.haskellPackages.structured-haskell-mode + ]; + }); # Telega has a server portion for it's network protocol - telega = super.telega.overrideAttrs (old: { + # elisp error + telega = (ignoreCompilationError super.telega).overrideAttrs (old: { buildInputs = old.buildInputs ++ [ pkgs.tdlib ]; nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; @@ -640,7 +655,7 @@ let ]; }); - helm-rtags = fix-rtags super.helm-rtags; + helm-rtags = ignoreCompilationError (fix-rtags super.helm-rtags); # elisp error # tries to write to $HOME php-auto-yasnippets = super.php-auto-yasnippets.overrideAttrs (attrs: { @@ -718,6 +733,850 @@ let ''; }) else super.osx-dictionary; + + # https://github.com/skeeto/at-el/issues/9 + "@" = ignoreCompilationErrorIfOlder super."@" "20240923.1318"; + + abgaben = addPackageRequires (mkHome super.abgaben) [ self.mu4e ]; + + # https://github.com/afroisalreadyinu/abl-mode/issues/9 + abl-mode = addPackageRequires super.abl-mode [ self.f ]; + + ac-php-core = super.ac-php-core.overrideAttrs (old: { + # empty file causing native-compiler-error-empty-byte + preBuild = + '' + rm --verbose ac-php-comm-tags-data.el + '' + + old.preBuild or ""; + }); + + # Optimizer error: too much on the stack + ack-menu = ignoreCompilationError super.ack-menu; + + # https://github.com/gongo/airplay-el/issues/2 + airplay = addPackageRequires super.airplay [ self.request-deferred ]; + + alectryon = super.alectryon.overrideAttrs ( + finalAttrs: previousAttrs: { + # https://github.com/melpa/melpa/pull/9185 + preBuild = + if lib.versionOlder finalAttrs.version "20241006.1902" then + previousAttrs.preBuild or "" + + "\n" + + '' + rm --recursive --verbose etc/elisp/screenshot + '' + else + previousAttrs.preBuild or null; + } + ); + + # https://github.com/gergelypolonkai/alert-termux/issues/2 + alert-termux = addPackageRequires super.alert-termux [ self.alert ]; + + # https://github.com/magnars/angular-snippets.el/issues/7 + angular-snippets = addPackageRequires super.angular-snippets [ self.yasnippet ]; + + # https://github.com/ragone/asx/pull/3 + asx = addPackageRequires super.asx [ self.request ]; + + auctex-cluttex = mkHome super.auctex-cluttex; + + auctex-latexmk = mkHome super.auctex-latexmk; + + auto-indent-mode = ignoreCompilationError super.auto-indent-mode; # elisp error + + # missing optional dependencies + auto-complete-auctex = addPackageRequires (mkHome super.auto-complete-auctex) [ self.auctex ]; + + # depends on distel which is not on any ELPA https://github.com/massemanet/distel/issues/21 + auto-complete-distel = ignoreCompilationError super.auto-complete-distel; + + aws-ec2 = ignoreCompilationError super.aws-ec2; # elisp error + + badger-theme = ignoreCompilationError super.badger-theme; # elisp error + + # https://github.com/BinaryAnalysisPlatform/bap-mode/pull/4 + bap-mode = fixRequireHelmCore (addPackageRequires super.bap-mode [ self.helm-core ]); + + # try to open non-existent ~/.emacs.d/.blog_minimal.config during compilation + blog-minimal = ignoreCompilationError super.blog-minimal; + + boa-mode = ignoreCompilationError super.boa-mode; # elisp error + + # missing optional dependencies + boogie-friends = addPackageRequires super.boogie-friends [ self.lsp-mode ]; + + bpr = super.bpr.overrideAttrs ( + finalAttrs: previousAttrs: { + # https://github.com/melpa/melpa/pull/9181 + preBuild = + if lib.versionOlder finalAttrs.version "20241013.1803" then + previousAttrs.preBuild or "" + + "\n" + + '' + rm --verbose --force test-bpr.el + '' + else + previousAttrs; + } + ); + + bts = ignoreCompilationError super.bts; # elisp error + + bts-github = ignoreCompilationError super.bts-github; # elisp error + + buffer-buttons = ignoreCompilationError super.buffer-buttons; # elisp error + + # https://github.com/kiwanami/emacs-calfw/pull/106 + calfw-cal = addPackageRequires super.calfw-cal [ self.calfw ]; + + # https://github.com/kiwanami/emacs-calfw/pull/106 + calfw-gcal = addPackageRequires super.calfw-gcal [ self.calfw ]; + + # https://github.com/kiwanami/emacs-calfw/pull/106 + calfw-howm = addPackageRequires super.calfw-howm [ + self.calfw + self.howm + ]; + + # https://github.com/kiwanami/emacs-calfw/pull/106 + calfw-ical = addPackageRequires super.calfw-ical [ self.calfw ]; + + # https://github.com/kiwanami/emacs-calfw/pull/106 + calfw-org = addPackageRequires super.calfw-org [ self.calfw ]; + + cardano-tx = ignoreCompilationError super.cardano-tx; # elisp error + + cardano-wallet = ignoreCompilationError super.cardano-wallet; # elisp error + + # elisp error and missing optional dependencies + cask-package-toolset = ignoreCompilationError super.cask-package-toolset; + + # missing optional dependencies + chee = addPackageRequires super.chee [ self.helm ]; + + cheerilee = ignoreCompilationError super.cheerilee; # elisp error + + # elisp error and missing optional dependencies + # one optional dependency spark is removed in https://github.com/melpa/melpa/pull/9151 + chronometrist = ignoreCompilationError super.chronometrist; + + chronometrist-key-values = super.chronometrist-key-values.overrideAttrs ( + finalAttrs: previousAttrs: { + # https://github.com/melpa/melpa/pull/9184 + recipe = + if lib.versionOlder finalAttrs.version "20241006.1831" then + '' + (chronometrist-key-values :fetcher git :url "" + :files (:defaults "elisp/chronometrist-key-values.*")) + '' + else + previousAttrs.recipe; + } + ); + + clingo-mode = super.clingo-mode.overrideAttrs ( + finalAttrs: previousAttrs: { + patches = previousAttrs.patches or [ ] ++ [ + (pkgs.fetchpatch { + name = "add-missing-end-parenthesis.patch"; + url = "https://github.com/llaisdy/clingo-mode/pull/3/commits/063445a24afb176c3f16af7a2763771dbdc4ecf6.patch"; + hash = "sha256-OYP5LaZmCUJFgFk1Pf30e7sml8fC+xI4HSyDz7lck7E="; + }) + ]; + } + ); + + # https://github.com/atilaneves/cmake-ide/issues/176 + cmake-ide = addPackageRequires super.cmake-ide [ self.dash ]; + + code-review = ignoreCompilationError super.code-review; # elisp error + + codesearch = super.codesearch.overrideAttrs ( + finalAttrs: previousAttrs: { + patches = + if lib.versionOlder finalAttrs.version "20240827.805" then + previousAttrs.patches or [ ] + ++ [ + (pkgs.fetchpatch { + name = "remove-unused-dash.patch"; + url = "https://github.com/abingham/emacs-codesearch/commit/bd24a152ab6ea9f69443ae8e5b7351bb2f990fb6.patch"; + hash = "sha256-cCHY8Ak2fHuuhymjSF7w2MLPDJa84mBUdKg27mB9yto="; + }) + ] + else + previousAttrs.patches or null; + } + ); + + # https://github.com/hying-caritas/comint-intercept/issues/2 + comint-intercept = addPackageRequires super.comint-intercept [ self.vterm ]; + + company-auctex = mkHome super.company-auctex; + + # depends on distel which is not on any ELPA https://github.com/massemanet/distel/issues/21 + company-distel = ignoreCompilationError super.company-distel; + + # qmltypes-table.el causing native-compiler-error-empty-byte + company-qml = ignoreCompilationError super.company-qml; + + # https://github.com/neuromage/ycm.el/issues/6 + company-ycm = ignoreCompilationError (addPackageRequires super.company-ycm [ self.company ]); + + composable = ignoreCompilationError super.composable; # elisp error + + # missing optional dependencies + conda = addPackageRequires super.conda [ self.projectile ]; + + counsel-gtags = ignoreCompilationError super.counsel-gtags; # elisp error + + # https://github.com/fuxialexander/counsel-notmuch/issues/3 + counsel-notmuch = addPackageRequires super.counsel-notmuch [ self.counsel ]; + + # needs dbus during compilation + counsel-spotify = ignoreCompilationError super.counsel-spotify; + + creole = ignoreCompilationError super.creole; # elisp error + + cssh = ignoreCompilationError super.cssh; # elisp error + + dap-mode = super.dap-mode.overrideAttrs (old: { + # empty file causing native-compiler-error-empty-byte + preBuild = + '' + rm --verbose dapui.el + '' + + old.preBuild or ""; + }); + + db-pg = ignoreCompilationError super.db-pg; # elisp error + + describe-number = ignoreCompilationError super.describe-number; # elisp error + + # missing optional dependencies: text-translator, not on any ELPA + dic-lookup-w3m = ignoreCompilationError super.dic-lookup-w3m; + + # https://github.com/nlamirault/dionysos/issues/17 + dionysos = addPackageRequires super.dionysos [ self.f ]; + + # https://github.com/emacsorphanage/dired-k/issues/48 + # missing optional dependencies + dired-k = addPackageRequires super.dired-k [ self.direx ]; + + # depends on distel which is not on any ELPA https://github.com/massemanet/distel/issues/21 + distel-completion-lib = ignoreCompilationError super.distel-completion-lib; + + django-mode = ignoreCompilationError super.django-mode; # elisp error + + # elisp error and missing optional dependencies + drupal-mode = ignoreCompilationError super.drupal-mode; + + e2wm-pkgex4pl = ignoreCompilationError super.e2wm-pkgex4pl; # elisp error + + ecb = ignoreCompilationError super.ecb; # elisp error + + # Optimizer error: too much on the stack + edit-color-stamp = ignoreCompilationError super.edit-color-stamp; + + edts = ignoreCompilationError (mkHome super.edts); # elisp error + + eimp = super.eimp.overrideAttrs (old: { + postPatch = + old.postPatch or "" + + "\n" + + '' + substituteInPlace eimp.el --replace-fail \ + '(defcustom eimp-mogrify-program "mogrify"' \ + '(defcustom eimp-mogrify-program "${pkgs.imagemagick}/bin/mogrify"' + ''; + }); + + ein = ignoreCompilationError super.ein; # elisp error + + # missing optional dependencies + ejc-sql = addPackageRequires super.ejc-sql [ + self.auto-complete + self.company + ]; + + # missing optional dependencies + ekg = addPackageRequires super.ekg [ self.denote ]; + + elisp-sandbox = ignoreCompilationError super.elisp-sandbox; # elisp error + + elnode = ignoreCompilationError super.elnode; # elisp error + + elscreen = super.elscreen.overrideAttrs (old: { + patches = old.patches or [ ] ++ [ + (pkgs.fetchpatch { + name = "do-not-require-unneeded-wl.patch"; + url = "https://github.com/knu/elscreen/pull/34/commits/2ffbeb11418d1b98809909c389e7010666d511fd.patch"; + hash = "sha256-7JoDGtFECZEkB3xmMBXZcx6oStkEV06soiqOkDevWtM="; + }) + ]; + }); + + el-secretario-mu4e = addPackageRequires super.el-secretario-mu4e [ self.mu4e ]; + + embark-vc = buildWithGit super.embark-vc; + + # https://github.com/nubank/emidje/issues/23 + emidje = addPackageRequires super.emidje [ self.pkg-info ]; + + # depends on later-do which is not on any ELPA + emms-player-simple-mpv = ignoreCompilationError super.emms-player-simple-mpv; + emms-player-mpv-jp-radios = ignoreCompilationError super.emms-player-mpv-jp-radios; + + enotify = ignoreCompilationError super.enotify; # elisp error + + # https://github.com/leathekd/ercn/issues/6 + ercn = addPackageRequires super.ercn [ self.dash ]; + + # missing optional dependencies + eval-in-repl = addPackageRequires super.eval-in-repl ( + with self; + [ + alchemist + cider + elm-mode + erlang + geiser + hy-mode + elixir-mode + js-comint + lua-mode + tuareg + racket-mode + inf-ruby + slime + sly + sml-mode + ] + ); + + # elisp error and missing dependencies + evalator = ignoreCompilationError super.evalator; + + evalator-clojure = ignoreCompilationError super.evalator-clojure; # elisp error + + # https://github.com/PythonNut/evil-easymotion/issues/74 + evil-easymotion = addPackageRequires super.evil-easymotion [ self.evil ]; + + evil-mu4e = addPackageRequires super.evil-mu4e [ self.mu4e ]; + + # https://github.com/VanLaser/evil-nl-break-undo/issues/2 + evil-nl-break-undo = addPackageRequiresIfOlder super.evil-nl-break-undo [ + self.evil + ] "20240921.953"; + + evil-python-movement = ignoreCompilationError super.evil-python-movement; # elisp error + + evil-tex = mkHome super.evil-tex; + + # Error: Bytecode overflow + ewal-doom-themes = ignoreCompilationError super.ewal-doom-themes; + + # https://github.com/agzam/exwm-edit/issues/32 + exwm-edit = addPackageRequires super.exwm-edit [ self.exwm ]; + + # https://github.com/syl20bnr/flymake-elixir/issues/4 + flymake-elixir = addPackageRequires super.flymake-elixir [ self.flymake-easy ]; + + flyparens = ignoreCompilationError super.flyparens; # elisp error + + fold-dwim-org = ignoreCompilationError super.fold-dwim-org; # elisp error + + frontside-javascript = super.frontside-javascript.overrideAttrs ( + finalAttrs: previousAttrs: { + # https://github.com/melpa/melpa/pull/9182 + preBuild = + if lib.versionOlder finalAttrs.version "20240929.1858" then + previousAttrs.preBuild or "" + + "\n" + + '' + rm --verbose packages/javascript/test-suppport.el + '' + else + previousAttrs.preBuild or null; + } + ); + + fxrd-mode = ignoreCompilationError super.fxrd-mode; # elisp error + + # missing optional dependencies + gap-mode = addPackageRequires super.gap-mode [ + self.company + self.flycheck + ]; + + gh-notify = buildWithGit super.gh-notify; + + # https://github.com/nlamirault/emacs-gitlab/issues/68 + gitlab = addPackageRequires super.gitlab [ self.f ]; + + # TODO report to upstream + global-tags = addPackageRequires super.global-tags [ self.s ]; + + go = ignoreCompilationError super.go; # elisp error + + graphene = ignoreCompilationError super.graphene; # elisp error + + greader = ignoreCompilationError super.greader; # elisp error + + # TODO report to upstream + guix = addPackageRequires super.guix [ self.geiser-guile ]; + + # missing optional dependencies + gumshoe = addPackageRequires super.gumshoe [ self.perspective ]; + + helm-chrome-control = super.helm-chrome-control.overrideAttrs (old: { + patches = old.patches or [ ] ++ [ + (pkgs.fetchpatch { + name = "require-helm-core-instead-of-helm.patch"; + url = "https://github.com/xuchunyang/helm-chrome-control/pull/2/commits/7765cd2483adef5cfa6cf77f52259ad6e1dd0daf.patch"; + hash = "sha256-tF+IaICbveYJvd3Tjx52YBBztpjifZdCA4O+Z2r1M3s="; + }) + ]; + }); + + # https://github.com/xuchunyang/helm-chrome-history/issues/3 + helm-chrome-history = fixRequireHelmCore super.helm-chrome-history; + + helm-cider = ignoreCompilationError super.helm-cider; # elisp error + + helm-ext = ignoreCompilationError super.helm-ext; # elisp error + + # https://github.com/iory/emacs-helm-ghs/issues/1 + helm-ghs = addPackageRequires super.helm-ghs [ self.helm-ghq ]; + + # https://github.com/maio/helm-git/issues/7 + helm-git = addPackageRequires super.helm-git [ + self.helm + self.magit + ]; + + # TODO report to upstream + helm-flycheck = fixRequireHelmCore super.helm-flycheck; + + # https://github.com/yasuyk/helm-git-grep/issues/54 + helm-git-grep = addPackageRequires super.helm-git-grep [ self.helm ]; + + # https://github.com/yasuyk/helm-go-package/issues/8 + helm-go-package = fixRequireHelmCore super.helm-go-package; + + # https://github.com/torgeir/helm-js-codemod.el/pull/1 + helm-js-codemod = fixRequireHelmCore super.helm-js-codemod; + + helm-kythe = ignoreCompilationError super.helm-kythe; # elisp error + + # https://github.com/emacs-jp/helm-migemo/issues/8 + helm-migemo = addPackageRequiresIfOlder super.helm-migemo [ self.helm ] "20240921.1550"; + + helm-mu = addPackageRequires super.helm-mu [ self.mu4e ]; + + # https://github.com/xuchunyang/helm-osx-app/pull/1 + helm-osx-app = addPackageRequires super.helm-osx-app [ self.helm ]; + + # https://github.com/cosmicexplorer/helm-rg/issues/36 + helm-rg = ignoreCompilationError super.helm-rg; # elisp error + + # https://github.com/yasuyk/helm-spaces/issues/1 + helm-spaces = fixRequireHelmCore super.helm-spaces; + + hideshow-org = ignoreCompilationError super.hideshow-org; # elisp error + + # https://github.com/purcell/hippie-expand-slime/issues/2 + hippie-expand-slime = addPackageRequires super.hippie-expand-slime [ self.slime ]; + + hyperbole = ignoreCompilationError (addPackageRequires (mkHome super.hyperbole) [ self.el-mock ]); # elisp error + + # needs non-existent "browser database directory" during compilation + # TODO report to upsteam about missing dependency websocket + ibrowse = ignoreCompilationError (addPackageRequires super.ibrowse [ self.websocket ]); + + # elisp error and missing optional dependencies + identica-mode = ignoreCompilationError super.identica-mode; + + # missing optional dependencies + idris-mode = addPackageRequires super.idris-mode [ self.flycheck ]; + + imbot = ignoreCompilationError super.imbot; # elisp error + + indium = mkHome super.indium; + + # TODO report to upsteam + inlineR = addPackageRequires super.inlineR [ self.ess ]; + + # https://github.com/duelinmarkers/insfactor.el/issues/7 + insfactor = addPackageRequires super.insfactor [ self.cider ]; + + # https://github.com/wandersoncferreira/ivy-clojuredocs/issues/5 + ivy-clojuredocs = addPackageRequires super.ivy-clojuredocs [ self.parseedn ]; + + # TODO report to upstream + jack-connect = addPackageRequires super.jack-connect [ self.dash ]; + + jdee = ignoreCompilationError super.jdee; # elisp error + + # https://github.com/fred-o/jekyll-modes/issues/6 + jekyll-modes = addPackageRequires super.jekyll-modes [ self.poly-markdown ]; + + jss = ignoreCompilationError super.jss; # elisp error + + # missing optional dependencies: vterm or eat + julia-snail = addPackageRequires super.julia-snail [ self.eat ]; + + kite = ignoreCompilationError super.kite; # elisp error + + # missing optional dependencies + laas = addPackageRequires super.laas [ self.math-symbol-lists ]; + + latex-change-env = mkHome super.latex-change-env; + + latex-extra = mkHome super.latex-extra; + + latex-table-wizard = mkHome super.latex-table-wizard; + + leaf-defaults = ignoreCompilationError super.leaf-defaults; # elisp error + + # https://github.com/abo-abo/lispy/pull/683 + # missing optional dependencies + lispy = addPackageRequires (mkHome super.lispy) [ self.indium ]; + + # missing optional dependencies + magik-mode = addPackageRequires super.magik-mode [ + self.auto-complete + self.flycheck + ]; + + # missing optional dependencies + magnatune = addPackageRequires super.magnatune [ self.helm ]; + + major-mode-icons = ignoreCompilationError super.major-mode-icons; # elisp error + + malinka = ignoreCompilationError super.malinka; # elisp error + + mastodon = ignoreCompilationError super.mastodon; # elisp error + + # https://github.com/org2blog/org2blog/issues/339 + metaweblog = addPackageRequires super.metaweblog [ self.xml-rpc ]; + + mu-cite = ignoreCompilationError super.mu-cite; # elisp error + + mu4e-alert = addPackageRequires super.mu4e-alert [ self.mu4e ]; + + mu4e-column-faces = addPackageRequires super.mu4e-column-faces [ self.mu4e ]; + + mu4e-conversation = addPackageRequires super.mu4e-conversation [ self.mu4e ]; + + mu4e-jump-to-list = addPackageRequires super.mu4e-jump-to-list [ self.mu4e ]; + + mu4e-marker-icons = addPackageRequires super.mu4e-marker-icons [ self.mu4e ]; + + mu4e-overview = addPackageRequires super.mu4e-overview [ self.mu4e ]; + + mu4e-query-fragments = addPackageRequires super.mu4e-query-fragments [ self.mu4e ]; + + mu4e-views = addPackageRequires super.mu4e-views [ self.mu4e ]; + + # https://github.com/magnars/multifiles.el/issues/9 + multifiles = addPackageRequires super.multifiles [ self.dash ]; + + # missing optional dependencies + mykie = addPackageRequires super.mykie [ self.helm ]; + + myrddin-mode = ignoreCompilationError super.myrddin-mode; # elisp error + + nand2tetris = super.nand2tetris.overrideAttrs (old: { + patches = old.patches or [ ] ++ [ + (pkgs.fetchpatch { + name = "remove-unneeded-require.patch"; + url = "https://github.com/CestDiego/nand2tetris.el/pull/16/commits/d06705bf52f3cf41f55498d88fe15a1064bc2cfa.patch"; + hash = "sha256-8OJXN9MuwBbL0afus53WroIxtIzHY7Bryv5ZGcS/inI="; + }) + ]; + }); + + # elisp error and missing dependency spamfilter which is not on any ELPA + navi2ch = ignoreCompilationError super.navi2ch; + + navorski = super.navorski.overrideAttrs (old: { + patches = old.patches or [ ] ++ [ + (pkgs.fetchpatch { + name = "stop-using-assoc.patch"; + url = "https://github.com/roman/navorski.el/pull/12/commits/b7b6c331898cae239c176346ac87c8551b1e0c72.patch"; + hash = "sha256-CZxOSGuJXATonHMSLGCzO4kOlQqRAOcNNq0i4Qh21y8="; + }) + ]; + }); + + # empty tools/ncl-mode-keywords.el causing native-compiler-error-empty-byte + ncl-mode = ignoreCompilationError super.ncl-mode; + + # missing optional dependencies + netease-cloud-music = addPackageRequires super.netease-cloud-music [ self.async ]; + + nim-mode = ignoreCompilationError super.nim-mode; # elisp error + + noctilux-theme = ignoreCompilationError super.noctilux-theme; # elisp error + + # https://github.com/nicferrier/emacs-noflet/issues/12 + noflet = ignoreCompilationError super.noflet; # elisp error + + norns = ignoreCompilationError super.norns; # elisp error + + # missing optional dependencies + nu-mode = addPackageRequires super.nu-mode [ self.evil ]; + + # try to open non-existent ~/.emacs.d/.chatgpt-shell.el during compilation + ob-chatgpt-shell = ignoreCompilationError super.ob-chatgpt-shell; + + org-change = ignoreCompilationError super.org-change; # elisp error + + org-edit-latex = mkHome super.org-edit-latex; + + # https://github.com/GuiltyDolphin/org-evil/issues/24 + # hydra has that error: https://hydra.nixos.org/build/274852065 + # but I cannot reproduce that locally + org-evil = ignoreCompilationError super.org-evil; + + org-gnome = ignoreCompilationError super.org-gnome; # elisp error + + org-gtd = ignoreCompilationError super.org-gtd; # elisp error + + # needs newer org than the Eamcs 29.4 builtin one + org-link-beautify = addPackageRequires super.org-link-beautify [ self.org ]; + + # TODO report to upstream + org-kindle = addPackageRequires super.org-kindle [ self.dash ]; + + org-special-block-extras = ignoreCompilationError super.org-special-block-extras; # elisp error + + org-trello = ignoreCompilationError super.org-trello; # elisp error + + # Optimizer error: too much on the stack + orgnav = ignoreCompilationError super.orgnav; + + org-noter = super.org-noter.overrideAttrs ( + finalAttrs: previousAttrs: { + patches = + if lib.versionOlder finalAttrs.version "20240915.344" then + previousAttrs.patches or [ ] + ++ [ + (pkgs.fetchpatch { + name = "catch-error-for-optional-dep-org-roam.patch"; + url = "https://github.com/org-noter/org-noter/commit/761c551ecc88fec57e840d346c6af5f5b94591d5.patch"; + hash = "sha256-Diw9DgjANDWu6CBMOlRaihQLOzeAr7VcJPZT579dpYU="; + }) + ] + else + previousAttrs.patches or null; + } + ); + + org-noter-pdftools = mkHome super.org-noter-pdftools; + + # elisp error and missing optional dependencies + org-ref = ignoreCompilationError super.org-ref; + + # missing optional dependencies + org-roam-bibtex = addPackageRequires super.org-roam-bibtex [ + self.helm-bibtex + self.ivy-bibtex + ]; + + org-pdftools = mkHome super.org-pdftools; + + org-projectile = super.org-projectile.overrideAttrs ( + finalAttrs: previousAttrs: { + # https://github.com/melpa/melpa/pull/9150 + preBuild = + if lib.versionOlder finalAttrs.version "20240901.2041" then + '' + rm --verbose org-projectile-helm.el + '' + + previousAttrs.preBuild or "" + else + previousAttrs.preBuild or null; + } + ); + + # https://github.com/colonelpanic8/org-project-capture/issues/66 + org-projectile-helm = addPackageRequires super.org-projectile-helm [ self.helm-org ]; + + # https://github.com/DarwinAwardWinner/mac-pseudo-daemon/issues/9 + osx-pseudo-daemon = addPackageRequiresIfOlder super.osx-pseudo-daemon [ self.mac-pseudo-daemon ] "20240922.2024"; + + # missing optional dependencies + outlook = addPackageRequires super.outlook [ self.mu4e ]; + + pastery = ignoreCompilationError super.pastery; # elisp error + + pgdevenv = ignoreCompilationError super.pgdevenv; # elisp error + + pinot = ignoreCompilationError super.pinot; # elisp error + + # https://github.com/polymode/poly-R/issues/41 + poly-R = addPackageRequires super.poly-R [ self.ess ]; + + # missing optional dependencies: direx e2wm yaol, yaol not on any ELPA + pophint = ignoreCompilationError super.pophint; + + portage-navi = ignoreCompilationError super.portage-navi; # elisp error + + preview-dvisvgm = mkHome super.preview-dvisvgm; + + # https://github.com/micdahl/projectile-trailblazer/issues/4 + projectile-trailblazer = addPackageRequires super.projectile-trailblazer [ self.projectile-rails ]; + + projmake-mode = ignoreCompilationError super.projmake-mode; # elisp error + + # https://github.com/tumashu/pyim-basedict/issues/4 + pyim-basedict = addPackageRequires super.pyim-basedict [ self.pyim ]; + + # TODO report to upstream + realgud-lldb = super.realgud-lldb.overrideAttrs (old: { + preBuild = + old.preBuild or "" + + "\n" + + '' + rm --verbose cask-install.el + ''; + }); + + # empty .yas-compiled-snippets.el causing native-compiler-error-empty-byte + requirejs = ignoreCompilationError super.requirejs; + + rhtml-mode = ignoreCompilationError super.rhtml-mode; # elisp error + + roguel-ike = ignoreCompilationError super.roguel-ike; # elisp error + + rpm-spec-mode = ignoreCompilationError super.rpm-spec-mode; # elisp error + + # https://github.com/emacsfodder/emacs-theme-sakura/issues/1 + sakura-theme = addPackageRequiresIfOlder super.sakura-theme [ self.autothemer ] "20240921.1028"; + + scad-preview = ignoreCompilationError super.scad-preview; # elisp error + + # https://github.com/wanderlust/semi/pull/29 + # missing optional dependencies + semi = addPackageRequires super.semi [ self.bbdb-vcard ]; + + shadchen = ignoreCompilationError super.shadchen; # elisp error + + # missing optional dependencies and one of them (mew) is not on any ELPA + shimbun = ignoreCompilationError ( + addPackageRequires super.shimbun [ + self.apel + self.flim + self.w3m + ] + ); + + slack = mkHome super.slack; + + # https://github.com/ffevotte/slurm.el/issues/14 + slurm-mode = addPackageRequires super.slurm-mode [ + self.dash + self.s + ]; + + smart-tabs-mode = ignoreCompilationError super.smart-tabs-mode; # elisp error + + # needs network during compilation + # https://github.com/md-arif-shaikh/soccer/issues/14 + soccer = ignoreCompilationError (addPackageRequires super.soccer [ self.s ]); + + # elisp error and missing optional dependencies + soundklaus = ignoreCompilationError super.soundklaus; + + # missing optional dependencies + sparql-mode = addPackageRequires super.sparql-mode [ self.company ]; + + speechd-el = ignoreCompilationError super.speechd-el; # elisp error + + spu = ignoreCompilationError super.spu; # elisp error + + # missing optional dependencies + ssh-tunnels = addPackageRequires super.ssh-tunnels [ self.helm ]; + + # https://github.com/brianc/jade-mode/issues/73 + stylus-mode = addPackageRequires super.stylus-mode [ self.sws-mode ]; + + # missing optional dependencies + suggest = addPackageRequires super.suggest [ self.shut-up ]; + + symex = ignoreCompilationError super.symex; # elisp error + + term-alert = mkHome super.term-alert; + + # https://github.com/colonelpanic8/term-manager/issues/9 + term-manager = addPackageRequires super.term-manager [ self.eat ]; + + texfrag = mkHome super.texfrag; + + # https://github.com/Dspil/text-categories/issues/3 + text-categories = addPackageRequiresIfOlder super.text-categories [ self.dash ] "20240921.824"; + + timp = ignoreCompilationError super.timp; # elisp error + + tommyh-theme = ignoreCompilationError super.tommyh-theme; # elisp error + + tramp-hdfs = ignoreCompilationError super.tramp-hdfs; # elisp error + + universal-emotions-emoticons = ignoreCompilationError super.universal-emotions-emoticons; # elisp error + + use-package-el-get = addPackageRequires super.use-package-el-get [ self.el-get ]; + + vala-mode = ignoreCompilationError super.vala-mode; # elisp error + + # needs network during compilation + wandbox = ignoreCompilationError super.wandbox; # needs network + + # optional dependency spamfilter is not on any ELPA + wanderlust = ignoreCompilationError (addPackageRequires super.wanderlust [ self.shimbun ]); + + # https://github.com/nicklanasa/xcode-mode/issues/28 + xcode-mode = addPackageRequires super.xcode-mode [ self.hydra ]; + + weechat = ignoreCompilationError super.weechat; # elisp error + + weechat-alert = ignoreCompilationError super.weechat-alert; # elisp error + + weibo = ignoreCompilationError super.weibo; # elisp error + + xenops = mkHome super.xenops; + + # missing optional dependencies + xmlunicode = addPackageRequires super.xmlunicode [ self.helm ]; + + # https://github.com/canatella/xwwp/issues/18 + xwwp-follow-link-ivy = addPackageRequires super.xwwp-follow-link-ivy [ self.ivy ]; + + # https://github.com/canatella/xwwp/issues/19 + xwwp-follow-link-helm = addPackageRequires super.xwwp-follow-link-helm [ self.helm ]; + + yara-mode = ignoreCompilationError super.yara-mode; # elisp error + + # https://github.com/leanprover-community/yasnippet-lean/issues/6 + yasnippet-lean = addPackageRequires super.yasnippet-lean [ self.lean-mode ]; + + yasnippet-snippets = mkHome super.yasnippet-snippets; + + yatex = ignoreCompilationError super.yatex; # elisp error + + # elisp error and incomplete recipe + ycm = ignoreCompilationError ( + addPackageRequires super.ycm [ + self.flycheck + self.f + ] + ); + + # missing optional dependencies + zotxt = addPackageRequires super.zotxt [ self.org-noter ]; }; in lib.mapAttrs (n: v: if lib.hasAttr n overrides then overrides.${n} else v) super); diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-common-overrides.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-common-overrides.nix index d6ac00a3a8..f59b607202 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-common-overrides.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-common-overrides.nix @@ -1,8 +1,25 @@ -pkgs: +pkgs: lib: self: super: +let + inherit (import ./lib-override-helper.nix pkgs lib) + addPackageRequires + ; +in { + # missing optional dependencies + haskell-tng-mode = addPackageRequires super.haskell-tng-mode ( + with self; + [ + s + company + projectile + smartparens + yasnippet + ] + ); + p4-16-mode = super.p4-16-mode.overrideAttrs { # workaround https://github.com/NixOS/nixpkgs/issues/301795 prePatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix index 8cbcd0a711..bba1f73f02 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix @@ -19,6 +19,10 @@ self: let + inherit (import ./lib-override-helper.nix pkgs lib) + addPackageRequires + ; + generateNongnu = lib.makeOverridable ( { generated ? ./nongnu-devel-generated.nix, @@ -39,9 +43,15 @@ let super = imported; - commonOverrides = import ./nongnu-common-overrides.nix pkgs; + commonOverrides = import ./nongnu-common-overrides.nix pkgs lib; - overrides = self: super: { }; + overrides = self: super: { + # missing optional dependencies + haskell-tng-mode = addPackageRequires super.haskell-tng-mode [ + self.shut-up + self.lsp-mode + ]; + }; in let diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix index 4466621b39..139bdaf626 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix @@ -29,7 +29,7 @@ self: let super = imported; - commonOverrides = import ./nongnu-common-overrides.nix pkgs; + commonOverrides = import ./nongnu-common-overrides.nix pkgs lib; overrides = self: super: { }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 375b589bcb..5dbcd958b3 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -6975,8 +6975,8 @@ }, { "ename": "bbdb", - "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", - "sha256": "0gnjdlb338gxpsmdx8scj5vb1rbvfkmm71xq37sahy0m4r402al1", + "commit": "8a7d0c7287d157f45ebcb7a6ba2a776b3ee2bc2d", + "sha256": "0rrjvg3rq9267hyr5dkr82kqd3lxxnv6zhmn4ldzb00ynwwmrzr0", "fetcher": "git", "url": "https://git.savannah.nongnu.org/git/bbdb.git", "unstable": { @@ -123226,8 +123226,8 @@ }, { "ename": "ttl-mode", - "commit": "0575169e8fb9a2537582f5aa77fc9950f1f1384c", - "sha256": "1fi8xxzwz3h7kgn69h4p1wlvhvia0v8qqh7k64pgh44b2fq040p1", + "commit": "8a7d0c7287d157f45ebcb7a6ba2a776b3ee2bc2d", + "sha256": "1v34axc96n5aqsm9w2j94z8h9mqfa41300lx8aqccwj8a5qwk90k", "fetcher": "github", "repo": "nxg/ttl-mode", "unstable": { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/make-emacs.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/make-emacs.nix index 8c53805978..e7fe2ccac6 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/make-emacs.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/make-emacs.nix @@ -55,7 +55,7 @@ , systemd , tree-sitter , texinfo -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 , zlib @@ -274,7 +274,7 @@ mkDerivation (finalAttrs: { ] ++ lib.optionals withXinput2 [ libXi ] ++ lib.optionals withXwidgets [ - webkitgtk + webkitgtk_4_0 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ] ++ lib.optionals withNS [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/sources.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/sources.nix index ae93a2ed01..2ad51433e2 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/sources.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/sources.nix @@ -50,14 +50,16 @@ let "macport" = "https://bitbucket.org/mituharu/emacs-mac/raw/${rev}/NEWS-mac"; }.${variant}; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ - AndersonTorres - adisbladis - jwiegley - lovek323 - matthewbauer - # atemu for issues relating to Macport - ]; + maintainers = { + "mainline" = with lib.maintainers; [ + AndersonTorres + adisbladis + jwiegley + lovek323 + matthewbauer + ]; + "macport" = with lib.maintainers; [ ]; + }.${variant}; platforms = { "mainline" = lib.platforms.all; "macport" = lib.platforms.darwin; diff --git a/third_party/nixpkgs/pkgs/applications/editors/focuswriter/default.nix b/third_party/nixpkgs/pkgs/applications/editors/focuswriter/default.nix index 01b461c672..5126c7c672 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/focuswriter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/focuswriter/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "focuswriter"; - version = "1.8.8"; + version = "1.8.9"; src = fetchFromGitHub { owner = "gottcode"; repo = "focuswriter"; rev = "v${version}"; - hash = "sha256-6DUUY7pqhmalxTq/LnJteQkd5Z001+kyQb/cUtmuZI4="; + hash = "sha256-FFfNjjVwi0bE6oc8LYhXrCKd+nwRQrjWzK5P4DSIIgs="; }; nativeBuildInputs = [ pkg-config cmake qttools wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/formiko/default.nix b/third_party/nixpkgs/pkgs/applications/editors/formiko/default.nix index 40c7fba0be..1fa92679f6 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/formiko/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/formiko/default.nix @@ -9,7 +9,7 @@ , gtkspell3 , librsvg , pygobject3 -, webkitgtk +, webkitgtk_4_0 }: buildPythonApplication rec { @@ -36,7 +36,7 @@ buildPythonApplication rec { gtkspell3 librsvg pygobject3 - webkitgtk + webkitgtk_4_0 ]; # Needs a display diff --git a/third_party/nixpkgs/pkgs/applications/editors/gnome-inform7/default.nix b/third_party/nixpkgs/pkgs/applications/editors/gnome-inform7/default.nix index df1baa997a..e4cc850579 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/gnome-inform7/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/gnome-inform7/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, python3, perl, bison , texinfo, desktop-file-utils, wrapGAppsHook3, docbook2x, docbook-xsl-nons , inform7, gettext, libossp_uuid, gtk3, gobject-introspection, vala, gtk-doc -, webkitgtk, gtksourceview3, gspell, libxml2, goocanvas2, libplist, glib +, webkitgtk_4_0, gtksourceview3, gspell, libxml2, goocanvas2, libplist, glib , gst_all_1 }: # Neither gnome-inform7 nor its dependencies ratify and chimara have tagged releases in the GTK3 branch yet. @@ -92,7 +92,7 @@ in stdenv.mkDerivation { gtk3 gtksourceview3 gspell - webkitgtk + webkitgtk_4_0 libxml2 goocanvas2 libplist diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/tests/default.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/tests/default.nix index 14d682e14e..a5443ab489 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/tests/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/tests/default.nix @@ -101,8 +101,18 @@ in ### neovim tests ################## nvim_with_plugins = wrapNeovim2 "-with-plugins" nvimConfNix; + nvim_singlelines = wrapNeovim2 "-single-lines" nvimConfSingleLines; - singlelinesconfig = runTest (wrapNeovim2 "-single-lines" nvimConfSingleLines) '' + # test that passthru.initRc hasn't changed + passthruInitRc = runTest nvim_singlelines '' + INITRC=${pkgs.writeTextFile { name = "initrc"; text = nvim_singlelines.passthru.initRc; }} + assertFileContent \ + $INITRC \ + "${./init-single-lines.vim}" + ''; + + # test single line concatenation + singlelinesconfig = runTest nvim_singlelines '' assertFileContains \ "$luarcGeneric" \ "vim.cmd.source \"/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-init.vim" @@ -127,6 +137,7 @@ in viAlias = true; }; + # test it still works with vim-plug nvim_with_plug = neovim.override { extraName = "-with-plug"; configure.packages.plugins = with pkgs.vimPlugins; { diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/utils.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/utils.nix index 9f0aa86de4..4eeb1701a5 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/utils.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/utils.nix @@ -13,6 +13,45 @@ let inherit (vimUtils) toVimPlugin; + /* transform all plugins into an attrset + { optional = bool; plugin = package; } + */ + normalizePlugins = plugins: + let + defaultPlugin = { + plugin = null; + config = null; + optional = false; + }; + in + map (x: defaultPlugin // (if (x ? plugin) then x else { plugin = x; })) plugins; + + + /** + accepts a list of normalized plugins and convert them into a vim package + + # Type + + ``` + normalizedPluginsToVimPackage :: [AttrSet] -> AttrSet + ``` + + # Examples + :::{.example} + + ```nix + normalizedPluginsToVimPackage [ { plugin = vim-fugitive; optional = false'} ] + => { start = [ vim-fugitive ]; opt = []; } + ::: + */ + normalizedPluginsToVimPackage = normalizedPlugins: + let + pluginsPartitioned = lib.partition (x: x.optional == true) normalizedPlugins; + in { + start = map (x: x.plugin) pluginsPartitioned.wrong; + opt = map (x: x.plugin) pluginsPartitioned.right; + }; + /* returns everything needed for the caller to wrap its own neovim: - the generated content of the future init.vim - the arguments to wrap neovim with @@ -23,103 +62,19 @@ let Indeed, note that wrapping with `-u init.vim` has sideeffects like .nvimrc wont be loaded anymore, $MYVIMRC wont be set etc */ - makeNeovimConfig = - { withPython3 ? true - /* the function you would have passed to python3.withPackages */ - , extraPython3Packages ? (_: [ ]) - , withNodeJs ? false - , withRuby ? true - /* the function you would have passed to lua.withPackages */ - , extraLuaPackages ? (_: [ ]) - - # expects a list of plugin configuration - # expects { plugin=far-vim; config = "let g:far#source='rg'"; optional = false; } - , plugins ? [] - # custom viml config appended after plugin-specific config - , customRC ? "" - - # for forward compability, when adding new environments, haskell etc. - , ... - }@args: - let - rubyEnv = bundlerEnv { - name = "neovim-ruby-env"; - gemdir = ./ruby_provider; - postBuild = '' - ln -sf ${ruby}/bin/* $out/bin - ''; - }; - - # transform all plugins into an attrset - # { optional = bool; plugin = package; } - pluginsNormalized = let - defaultPlugin = { - plugin = null; - config = null; - optional = false; - }; - in - map (x: defaultPlugin // (if (x ? plugin) then x else { plugin = x; })) plugins; - - pluginRC = lib.foldl (acc: p: if p.config != null then acc ++ [p.config] else acc) [] pluginsNormalized; - - pluginsPartitioned = lib.partition (x: x.optional == true) pluginsNormalized; - requiredPlugins = vimUtils.requiredPluginsForPackage myVimPackage; - getDeps = attrname: map (plugin: plugin.${attrname} or (_: [ ])); - myVimPackage = { - start = map (x: x.plugin) pluginsPartitioned.wrong; - opt = map (x: x.plugin) pluginsPartitioned.right; - }; - - pluginPython3Packages = getDeps "python3Dependencies" requiredPlugins; - python3Env = python3Packages.python.withPackages (ps: - [ ps.pynvim ] - ++ (extraPython3Packages ps) - ++ (lib.concatMap (f: f ps) pluginPython3Packages)); - - luaEnv = neovim-unwrapped.lua.withPackages extraLuaPackages; - - # as expected by packdir - packpathDirs.myNeovimPackages = myVimPackage; - ## Here we calculate all of the arguments to the 1st call of `makeWrapper` - # We start with the executable itself NOTE we call this variable "initial" - # because if configure != {} we need to call makeWrapper twice, in order to - # avoid double wrapping, see comment near finalMakeWrapperArgs - makeWrapperArgs = - let - binPath = lib.makeBinPath (lib.optionals withRuby [ rubyEnv ] ++ lib.optionals withNodeJs [ nodejs ]); - in - [ - "--inherit-argv0" - ] ++ lib.optionals withRuby [ - "--set" "GEM_HOME" "${rubyEnv}/${rubyEnv.ruby.gemPath}" - ] ++ lib.optionals (binPath != "") [ - "--suffix" "PATH" ":" binPath - ] ++ lib.optionals (luaEnv != null) [ + makeNeovimConfig = { + customRC ? "" + /* the function you would have passed to lua.withPackages */ + , extraLuaPackages ? (_: [ ]) + , ...}@attrs: let + luaEnv = neovim-unwrapped.lua.withPackages extraLuaPackages; + in attrs // { + neovimRcContent = customRC; + wrapperArgs = lib.optionals (luaEnv != null) [ "--prefix" "LUA_PATH" ";" (neovim-unwrapped.lua.pkgs.luaLib.genLuaPathAbsStr luaEnv) "--prefix" "LUA_CPATH" ";" (neovim-unwrapped.lua.pkgs.luaLib.genLuaCPathAbsStr luaEnv) - ]; - - manifestRc = vimUtils.vimrcContent { customRC = ""; }; - # we call vimrcContent without 'packages' to avoid the init.vim generation - neovimRcContent = vimUtils.vimrcContent { - beforePlugins = ""; - customRC = lib.concatStringsSep "\n" (pluginRC ++ [customRC]); - packages = null; - }; - in - - builtins.removeAttrs args ["plugins"] // { - wrapperArgs = makeWrapperArgs; - inherit packpathDirs; - inherit neovimRcContent; - inherit manifestRc; - inherit python3Env; - inherit luaEnv; - inherit withNodeJs; - } // lib.optionalAttrs withRuby { - inherit rubyEnv; - }; + ]; + }; # to keep backwards compatibility for people using neovim.override @@ -198,6 +153,9 @@ let in lib.concatStringsSep ";" hostProviderLua; + /* Converts a lua package into a neovim plugin. + Does so by installing the lua package with a flat hierarchy of folders + */ buildNeovimPlugin = callPackage ./build-neovim-plugin.nix { inherit (vimUtils) toVimPlugin; inherit lua; @@ -275,6 +233,7 @@ in inherit legacyWrapper; inherit grammarToPlugin; inherit packDir; + inherit normalizePlugins normalizedPluginsToVimPackage; inherit buildNeovimPlugin; buildNeovimPluginFrom2Nix = lib.warn "buildNeovimPluginFrom2Nix was renamed to buildNeovimPlugin" buildNeovimPlugin; diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix index 8bcd1b5ebb..60049e184a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix @@ -1,4 +1,7 @@ { stdenv, symlinkJoin, lib, makeWrapper +, bundlerEnv +, ruby +, nodejs , writeText , nodePackages , python3 @@ -6,6 +9,7 @@ , neovimUtils , perl , lndir +, vimUtils }: neovim-unwrapped: @@ -18,10 +22,11 @@ let extraName ? "" # should contain all args but the binary. Can be either a string or list , wrapperArgs ? [] - # a limited RC script used only to generate the manifest for remote plugins - , manifestRc ? null , withPython2 ? false - , withPython3 ? true, python3Env ? python3 + , withPython3 ? true + /* the function you would have passed to python3.withPackages */ + , extraPython3Packages ? (_: [ ]) + , withNodeJs ? false , withPerl ? false , rubyEnv ? null @@ -39,23 +44,67 @@ let , neovimRcContent ? null # lua code to put into the generated init.lua file , luaRcContent ? "" - # entry to load in packpath - , packpathDirs + # DEPRECATED: entry to load in packpath + # use 'plugins' instead + , packpathDirs ? null # not used anymore + + # a list of neovim plugin derivations, for instance + # plugins = [ + # { plugin=far-vim; config = "let g:far#source='rg'"; optional = false; } + # ] + , plugins ? [] , ... - }: + }@attrs: assert withPython2 -> throw "Python2 support has been removed from the neovim wrapper, please remove withPython2 and python2Env."; + assert packpathDirs != null -> throw "packpathdirs is not used anymore: pass a list of neovim plugin derivations in 'plugins' instead."; + stdenv.mkDerivation (finalAttrs: let + pluginsNormalized = neovimUtils.normalizePlugins plugins; + myVimPackage = neovimUtils.normalizedPluginsToVimPackage pluginsNormalized; + + rubyEnv = bundlerEnv { + name = "neovim-ruby-env"; + gemdir = ./ruby_provider; + postBuild = '' + ln -sf ${ruby}/bin/* $out/bin + ''; + }; + + pluginRC = lib.foldl (acc: p: if p.config != null then acc ++ [p.config] else acc) [] pluginsNormalized; + + # a limited RC script used only to generate the manifest for remote plugins + manifestRc = vimUtils.vimrcContent { customRC = ""; }; + # we call vimrcContent without 'packages' to avoid the init.vim generation + neovimRcContent' = vimUtils.vimrcContent { + beforePlugins = ""; + customRC = lib.concatStringsSep "\n" (pluginRC ++ lib.optional (neovimRcContent != null) neovimRcContent); + packages = null; + }; + + packpathDirs.myNeovimPackages = myVimPackage; finalPackdir = neovimUtils.packDir packpathDirs; rcContent = '' ${luaRcContent} - '' + lib.optionalString (!isNull neovimRcContent) '' - vim.cmd.source "${writeText "init.vim" neovimRcContent}" + '' + lib.optionalString (neovimRcContent' != null) '' + vim.cmd.source "${writeText "init.vim" neovimRcContent'}" ''; + getDeps = attrname: map (plugin: plugin.${attrname} or (_: [ ])); + + requiredPlugins = vimUtils.requiredPluginsForPackage myVimPackage; + pluginPython3Packages = getDeps "python3Dependencies" requiredPlugins; + + python3Env = lib.warnIf (attrs ? python3Env) "Pass your python packages via the `extraPython3Packages`, e.g., `extraPython3Packages = ps: [ ps.pandas ]`" + python3.pkgs.python.withPackages (ps: + [ ps.pynvim ] + ++ (extraPython3Packages ps) + ++ (lib.concatMap (f: f ps) pluginPython3Packages)); + + wrapperArgsStr = if lib.isString wrapperArgs then wrapperArgs else lib.escapeShellArgs wrapperArgs; generatedWrapperArgs = @@ -94,6 +143,7 @@ let in { name = "${pname}-${version}${extraName}"; inherit pname version; + inherit plugins; __structuredAttrs = true; dontUnpack = true; @@ -190,10 +240,14 @@ let preferLocalBuild = true; nativeBuildInputs = [ makeWrapper lndir ]; + + # A Vim "package", see ':h packages' + vimPackage = myVimPackage; + passthru = { inherit providerLuaRc packpathDirs; unwrapped = neovim-unwrapped; - initRc = neovimRcContent; + initRc = neovimRcContent'; tests = callPackage ./tests { }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/qemacs/default.nix b/third_party/nixpkgs/pkgs/applications/editors/qemacs/default.nix index 67f8f6825a..46ecfa0259 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/qemacs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/qemacs/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "qemacs"; - version = "6.1.1b"; + version = "6.3.2"; src = fetchFromGitHub { owner = "qemacs"; repo = "qemacs"; - rev = "06b3d373bbcc52b51ccb438bf3cab38a49492ff0"; - hash = "sha256-Z4BbA8W3bYdw+cHgI24r55OP1Olr3GwKLlfRxjy45i8="; + rev = "0e90c181078f3d85d0d44d985d541184223668e1"; + hash = "sha256-3kq89CoUi9ocR0q2SqYF8S/xNgBpInC4f2d/dJg/nEM="; }; postPatch = '' @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://bellard.org/qemacs/"; description = "Very small but powerful UNIX editor"; - license = licenses.lgpl2Only; + license = licenses.mit; maintainers = with maintainers; [ iblech ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/rednotebook/default.nix b/third_party/nixpkgs/pkgs/applications/editors/rednotebook/default.nix index 679cde8b50..e977ae2068 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/rednotebook/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/rednotebook/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonApplication, fetchFromGitHub -, gdk-pixbuf, glib, gobject-introspection, gtk3, gtksourceview, pango, webkitgtk +, gdk-pixbuf, glib, gobject-introspection, gtk3, gtksourceview, pango, webkitgtk_4_0 , pygobject3, pyyaml, setuptools }: @@ -23,7 +23,7 @@ buildPythonApplication rec { build-system = [ setuptools ]; propagatedBuildInputs = [ - gdk-pixbuf glib gtk3 gtksourceview pango webkitgtk + gdk-pixbuf glib gtk3 gtksourceview pango webkitgtk_4_0 pygobject3 pyyaml ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix b/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix index a93a25b886..afa42fc767 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix @@ -8,6 +8,7 @@ , qtbase , qtdeclarative , qttools +, qtwayland , qtsvg , zlib , zstd @@ -15,7 +16,7 @@ }: let - qtEnv = env "tiled-qt-env" [ qtbase qtdeclarative qtsvg qttools ]; + qtEnv = env "tiled-qt-env" [ qtbase qtdeclarative qtsvg qttools qtwayland ]; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix index 5b9cfec4cb..67cf247fe7 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub }: rec { - version = "9.1.0707"; + version = "9.1.0765"; outputs = [ "out" "xxd" ]; @@ -8,7 +8,7 @@ rec { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-iHOLABPk5B7Sh7EBYnM7wdxnK2Wv7q4WS3FEp780SV4="; + hash = "sha256-LtEEMpdWXA6qyjAIjgsZoc4hNXXG2ZXxCsbWKC5aEPI="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.nix index 0cca3d9753..64119b7870 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.nix @@ -8,7 +8,7 @@ , cscope , ruby_3_2 , tcl -, perl536 +, perl540 , luajit , darwin , libiconv @@ -17,8 +17,7 @@ # Try to match MacVim's documented script interface compatibility let - # Perl 5.30 - closest we get is 5.36. 5.38 is currently failing - perl = perl536; + perl = perl540; # Ruby 3.2 ruby = ruby_3_2; @@ -35,13 +34,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "macvim"; - version = "178"; + version = "179"; src = fetchFromGitHub { owner = "macvim-dev"; repo = "macvim"; rev = "release-${finalAttrs.version}"; - hash = "sha256-JYh5fyaYuME/Lk67vrf1hYOIcAkEbwtslcnI9KRzHa8="; + hash = "sha256-L9LVXyeA09aMtNf+b/Oo+eLpeVEKTD1/oNWCiFn5FbU="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix index db712305c9..b746e18664 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix @@ -4,12 +4,8 @@ , toVimPlugin }: -rec { - addRtp = drv: - drv // { - rtp = lib.warn "`rtp` attribute is deprecated, use `outPath` instead." drv.outPath; - overrideAttrs = f: addRtp (drv.overrideAttrs f); - }; +{ + addRtp = drv: lib.warn "`addRtp` is deprecated, does nothing." drv; buildVimPlugin = { name ? "${attrs.pname}-${attrs.version}" @@ -28,6 +24,7 @@ rec { drv = stdenv.mkDerivation (attrs // { name = lib.warnIf (attrs ? vimprefix) "The 'vimprefix' is now hardcoded in toVimPlugin" name; + __structuredAttrs = true; inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall; installPhase = '' @@ -45,6 +42,6 @@ rec { } // meta; }); in - addRtp (toVimPlugin drv); + toVimPlugin drv; } 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 86aa4ca172..01c5e79950 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix @@ -29,12 +29,12 @@ final: prev: ChatGPT-nvim = buildVimPlugin { pname = "ChatGPT.nvim"; - version = "2024-08-26"; + version = "2024-10-12"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "4d9d297c2409c8ebc715da7f1d7705a221564555"; - sha256 = "0i4ras7n66i4h64bb0v70v85b70d0rw33hy16kgyr20b6qkm53vm"; + rev = "5b6d296eefc75331e2ff9f0adcffbd7d27862dd6"; + sha256 = "07f0p03fb4060lc7jfvp8mqi0jbk8mril9fg3b8rx9mq8415g1gr"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; @@ -197,12 +197,12 @@ final: prev: LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2024-09-29"; + version = "2024-10-10"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "ed349b76f3feff7dc68a1e478d51e59cb41e1e6f"; - sha256 = "1cyhgc7hh73gnn5k41xryndfxxnan0f1vpl4fndbwslxyfmilvy0"; + rev = "1f00feafbde66263760ea6b066ef07515ae03a42"; + sha256 = "01s4f0nihvq0haldrdgiqi2rpkpmqzaslqq09q42sn5kx5yg3xn7"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -329,12 +329,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2024-10-04"; + version = "2024-10-15"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "dd374887d6e1de38e9d7041da824a8dc10cae401"; - sha256 = "02k5grghlzmxw03av99y5xbmkyq9rh3mb26nhmcs0wmf0d431d92"; + rev = "6796194ae7db1c4c79c904e31ba2f8cfd7b0cd12"; + sha256 = "04knqshjbjjqvg4drpfz6fc5w3jndsr5jb71jf5w0r3h0jyxdb55"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -473,12 +473,12 @@ final: prev: YouCompleteMe = buildVimPlugin { pname = "YouCompleteMe"; - version = "2024-09-14"; + version = "2024-10-09"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "63ab13e95141c252c545f9a6c7144ced6790d68f"; - sha256 = "0v7xb149q9wvmd7arin397415bl6rrscgipwcb46wmjm08qzwjyp"; + rev = "35d188247bb481ed721584612fea4736a373e8ca"; + sha256 = "0j8nc144vnmxz2nky8snfh7yvzdfd4lz57k808944qs93i7rndp1"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -631,12 +631,12 @@ final: prev: ale = buildVimPlugin { pname = "ale"; - version = "2024-09-05"; + version = "2024-10-14"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "a7ef1817b7aa06d0f80952ad530be87ad3c8f6e2"; - sha256 = "0sd8ygz6g1l80h108lhzjl6cmv5wl490z69ybzlxp9xywkhp5nah"; + rev = "2e5f135836a700dcc6b787f10097ebdeb8e22abb"; + sha256 = "0nai1872lh4069li7c2s0jk24vf6cql2irx8vi7dybcf7a52rmxb"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -739,24 +739,24 @@ final: prev: arrow-nvim = buildVimPlugin { pname = "arrow.nvim"; - version = "2024-09-25"; + version = "2024-10-15"; src = fetchFromGitHub { owner = "otavioschwanck"; repo = "arrow.nvim"; - rev = "8b54450ae537564f809ee6883157c82c4f82e6ae"; - sha256 = "095cqvlp38y8v1b41b0qfklvr68kp8vbhnw91jp5xqqbzf5sxgb9"; + rev = "5438c977e729a29d96bd54c8da3103154e80dbd1"; + sha256 = "1sjd0gv7ka6by3fkgh8h48jwwfxmbgm21xcj7637349mj2ciaz7c"; }; meta.homepage = "https://github.com/otavioschwanck/arrow.nvim/"; }; astrotheme = buildVimPlugin { pname = "astrotheme"; - version = "2024-09-26"; + version = "2024-10-14"; src = fetchFromGitHub { owner = "AstroNvim"; repo = "astrotheme"; - rev = "53d093f172c7beb72bae5c0a350880223c2735de"; - sha256 = "0vfzvbk4k5gawv3q9924sr5yydjxbfw4qdn3qk1jgph7p3iw64z8"; + rev = "b1405cc96823d5f6cdd5a2f7ebeb137183220840"; + sha256 = "0npfxdl64qqcz49xy1jinsc140qfab4hr1dla64p8zwi8z99isch"; }; meta.homepage = "https://github.com/AstroNvim/astrotheme/"; }; @@ -943,12 +943,12 @@ final: prev: auto-save-nvim = buildVimPlugin { pname = "auto-save.nvim"; - version = "2024-04-25"; + version = "2024-10-10"; src = fetchFromGitHub { owner = "okuuva"; repo = "auto-save.nvim"; - rev = "5fe9ab0c42f0457f2a973e814a6352b8eeb04730"; - sha256 = "1c4xmp1cy3h7z68yh09bcazdqj8kimyrddgl0wc068sb6pmnpbbi"; + rev = "5fbcaac0a2698c87a9a1bd2083cb6949505cca12"; + sha256 = "1ncp19p7glgwjy372kmiffk5l78xd2byjmk3l87a4vxjf5d3gp9l"; }; meta.homepage = "https://github.com/okuuva/auto-save.nvim/"; }; @@ -1136,12 +1136,12 @@ final: prev: base46 = buildVimPlugin { pname = "base46"; - version = "2024-10-07"; + version = "2024-10-13"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "177af7c0e492f6332bf78675a47b8983b1a32291"; - sha256 = "1fj1lvjzizp47f41pnsdjx19qpl12rfcw9awis2ci65095xrzv12"; + rev = "fec9fa583025e69e0c4f902bd61990e8d13d1975"; + sha256 = "0zzkpl73cf1xd8lhmn9468ca8xpdyhbpki6yazwsdvdvn657fyy7"; }; meta.homepage = "https://github.com/nvchad/base46/"; }; @@ -1436,12 +1436,12 @@ final: prev: chadtree = buildVimPlugin { pname = "chadtree"; - version = "2024-10-01"; + version = "2024-10-15"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "55462bb29d681693bd5696fe8486b8cdacee5997"; - sha256 = "1m9apk8q3q71drfadm1vg6sijjs1i6xzlgq9yz8ibzgvp1jnwn23"; + rev = "ddd88d9f1f91c026b21bac5f8b5e8259af20434a"; + sha256 = "1q76b0j4fzb0y98jh0x273x70a0f85mwwan88d90dd6np0k10p9c"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -1640,11 +1640,11 @@ final: prev: cmp-async-path = buildVimPlugin { pname = "cmp-async-path"; - version = "2024-08-27"; + version = "2024-10-11"; src = fetchgit { url = "https://codeberg.org/FelipeLema/cmp-async-path/"; - rev = "03fac5dfd6f7880be2c059d58bebe007f0d6d8ee"; - sha256 = "1dycqym1n4i5cxah2a151ih5k3h238vipf54d7jcr3jgx1ad8glv"; + rev = "e3206e521ce89fe0e97cc8f14e4fc8c131f369e4"; + sha256 = "0r6kb1c25m4wwxdx1mxkakfl2qhmmfivvmxx1wp3c8f16rny5m6i"; }; meta.homepage = "https://codeberg.org/FelipeLema/cmp-async-path/"; }; @@ -1913,6 +1913,18 @@ final: prev: meta.homepage = "https://github.com/notomo/cmp-neosnippet/"; }; + cmp-nixpkgs-maintainers = buildVimPlugin { + pname = "cmp-nixpkgs-maintainers"; + version = "2024-10-15"; + src = fetchFromGitHub { + owner = "GaetanLepage"; + repo = "cmp-nixpkgs-maintainers"; + rev = "828040c309972f044346e0bf43d0f92623b60d65"; + sha256 = "0wnqhsfinzz3xf746sd731gy6sj05c5z7c09w4lrdchbrxx3zgrb"; + }; + meta.homepage = "https://github.com/GaetanLepage/cmp-nixpkgs-maintainers/"; + }; + cmp-npm = buildVimPlugin { pname = "cmp-npm"; version = "2023-06-12"; @@ -2311,12 +2323,12 @@ final: prev: coc-nvim = buildVimPlugin { pname = "coc.nvim"; - version = "2024-09-02"; + version = "2024-10-12"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "69b16f8651b4d92d9ea5d6b000c084f275ed7928"; - sha256 = "1fw1jridm31gw41xq6cx2k51nkxk8jv3b26idbkynm4isr02g0ig"; + rev = "57d488a06bdb34de89acef3c2f3e9ce609d632ed"; + sha256 = "106w4kgrqlgnszpkzlxrlzsvca880qagv07h93dxsl2ggbdkm91l"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -2335,24 +2347,24 @@ final: prev: codeium-nvim = buildVimPlugin { pname = "codeium.nvim"; - version = "2024-10-05"; + version = "2024-10-12"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.nvim"; - rev = "ed65f0a5262c746b2d69a7ae67af7c1da89f94ab"; - sha256 = "061i7q55mdqsnk02iz37s0k4l00mxgg0xqcb410j0m281knxicmp"; + rev = "ca38490ef963b066d6f686146d73213c70ef7f6b"; + sha256 = "0ya0bp8l846l2zank4gbd44fzb464wz2bhdzc5k0z592xrvavjky"; }; meta.homepage = "https://github.com/Exafunction/codeium.nvim/"; }; codeium-vim = buildVimPlugin { pname = "codeium.vim"; - version = "2024-10-04"; + version = "2024-10-14"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "9ff8d323ff56ff513457f3f7f4305523408d538e"; - sha256 = "1yp6n5377baxkwz7dq9cgxnhp9cvhf1kv4w2fypsky6nrqdcgsak"; + rev = "8c01979323b2b480c8bf160d3ff85bd1668baa49"; + sha256 = "0hkmgfph4r2ayw5ch7yhiqffqccglksckgl5nb0dzsbpzvqk6g81"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; @@ -2431,12 +2443,12 @@ final: prev: command-t = buildVimPlugin { pname = "command-t"; - version = "2024-09-30"; + version = "2024-10-15"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "75b8ad842f1667eec6bcd61344b0004c57b01b9c"; - sha256 = "0r1a3kf2gq8yhqbnxxyf45qa3swl2mwn4971x1fksc3c64lh77fg"; + rev = "cd46c34ed11e1554959fdc4efed581261ae486e8"; + sha256 = "0d1i97mdp3n21hiyqf9mpx65sxrrbajcjv25pij3xidyvj7l38sp"; }; meta.homepage = "https://github.com/wincent/command-t/"; }; @@ -2720,12 +2732,12 @@ final: prev: copilot-vim = buildVimPlugin { pname = "copilot.vim"; - version = "2024-08-29"; + version = "2024-10-08"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "782461159655b259cff10ecff05efa761e3d4764"; - sha256 = "0f0iszaphi1p411wgpn8r4slqrxlwdcy03raqypdg5f40jmiad9c"; + rev = "87038123804796ca7af20d1b71c3428d858a9124"; + sha256 = "1532h9694na7mx2lxmg0cx683df0x7w83vrrvd1gn5hwv96bhvpp"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; @@ -2768,12 +2780,12 @@ final: prev: coq_nvim = buildVimPlugin { pname = "coq_nvim"; - version = "2024-10-05"; + version = "2024-10-15"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "1a1a6645c70d42519d8a2425530fae0df4041a81"; - sha256 = "1p9xg66xipdyyc0f1pp1zl33fvz93rqcy1lb95zk0j943gg06md1"; + rev = "27cca63337debdea4a8da61f758abc82a0045bfb"; + sha256 = "1f08b0p2ffqkswwlx32h6b16q4n2mafcs9q612yfzcp7hkx9ffs2"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2840,12 +2852,12 @@ final: prev: csharpls-extended-lsp-nvim = buildVimPlugin { pname = "csharpls-extended-lsp.nvim"; - version = "2024-10-06"; + version = "2024-10-09"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "csharpls-extended-lsp.nvim"; - rev = "abcd1c82ae4eb959eb1cf4276139abe01547815b"; - sha256 = "0gzz1d8qwcmmqcfvvbb8madhahbm5z5s1nyprjvjm0b83856knjp"; + rev = "b647e1bd1f9c0410f5ef4a1517a331cbac322d9a"; + sha256 = "0157f53l65r68dy3swx221nijzfxqq3hrhpfz8sg8fi1j9bwzqmh"; }; meta.homepage = "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/"; }; @@ -2912,24 +2924,24 @@ final: prev: cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; - version = "2024-10-06"; + version = "2024-10-09"; src = fetchFromGitHub { owner = "scottmckendry"; repo = "cyberdream.nvim"; - rev = "1af5dbd6fba7c92c6fc17c775a625f9402dd9980"; - sha256 = "1j6hvxvhp007nc2va3vf9nq2pf1i41nb7lsrf89375msvibg8smv"; + rev = "e2ff36e57bb6f75a627e282fa2c6654e658d3052"; + sha256 = "0fdhamfbvlzjjsla81a20pkyaw71ras3zkba41j1vfas9h6kjr0g"; }; meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; }; darkearth-nvim = buildVimPlugin { pname = "darkearth-nvim"; - version = "2024-09-06"; + version = "2024-10-15"; src = fetchFromGitHub { owner = "ptdewey"; repo = "darkearth-nvim"; - rev = "14369f828f4b09ee89b18bfa3f58b02720e8e20a"; - sha256 = "0wccpw7hssb4nb28pcnl5565g4s8s24ibc5r9wv1byygxn80gwha"; + rev = "37234dfdf8dfa934fedb49b1618f10bacdaf504d"; + sha256 = "08r9l7l9cl05gpijmpkg0787byzmjvk8799lswdvpxkgz7y9jj6a"; }; meta.homepage = "https://github.com/ptdewey/darkearth-nvim/"; }; @@ -2960,12 +2972,12 @@ final: prev: dashboard-nvim = buildVimPlugin { pname = "dashboard-nvim"; - version = "2024-07-14"; + version = "2024-10-14"; src = fetchFromGitHub { owner = "nvimdev"; repo = "dashboard-nvim"; - rev = "fabf5feec96185817c732d47d363f34034212685"; - sha256 = "0lf1sxj6fjb6m5z0pf32yg5z70rvkx7s2nljm1r00zkfgqwys9s4"; + rev = "d2c5a4d1341f5ca1ed2ecb4ecfcff2bc8ea18b14"; + sha256 = "1502s7mkc2z42gvh9hrs6c0rhmm7illhnhgvqks2mn2dl8431yw4"; }; meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; @@ -3032,24 +3044,24 @@ final: prev: ddc-vim = buildVimPlugin { pname = "ddc.vim"; - version = "2024-10-07"; + version = "2024-10-14"; src = fetchFromGitHub { owner = "Shougo"; repo = "ddc.vim"; - rev = "dd845f05d6be94214988afeeb59407f7f2e95945"; - sha256 = "15nz0mr01h8vlx7l3ikavjv0gzlasrdwfprwmc73iaxlxsfjyz8k"; + rev = "517a127d10b7babe46647fd571ae468cf3a2b647"; + sha256 = "1y2wm3hqikyp23msbbxa64yxkpg9nb87gfyff5ad845x9w0sl18i"; }; meta.homepage = "https://github.com/Shougo/ddc.vim/"; }; debugprint-nvim = buildVimPlugin { pname = "debugprint.nvim"; - version = "2024-10-02"; + version = "2024-10-12"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "debugprint.nvim"; - rev = "aa2e6966e1caf57a80df293565bb669cc8dbe50d"; - sha256 = "1qz31i7ggcq5zzav1v3hz4zb6d2gr56r0k4wcbj5wslnz869k42f"; + rev = "954f0b6c1c2e9338a71442a64ccf464a20ee9134"; + sha256 = "09z2f0fv1gfnvkn2z5f5s9a5cgxna09rach6v7cmcia9f5wg2ncf"; }; meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/"; }; @@ -3502,12 +3514,12 @@ final: prev: distant-nvim = buildVimPlugin { pname = "distant.nvim"; - version = "2024-09-30"; + version = "2024-10-08"; src = fetchFromGitHub { owner = "chipsenkbeil"; repo = "distant.nvim"; - rev = "f3a4a1c87a2a67a08deb472b57148cd55b29d0fc"; - sha256 = "1y4q7gwyanj43cxg5vvaichc28c9k59ylvlg82xw163k0wlm0m70"; + rev = "cf8f00d88fac3ed52ecdd8d485e4a565ba4c660f"; + sha256 = "0677mgkp91nx9hbmjkxpagqbpzxiapylz89yiq50al34hqaqbl4w"; }; meta.homepage = "https://github.com/chipsenkbeil/distant.nvim/"; }; @@ -3562,12 +3574,12 @@ final: prev: dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2024-09-26"; + version = "2024-10-08"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "669e325489202ae4da5a951314bbf8dbb20e7cff"; - sha256 = "056iyj4l3rjb6w5vg0h8w7mn930dj74fknra1282xdiz5qf70myx"; + rev = "35988affc74c0cebb1484bcdfccfed523c0e7267"; + sha256 = "0ap101wxi1y3f2dx6x9b0ag0gbibifhqj2ybn13z5kab8pindc2r"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -3634,12 +3646,12 @@ final: prev: editorconfig-vim = buildVimPlugin { pname = "editorconfig-vim"; - version = "2024-04-13"; + version = "2024-10-14"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "8b7da79e9daee7a3f3a8d4fe29886b9756305aff"; - sha256 = "1ix80rgylpjimv3x13f8nf3gs33lf99wzydswyzyd5mpvz5p8i55"; + rev = "ba2ce027c5b0e523e658d24657ce3ae3306c9fe0"; + sha256 = "1f5ncz4zwsfik99pys6p1y8ik6b865rvxw3n2xdgpcchgjlwhfjf"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -3659,12 +3671,12 @@ final: prev: efmls-configs-nvim = buildVimPlugin { pname = "efmls-configs-nvim"; - version = "2024-09-05"; + version = "2024-10-14"; src = fetchFromGitHub { owner = "creativenull"; repo = "efmls-configs-nvim"; - rev = "8474cdc5a8fc21091828487c3f7781d0b19c66fb"; - sha256 = "1b57l8b5m19p8bf5an67z595zcz9adandz5g4v0yj4b3kbw2azc3"; + rev = "6c9dd80d4c2071a0328947cf6bcb6b91cc62c7b5"; + sha256 = "1vxw7xd999iyb6lbyhy5k9d4vw0d96b54712vh4kj7m1bpbbgmjp"; }; meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/"; }; @@ -4045,12 +4057,12 @@ final: prev: flutter-tools-nvim = buildVimPlugin { pname = "flutter-tools.nvim"; - version = "2024-09-26"; + version = "2024-10-11"; src = fetchFromGitHub { owner = "nvim-flutter"; repo = "flutter-tools.nvim"; - rev = "ce18f5da5f9c458cd26eef5c3accb0c37b2263c2"; - sha256 = "17w7hz2nxwq57k25canbfy11i6fy8vpf435jbd8fdq578a1jcwmj"; + rev = "6bf887bb9442b80a67f36e7465a66de4202d8a3f"; + sha256 = "1y4fksq8lrz2v15vinvvgj3bbqavyx8nsajmf5r81bgmkpqa8bhr"; }; meta.homepage = "https://github.com/nvim-flutter/flutter-tools.nvim/"; }; @@ -4069,12 +4081,12 @@ final: prev: formatter-nvim = buildVimPlugin { pname = "formatter.nvim"; - version = "2024-10-01"; + version = "2024-10-10"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "b0edd69cec589bb65930cb15ab58b7e61d9a7e70"; - sha256 = "0sffbiygib9mnyl3k2aiwap4xnp5gpyasgdiyz21j2mkvs850kpj"; + rev = "77979a90a80849e60c6a9249427421b65d5a9a68"; + sha256 = "139wx2bhvs2iyyc3bysgln40rj1jcm5iag5yd39hcwwdk2f6f4iz"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -4213,12 +4225,12 @@ final: prev: fzf-lua = buildNeovimPlugin { pname = "fzf-lua"; - version = "2024-10-06"; + version = "2024-10-13"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "1e03541de4d8a169defe83bb4d7abfba450c63a1"; - sha256 = "1by9092fvfk1v06idfqhnx5bsisj28hk981ngylkzq806j7lbj09"; + rev = "5dec364c9dedec00dcd6d06e323d7bc7f8d6b596"; + sha256 = "1fr43zyqbxmnzvynjwsiivlj76wblwrvrx5860sg0a675kbkmi83"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -4453,12 +4465,12 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2024-10-01"; + version = "2024-10-14"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "5b4f1ab2689c903ab801f2cf195bebbc95f0d156"; - sha256 = "1wppn4rhqlcjac0i67x1q2388v803syjkaffnn2jdrwknhpc5vpd"; + rev = "fb612d13c34d3d1d2caa4d5785733abe70dc22f0"; + sha256 = "1k9vcgwnl1nvgww0mnqpmlf1m7478jbrl34cp5h94z40qxhld05v"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -4573,12 +4585,12 @@ final: prev: grug-far-nvim = buildVimPlugin { pname = "grug-far.nvim"; - version = "2024-09-30"; + version = "2024-10-09"; src = fetchFromGitHub { owner = "MagicDuck"; repo = "grug-far.nvim"; - rev = "b7c2b28e49d55ff71cd9bb3ad19a2021316510d8"; - sha256 = "0cxvza1f45h07zms30wsnx8m5mklpfhgb9x7rw1v8jcvlsgx2dm8"; + rev = "f47594f05d10b0bedfc0ed78e488e7fd714d57be"; + sha256 = "14s0y1lzchqghr1rkirwmfys0q1l3rl9h1b80acik3pcmdzgr1i5"; }; meta.homepage = "https://github.com/MagicDuck/grug-far.nvim/"; }; @@ -4657,24 +4669,24 @@ final: prev: guard-collection = buildVimPlugin { pname = "guard-collection"; - version = "2024-10-06"; + version = "2024-10-10"; src = fetchFromGitHub { owner = "nvimdev"; repo = "guard-collection"; - rev = "06da4a065b974bbedf1a5535232c90a3526f8a43"; - sha256 = "1clpsgzq2iw0srhyf85l8qf0jr6bsdrq1pmpbvcqd69r8s2wybgy"; + rev = "21864299f3f5bd8eedddf2fa7f1253fa20e1c568"; + sha256 = "1rrkf51bf7wb60vpjzhhzc9ic8hgyzp7i52affsw3fw4r96mlwfm"; }; meta.homepage = "https://github.com/nvimdev/guard-collection/"; }; guard-nvim = buildVimPlugin { pname = "guard.nvim"; - version = "2024-10-06"; + version = "2024-10-11"; src = fetchFromGitHub { owner = "nvimdev"; repo = "guard.nvim"; - rev = "bdbc43dadd530b0058708723db76e705a4542063"; - sha256 = "0198gbvx52c0g15pjjlncq9gir3x0f3lnm253v2yf9qc0y2w8zm0"; + rev = "cc8df48248eb795b71be21f7a30f08fc47a2c22d"; + sha256 = "1khw69wymn22wisp29z8yh4avr826l7d0vpvks857zk79lm3lm89"; }; meta.homepage = "https://github.com/nvimdev/guard.nvim/"; }; @@ -4729,12 +4741,12 @@ final: prev: hardtime-nvim = buildVimPlugin { pname = "hardtime.nvim"; - version = "2024-08-20"; + version = "2024-10-12"; src = fetchFromGitHub { owner = "m4xshen"; repo = "hardtime.nvim"; - rev = "6513bf42cd9261669d1ee41ff8b4065dfdc53a09"; - sha256 = "0v522mzz7cp62hjf9bqnfrpnadapywb56r5d888kjvc4gcy9kzrv"; + rev = "027d6f991927a71bd510a7673ae5bb404ca2a1c7"; + sha256 = "1vpxrcrw8hh6jcs74ykvld4rk7dhvjp0k4sd7jqn5ijj73h3ah48"; }; meta.homepage = "https://github.com/m4xshen/hardtime.nvim/"; }; @@ -4861,12 +4873,12 @@ final: prev: hex-nvim = buildVimPlugin { pname = "hex.nvim"; - version = "2024-09-03"; + version = "2024-10-09"; src = fetchFromGitHub { owner = "RaafatTurki"; repo = "hex.nvim"; - rev = "d0f553dcd2c08d226026d769119b2eb6b09b8dfd"; - sha256 = "0dqv23i08ng4g7mm35g484p39i4b3vr6xnz3m7ij7n3d6bpfc8c3"; + rev = "fcff75fcf43b5a6c5b471eed65b3a06c412d6020"; + sha256 = "1wh8dnx9a8pjq53v7crhxczv0bzvv2gdj2ra7n2w66cql75piw4v"; }; meta.homepage = "https://github.com/RaafatTurki/hex.nvim/"; }; @@ -5512,12 +5524,12 @@ final: prev: kulala-nvim = buildVimPlugin { pname = "kulala.nvim"; - version = "2024-10-07"; + version = "2024-10-14"; src = fetchFromGitHub { owner = "mistweaverco"; repo = "kulala.nvim"; - rev = "9140eed63adff50993d9eb7b0b82900db57dbc17"; - sha256 = "02rnb0pf6iwck9wmf9msp8dbwxpb2a5sgpsxw67dsq4dn34w6bjm"; + rev = "c7a2c793dca8509f9792e9d35d377de016c88a5b"; + sha256 = "1w8riv2bvqbl6dvllx7kn0j8aa33mcp44j7ghczjd5kzbxqpzksr"; }; meta.homepage = "https://github.com/mistweaverco/kulala.nvim/"; }; @@ -5534,6 +5546,18 @@ final: prev: meta.homepage = "https://github.com/qnighy/lalrpop.vim/"; }; + langmapper-nvim = buildVimPlugin { + pname = "langmapper.nvim"; + version = "2024-09-19"; + src = fetchFromGitHub { + owner = "Wansmer"; + repo = "langmapper.nvim"; + rev = "ac74a80cb86e8b51e4a13ccb2ee540d544fe1c62"; + sha256 = "1b2sjsi81r7m1pxxkisl4b2w2cag3v2i4andhn89gv6afzakvzka"; + }; + meta.homepage = "https://github.com/Wansmer/langmapper.nvim/"; + }; + last256 = buildVimPlugin { pname = "last256"; version = "2020-12-09"; @@ -5560,12 +5584,12 @@ final: prev: lazy-lsp-nvim = buildVimPlugin { pname = "lazy-lsp.nvim"; - version = "2024-09-29"; + version = "2024-10-14"; src = fetchFromGitHub { owner = "dundalek"; repo = "lazy-lsp.nvim"; - rev = "faedf30d6e858a32e635a9640d10f7b44a878847"; - sha256 = "1mk6klyg6nfpm8dr5fiz6n0drp2mvdqyjyy6n3d5yad58d57d25h"; + rev = "8cfb2329a4cdc8e1eefe47dc18fb8e8c6dbdf183"; + sha256 = "0zp44fkbp63y4bvxgabhlc2w7pnjwmwcjyf7ka14lhkxnfj2fbdi"; }; meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/"; }; @@ -5608,12 +5632,12 @@ final: prev: lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2024-10-02"; + version = "2024-10-15"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "62946f6d54c4a255d48b5de964aec034e1d07a1b"; - sha256 = "1w9whxcq8jp7xnmjp0k7bx9s67j6h24884s3alnjpqqqzwmldb3q"; + rev = "273749f1769f6fd5f45aba44af0b0c7ac47c3f5a"; + sha256 = "1kkvcm11sd4kj729dgnn6fclx8v8s4nq464mnd5am7igrkpjrmrv"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -5654,14 +5678,26 @@ final: prev: meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; + leetcode-nvim = buildVimPlugin { + pname = "leetcode.nvim"; + version = "2024-06-27"; + src = fetchFromGitHub { + owner = "kawre"; + repo = "leetcode.nvim"; + rev = "02fb2c855658ad6b60e43671f6b040c812181a1d"; + sha256 = "sha256-YoFRd9Uf+Yv4YM6/l7MVLMjfRqhroSS3RCmZvNowIAo="; + }; + meta.homepage = "https://github.com/kawre/leetcode.nvim/"; + }; + legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; - version = "2024-10-04"; + version = "2024-10-12"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "71a8d41f18d931b47ed69879da832ce4fe33d647"; - sha256 = "086l1kbcwwcxxs9fbrwwh4591d7c1dwxn0n0ab560w9al8a8cwrw"; + rev = "192fbef32d1f7d70463c4c8a634c2a75adc41348"; + sha256 = "0grhj484513hrnmpr9wlvc6fa44lm3jr65cm50ymkza3qjnjnbcj"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -5728,12 +5764,12 @@ final: prev: lh-vim-lib = buildVimPlugin { pname = "lh-vim-lib"; - version = "2024-08-18"; + version = "2024-10-14"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "db1c7b4261be24a79f62dc22c8061b8bdd9f2333"; - sha256 = "1vfphkvkfydw69hp7rhm7h3nm2na75cq4vrlk8qxxqphxn51g9jr"; + rev = "d51bc713d7158b5837f903b3e50c9f44ae936bcd"; + sha256 = "1blrrr76r21mg6bbyjajqyqy42qa89dyvqyg42hacfy0v39pi3gz"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -6075,12 +6111,12 @@ final: prev: lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "2024-09-10"; + version = "2024-10-13"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "e64351d0e6335eadf089aa2b9f17221e54ca10a4"; - sha256 = "0n8jmfg7rg23skdd4qlqyx78acww6ahskd3j6l5k2lvh5jlxjc4r"; + rev = "3c1af059348350b0bbb81c5ca3c1f8f573dbd64a"; + sha256 = "15y7bv8ywaihc1s0ifs5g8a6pcpdlqm4c15ahg8ygys2hnb4l5r7"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; @@ -6256,12 +6292,12 @@ final: prev: markview-nvim = buildVimPlugin { pname = "markview.nvim"; - version = "2024-10-07"; + version = "2024-10-09"; src = fetchFromGitHub { owner = "OXY2DEV"; repo = "markview.nvim"; - rev = "493c054c6463156f1c584cffe006b2fc9ed2d34c"; - sha256 = "0vag2lgibq4d8jmzvsf6c3hazpf4mvlr1pbjindpbaygcj063wz9"; + rev = "67b69cdaf9055bebac3682a070d7e5c8eecba29c"; + sha256 = "029ysnbnp5nl2jxgpg2q6zpm3ajk8yqxbnwqj42z3lcn3ylhcvsa"; fetchSubmodules = true; }; meta.homepage = "https://github.com/OXY2DEV/markview.nvim/"; @@ -6521,12 +6557,12 @@ final: prev: mini-clue = buildVimPlugin { pname = "mini.clue"; - version = "2024-09-06"; + version = "2024-10-13"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.clue"; - rev = "8e329f586a7cfd06085859066a4b60965fc4ecce"; - sha256 = "0s6n4bd5naq50pdyl3ibmk0788823iii6gapqqcnqkvsyi39rp5g"; + rev = "378285270242fa23b441a68655d4af6cba8ac4c0"; + sha256 = "09aas4hyza4s7pwwy7vpvizw6qdzyn46h44z9b8y4j4vk7fpk82a"; }; meta.homepage = "https://github.com/echasnovski/mini.clue/"; }; @@ -6629,12 +6665,12 @@ final: prev: mini-files = buildVimPlugin { pname = "mini.files"; - version = "2024-09-28"; + version = "2024-10-15"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.files"; - rev = "1b5ada9d3a0df36cfbf7f50a314646c0673b8c87"; - sha256 = "0hjsvp3lhby2qcl88bawykdvy4fplrh9gr81wjkmy47fiq9y2n9r"; + rev = "6abe854f1410fc6aec69897a78b1db994c32d9c6"; + sha256 = "1drznn7iscyifkqy153r5fqg0a5q7cridbpkd743575vph2hr9pd"; }; meta.homepage = "https://github.com/echasnovski/mini.files/"; }; @@ -6665,12 +6701,12 @@ final: prev: mini-hues = buildVimPlugin { pname = "mini.hues"; - version = "2024-10-03"; + version = "2024-10-08"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.hues"; - rev = "c54a85c68040640cc990d91762ea06ab3617abca"; - sha256 = "13cw0gp7isfx7rbw3kk9a075nizcp3szqqsc4hpm6mxlw5zb43ri"; + rev = "40d515229a7ed19c423bcfea8646f6e4354dcfc6"; + sha256 = "1v94yljlpwzbqa4g44n1wvc3hi5wyj6w7mvjx4qg954ak81yfv1j"; }; meta.homepage = "https://github.com/echasnovski/mini.hues/"; }; @@ -6761,48 +6797,48 @@ final: prev: mini-notify = buildVimPlugin { pname = "mini.notify"; - version = "2024-09-06"; + version = "2024-10-08"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.notify"; - rev = "1c901d62581439f3d17382a5bf7001a282d6468b"; - sha256 = "1vi3nsclkx9myglb0mxizhmzil02pglh96jf4291cblkgycs6zil"; + rev = "efec01f9e419642502421c3b1b1b8d7d627774c4"; + sha256 = "1gxpzzkzbc57aiwsgmb1hib2pb5vldis8csljs3hg3in11dj22hh"; }; meta.homepage = "https://github.com/echasnovski/mini.notify/"; }; mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2024-10-07"; + version = "2024-10-15"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "e52ac74bd4e9c0ce6a182ee551eb099236b5a89d"; - sha256 = "18kl8hlrkgywq6s9lz53fy4wyzh76j8wpyic12dxhm57clc6hkny"; + rev = "d4ce7d025f9c7bb4d55ebc4fd88987651e632893"; + sha256 = "10cls549nsv4bgmqqky5acdy8f912901084vbqzrgq7dnx7j3vzg"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; mini-operators = buildVimPlugin { pname = "mini.operators"; - version = "2024-09-09"; + version = "2024-10-13"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.operators"; - rev = "35b12f54bd5acb860f4297fd6d12fd07b1b065e2"; - sha256 = "1h3kf7ri8ip8as7kcb86q5lq56v7iqz731g4pyn020ymyxmyp75n"; + rev = "301882a657ac910718dbb965b57028e2967e655a"; + sha256 = "05f5xfbjhn0ydjylx8mj03k4iw0lgndi9wd1a2sq9wffwr3ljw9d"; }; meta.homepage = "https://github.com/echasnovski/mini.operators/"; }; mini-pairs = buildVimPlugin { pname = "mini.pairs"; - version = "2024-09-27"; + version = "2024-10-11"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.pairs"; - rev = "919a89ed3c9f4142215a44c9fffca72fa8c8e792"; - sha256 = "14dm1jch4fnj0a2q33ibznj4gx718984crn62a7gkp7fqfb5mw8d"; + rev = "7e834c5937d95364cc1740e20d673afe2d034cdb"; + sha256 = "04x3gwrg64xxbg0njrb64bjb66rpi2aayydfqx9nbcimllng3l9y"; }; meta.homepage = "https://github.com/echasnovski/mini.pairs/"; }; @@ -6869,12 +6905,12 @@ final: prev: mini-surround = buildVimPlugin { pname = "mini.surround"; - version = "2024-09-28"; + version = "2024-10-15"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.surround"; - rev = "e1ac1ce5c7499aa4cc2ca9fb1adec9e730dd9394"; - sha256 = "01r2crm4x1jxcxkiy4w31z6198xc44kvlql12ii1bh7hraz6bzhw"; + rev = "48a9795c9d352c771e1ab5dedab6063c0a2df037"; + sha256 = "03358zgpjryfh403nw2vxnl9n4rqdbz548niaj7k60nfhv4kcf27"; }; meta.homepage = "https://github.com/echasnovski/mini.surround/"; }; @@ -6989,12 +7025,12 @@ final: prev: modus-themes-nvim = buildVimPlugin { pname = "modus-themes.nvim"; - version = "2024-10-01"; + version = "2024-10-15"; src = fetchFromGitHub { owner = "miikanissi"; repo = "modus-themes.nvim"; - rev = "24b34562a71cb75769411ca3146d35c093e7f4e6"; - sha256 = "1lg0y8ravnsk1swdx8k5668yrly6hlzs2jg9fl01x0b211xn5xx6"; + rev = "54647ef5282e7166c1878ab1527a2c0de54c085d"; + sha256 = "0mrnm422j85pxjjq4l7ghjkpm50b1fs7ii89frpnivz4ppfljz11"; }; meta.homepage = "https://github.com/miikanissi/modus-themes.nvim/"; }; @@ -7013,12 +7049,12 @@ final: prev: molten-nvim = buildVimPlugin { pname = "molten-nvim"; - version = "2024-10-05"; + version = "2024-10-12"; src = fetchFromGitHub { owner = "benlubas"; repo = "molten-nvim"; - rev = "f2e9ba9d229fbc847b7f19da68744954513aff11"; - sha256 = "13pp9dpbj0ndqzkdgvdsn6lf4633qd3a3n1lil42sk47s5g7vwqv"; + rev = "66ee5c0a0fbe3e014b867d04db44592f2d3eb30f"; + sha256 = "0k88b6ix8sqsnhm8z02jrphbkjzpimg1wx3jbqcmzlnm8i49nghs"; }; meta.homepage = "https://github.com/benlubas/molten-nvim/"; }; @@ -7349,12 +7385,12 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2024-10-06"; + version = "2024-10-15"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "545b57d48d4bbc8f426aade4f2122c8296e9a0c0"; - sha256 = "1px6r6dj02p65wzwhrby0d0bvx81qikg61hj10xs29hbngz815ax"; + rev = "887be0ddcf27f6684898e5f9f33297365146a5ec"; + sha256 = "0i2fafb3wdwpzs2899d9r0nmfxpq22d05vvvwrbkhpa77lwli7sm"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -7421,12 +7457,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2024-10-04"; + version = "2024-10-14"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "d55bf6114c6cfba013e4c0e817e29e7752554ab7"; - sha256 = "1bvzwmifvjl14p2vix8rxj50sp3yxj9yq3fx5gighhqyf4fvmals"; + rev = "eda716c44d3b5a424ea8604b10756c7fd8bed93a"; + sha256 = "1mdyn40ih75pnqrmayiqc3pcwzi80h3y4s60k2yxbbgr0dp9c8rc"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -7651,12 +7687,12 @@ final: prev: neotest-golang = buildVimPlugin { pname = "neotest-golang"; - version = "2024-09-25"; + version = "2024-10-14"; src = fetchFromGitHub { owner = "fredrikaverpil"; repo = "neotest-golang"; - rev = "33077c3662866a04af5f03d1dc6042d929fef037"; - sha256 = "1l6011752wwfvz4iqcfpw6l69ky9kg8g1rkay39sawwprr52vzcw"; + rev = "ea1c3a77f147e29583cd756b44ee69d9007bebba"; + sha256 = "0mjd5ngdkk65f5xj31wriv6zsq2gg99ljplv3b9jih5h5b637yry"; }; meta.homepage = "https://github.com/fredrikaverpil/neotest-golang/"; }; @@ -7688,24 +7724,24 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2024-10-07"; + version = "2024-10-13"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "08c0e81415971b37a41193e66f56344886d05fec"; - sha256 = "1sgfbj9d6p7bfk7az4jsz81kz7rs9izglccg5hwxhkp8d9mksycv"; + rev = "6b555ce43d3b9d29f484abf98ccb70e7597a50bb"; + sha256 = "02wrqp854na7k2rxr204ckwc4kvm1pxlsrxknpm60jqinm1fj3i0"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; neotest-java = buildVimPlugin { pname = "neotest-java"; - version = "2024-10-06"; + version = "2024-10-13"; src = fetchFromGitHub { owner = "rcasia"; repo = "neotest-java"; - rev = "b880a7dacd78425965fc7b70c39a56ddea2e31c1"; - sha256 = "0216mfpgk8qrq374d1grh8442ddjickhy1814snm993l6q8xpybi"; + rev = "800393067cf97b0f20eb0a3e61506cc6ffc76128"; + sha256 = "0765v6l9asinbzpynlqcm0abp1f20af934810i8rpsnx2z46wkmw"; }; meta.homepage = "https://github.com/rcasia/neotest-java/"; }; @@ -7808,12 +7844,12 @@ final: prev: neotest-rust = buildVimPlugin { pname = "neotest-rust"; - version = "2024-04-08"; + version = "2024-10-08"; src = fetchFromGitHub { owner = "rouge8"; repo = "neotest-rust"; - rev = "0418811e1e3499b2501593f2e131d02f5e6823d4"; - sha256 = "1ffa0in8zvw6fc9lwga67s9gjqmvn1a69i3wpajrslf2d0ngmw3y"; + rev = "f2e0b3713d3559ce33be9aa32ace3a6051ec5593"; + sha256 = "1nm03cb1vwak6qc3l9f3zj51iabsz6bh3x9sip5jy88rfxpxgp6l"; }; meta.homepage = "https://github.com/rouge8/neotest-rust/"; }; @@ -8084,12 +8120,12 @@ final: prev: nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2024-10-03"; + version = "2024-10-10"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "bfa30195eecde4f0e2d30ab8b7013ed8aa637208"; - sha256 = "1f0rd3zac6kh1qf7i2gbrhx3cn9a02g0yz0m6iv42291i4rp6ypb"; + rev = "941dd4b9d8c9420968dfdef0675f120965f7d637"; + sha256 = "099mql8lw6xbvdvdqbg0ks2l0z1xy4k895kc8cl0bl89970r5908"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -8156,12 +8192,12 @@ final: prev: none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2024-10-01"; + version = "2024-10-11"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "0e0a940477cc08fa7b1799384a1d668058ed4e61"; - sha256 = "1z5crc8zjiv6p41b15pk83nvsmibl6fshyki3zn05lx1bbny80yx"; + rev = "6bdd9b3364e12ffb346ac224db3df37de0b1429b"; + sha256 = "145jzbjsx10dl4n9ni7p0ggcnhjwbz5fs6ksyrq73h9f0h6vcfxw"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; }; @@ -8252,12 +8288,12 @@ final: prev: nvchad = buildVimPlugin { pname = "nvchad"; - version = "2024-10-07"; + version = "2024-10-10"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "a69f893e49ee36d4c74431044b40f08042c396a2"; - sha256 = "0h5fiml0gsiigfyvfw3w700bnj01bx0xj4nlf06b26xknzbb9azp"; + rev = "f6025f0788880989484733c90deff07dff01ef02"; + sha256 = "0y7pi4czifx7di9j8msd8nicqvn6scd4vysg7zbrxpkavzzg09jy"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -8516,24 +8552,24 @@ final: prev: nvim-dap-python = buildVimPlugin { pname = "nvim-dap-python"; - version = "2024-09-08"; + version = "2024-10-10"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap-python"; - rev = "db72bf6ab9f75fe841e8e11e772ee7fef6f484f1"; - sha256 = "1m2bs71l4wdk6kippwkmsvw4978qcqh8lnkx7h9sa82l87wb76mp"; + rev = "03fe9592409236b9121c03b66a682dfca15a5cac"; + sha256 = "0d72nmrvy070x5cmx9xh0bmrj1hayccs347l30cajfrzajj4bmnr"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/"; }; nvim-dap-rego = buildVimPlugin { pname = "nvim-dap-rego"; - version = "2024-10-05"; + version = "2024-10-14"; src = fetchFromGitHub { owner = "rinx"; repo = "nvim-dap-rego"; - rev = "7316f3fa47266dbb28a82f77a0e1e9adc83ab4a3"; - sha256 = "10v0ixp27anjnwbdjqabwgir2jnlhbg90db8wc9a27099a25kwa3"; + rev = "36d51c69c1e8537680e5e46d041b36ac76aa7bf8"; + sha256 = "04058hxmwvag0567gbwbxvfym7vzs2w2hjcqnk3z2yvhx2v4ivi5"; }; meta.homepage = "https://github.com/rinx/nvim-dap-rego/"; }; @@ -8636,12 +8672,12 @@ final: prev: nvim-gdb = buildVimPlugin { pname = "nvim-gdb"; - version = "2024-10-07"; + version = "2024-10-15"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "53c34afd5dbc197709e6b88214f08c18213da153"; - sha256 = "1f17i503jl9s2r2vkpwssbsg0dvsbaqbhpwjirk4wkn99g4k8k6d"; + rev = "952f0b45ac4324fc876b0c6a3f465b57a8b3f202"; + sha256 = "1v35lqfvsdxiw92llfb0y0wlm705y4xxzcdyb42s5mvysvqdw15x"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; @@ -8684,12 +8720,12 @@ final: prev: nvim-highlite = buildVimPlugin { pname = "nvim-highlite"; - version = "2024-09-04"; + version = "2024-10-15"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "0dd4a4ab5892b02661ad18ceb9071428c3391a89"; - sha256 = "0rn2crlih3wmxpq0c0c9j1cksvlzn687wx8v88jdn5a643jbaxvp"; + rev = "eb4ed4979fcea945b0da879754d91930663bbf8a"; + sha256 = "1aazg7xdxp6ac13rgiiwzxwy88qwqfxi3jzg8vrzrphav4ibx6sx"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -8803,12 +8839,12 @@ final: prev: nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2024-10-03"; + version = "2024-10-10"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "27f44d1cc3d733a38a736acb902f94879d99c76c"; - sha256 = "02632rx9sn954ds17wb30lznaqnf2cfsdl9a0vnj7zig4q0yss73"; + rev = "f707b3ae50417067fa63fdfe179b0bff6b380da1"; + sha256 = "0zws4m0jcprpn0d0ny2k6pvkmca917wjbqwk13g1p8rp87ia5yy1"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -8839,12 +8875,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2024-10-07"; + version = "2024-10-15"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "04680101ff79e99b4e33a4386ec27cbd0d360c75"; - sha256 = "1qv90xhs7i9mqh66kar7awjz1vhnn12i3fc1sbjck50gqsy3131b"; + rev = "9b2509f17c284486497358ccea1019cc17c28af6"; + sha256 = "09g1zcpg1b98fgv6siibd683ci5yfih4papv56nc9h2vk01a9p8d"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -9019,12 +9055,12 @@ final: prev: nvim-paredit = buildVimPlugin { pname = "nvim-paredit"; - version = "2024-07-11"; + version = "2024-10-15"; src = fetchFromGitHub { owner = "julienvincent"; repo = "nvim-paredit"; - rev = "dd851b3a17e393b6837c26ee14fc96db9ffdef82"; - sha256 = "084vc5rfqa8k9ir5pd5rwfssmkq8yi2ndg3gr8mj2fylr14lp9z7"; + rev = "2f0e7fc4fc5c25cb0e8af7fc0bd1fe00f1fe131a"; + sha256 = "1qphsmankkrxgnbxac8ja366akp22139p4c9j6pa9z988ipq4bz2"; }; meta.homepage = "https://github.com/julienvincent/nvim-paredit/"; }; @@ -9091,12 +9127,12 @@ final: prev: nvim-rip-substitute = buildVimPlugin { pname = "nvim-rip-substitute"; - version = "2024-10-02"; + version = "2024-10-10"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-rip-substitute"; - rev = "144154d012b8352827363cdb58b1bb57a9a60294"; - sha256 = "0xb3dcmv193bgw7rg9zpm431myy4gnx4nrfqcrjgqa2vkkv3q93s"; + rev = "dd0ad18f207998ce08355ccefaa332376257552a"; + sha256 = "19az20g2jr2vvmkcadsdpppcn1fbsvi1dhg3lyq02a67s9525ln4"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-rip-substitute/"; }; @@ -9115,12 +9151,12 @@ final: prev: nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2024-10-01"; + version = "2024-10-15"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "b0febf803081dab602649e72b7f6685683c88a3b"; - sha256 = "1sr76silz6mg5v6zjqri7yylawhn84mysx1vc417lcmki9ciys52"; + rev = "db413e93ef6d50b4e92bbfd7a82263057a6cf28a"; + sha256 = "1jshj0qq80pnf0x6np76xrvwswawl5yyikzvxid8kan0s86gs3nf"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -9259,24 +9295,24 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2024-10-07"; + version = "2024-10-14"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "010ae0365aafd6275c478d932515d2e8e897b7bb"; - sha256 = "0dsg3c3n79vhmcfg5ng6hrxbkhskgxsap5b444wsksy6xdi0304h"; + rev = "f5f67892996b280ae78b1b0a2d07c4fa29ae0905"; + sha256 = "0pqzd4yqsajr26b1bc359ylj7ywiiallc5akq7996hnakcx6r1c9"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2024-10-07"; + version = "2024-10-15"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "45e0d66246f31306d890b91301993fa1623e79f1"; - sha256 = "1dpfzs118rv5717i81y9cibxqqy0x6xy98r93xcnkba75yyn0qbi"; + rev = "da926103921117cc6dc8a518bc9b949c90d1c70c"; + sha256 = "006crqfchxf94x5y1v5hi9jf023m7k39xqjh8yjffwzc8whsyd4m"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -9415,12 +9451,12 @@ final: prev: nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2024-10-04"; + version = "2024-10-11"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "56f17def81478e406e3a8ec4aa727558e79786f3"; - sha256 = "1855li3b7j64w1m1jxqxxdsdf0m6vs8migddhkrfkz6nmm1f3lfq"; + rev = "19d257cf889f79f4022163c3fbb5e08639077bd8"; + sha256 = "0rwlikjvc469fkmpn980abvk27dyf23azamac7iz2wchkwx88ia9"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -9535,12 +9571,12 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2024-10-03"; + version = "2024-10-15"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "29d4ed4463ce4f487a3d4d0b5a649ab943e62fae"; - sha256 = "0m5wq6czs0vscq207qinxyh2v0msxqkn3y9s2sg7spmb47mims2h"; + rev = "896d48b6184f69113599e9ecc46611e9d0b5fbcf"; + sha256 = "1p1618cnf1ag6nmirpm6z9hx57cwrpn5wfnhncr6rifjndjfmas1"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; @@ -9728,12 +9764,12 @@ final: prev: orgmode = buildVimPlugin { pname = "orgmode"; - version = "2024-09-25"; + version = "2024-10-09"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "8ead368a78c7e1df0c15432dfb41d95dd4365f5c"; - sha256 = "1pmdzgb23d3hynaszmdh3fkdgsfbav84vazg7amj4fy372m8dcsa"; + rev = "a5aeb14663ef08e0bb4bb847f8d79f9c253094a0"; + sha256 = "0hwplx3dj7mn95cqhj9hrc9dl2q211ib8hlz3fn4771bsadabxzh"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -10066,12 +10102,12 @@ final: prev: precognition-nvim = buildVimPlugin { pname = "precognition.nvim"; - version = "2024-08-13"; + version = "2024-10-12"; src = fetchFromGitHub { owner = "tris203"; repo = "precognition.nvim"; - rev = "8a81c310b4e76b4884fc5350a5741cf683c645c7"; - sha256 = "1x6h94jcpyqdqg5ranrmsp2di4lh8kchi03bp80600r54f5sgqf3"; + rev = "35c402c19a10e524d5378c9c0a5151ff5d847b06"; + sha256 = "1sq7ahnj9kj0cijr8jb4shr226rv65a3gdcnrv10glf9kisbpk6i"; }; meta.homepage = "https://github.com/tris203/precognition.nvim/"; }; @@ -10174,12 +10210,12 @@ final: prev: pum-vim = buildVimPlugin { pname = "pum.vim"; - version = "2024-10-05"; + version = "2024-10-09"; src = fetchFromGitHub { owner = "Shougo"; repo = "pum.vim"; - rev = "5997cfc3b7941bde582aab276ff82e9a5f43db66"; - sha256 = "0szsqlx6hinwamrc36ha8p4x9kg5wbg7b28mbj7ynwbncjfbnini"; + rev = "b2ca20dedf32b80dd0cbd654770ec3f70841be68"; + sha256 = "1qq0ha1r3yl4m94p83lcy0lrjazajcpnsd2v9rd9y74mznbh93f1"; }; meta.homepage = "https://github.com/Shougo/pum.vim/"; }; @@ -10247,12 +10283,12 @@ final: prev: quarto-nvim = buildVimPlugin { pname = "quarto-nvim"; - version = "2024-07-09"; + version = "2024-10-09"; src = fetchFromGitHub { owner = "quarto-dev"; repo = "quarto-nvim"; - rev = "eed598983fa4040eed77191f69462c1348770b8a"; - sha256 = "0za72ishz4gbc43887r18n7qlzayx05i5apfix1v77pn0c8fwwnr"; + rev = "23083a0152799ca7263ac9ae53d768d4dd93d24e"; + sha256 = "0mamwyjgb1l4bvy741ixqyzr4ggjhzh4nsqr6rdb22p98g465r15"; }; meta.homepage = "https://github.com/quarto-dev/quarto-nvim/"; }; @@ -10462,12 +10498,12 @@ final: prev: render-markdown-nvim = buildVimPlugin { pname = "render-markdown.nvim"; - version = "2024-10-04"; + version = "2024-10-15"; src = fetchFromGitHub { owner = "MeanderingProgrammer"; repo = "render-markdown.nvim"; - rev = "fe1002fddc61207e4ef4325d4bc0ca33697bbc7a"; - sha256 = "1srxz1916qbbgaf2xxp29sdvjib9j4kfqjr7qb0grddk7s5hrywz"; + rev = "5925f48b8c00bb6911763f2a2de19ce05d375e85"; + sha256 = "1vn7nnr7h8g5i8ljqfrj11mzbqs6qamw2rwi5xrihaxmjnhbp24z"; }; meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/"; }; @@ -10498,12 +10534,12 @@ final: prev: rest-nvim = buildNeovimPlugin { pname = "rest.nvim"; - version = "2024-09-30"; + version = "2024-10-11"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "3a7eecb442d9c02538cc99f76c611ba4912654a3"; - sha256 = "0g93hk677l092mcsxmdihn51ahqkzgahw3gy623hv5sj8rpqjbld"; + rev = "113dce7749eb22b84cbde052d1cdc1f70702ed58"; + sha256 = "0cjck6c2qpa13rll3n1i0a97kpzlzpmk93nl2c4lvgplc3xp6zkf"; fetchSubmodules = true; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; @@ -10559,12 +10595,12 @@ final: prev: roslyn-nvim = buildVimPlugin { pname = "roslyn.nvim"; - version = "2023-12-19"; + version = "2024-10-13"; src = fetchFromGitHub { owner = "jmederosalvarado"; repo = "roslyn.nvim"; - rev = "3e360ea5a15f3cf7ddef02ff003ef24244cdff3a"; - sha256 = "06lqxv1qaqpz5s4zaqvnd975a1qsn0avdwyjv4pnka7z9l8fasyj"; + rev = "5a2df70f8b78cca3732bacdf51eaa21a861fe3df"; + sha256 = "11226pwyfz2xadir41lafr6p6khlc4w5awd6bgr2zrwvsf5wf0aa"; }; meta.homepage = "https://github.com/jmederosalvarado/roslyn.nvim/"; }; @@ -10691,12 +10727,12 @@ final: prev: scss-syntax-vim = buildVimPlugin { pname = "scss-syntax.vim"; - version = "2019-06-30"; + version = "2024-10-10"; src = fetchFromGitHub { owner = "cakebaker"; repo = "scss-syntax.vim"; - rev = "bda22a93d1dcfcb8ee13be1988560d9bb5bd0fef"; - sha256 = "0p6yy6d7lwi87rvk4c6b2ggrvpddrfksrgdwz993gvxxxbnpwi8q"; + rev = "a6515bad76259f34d885d1f54cdd82c1dd98d91a"; + sha256 = "1na3x1n24xpybw4v7mi25pwfk18nm27kp7iywprdh7x6y6sx0czk"; }; meta.homepage = "https://github.com/cakebaker/scss-syntax.vim/"; }; @@ -10848,24 +10884,24 @@ final: prev: smart-open-nvim = buildVimPlugin { pname = "smart-open.nvim"; - version = "2024-04-23"; + version = "2024-10-15"; src = fetchFromGitHub { owner = "danielfalk"; repo = "smart-open.nvim"; - rev = "87626ee8748b9bba22093adec7bb58c63e7214f0"; - sha256 = "sha256-ro4qFdEAnE5u8wt7NyIc7OHobvjRotVX+LZ0P5as8EU="; + rev = "7770b01ce4d551c143d7ec8589879320796621b9"; + sha256 = "1yyz1c8v0laxd9xddsfdngpsjlaiap1lsfck2l90kwvqxbj82xbj"; }; meta.homepage = "https://github.com/danielfalk/smart-open.nvim/"; }; smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2024-10-04"; + version = "2024-10-12"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "0523920a07c54eea7610f342ca8c1bddbee4b626"; - sha256 = "1cccikkr5gvxv0ml23la4gsma6nyanr1a0h00mx949cwjl9q9m4s"; + rev = "70f9e4f36082bf28b8bc1d05e2ea7c3f6aeb51ff"; + sha256 = "1rkwqh6nnf9fv2s1g4fbwsqb6jydkr5zspb60sy1bs1y4maj3lv2"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -11221,12 +11257,12 @@ final: prev: stay-centered-nvim = buildVimPlugin { pname = "stay-centered.nvim"; - version = "2024-10-01"; + version = "2024-10-09"; src = fetchFromGitHub { owner = "arnamak"; repo = "stay-centered.nvim"; - rev = "09fc8a4f0f20b0dc8b5c4310af2e970665332ae0"; - sha256 = "16dnmzp3vs4km7lzykgmmq2syyjvswh3zydyj1hyfzcd1syajbgh"; + rev = "c28430fe49615680587458914070d7bd1d8782cc"; + sha256 = "0gwvvzw4vv6v7r9bzfvzj7lkvhx64hsb3nn8vp12jsl3g5rqxrvm"; }; meta.homepage = "https://github.com/arnamak/stay-centered.nvim/"; }; @@ -11595,12 +11631,12 @@ final: prev: telekasten-nvim = buildVimPlugin { pname = "telekasten.nvim"; - version = "2024-09-18"; + version = "2024-10-15"; src = fetchFromGitHub { owner = "nvim-telekasten"; repo = "telekasten.nvim"; - rev = "ae6473da3d7ee7ca5cd7df413d3934169a857a75"; - sha256 = "1sqgzhhqwvl6549rv97r2r75bw4k010jrwjj2d3p6ajk803m8yrg"; + rev = "b695fa6eff5d892d4d793326c8b313941c6a7af1"; + sha256 = "13grif3bhi89fr2hbkbqm3dd9ifma5x641g0783c8387zqjgvyhw"; fetchSubmodules = true; }; meta.homepage = "https://github.com/nvim-telekasten/telekasten.nvim/"; @@ -11715,6 +11751,18 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-fzy-native.nvim/"; }; + telescope-git-conflicts-nvim = buildVimPlugin { + pname = "telescope-git-conflicts.nvim"; + version = "2024-01-14"; + src = fetchFromGitHub { + owner = "Snikimonkd"; + repo = "telescope-git-conflicts.nvim"; + rev = "1ac7040f601d16ab3800bdda6f5912a0e385cb29"; + sha256 = "0n5jwc7pv14fipavqfvam5691qp9fvs2nksdaihjgqrgl5sd12jv"; + }; + meta.homepage = "https://github.com/Snikimonkd/telescope-git-conflicts.nvim/"; + }; + telescope-github-nvim = buildVimPlugin { pname = "telescope-github.nvim"; version = "2022-04-22"; @@ -11753,12 +11801,12 @@ final: prev: telescope-manix = buildNeovimPlugin { pname = "telescope-manix"; - version = "2024-10-06"; + version = "2024-10-13"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "19dfbb91ba74755e5e348805d1a96ea5a3dec86a"; - sha256 = "0a06xb9fq6b65rv3c1zvq37k1rb9x7crr9g4bcmlqjqzqvp3yiqw"; + rev = "b04d358d3c1bf65e1a3b10812c4f0a9f57fb6fc0"; + sha256 = "02b91csvggcw5yln87kbbx7jl7j9h0dl8rd0nlqw77ds0345yvbi"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -11910,12 +11958,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2024-10-06"; + version = "2024-10-10"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "dc6fc321a5ba076697cca89c9d7ea43153276d81"; - sha256 = "0jknzk7fi5w05zwl7l5yymgn80nb6sdlqmmkiqzrqn2808aaa4bf"; + rev = "df534c3042572fb958586facd02841e10186707c"; + sha256 = "0a82h051ymnbkzxsz21f454fbk5qq26fhxk4h42jby6vgy7myqqx"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -12114,12 +12162,12 @@ final: prev: tiny-inline-diagnostic-nvim = buildVimPlugin { pname = "tiny-inline-diagnostic.nvim"; - version = "2024-09-17"; + version = "2024-10-15"; src = fetchFromGitHub { owner = "rachartier"; repo = "tiny-inline-diagnostic.nvim"; - rev = "1a83e7ce5c9d0ae4d89fc5c812b55ff8ed1d39e7"; - sha256 = "1bjf996ria9sghf51wmck7gn2x57vdabrzradpjn94x78iai85rl"; + rev = "1618f75a6c1dab4e96a1c0fbf436da346bc2db18"; + sha256 = "1i58y1hz9kxxq9ca69g392hjjvlbif884vgybakd73ywcsx14bgr"; }; meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/"; }; @@ -12283,12 +12331,12 @@ final: prev: trim-nvim = buildVimPlugin { pname = "trim.nvim"; - version = "2024-03-15"; + version = "2024-10-13"; src = fetchFromGitHub { owner = "cappyzawa"; repo = "trim.nvim"; - rev = "4fe47a46c02a58894ded8328ca81f6c214a892f5"; - sha256 = "1h8w50an3fmp8xl052apblsnm0x70m1ykygjn5wb94wsb7crydl9"; + rev = "7dc35b9e61b9f77f475807a2be6fe8115a12d81c"; + sha256 = "07bi6y2pc7kh02v5497a6wji7qj7si2wjf3khi5bmgqyj9iqlp95"; }; meta.homepage = "https://github.com/cappyzawa/trim.nvim/"; }; @@ -12452,12 +12500,12 @@ final: prev: ultimate-autopair-nvim = buildVimPlugin { pname = "ultimate-autopair.nvim"; - version = "2024-09-13"; + version = "2024-10-13"; src = fetchFromGitHub { owner = "altermo"; repo = "ultimate-autopair.nvim"; - rev = "ff21db642847840db183b9421ab3d89795a7fbba"; - sha256 = "0rkxfmacwwpzifpnqfbizla425b7gfay0jfgw84bfidspvc33vab"; + rev = "9e3209190c22953566ae4e6436ad2b4ff4dabb95"; + sha256 = "0xchw704s2wy0p4f1v8gmrbh2z4n9l1k0dl6f9zgjkzrvi0pnw13"; }; meta.homepage = "https://github.com/altermo/ultimate-autopair.nvim/"; }; @@ -12500,12 +12548,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2024-10-06"; + version = "2024-10-10"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "ff47921b96796cef9db2782a541ffd40a893c126"; - sha256 = "1hx5y68f6d2738bzqj2byz8cqdz61pyqjkpqx64c5bcpx5y4bxrf"; + rev = "e2c42cac45a77b5548ddcec57eb79b6996659d2a"; + sha256 = "1cjg9plvwq00plynk7k993rbg65zdwgmyv0jvl824wa3inh0fv7w"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -12596,24 +12644,24 @@ final: prev: verilog_systemverilog-vim = buildVimPlugin { pname = "verilog_systemverilog.vim"; - version = "2023-08-11"; + version = "2024-10-13"; src = fetchFromGitHub { owner = "vhda"; repo = "verilog_systemverilog.vim"; - rev = "74e533b5f8f169af86af27d7206814103b35efcb"; - sha256 = "0f9fylwhmya8rzg605bjyn8qldhyk59d6r98fhd6s4nn3n939rvw"; + rev = "5d1ea7c50a66a2f6c6002214344b16de02996ecc"; + sha256 = "06w0m0rxwznh6mnd8f7qpccqaz4mv8pdw7anfib0rbw30m7hc167"; }; meta.homepage = "https://github.com/vhda/verilog_systemverilog.vim/"; }; vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2024-09-11"; + version = "2024-10-09"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "b1fe33e532aa360203e8015a557ba79dd38e07e4"; - sha256 = "0gwcn7r43143k95k5gzni6g9gj20kf5k4yy0gax8kdmdfc6660k1"; + rev = "785866e76397fafb7bce1f9bd0eb925aa29151aa"; + sha256 = "0j02065ayciz0qnqh5a9h2lka9w20ijjsnlbs8hpcv944ynls1r8"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -12942,6 +12990,18 @@ final: prev: meta.homepage = "https://github.com/junegunn/vim-after-object/"; }; + vim-afterglow = buildVimPlugin { + pname = "vim-afterglow"; + version = "2024-03-31"; + src = fetchFromGitHub { + owner = "danilo-augusto"; + repo = "vim-afterglow"; + rev = "fe3a0c4d2acf13ed6f7f0f1fede0a2570f13b06e"; + sha256 = "0z61jfdhhajw5k7y8msk8nj5nljwygmw3s6vsqq9qgczaixqh968"; + }; + meta.homepage = "https://github.com/danilo-augusto/vim-afterglow/"; + }; + vim-agda = buildVimPlugin { pname = "vim-agda"; version = "2024-05-17"; @@ -13112,12 +13172,12 @@ final: prev: vim-autoformat = buildVimPlugin { pname = "vim-autoformat"; - version = "2024-02-07"; + version = "2024-10-11"; src = fetchFromGitHub { owner = "vim-autoformat"; repo = "vim-autoformat"; - rev = "38a01acb7471d276ecf5970ab4fd58bfebb9ea06"; - sha256 = "1f9cppm7x0vyxcch256lm0m7k2wj3njpp62b9xlphw8cwyqx45dp"; + rev = "9a8e716e457b9d95447e054435ebdae5943cab8c"; + sha256 = "14iw5iab12axwdr2vdsnsgp77br1z2y2r229ihmsnlll4i645nx0"; }; meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/"; }; @@ -13664,12 +13724,12 @@ final: prev: vim-dadbod = buildVimPlugin { pname = "vim-dadbod"; - version = "2024-05-31"; + version = "2024-10-15"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "7888cb7164d69783d3dce4e0283decd26b82538b"; - sha256 = "125fzaimjf0vzgl880vjqs5hm9zncbvxjwr5g34psmidhx4x82gk"; + rev = "b74e49c11707fdfe23d101557dee496496611ab2"; + sha256 = "0iqq3721hx28p51lm6b7irffqglpsxsjjy1h11x7hrhphn8qdn0q"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; @@ -14036,12 +14096,12 @@ final: prev: vim-eunuch = buildVimPlugin { pname = "vim-eunuch"; - version = "2024-02-04"; + version = "2024-10-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-eunuch"; - rev = "8fb3904be27b6b60d086f87c2570085902414069"; - sha256 = "1icir4spx0hj4zp2ps26v9q2jgbqi9fw4anhn6k48n8ahgvim614"; + rev = "6c6af39aa0a25223389607338ae965c5dfc7c972"; + sha256 = "01qgpn9z6izv8ik7qhdmki3zwaackn62aan7qp11k9i2mzd5fx39"; }; meta.homepage = "https://github.com/tpope/vim-eunuch/"; }; @@ -14084,12 +14144,12 @@ final: prev: vim-fern = buildVimPlugin { pname = "vim-fern"; - version = "2024-05-08"; + version = "2024-10-15"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "vim-fern"; - rev = "a675dff495a0a0fd15663ebbae585c19825a64c5"; - sha256 = "1bxd4x5iac6c1ca5vxw2y1bxxlzjhn6gkxfnw91q68cj7lik5575"; + rev = "2cf57c60df508d15878e03c1e8fb12506384212a"; + sha256 = "1rdmannlp0vzsrmmcyiygpmnkm4pnzgqm6w9lz17ca4yy1adlqfh"; }; meta.homepage = "https://github.com/lambdalisue/vim-fern/"; }; @@ -15419,12 +15479,12 @@ final: prev: vim-matchtag = buildVimPlugin { pname = "vim-matchtag"; - version = "2022-06-24"; + version = "2024-10-10"; src = fetchFromGitHub { owner = "leafOfTree"; repo = "vim-matchtag"; - rev = "54357c00979e07d86aa12b383ddd1d6a7fbda2c2"; - sha256 = "01ar9qma2glb6wyhpafnwpf1f63v9i417hx1dzck1gi4fcz1pfqa"; + rev = "008aee75e4003cb11cf7eea800c849182693275b"; + sha256 = "0a17nw3f3jl599d6i6jbga11mmlayqbm65dr2gjw4a88z2djkvsj"; }; meta.homepage = "https://github.com/leafOfTree/vim-matchtag/"; }; @@ -15467,12 +15527,12 @@ final: prev: vim-merginal = buildVimPlugin { pname = "vim-merginal"; - version = "2024-05-17"; + version = "2024-10-14"; src = fetchFromGitHub { owner = "idanarye"; repo = "vim-merginal"; - rev = "9ae2f12132d3ab8871d9dd6f8371149e826b7818"; - sha256 = "01inqqwzf0f9ck9av4bm3jz4s32lr1dljk2nwdmwkdhrjizrvy5s"; + rev = "3dca10fd8bce10edbc2024651db4ffb6dd2d89de"; + sha256 = "0g8pkpmx3xrd0pn8v7i4rpgqkc54cl34yh3z8mzdk6wsi0lpyp3k"; }; meta.homepage = "https://github.com/idanarye/vim-merginal/"; }; @@ -16175,12 +16235,12 @@ final: prev: vim-projectionist = buildVimPlugin { pname = "vim-projectionist"; - version = "2024-06-22"; + version = "2024-10-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "3736bd4a5f23b30821cbb892385bb1f1b0088cfc"; - sha256 = "0q5jly140pjf9z6cc2n8g833glwpal07lrvkcq9ay3gn9pznpjwy"; + rev = "104394c31ead4b09fbf0e16f9d367e3e179ee50a"; + sha256 = "0g5xwzp5wixk2f6a4325jpz1hg7m0jv3klkdglv1qz23ffgdznbh"; }; meta.homepage = "https://github.com/tpope/vim-projectionist/"; }; @@ -16811,12 +16871,12 @@ final: prev: vim-spirv = buildVimPlugin { pname = "vim-spirv"; - version = "2024-10-03"; + version = "2024-10-10"; src = fetchFromGitHub { owner = "kbenzie"; repo = "vim-spirv"; - rev = "612b5c42ff2d33c0d044da0affa54f9edba22b64"; - sha256 = "11kpwy4f4j19waxq3n83iaalr678nn9a6qk9bsvsz1g6wbc0p8sc"; + rev = "11f7c6d26baf79a29ac8d2321810a5e3f7a45397"; + sha256 = "10wkfiqg4ccl671j8wc1kghck0jah7b74l4i648ybjly00ikybbh"; }; meta.homepage = "https://github.com/kbenzie/vim-spirv/"; }; @@ -17003,12 +17063,12 @@ final: prev: vim-teal = buildVimPlugin { pname = "vim-teal"; - version = "2024-06-19"; + version = "2024-10-11"; src = fetchFromGitHub { owner = "teal-language"; repo = "vim-teal"; - rev = "912602f9fab602234a55ad8b0f5f590f657d3e66"; - sha256 = "0lqr6ss3pvsd9q3w88vy3qf456939crddv17jhc1ynib90ngb59c"; + rev = "a82ffa437a6a146d28da1c24356995155ebeb6a5"; + sha256 = "00hh8lqjvbv6rcfb2wlgifk4sznxcxcs3sjqdlpxhk3m9hhl4g10"; }; meta.homepage = "https://github.com/teal-language/vim-teal/"; }; @@ -17412,12 +17472,12 @@ final: prev: vim-vp4 = buildVimPlugin { pname = "vim-vp4"; - version = "2022-06-06"; + version = "2024-10-11"; src = fetchFromGitHub { owner = "ngemily"; repo = "vim-vp4"; - rev = "c08df4fa9639949c339cbac7835b67288aad63ae"; - sha256 = "1sr75a4rgcgfqxh5ipivpks4y2nzzdxybijawgqyjn1i110iy502"; + rev = "7e958ba378b24981b90edd4c56b6d2c3ce20b558"; + sha256 = "0hlg5akv512fw7az8inbd2z67vmhiqmaz1i818k4kc73jxl2h5h7"; }; meta.homepage = "https://github.com/ngemily/vim-vp4/"; }; @@ -17688,12 +17748,12 @@ final: prev: vimade = buildVimPlugin { pname = "vimade"; - version = "2024-10-06"; + version = "2024-10-14"; src = fetchFromGitHub { owner = "TaDaa"; repo = "vimade"; - rev = "39a045585efa47f34307834cfe2d978f4f87a73b"; - sha256 = "07z3fzlikg2sn0isx9wlvih7vvnhn1iiklqv9nxaqcszj20wvf7i"; + rev = "0330c53f4541908317c33582692d518b2bf5cce1"; + sha256 = "1gfkpnymvwqi91nskp8g2cld8v6dz72pn59ac4y6d5fafq83y5gn"; }; meta.homepage = "https://github.com/TaDaa/vimade/"; }; @@ -17796,12 +17856,12 @@ final: prev: vimspector = buildVimPlugin { pname = "vimspector"; - version = "2024-09-27"; + version = "2024-10-08"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "8d497913d4fc311cc6884889eb4aed062ef9c177"; - sha256 = "170kqy9ndqs656ccrjna8ygpcgz55app8bqbkm288spvcnacs9lr"; + rev = "ecb4669e5641abc3099b5a0b907f15ba3ceabd02"; + sha256 = "1czc5li3rrd2zl2bjh54c0alpmgnl309kdp8z4ynl0g0ga9lp896"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -17809,12 +17869,12 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2024-10-03"; + version = "2024-10-13"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "fcbaf66887bd19f5d973406848cf2a5ac46bd65e"; - sha256 = "0r24jlb2qh45ai7fhk7a3k4jhgv0r01sjm6w2hm1ky40ycl5xw6g"; + rev = "9a5ef1d4ac8e4e06071179ebe8121350fcb97861"; + sha256 = "1zp8wvys8m61sqpyil7ra33pinnq8kliadric0d7iii9d4gjqidd"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -17833,12 +17893,12 @@ final: prev: vimwiki = buildVimPlugin { pname = "vimwiki"; - version = "2024-06-23"; + version = "2024-10-14"; src = fetchFromGitHub { owner = "vimwiki"; repo = "vimwiki"; - rev = "705ad1e0dded0e3b7ff5fac78547ab67c9d39bdf"; - sha256 = "0wv0lyfxd5dfgmj3j8qpf05014isrm1py9mrxkg6zh8gnbv7d72j"; + rev = "72792615e739d0eb54a9c8f7e0a46a6e2407c9e8"; + sha256 = "0w4vmv4shax8wx8vr78vq5aryspmhx2h42sjh2saj85i8mjngkiv"; }; meta.homepage = "https://github.com/vimwiki/vimwiki/"; }; @@ -18182,12 +18242,12 @@ final: prev: yazi-nvim = buildVimPlugin { pname = "yazi.nvim"; - version = "2024-10-06"; + version = "2024-10-14"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "yazi.nvim"; - rev = "55e66733a7d05e761f97fa11589f569233be6616"; - sha256 = "1bng3j8mm0mx9pq0kf4v5vlvnm9bz5a9j1jynin30c46kagn24fx"; + rev = "519940019913a5e742e2dd2f04712d9ff8869a10"; + sha256 = "1yir1h5k6ni6wqbxbj5fs2rmd7bwl1asj6nh82h987mg8s7w3gf5"; }; meta.homepage = "https://github.com/mikavilpas/yazi.nvim/"; }; @@ -18410,12 +18470,12 @@ final: prev: gbprod-nord = buildVimPlugin { pname = "gbprod-nord"; - version = "2024-10-03"; + version = "2024-10-10"; src = fetchFromGitHub { owner = "gbprod"; repo = "nord.nvim"; - rev = "33a928133fd031b9714cb390645b5b01a900d9f9"; - sha256 = "03zxdh9b5bjx3apz884diai8gb2xmngb706qrwmpmgnf33bfr0xp"; + rev = "4cc19936b1b57ba08eb461c5f450b3976cbb8e0c"; + sha256 = "1k09fv0cb8xaa6z1fz6l58cdzgz4wfnfhv32dw3y395gr69a9sra"; }; meta.homepage = "https://github.com/gbprod/nord.nvim/"; }; @@ -18482,12 +18542,12 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2024-10-07"; + version = "2024-10-15"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "da65abac6649a239a8fb89e2f2ad6262bcd0ac63"; - sha256 = "063qfs233jyjjdqaxg5025q4ycz3ak9mv0q6kzks8wj0zclf4ayf"; + rev = "e0891549ec3ccff7d68a57915e7af97c9608ffad"; + sha256 = "1sj9gjzr8g035dhszpcg19a6f68ibqj65bfss39vm4qhk9zr85kn"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; @@ -18530,12 +18590,12 @@ final: prev: rose-pine = buildVimPlugin { pname = "rose-pine"; - version = "2024-08-25"; + version = "2024-10-08"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "8b1fd252255a7f2c41b4192a787ab62660b29f72"; - sha256 = "0djiabbm8c9kxwaz2awb5a9a20qiy5xap9r9prwiak4apk96v299"; + rev = "d396005db5bbd1d4ec7772a7c96c96f4c4802328"; + sha256 = "1ahcvljrk073mwr2ipmlf3gd2k7gp1n6g921q2s2v4i0136v2lyr"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh index 0c6a001084..1808442327 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh @@ -1,3 +1,4 @@ +#shellcheck shell=bash # Setup hook for checking whether Python imports succeed echo "Sourcing neovim-require-check-hook.sh" @@ -9,13 +10,15 @@ neovimRequireCheckHook () { # editorconfig-checker-disable export HOME="$TMPDIR" + + local deps="${dependencies[*]}" @nvimBinary@ -es --headless -n -u NONE -i NONE --clean -V1 \ - --cmd "set rtp+=$out,${dependencies/ /,}" \ + --cmd "set rtp+=$out,${deps// /,}" \ --cmd "lua require('$nvimRequireCheck')" fi } echo "Using neovimRequireCheckHook" -preDistPhases+=" neovimRequireCheckHook" +appendToVar preDistPhases neovimRequireCheckHook diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index c95199d6ee..62c42151f8 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -16,12 +16,12 @@ }; agda = buildGrammar { language = "agda"; - version = "0.0.0+rev=d3dc807"; + version = "0.0.0+rev=6516cfe"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-agda"; - rev = "d3dc807692e6bca671d4491b3bf5c67eeca8c016"; - hash = "sha256-2HBndaridTSSpYgCnpc6buLWWusmQPzsQjwAD9PkrCE="; + rev = "6516cfec35479d62c0ad3c8e7e546a9774b489fd"; + hash = "sha256-X8CkbeJWkNKyx1aT2FZRsh8teyie8nzZt7lhIQ+apnc="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-agda"; }; @@ -38,12 +38,12 @@ }; apex = buildGrammar { language = "apex"; - version = "0.0.0+rev=943a3eb"; + version = "0.0.0+rev=46d4a12"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "943a3eb7f55733929ccafe06841087c3004cb4e0"; - hash = "sha256-eTdNxvK3vcC7MiE5g0DgptuChYs7fv+WjEmxhwmUI4U="; + rev = "46d4a12e4e90b10a575b7b16ea3b6ead50322074"; + hash = "sha256-vPSdx//9PZXDV9wzkMobaSVl88+iVGi/E+t7EA2yyCY="; }; location = "apex"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; @@ -105,12 +105,12 @@ }; bash = buildGrammar { language = "bash"; - version = "0.0.0+rev=c8713e5"; + version = "0.0.0+rev=597a5ed"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-bash"; - rev = "c8713e50f0bd77d080832fc61ad128bc8f2934e9"; - hash = "sha256-xqiUJhl7nfOlS6wBYWpmrGLCvWoJCA5fz8DCX85Lxog="; + rev = "597a5ed6ed4d932fd44697feec988f977081ae59"; + hash = "sha256-h6L5eIItu3IOJBKSZCajHMhhencN1Fk/4dXgBMuVxYc="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash"; }; @@ -193,23 +193,23 @@ }; c = buildGrammar { language = "c"; - version = "0.0.0+rev=f4c2115"; + version = "0.0.0+rev=79284a1"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; - rev = "f4c21152f1952a99f4744e8c41d3ffb8038ae78c"; - hash = "sha256-DcW6KZVTjJtPx0iNXvizeAXWW8iaShKGF4+sHrwXPvs="; + rev = "79284a14a0d7e4495b095b38acdd8a27acbe870e"; + hash = "sha256-dmvh+k+G0KrR8/bQxJOA/a+uZSrMQfZrNx3ZJQt2MZ4="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c"; }; c_sharp = buildGrammar { language = "c_sharp"; - version = "0.0.0+rev=fd7f740"; + version = "0.0.0+rev=3a85187"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "fd7f7402db6e66afd70b402fb2e367b2d71c10d6"; - hash = "sha256-kj3YWtpitPgPas02I+FAZKtHBVqX7yAy8Ldi0b8IPqk="; + rev = "3a85187e0a9e8db01dec6b3eb2f4e7cdfecc9d88"; + hash = "sha256-OwH0ehwTVEATJts7Y5k0E1oHL8X4G5DGoN4kZmhjjQk="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; @@ -259,12 +259,12 @@ }; cmake = buildGrammar { language = "cmake"; - version = "0.0.0+rev=69d7a8b"; + version = "0.0.0+rev=e409ae3"; src = fetchFromGitHub { owner = "uyha"; repo = "tree-sitter-cmake"; - rev = "69d7a8b0f7493b0dbb07d54e8fea96c5421e8a71"; - hash = "sha256-WyWKf/cqMPClo8xwech3xm4if4Tu9TwA9YstBIEjkoI="; + rev = "e409ae33f00e04cde30f2bcffb979caf1a33562a"; + hash = "sha256-+DiM/deIBx4AyJOF86S5tbKkg93+1fg4r8kDnlyfU+w="; }; meta.homepage = "https://github.com/uyha/tree-sitter-cmake"; }; @@ -325,23 +325,23 @@ }; cpp = buildGrammar { language = "cpp"; - version = "0.0.0+rev=30d2fa3"; + version = "0.0.0+rev=16bf9d2"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "30d2fa385735378388a55917e2910965fce19748"; - hash = "sha256-O7EVmGvkMCLTzoxNc+Qod6eCTWs6y8DYVpQqw+ziqGo="; + rev = "16bf9d2c451957aee976c982c2c668b1c0d12014"; + hash = "sha256-ZcZRTxF+9SvSwMSX4AjHndPJUnz3Ajx7/1cTkhWT7ZM="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; css = buildGrammar { language = "css"; - version = "0.0.0+rev=a68fcd1"; + version = "0.0.0+rev=ccc4e2c"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-css"; - rev = "a68fcd1e6b03118d1e92ffa45e7ab7a39d52d3f7"; - hash = "sha256-o78Od04Ss4S7hbJG41eTN7Mw/i6Dh+AVfENYnPO9/qo="; + rev = "ccc4e2c4b30ddabc4b41c577ad0550b3cac4a74a"; + hash = "sha256-mtDBNG2vadcqYX6CHo9TBIg9vMvY1RmK0LiOD2su4JE="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-css"; }; @@ -425,12 +425,12 @@ }; diff = buildGrammar { language = "diff"; - version = "0.0.0+rev=19dd5aa"; + version = "0.0.0+rev=63439b5"; src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-diff"; - rev = "19dd5aa52fe339a1d974768a09ee2537303e8ca5"; - hash = "sha256-pS+xTdJWhb0pmWecmlnQb6PwkAUTG5Sry3Jf7zWseU0="; + rev = "63439b5e6e35750aff1e53d9eecc663d369c54bc"; + hash = "sha256-dMEeSOb4DlSPs5eq6tmFhrvkp9Imy3xS85hGoPFeH24="; }; meta.homepage = "https://github.com/the-mikedavis/tree-sitter-diff"; }; @@ -526,23 +526,23 @@ }; editorconfig = buildGrammar { language = "editorconfig"; - version = "0.0.0+rev=a761198"; + version = "0.0.0+rev=79bb1dc"; src = fetchFromGitHub { owner = "ValdezFOmar"; repo = "tree-sitter-editorconfig"; - rev = "a761198025448c77ea11bcf22505b395a77fc0d0"; - hash = "sha256-KuaXFJGp1kxn0hqssiAFYL36zb0HY22warBb/40Ftzg="; + rev = "79bb1dc197d0eb7499843b19d3dd0f9a2ee34d3c"; + hash = "sha256-A58dlaDQBmufKT/yG+At0NN0Op6gbEU47DvHjpzklwg="; }; meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig"; }; eds = buildGrammar { language = "eds"; - version = "0.0.0+rev=0ad62cb"; + version = "0.0.0+rev=26d529e"; src = fetchFromGitHub { owner = "uyha"; repo = "tree-sitter-eds"; - rev = "0ad62cb635c2f4353359a88dec9e3a57bbf9f66d"; - hash = "sha256-dbREFx/P6PMHSwoAaEBKSqRolPTFrLDBhMfZKPsvxbc="; + rev = "26d529e6cfecde391a03c21d1474eb51e0285805"; + hash = "sha256-+3BO4JxUrSc8OWHVZvd1lxjrNYkhN35q2YhcrUrFgMk="; }; meta.homepage = "https://github.com/uyha/tree-sitter-eds"; }; @@ -559,12 +559,12 @@ }; elixir = buildGrammar { language = "elixir"; - version = "0.0.0+rev=ef124b8"; + version = "0.0.0+rev=827d15d"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "tree-sitter-elixir"; - rev = "ef124b83a3f3572b0af23db4efae3f8de06a15e1"; - hash = "sha256-5fZK8dP+ldw3Uvi1wbD5Wq4jOK3CH/iUSGsQVjik2CI="; + rev = "827d15deada6ca2f40eece82d1bbe65df07af954"; + hash = "sha256-yKeSOH1/6R1km3vzIZurVwVE1hxVoGMBCFGHkHFkt20="; }; meta.homepage = "https://github.com/elixir-lang/tree-sitter-elixir"; }; @@ -603,12 +603,12 @@ }; embedded_template = buildGrammar { language = "embedded_template"; - version = "0.0.0+rev=62b0a6e"; + version = "0.0.0+rev=7e319b0"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-embedded-template"; - rev = "62b0a6e45900a7dff7c37da95fec20a09968ba52"; - hash = "sha256-F0colhLIN7+1uPAa+z5kBaXIWx/ZxFB28uqNt24QyGo="; + rev = "7e319b065c5864bac2fb68f7e14a338b919e8bb3"; + hash = "sha256-aBeJ0R2OQZTVH63NOGrYH0z044d0fgVgIn2V2Z2d7cY="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-embedded-template"; }; @@ -846,12 +846,12 @@ }; gitcommit = buildGrammar { language = "gitcommit"; - version = "0.0.0+rev=aa5c279"; + version = "0.0.0+rev=79fdc5d"; src = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-gitcommit"; - rev = "aa5c279287f0895a7ebc76a06e55ac3e4b2df7c7"; - hash = "sha256-TjHaogOnerLUvCxEOBkqfc4ZtKmgmpU8vQyDmaDsO3Y="; + rev = "79fdc5de52d0e2c6854db924525196af22100dad"; + hash = "sha256-SvYMfldARrwhte6lJrCwpVaBjCerCsYwL4Z+qjdhHKs="; }; meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit"; }; @@ -945,12 +945,12 @@ }; go = buildGrammar { language = "go"; - version = "0.0.0+rev=ecc2086"; + version = "0.0.0+rev=df2ce2e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-go"; - rev = "ecc20866d1bd4d80f3aef06456ed3014d4d598e6"; - hash = "sha256-elPqkvVYs0vADOuN/umDteWP5hqcXhQAoSkqYDtTxaU="; + rev = "df2ce2e206d2810bf010d73055055bfcff1b55aa"; + hash = "sha256-hQrLPjGsgBDd3nMKSTEkcuV3dOK6b1FlAR1fD0mAAt0="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-go"; }; @@ -1000,12 +1000,12 @@ }; gotmpl = buildGrammar { language = "gotmpl"; - version = "0.0.0+rev=fd9e1c6"; + version = "0.0.0+rev=ca52fbf"; src = fetchFromGitHub { owner = "ngalaiko"; repo = "tree-sitter-go-template"; - rev = "fd9e1c6647e5e9b23918d00d1e48710d0f703e19"; - hash = "sha256-DGeaKT1uqvXiYwL4g5kZNX6f5TwLPbb5qbhI4amdl98="; + rev = "ca52fbfc98366c585b84f4cb3745df49f33cd140"; + hash = "sha256-ZWpzqKD3ceBzlsRjehXZgu+NZMbWyyK+/R1Ymg7DVkM="; }; meta.homepage = "https://github.com/ngalaiko/tree-sitter-go-template"; }; @@ -1088,12 +1088,12 @@ }; haskell = buildGrammar { language = "haskell"; - version = "0.0.0+rev=558b997"; + version = "0.0.0+rev=70ea075"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-haskell"; - rev = "558b997049fddcb07fc513528189c57d6129a260"; - hash = "sha256-BvnCHdHJwhCH3wQnA8JA2RgOUUpigJv7f88pRMW1U8o="; + rev = "70ea0757986ea58a0d39ddfcd9d791beadeb0f43"; + hash = "sha256-T/EMYPjdsD4hxcGzqYwC7uHP2EgWPYCqjPywucnpe9s="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell"; }; @@ -1132,12 +1132,12 @@ }; helm = buildGrammar { language = "helm"; - version = "0.0.0+rev=fd9e1c6"; + version = "0.0.0+rev=ca52fbf"; src = fetchFromGitHub { owner = "ngalaiko"; repo = "tree-sitter-go-template"; - rev = "fd9e1c6647e5e9b23918d00d1e48710d0f703e19"; - hash = "sha256-DGeaKT1uqvXiYwL4g5kZNX6f5TwLPbb5qbhI4amdl98="; + rev = "ca52fbfc98366c585b84f4cb3745df49f33cd140"; + hash = "sha256-ZWpzqKD3ceBzlsRjehXZgu+NZMbWyyK+/R1Ymg7DVkM="; }; location = "dialects/helm"; meta.homepage = "https://github.com/ngalaiko/tree-sitter-go-template"; @@ -1155,12 +1155,12 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "0.0.0+rev=5439302"; + version = "0.0.0+rev=b309425"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "543930235970a04c2f0d549c9e88815847c7a74a"; - hash = "sha256-MElmidivJtIywWm4dRslrmtc/vVwGDO1f6k/0P3gb4E="; + rev = "b309425a7ab4456605cfe78774b80f7e275ca87d"; + hash = "sha256-o8y2jZUn15kLQ9k1rftxepeyRfx4dP6Vk2Vv4MUxcOQ="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; @@ -1199,12 +1199,12 @@ }; html = buildGrammar { language = "html"; - version = "0.0.0+rev=14bdaf0"; + version = "0.0.0+rev=c30792d"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-html"; - rev = "14bdaf0da9e26e2de9b30178c2242539d2b0b285"; - hash = "sha256-vSiIabzhhTpvt+1Zh+tCad2TR5hG572hRmX2fTjfC7s="; + rev = "c30792dee70aaa1910e66a39557a841b6e4386d5"; + hash = "sha256-DKRgTfJcUIOfuD7gFRGaSvLoz+RKhBVs0lVB22/AC04="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-html"; }; @@ -1309,23 +1309,23 @@ }; java = buildGrammar { language = "java"; - version = "0.0.0+rev=490d878"; + version = "0.0.0+rev=3f86793"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-java"; - rev = "490d878cf33b0ad5ae7a7253ff30597a5bdc348e"; - hash = "sha256-spf6dl7wvWuhJyhxwVU2YBLzt5xyNQDcBkk9g5cBiNQ="; + rev = "3f8679368cf00ed10ec086975fa87f697b91b7bc"; + hash = "sha256-Mkh3zwZmErBEwzQ1yLTo9kyEhSZm6WigXtWKZpPYyXY="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-java"; }; javascript = buildGrammar { language = "javascript"; - version = "0.0.0+rev=b6f0624"; + version = "0.0.0+rev=c4ce9dc"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-javascript"; - rev = "b6f0624c1447bc209830b195999b78a56b10a579"; - hash = "sha256-xen4zzDwlCXbvgYwckDE0Jw3rDpKUwmr4DHB47nGng4="; + rev = "c4ce9dc8e7e98ea25757ea26bfe9a022043ccd77"; + hash = "sha256-ZSuogu8ljy0Ve8MGzkX1Q+dkHNbVmy8LhcCmshvw7+U="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript"; }; @@ -1342,12 +1342,12 @@ }; jsdoc = buildGrammar { language = "jsdoc"; - version = "0.0.0+rev=bc09606"; + version = "0.0.0+rev=b223787"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-jsdoc"; - rev = "bc09606fc786ead131a301e4b7524888f2d5c517"; - hash = "sha256-tVCYa2N3h+Wf1vPL7/C3rqY6WiR6n9b6VXofUk7+DSA="; + rev = "b2237872e528b8372ed008068f717db66c16a725"; + hash = "sha256-XRSwn1TZcotETTalWKAviBGmmQWHucfVFV7rqglTdfw="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-jsdoc"; }; @@ -1397,23 +1397,23 @@ }; julia = buildGrammar { language = "julia"; - version = "0.0.0+rev=3520b57"; + version = "0.0.0+rev=19f6265"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-julia"; - rev = "3520b57e418f734f582215181ecd926a6178c90f"; - hash = "sha256-IPtEDuYMMZ/0ARvO/Cs8RCofJJE9S/30StvV2oSW41I="; + rev = "19f62656dc7f2ff3756a8ef3dcf9ab1c01a9eb58"; + hash = "sha256-3oegMQ+8B/grgV26v9hir0vpjl9QYxj9cdLeIeDougw="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia"; }; just = buildGrammar { language = "just"; - version = "0.0.0+rev=6648ac1"; + version = "0.0.0+rev=6aee3d2"; src = fetchFromGitHub { owner = "IndianBoy42"; repo = "tree-sitter-just"; - rev = "6648ac1c0cdadaec8ee8bcf9a4ca6ace5102cf21"; - hash = "sha256-EVISh9r+aJ6Og1UN8bGCLk4kVjS/cEOYyhqHF40ztqg="; + rev = "6aee3d2f5b3a47286bae0916daaa6c7a217f6fa4"; + hash = "sha256-A5dN76/ZxoXBzqNHDhE5JeNeKBpamZ2Jp6Y67U6gZ/w="; }; meta.homepage = "https://github.com/IndianBoy42/tree-sitter-just"; }; @@ -1441,12 +1441,12 @@ }; kotlin = buildGrammar { language = "kotlin"; - version = "0.0.0+rev=ec98567"; + version = "0.0.0+rev=76f53c4"; src = fetchFromGitHub { owner = "fwcd"; repo = "tree-sitter-kotlin"; - rev = "ec985672ff21f7fd7f835869d8021e8f87304bb4"; - hash = "sha256-ThttqJxC3yaGufY2H9H5KgUu2bSTp+BKInyi0vucrS8="; + rev = "76f53c48d29e8588934fb55b0240d7bdfe00bfe5"; + hash = "sha256-EBySJmzXH0FoWcslHNs70N9e9K9O/4/RcpbcdWYmgI4="; }; meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin"; }; @@ -1497,12 +1497,12 @@ }; ledger = buildGrammar { language = "ledger"; - version = "0.0.0+rev=8a841fb"; + version = "0.0.0+rev=a2eff7f"; src = fetchFromGitHub { owner = "cbarrete"; repo = "tree-sitter-ledger"; - rev = "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"; - hash = "sha256-BDMmRRqJXZTgK3yHX+yqgWHGpsMLqzTcQxFYaAWxroo="; + rev = "a2eff7fee59ee6adfc4a3646e2f41ba3b340a97d"; + hash = "sha256-7TM+Y2lDt53mxfeE5XepcdnoUtzv9FzH0klEEl4BOWU="; }; meta.homepage = "https://github.com/cbarrete/tree-sitter-ledger"; }; @@ -1552,12 +1552,12 @@ }; llvm = buildGrammar { language = "llvm"; - version = "0.0.0+rev=1b96e58"; + version = "0.0.0+rev=c14cb83"; src = fetchFromGitHub { owner = "benwilliamgraham"; repo = "tree-sitter-llvm"; - rev = "1b96e58faf558ce057d4dc664b904528aee743cb"; - hash = "sha256-9OCiD7Hotl7EYoggX0lArwFvK2OZisBUsX7xv8+Ig+o="; + rev = "c14cb839003348692158b845db9edda201374548"; + hash = "sha256-L3XwPhvwIR/mUbugMbaHS9dXyhO7bApv/gdlxQ+2Bbo="; }; meta.homepage = "https://github.com/benwilliamgraham/tree-sitter-llvm"; }; @@ -1686,23 +1686,23 @@ }; meson = buildGrammar { language = "meson"; - version = "0.0.0+rev=bd17c82"; + version = "0.0.0+rev=c5fffb8"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "tree-sitter-meson"; - rev = "bd17c824196ce70800f64ad39cfddd1b17acc13f"; - hash = "sha256-+RqhCA+WoE2Lnk9vGiAYcdvl+ovxX5kaJhQ8m9H/fvo="; + rev = "c5fffb8edd39f22644084ab3f73a924a75721ee3"; + hash = "sha256-Q+5sCO+1CAbnaE7nq7vl/CxUpydxEHVtmPXIAUGJiOE="; }; meta.homepage = "https://github.com/Decodetalkers/tree-sitter-meson"; }; mlir = buildGrammar { language = "mlir"; - version = "0.0.0+rev=ccf732d"; + version = "0.0.0+rev=0238b7f"; src = fetchFromGitHub { owner = "artagnon"; repo = "tree-sitter-mlir"; - rev = "ccf732d3dbe6ca415a29b9be887c783111b297c7"; - hash = "sha256-liYapDXD8R2nLHaDvynKAYvIfJPrXITVsn8IA/snclU="; + rev = "0238b7fb6a630f77b3fc8b8a48285ef6ed45cbcc"; + hash = "sha256-rQDkvs/z+sunTlcquHLMN6wmsCP3RRT6vcnSqxNNo+0="; }; generate = true; meta.homepage = "https://github.com/artagnon/tree-sitter-mlir"; @@ -1786,12 +1786,12 @@ }; nix = buildGrammar { language = "nix"; - version = "0.0.0+rev=9ef77ce"; + version = "0.0.0+rev=456b14a"; src = fetchFromGitHub { owner = "cstrahan"; repo = "tree-sitter-nix"; - rev = "9ef77ceefff61d31a63133d8d697f219ab62c841"; - hash = "sha256-hBdruZbMKoPtcsoaMAVKsLJZree4WBiifRNCdzJLJUs="; + rev = "456b14a2fa6315abc7e02fcffaf4a1f35d4955d3"; + hash = "sha256-eY+e48XFHvTRlew4LvndGHQog3d/RKDLlIrGr7QOWBY="; }; meta.homepage = "https://github.com/cstrahan/tree-sitter-nix"; }; @@ -1932,58 +1932,58 @@ }; perl = buildGrammar { language = "perl"; - version = "0.0.0+rev=81c57e2"; + version = "0.0.0+rev=76ab9a5"; src = fetchFromGitHub { owner = "tree-sitter-perl"; repo = "tree-sitter-perl"; - rev = "81c57e274c541c30d6c204c8dbceb90ec647ed8d"; - hash = "sha256-xtsLJx9tzj3KNhlCDuXnAGBz3EYnJ/J+EJ0UKHVN4g4="; + rev = "76ab9a52b9dd2a1758aae3da8286519d995037e9"; + hash = "sha256-w45JH2sFLgnzk7ECfWTFvz2QIpkhFKxvZ/LiZT0HzzQ="; }; meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl"; }; php = buildGrammar { language = "php"; - version = "0.0.0+rev=07a0459"; + version = "0.0.0+rev=69af07e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "07a04599ed9ac97f82c6383a24ae139a807930f3"; - hash = "sha256-Nd3v1UtM/LqxJlcLpp6Y057NR7L9XJapfKdFC5b4SQw="; + rev = "69af07eedf60bc1992c59a8fd6b5e41f25442715"; + hash = "sha256-uS5MTotJypsawMR1z/KmZCNxfTuFIyimqbms5IEJ0cE="; }; location = "php"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; php_only = buildGrammar { language = "php_only"; - version = "0.0.0+rev=07a0459"; + version = "0.0.0+rev=69af07e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "07a04599ed9ac97f82c6383a24ae139a807930f3"; - hash = "sha256-Nd3v1UtM/LqxJlcLpp6Y057NR7L9XJapfKdFC5b4SQw="; + rev = "69af07eedf60bc1992c59a8fd6b5e41f25442715"; + hash = "sha256-uS5MTotJypsawMR1z/KmZCNxfTuFIyimqbms5IEJ0cE="; }; location = "php_only"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; phpdoc = buildGrammar { language = "phpdoc"; - version = "0.0.0+rev=df5e7da"; + version = "0.0.0+rev=fe3202e"; src = fetchFromGitHub { owner = "claytonrcarter"; repo = "tree-sitter-phpdoc"; - rev = "df5e7da4b83da072f99135079ac3436550b8d67d"; - hash = "sha256-LIqu5+DaybdxY57IPwVACtgrGTiCXIiIIqUK45ISzYw="; + rev = "fe3202e468bc17332bec8969f2b50ff1f1da3a46"; + hash = "sha256-sQ8jmVvZD0fIc9qlfyl6MaXvP/2ljzViKIl9RgVOJqw="; }; meta.homepage = "https://github.com/claytonrcarter/tree-sitter-phpdoc"; }; pioasm = buildGrammar { language = "pioasm"; - version = "0.0.0+rev=924aada"; + version = "0.0.0+rev=afece58"; src = fetchFromGitHub { owner = "leo60228"; repo = "tree-sitter-pioasm"; - rev = "924aadaf5dea2a6074d72027b064f939acf32e20"; - hash = "sha256-og5DjoyTtKUTp0V4/PpcGb8xwzLeidsb2lq0+QF7u9M="; + rev = "afece58efdb30440bddd151ef1347fa8d6f744a9"; + hash = "sha256-rUuolF/jPJGiqunD6SLUJ0x/MTIJ+mJ1QSBCasUw5T8="; }; meta.homepage = "https://github.com/leo60228/tree-sitter-pioasm"; }; @@ -2190,23 +2190,23 @@ }; python = buildGrammar { language = "python"; - version = "0.0.0+rev=8c65e25"; + version = "0.0.0+rev=7f4b9c2"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; - rev = "8c65e256f971812276ff2a69a2f515c218ed7f82"; - hash = "sha256-8mdBN1vP64PJKxN2y0GoaObLs6j/lcsU47sr+8/8oTQ="; + rev = "7f4b9c2d8039701b0579b7c060a918f8548aa7cd"; + hash = "sha256-pD4JedYrnz6d5pgzRPtKPY0XPRoot1FMI9XgTgONOyw="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-python"; }; ql = buildGrammar { language = "ql"; - version = "0.0.0+rev=c73c31c"; + version = "0.0.0+rev=1d3e2ff"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ql"; - rev = "c73c31c89cb0019ef56fe8bc1723e7c36e0be607"; - hash = "sha256-C/FGCN1JAThAAyMgSt8o0yf+qfYKF98jPTitfXrUytI="; + rev = "1d3e2ff34f1113fadc0ff174c8a01cd4227af7fd"; + hash = "sha256-nPOpe7p9dPEfJNmwYLsggwtY1RX/raWAMkcgbLJBIas="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ql"; }; @@ -2223,12 +2223,12 @@ }; qmljs = buildGrammar { language = "qmljs"; - version = "0.0.0+rev=cc4186f"; + version = "0.0.0+rev=6d4db24"; src = fetchFromGitHub { owner = "yuja"; repo = "tree-sitter-qmljs"; - rev = "cc4186f15e2829385be33440561fdd17b1c40cf7"; - hash = "sha256-g05fmFG/+DiW8VOCfH+8//ksFNYZ8V9RAn7hGJ7Jl6w="; + rev = "6d4db242185721e1f5ef21fde613ca90c743ec47"; + hash = "sha256-S6rBQRecJvPgyWq1iydFZgDyXbm9CZBw8kxzNI0cqdw="; }; meta.homepage = "https://github.com/yuja/tree-sitter-qmljs"; }; @@ -2322,12 +2322,12 @@ }; regex = buildGrammar { language = "regex"; - version = "0.0.0+rev=f70251e"; + version = "0.0.0+rev=123552e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-regex"; - rev = "f70251e1f1d72bd6dc1f897f956f9112f8668441"; - hash = "sha256-G0I71WXSBHttsLfD18W/9RIrNAJN79kMPOcYt/k7KSI="; + rev = "123552e5849fae9a7c536eac84d471579c7f3328"; + hash = "sha256-qcVZHrhlx66usrG5aapYdyv8Tx2wK4ZivjzsDNLpmsY="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-regex"; }; @@ -2432,23 +2432,23 @@ }; ruby = buildGrammar { language = "ruby"; - version = "0.0.0+rev=0b47296"; + version = "0.0.0+rev=83aec5f"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ruby"; - rev = "0b4729672f9aec4810c01a0f971541dcb433fef5"; - hash = "sha256-+FH/L028b/rpKypu0zdUoMYWiYMVkUIZXM3lmmN+nak="; + rev = "83aec5f7d1659aaa79e6f24b406a9cd49b87e8e8"; + hash = "sha256-LmZ2CmsAtxVcR/FuEZXunOHbGR9w8IL5DmLINFWqBAE="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ruby"; }; rust = buildGrammar { language = "rust"; - version = "0.0.0+rev=6b7d1fc"; + version = "0.0.0+rev=2ace7a9"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; - rev = "6b7d1fc73ded57f73b1619bcf4371618212208b1"; - hash = "sha256-cK3dswI0lgsuXp8CDOj/mjgnuWsCUvT3DX++kpWJoCI="; + rev = "2ace7a922a755960f44d73a7bb1efffeb4cc5501"; + hash = "sha256-b4Qt61u1dJ3LCxVY1ulQjsZVt45BX5ZVa9nPD046yBI="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust"; }; @@ -2499,24 +2499,24 @@ }; sflog = buildGrammar { language = "sflog"; - version = "0.0.0+rev=943a3eb"; + version = "0.0.0+rev=46d4a12"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "943a3eb7f55733929ccafe06841087c3004cb4e0"; - hash = "sha256-eTdNxvK3vcC7MiE5g0DgptuChYs7fv+WjEmxhwmUI4U="; + rev = "46d4a12e4e90b10a575b7b16ea3b6ead50322074"; + hash = "sha256-vPSdx//9PZXDV9wzkMobaSVl88+iVGi/E+t7EA2yyCY="; }; location = "sflog"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; }; slang = buildGrammar { language = "slang"; - version = "0.0.0+rev=dd991eb"; + version = "0.0.0+rev=3ed23c0"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-slang"; - rev = "dd991eb3b6957a33d9044e0f5914588f7f449a78"; - hash = "sha256-Kt396lw3O3X4I3sEadfhoRVi598UCknOmdCPIMpqgdA="; + rev = "3ed23c04a412a0559162d9cadf96dfff7cb36079"; + hash = "sha256-X/QoG1Gl9zDzA3++FznypgeBuWElMaN4BFFuBKPXohk="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-slang"; }; @@ -2577,24 +2577,24 @@ }; soql = buildGrammar { language = "soql"; - version = "0.0.0+rev=943a3eb"; + version = "0.0.0+rev=46d4a12"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "943a3eb7f55733929ccafe06841087c3004cb4e0"; - hash = "sha256-eTdNxvK3vcC7MiE5g0DgptuChYs7fv+WjEmxhwmUI4U="; + rev = "46d4a12e4e90b10a575b7b16ea3b6ead50322074"; + hash = "sha256-vPSdx//9PZXDV9wzkMobaSVl88+iVGi/E+t7EA2yyCY="; }; location = "soql"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; }; sosl = buildGrammar { language = "sosl"; - version = "0.0.0+rev=943a3eb"; + version = "0.0.0+rev=46d4a12"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "943a3eb7f55733929ccafe06841087c3004cb4e0"; - hash = "sha256-eTdNxvK3vcC7MiE5g0DgptuChYs7fv+WjEmxhwmUI4U="; + rev = "46d4a12e4e90b10a575b7b16ea3b6ead50322074"; + hash = "sha256-vPSdx//9PZXDV9wzkMobaSVl88+iVGi/E+t7EA2yyCY="; }; location = "sosl"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; @@ -2700,12 +2700,12 @@ }; superhtml = buildGrammar { language = "superhtml"; - version = "0.0.0+rev=b684bbe"; + version = "0.0.0+rev=36f37aa"; src = fetchFromGitHub { owner = "kristoff-it"; repo = "superhtml"; - rev = "b684bbe28ecd740a7110ead5674355770186ca9c"; - hash = "sha256-9Aw51LvTIBzptXuW3rEco/wTOdSADEhWJ/sI9OHr854="; + rev = "36f37aa5aa440805f27d4a9f5203e616a303c6a1"; + hash = "sha256-oegEpBCk7Fhx4SbXebBq33b7Ef9XshYfx2SciaKwINY="; }; location = "tree-sitter-superhtml"; meta.homepage = "https://github.com/kristoff-it/superhtml"; @@ -2734,12 +2734,12 @@ }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=1466855"; + version = "0.0.0+rev=a6ec57a"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "14668554259c5a82fc0c8ca825aa3bb895034c67"; - hash = "sha256-+coXjHJSa5jKOx3DE4zD4Crqp8NWn8jcsrK/eEgZQtk="; + rev = "a6ec57ad4d12c68d952ba1f869bd373a7ac95832"; + hash = "sha256-mdBrUgq8uux7p/DEm4jBNtB5a4UFDTrNRXX4hexKN7s="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -2801,12 +2801,12 @@ }; tact = buildGrammar { language = "tact"; - version = "0.0.0+rev=09c57b6"; + version = "0.0.0+rev=83e2649"; src = fetchFromGitHub { owner = "tact-lang"; repo = "tree-sitter-tact"; - rev = "09c57b6b9759560b4d067e0546c9953ee0e065da"; - hash = "sha256-WyCBuWPTYzNEApxtACTNt7StYoaSXIR9oqrOUlIquOY="; + rev = "83e264928fa194b7283428527259e88e54205264"; + hash = "sha256-gSLVUjn8MBRDQhZoEsPGao2lZI1gcxJsg6d8suA4D50="; }; meta.homepage = "https://github.com/tact-lang/tree-sitter-tact"; }; @@ -2823,24 +2823,24 @@ }; teal = buildGrammar { language = "teal"; - version = "0.0.0+rev=19b02da"; + version = "0.0.0+rev=485fbdc"; src = fetchFromGitHub { owner = "euclidianAce"; repo = "tree-sitter-teal"; - rev = "19b02da829d1721a521bf7b802eb80a50bd53aab"; - hash = "sha256-xIws9Q8AsaIowv6nc01ZpF87Dy8rL78EoZgXuBmg6Kg="; + rev = "485fbdc00d811b01b2090dff4d0469fd1d0350f5"; + hash = "sha256-Py825x38vkRgHqqEg/btFVQMgalSdonEgtFKSLPlZdw="; }; generate = true; meta.homepage = "https://github.com/euclidianAce/tree-sitter-teal"; }; templ = buildGrammar { language = "templ"; - version = "0.0.0+rev=e3e894e"; + version = "0.0.0+rev=4519e3e"; src = fetchFromGitHub { owner = "vrischmann"; repo = "tree-sitter-templ"; - rev = "e3e894ef9e490c3d36d94a51458ec55480991730"; - hash = "sha256-uuPK/bWAAaoVGvWk4so+AulpaI1KAsyZwe5FzmPqWrg="; + rev = "4519e3ec9ca92754ca25659bb1fd410d5e0f8d88"; + hash = "sha256-ic5SlqDEZoYakrJFe0H9GdzravqovlL5sTaHjyhe74M="; }; meta.homepage = "https://github.com/vrischmann/tree-sitter-templ"; }; @@ -2947,12 +2947,12 @@ }; tsx = buildGrammar { language = "tsx"; - version = "0.0.0+rev=9951831"; + version = "0.0.0+rev=73c4447"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "9951831c5f05be434514dce38b30eef213667601"; - hash = "sha256-CFEYTfEqJdAQMaKRB1wThDTiqPcq5u53WAQhgI2+PN0="; + rev = "73c4447796b251295b498227bad028d88dc1918b"; + hash = "sha256-tF1fdxM9xsAk2pF3ptzyLy8/76uZ5Vs+jACK4dlmbak="; }; location = "tsx"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -2981,12 +2981,12 @@ }; typescript = buildGrammar { language = "typescript"; - version = "0.0.0+rev=9951831"; + version = "0.0.0+rev=73c4447"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "9951831c5f05be434514dce38b30eef213667601"; - hash = "sha256-CFEYTfEqJdAQMaKRB1wThDTiqPcq5u53WAQhgI2+PN0="; + rev = "73c4447796b251295b498227bad028d88dc1918b"; + hash = "sha256-tF1fdxM9xsAk2pF3ptzyLy8/76uZ5Vs+jACK4dlmbak="; }; location = "typescript"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -3082,12 +3082,12 @@ }; v = buildGrammar { language = "v"; - version = "0.0.0+rev=bc5b3ca"; + version = "0.0.0+rev=ea53875"; src = fetchFromGitHub { owner = "vlang"; repo = "v-analyzer"; - rev = "bc5b3caa85f7a8d4597f51aeaf92b83162ed6b33"; - hash = "sha256-44WUptfNjp4hsHa3BQLdzjRIiCyppzNNOqoqU/rJGNA="; + rev = "ea538758a1273b59774dc9179cde460d9c73fd89"; + hash = "sha256-r2Mn7hvMjMYp+jvceGHNT0ss4UzoOjLeqN+DFj/mB0U="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/v-analyzer"; @@ -3116,23 +3116,23 @@ }; verilog = buildGrammar { language = "verilog"; - version = "0.0.0+rev=075ebfc"; + version = "0.0.0+rev=5a01c57"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-verilog"; - rev = "075ebfc84543675f12e79a955f79d717772dcef3"; - hash = "sha256-k0Q+MOcZWtXZ99+I+ZyFJ0PZQp2oat2O/7u2UjHzsUg="; + rev = "5a01c57fa8e3d8801953a67ae7c6b240e2284ee8"; + hash = "sha256-Q8RaoL/1vNd553VFOI8crRffV8iVmAnMVCC+O2zjEZU="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-verilog"; }; vhdl = buildGrammar { language = "vhdl"; - version = "0.0.0+rev=3f13cd1"; + version = "0.0.0+rev=d6e8301"; src = fetchFromGitHub { owner = "jpt13653903"; repo = "tree-sitter-vhdl"; - rev = "3f13cd14952b39ccf6817f58880834b84565ca54"; - hash = "sha256-bChHzBGWlfJpSUpUqQW8L1y4CiM1Qqen3MaGcUT9lh0="; + rev = "d6e8301999336b47d663052d43f983c3edeb01dd"; + hash = "sha256-vQIsWcmm5szh7L8iSDDHenSJDqJrXcTDn0A/0WJYWGc="; }; meta.homepage = "https://github.com/jpt13653903/tree-sitter-vhdl"; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix index 137d364e54..987e1755d3 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix @@ -90,4 +90,5 @@ in license = licenses.asl20; maintainers = with maintainers; [ figsoda ]; }; + nvimRequireCheck = "nvim-treesitter"; } 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 a65e920150..4a58f44942 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1,139 +1,140 @@ -{ lib -, stdenv -, # nixpkgs functions - buildGoModule -, buildVimPlugin -, fetchFromGitHub -, fetchFromSourcehut -, fetchpatch -, fetchurl -, neovimUtils -, substituteAll -, # Language dependencies - fetchYarnDeps -, mkYarnModules -, python3 -, rustPlatform -, # Misc dependencies - arrow-cpp -, Cocoa -, coc-clangd -, coc-diagnostic -, coc-pyright -, code-minimap -, dasht -, deno -, direnv -, duckdb -, fish -, fzf -, gawk -, git -, himalaya -, htop -, jq -, khard -, languagetool -, llvmPackages -, meson -, neovim-unwrapped -, nim1 -, nodePackages -, openscad -, pandoc -, parinfer-rust -, phpactor -, ranger -, ripgrep -, skim -, sqlite -, statix -, stylish-haskell -, tabnine -, taskwarrior2 -, taskwarrior3 -, tmux -, tup -, vim -, which -, xkb-switch -, ycmd -, zoxide -, nodejs -, xdotool -, xorg -, xxd -, zathura -, zenity -, zsh -, # codeium-nvim dependencies - codeium -, # codesnap-nvim dependencies - clang -, libuv -, # command-t dependencies - getconf -, ruby -, # cornelis dependencies - cornelis -, # cpsm dependencies - boost -, cmake -, icu -, ncurses -, # LanguageClient-neovim dependencies - CoreFoundation -, CoreServices -, # nvim-treesitter dependencies - callPackage -, # Preview-nvim dependencies - md-tui -, # sg.nvim dependencies - darwin -, # sved dependencies - glib -, gobject-introspection -, wrapGAppsHook3 -, writeText -, # sniprun dependencies - bashInteractive -, coreutils -, curl -, gnugrep -, gnused -, makeWrapper -, procps -, # sg-nvim dependencies - openssl -, pkg-config -, # vim-agda dependencies - agda -, # vim-go dependencies - asmfmt -, delve -, errcheck -, go-motion -, go-tools -, gocode-gomod -, godef -, gogetdoc -, golangci-lint -, golint -, gomodifytags -, gopls -, gotags -, gotools -, iferr -, impl -, reftools -, revive -, # hurl dependencies - hurl -, # must be lua51Packages - luajitPackages -, aider-chat -, -}: self: super: +{ + lib, + stdenv, + # nixpkgs functions + buildGoModule, + buildVimPlugin, + fetchFromGitHub, + fetchFromSourcehut, + fetchpatch, + fetchurl, + neovimUtils, + substituteAll, + # Language dependencies + fetchYarnDeps, + mkYarnModules, + python3, + rustPlatform, + # Misc dependencies + arrow-cpp, + Cocoa, + coc-clangd, + coc-diagnostic, + coc-pyright, + code-minimap, + dasht, + deno, + direnv, + duckdb, + fish, + fzf, + gawk, + git, + himalaya, + htop, + jq, + khard, + languagetool, + llvmPackages, + meson, + neovim-unwrapped, + nim1, + nodePackages, + openscad, + pandoc, + parinfer-rust, + phpactor, + ranger, + ripgrep, + skim, + sqlite, + statix, + stylish-haskell, + tabnine, + taskwarrior2, + taskwarrior3, + tmux, + tup, + vim, + which, + xkb-switch, + ycmd, + zoxide, + nodejs, + xdotool, + xorg, + xxd, + zathura, + zenity, + zsh, + # codeium-nvim dependencies + codeium, + # codesnap-nvim dependencies + clang, + libuv, + # command-t dependencies + getconf, + ruby, + # cornelis dependencies + cornelis, + # cpsm dependencies + boost, + cmake, + icu, + ncurses, + # LanguageClient-neovim dependencies + CoreFoundation, + CoreServices, + # nvim-treesitter dependencies + callPackage, + # Preview-nvim dependencies + md-tui, + # sg.nvim dependencies + darwin, + # sved dependencies + glib, + gobject-introspection, + wrapGAppsHook3, + writeText, + # sniprun dependencies + bashInteractive, + coreutils, + curl, + gnugrep, + gnused, + makeWrapper, + procps, + # sg-nvim dependencies + openssl, + pkg-config, + # vim-agda dependencies + agda, + # vim-go dependencies + asmfmt, + delve, + errcheck, + go-motion, + go-tools, + gocode-gomod, + godef, + gogetdoc, + golangci-lint, + golint, + gomodifytags, + gopls, + gotags, + gotools, + iferr, + impl, + reftools, + revive, + # hurl dependencies + hurl, + # must be lua51Packages + luajitPackages, + aider-chat, +}: +self: super: let luaPackages = neovim-unwrapped.lua.pkgs; in @@ -143,7 +144,13 @@ in }; advanced-git-search-nvim = super.advanced-git-search-nvim.overrideAttrs { - dependencies = with super; [ telescope-nvim vim-fugitive vim-rhubarb ]; + dependencies = with super; [ + telescope-nvim + vim-fugitive + vim-rhubarb + ]; + # TODO: enable after https://github.com/NixOS/nixpkgs/pull/342240 merged + # nvimRequireCheck = "advanced_git_search.utils"; }; animation-nvim = super.animation-nvim.overrideAttrs { @@ -153,6 +160,7 @@ in autosave-nvim = super.autosave-nvim.overrideAttrs { dependencies = with super; [ plenary-nvim ]; + nvimRequireCheck = "autosave"; }; avante-nvim = (callPackage ./avante-nvim { }).overrideAttrs { @@ -165,13 +173,17 @@ in }; barbecue-nvim = super.barbecue-nvim.overrideAttrs { - dependencies = with self; [ nvim-lspconfig nvim-navic ]; + dependencies = with self; [ + nvim-lspconfig + nvim-navic + ]; meta = { description = "VS Code like winbar for Neovim"; homepage = "https://github.com/utilyre/barbecue.nvim"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ lightquantum ]; }; + nvimRequireCheck = "barbecue"; }; # The GitHub repository returns 404, which breaks the update script @@ -201,8 +213,11 @@ in }; chadtree = super.chadtree.overrideAttrs { - passthru.python3Dependencies = ps: - with ps; [ + buildInputs = [ + python3 + ]; + passthru.python3Dependencies = + ps: with ps; [ pynvim-pp pyyaml std2 @@ -210,10 +225,17 @@ in # We need some patches so it stops complaining about not being in a venv patches = [ ./patches/chadtree/emulate-venv.patch ]; + nvimRequireCheck = "chadtree"; }; ChatGPT-nvim = super.ChatGPT-nvim.overrideAttrs { - dependencies = with self; [ nui-nvim plenary-nvim telescope-nvim ]; + dependencies = with self; [ + nui-nvim + plenary-nvim + telescope-nvim + ]; + # TODO: enable after https://github.com/NixOS/nixpkgs/pull/342240 merged + # nvimRequireCheck = "chatgpt"; }; clang_complete = super.clang_complete.overrideAttrs { @@ -227,7 +249,8 @@ in substituteInPlace "$out"/plugin/clang_complete.vim \ --replace "let g:clang_library_path = '' + "''" - + '' " "let g:clang_library_path='${llvmPackages.libclang.lib}/lib/libclang.so'" + + '' + " "let g:clang_library_path='${llvmPackages.libclang.lib}/lib/libclang.so'" substituteInPlace "$out"/plugin/libclang.py \ --replace "/usr/lib/clang" "${llvmPackages.clang.cc}/lib/clang" @@ -245,119 +268,197 @@ in postPatch = '' sed -i -e 's/require "health"/vim.health/' lua/clipboard-image/health.lua ''; + nvimRequireCheck = "clipboard-image"; }; cmake-tools-nvim = super.cmake-tools-nvim.overrideAttrs { dependencies = with self; [ plenary-nvim ]; + nvimRequireCheck = "cmake-tools"; }; cmp-ai = super.cmp-ai.overrideAttrs { - dependencies = with self; [ nvim-cmp plenary-nvim ]; + dependencies = with self; [ + nvim-cmp + plenary-nvim + ]; + nvimRequireCheck = "cmp_ai"; }; cmp-clippy = super.cmp-clippy.overrideAttrs { - dependencies = with self; [ nvim-cmp plenary-nvim ]; + dependencies = with self; [ + nvim-cmp + plenary-nvim + ]; + nvimRequireCheck = "cmp_clippy"; }; cmp-copilot = super.cmp-copilot.overrideAttrs { - dependencies = with self; [ nvim-cmp copilot-vim ]; + dependencies = with self; [ + nvim-cmp + copilot-vim + ]; + nvimRequireCheck = "cmp_copilot"; }; cmp-ctags = super.cmp-ctags.overrideAttrs { dependencies = with self; [ nvim-cmp ]; + nvimRequireCheck = "cmp_ctags"; }; cmp-dap = super.cmp-dap.overrideAttrs { - dependencies = with self; [ nvim-cmp nvim-dap ]; + dependencies = with self; [ + nvim-cmp + nvim-dap + ]; + nvimRequireCheck = "cmp_dap"; }; cmp-dictionary = super.cmp-dictionary.overrideAttrs { dependencies = with self; [ nvim-cmp ]; + nvimRequireCheck = "cmp_dictionary"; }; cmp-digraphs = super.cmp-digraphs.overrideAttrs { dependencies = with self; [ nvim-cmp ]; + nvimRequireCheck = "cmp_digraphs"; }; cmp-fish = super.cmp-fish.overrideAttrs { dependencies = with self; [ nvim-cmp ]; + nvimRequireCheck = "cmp_fish"; }; cmp-fuzzy-buffer = super.cmp-fuzzy-buffer.overrideAttrs { - dependencies = with self; [ nvim-cmp fuzzy-nvim ]; + dependencies = with self; [ + nvim-cmp + fuzzy-nvim + ]; + nvimRequireCheck = "cmp_fuzzy_buffer"; }; cmp-fuzzy-path = super.cmp-fuzzy-path.overrideAttrs { - dependencies = with self; [ nvim-cmp fuzzy-nvim ]; + dependencies = with self; [ + nvim-cmp + fuzzy-nvim + ]; + nvimRequireCheck = "cmp_fuzzy_path"; }; cmp-git = super.cmp-git.overrideAttrs { - dependencies = with self; [ nvim-cmp plenary-nvim ]; + dependencies = with self; [ + nvim-cmp + plenary-nvim + ]; + nvimRequireCheck = "cmp_git"; }; cmp-greek = super.cmp-greek.overrideAttrs { dependencies = with self; [ nvim-cmp ]; + nvimRequireCheck = "cmp_greek"; }; cmp-look = super.cmp-look.overrideAttrs { dependencies = with self; [ nvim-cmp ]; + nvimRequireCheck = "cmp_look"; }; cmp-neosnippet = super.cmp-neosnippet.overrideAttrs { - dependencies = with self; [ nvim-cmp neosnippet-vim ]; + dependencies = with self; [ + nvim-cmp + neosnippet-vim + ]; + nvimRequireCheck = "cmp_neosnippet"; + }; + + cmp-nixpkgs-maintainers = super.cmp-nixpkgs-maintainers.overrideAttrs { + dependencies = with self; [ nvim-cmp ]; + nvimRequireCheck = "cmp_nixpkgs_maintainers"; }; cmp-npm = super.cmp-npm.overrideAttrs { - dependencies = with self; [ nvim-cmp plenary-nvim ]; + dependencies = with self; [ + nvim-cmp + plenary-nvim + ]; + nvimRequireCheck = "cmp-npm"; }; cmp-nvim-lsp-signature-help = super.cmp-nvim-lsp-signature-help.overrideAttrs { dependencies = with self; [ nvim-cmp ]; + nvimRequireCheck = "cmp_nvim_lsp_signature_help"; }; cmp-nvim-tags = super.cmp-nvim-tags.overrideAttrs { dependencies = with self; [ nvim-cmp ]; + nvimRequireCheck = "cmp_nvim_tags"; }; cmp-pandoc-nvim = super.cmp-pandoc-nvim.overrideAttrs { - dependencies = with self; [ nvim-cmp plenary-nvim ]; + dependencies = with self; [ + nvim-cmp + plenary-nvim + ]; + nvimRequireCheck = "cmp_pandoc"; }; cmp-rg = super.cmp-rg.overrideAttrs { dependencies = with self; [ nvim-cmp ]; + nvimRequireCheck = "cmp-rg"; }; cmp-snippy = super.cmp-snippy.overrideAttrs { - dependencies = with self; [ nvim-cmp nvim-snippy ]; + dependencies = with self; [ + nvim-cmp + nvim-snippy + ]; + nvimRequireCheck = "cmp_snippy"; }; cmp-tabby = super.cmp-tabby.overrideAttrs { dependencies = with self; [ nvim-cmp ]; + nvimRequireCheck = "cmp_tabby"; }; cmp-tabnine = super.cmp-tabnine.overrideAttrs { buildInputs = [ tabnine ]; + dependencies = with self; [ nvim-cmp ]; postFixup = '' mkdir -p $target/binaries/${tabnine.version} ln -s ${tabnine}/bin/ $target/binaries/${tabnine.version}/${tabnine.passthru.platform} ''; + nvimRequireCheck = "cmp_tabnine"; }; cmp-tmux = super.cmp-tmux.overrideAttrs { - dependencies = with self; [ nvim-cmp tmux ]; + dependencies = with self; [ + nvim-cmp + tmux + ]; + nvimRequireCheck = "cmp_tmux"; }; cmp-vim-lsp = super.cmp-vim-lsp.overrideAttrs { - dependencies = with self; [ nvim-cmp vim-lsp ]; + dependencies = with self; [ + nvim-cmp + vim-lsp + ]; }; cmp-vimwiki-tags = super.cmp-vimwiki-tags.overrideAttrs { - dependencies = with self; [ nvim-cmp vimwiki ]; + dependencies = with self; [ + nvim-cmp + vimwiki + ]; + nvimRequireCheck = "cmp_vimwiki_tags"; }; cmp-zsh = super.cmp-zsh.overrideAttrs { - dependencies = with self; [ nvim-cmp zsh ]; + dependencies = with self; [ + nvim-cmp + zsh + ]; + nvimRequireCheck = "cmp_zsh"; }; coc-clangd = buildVimPlugin { @@ -382,79 +483,89 @@ in src = "${nodePackages."@yaegassy/coc-nginx"}/lib/node_modules/@yaegassy/coc-nginx"; }; - codeium-nvim = let - # Update according to https://github.com/Exafunction/codeium.nvim/blob/main/lua/codeium/versions.json - codeiumVersion = "1.20.9"; - codeiumHashes = { - x86_64-linux = "sha256-IeNK7UQtOhqC/eQv7MAya4jB1WIGykSR7IgutZatmHM="; - aarch64-linux = "sha256-ujTFki/3V79El2WCkG0PJhbaMT0knC9mrS9E7Uv9HD4="; - x86_64-darwin = "sha256-r2KloEQsUku9sk8h76kwyQuMTHcq/vwfTSK2dkiXDzE="; - aarch64-darwin = "sha256-1jNH0Up8mAahDgvPF6g42LV+RVDVsPqDM54lE2KYY48="; - }; - - codeium' = codeium.overrideAttrs rec { - version = codeiumVersion; - - src = let - inherit (stdenv.hostPlatform) system; - throwSystem = throw "Unsupported system: ${system}"; - - platform = { - x86_64-linux = "linux_x64"; - aarch64-linux = "linux_arm"; - x86_64-darwin = "macos_x64"; - aarch64-darwin = "macos_arm"; - }.${system} or throwSystem; - - hash = codeiumHashes.${system} or throwSystem; - in fetchurl { - name = "codeium-${version}.gz"; - url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${version}/language_server_${platform}.gz"; - inherit hash; + codeium-nvim = + let + # Update according to https://github.com/Exafunction/codeium.nvim/blob/main/lua/codeium/versions.json + codeiumVersion = "1.20.9"; + codeiumHashes = { + x86_64-linux = "sha256-IeNK7UQtOhqC/eQv7MAya4jB1WIGykSR7IgutZatmHM="; + aarch64-linux = "sha256-ujTFki/3V79El2WCkG0PJhbaMT0knC9mrS9E7Uv9HD4="; + x86_64-darwin = "sha256-r2KloEQsUku9sk8h76kwyQuMTHcq/vwfTSK2dkiXDzE="; + aarch64-darwin = "sha256-1jNH0Up8mAahDgvPF6g42LV+RVDVsPqDM54lE2KYY48="; }; - }; - in super.codeium-nvim.overrideAttrs { - dependencies = with self; [ nvim-cmp plenary-nvim ]; - buildPhase = '' - cat << EOF > lua/codeium/installation_defaults.lua - return { - tools = { - language_server = "${codeium'}/bin/codeium_language_server" + codeium' = codeium.overrideAttrs rec { + version = codeiumVersion; + + src = + let + inherit (stdenv.hostPlatform) system; + throwSystem = throw "Unsupported system: ${system}"; + + platform = + { + x86_64-linux = "linux_x64"; + aarch64-linux = "linux_arm"; + x86_64-darwin = "macos_x64"; + aarch64-darwin = "macos_arm"; + } + .${system} or throwSystem; + + hash = codeiumHashes.${system} or throwSystem; + in + fetchurl { + name = "codeium-${version}.gz"; + url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${version}/language_server_${platform}.gz"; + inherit hash; + }; + }; + + in + super.codeium-nvim.overrideAttrs { + dependencies = with self; [ + nvim-cmp + plenary-nvim + ]; + buildPhase = '' + cat << EOF > lua/codeium/installation_defaults.lua + return { + tools = { + language_server = "${codeium'}/bin/codeium_language_server" + }; }; - }; - EOF - ''; + EOF + ''; - doCheck = true; - checkInputs = [ jq ]; - checkPhase = '' - runHook preCheck + doCheck = true; + checkInputs = [ jq ]; + checkPhase = '' + runHook preCheck - expected_codeium_version=$(jq -r '.version' lua/codeium/versions.json) - actual_codeium_version=$(${codeium'}/bin/codeium_language_server --version) + expected_codeium_version=$(jq -r '.version' lua/codeium/versions.json) + actual_codeium_version=$(${codeium'}/bin/codeium_language_server --version) - expected_codeium_stamp=$(jq -r '.stamp' lua/codeium/versions.json) - actual_codeium_stamp=$(${codeium'}/bin/codeium_language_server --stamp | grep STABLE_BUILD_SCM_REVISION | cut -d' ' -f2) + expected_codeium_stamp=$(jq -r '.stamp' lua/codeium/versions.json) + actual_codeium_stamp=$(${codeium'}/bin/codeium_language_server --stamp | grep STABLE_BUILD_SCM_REVISION | cut -d' ' -f2) - if [ "$actual_codeium_stamp" != "$expected_codeium_stamp" ]; then - echo " - The version of codeium patched in vimPlugins.codeium-nvim is incorrect. - Expected stamp: $expected_codeium_stamp - Actual stamp: $actual_codeium_stamp + if [ "$actual_codeium_stamp" != "$expected_codeium_stamp" ]; then + echo " + The version of codeium patched in vimPlugins.codeium-nvim is incorrect. + Expected stamp: $expected_codeium_stamp + Actual stamp: $actual_codeium_stamp - Expected codeium version: $expected_codeium_version - Actual codeium version: $actual_codeium_version + Expected codeium version: $expected_codeium_version + Actual codeium version: $actual_codeium_version - Please, update 'codeiumVersion' in pkgs/applications/editors/vim/plugins/overrides.nix accordingly to: - https://github.com/Exafunction/codeium.nvim/blob/main/lua/codeium/versions.json - " - exit 1 - fi + Please, update 'codeiumVersion' in pkgs/applications/editors/vim/plugins/overrides.nix accordingly to: + https://github.com/Exafunction/codeium.nvim/blob/main/lua/codeium/versions.json + " + exit 1 + fi - runHook postCheck - ''; - }; + runHook postCheck + ''; + nvimRequireCheck = "codeium"; + }; codesnap-nvim = let @@ -478,11 +589,13 @@ in rustPlatform.bindgenHook ]; - buildInputs = [ - libuv.dev - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ]; + buildInputs = + [ + libuv.dev + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.AppKit + ]; }; in buildVimPlugin { @@ -493,12 +606,14 @@ in # - Copy the resulting binary from the codesnap-lib derivation # Note: the destination should be generator.so, even on darwin # https://github.com/mistricky/codesnap.nvim/blob/main/scripts/build_generator.sh - postInstall = let - extension = if stdenv.hostPlatform.isDarwin then "dylib" else "so"; - in '' - rm -r $out/lua/*.so - cp ${codesnap-lib}/lib/libgenerator.${extension} $out/lua/generator.so - ''; + postInstall = + let + extension = if stdenv.hostPlatform.isDarwin then "dylib" else "so"; + in + '' + rm -r $out/lua/*.so + cp ${codesnap-lib}/lib/libgenerator.${extension} $out/lua/generator.so + ''; doInstallCheck = true; nvimRequireCheck = "codesnap"; @@ -510,7 +625,10 @@ in }; command-t = super.command-t.overrideAttrs { - nativeBuildInputs = [ getconf ruby ]; + nativeBuildInputs = [ + getconf + ruby + ]; buildPhase = '' substituteInPlace lua/wincent/commandt/lib/Makefile \ --replace '/bin/bash' 'bash' \ @@ -518,6 +636,7 @@ in make build rm ruby/command-t/ext/command-t/*.o ''; + nvimRequireCheck = "wincent.commandt"; }; competitest-nvim = super.competitest-nvim.overrideAttrs { @@ -538,6 +657,7 @@ in compiler-explorer-nvim = super.compiler-explorer-nvim.overrideAttrs { dependencies = with self; [ plenary-nvim ]; + nvimRequireCheck = "compiler-explorer"; }; compiler-nvim = super.compiler-nvim.overrideAttrs { @@ -547,6 +667,7 @@ in completion-buffers = super.completion-buffers.overrideAttrs { dependencies = with self; [ completion-nvim ]; + nvimRequireCheck = "completion_buffers"; }; completion-tabnine = super.completion-tabnine.overrideAttrs { @@ -559,15 +680,25 @@ in }; completion-treesitter = super.completion-treesitter.overrideAttrs { - dependencies = with self; [ completion-nvim nvim-treesitter ]; + dependencies = with self; [ + completion-nvim + nvim-treesitter + ]; }; CopilotChat-nvim = super.CopilotChat-nvim.overrideAttrs { - dependencies = with self; [ copilot-lua plenary-nvim ]; + dependencies = with self; [ + copilot-lua + plenary-nvim + ]; + nvimRequireCheck = "CopilotChat"; }; copilot-lualine = super.copilot-lualine.overrideAttrs { - dependencies = with self; [ copilot-lua lualine-nvim ]; + dependencies = with self; [ + copilot-lua + lualine-nvim + ]; doInstallCheck = true; nvimRequireCheck = "copilot-lualine"; }; @@ -585,8 +716,8 @@ in }); coq_nvim = super.coq_nvim.overrideAttrs { - passthru.python3Dependencies = ps: - with ps; [ + passthru.python3Dependencies = + ps: with ps; [ pynvim-pp pyyaml std2 @@ -594,6 +725,7 @@ in # We need some patches so it stops complaining about not being in a venv patches = [ ./patches/coq_nvim/emulate-venv.patch ]; + nvimRequireCheck = "coq"; }; cord-nvim = @@ -612,11 +744,13 @@ in cargoHash = "sha256-M5mTdBACTaUVZhPpMOf1KQ3BcQpEoD2isAKRn+iAWjc="; - installPhase = let - cargoTarget = stdenv.hostPlatform.rust.cargoShortTarget; - in '' - install -D target/${cargoTarget}/release/libcord.${extension} $out/lib/cord.${extension} - ''; + installPhase = + let + cargoTarget = stdenv.hostPlatform.rust.cargoShortTarget; + in + '' + install -D target/${cargoTarget}/release/libcord.${extension} $out/lib/cord.${extension} + ''; }; in buildVimPlugin { @@ -671,6 +805,7 @@ in crates-nvim = super.crates-nvim.overrideAttrs { dependencies = with self; [ plenary-nvim ]; + nvimRequireCheck = "crates"; }; ctrlp-cmatcher = super.ctrlp-cmatcher.overrideAttrs { @@ -688,7 +823,10 @@ in sha256 = "sha256-yXKCq8sqO0Db/sZREuSeqKwKO71cmTsAvWftoOQehZo="; }) ]; - buildInputs = with python3.pkgs; [ python3 setuptools ]; + buildInputs = with python3.pkgs; [ + python3 + setuptools + ]; buildPhase = '' patchShebangs . ./install.sh @@ -701,6 +839,7 @@ in ddc-source-lsp = super.ddc-source-lsp.overrideAttrs { dependencies = with self; [ ddc-vim ]; + nvimRequireCheck = "ddc_source_lsp"; }; ddc-vim = super.ddc-vim.overrideAttrs { @@ -716,7 +855,10 @@ in }; ddc-ui-pum = super.ddc-ui-pum.overrideAttrs { - dependencies = with self; [ ddc-vim pum-vim ]; + dependencies = with self; [ + ddc-vim + pum-vim + ]; }; defx-nvim = super.defx-nvim.overrideAttrs { @@ -731,7 +873,10 @@ in }; deoplete-fish = super.deoplete-fish.overrideAttrs { - dependencies = with self; [ deoplete-nvim vim-fish ]; + dependencies = with self; [ + deoplete-nvim + vim-fish + ]; }; deoplete-go = super.deoplete-go.overrideAttrs { @@ -757,6 +902,7 @@ in diagram-nvim = super.diagram-nvim.overrideAttrs { dependencies = with self; [ image-nvim ]; + nvimRequireCheck = "diagram"; }; diffview-nvim = super.diffview-nvim.overrideAttrs { @@ -768,8 +914,7 @@ in direnv-vim = super.direnv-vim.overrideAttrs (old: { preFixup = - old.preFixup - or "" + old.preFixup or "" + '' substituteInPlace $out/autoload/direnv.vim \ --replace "let s:direnv_cmd = get(g:, 'direnv_cmd', 'direnv')" \ @@ -778,13 +923,16 @@ in }); elixir-tools-nvim = super.elixir-tools-nvim.overrideAttrs { + dependencies = with self; [ plenary-nvim ]; fixupPhase = '' patchShebangs $(find $out/bin/ -type f -not -name credo-language-server) ''; + nvimRequireCheck = "elixir"; }; executor-nvim = super.executor-nvim.overrideAttrs { dependencies = with self; [ nui-nvim ]; + nvimRequireCheck = "executor"; }; fcitx-vim = super.fcitx-vim.overrideAttrs { @@ -797,6 +945,7 @@ in flit-nvim = super.flit-nvim.overrideAttrs { dependencies = with self; [ leap-nvim ]; + nvimRequireCheck = "flit"; }; forms = super.forms.overrideAttrs { @@ -840,6 +989,7 @@ in fuzzy-nvim = super.fuzzy-nvim.overrideAttrs { dependencies = with self; [ telescope-fzf-native-nvim ]; + nvimRequireCheck = "fuzzy_nvim"; }; fzf-checkout-vim = super.fzf-checkout-vim.overrideAttrs { @@ -867,6 +1017,8 @@ in fzf-lua = super.fzf-lua.overrideAttrs { propagatedBuildInputs = [ fzf ]; + # FIXME: address already in use + # nvimRequireCheck = "fzf-lua"; }; fzf-vim = super.fzf-vim.overrideAttrs { @@ -890,22 +1042,29 @@ in gitlinker-nvim = super.gitlinker-nvim.overrideAttrs { dependencies = with self; [ plenary-nvim ]; + nvimRequireCheck = "gitlinker"; }; gitsigns-nvim = super.gitsigns-nvim.overrideAttrs { dependencies = with self; [ plenary-nvim ]; + nvimRequireCheck = "gitsigns"; }; git-worktree-nvim = super.git-worktree-nvim.overrideAttrs { dependencies = with super; [ plenary-nvim ]; + nvimRequireCheck = "git-worktree"; }; guard-nvim = super.guard-nvim.overrideAttrs { dependencies = with self; [ guard-collection ]; + nvimRequireCheck = "guard"; }; hardhat-nvim = super.hardhat-nvim.overrideAttrs { - dependencies = with self; [ overseer-nvim plenary-nvim ]; + dependencies = with self; [ + overseer-nvim + plenary-nvim + ]; doInstallCheck = true; nvimRequireCheck = "hardhat"; @@ -913,26 +1072,34 @@ in harpoon = super.harpoon.overrideAttrs { dependencies = with self; [ plenary-nvim ]; + nvimRequireCheck = "harpoon"; }; harpoon2 = super.harpoon2.overrideAttrs { dependencies = with self; [ plenary-nvim ]; + nvimRequireCheck = "harpoon"; }; haskell-snippets-nvim = super.haskell-snippets-nvim.overrideAttrs { dependencies = [ self.luasnip ]; + nvimRequireCheck = "haskell-snippets"; }; haskell-scope-highlighting-nvim = super.haskell-scope-highlighting-nvim.overrideAttrs { dependencies = with self; [ nvim-treesitter ]; + nvimRequireCheck = "haskell-scope-highlighting"; }; - haskell-tools-nvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.haskell-tools-nvim; }; + haskell-tools-nvim = neovimUtils.buildNeovimPlugin { + luaAttr = luaPackages.haskell-tools-nvim; + nvimRequireCheck = "haskell-tools"; + }; hex-nvim = super.hex-nvim.overrideAttrs { postPatch = '' substituteInPlace lua/hex.lua --replace xxd ${xxd}/bin/xxd ''; + nvimRequireCheck = "hex"; }; himalaya-vim = super.himalaya-vim.overrideAttrs { @@ -955,7 +1122,10 @@ in }; idris2-nvim = super.idris2-nvim.overrideAttrs { - dependencies = with self; [ nui-nvim nvim-lspconfig ]; + dependencies = with self; [ + nui-nvim + nvim-lspconfig + ]; doInstallCheck = true; nvimRequireCheck = "idris2"; @@ -994,6 +1164,7 @@ in jupytext-nvim = super.jupytext-nvim.overrideAttrs { passthru.python3Dependencies = ps: [ ps.jupytext ]; + nvimRequireCheck = "jupytext"; }; kulala-nvim = super.kulala-nvim.overrideAttrs { @@ -1006,6 +1177,7 @@ in substituteInPlace lua/kulala/config/init.lua \ --replace 'curl_path = "curl"' 'curl_path = "${lib.getExe curl}"' ''; + nvimRequireCheck = "kulala"; }; LanguageClient-neovim = @@ -1047,18 +1219,28 @@ in lazy-lsp-nvim = super.lazy-lsp-nvim.overrideAttrs { dependencies = with self; [ nvim-lspconfig ]; + nvimRequireCheck = "lazy-lsp"; }; lazy-nvim = super.lazy-nvim.overrideAttrs { patches = [ ./patches/lazy-nvim/no-helptags.patch ]; + nvimRequireCheck = "lazy"; }; lean-nvim = super.lean-nvim.overrideAttrs { - dependencies = with self; [ nvim-lspconfig plenary-nvim ]; + dependencies = with self; [ + nvim-lspconfig + plenary-nvim + ]; + nvimRequireCheck = "lean"; }; leap-ast-nvim = super.leap-ast-nvim.overrideAttrs { - dependencies = with self; [ leap-nvim nvim-treesitter ]; + dependencies = with self; [ + leap-nvim + nvim-treesitter + ]; + nvimRequireCheck = "leap-ast"; }; lens-vim = super.lens-vim.overrideAttrs { @@ -1079,6 +1261,7 @@ in lir-nvim = super.lir-nvim.overrideAttrs { dependencies = with self; [ plenary-nvim ]; + nvimRequireCheck = "lir"; }; lsp-progress-nvim = neovimUtils.buildNeovimPlugin { @@ -1087,14 +1270,24 @@ in }; luasnip = super.luasnip.overrideAttrs { - dependencies = with self; [ luaPackages.jsregexp ]; + dependencies = [ luaPackages.jsregexp ]; + nvimRequireCheck = "luasnip"; }; - lz-n = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.lz-n; }; + lz-n = neovimUtils.buildNeovimPlugin { + luaAttr = luaPackages.lz-n; + nvimRequireCheck = "lz.n"; + }; - lze = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.lze; }; + lze = neovimUtils.buildNeovimPlugin { + luaAttr = luaPackages.lze; + nvimRequireCheck = "lze"; + }; - lzn-auto-require = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.lzn-auto-require; }; + lzn-auto-require = neovimUtils.buildNeovimPlugin { + luaAttr = luaPackages.lzn-auto-require; + nvimRequireCheck = "lzn-auto-require.loader"; + }; magma-nvim-goose = buildVimPlugin { pname = "magma-nvim-goose"; @@ -1105,8 +1298,8 @@ in rev = "5d916c39c1852e09fcd39eab174b8e5bbdb25f8f"; sha256 = "10d6dh0czdpgfpzqs5vzxfffkm0460qjzi2mfkacgghqf3iwkbja"; }; - passthru.python3Dependencies = ps: - with ps; [ + passthru.python3Dependencies = + ps: with ps; [ pynvim jupyter-client ueberzug @@ -1152,11 +1345,16 @@ in }; mason-lspconfig-nvim = super.mason-lspconfig-nvim.overrideAttrs { - dependencies = with self; [ mason-nvim nvim-lspconfig ]; + dependencies = with self; [ + mason-nvim + nvim-lspconfig + ]; + nvimRequireCheck = "mason-lspconfig"; }; mason-tool-installer-nvim = super.mason-tool-installer-nvim.overrideAttrs { dependencies = with self; [ mason-nvim ]; + nvimRequireCheck = "mason-tool-installer"; }; meson = buildVimPlugin { @@ -1194,44 +1392,59 @@ in meta.homepage = "https://github.com/jose-elias-alvarez/minsnip.nvim/"; }; - moveline-nvim = let - version = "2024-07-25"; - src = fetchFromGitHub { - owner = "willothy"; - repo = "moveline.nvim"; - rev = "9f67f4b9e752a87eea8205f0279f261a16c733d8"; - sha256 = "sha256-B4t5+Q4Urx5bGm8glNpYkHhpp/rAhz+lDd2EpWFUYoY="; - }; - moveline-lib = rustPlatform.buildRustPackage { + moveline-nvim = + let + version = "2024-07-25"; + src = fetchFromGitHub { + owner = "willothy"; + repo = "moveline.nvim"; + rev = "9f67f4b9e752a87eea8205f0279f261a16c733d8"; + sha256 = "sha256-B4t5+Q4Urx5bGm8glNpYkHhpp/rAhz+lDd2EpWFUYoY="; + }; + moveline-lib = rustPlatform.buildRustPackage { + inherit src version; + pname = "moveline-lib"; + cargoHash = "sha256-e9QB4Rfm+tFNrLAHN/nYUQ5PiTET8knQQIQkMH3UFkU="; + }; + in + buildVimPlugin { inherit src version; - pname = "moveline-lib"; - cargoHash = "sha256-e9QB4Rfm+tFNrLAHN/nYUQ5PiTET8knQQIQkMH3UFkU="; + pname = "moveline-nvim"; + preInstall = '' + mkdir -p lua + ln -s ${moveline-lib}/lib/libmoveline.so lua/moveline.so + ''; + meta = { + description = "Neovim plugin for moving lines up and down"; + homepage = "https://github.com/willothy/moveline.nvim"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ redxtech ]; + badPlatforms = [ + "aarch64-darwin" + "x86_64-darwin" + ]; + }; + nvimRequireCheck = "moveline"; }; - in buildVimPlugin { - inherit src version; - pname = "moveline-nvim"; - preInstall = '' - mkdir -p lua - ln -s ${moveline-lib}/lib/libmoveline.so lua/moveline.so - ''; - meta = { - description = "Neovim plugin for moving lines up and down"; - homepage = "https://github.com/willothy/moveline.nvim"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ redxtech ]; - }; - }; multicursors-nvim = super.multicursors-nvim.overrideAttrs { - dependencies = with self; [ nvim-treesitter hydra-nvim ]; + dependencies = with self; [ + nvim-treesitter + hydra-nvim + ]; + nvimRequireCheck = "multicursors"; }; ncm2 = super.ncm2.overrideAttrs { dependencies = with self; [ nvim-yarp ]; + nvimRequireCheck = "ncm2"; }; ncm2-jedi = super.ncm2-jedi.overrideAttrs { - dependencies = with self; [ nvim-yarp ncm2 ]; + dependencies = with self; [ + nvim-yarp + ncm2 + ]; passthru.python3Dependencies = ps: with ps; [ jedi ]; }; @@ -1253,6 +1466,7 @@ in neogit = super.neogit.overrideAttrs { dependencies = with self; [ plenary-nvim ]; + nvimRequireCheck = "neogit"; }; neorg = neovimUtils.buildNeovimPlugin { @@ -1263,55 +1477,76 @@ in }; neotest = super.neotest.overrideAttrs { - dependencies = with self; [ nvim-nio plenary-nvim ]; + dependencies = with self; [ + nvim-nio + plenary-nvim + ]; + nvimRequirecheck = "neotest"; }; neotest-gradle = super.neotest-gradle.overrideAttrs { dependencies = with self; [ plenary-nvim ]; + nvimRequirecheck = "neotest-gradle"; }; neotest-gtest = super.neotest-gtest.overrideAttrs { dependencies = [ self.plenary-nvim ]; + nvimRequirecheck = "neotest-gtest"; }; neotest-playwright = super.neotest-playwright.overrideAttrs { dependencies = [ self.telescope-nvim ]; + nvimRequirecheck = "neotest-playwright"; }; neotest-golang = super.neotest-golang.overrideAttrs { dependencies = [ self.nvim-dap-go ]; + nvimRequirecheck = "neotest-golang"; }; neo-tree-nvim = super.neo-tree-nvim.overrideAttrs { - dependencies = with self; [ plenary-nvim nui-nvim ]; + dependencies = with self; [ + plenary-nvim + nui-nvim + ]; + nvimRequirecheck = "neo-tree"; }; noice-nvim = super.noice-nvim.overrideAttrs { dependencies = with self; [ nui-nvim ]; + nvimRequirecheck = "noice"; }; none-ls-nvim = super.none-ls-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; + nvimRequireCheck = "null-ls"; }; null-ls-nvim = super.null-ls-nvim.overrideAttrs { dependencies = with self; [ plenary-nvim ]; + nvimRequireCheck = "null-ls"; }; nvim-coverage = super.nvim-coverage.overrideAttrs { dependencies = with self; [ plenary-nvim ]; + nvimRequireCheck = "coverage"; }; nvim-dap-python = super.nvim-dap-python.overrideAttrs { dependencies = with self; [ nvim-dap ]; + nvimRequireCheck = "dap-python"; }; nvim-dap-rego = super.nvim-dap-rego.overrideAttrs { dependencies = with self; [ nvim-dap ]; + nvimRequireCheck = "dap-rego"; }; nvim-dap-ui = super.nvim-dap-ui.overrideAttrs { - dependencies = with self; [ nvim-dap nvim-nio ]; + dependencies = with self; [ + nvim-dap + nvim-nio + ]; doInstallCheck = true; nvimRequireCheck = "dapui"; @@ -1319,6 +1554,7 @@ in nvim-dap-rr = super.nvim-dap-rr.overrideAttrs { dependencies = [ self.nvim-dap ]; + nvimRequireCheck = "nvim-dap-rr"; }; nvim-genghis = super.nvim-genghis.overrideAttrs { @@ -1330,52 +1566,68 @@ in nvim-lsputils = super.nvim-lsputils.overrideAttrs { dependencies = with self; [ popfix ]; + nvimRequireCheck = "lsputil.codeAction"; }; nvim-metals = super.nvim-metals.overrideAttrs { + dependencies = with self; [ plenary-nvim ]; dontBuild = true; + nvimRequireCheck = "metals"; }; nvim-navbuddy = super.nvim-navbuddy.overrideAttrs { - dependencies = with self; [ nui-nvim nvim-lspconfig nvim-navic ]; + dependencies = with self; [ + nui-nvim + nvim-lspconfig + nvim-navic + ]; + # TODO: enable after https://github.com/NixOS/nixpkgs/pull/342240 merged + # nvimRequireCheck = "nvim-navbuddy"; }; vim-mediawiki-editor = super.vim-mediawiki-editor.overrideAttrs { passthru.python3Dependencies = [ python3.pkgs.mwclient ]; }; - nvim-dbee = super.nvim-dbee.overrideAttrs (oa: let - dbee-go = buildGoModule { - name = "nvim-dbee"; - src = "${oa.src}/dbee"; - vendorHash = "sha256-U/3WZJ/+Bm0ghjeNUILsnlZnjIwk3ySaX3Rd4L9Z62A="; - buildInputs = [ - arrow-cpp - duckdb - ]; - }; - in { - dependencies = [ self.nui-nvim ]; + nvim-dbee = super.nvim-dbee.overrideAttrs ( + oa: + let + dbee-go = buildGoModule { + name = "nvim-dbee"; + src = "${oa.src}/dbee"; + vendorHash = "sha256-U/3WZJ/+Bm0ghjeNUILsnlZnjIwk3ySaX3Rd4L9Z62A="; + buildInputs = [ + arrow-cpp + duckdb + ]; + }; + in + { + dependencies = [ self.nui-nvim ]; - # nvim-dbee looks for the go binary in paths returned bu M.dir() and M.bin() defined in lua/dbee/install/init.lua - postPatch = '' - substituteInPlace lua/dbee/install/init.lua \ - --replace-fail 'return vim.fn.stdpath("data") .. "/dbee/bin"' 'return "${dbee-go}/bin"' - ''; - - preFixup = '' - mkdir $target/bin - ln -s ${dbee-go}/bin/dbee $target/bin/dbee + # nvim-dbee looks for the go binary in paths returned bu M.dir() and M.bin() defined in lua/dbee/install/init.lua + postPatch = '' + substituteInPlace lua/dbee/install/init.lua \ + --replace-fail 'return vim.fn.stdpath("data") .. "/dbee/bin"' 'return "${dbee-go}/bin"' ''; - meta.platforms = lib.platforms.linux; - }); + preFixup = '' + mkdir $target/bin + ln -s ${dbee-go}/bin/dbee $target/bin/dbee + ''; + + meta.platforms = lib.platforms.linux; + nvimRequireCheck = "dbee"; + } + ); nvim-navic = super.nvim-navic.overrideAttrs { - dependencies = [ self.nvim-lspconfig ]; + dependencies = [ self.nvim-lspconfig ]; + nvimRequireCheck = "nvim-navic"; }; - nvim-spectre = super.nvim-spectre.overrideAttrs (old: + nvim-spectre = super.nvim-spectre.overrideAttrs ( + old: let spectre_oxi = rustPlatform.buildRustPackage { pname = "spectre_oxi"; @@ -1395,12 +1647,13 @@ in }; in { - dependencies = with self; - [ plenary-nvim ]; + dependencies = with self; [ plenary-nvim ]; postInstall = '' ln -s ${spectre_oxi}/lib/libspectre_oxi.* $out/lua/spectre_oxi.so ''; - }); + nvimRequireCheck = "spectre"; + } + ); nvim-teal-maker = super.nvim-teal-maker.overrideAttrs { postPatch = '' @@ -1413,22 +1666,30 @@ in nvim-treesitter = super.nvim-treesitter.overrideAttrs ( callPackage ./nvim-treesitter/overrides.nix { } self super ); + nvim-treesitter-parsers = lib.recurseIntoAttrs self.nvim-treesitter.grammarPlugins; nvim-ufo = super.nvim-ufo.overrideAttrs { dependencies = with self; [ promise-async ]; + nvimRequireCheck = "ufo"; }; obsidian-nvim = super.obsidian-nvim.overrideAttrs { dependencies = with self; [ plenary-nvim ]; + nvimRequireCheck = "obsidian"; }; octo-nvim = super.octo-nvim.overrideAttrs { - dependencies = with self; [ telescope-nvim plenary-nvim ]; + dependencies = with self; [ + telescope-nvim + plenary-nvim + ]; + nvimRequireCheck = "octo"; }; ollama-nvim = super.ollama-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; + nvimRequireCheck = "ollama"; }; onehalf = super.onehalf.overrideAttrs { @@ -1438,8 +1699,14 @@ in # The plugin depends on either skim-vim or fzf-vim, but we don't want to force the user so we # avoid choosing one of them and leave it to the user openscad-nvim = super.openscad-nvim.overrideAttrs { - buildInputs = [ zathura htop openscad ]; + buildInputs = [ + zathura + htop + openscad + ]; + # FIXME: cant find plugin root dir + # nvimRequireCheck = "openscad"; patches = [ (substituteAll { src = ./patches/openscad.nvim/program_paths.patch; @@ -1452,10 +1719,12 @@ in orgmode = super.orgmode.overrideAttrs { dependencies = with self; [ (nvim-treesitter.withPlugins (p: [ p.org ])) ]; + nvimRequireCheck = "orgmode"; }; otter-nvim = super.otter-nvim.overrideAttrs { dependencies = [ self.nvim-lspconfig ]; + nvimRequirecheck = "otter"; }; overseer-nvim = super.overseer-nvim.overrideAttrs { @@ -1471,12 +1740,18 @@ in runHook postCheck ''; + nvimRequireCheck = "overseer"; }; inherit parinfer-rust; phpactor = buildVimPlugin { - inherit (phpactor) pname src meta version; + inherit (phpactor) + pname + src + meta + version + ; postPatch = '' substituteInPlace plugin/phpactor.vim \ --replace "g:phpactorpath = expand(':p:h') . '/..'" "g:phpactorpath = '${phpactor}'" @@ -1488,6 +1763,7 @@ in # we need the 'query' grammer to make (nvim-treesitter.withPlugins (p: [ p.query ])) ]; + nvimRequireCheck = "nvim-treesitter-playground"; }; plenary-nvim = super.plenary-nvim.overrideAttrs { @@ -1511,6 +1787,7 @@ in range-highlight-nvim = super.range-highlight-nvim.overrideAttrs { dependencies = with self; [ cmd-parser-nvim ]; + nvimRequireCheck = "range-highlight"; }; ranger-nvim = super.ranger-nvim.overrideAttrs { @@ -1519,6 +1796,7 @@ in postPatch = '' substituteInPlace lua/ranger-nvim.lua --replace '@ranger@' ${ranger}/bin/ranger ''; + nvimRequireCheck = "ranger-nvim"; }; aider-nvim = super.aider-nvim.overrideAttrs { @@ -1528,33 +1806,56 @@ in substituteInPlace lua/aider.lua --replace '@aider@' ${aider-chat}/bin/aider substituteInPlace lua/helpers.lua --replace '@aider@' ${aider-chat}/bin/aider ''; + nvimRequireCheck = "aider"; }; refactoring-nvim = super.refactoring-nvim.overrideAttrs { - dependencies = with self; [ nvim-treesitter plenary-nvim ]; + dependencies = with self; [ + nvim-treesitter + plenary-nvim + ]; + nvimRequireCheck = "refactoring"; }; # needs "http" and "json" treesitter grammars too rest-nvim = super.rest-nvim.overrideAttrs { dependencies = with self; [ plenary-nvim - (nvim-treesitter.withPlugins (p: [ p.http p.json ])) + (nvim-treesitter.withPlugins (p: [ + p.http + p.json + ])) ]; + nvimRequireCheck = "rest-nvim"; }; - rocks-nvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.rocks-nvim; }; + rocks-nvim = neovimUtils.buildNeovimPlugin { + luaAttr = luaPackages.rocks-nvim; + nvimRequireCheck = "rocks"; + }; - rocks-config-nvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.rocks-config-nvim; }; + rocks-config-nvim = neovimUtils.buildNeovimPlugin { + luaAttr = luaPackages.rocks-config-nvim; + nvimRequireCheck = "rocks-config"; + }; roslyn-nvim = super.roslyn-nvim.overrideAttrs { dependencies = with self; [ nvim-lspconfig ]; + nvimRequireCheck = "roslyn"; }; - rtp-nvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.rtp-nvim; }; + rtp-nvim = neovimUtils.buildNeovimPlugin { + luaAttr = luaPackages.rtp-nvim; + nvimRequireCheck = "rtp_nvim"; + }; - rustaceanvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.rustaceanvim; }; + rustaceanvim = neovimUtils.buildNeovimPlugin { + luaAttr = luaPackages.rustaceanvim; + nvimRequireCheck = "rustaceanvim"; + }; - sg-nvim = super.sg-nvim.overrideAttrs (old: + sg-nvim = super.sg-nvim.overrideAttrs ( + old: let sg-nvim-rust = rustPlatform.buildRustPackage { pname = "sg-nvim-rust"; @@ -1589,7 +1890,9 @@ in mkdir -p $out/target/debug ln -s ${sg-nvim-rust}/{bin,lib}/* $out/target/debug ''; - }); + nvimRequireCheck = "sg"; + } + ); skim = buildVimPlugin { pname = "skim"; @@ -1602,7 +1905,10 @@ in }; smart-open-nvim = super.smart-open-nvim.overrideAttrs { - dependencies = with self; [ telescope-nvim sqlite-lua ]; + dependencies = with self; [ + telescope-nvim + sqlite-lua + ]; }; sniprun = @@ -1628,7 +1934,16 @@ in postInstall = '' wrapProgram $out/bin/sniprun \ - --prefix PATH ${lib.makeBinPath [bashInteractive coreutils curl gnugrep gnused procps]} + --prefix PATH ${ + lib.makeBinPath [ + bashInteractive + coreutils + curl + gnugrep + gnused + procps + ] + } ''; doCheck = false; @@ -1650,6 +1965,7 @@ in changelog = "https://github.com/michaelb/sniprun/blob/v${version}/CHANGELOG.md"; maintainers = with lib.maintainers; [ GaetanLepage ]; }; + nvimRequireCheck = "sniprun"; }; # The GitHub repository returns 404, which breaks the update script @@ -1675,17 +1991,19 @@ in --replace "path = vim.g.sqlite_clib_path" "path = vim.g.sqlite_clib_path or ${lib.escapeShellArg libsqlite}" ''; - passthru = oa.passthru // { - initLua = ''vim.g.sqlite_clib_path = "${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}"''; - }; + passthru = oa.passthru // { + initLua = ''vim.g.sqlite_clib_path = "${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}"''; + }; }); ssr = super.ssr-nvim.overrideAttrs { dependencies = with self; [ nvim-treesitter ]; + nvimRequireCheck = "ssr"; }; startup-nvim = super.startup-nvim.overrideAttrs { dependencies = with super; [ plenary-nvim ]; + nvimRequireCheck = "startup"; }; statix = buildVimPlugin rec { @@ -1708,6 +2026,7 @@ in substituteInPlace lua/stylish/components/menu.lua --replace xdotool ${xdotool}/bin/xdotool substituteInPlace lua/stylish/components/menu.lua --replace xwininfo ${xorg.xwininfo}/bin/xwininfo ''; + nvimRequireCheck = "stylish"; }; sved = @@ -1716,10 +2035,19 @@ in svedbackend = stdenv.mkDerivation { name = "svedbackend-${super.sved.name}"; inherit (super.sved) src; - nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; + nativeBuildInputs = [ + wrapGAppsHook3 + gobject-introspection + ]; buildInputs = [ glib - (python3.withPackages (ps: with ps; [ pygobject3 pynvim dbus-python ])) + (python3.withPackages ( + ps: with ps; [ + pygobject3 + pynvim + dbus-python + ] + )) ]; preferLocalBuild = true; installPhase = '' @@ -1727,12 +2055,14 @@ in ''; }; # the vim plugin expects evinceSync.py to be a python file, but it is a C wrapper - pythonWrapper = writeText "evinceSync-wrapper.py" /* python */ '' - #!${python3}/bin/python3 - import os - import sys - os.execv("${svedbackend}/bin/evinceSync.py", sys.argv) - ''; + pythonWrapper = + writeText "evinceSync-wrapper.py" # python + '' + #!${python3}/bin/python3 + import os + import sys + os.execv("${svedbackend}/bin/evinceSync.py", sys.argv) + ''; in super.sved.overrideAttrs { preferLocalBuild = true; @@ -1748,6 +2078,7 @@ in syntax-tree-surfer = super.syntax-tree-surfer.overrideAttrs { dependencies = with self; [ nvim-treesitter ]; meta.maintainers = with lib.maintainers; [ callumio ]; + nvimRequireCheck = "syntax-tree-surfer"; }; taskwarrior3 = buildVimPlugin { @@ -1760,12 +2091,26 @@ in src = "${taskwarrior2.src}/scripts/vim"; }; + telekasten-nvim = super.telekasten-nvim.overrideAttrs { + dependencies = with self; [ + plenary-nvim + telescope-nvim + ]; + nvimRequireCheck = "telekasten"; + }; + telescope-cheat-nvim = super.telescope-cheat-nvim.overrideAttrs { - dependencies = with self; [ sqlite-lua telescope-nvim ]; + dependencies = with self; [ + sqlite-lua + telescope-nvim + ]; }; telescope-frecency-nvim = super.telescope-frecency-nvim.overrideAttrs { - dependencies = with self; [ sqlite-lua telescope-nvim ]; + dependencies = with self; [ + sqlite-lua + telescope-nvim + ]; }; telescope-fzf-native-nvim = super.telescope-fzf-native-nvim.overrideAttrs { @@ -1802,8 +2147,16 @@ in meta.platforms = lib.platforms.all; }); + telescope-git-conflicts-nvim = super.telescope-git-conflicts-nvim.overrideAttrs { + dependencies = with self; [ telescope-nvim ]; + }; + telescope-media-files-nvim = super.telescope-media-files-nvim.overrideAttrs { - dependencies = with self; [ telescope-nvim popup-nvim plenary-nvim ]; + dependencies = with self; [ + telescope-nvim + popup-nvim + plenary-nvim + ]; }; telescope-nvim = super.telescope-nvim.overrideAttrs { @@ -1840,6 +2193,7 @@ in tssorter-nvim = super.tssorter-nvim.overrideAttrs { dependencies = with self; [ nvim-treesitter ]; + nvimRequireCheck = "tssorter"; }; tup = @@ -1861,7 +2215,11 @@ in }; typescript-tools-nvim = super.typescript-tools-nvim.overrideAttrs { - dependencies = with self; [ nvim-lspconfig plenary-nvim ]; + dependencies = with self; [ + nvim-lspconfig + plenary-nvim + ]; + nvimRequireCheck = "typescript-tools"; }; unicode-vim = @@ -1900,7 +2258,10 @@ in }; vim-addon-actions = super.vim-addon-actions.overrideAttrs { - dependencies = with self; [ vim-addon-mw-utils tlib_vim ]; + dependencies = with self; [ + vim-addon-mw-utils + tlib_vim + ]; }; vim-addon-async = super.vim-addon-async.overrideAttrs { @@ -1924,7 +2285,10 @@ in }; vim-addon-mru = super.vim-addon-mru.overrideAttrs { - dependencies = with self; [ vim-addon-other vim-addon-mw-utils ]; + dependencies = with self; [ + vim-addon-other + vim-addon-mw-utils + ]; }; vim-addon-nix = super.vim-addon-nix.overrideAttrs { @@ -1939,19 +2303,34 @@ in }; vim-addon-sql = super.vim-addon-sql.overrideAttrs { - dependencies = with self; [ vim-addon-completion vim-addon-background-cmd tlib_vim ]; + dependencies = with self; [ + vim-addon-completion + vim-addon-background-cmd + tlib_vim + ]; }; vim-addon-syntax-checker = super.vim-addon-syntax-checker.overrideAttrs { - dependencies = with self; [ vim-addon-mw-utils tlib_vim ]; + dependencies = with self; [ + vim-addon-mw-utils + tlib_vim + ]; }; vim-addon-toggle-buffer = super.vim-addon-toggle-buffer.overrideAttrs { - dependencies = with self; [ vim-addon-mw-utils tlib_vim ]; + dependencies = with self; [ + vim-addon-mw-utils + tlib_vim + ]; }; vim-addon-xdebug = super.vim-addon-xdebug.overrideAttrs { - dependencies = with self; [ webapi-vim vim-addon-mw-utils vim-addon-signs vim-addon-async ]; + dependencies = with self; [ + webapi-vim + vim-addon-mw-utils + vim-addon-signs + vim-addon-async + ]; }; vim-agda = super.vim-agda.overrideAttrs { @@ -2120,7 +2499,10 @@ in }; vim-snipmate = super.vim-snipmate.overrideAttrs { - dependencies = with self; [ vim-addon-mw-utils tlib_vim ]; + dependencies = with self; [ + vim-addon-mw-utils + tlib_vim + ]; }; vim-speeddating = super.vim-speeddating.overrideAttrs { @@ -2129,8 +2511,7 @@ in vim-stylish-haskell = super.vim-stylish-haskell.overrideAttrs (old: { postPatch = - old.postPatch - or "" + old.postPatch or "" + '' substituteInPlace ftplugin/haskell/stylish-haskell.vim --replace \ 'g:stylish_haskell_command = "stylish-haskell"' \ @@ -2250,16 +2631,23 @@ in }; vim-zettel = super.vim-zettel.overrideAttrs { - dependencies = with self; [ vimwiki fzf-vim ]; + dependencies = with self; [ + vimwiki + fzf-vim + ]; }; windows-nvim = super.windows-nvim.overrideAttrs { - dependencies = with self; [ middleclass animation-nvim ]; + dependencies = with self; [ + middleclass + animation-nvim + ]; nvimRequireCheck = "windows"; }; wtf-nvim = super.wtf-nvim.overrideAttrs { dependencies = with self; [ nui-nvim ]; + nvimRequireCheck = "wtf"; }; YankRing-vim = super.YankRing-vim.overrideAttrs { @@ -2268,6 +2656,18 @@ in yazi-nvim = super.yazi-nvim.overrideAttrs { dependencies = with self; [ plenary-nvim ]; + nvimRequireCheck = "yazi"; + }; + + leetcode-nvim = super.leetcode-nvim.overrideAttrs { + dependencies = with self; [ + nui-nvim + plenary-nvim + telescope-nvim + ]; + + doInstallCheck = true; + nvimRequireCheck = "leetcode"; }; YouCompleteMe = super.YouCompleteMe.overrideAttrs { @@ -2284,7 +2684,10 @@ in description = "Code-completion engine for Vim"; homepage = "https://github.com/Valloric/YouCompleteMe"; license = licenses.gpl3; - maintainers = with maintainers; [ marcweber jagajaga ]; + maintainers = with maintainers; [ + marcweber + jagajaga + ]; platforms = platforms.unix; }; }; @@ -2310,7 +2713,7 @@ in stripDebugList = [ "autoload/leaderf/python" ]; }; } - // ( +// ( let nodePackageNames = [ "coc-cmake" @@ -2334,7 +2737,6 @@ in "coc-metals" "coc-pairs" "coc-prettier" - "coc-python" "coc-r-lsp" "coc-rls" "coc-rust-analyzer" @@ -2360,7 +2762,8 @@ in "coc-yaml" "coc-yank" ]; - nodePackage2VimPackage = name: + nodePackage2VimPackage = + name: buildVimPlugin { pname = name; inherit (nodePackages.${name}) version meta; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-command-check-hook.sh b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-command-check-hook.sh index c4ddd8e0c5..402910fd0c 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-command-check-hook.sh +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-command-check-hook.sh @@ -21,5 +21,5 @@ vimCommandCheckHook () { } echo "Using vimCommandCheckHook" -preDistPhases+=" vimCommandCheckHook" +appendToVar preDistPhases vimCommandCheckHook 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 4bb2712e70..c4d547e962 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 @@ -159,6 +159,7 @@ https://github.com/max397574/cmp-greek/,HEAD, https://github.com/kdheepak/cmp-latex-symbols/,, https://github.com/octaltree/cmp-look/,HEAD, https://github.com/notomo/cmp-neosnippet/,HEAD, +https://github.com/GaetanLepage/cmp-nixpkgs-maintainers/,HEAD, https://github.com/David-Kunz/cmp-npm/,HEAD, https://github.com/hrsh7th/cmp-nvim-lsp/,, https://github.com/hrsh7th/cmp-nvim-lsp-document-symbol/,, @@ -463,6 +464,7 @@ https://github.com/b3nj5m1n/kommentary/,, https://github.com/udalov/kotlin-vim/,, https://github.com/mistweaverco/kulala.nvim/,HEAD, https://github.com/qnighy/lalrpop.vim/,, +https://github.com/Wansmer/langmapper.nvim/,HEAD, https://github.com/sk1418/last256/,, https://github.com/latex-box-team/latex-box/,, https://github.com/dundalek/lazy-lsp.nvim/,HEAD, @@ -473,6 +475,7 @@ https://github.com/Julian/lean.nvim/,, https://github.com/leanprover/lean.vim/,, https://github.com/ggandor/leap-ast.nvim/,HEAD, https://github.com/ggandor/leap.nvim/,HEAD, +https://github.com/kawre/leetcode.nvim/,HEAD, https://github.com/mrjones2014/legendary.nvim/,HEAD, https://github.com/camspiers/lens.vim/,, https://github.com/thirtythreeforty/lessspace.vim/,, @@ -982,6 +985,7 @@ https://github.com/nvim-telescope/telescope-frecency.nvim/,, https://github.com/nvim-telescope/telescope-fzf-native.nvim/,, https://github.com/nvim-telescope/telescope-fzf-writer.nvim/,, https://github.com/nvim-telescope/telescope-fzy-native.nvim/,, +https://github.com/Snikimonkd/telescope-git-conflicts.nvim/,HEAD, https://github.com/nvim-telescope/telescope-github.nvim/,, https://github.com/nvim-telescope/telescope-live-grep-args.nvim/,HEAD, https://github.com/gbrlsnchs/telescope-lsp-handlers.nvim/,, @@ -1091,6 +1095,7 @@ https://github.com/MarcWeber/vim-addon-syntax-checker/,, https://github.com/MarcWeber/vim-addon-toggle-buffer/,, https://github.com/MarcWeber/vim-addon-xdebug/,, https://github.com/junegunn/vim-after-object/,, +https://github.com/danilo-augusto/vim-afterglow/,HEAD, https://github.com/msuperdock/vim-agda/,HEAD, https://github.com/vim-airline/vim-airline/,, https://github.com/enricobacis/vim-airline-clock/,, diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix index 983ae07bb1..53e836685e 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix @@ -7,8 +7,8 @@ buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "18.0.5"; - hash = "sha256-vWqGxMbxKqd4UgKK0sOKadMTDf6Y3TQxfWsc93MHjFs="; + version = "24.2.0"; + hash = "sha256-1AAerJsgmXJGiEOlxQRRo00JxYBm1Y8xI4rMQUcdv6k="; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/azdavis.millet/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/azdavis.millet/default.nix index af1e8c3df0..3020dc31b7 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/azdavis.millet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/azdavis.millet/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "Millet"; publisher = "azdavis"; - version = "0.13.5"; - hash = "sha256-sWM7N+axgu1zOGWexR4JVupVmYhZrd4cZz3pmLxRj8Q="; + version = "0.14.7"; + hash = "sha256-+PrGTeov5lTP1SgB6E0E40QHXfX+/vhm2DzW6DJB1/A="; }; nativeBuildInputs = [ jq 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 3f83b004c8..f8fc458aef 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix @@ -1547,8 +1547,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 = "15.1.0"; - hash = "sha256-xGgm/WNJDIh/Bs11fLYwHQ9ULiZBWbKw4QYl/l4KYJ4="; + version = "15.6.0"; + hash = "sha256-s6ur76DyNhwuZOYma2zPfYEs3lMliRuhdmZhITCSCPE="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; @@ -1644,8 +1644,8 @@ let mktplcRef = { name = "elixir-ls"; publisher = "JakeBecker"; - version = "0.24.0"; - hash = "sha256-zNiKtOeZEO9zVpyF4AE/3FjiEy4jtCSCjB9T8e8PjRE="; + version = "0.24.2"; + hash = "sha256-u6l6JJ7oWyb5HjZvWxbO+2RXeSOrsgeq8jEMnGmM1Ns="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; @@ -4174,8 +4174,8 @@ let mktplcRef = { name = "sas-lsp"; publisher = "SAS"; - version = "1.10.2"; - hash = "sha256-mf0q80UX4FxqHAHJBQlhkF/nqvTnfgTR8GuYBoWSswU="; + version = "1.11.0"; + hash = "sha256-CJn5pSZB+f5Eo7DvkJbP0iEzBbuBQC3FSZwxbxlrq58="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/SAS.sas-lsp/changelog"; @@ -4684,6 +4684,21 @@ let }; }; + tauri-apps.tauri-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "tauri-vscode"; + publisher = "tauri-apps"; + version = "0.2.9"; + hash = "sha256-ySfsmKAReKTLl6lHax2fnPu9paQ2pBSEMUoeGtGJelA="; + }; + meta = { + description = "Enhances the experience of Tauri apps development"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=tauri-apps.tauri-vscode"; + homepage = "https://github.com/tauri-apps/tauri-vscode"; + license = lib.licenses.mit; + }; + }; + teabyii.ayu = buildVscodeMarketplaceExtension { mktplcRef = { name = "ayu"; @@ -5014,6 +5029,8 @@ let }; }; + visualjj.visualjj = callPackage ./visualjj.visualjj { }; + visualstudioexptteam.intellicode-api-usage-examples = buildVscodeMarketplaceExtension { mktplcRef = { name = "intellicode-api-usage-examples"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/eugleo.magic-racket/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/eugleo.magic-racket/default.nix index f9165e7da0..53b23469ee 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/eugleo.magic-racket/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/eugleo.magic-racket/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "magic-racket"; publisher = "evzen-wybitul"; - version = "0.6.4"; - hash = "sha256-Hxa4VPm3QvJICzpDyfk94fGHu1hr+YN9szVBwDB8X4U="; + version = "0.6.7"; + hash = "sha256-1A4j8710AYuV8gA+sybv6WSavPVcCPMvI71h4n4Jx0w="; }; nativeBuildInputs = [ jq 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 73e603bbde..d1dcbafac6 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-PcCZkY1+ks9J5JaDJLVgiJuXgRxIvUZHI00gatjeVbA="; + hash = "sha256-CQVujtl1SFcUmEG7O1cvN2gr6v3kcWMMZz+oYEkclKI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/pylyzer.pylyzer/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/pylyzer.pylyzer/default.nix index c060c2c298..32a36e57b4 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/pylyzer.pylyzer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/pylyzer.pylyzer/default.nix @@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "pylyzer"; publisher = "pylyzer"; - version = "0.1.8"; - hash = "sha256-GoY4cobxL64bREtgl7q/iR66axSM3tBrle/b9h3ED8Q="; + version = "0.1.10"; + hash = "sha256-dDkX0U/XmHk5Jo+VdvxDkcA/1xu0Ae8kaDuDd/xjdUc="; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix new file mode 100644 index 0000000000..e15cfdd5be --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + vscode-utils, + fetchurl, + ... +}: + +let + version = "0.11.8"; + + sources = { + "x86_64-linux" = { + arch = "linux-x64"; + url = "https://download.visualjj.com/visualjj-linux-x64-${version}.vsix"; + hash = "sha256-L46ORW4iZnZ1GNQSU4opp1bTIh036j9JNmkATjTt/qM="; + }; + "x86_64-darwin" = { + arch = "darwin-x64"; + url = "https://download.visualjj.com/visualjj-darwin-x64-${version}.vsix"; + hash = "sha256-h15HMZiV/bCVgoajEBe8XLSmFD7EsU2JVlpqiN6ntjQ="; + }; + "aarch64-linux" = { + arch = "linux-arm64"; + url = "https://download.visualjj.com/visualjj-linux-arm64-${version}.vsix"; + hash = "sha256-1h/xBMFXtHn/QA0FpZcuUFKxU65AMvaqds6Q9aNaW3s="; + }; + "aarch64-darwin" = { + arch = "darwin-arm64"; + url = "https://download.visualjj.com/visualjj-darwin-arm64-${version}.vsix"; + hash = "sha256-9SagMPdkB8d2GeGR/R1EmH5y6VNZtYydst9S82kAQlA="; + }; + }; +in +vscode-utils.buildVscodeMarketplaceExtension { + vsix = fetchurl { + url = sources.${stdenv.hostPlatform.system}.url; + hash = sources.${stdenv.hostPlatform.system}.hash; + name = "visualjj-visualjj-${version}.zip"; + }; + + mktplcRef = { + inherit version; + name = "visualjj"; + publisher = "visualjj"; + arch = sources.${stdenv.hostPlatform.system}.arch; + }; + + meta = { + description = "Jujutsu version control integration, for simpler Git workflow"; + downloadPage = "https://www.visualjj.com"; + homepage = "https://www.visualjj.com"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.drupol ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix index 6351b9d71b..352c25fe17 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix @@ -149,6 +149,7 @@ in exec = executableName + " --open-url %U"; icon = "vs${executableName}"; startupNotify = true; + startupWMClass = shortName; categories = [ "Utility" "TextEditor" "Development" "IDE" ]; mimeTypes = [ "x-scheme-handler/vs${executableName}" ]; keywords = [ "vscode" ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index c6a7eff1d8..1c12abb147 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -30,21 +30,21 @@ let archive_fmt = if stdenv.hostPlatform.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "11d9qqfb5kh5zsc7xd6h5xsywacir5z08l2snj0cz2cb0nji9xhj"; - x86_64-darwin = "0rbwvvakh1b5iqca49hcmqlfq4g0j067rrphrh0yx7wdyr6kmwg2"; - aarch64-linux = "0vrvcy1p5lrdy2lww42w32vr79075vpkwj4q8wfqzd7x72vmhfci"; - aarch64-darwin = "03wccm854v9va50x91kp00a16r483zpndayhlwy1fm4n0wdy6iw8"; - armv7l-linux = "0b9r78mz5djvv6n82isn2jqb4bwa41hqyxxc9arhrpvpj5w65rla"; + x86_64-linux = "0w452wnzyb4wmr2qqq55dhfb1jd0zqmwf65fbmxdz7jn1jimjjrn"; + x86_64-darwin = "1b333snvrw8khryhi5scfhhkg43m3b6ds3nvs24nbvx8k7h69hmm"; + aarch64-linux = "12p5cdva14s9sfgyrzg3nylpmgdnmfavwx3xxxmblzq1gcal2g6i"; + aarch64-darwin = "1l59fcdvynkl5kyz9bn31mld6pi89nynk1zw645rczjm940pac7p"; + armv7l-linux = "07ylija6chg6jc2zcavdr9yw1laniigw57f2gilyjynv1cgjm76r"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.94.1"; + version = "1.94.2"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "e10f2369d0d9614a452462f2e01cdc4aa9486296"; + rev = "384ff7382de624fb94dbaf6da11977bba1ecd427"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -68,7 +68,7 @@ in src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "094klvp32475f6rsapxkhgsm8cmjmpq4qp3lx2b1vgf3xzl7j9nw"; + sha256 = "1mj9fg76b9x9r6ql21hbckpni179vfa9j8fiah9rd6ih7sb72048"; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix index 54a1a98ad7..0bff53ccf3 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.hostPlatform.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "14pqi5l7zbkhpsl8hd7mqss4xkqnxf0f0h5bs710iadpcscgpndf"; - x86_64-darwin = "10k4qgck48xh12xq80y8x3jf9qp5fn15n995mn8gbid39907ars0"; - aarch64-linux = "0jk33jw5rj98qr6fhi4r3vz5f1673m5v1g28jdyn3prs20hp0msg"; - aarch64-darwin = "1sw39iyz5m0hdy875b3ygzvpl7vz9j3d1w6fpmf30a3iyl3ndh66"; - armv7l-linux = "1rjv5c85ffy5szxhf71kjmvxiahyyvx2dl6183v5q7apv9pa64hj"; + x86_64-linux = "0xbnyi6g5a12bip1vh2b5ap5108gwxa9g9g3ncllllz3ak2jim5r"; + x86_64-darwin = "0linvibppgjr4dwsrjpqd126m8izq757cnwkr0w4bv81k30j1jv6"; + aarch64-linux = "1324p9av9vx8ywz55vdls53b34jp6csnqbm0y94v5azxjvwcr3kj"; + aarch64-darwin = "160mwlz17fb0xq935ih35h8bd7dn7gmvy5szra0jdr754xcgn5z5"; + armv7l-linux = "07dln5mgrhn0569m77rj30443hgk1z7z8xi442lh5y8ib729q10y"; }.${system} or throwSystem; sourceRoot = lib.optionalString (!stdenv.hostPlatform.isDarwin) "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.93.1.24256"; + version = "1.94.2.24284"; pname = "vscodium"; executableName = "codium"; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/darling/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/darling/default.nix index 6747f8781f..581dd0cace 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/darling/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/darling/default.nix @@ -134,6 +134,14 @@ in stdenv.mkDerivation { url = "https://github.com/darlinghq/darling/commit/f46eb721c11d32addd807f092f4b3a6ea515bb6d.patch?full_index=1"; hash = "sha256-FnLcHnK4cNto+E3OQSxE3iK+FHSU8y459FcpMvrzd6o="; }) + + # Fix compatibility with ffmpeg_7 + # https://github.com/darlinghq/darling/pull/1537 + # https://github.com/darlinghq/darling/commit/9655d5598c87dcb22c54a83cc7741b77cb47a1b0 + (fetchpatch { + url = "https://github.com/darlinghq/darling/commit/9655d5598c87dcb22c54a83cc7741b77cb47a1b0.patch?full_index=1"; + hash = "sha256-ogMo4SRRwiOhaVJ+OS8BVolGDa7vGKyR9bdGiOiCuRc="; + }) ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/default.nix index b23a5e3c9b..581315d933 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/default.nix @@ -8,7 +8,7 @@ , alsa-lib , dbus , fetchFromGitHub -, ffmpeg_7 +, ffmpeg , flac , freetype , gamemode @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { lib.optional (runtimeLibs != [ ]) makeWrapper; buildInputs = [ - ffmpeg_7 + ffmpeg flac freetype libGL diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/xplorer/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/xplorer/default.nix index 9c3a04e8dd..6af5e5da6c 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/xplorer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/xplorer/default.nix @@ -13,7 +13,7 @@ , openssl , pkg-config , rustPlatform -, webkitgtk +, webkitgtk_4_0 }: let @@ -74,7 +74,7 @@ rustPlatform.buildRustPackage { ''; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ dbus openssl freetype libsoup gtk3 webkitgtk ]; + buildInputs = [ dbus openssl freetype libsoup gtk3 webkitgtk_4_0 ]; checkFlags = [ # tries to mutate the parent directory diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/default.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/default.nix index 5e22cc9aa0..c90a372681 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/default.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/default.nix @@ -5,9 +5,16 @@ , extraPythonPackages ? (ps: [ ]) , libsForQt5 + +# unwrapped package parameters +, withGrass ? true +, withWebKit ? false }: let - qgis-unwrapped = libsForQt5.callPackage ./unwrapped.nix { }; + qgis-unwrapped = libsForQt5.callPackage ./unwrapped.nix { + withGrass = withGrass; + withWebKit = withWebKit; + }; in symlinkJoin rec { inherit (qgis-unwrapped) version; diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/ltr.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/ltr.nix index 53e6069e87..56a15dbd7d 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/ltr.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/ltr.nix @@ -5,9 +5,16 @@ , extraPythonPackages ? (ps: [ ]) , libsForQt5 + +# unwrapped package parameters +, withGrass ? true +, withWebKit ? false }: let - qgis-ltr-unwrapped = libsForQt5.callPackage ./unwrapped-ltr.nix { }; + qgis-ltr-unwrapped = libsForQt5.callPackage ./unwrapped-ltr.nix { + withGrass = withGrass; + withWebKit = withWebKit; + }; in symlinkJoin rec { inherit (qgis-ltr-unwrapped) version; 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 17af854eab..98caf348ae 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -6,8 +6,8 @@ , wrapGAppsHook3 , wrapQtAppsHook -, withGrass ? true -, withWebKit ? false +, withGrass +, withWebKit , bison , cmake diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix index 97349b3184..49d0fd5b36 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix @@ -6,8 +6,8 @@ , wrapGAppsHook3 , wrapQtAppsHook -, withGrass ? true -, withWebKit ? false +, withGrass +, withWebKit , bison , cmake diff --git a/third_party/nixpkgs/pkgs/applications/graphics/curtail/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/curtail/default.nix index 7c9d4298cb..88f0a64df1 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/curtail/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/curtail/default.nix @@ -20,14 +20,14 @@ python3.pkgs.buildPythonApplication rec { pname = "curtail"; - version = "1.10.0"; + version = "1.11.0"; format = "other"; src = fetchFromGitHub { owner = "Huluti"; repo = "Curtail"; rev = "refs/tags/${version}"; - sha256 = "sha256-xwpjyMMdjYMrd79/EzoNae4rQuq2VjwJRNoudNGD78E="; + sha256 = "sha256-bN901v2M644EN7tBKN9/kv12AE2XuIPjDSCoohfevFI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gimp/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gimp/default.nix index 5270b70848..e71cefc6ce 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gimp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gimp/default.nix @@ -168,7 +168,11 @@ in stdenv.mkDerivation (finalAttrs: { doCheck = true; env = { - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DGDK_OSX_BIG_SUR=16"; + NIX_CFLAGS_COMPILE = toString ( + [ ] + ++ lib.optionals stdenv.cc.isGNU [ "-Wno-error=incompatible-pointer-types" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DGDK_OSX_BIG_SUR=16" ] + ); # Check if librsvg was built with --disable-pixbuf-loader. PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix index f5c9266b57..8617348642 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix @@ -17,7 +17,7 @@ let pluginDerivation = attrs: let name = attrs.name or "${attrs.pname}-${attrs.version}"; in stdenv.mkDerivation ({ - prePhases = "extraLib"; + prePhases = [ "extraLib" ]; extraLib = '' installScripts(){ mkdir -p $out/${gimp.targetScriptDir}/${name}; @@ -54,7 +54,7 @@ let }); scriptDerivation = {src, ...}@attrs : pluginDerivation ({ - prePhases = "extraLib"; + prePhases = [ "extraLib" ]; dontUnpack = true; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gthumb/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gthumb/default.nix index 5b56ce7585..f2666b3ee1 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gthumb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gthumb/default.nix @@ -31,7 +31,7 @@ , python3 , desktop-file-utils , itstool -, withWebservices ? true, webkitgtk +, withWebservices ? true, webkitgtk_4_0 }: stdenv.mkDerivation rec { @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { libtiff libwebp libX11 - ] ++ lib.optional withWebservices webkitgtk; + ] ++ lib.optional withWebservices webkitgtk_4_0; mesonFlags = [ "-Dlibchamplain=true" diff --git a/third_party/nixpkgs/pkgs/applications/graphics/hdrmerge/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/hdrmerge/default.nix index cfd5fe516b..ba0d25ac11 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/hdrmerge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/hdrmerge/default.nix @@ -16,12 +16,12 @@ mkDerivation rec { pname = "hdrmerge"; - version = "unstable-2023-01-04"; + version = "0.5.0-unstable-2024-08-02"; src = fetchFromGitHub { owner = "jcelaya"; repo = "hdrmerge"; - rev = "ca38b54f980564942a7f2b014a5f57a64c1d9019"; - hash = "sha256-DleYgpDXP0NvbmEURXnBfe3OYnT1CaQq+Mw93JQQprE="; + rev = "e2a46f97498b321b232cc7f145461212677200f1"; + hash = "sha256-471gJtF9M36pAId9POG8ZIpNk9H/157EdHqXSAPlhN0="; }; nativeBuildInputs = [ @@ -42,15 +42,6 @@ mkDerivation rec { "-include cstdint" ]; - patches = [ - # https://github.com/jcelaya/hdrmerge/pull/222 - (fetchpatch { - name = "exiv2-0.28.patch"; - url = "https://github.com/jcelaya/hdrmerge/commit/377d8e6f3c7cdd1a45b63bce2493ad177dde03fb.patch"; - hash = "sha256-lXHML6zGkVeWKvmY5ECoJL2xjmtZz77XJd5prpgJiZo="; - }) - ]; - desktopItems = [ (makeDesktopItem { name = "HDRMerge"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/komorebi/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/komorebi/default.nix index f98549cb14..91e4ad570e 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/komorebi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/komorebi/default.nix @@ -7,7 +7,7 @@ , glib , gtk3 , libgee -, webkitgtk +, webkitgtk_4_0 , clutter-gtk , clutter-gst , ninja @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { glib gtk3 libgee - webkitgtk + webkitgtk_4_0 clutter-gtk clutter-gst ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/openboard/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/openboard/default.nix index a02ae20d9f..cd5331d006 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/openboard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/openboard/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, fetchpatch2, copyDesktopItems, makeDesktopItem, qmake , qtbase, qtxmlpatterns, qttools, qtwebengine, libGL, fontconfig, openssl, poppler, wrapQtAppsHook -, ffmpeg_7, libva, alsa-lib, SDL, x264, libvpx, libvorbis, libtheora, libogg +, ffmpeg, libva, alsa-lib, SDL, x264, libvpx, libvorbis, libtheora, libogg , libopus, lame, fdk_aac, libass, quazip, libXext, libXfixes }: let @@ -73,7 +73,7 @@ in stdenv.mkDerivation (finalAttrs: { fontconfig openssl poppler - ffmpeg_7 + ffmpeg libva alsa-lib SDL diff --git a/third_party/nixpkgs/pkgs/applications/graphics/processing/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/processing/default.nix index 59ab93c186..a7a38e6f75 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/processing/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/processing/default.nix @@ -31,25 +31,25 @@ let flatlaf = fetchurl { name = "flatlaf-2.4.jar"; - url = "https://repo1.maven.org/maven2/com/formdev/flatlaf/2.4/flatlaf-2.4.jar"; + url = "mirror://maven/com/formdev/flatlaf/2.4/flatlaf-2.4.jar"; sha256 = "NVMYiCd+koNCJ6X3EiRx1Aj+T5uAMSJ9juMmB5Os+zc="; }; lsp4j = fetchurl { name = "org.eclipse.lsp4j-0.19.0.jar"; - url = "https://repo1.maven.org/maven2/org/eclipse/lsp4j/org.eclipse.lsp4j/0.19.0/org.eclipse.lsp4j-0.19.0.jar"; + url = "mirror://maven/org/eclipse/lsp4j/org.eclipse.lsp4j/0.19.0/org.eclipse.lsp4j-0.19.0.jar"; sha256 = "sha256-1DI5D9KW+GL4gT1qjwVZveOl5KVOEjt6uXDwsFzi8Sg="; }; lsp4j-jsonrpc = fetchurl { name = "org.eclipse.lsp4j.jsonrpc-0.19.0.jar"; - url = "https://repo1.maven.org/maven2/org/eclipse/lsp4j/org.eclipse.lsp4j.jsonrpc/0.19.0/org.eclipse.lsp4j.jsonrpc-0.19.0.jar"; + url = "mirror://maven/org/eclipse/lsp4j/org.eclipse.lsp4j.jsonrpc/0.19.0/org.eclipse.lsp4j.jsonrpc-0.19.0.jar"; sha256 = "sha256-ozYTkvv7k0psCeX/PbSM3/Bl17qT3upX3trt65lmM9I="; }; gson = fetchurl { name = "gson-2.9.1.jar"; - url = "https://repo1.maven.org/maven2/com/google/code/gson/gson/2.9.1/gson-2.9.1.jar"; + url = "mirror://maven/com/google/code/gson/gson/2.9.1/gson-2.9.1.jar"; sha256 = "sha256-N4U04znm5tULFzb7Ort28cFdG+P0wTzsbVNkEuI9pgM="; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/ffmpegthumbs.nix b/third_party/nixpkgs/pkgs/applications/kde/ffmpegthumbs.nix index 9b0da69d71..360da8ede7 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/ffmpegthumbs.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/ffmpegthumbs.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, - ffmpeg_7, kio, taglib + ffmpeg, kio, taglib }: mkDerivation { @@ -11,5 +11,5 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ ffmpeg_7 kio taglib ]; + buildInputs = [ ffmpeg kio taglib ]; } diff --git a/third_party/nixpkgs/pkgs/applications/kde/partitionmanager/default.nix b/third_party/nixpkgs/pkgs/applications/kde/partitionmanager/default.nix index f65eb6d02b..b5a5053419 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/partitionmanager/default.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/partitionmanager/default.nix @@ -20,7 +20,6 @@ , exfat , f2fs-tools , fatresize -, hfsprogs , jfsutils , nilfs-utils , ntfs3g @@ -50,7 +49,7 @@ let exfat f2fs-tools fatresize - hfsprogs + # hfsprogs intentionally omitted due to being unmaintained jfsutils nilfs-utils ntfs3g diff --git a/third_party/nixpkgs/pkgs/applications/misc/bambu-studio/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bambu-studio/default.nix index b1ff6eb0a2..4084734aa5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/bambu-studio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/bambu-studio/default.nix @@ -39,7 +39,7 @@ pcre, systemd, tbb_2021_11, - webkitgtk, + webkitgtk_4_0, wxGTK31, xorg, withSystemd ? stdenv.hostPlatform.isLinux, @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { openvdb_tbb_2021_8 pcre tbb_2021_11 - webkitgtk + webkitgtk_4_0 wxGTK31' xorg.libX11 ] ++ lib.optionals withSystemd [ systemd ] ++ checkInputs; diff --git a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix index a2ac2a81c8..1a9ea4fd5e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix @@ -19,6 +19,7 @@ dbus, embree, fetchgit, + fetchpatch2, fetchzip, ffmpeg, fftw, @@ -132,7 +133,17 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "source"; - patches = [ ./draco.patch ] ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch; + patches = [ + ./draco.patch + (fetchpatch2 { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/raw/4b6214600e11851d7793256e2f6846a594e6f223/ffmpeg-7-1.patch"; + hash = "sha256-YXXqP/+79y3f41n3cJ3A1RBzgdoYqfKZD/REqmWYdgQ="; + }) + (fetchpatch2 { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/raw/4b6214600e11851d7793256e2f6846a594e6f223/ffmpeg-7-2.patch"; + hash = "sha256-mF6IA/dbHdNEkBN5XXCRcLIZ/8kXoirNwq7RDuLRAjw="; + }) + ] ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch; postPatch = (lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/cheat/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cheat/default.nix index ef8780f1e8..07b4eaa398 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cheat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cheat/default.nix @@ -16,6 +16,21 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; + patches = [ + (builtins.toFile "fix-zsh-completion.patch" '' + diff --git a/scripts/cheat.zsh b/scripts/cheat.zsh + index befe1b2..675c9f8 100755 + --- a/scripts/cheat.zsh + +++ b/scripts/cheat.zsh + @@ -62,4 +62,4 @@ _cheat() { + esac + } + + -compdef _cheat cheat + +_cheat "$@" + '') + ]; + postInstall = '' installManPage doc/cheat.1 installShellCompletion scripts/cheat.{bash,fish,zsh} diff --git a/third_party/nixpkgs/pkgs/applications/misc/cubiomes-viewer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cubiomes-viewer/default.nix index f75ddf0c10..7e96b34af4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cubiomes-viewer/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "cubiomes-viewer"; - version = "4.0.1"; + version = "4.1.0"; src = fetchFromGitHub { owner = "Cubitect"; repo = pname; rev = version; - hash = "sha256-UUvNSTM98r8D/Q+/pPTXwGzW4Sl1qhgem4WsFRfybuo="; + hash = "sha256-ORTFddzVGKXpy5V6zXJgCnwLwn/8cWKklpcoHkc6u34="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/debian-goodies/default.nix b/third_party/nixpkgs/pkgs/applications/misc/debian-goodies/default.nix index 897881dec4..6e0fc3a0fb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/debian-goodies/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/debian-goodies/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "debian-goodies"; - version = "0.88.1"; + version = "0.88.2"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "debian-goodies"; rev = "debian/${version}"; - sha256 = "sha256-g1xeWhCkC7HEHHOJpcZ6JFA9jmavJE0lUX1Cmp5A0QQ="; + sha256 = "sha256-KPPRxYmCEYwlUAR29tc8w4rerXpswO/rbpEjXPoDV4Q="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/elogind/Add-missing-musl_missing.h-includes-for-basename.patch b/third_party/nixpkgs/pkgs/applications/misc/elogind/Add-missing-musl_missing.h-includes-for-basename.patch new file mode 100644 index 0000000000..f20c19d32e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/elogind/Add-missing-musl_missing.h-includes-for-basename.patch @@ -0,0 +1,121 @@ +From ae7ecfc9487756659077e126bfd296146125a59d Mon Sep 17 00:00:00 2001 +From: Alyssa Ross +Date: Sun, 13 Oct 2024 18:03:47 +0200 +Subject: [PATCH] Add missing musl_missing.h includes for basename + +Link: https://github.com/elogind/elogind/pull/292 +--- + src/basic/cgroup-util.c | 1 + + src/libelogind/sd-bus/test-bus-watch-bind.c | 2 ++ + src/login/logind-inhibit.c | 2 ++ + src/login/logind-seat.c | 2 ++ + src/login/logind-session.c | 1 + + src/test/test-fileio.c | 2 ++ + src/test/test-mountpoint-util.c | 1 + + src/test/test-path-util.c | 2 ++ + 8 files changed, 13 insertions(+) + +diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c +index 90cfeb570..c57fe54d0 100644 +--- a/src/basic/cgroup-util.c ++++ b/src/basic/cgroup-util.c +@@ -40,6 +40,7 @@ + //#include "xattr-util.h" + /// Additional includes needed by elogind + #include "env-file.h" ++#include "musl_missing.h" + + static int cg_enumerate_items(const char *controller, const char *path, FILE **ret, const char *item) { + _cleanup_free_ char *fs = NULL; +diff --git a/src/libelogind/sd-bus/test-bus-watch-bind.c b/src/libelogind/sd-bus/test-bus-watch-bind.c +index d6938a7f0..3227c17d7 100644 +--- a/src/libelogind/sd-bus/test-bus-watch-bind.c ++++ b/src/libelogind/sd-bus/test-bus-watch-bind.c +@@ -17,6 +17,8 @@ + #include "string-util.h" + #include "tmpfile-util.h" + #include "tests.h" ++/// Additional includes needed by elogind ++#include "musl_missing.h" + + static int method_foobar(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { + log_info("Got Foobar() call."); +diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c +index 86d1f84b3..4140f1aae 100644 +--- a/src/login/logind-inhibit.c ++++ b/src/login/logind-inhibit.c +@@ -26,6 +26,8 @@ + #include "string-util.h" + #include "tmpfile-util.h" + #include "user-util.h" ++/// Additional includes needed by elogind ++#include "musl_missing.h" + + static void inhibitor_remove_fifo(Inhibitor *i); + +diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c +index bef542d94..f520562ad 100644 +--- a/src/login/logind-seat.c ++++ b/src/login/logind-seat.c +@@ -24,6 +24,8 @@ + #include "string-util.h" + #include "terminal-util.h" + #include "tmpfile-util.h" ++/// Additional includes needed by elogind ++#include "musl_missing.h" + + int seat_new(Seat** ret, Manager *m, const char *id) { + _cleanup_(seat_freep) Seat *s = NULL; +diff --git a/src/login/logind-session.c b/src/login/logind-session.c +index ea69c2e6c..90ddec899 100644 +--- a/src/login/logind-session.c ++++ b/src/login/logind-session.c +@@ -42,6 +42,7 @@ + /// Additional includes needed by elogind + #include "cgroup-setup.h" + #include "extract-word.h" ++#include "musl_missing.h" + + #define RELEASE_USEC (20*USEC_PER_SEC) + +diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c +index b9b82e7ff..db981bd41 100644 +--- a/src/test/test-fileio.c ++++ b/src/test/test-fileio.c +@@ -25,6 +25,8 @@ + #include "strv.h" + #include "tests.h" + #include "tmpfile-util.h" ++/// Additional includes needed by elogind ++#include "musl_missing.h" + + #if 0 /// elogind does not need load_/write_/merge_env_file() + TEST(parse_env_file) { +diff --git a/src/test/test-mountpoint-util.c b/src/test/test-mountpoint-util.c +index de526100f..9d37ce77d 100644 +--- a/src/test/test-mountpoint-util.c ++++ b/src/test/test-mountpoint-util.c +@@ -16,6 +16,7 @@ + #include "string-util.h" + #include "tests.h" + /// Addition includes needed by elogind ++#include "musl_missing.h" + #include "virt.h" + #include "tmpfile-util.h" + +diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c +index 76fda746a..1df305d30 100644 +--- a/src/test/test-path-util.c ++++ b/src/test/test-path-util.c +@@ -16,6 +16,8 @@ + #include "strv.h" + #include "tests.h" + #include "tmpfile-util.h" ++/// Additional includes needed by elogind ++#include "musl_missing.h" + + TEST(print_paths) { + log_info("DEFAULT_PATH=%s", DEFAULT_PATH); +-- +2.46.0 + diff --git a/third_party/nixpkgs/pkgs/applications/misc/elogind/0001-Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch b/third_party/nixpkgs/pkgs/applications/misc/elogind/Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch similarity index 100% rename from third_party/nixpkgs/pkgs/applications/misc/elogind/0001-Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch rename to third_party/nixpkgs/pkgs/applications/misc/elogind/Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch diff --git a/third_party/nixpkgs/pkgs/applications/misc/elogind/default.nix b/third_party/nixpkgs/pkgs/applications/misc/elogind/default.nix index 985d821837..3d23056e69 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/elogind/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/elogind/default.nix @@ -79,11 +79,10 @@ stdenv.mkDerivation rec { (fetchpatch { url = "https://github.com/chimera-linux/cports/raw/49d65fe38be815b9918a15ac2d2ff2b123fc559a/main/elogind/patches/xxx-musl-fixes.patch"; includes = [ - "src/basic/cgroup-util.c" "src/basic/missing_prctl.h" "src/libelogind/sd-journal/journal-file.h" ]; - hash = "sha256-kY+B1t87E/TtWa83r0VoiojhRrrB667ZhUAHtHE7m28="; + hash = "sha256-JYPB9AKbQpVgid5BhwBTvcebE5rxDFRMYhKRNS8KPTc="; }) (fetchurl { url = "https://github.com/chimera-linux/cports/raw/49d65fe38be815b9918a15ac2d2ff2b123fc559a/main/elogind/patches/gshadow.patch"; @@ -111,7 +110,8 @@ stdenv.mkDerivation rec { url = "https://git.openembedded.org/openembedded-core/plain/meta/recipes-core/systemd/systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch?id=6bc5e3f3cd882c81c972dbd27aacc1ce00e5e59a"; hash = "sha256-ZyOCmM5LcwJ7mHiZr0lQjV4G+XMxjhsUm7g7L3OzDDM="; }) - ./0001-Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch + ./Add-missing-musl_missing.h-includes-for-basename.patch + ./Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch ]; # Inspired by the systemd `preConfigure`. 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 b235cabde9..ac8e15d389 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix @@ -10,13 +10,13 @@ buildPythonApplication rec { pname = "gallery-dl"; - version = "1.27.5"; + version = "1.27.6"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - hash = "sha256-q/byWRvbzrV6KjPIDjJJWl0fkrluGEcvrISPKz8SJ+4="; + hash = "sha256-bxh15aZIupTaHnYM65MAYuYtKx0z2OIQl3WKEU1gO4Q="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/hamster/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hamster/default.nix index bdab5d71e9..e6e9fbea77 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hamster/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hamster/default.nix @@ -35,9 +35,12 @@ python3Packages.buildPythonApplication rec { pygobject3 pycairo pyxdg + setuptools dbus-python ]; + PYTHONDIR = "${placeholder "out"}/${python3Packages.python.sitePackages}"; + dontWrapGApps = true; # Arguments to be passed to `makeWrapper`, only used by buildPython* diff --git a/third_party/nixpkgs/pkgs/applications/misc/holochain-launcher/default.nix b/third_party/nixpkgs/pkgs/applications/misc/holochain-launcher/default.nix index b438f6c6d5..85109890fb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/holochain-launcher/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/holochain-launcher/default.nix @@ -4,7 +4,7 @@ , autoPatchelfHook , dpkg , openssl -, webkitgtk +, webkitgtk_4_0 , libappindicator , wrapGAppsHook3 , shared-mime-info @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl - webkitgtk + webkitgtk_4_0 libappindicator glib-networking diff --git a/third_party/nixpkgs/pkgs/applications/misc/houdini/runtime.nix b/third_party/nixpkgs/pkgs/applications/misc/houdini/runtime.nix index a660ee2a5d..170d6a3d1d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/houdini/runtime.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/houdini/runtime.nix @@ -1,11 +1,11 @@ { requireFile, callPackage }: callPackage ./runtime-build.nix rec { - version = "20.5.332"; + version = "20.5.370"; eulaDate = "2021-10-13"; src = requireFile { name = "houdini-${version}-linux_x86_64_gcc11.2.tar.gz"; - hash = "sha256-ZqbLCWfPUo0fXS9liKOXsUEpm1d60bHIkbx+K98gFtU="; + hash = "sha256-QwPCU7E5yoJvWsiRUMBSAhEJYckbFTrQa1S4fto8dy0="; url = "https://www.sidefx.com/download/daily-builds/?production=true"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/insulator2/default.nix b/third_party/nixpkgs/pkgs/applications/misc/insulator2/default.nix index 2fb8b15e3e..423a773026 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/insulator2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/insulator2/default.nix @@ -7,7 +7,7 @@ , freetype , libsoup , gtk3 -, webkitgtk +, webkitgtk_4_0 , perl , cyrus_sasl , stdenv @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { freetype libsoup gtk3 - webkitgtk + webkitgtk_4_0 ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/khal/default.nix b/third_party/nixpkgs/pkgs/applications/misc/khal/default.nix index 32c307af60..b4151a9c50 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/khal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/khal/default.nix @@ -1,12 +1,35 @@ -{ lib -, stdenv -, fetchFromGitHub -, glibcLocales -, installShellFiles -, python3 +{ + lib, + stdenv, + fetchFromGitHub, + glibcLocales, + installShellFiles, + python3, }: -python3.pkgs.buildPythonApplication rec { +let + python = python3.override { + packageOverrides = self: super: { + # https://github.com/pimutils/khal/issues/1361 + icalendar = super.icalendar.overridePythonAttrs (old: rec { + version = "5.0.13"; + src = fetchFromGitHub { + owner = "collective"; + repo = "icalendar"; + rev = "refs/tags/v${version}"; + hash = "sha256-2gpWfLXR4HThw23AWxY2rY9oiK6CF3Qiad8DWHCs4Qk="; + }; + patches = [ ]; + build-system = with self; [ setuptools ]; + dependencies = with self; [ + python-dateutil + pytz + ]; + }); + }; + }; +in +python.pkgs.buildPythonApplication rec { pname = "khal"; version = "0.11.3"; pyproject = true; @@ -18,16 +41,17 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-YP2kQ/qXPDwvFvlHf+A2Ymvk49dmt5tAnTaOhrOV92M="; }; + build-system = with python.pkgs; [ + setuptools + setuptools-scm + ]; + nativeBuildInputs = [ glibcLocales installShellFiles - ] ++ (with python3.pkgs; [ - setuptools-scm - sphinx - sphinxcontrib-newsfeed - ]); + ]; - propagatedBuildInputs = with python3.pkgs;[ + dependencies = with python.pkgs; [ atomicwrites click click-log @@ -45,7 +69,7 @@ python3.pkgs.buildPythonApplication rec { urwid ]; - nativeCheckInputs = with python3.pkgs;[ + nativeCheckInputs = with python.pkgs; [ freezegun hypothesis packaging @@ -61,8 +85,15 @@ python3.pkgs.buildPythonApplication rec { --fish <(_KHAL_COMPLETE=fish_source $out/bin/khal) # man page - PATH="${python3.withPackages (ps: with ps; [ sphinx sphinxcontrib-newsfeed ])}/bin:$PATH" \ - make -C doc man + PATH="${ + python3.withPackages ( + ps: with ps; [ + sphinx + sphinxcontrib-newsfeed + ] + ) + }/bin:$PATH" \ + make -C doc man installManPage doc/build/man/khal.1 # .desktop file @@ -71,7 +102,7 @@ python3.pkgs.buildPythonApplication rec { doCheck = !stdenv.hostPlatform.isAarch64; - LC_ALL = "en_US.UTF-8"; + env.LC_ALL = "en_US.UTF-8"; disabledTests = [ # timing based diff --git a/third_party/nixpkgs/pkgs/applications/misc/lutris/default.nix b/third_party/nixpkgs/pkgs/applications/misc/lutris/default.nix index 2583663fb6..f01be485ae 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/lutris/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/lutris/default.nix @@ -13,7 +13,7 @@ , gtk3 , libnotify , pango -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 # check inputs @@ -93,7 +93,7 @@ buildPythonApplication rec { gtk3 libnotify pango - webkitgtk + webkitgtk_4_0 ] ++ (with gst_all_1; [ gst-libav gst-plugins-bad diff --git a/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix b/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix index 0f2f1e9c08..4d894c6eb5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix @@ -7,10 +7,11 @@ let qt5Deps = pkgs: with pkgs.qt5; [ qtbase qtmultimedia ]; - gnomeDeps = pkgs: with pkgs; [ zenity gtksourceview gnome-desktop libgnome-keyring webkitgtk ]; + gnomeDeps = pkgs: with pkgs; [ zenity gtksourceview gnome-desktop libgnome-keyring webkitgtk_4_0 ]; xorgDeps = pkgs: with pkgs.xorg; [ libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite + libXfixes libXtst libXScrnSaver libICE libXt ]; gstreamerDeps = pkgs: with pkgs.gst_all_1; [ gstreamer @@ -35,6 +36,9 @@ in buildFHSEnv { # Adventure Game Studio allegro dumb + # Battle.net + jansson + # Curl libnghttp2 @@ -127,7 +131,7 @@ in buildFHSEnv { libselinux # Winetricks - fribidi + fribidi pango ] ++ xorgDeps pkgs ++ gstreamerDeps pkgs ++ extraLibraries pkgs; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mediaelch/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mediaelch/default.nix index 4ad51e4a7d..58aae6450e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mediaelch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mediaelch/default.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation rec { pname = "mediaelch"; - version = "2.10.6"; + version = "2.12.0"; src = fetchFromGitHub { owner = "Komet"; repo = "MediaElch"; rev = "v${version}"; - hash = "sha256-qc7HaCMAmALY9MoIKmaCWF0cnwBBFDAXwqiBzwzu2bU="; + hash = "sha256-m2d4lnyD8HhhqovMdeG36dMK+4kJA7rlPHE2tlhfevo="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix index d98ecb21da..a20ed2d48b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix @@ -9,7 +9,7 @@ , steam-run , substituteAll , unzip -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 }: @@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec { pythonPath = [ python3Packages.pygobject3 python3Packages.requests - webkitgtk + webkitgtk_4_0 ]; dontWrapGApps = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mupdf/0002-Add-Darwin-deps.patch b/third_party/nixpkgs/pkgs/applications/misc/mupdf/0002-Add-Darwin-deps.patch deleted file mode 100644 index 2fe1a4afd9..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/mupdf/0002-Add-Darwin-deps.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 0f0ccfc01cfe72d96eafee57ec6c5107f09c7238 Mon Sep 17 00:00:00 2001 -From: toonn -Date: Wed, 9 Mar 2022 00:08:28 +0100 -Subject: [PATCH 2/2] Add Darwin deps - ---- - Makerules | 34 ++++++++++++++++++++++++++++++++++ - 1 file changed, 34 insertions(+) - -diff --git a/Makerules b/Makerules -index 6d52cca..a6bd0ed 100644 ---- a/Makerules -+++ b/Makerules -@@ -153,6 +153,40 @@ else ifeq ($(OS),MACOS) - LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO - LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) - endif -+ # Required for mupdf-gl -+ ifeq ($(shell pkg-config --exists harfbuzz && echo yes),yes) -+ SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz) -+ SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz) -+ endif -+ ifeq ($(shell pkg-config --exists libopenjp2 && echo yes),yes) -+ SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2) -+ SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2) -+ endif -+ ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes) -+ SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2) -+ SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2) -+ endif -+ ifeq ($(shell pkg-config --exists gumbo && echo yes),yes) -+ SYS_GUMBO_CFLAGS := $(shell pkg-config --cflags gumbo) -+ SYS_GUMBO_LIBS := $(shell pkg-config --libs gumbo) -+ endif -+ # Required for mupdf-x11 -+ HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes) -+ ifeq ($(HAVE_X11),yes) -+ X11_CFLAGS := $(shell pkg-config --cflags x11 xext) -+ X11_LIBS := $(shell pkg-config --libs x11 xext) -+ endif -+ # Required for mupdf-x11-curl -+ HAVE_SYS_CURL := $(shell pkg-config --exists libcurl && echo yes) -+ ifeq ($(HAVE_SYS_CURL),yes) -+ SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl) -+ SYS_CURL_LIBS := $(shell pkg-config --libs libcurl) -+ endif -+ HAVE_PTHREAD := yes -+ ifeq ($(HAVE_PTHREAD),yes) -+ PTHREAD_CFLAGS := -+ PTHREAD_LIBS := -lpthread -+ endif - endif - - else ifeq ($(OS),Linux) --- -2.17.2 (Apple Git-113) - diff --git a/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix index 0a242d50e3..25d8686b50 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix @@ -59,18 +59,23 @@ let }); in + stdenv.mkDerivation rec { - version = "1.24.8"; + version = "1.24.9"; pname = "mupdf"; src = fetchurl { url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; - hash = "sha256-pRjZvpds2yAG1FOC1/+xubjWS8P9PLc8picNdS+n9Eg="; + hash = "sha256-C0RqoO7MEU6ZadzNcMl4k1j8y2WJqB1HDclBoIdNqYo="; }; patches = [ - ./0002-Add-Darwin-deps.patch - ./0003-Fix-cpp-build.patch + # Upstream makefile does not work with system deps on macOS by default, so + # we reuse the Linux section instead. + ./fix-darwin-system-deps.patch + # Upstream C++ wrap script only defines fixed-sized integers on macOS but + # this is required on aarch64-linux too. + ./fix-cpp-build.patch ]; postPatch = '' @@ -99,7 +104,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ] ++ lib.optional (enableGL || enableX11) copyDesktopItems ++ lib.optional (stdenv.hostPlatform.isDarwin && (enableGL || enableX11)) desktopToDarwinBundle - ++ lib.optionals (enableCxx || enablePython) [ python3 python3.pkgs.setuptools python3.pkgs.libclang ] + ++ lib.optionals (enableCxx || enablePython) [ (python3.pythonOnBuildForHost.withPackages (ps: [ ps.setuptools ps.libclang ])) ] ++ lib.optionals (enablePython) [ which swig ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames xcbuild ]; @@ -114,6 +119,7 @@ stdenv.mkDerivation rec { ) ++ lib.optionals enableOcr [ leptonica tesseract ] ; + outputs = [ "bin" "dev" "out" "man" "doc" ]; preConfigure = '' @@ -166,7 +172,6 @@ stdenv.mkDerivation rec { EOF moveToOutput "bin" "$bin" - cp ./build/shared-release/libmupdf${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib '' + (lib.optionalString (stdenv.hostPlatform.isDarwin) '' for exe in $bin/bin/*; do install_name_tool -change build/shared-release/libmupdf.dylib $out/lib/libmupdf.dylib "$exe" @@ -180,17 +185,19 @@ stdenv.mkDerivation rec { ln -s "$bin/bin/mupdf-x11" "$bin/bin/mupdf" '') + (lib.optionalString (enableCxx) '' cp platform/c++/include/mupdf/*.h $out/include/mupdf - cp build/*/libmupdfcpp.so* $out/lib + cp build/*/libmupdfcpp.so $out/lib '') + (lib.optionalString (enablePython) ('' mkdir -p $out/${python3.sitePackages}/mupdf - cp build/*/_mupdf.so $out/${python3.sitePackages} + cp build/*/_mupdf.so $out/${python3.sitePackages}/mupdf cp build/*/mupdf.py $out/${python3.sitePackages}/mupdf/__init__.py '' + lib.optionalString (stdenv.hostPlatform.isDarwin) '' - install_name_tool -add_rpath $out/lib $out/${python3.sitePackages}/_mupdf.so + install_name_tool -add_rpath $out/lib $out/${python3.sitePackages}/mupdf/_mupdf.so '')); enableParallelBuilding = true; + env.USE_SONAME = "no"; + passthru = { tests = { inherit cups-filters zathura; @@ -212,8 +219,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fpletz ]; platforms = platforms.unix; mainProgram = "mupdf"; - # ImportError: cannot import name '_mupdf' from partially initialized module 'mupdf' - # (most likely due to a circular import) - broken = enablePython; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/mupdf/0003-Fix-cpp-build.patch b/third_party/nixpkgs/pkgs/applications/misc/mupdf/fix-cpp-build.patch similarity index 100% rename from third_party/nixpkgs/pkgs/applications/misc/mupdf/0003-Fix-cpp-build.patch rename to third_party/nixpkgs/pkgs/applications/misc/mupdf/fix-cpp-build.patch diff --git a/third_party/nixpkgs/pkgs/applications/misc/mupdf/fix-darwin-system-deps.patch b/third_party/nixpkgs/pkgs/applications/misc/mupdf/fix-darwin-system-deps.patch new file mode 100644 index 0000000000..4a170b4c1d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/mupdf/fix-darwin-system-deps.patch @@ -0,0 +1,60 @@ +diff --git a/Makerules b/Makerules +index f582dc061..2da5680b6 100644 +--- a/Makerules ++++ b/Makerules +@@ -178,39 +178,20 @@ ifneq "$(CLUSTER)" "" + endif + + ifeq ($(OS),Linux) +- LINUX_OR_OPENBSD := yes ++ LINUX_OR_OPENBSD_OR_MACOS := yes + endif + ifeq ($(OS),OpenBSD) +- LINUX_OR_OPENBSD := yes ++ LINUX_OR_OPENBSD_OR_MACOS := yes ++endif ++ifeq ($(OS),MACOS) ++ LINUX_OR_OPENBSD_OR_MACOS := yes + endif + + ifeq ($(OS),MINGW) + WINDRES := windres + HAVE_WIN32 := yes + +-else ifeq ($(OS),MACOS) +- HAVE_GLUT := yes +- SYS_GLUT_CFLAGS := -Wno-deprecated-declarations +- SYS_GLUT_LIBS := -framework GLUT -framework OpenGL +- CC = xcrun cc +- AR = xcrun ar +- LD = xcrun ld +- RANLIB = xcrun ranlib +- +- ifneq ($(ARCHFLAGS),) +- $(warning "MacOS with ARCHFLAGS set. Assuming we are building for arm64, and setting HAVE_LIBCRYPTO to no.") +- HAVE_LIBCRYPTO := no +- else ifeq (, $(shell command -v pkg-config)) +- $(warning "No pkg-config found, install it for proper integration of libcrypto") +- else +- HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes) +- ifeq ($(HAVE_LIBCRYPTO),yes) +- LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO +- LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) +- endif +- endif +- +-else ifeq ($(LINUX_OR_OPENBSD),yes) ++else ifeq ($(LINUX_OR_OPENBSD_OR_MACOS),yes) + + ifeq ($(OS),Linux) + HAVE_OBJCOPY := yes +@@ -274,6 +255,9 @@ else ifeq ($(LINUX_OR_OPENBSD),yes) + ifeq ($(OS),OpenBSD) + SYS_GLUT_CFLAGS := $(shell pkg-config --cflags glut gl) + SYS_GLUT_LIBS := $(shell pkg-config --libs glut gl) ++ else ifeq ($(OS),MACOS) ++ SYS_GLUT_CFLAGS := -Wno-deprecated-declarations ++ SYS_GLUT_LIBS := -framework GLUT -framework OpenGL + else + SYS_GLUT_CFLAGS := + SYS_GLUT_LIBS := -lglut -lGL diff --git a/third_party/nixpkgs/pkgs/applications/misc/ola/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ola/default.nix index b02a63301f..669ced198c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ola/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ola/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { python3 ]; propagatedBuildInputs = [ - (python3.pkgs.protobuf.override { protobuf = protobuf; }) + (python3.pkgs.protobuf4.override { protobuf = protobuf; }) python3.pkgs.numpy ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/omegat.nix b/third_party/nixpkgs/pkgs/applications/misc/omegat.nix index 48756794b9..f5d9a9eb92 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/omegat.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/omegat.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, unzip, jdk, makeWrapper}: stdenv.mkDerivation { - version = "6.0.0"; + version = "6.0.1"; pname = "omegat"; src = fetchurl { # their zip has repeated files or something, so no fetchzip - url = "mirror://sourceforge/project/omegat/OmegaT%20-%20Standard/OmegaT%206.0.0/OmegaT_6.0.0_Without_JRE.zip"; - sha256 = "sha256-dsbT5iuZBudUL4Kw4rdvi4y98mcvnYNj9jRvC5wJoYI="; + url = "mirror://sourceforge/project/omegat/OmegaT%20-%20Standard/OmegaT%206.0.1/OmegaT_6.0.1_Without_JRE.zip"; + sha256 = "sha256-Rj50bzT8k7+GWb0p/ma+zy+PzkF7tB6iV4F4UVAImJg="; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/overmind/default.nix b/third_party/nixpkgs/pkgs/applications/misc/overmind/default.nix index ebdf67ca7a..ceaec16839 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/overmind/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/overmind/default.nix @@ -24,6 +24,6 @@ buildGoModule rec { description = "Process manager for Procfile-based applications and tmux"; mainProgram = "overmind"; license = with licenses; [ mit ]; - maintainers = [ maintainers.adisbladis ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/p2pool/default.nix b/third_party/nixpkgs/pkgs/applications/misc/p2pool/default.nix index b8ca97d298..49a3c1cdca 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/p2pool/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/p2pool/default.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation rec { pname = "p2pool"; - version = "4.1"; + version = "4.1.1"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${version}"; - hash = "sha256-eMg8DXFtVfYhl6vpg/KRUZUgMU/XsCS29Af1CSIbUsY="; + hash = "sha256-rxsKbrgDdVtGEv63SHi3FbFpqU2j6ESksq0SDm78j+0="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pdfpc/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pdfpc/default.nix index cae71f7859..f7fa1223a3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pdfpc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pdfpc/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, vala, gtk3, libgee , poppler, libpthreadstubs, gstreamer, gst-plugins-base, gst-plugins-good, gst-libav, gobject-introspection, wrapGAppsHook3 -, qrencode, webkitgtk, discount, json-glib, fetchpatch }: +, qrencode, webkitgtk_4_0, discount, json-glib, fetchpatch }: stdenv.mkDerivation rec { pname = "pdfpc"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { (gst-plugins-good.override { gtkSupport = true; }) gst-libav qrencode - webkitgtk + webkitgtk_4_0 discount json-glib ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pytrainer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pytrainer/default.nix index d2340b15f1..5f226752cc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pytrainer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pytrainer/default.nix @@ -11,7 +11,7 @@ , perl , sqlite , tzdata -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 , xvfb-run }: @@ -54,7 +54,7 @@ in python.pkgs.buildPythonApplication rec { buildInputs = [ sqlite gtk3 - webkitgtk + webkitgtk_4_0 glib-networking adwaita-icon-theme gdk-pixbuf diff --git a/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix index 6bffbda0a0..f942607525 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, mkDerivation , fetchFromGitHub , installShellFiles , pkg-config @@ -14,18 +13,19 @@ , qtsvg , qtxmlpatterns , qtmacextras +, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qcad"; - version = "3.30.1.3"; + version = "3.31.1.2"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - hash = "sha256-bGSXFX1LuNZzs981t0GZxnMPzyJ+bddB4m/wkLMsfg0="; + hash = "sha256-lTe/XCW/qUARfIpcps1RMjubLiIR7cvYMZ0XgebaDrk="; }; patches = [ @@ -47,6 +47,7 @@ mkDerivation rec { pkg-config qmake qttools + wrapQtAppsHook ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/skytemple/default.nix b/third_party/nixpkgs/pkgs/applications/misc/skytemple/default.nix index c510e88537..daf10d19c5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/skytemple/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/skytemple/default.nix @@ -3,21 +3,21 @@ , gobject-introspection , gtk3 , gtksourceview4 -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 , python3Packages }: python3Packages.buildPythonApplication rec { pname = "skytemple"; - version = "1.6.5"; + version = "1.8.3"; pyproject = true; src = fetchFromGitHub { owner = "SkyTemple"; repo = "skytemple"; rev = "refs/tags/${version}"; - hash = "sha256-yfXu1sboKi8STPiX5FUD9q+1U9GfhOyEKDRvU9rgdfI="; + hash = "sha256-RFLxDV/L6Qbz14KqIEcMX/EnirNUrHL0MW8v5Z8ByK0="; }; build-system = with python3Packages; [ setuptools ]; @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { # webkitgtk is used for rendering interactive statistics graph which # can be seen by opening a ROM, entering Pokemon section, selecting # any Pokemon, and clicking Stats and Moves tab. - webkitgtk + webkitgtk_4_0 ]; nativeBuildInputs = [ @@ -36,11 +36,6 @@ python3Packages.buildPythonApplication rec { wrapGAppsHook3 ]; - pythonRelaxDeps = [ - "skytemple-files" - "skytemple-ssb-debugger" - ]; - dependencies = with python3Packages; [ cairosvg natsort @@ -49,7 +44,6 @@ python3Packages.buildPythonApplication rec { pycairo pygal psutil - gbulb pypresence sentry-sdk setuptools diff --git a/third_party/nixpkgs/pkgs/applications/misc/subsurface/default.nix b/third_party/nixpkgs/pkgs/applications/misc/subsurface/default.nix index e8cc4baf27..f1ebdb98c1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/subsurface/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/subsurface/default.nix @@ -25,16 +25,17 @@ , qtwebengine , libXcomposite , bluez +, writeScript }: let - version = "5.0.10"; + version = "6.0.5231"; subsurfaceSrc = (fetchFromGitHub { owner = "Subsurface"; repo = "subsurface"; - rev = "v${version}"; - hash = "sha256-KzUBhFGvocaS1VrVT2stvKrj3uVxYka+dyYZUfkIoNs="; + rev = "38a0050ac33566dfd34bf94cf1d7ac66034e4118"; + hash = "sha256-6fNcBF/Ep2xs2z83ZQ09XNb/ZkhK1nUNLChV1x8qh0Y="; fetchSubmodules = true; }); @@ -136,7 +137,25 @@ stdenv.mkDerivation { "-DNO_PRINTING=OFF" ]; - passthru = { inherit version libdc googlemaps; }; + passthru = { + inherit version libdc googlemaps; + updateScript = writeScript "update-subsurface" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p git common-updater-scripts + + set -eu -o pipefail + tmpdir=$(mktemp -d) + pushd $tmpdir + git clone -b current https://github.com/subsurface/subsurface.git + cd subsurface + # this returns 6.0.????-local + new_version=$(./scripts/get-version.sh | cut -d '-' -f 1) + new_rev=$(git rev-list -1 HEAD) + popd + update-source-version subsurface "$new_version" --rev="$new_rev" + rm -rf $tmpdir + ''; + }; meta = with lib; { description = "Divelog program"; @@ -149,7 +168,7 @@ stdenv.mkDerivation { ''; homepage = "https://subsurface-divelog.org"; license = licenses.gpl2; - maintainers = with maintainers; [ mguentner adisbladis ]; + maintainers = with maintainers; [ mguentner ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/survex/default.nix b/third_party/nixpkgs/pkgs/applications/misc/survex/default.nix index bfb79fd10b..a74d7e424e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/survex/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/survex/default.nix @@ -13,6 +13,7 @@ , perl , pkg-config , proj +, gdal , python3 , wrapGAppsHook3 , wxGTK32 @@ -20,21 +21,13 @@ stdenv.mkDerivation rec { pname = "survex"; - version = "1.4.3"; + version = "1.4.11"; src = fetchurl { url = "https://survex.com/software/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-7NtGTe9xNRPEvG9fQ2fC6htQLEMHfqGmBM2ezhi6oNM="; + hash = "sha256-Q+86sDfU3zYhRhnnO2rfzwmF3CmWPYcIf2VeQctIZ7Y="; }; - patches = [ - # Fix cavern.tst to work with SOURCE_DATE_EPOCH set - (fetchpatch { - url = "https://github.com/ojwb/survex/commit/b1200a60be7bdea20ffebbd8bb15386041727fa6.patch"; - hash = "sha256-OtFjqpU+u8XGy+PAHg2iea++b681p/Kl8YslisBs4sA="; - }) - ]; - nativeBuildInputs = [ perl pkg-config @@ -46,6 +39,7 @@ stdenv.mkDerivation rec { ffmpeg glib proj + gdal wxGTK32 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon diff --git a/third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix index cf3a6a46f9..bcad8be29b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix @@ -8,7 +8,7 @@ , gobject-introspection , gtk3 , wrapGAppsHook3 -, webkitgtk +, webkitgtk_4_0 , libnotify , keybinder3 , libappindicator @@ -44,7 +44,7 @@ python3Packages.buildPythonApplication rec { libappindicator libnotify librsvg - webkitgtk + webkitgtk_4_0 wmctrl ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/apache-directory-studio/default.nix b/third_party/nixpkgs/pkgs/applications/networking/apache-directory-studio/default.nix index 596ba95b74..7a051db536 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/apache-directory-studio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/apache-directory-studio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, jdk, makeWrapper, autoPatchelfHook, makeDesktopItem, glib, libsecret, webkitgtk }: +{ lib, stdenv, fetchurl, jdk, makeWrapper, autoPatchelfHook, makeDesktopItem, glib, libsecret, webkitgtk_4_0 }: stdenv.mkDerivation rec { pname = "apache-directory-studio"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { makeWrapper "$dest/ApacheDirectoryStudio" \ "$out/bin/ApacheDirectoryStudio" \ --prefix PATH : "${jdk}/bin" \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ webkitgtk ])} + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ webkitgtk_4_0 ])} install -D icon.xpm "$out/share/pixmaps/apache-directory-studio.xpm" install -D -t "$out/share/applications" ${desktopItem}/share/applications/* ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/av-98/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/av-98/default.nix index d17dfb8e28..1356adff79 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/av-98/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/av-98/default.nix @@ -1,6 +1,9 @@ -{ lib, python3Packages, fetchgit }: - -python3Packages.buildPythonApplication rec { +{ + lib, + python3Packages, + fetchgit, +}: +python3Packages.buildPythonApplication { pname = "av-98"; version = "1.0.2dev"; @@ -10,7 +13,10 @@ python3Packages.buildPythonApplication rec { sha256 = "09iskh33hl5aaif763j1fmbz7yvf0yqsxycfd41scj7vbwdsbxl0"; }; - propagatedBuildInputs = with python3Packages; [ ansiwrap cryptography ]; + propagatedBuildInputs = with python3Packages; [ + ansiwrap + cryptography + ]; # No tests are available doCheck = false; @@ -22,5 +28,7 @@ python3Packages.buildPythonApplication rec { mainProgram = "av98"; license = licenses.bsd2; maintainers = with maintainers; [ ehmry ]; + + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/badwolf/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/badwolf/default.nix index dabbdf8981..1c56fedfbd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/badwolf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/badwolf/default.nix @@ -5,7 +5,7 @@ , pkg-config , ed , wrapGAppsHook3 -, webkitgtk +, webkitgtk_4_0 , libxml2 , glib-networking , gettext @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - webkitgtk + webkitgtk_4_0 libxml2 gettext glib-networking 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 4c2ee8a3c3..1dae6fdb4a 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-cWY8P3D+PrIlbEdMYPp+4cFQZfOLbGeebC1Glg53Sx4="; + hash_darwin = "sha256-/0mBZCSNULvZSQ/irsQSgNPsuOSWiRRnJA/6ogHYeGk="; hash_darwin_aarch64 = - "sha256-Tu11SCTlB+8/ao0uS7AbknB5WuvN+cw/gHiyL6xKH1o="; - hash_linux = "sha256-Da+xaXNNP8eRccq87LBxMb+2oXJ4WRGLdWoCAhG2yAQ="; - version = "129.0.6668.89"; + "sha256-JWcYFYaaXM2KN6oSu7wwxztYPbhql2XYZlvL2ymKgwI="; + hash_linux = "sha256-odFoTWjDa9ilyOrQ0T+0xxedRD7YOe/s7xdAyyku74w="; + version = "129.0.6668.91"; }; deps = { gn = { @@ -15,8 +15,8 @@ version = "2024-08-19"; }; }; - hash = "sha256-+n9LjRLFvVB/pYkSrRCxln/Xn2paFyoY+mJGD73NtII="; - version = "129.0.6668.89"; + hash = "sha256-LOZ9EPw7VgBNEV7Wxb8H5WfSYTTWOL8EDP91uCrZAsA="; + version = "129.0.6668.100"; }; ungoogled-chromium = { deps = { @@ -27,11 +27,11 @@ version = "2024-08-19"; }; ungoogled-patches = { - hash = "sha256-fKMa/TxQRzteLIYMy+gn5fDvxLyrqtSwXHWxle0bhsE="; - rev = "129.0.6668.89-1"; + hash = "sha256-kvpLE6SbXFur5xi1C8Ukvm4OoU5YB8PQCJdiakhFSAM="; + rev = "129.0.6668.100-1"; }; }; - hash = "sha256-+n9LjRLFvVB/pYkSrRCxln/Xn2paFyoY+mJGD73NtII="; - version = "129.0.6668.89"; + hash = "sha256-LOZ9EPw7VgBNEV7Wxb8H5WfSYTTWOL8EDP91uCrZAsA="; + version = "129.0.6668.100"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/eolie/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/eolie/default.nix index 1c82fa7d86..6b68cbb4a0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/eolie/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/eolie/default.nix @@ -1,5 +1,5 @@ { lib, fetchgit, meson, ninja, pkg-config, nix-update-script -, python3, gtk3, libsecret, gst_all_1, webkitgtk, glib +, python3, gtk3, libsecret, gst_all_1, webkitgtk_4_0, glib , glib-networking, gtkspell3, hunspell, desktop-file-utils , gobject-introspection, wrapGAppsHook3, gnome-settings-daemon }: @@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication rec { gtkspell3 hunspell libsecret - webkitgtk + webkitgtk_4_0 glib ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ephemeral/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/ephemeral/default.nix index 0cd58bbd25..5036f0c626 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -13,7 +13,7 @@ , pantheon , pkg-config , python3 -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 , glib-networking }: @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { libdazzle libgee pantheon.granite - webkitgtk + webkitgtk_4_0 ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 4be907711c..fe5dfae337 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,1035 +1,1035 @@ { - version = "131.0b9"; + version = "132.0b6"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ach/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ach/firefox-132.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "4763bf000a15940affeccfe6e3cd468a9a8cd89db8d790292272f2819c980c07"; + sha256 = "e25bc2af3eead50c85ac7788071ce95c2e6833758b82a8f5ce5ccff75e18399c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/af/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/af/firefox-132.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "85046ad1fb678e95ca835435aa0722552a774e2c71f0b38cb9d15ba711d37c10"; + sha256 = "0e2881eaceedf139d43671b24f5a97c95ec0e78afb6635767d058fecff2ee44c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/an/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/an/firefox-132.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "353952993afb71045c68f373b590ba3a496981a365d2f4f0c33300f82750a87f"; + sha256 = "5d7b05d76aa98a67fac2bb1e7ed3382e5a773ed699732b7ceb36bbdf2f7f42a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ar/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ar/firefox-132.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "9965c0c302662f0863bce753d538950f0f5425575633f299188850505b9ca1cf"; + sha256 = "240fa78947be010e9a25a9d7a7a05a5323a19805af42a0b3ff10fb716279e40c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ast/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ast/firefox-132.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "b8bf592307c2719a448f9203471e3e71e90e1bacc41509d54a50307c3ac3920c"; + sha256 = "eea78ee53aafc91f04f2d517f52038e1c8c45cb3dc48cd291e0bbb7c7e71274c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/az/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/az/firefox-132.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "4a58014662c43072ae6616ff98c28ca8f54fd883329789c41248bf5d63c7404d"; + sha256 = "fd27ce68a63e48b10c6ca1f54d5964a957a79052ea86eecc3e4ac56f41dc3dd1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/be/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/be/firefox-132.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "f6845ab9a4715d92841973723c1126ffe10bf45a911c12cd74e3a09bdc1ad2b6"; + sha256 = "1d0895eaae18d8015b6d87918c09956d466e69332c7f6f7c135fc344f7c96de1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/bg/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/bg/firefox-132.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "9d180594754fe68366fb37ae22c9a1fc20ee429ae997ef482f7bd192f1ece760"; + sha256 = "fc66226a6bedaf0cbf197674fe1a22a375f0e3b4063c657c1e74247b5a21d387"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/bn/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/bn/firefox-132.0b6.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "8281a1f5577892eeba43c761c66c26d0304faab55d5e4579a6f977e26f3fd6ae"; + sha256 = "1d76f516a6612f98e70ff4f6e139a8cc0e94c1b59741997c62c2e7d5110bfb78"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/br/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/br/firefox-132.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "188e8f62ef978a7113b648caccf581055f64925a170351169d193d8635492b97"; + sha256 = "ea7eb2fd67e35c630609cc002cd7fdcfa2ca8f9fc8075306f176fa1a7e32ad81"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/bs/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/bs/firefox-132.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "b3ec4dd38cc6efdee0bea477f3cf804304d4b36b34b124cd969b7f5925009e30"; + sha256 = "ee0b412c54a55c3c3a76addf78f417492117da4c60c09acc5c8833f13cc13197"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ca-valencia/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ca-valencia/firefox-132.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "f2519beaa589ee54f69e0a5d35c583fdabe80df247aa83f7915e2370c457d8f6"; + sha256 = "8d87382885ca5eb0f7e7cb404b66773da755a61f23f7a5bd26e55f870a573a6e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ca/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ca/firefox-132.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "22dd974392d30780b1a233406153082d292a7ad9ea3920f0afd315c6c9d7796f"; + sha256 = "f9c9046cad1b9101bb6be189dddc0586ac6ca699ac17a6781e4f2514c231dc47"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/cak/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/cak/firefox-132.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "6afb592800ed07337b807a6bd925c4c0db40c9d18a28b7976a88f349e0dc46d7"; + sha256 = "b1b562134bda139e48ecae233328a4c46fa63985cf3f30aa1788e6c5107f1d0f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/cs/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/cs/firefox-132.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "5975de9356392c335c37136be59c157a0364238eada296d356429f3c9a3c232f"; + sha256 = "6ab5dbb55d44bf2bd881daf82b55ad3927aac541d847ea78832d44bb3edac17c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/cy/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/cy/firefox-132.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "ff96ef11edde597f1c8c4dce2da4d6b9c72e3652c911d7e34368a9dbdf5fe1ba"; + sha256 = "d4b43431cb1b2c63edea0d1e7f547251397151f93337796169c7daf74dff92c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/da/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/da/firefox-132.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "620e6b7f7398e9942b67e41c6c850739a753ed46bcf82ce504c8e9912c46cd97"; + sha256 = "d0202d86602613fa49fbb1f5e747cdf08952ce398809832787553efef23c85e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/de/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/de/firefox-132.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "1bf2006d6c8c2275eab203ba2d6a0d8aefea199e7276c4a33019400b2557fe2c"; + sha256 = "961e353920d4f68ce18ed2a052b1cec3b68997511e2f587ae5a90f093d9d2d32"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/dsb/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/dsb/firefox-132.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "600f9fd28335e4a86a79d3e0a8a83d8037e439426ea514c4257316230092d2bd"; + sha256 = "bcebd528252103a6c35a13d9ba74ecedd21df421363e2a02527def78d195e229"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/el/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/el/firefox-132.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "d14fce952540ab83fcea14b8318817138b93d4ade2fc95c38211e3888fcb152b"; + sha256 = "88be7e9729108ecf6ce9df63e82fa00f448387c67ee022693034eb4e93100ff2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/en-CA/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/en-CA/firefox-132.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "f54ee4901ce8d26f812f97f5a1aa803d46c3b79e9db85fec7d5d49ae78b2d3b5"; + sha256 = "4f18dd9faca0c9e958c7a051a6087d604c3818f7f8812f03e0fde90b2a4b3020"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/en-GB/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/en-GB/firefox-132.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "cbc631160a71849b8f104a8e3486b750b1d1e614bd763c6f4aa67b2a8b804680"; + sha256 = "8571187956ebe889c68ffdf6bdf8cc2ad7ab3922bdda55b13c2d20319ccd9439"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/en-US/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/en-US/firefox-132.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "6b8b2aead8f8ad4ad979277e2af621ae27d6a2dc11781abf85f11e1a867411f4"; + sha256 = "4a698b38b8fbcf2bd31eddde0516d3ded002a931bfec2f8c25f2aa12374705bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/eo/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/eo/firefox-132.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "ab1c46580ab975f9a1318e23b8d8269b485c9ffd82696d2579efbce6d41a7c67"; + sha256 = "69d4d15a2fe7ac61e88f9d9da7245892d41b233eb88f693b5333285512485e27"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/es-AR/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/es-AR/firefox-132.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "00e238aa562c1700d8faa26b0233e17f6185a2cc2599e7842c34870d9e0227e5"; + sha256 = "010819207dd46a9fb08df54d1584d4592b03155ed47e328f833ed84c3b742e70"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/es-CL/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/es-CL/firefox-132.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "d6a1d8734908c47e5392670f68ee6bd413bb2d81635da5e244e9ccd7bdbbd0d8"; + sha256 = "ca36cbac24586894e4f3a5c91c23358657699170006cd341636b0e7df1ce5feb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/es-ES/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/es-ES/firefox-132.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "ef25296096196e03c4d73156b0915e15bf5de0a3beca46693902e0bbdc276152"; + sha256 = "0d18c2b0a21a1cb6965c3d468994fcf06f828554c76e9d3a369df46272b67276"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/es-MX/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/es-MX/firefox-132.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "c41c0c851eee771d4c12a0296979837efc33730448d03a34565c326311efee4e"; + sha256 = "3dcdafb0e434fdee06c1a8a90f173754125b60542629ef2903ede4111e412138"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/et/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/et/firefox-132.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "810668f7056a9e025bf48f0e1dd07ca588b1e159bac5c406460f18372c8a126d"; + sha256 = "60e9d139098f958d2081e585744fe439e9a21da8e42f440b5596f11a794585e0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/eu/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/eu/firefox-132.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "f9a7f2caba22a34d7363ef3e0fe2097ae577fffb8f410b5e4544ea4e158fd7c4"; + sha256 = "5cb5b3310c9d83ef60edc981ecb9cac86a37a6aad342cfd4de5993c2a5e5890a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/fa/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/fa/firefox-132.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "9ea0945da1a54c10bec5ae2c459963ae6b87ae2958b35a352ea2e7c7aca86e48"; + sha256 = "119d0c451b376a9b7ac07a8a66b22b1dd4e3224104da70e432b960693eac8b91"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ff/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ff/firefox-132.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "103b3246e2411b27caf160379581b33ed1b749444903a4194b0d33f1b2ea3c1a"; + sha256 = "6d1e5478b6daba5f38706d762371c63660b91c287b24cd523b2f69f04c343d9d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/fi/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/fi/firefox-132.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "2a25aa1fc5bc4126b93a47acb8554c4e337ab40faa5631b729b8f4b8b1278199"; + sha256 = "329b9bfe890bf3c26bd8fd1f5e505989d983c0fb8e47e84fe88cdab8b07dfd6b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/fr/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/fr/firefox-132.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "57e5b8cb7ff457f22c40d75cd6f4b997afdd0b195f9d627bbdb08542c8bc0c84"; + sha256 = "54687eb45d0a991e137c2c1634f3502365d479c3ca673f9632d3186499624013"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/fur/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/fur/firefox-132.0b6.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "3e6025dacc114d5798a74816d5b688f1b35fcd8e43664c53b2ae250790fdaa31"; + sha256 = "66eedf169feeaab1e9c7996df987ed6f0a3f0efaaf854ffa0f1cfa657b88809e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/fy-NL/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/fy-NL/firefox-132.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "94868a793e8f2f4d6489832d2f8f775f41a1e75cc1c2cadbfc9aec7bb490ea44"; + sha256 = "0943d17fd1a304b392f03247205f8ac9921a6572ab1fbe951eca591534236304"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ga-IE/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ga-IE/firefox-132.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "1122f87064c7d34664a2c357ed572326b4722f2070d9ffb215a911dd4dee10e0"; + sha256 = "fae0777a01c5b3d01abceebfdd347f6c6e5cf7fc2c7e955dcf282a83fa7c7a45"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/gd/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/gd/firefox-132.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "271b9616e87ae48d0a0f10cb354e4757762b8a6fd70d47c7eaf36f8175948f2c"; + sha256 = "179fcd7a6e1d5d8061eee8dfc232e320f9f1f240bc9b720293acc55979e7dc12"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/gl/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/gl/firefox-132.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "383a27b1a3811dd920cca825eff6d73546df6cc43c91090a3b2802d18e6356c0"; + sha256 = "ebd4b70176296f7833c17a62d91255ee002f72a6915a6e6b900c37a169c9af80"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/gn/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/gn/firefox-132.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "3d91aa02daec75a4f46365fd2e01e2d8384b980de87a7c332e38f96b16ad40ee"; + sha256 = "a75fbcd8ba47d58cd97cef837b410bf6e75b44df5d8a079c4b268c60fb91898c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/gu-IN/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/gu-IN/firefox-132.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "4bb2617124583eaa98d78747eb815c0fded49567b0322f12691b0d9d92b1ac3c"; + sha256 = "55dc7502274b2d8b01e2bde554bc101cb5b370dadc816f225166790ca90f9985"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/he/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/he/firefox-132.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "6cd73d1ed9d9b4a6e3b3f42eb2326e934bc63d8b65847bb86f2485203a984546"; + sha256 = "18f74efef4ecba385b66652a581abaf3e399286035a8b48d716f0716d8c5a1e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/hi-IN/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/hi-IN/firefox-132.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "b58ede5f65661ae777ae357f5da1e07915e52a649421772bb5dd8b9194afc386"; + sha256 = "5fb6f9d4660095276690e510ab92e939855d1a70ff7fd8985f66b63340968022"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/hr/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/hr/firefox-132.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "540b9e4bb100ba1498e39f4fdfa40d7d3f6607054c679527c2e2fdf679c73dc2"; + sha256 = "7b92150274387c1a58eef3141b0e8981579b0b9966fb7a381dcd88deaa47b5cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/hsb/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/hsb/firefox-132.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "b77d277e46d2c4f855d3aa000da4e9664c93b734c679afe16b059e3b348df05b"; + sha256 = "831036e8c730e25fa4faf32101190b9cc17c621f53c3531898929a692d1cf404"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/hu/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/hu/firefox-132.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "ef5519a39296a517876092ea902ba93bea1915a0d32f664e9a5c86e8933cf49c"; + sha256 = "bbf9078736b5d89a7c9e252c341977ba5f5473959ff20e8a8c804250433bf1f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/hy-AM/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/hy-AM/firefox-132.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "4f50d666cdd26affa0da647af3df72b8d960bdb3697c5efc6b8537fb26813704"; + sha256 = "d80455c003e4bc930ad90cba0c1ac2c353f40ee62d46eea9ace9e04b1aa426d2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ia/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ia/firefox-132.0b6.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "5437999fcac257a3d7d83b2ee8267fe142583a39e0ffd80b8abe69a78bbca57f"; + sha256 = "d7cad9bcbaf604105ac3b5a40aa0edd249d3e68e023a96a7893670b8f88e943a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/id/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/id/firefox-132.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "2527e3f497eaa25bbe0650c249c3f07f9b1c451c74d58a7b47fbc542bf4fc01a"; + sha256 = "f0132ac7c33619ca15babea69a13852c07e28212add00812ba992bbdbbfda484"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/is/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/is/firefox-132.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "565db2c30fa3d51dc6061c134e4c428e7d65bf1d99ebe8c936e0f13b14e9ba31"; + sha256 = "02c012807824b92296c94ec4770633e0b7b1aa1e4cca11fe390d77264a8f5836"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/it/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/it/firefox-132.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "cbfb895d5e01e2b4c80592dcf9a6a8a67fff3fdd926ca418066b52c5cf8af486"; + sha256 = "493fc9938e2cf097ec2969aecc1b5cfcecccdfc99680eb4d53f35cc82d0ea674"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ja/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ja/firefox-132.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "afe3aad601e339f649596754620a6cb41178e0580e2e04dfc3525921177ec2f9"; + sha256 = "d1429390dea25b931143963f67594817a3a9c206ac51f2b29173306ef208b0cc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ka/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ka/firefox-132.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "037ac18be525fd286e58d3cca21a83a92962df5b5317f561f014536e71eaf2a5"; + sha256 = "021292b8028a6ae18a41176718058d436b8b5a1dda4d3c7e0e49e31ed556468d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/kab/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/kab/firefox-132.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "e26ad34373517016e32b6e1901f0b1a310870f2ce269e7273e4f3d5859c164aa"; + sha256 = "457c961054f45be98ba0f6add85a712d95375b59505b04e4cb9e1154e9289909"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/kk/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/kk/firefox-132.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "ff379878de875600ec9c229153a37500f6f1b4e2ff0a61916698e18da0235b3d"; + sha256 = "91a4327d47a8f259e99204fd806699de7054b9244b0bb8146471dd3a63e2d076"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/km/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/km/firefox-132.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "abac0d85952087d33c02880c689ab47a8b51ff421e6e7d1f2703250005662e21"; + sha256 = "7b603a91f18b3f377cc34ad30f004a52dd7bde4dcc7f672f74bb562ef540c30b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/kn/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/kn/firefox-132.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "a4fa0dbe1d51351c8ab54cc44bf4a3810a6919049e174d93c7dd64a86838c0c7"; + sha256 = "3eb92c102cecdefeb4e73010f2cd6120d9390330fe746ea6ea7113ba54ae9518"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ko/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ko/firefox-132.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "02901a60da1e4ac3b8b70579ae003270dccefc72c112f4bbac1e3ba38a391a9a"; + sha256 = "86d3432271bdbb33b9aa218d5a11909f6fb183cee62d71808b9c820a0616eab2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/lij/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/lij/firefox-132.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "2f4d71e54f56426651218df43cffae83d4a0da4f775f9e540d21f9e4e059d6c9"; + sha256 = "56a7a3e8ce7877f9e6d50eada51935b9c751780dc90c4e8cffb19940f17fccb7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/lt/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/lt/firefox-132.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "d27567298bdd12f95089983413d3379987b2842fd94e29761aa83c89908ab3d3"; + sha256 = "b50355988b3d276643353cbee06ad05c7a4e1ca671eac9d8fe54bf787d62e0ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/lv/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/lv/firefox-132.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "781792bdd0f5169bda104c1bce61d80e3dfe854a98dc469d5fd89145e7480c16"; + sha256 = "aa8f7ad9f5c4aeae3ccadb86da303599df1fd459ad6aee0450fe6b6674b6cd44"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/mk/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/mk/firefox-132.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "441acc04a7796fdd9a693049ac2a2a99e19ca26d5433158a649dc9054cc78bfd"; + sha256 = "111eb6af1ac41984af10c5576b0f79d1747360c679fe4cca84915656f1b17b8c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/mr/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/mr/firefox-132.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "a45c4c84a08f969821f060d81e6537600d4c6f7be4bcb7967e0a1e4df8057985"; + sha256 = "43fbe5f3d22bf5a671c157dce6632b9f30cc9ed9cc22d7ffe1c7939329d0b1cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ms/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ms/firefox-132.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "9a1f96989aa5b0f5f40bd9b89f813b586334165d28ce68d0ea811bf4b4377a12"; + sha256 = "2f48806fb111cb14933453868fb485758ec4c9c68ccd37799767a3c21cab0eec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/my/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/my/firefox-132.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "3622b5b8c9af179a8a536f3ce616132ebd8d3dc13f67a0368c7190c579cf9dbd"; + sha256 = "da074cf7baadb63e1c9a3abbfb91ffec3a5803d4f7670eca6ac7480b183c9cf5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/nb-NO/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/nb-NO/firefox-132.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "062a00dec6f88988674e0b79f3c53215dc1dcfd270f04f9dc24fc0c69cbcc3bd"; + sha256 = "851c9436912128a0ae64aa7e1a9f990df503d69629c2ef4e926e0a6d8aeeb2b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ne-NP/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ne-NP/firefox-132.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "9a83d84d258cd1ad43dda913423825aeaa3e77f7c51fff699cbed4932b2fccac"; + sha256 = "d542a9954f7021bc4720b6eccd42aac48115fd9efad927790daa49613f8f90b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/nl/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/nl/firefox-132.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "88f5a6ef96cb7aaff5903085988a43a0f5bd38c85e353076d150434986d571b3"; + sha256 = "dcc631be5ac05352bbc1168038a701be825f4ea003db86dc0b5f2e1b3c9791cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/nn-NO/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/nn-NO/firefox-132.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "0c226da7a894a8d13e6442b49ea60712afb95409fc0f8c786915594142fada35"; + sha256 = "7b8f99d8cd68224937b5058524083d58934ce9122241d77cff61b1d33a8fc5c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/oc/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/oc/firefox-132.0b6.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "54e231943cd9766431635429ba349590a9a80bfecf66eaad597d7c72cf4dcb0a"; + sha256 = "c36995dc2249eac5d7ca667315d09d9b59a5f2cf60ad95306217377e0c10921f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/pa-IN/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/pa-IN/firefox-132.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "c9dc7e8f3c8dce9ca52f033928e7bbcc955e06afbb2d1322c6e4156d2b079d76"; + sha256 = "ff5f11f855c84eba7852e786634b5025ffe41dc7eef3639123a441b2dde791b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/pl/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/pl/firefox-132.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "b310f3ea397ab1c84c0e4481a6a8d95f026766ab757faa412e5963a883c01fb9"; + sha256 = "e84813f0dafa0043a89497d865e80ebf11bf7217f8f911ecd94304e9df6b60e4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/pt-BR/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/pt-BR/firefox-132.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "aa2881ab9553305e96544a534f42a476c26cbc206658ec2fe2b4927085e74481"; + sha256 = "2cb87ce508563542960442774d8f7f830e70b22772176905234422bb3da3eda6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/pt-PT/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/pt-PT/firefox-132.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "a8b171efe5ea76a3dacf02931f4bc4373aee947c9c326a514618fc827a0c2fcd"; + sha256 = "6249dfcfc04b954adb3f189c78cc2a383f3ec40b404ac11956e10f12f4bf816d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/rm/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/rm/firefox-132.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "8a05a553e9e0a35db3e871604c6921441d1eb859d9d05a2de8ac5e65ac3fb2d4"; + sha256 = "7d57212324302b5d926be44567efe41a13676aed4f0f82072cf1cdb204919733"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ro/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ro/firefox-132.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "1873afb93447fc534b18370f8349e871dac5c8aa2f7380fec998a95259585d4f"; + sha256 = "aec8f5e5749c4b72faedd53d339dbf6cbd6fa08e1ae840ddd4b78c4bc85efaab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ru/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ru/firefox-132.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "dc4c06cc1440b014a85a889ba019e4ef1a5feb89e870f4dd7ac687114f6cd3ee"; + sha256 = "10c50f4a9781dbcc9ea55b419bb7e152eafbb699d021052eea904260afa3263e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/sat/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/sat/firefox-132.0b6.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "562d52bbcbb8883bf4a790960dcd91f090b3c2f8899c03d0440edbe4a30a0eff"; + sha256 = "c24b08ba6b2053194c1afeced698d9a0c82613ac0fe68e37d8121fe26f1f0a15"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/sc/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/sc/firefox-132.0b6.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "e75d71ba560a52a50c8032bf4d7df8da27c8cf8eb7cf4e9016e56a6377df1b5f"; + sha256 = "4e560df815dfb2f2f241b66c9fc0bfac35d17924b7039b2e583e604ce787d90f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/sco/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/sco/firefox-132.0b6.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "e94f83e68516732fbbe00ad6caea44ae166c996ddd05fd2a7049c187143ea277"; + sha256 = "21e82b0c3789e570649704aa2045e6a1c18efec509bccad61479001fd4153e67"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/si/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/si/firefox-132.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "6883130e8537d9d4d8213103a75b9bc31b95535449ddbef258a602c11bfe144e"; + sha256 = "ea0015c32dc1e563bbf551cdc2c68d80fd2201d0b6a692753f67fc0046f5a8cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/sk/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/sk/firefox-132.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "6343a3fb3b7c8ab39c87c5abccc4eceb9105c9f59e6dc8944e2a2dc7b23ac073"; + sha256 = "a7ffed45b58328a8b20f62fee06a1962335e2e33fae05d549f1f51d823ce8976"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/skr/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/skr/firefox-132.0b6.tar.bz2"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "f74f73fda01b36deed700f0b089bd3688f60b76b61aa1444a1d092d7d54599f8"; + sha256 = "17e5c43d28de384c99db927cd81e1f3e0c2aa14bacbd912e53f82e8761dfb8b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/sl/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/sl/firefox-132.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "5c5a2ced7e9236d0cdbfb566105128307bd0012cbdd39af705e48b262e85aea2"; + sha256 = "c4fb6580921e5e10e726d264bb9aff52bfb42f4b262f16baafe5fa77cef14925"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/son/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/son/firefox-132.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "7e1bed00b5d0daa360a0a0b019cd9d4130006cd269c5e092ff48ef3288da21f7"; + sha256 = "cd65f47a1809eaf8ebad9af6c4ae40f9f1cafa7fb37d5c59252c309870487594"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/sq/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/sq/firefox-132.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "d49e5c8bc7d2be60ae98b4a9f07579ddec4b153b300e35c6d1aea2d9f66ccc8d"; + sha256 = "553e14f9a6cc7a91e7ae4331a0c6224be0b3740f11ba139e1d1b47e783583e4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/sr/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/sr/firefox-132.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "363a6c7cffa7e5088d7253dce1e4981752a43a57c57d2183471644415776ce32"; + sha256 = "f751e253f51b2e4cf0816c5fcaaf89d0bcf3f5fa690f40668cafe0cd50c28c43"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/sv-SE/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/sv-SE/firefox-132.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "5a5e86dacac51bc734078575bbb394690ddb479830c95ace2520403249f4d386"; + sha256 = "6e57f8f0fc31caf4227c7339460deacac7bbfd3f432c49a5f7b4b8edf71f55fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/szl/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/szl/firefox-132.0b6.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "cd8d6559dfef4999094775ccc7499170d5f41304215094e02a30b4c63017c7e9"; + sha256 = "3d38fe4cf2b039af03b7e8be73cb35d529a0008a984ab4936afafd5c163a7a16"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ta/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ta/firefox-132.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "a83ff685e9a0b45c32ebec720382ab696f1135457369a44917ec34ebda26db8f"; + sha256 = "7e5e5e2aa01985d6241f4327006c27651e76f7e1c3855c75656485667f38dc0c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/te/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/te/firefox-132.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "5a2d5f05b95044bdd40f89ba7110b74902295b51a9ac59ef3e645b241bb90622"; + sha256 = "a313c3be09fa343da4ab869785b0a9c04dbdea979398fa3697fccc4a1791bc20"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/tg/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/tg/firefox-132.0b6.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "0ef5be4109ba6caafa91edc5ad32149fd76ed045258b045f30c1aa9b024428ba"; + sha256 = "de9433a353d8cd8ed95f88a207e267cda90d17699025dea658975b7f0971068c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/th/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/th/firefox-132.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "5ac6d03de6aab2c5280fa880a13eec2cb228c02fe307e4bcd2e460cbe2f10ae7"; + sha256 = "2dd35f8f097147aa9b4d7272054ed80ef644b3898a366385ee68862cfc9dd161"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/tl/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/tl/firefox-132.0b6.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "6518de1b4deb40cacfca830333b6909f451e54d087fe6badfcd1c7dc6a32876e"; + sha256 = "f245fe6a65cd50b97106a6e4cd1d0d0bde221523c3969beb64abadd9318adb73"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/tr/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/tr/firefox-132.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "652367b86b180d5f9aa2fc2175069df9f00f270a9a526f6db3033df1e4ecf7ba"; + sha256 = "fe0d0cd53fa7fb6586b7b76a11471b9402e636342c6a40cfd12b80ab80018eaf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/trs/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/trs/firefox-132.0b6.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "c949531be0a24259947c66581cb30c7e8ff0e046cdd5b80616ce32c24d4b394c"; + sha256 = "af7ca43a3dad5edfb8c85f337fe1e5ca6bb9c444eab5241f85967d803132be38"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/uk/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/uk/firefox-132.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "9b705eb1ae999334bb3a652aed2a69b1112f7bde18b2463aa609f6ca82237304"; + sha256 = "7c8c34619ef8b378fd55320667c9f342a80042164612038d53bf617a1c8bebb6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ur/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ur/firefox-132.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "f9543650db97d04106eac07897faea7115e1ee6180996c3c94dfae3a5d34363e"; + sha256 = "5a55235e42a4ee956697a158d40e8b1b6e1b9b327868be0f363ce470044261b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/uz/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/uz/firefox-132.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "aedadfeb84a3efe02eae59f806d827edb36271aa3c5ebf46e4e264ab937c6ab7"; + sha256 = "2dc26b6ceec6c45c818dee7cbc0e22ce5c1fcb1628407e573dd821a0e467345d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/vi/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/vi/firefox-132.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "87dfc6ea7811478111a426ec5bd71bf13f30f7d8161c49570124e23092fedc6d"; + sha256 = "b145ddc7150413a26649c46d0363de51b12fce1aa7051007345bb43388af0f3c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/xh/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/xh/firefox-132.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "95ecc4eb6b769de9b2d30cbb04484f3845d79f6f097ed3d4a61ea5e231faa93e"; + sha256 = "5473f4aef3f6721ce8ab7bf1ae20988a4062f326fb3793abf10d4ff4430d50c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/zh-CN/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/zh-CN/firefox-132.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "15475cf50d40b86141c1e870e24d280d79678885977ffcb417239d3948ac3d3c"; + sha256 = "9c449a468edfb9e98c2b94fe0c6729317f0a2e7b9e2fc9ac6fe508f9dc9ba2e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/zh-TW/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/zh-TW/firefox-132.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "d3e80bda223fbe9ee08bf1f6e094793ebb0ef1a16fe56ba58362e6c62a22e546"; + sha256 = "1da792e45fd577b7ea2e9d4defdbf45c2ce7b0a1577e89e5805489a14ffeb180"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ach/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ach/firefox-132.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "69eb32eb9819bb9d01b77d10e5429a8770cc2970df5c460747dd7335ad0877d8"; + sha256 = "f8a2c573dd5ac235cf1ad946b1f74fd373c0ba66ff3a1c9adc78dfae874cf2fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/af/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/af/firefox-132.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "8e2d978913ab8b2e8b8bec9ae3b64906ba1cf0f71bfb79e5f942239659f6a5a2"; + sha256 = "4e72dd27baf3b17573f6a3d4e9a9c905679c398ffe4a54e9564b1bec9a1d2557"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/an/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/an/firefox-132.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "5d361f9a5720a958e58757e23ca8fd9852bf6187c3ae9a90b8c0457991e6847f"; + sha256 = "3da409c0aefb795a566ee2e642d5c8e6a27ab5189d5e37a0c66716acbd63d0a8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ar/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ar/firefox-132.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "614b31438e1027d427fcbd2cc49fdc149c407c7c7b58f2ebb711fe152e0a6620"; + sha256 = "9fcbddaf46354b670c28d12623ab6a4d6381475d2cf2ac4bfa6729d0d3880925"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ast/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ast/firefox-132.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "f9a7ea4bcd928db80b1abf8bfaa375fc685e142ff70dfe892e414672af2312f1"; + sha256 = "bd4024a7c6df02a18bbe4295851fedb70d2704a1b5528ec45788fb1b40684b7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/az/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/az/firefox-132.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "5cc255cbe0df8bd7441f16cd6337e64f335aa06dfd0cb1a38d541a2e2e4d9499"; + sha256 = "4714ab9a89fcd76be3da2f9c338540c668fb3b40fc5dba28eb052ab7f93cedf6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/be/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/be/firefox-132.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "a4724722a484dbf404897f0c9f387d1485f50032f28560826445a11d35c4059d"; + sha256 = "d2f00109179d42b53eb3f8efb18ff4e6c81c6035fb3e4d39f763d39cf5feeae4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/bg/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/bg/firefox-132.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "084c33231412d7e6770cc730b3f33db1588889bf64108cacb19f7dfacc6694e9"; + sha256 = "250ede13a919bb9b144f3e89ddf188bb6319d220179e7e214fcc3481aced6262"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/bn/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/bn/firefox-132.0b6.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "94cb150193c6f5ead5d7c06fff92ebe5c51291037f10b5e9e3d9d51cf910883c"; + sha256 = "442903bd530fc6d79e46b8e10230b9714a107a0daa504a28e824faf333f9e9aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/br/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/br/firefox-132.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "78e05cf9b8a735a28ca2593a2e729883478245579f32d6e8b11b247c5dfae586"; + sha256 = "f02ba733155aa236391bea00252fab451a9885eeb098883f3965bda2c229bf46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/bs/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/bs/firefox-132.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "06f1ef247527e3d421bac33e34fb4e46c97a866f14c7688517dee7189eb3267f"; + sha256 = "67d96433b68a9ef9255be578c1191795d22c295ce76f2f9663460b2b9154f692"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ca-valencia/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ca-valencia/firefox-132.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "3ff3279d3adfa248b650f57a4f6fe094ab75d3ef0daf4b93a55f17685341e896"; + sha256 = "37e5b6825a7a39b7e486c955ccf2d2428a4683c1831bd3ff49742b3c89161a93"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ca/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ca/firefox-132.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "ce26536d2db9581f9b92c1e386cb172546df4e0f7cd40cb54116b7bc66cfcf36"; + sha256 = "d423663fd8534f8d77dcc704019a95b252e42495df298827ebbd4512daada3cd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/cak/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/cak/firefox-132.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "61629cda585866b87d0047adc52b733df91f5ac46b161e955cf3c8b7962750f7"; + sha256 = "792a0b4140247309e8d0f49138e8c0409732f1105cfec6ff18f462f83f0b4b6b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/cs/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/cs/firefox-132.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "8d365f87da2d7c2b396e1bdb8fdafaa4daa2c7421cffad935e24e40636fc4036"; + sha256 = "b750be8197847fa5a1a5051a5a1d4d8ccb0edfbb3713810464207b459c83ddc4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/cy/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/cy/firefox-132.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "69d62b9ca499d51c99f796a91b58d9bc52bb73c4883ffe48982b74c1011a1d94"; + sha256 = "14f198e8003cea2a3acb4bf51d724f87dc0524e58152ce1c5f1be70ac456e73c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/da/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/da/firefox-132.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "6f8231de644fe6ece3e5d8765585aaa2f781a2d0502895be840503600d173c51"; + sha256 = "bf37f4a9e58d4f9f221cdd3d1d2b8b6f89793f058a5561b02df2a3d0d0295906"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/de/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/de/firefox-132.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "0af79c076391c3e809d88c53f017059ce673b16c91dae44fe314550f99f1621b"; + sha256 = "0b17f45941135765ab3dbf4c5eb75f8f76ef006ec6f80f95a410bb54ba83d9c7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/dsb/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/dsb/firefox-132.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "584be70610e13bc2236cbb6c8e3ac22ea487b8dbc0edac9c05e74bf3171558f8"; + sha256 = "781f06b8cf136114639c5f7d39be8033ab0dcf700a8bda59e58337b17e5a7667"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/el/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/el/firefox-132.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "cbd65e86e40673e20fa15cc487cb34b17bb07a5346f25c4822b7037b3ac3fd5c"; + sha256 = "13fb05fa4115d97d44e401350232c8856f89947a771aed3def2a2105e246d1ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/en-CA/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/en-CA/firefox-132.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "b0136e885b4562b74dfe89e92b9c2f4db85693b218031e7fc5540baef6c44e78"; + sha256 = "fecc32f4a98c31f7f6ae032f55c3ef1649b041245d7c49c1d1f5462047b9e671"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/en-GB/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/en-GB/firefox-132.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "52e04c5559b439f51cfb128a9e2e3fc9167912162bc945da81f6be2355f50e64"; + sha256 = "bc97613b91bda81c2ed9ef92e4e444f5dfe2c16c9a163bed189c1110cd54abae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/en-US/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/en-US/firefox-132.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "93f50d0f65931e966fce4efc049967ad413a9eaa6a3a0b73bdd160bb11cca7e2"; + sha256 = "6fd69d37c09596fd74c5650ece23a4661cb0870b80d70408100475702ad6e907"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/eo/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/eo/firefox-132.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "63ecb54b5c8640b3cf4302fa61639d25dd8d273e758ccc0d43c832a67320e240"; + sha256 = "13241efce96508e23c858a64fec98c2445d5aebf9944fc320b8b06dbdb8fd731"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/es-AR/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/es-AR/firefox-132.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "76a371441d463f40f676b6333b5e041908ae1b53cd584268941232f57784d4fe"; + sha256 = "c3ac01537dd38d6c66519d0c97e38fc1a2fca07bf664ee5f5d2195bd39188335"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/es-CL/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/es-CL/firefox-132.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "1272fea50d52e07512d86468f55c79222d8d10fab989326e7cb26596d60694f1"; + sha256 = "420e42a239f73f37ca3ea30b230c4bfcd554c0581d7ddf44dca80fcbca6f0750"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/es-ES/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/es-ES/firefox-132.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "7080509303a493851c8519533f95394c97f4e48cb9edf4c71ba8015fcfab2db2"; + sha256 = "73b0f24cd5eb814084982544e5539ee612b4b37ce1e1bf7fafaf22c169e9b5e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/es-MX/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/es-MX/firefox-132.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "5a8d79d8e90caff7607852d2516fe46984f3301e863ea676f6df0426458a39d6"; + sha256 = "b97b8097536f728e7a30dec8d39676ba4a0496f880f9c918cebe38a782ffafbe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/et/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/et/firefox-132.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "51bf97a75d98e0229712b5089514ef98ef9418cb2f81b0aa417b35b93a91b238"; + sha256 = "53382143432869d6db33003c43610325bd6dd0bbd7ba9a508d1356d10fe3169d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/eu/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/eu/firefox-132.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "ae4cb5677424112ca885b9e685bbff7973ab5abd2346978f1df4d04a5ec9da67"; + sha256 = "3c8667c07918a0bdcea9c44e847cadbc1e06defaa43465dc6fc3158bfa8de9e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/fa/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/fa/firefox-132.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "6b2285a462be10594c197bf77443f3adf74282d9476c7b61d105f1e56faf274e"; + sha256 = "d0f63ba4c199e15b8849d40379095db58f9fe2a0ff33133cb1b5244cd991162c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ff/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ff/firefox-132.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "63d7966b3f3888f94c2572a782f542a0c8d0459070a980cc10ce6596e19de55d"; + sha256 = "e4741fe190ad923d6b24ad2a9bf81fe6c7d924fe1b3bfe09657fd5ff6d7ac962"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/fi/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/fi/firefox-132.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "9fda1052b11868a54132c45791e608da9198a394ead4cdccc4c33641fbd99639"; + sha256 = "62cb5d82d0308ed53346c359d61a5f90b48c50eefd6b6714cbf1a8e18c125f52"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/fr/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/fr/firefox-132.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "e05ac7d8b58060da27f51a54e9a42602b9c703a4ecea3f5516ba3bef5729f78a"; + sha256 = "8594efd78d16d09c7890d9bef7b121529564308f1341abe27db5b35a4e7d3ede"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/fur/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/fur/firefox-132.0b6.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "84f48f7f053bc954c6e3a0f49d6037d87eaebad140442e24ec004cf570f4e04d"; + sha256 = "2a116470fac9ac157854a63b30515b991eebccc0ca3f3fe74f56be11953d4e2c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/fy-NL/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/fy-NL/firefox-132.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "bee16b840dd96e1717d847dc9f0a21f39bbd1a0e3dd7d1e44c6abe570c2d3e11"; + sha256 = "ddf0b9ef209964345cd9cdbaae621cc1f85dc5fef11143878f2bc285155e031b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ga-IE/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ga-IE/firefox-132.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "3cc432fc0616bc6a25efcd7b8fb7ca531a46bfa6daecfd1f9e6fd8c8e6de1567"; + sha256 = "2202504c37efeeb7311baa9841dbf49b50040fb6952fa7b4fa24d925d765f045"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/gd/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/gd/firefox-132.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "b2e82175ac46f60330091ae4988431ca99589b5e29ce2164831374201231002e"; + sha256 = "cc09d2ecbe1eb69fedd6a76e5163a6958a4d6103a8fd496f86cc2b9f20367431"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/gl/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/gl/firefox-132.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "652ecc427d7db1959cbd13b8a6b3eac5bf460d75615318b3e33899c09e2c318c"; + sha256 = "7e394917b96e393b83f5b1f9fe86ab1d3ecfa9c98dcfa1762c7f86c252911381"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/gn/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/gn/firefox-132.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "af1b79fd7cf0ed1f2694065c5ee1f8fb87d34a472524ddee78757d30c2bf6583"; + sha256 = "ad4580e388ce2303ac54151d65913fd837259f428424c351871936f6453f043f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/gu-IN/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/gu-IN/firefox-132.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "a88d70e37ad783bfec45f5f3546df2c2ebbe42020bde496dba49aa2621079e44"; + sha256 = "f0c5a2c03a58bc6c3489d7e77413052e2d3f5946ca9de0cb9447675ba9ef2b0e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/he/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/he/firefox-132.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "f3b4435ae00f6be336dc0c7278250f4b8c53a19ece0b32148314aa3ac3350efc"; + sha256 = "c552bf9168c406be1b3d98f2db782fce7ab38dadb5421cbe1d3655da3e746e10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/hi-IN/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/hi-IN/firefox-132.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "41c595a8811d5f27775d99acd340a9aa8aa0678e8e4da525e0df68bb084d73fa"; + sha256 = "d6cb09990428c58e1cfcdf96ea578b82acd8d811b1b422bc52a064bb4d764772"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/hr/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/hr/firefox-132.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "71dc76bb7b7f363b30821ef1ceee50df8063e50c55e922233843a3830bf00753"; + sha256 = "9494c3fd3c1fb82aa728ae2b5168a24419539559876a8e4133fe25084e145808"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/hsb/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/hsb/firefox-132.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "eb19898c2578257846f822837848aa5a58cadb2e384e3bc1279f283872bba988"; + sha256 = "8f6de4c0aa9e0954501f1aaa9c536442f858c725e53a960630d41a4e69632388"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/hu/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/hu/firefox-132.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "c99dfa4470841565a60263940e697ea6068627ff6a382895a5b6644cc05d5485"; + sha256 = "eeab0f343c631ae4ce59c72f420ba405227262c8e4a3c310d155cf72d21b6623"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/hy-AM/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/hy-AM/firefox-132.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "717a9d71f0c4e9f458c7743ebc2653ed804c21808bbe33e24df46734d76c2929"; + sha256 = "4bb6cd84a5762dbf1916314afd7379b0fbd61fe432a333a33843a54c7a37c43d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ia/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ia/firefox-132.0b6.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "66bdcbd7b27e71d26274614863586364cab5362a1a4e408da922f72fb5859fd0"; + sha256 = "a1616aeb135b63aecded8290397ced2b9ea72a801ad8f498dbb2f59590cb6105"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/id/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/id/firefox-132.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "916eb11604936e14fe256adfea3904d385282d470cfe7b822d6d24826b4f5923"; + sha256 = "8553daf4ad1471462c14ff7c1186e57f6ddae5170f9254c68ab89903edbbf14b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/is/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/is/firefox-132.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "c7922e665f9b382ccef7f3a9e50303ccc6cff61976f70a2dd8f176dc6efcc208"; + sha256 = "353cbe93c7c55ce8d59784b12ce96c904802bcbb9bbf6d8c68ef57d7f635179a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/it/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/it/firefox-132.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "f4f7542197a31773045c365c3cebb432b272c1b0ebac49bbbf2ff2c39bfcd91c"; + sha256 = "0b7778b4ecc966cd3e010996e250434350d1899be0657df6ee759780f80f1fce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ja/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ja/firefox-132.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "5ba99b8a6904ff53cc4488824ae3f32c708752cb35df030e6973fed9ac9bc6be"; + sha256 = "d7906877c1ce9c6ef47de911b870e067d27b5c83b52771ae7c6052fb437caba7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ka/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ka/firefox-132.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "f02989fce1be1761be71aa960b3f70327d747bc8d71e8ceb10da06f2599f8a2c"; + sha256 = "23fa3ec7f1a472563a5b98943dbc576e24020480a6f5e6d862125e2c496c6f72"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/kab/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/kab/firefox-132.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "02b6b5c873c2f2a68071beb86df22e25b7b2aed1e2d1f4db955db534e6867c56"; + sha256 = "2ba938b86472dc92704a2791c33aae2386d3a56ba0e027ec0828238752e29823"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/kk/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/kk/firefox-132.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "57305885fc575780f61b244747ad99d694204051ee0a6812c5d46d43afc1f4e5"; + sha256 = "9ddaceda06c199fffab52fcf1e04dc7a509d68dd27434fb5ea23cc521ddfd6d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/km/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/km/firefox-132.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "ca423f1155bd45bb60d84bdb257b1c223e847735725a780d64c16d05b599dbc7"; + sha256 = "29797113978960543d6204be64d1f388acc270b6048416d8ef7bf1247ca9f4d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/kn/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/kn/firefox-132.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "d3834fbbb1f9441a377bd78bbb6a1433fca18ef67215bf4bba17642354aa465e"; + sha256 = "ae7b2f0d4502bbf38afa3011e7c068cf163ef49778b16c219ce43b0b65475b59"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ko/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ko/firefox-132.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "f57b61412b00d9942691405691b0c4ab71eefabcd8a2440a4a1207aee913da78"; + sha256 = "3e63fc3c854a7c52c6d4710e5d5ba34cd3aa74d88c640c425656522dd1f1ed33"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/lij/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/lij/firefox-132.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "3786385aa819c46d4d2403c313e172ff5548f5ef41a8f8cab9cec0de2661e3a3"; + sha256 = "afbf87dce72ea5deecf254b5c3ea2a76d683bc10df9490c0b5d9cb093f1d744a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/lt/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/lt/firefox-132.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "8c9d2b0f829947046d5707437e53e98b56c36811bb4afd081a214de543c90e1a"; + sha256 = "4713af9649c2327827c95d67a6b1d9bf7586109047572a585f605e0abf126aba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/lv/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/lv/firefox-132.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "25fa85bf802cba0358f01e9098306611baa047bbd796b9c1486179c4e181d4d0"; + sha256 = "bb30dbfc7ca1dcf5aa6e7e087e26114fa99b756af2814859ac40f8622a7fd8f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/mk/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/mk/firefox-132.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "1b5bc7720849a702206d07439adede9f06a3dc36df1aaedec87b11bd464cc950"; + sha256 = "2efb34ec434a8e761b8af548cb08d1daec95dbcee7b18febbd4574f44991e2d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/mr/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/mr/firefox-132.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "8d75634cfab7c5398c5dbb1d198d80f3a530ca6be9492fe161b103d67fa3120f"; + sha256 = "4854311c9c6097b851fd48208ebd2e3bf8d9edd5176cd8d59d7f6aafb1a58f3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ms/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ms/firefox-132.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "b255028a855792af9c669b2a12e80dc6b6962a2fb64c29bc9b46e39b1a7ef83f"; + sha256 = "5baf7f6d41688e67d39d8fe58b418622ed45847b8bdec140b208835de92b192d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/my/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/my/firefox-132.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "ef1dc83a189e514c3cc446724bdb2325ccc806c7389acc85f751bb7356ccb9c4"; + sha256 = "c537f45f4d3312fd84820781876f7057f15b729a2acc41cc9cb944b349a8ab77"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/nb-NO/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/nb-NO/firefox-132.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "7ff5c535300d391d5db869189876b2ba6c7fd8692d8acb32b23dbed587e5d404"; + sha256 = "b3efe2b45e40c8c19c71a391bd56d8217ecebb306e248d1bd605b9453e595d0d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ne-NP/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ne-NP/firefox-132.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "645e5f730f0678cce48e727b7d425b16197e45f259fa73ab2bdfb8d29ea0acf4"; + sha256 = "9e1834577beee58f4154a31490de01af4841f589b1c99f1bd988a3997cfaf158"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/nl/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/nl/firefox-132.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "38fb818029706b30dfdb3a133190a13b7c30ee62472a17cc2591ddf3403ae945"; + sha256 = "242e6cbee2e452771c96196e777c3f3e6ea3b23d0bcf7400f9902ce9d414452a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/nn-NO/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/nn-NO/firefox-132.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "bcb08b084bc0c785ccbdbe7106896b81f77e1ebfd1652752780abd9b83390a70"; + sha256 = "578f1a856c800849ff763a78a14d86916f5a5a22b02971476b5117bd3a30fc67"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/oc/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/oc/firefox-132.0b6.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "79e27d2a621ce64315cce6c38599e6d12c3b18de06c594dd33090947daaa6c43"; + sha256 = "d1136d8e646d7cfa6ea711a879182591d00f7e378abde95889aa0429fca2778f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/pa-IN/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/pa-IN/firefox-132.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "bde16ef9afdcc989827e0e014d69abec3200ae07d138df5c69a6e7c9787722b6"; + sha256 = "8fba9a351dc1f2133fc3816ff13e2d479044a256e1ef0d61ab5df538591fef40"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/pl/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/pl/firefox-132.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "9e8665b37b0256e5ac0b62a88967ee337a5ff5d4625f7ae43cb13da7e51ad162"; + sha256 = "f24a14ee3bff011451c826e1871d811a4c9411f3766202037d1f8fcba7ffc9f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/pt-BR/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/pt-BR/firefox-132.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "66fa6a0361d64b6d2bec784671c77e42e0fb70db3a724fb57d5e4349ef1a4f06"; + sha256 = "6348659cce711a9165fb446d4415f04ba5d46a3e4dc27ee0525563ac69e50911"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/pt-PT/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/pt-PT/firefox-132.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "5c3b2f9f8589fee3214b3458c716214675b22608a76974ee154a0a3794ad4fb0"; + sha256 = "d1be462007667a55c921ffa8398e5438d5c0733fb922af38908af65ca5607518"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/rm/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/rm/firefox-132.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "0338c62aa70a83c6782065db6196850e7d1a8e7c13475aa2971c2ca0995fcaf5"; + sha256 = "cb2a394f10be16b13510a6966d6566d0bb0f2b484998158f4988de5881238ef6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ro/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ro/firefox-132.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "545a96ae03334282d9e915ad3970cb655346600c3cc87f5a610ea56ba56fe859"; + sha256 = "098fd826d39afb9775c2750df009bce9559f87650321b8c065f4a476f11ca42b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ru/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ru/firefox-132.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "774a98da6ecfc67e350499bbdca10e694734e77049d6813f3a11102ef2786b88"; + sha256 = "9b6a8f7f3a5ddc798b86104c313b9551ee58e457a13c51a4e7df6d0633d2e8ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/sat/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/sat/firefox-132.0b6.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "3fc563859c2bb701e955646b03d5f8a3ce2d0a492e247416c7ea826f608b2831"; + sha256 = "c2ed020a41c8910fb26070268e467cfaab7669641111b377cad8045f3aa58900"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/sc/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/sc/firefox-132.0b6.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "256844a0a7e79bc42978c599caf07def4e7b56bdf0b6d62dad6304d27089fbb3"; + sha256 = "4a23815d4e31200e862b4c6aa88782963f042639df71064d1c8304a4175edc48"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/sco/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/sco/firefox-132.0b6.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "55d6b8153cb07c56bac006a0180ff5ae52e3da539c907fa6fe15dd6f950a284f"; + sha256 = "2fd5d51abc2060c99611ce87e3c701fa34553c18682907f16edd132ec343b89f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/si/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/si/firefox-132.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "5aadfe21cdb8a6f8d590e98905b9a17ac5730825efcca007ccab8912cf25108a"; + sha256 = "5f5ffef49964f0f2d2d84b5c8a76489b9d41c6d6016005b83801888d091e3459"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/sk/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/sk/firefox-132.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "a73b49d89cb5118f4e20ea7b14d90b5edc20371cc15356197a10c1f3b41745a9"; + sha256 = "5478466d9f5561ffb7c0a9cc7da1eb38380fc72a59490582c5bca9825e00dfb6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/skr/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/skr/firefox-132.0b6.tar.bz2"; locale = "skr"; arch = "linux-i686"; - sha256 = "0d0c1ed8d9386207385a76466aca1d177d4a516149b844ce84a8b132dc862529"; + sha256 = "6bef1c97ec3f1ceb9b8bc53acd208af905c8c3b7d7178404097d56c98ba76d77"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/sl/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/sl/firefox-132.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "b4ba523ae509389b0889fe4e68ebd4d1ac5b2f08ebc625e16f9dd6a836ea72e3"; + sha256 = "4be7246171e5341c348f22b2f787e470c77435353874097b59848893ad30b609"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/son/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/son/firefox-132.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "795d063b0f00c2d5926642347faaa9ad422f75f1f4b241b617b8c52426b0b128"; + sha256 = "eb88c2d2abbcbf2f4b2ca3eddcc5b6e04de8ec62f0d7eca429f355c9945d2d35"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/sq/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/sq/firefox-132.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "126cea5bf67d1acdd1067c2b58e358a9390857cbf9ca16248efe936809bdf36f"; + sha256 = "c925a98210ed9f4195fea56fbc191c5ef7b87e7306c57538c087f92c331a4765"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/sr/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/sr/firefox-132.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "36d6b5b278c15f4e127a70554a2705c7058915379bf1ff3fe9badd14132425b2"; + sha256 = "0eeb92fd2d5c0dba6f770a013bcefa89f09c1984d739d356dd6acaf8a487cf4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/sv-SE/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/sv-SE/firefox-132.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "3fd7c4a21d6ab6784bbe9b0c01ef736347bb72e7f9565a97bc5ee7ee1eed461f"; + sha256 = "749158144a92a34b4f21e97c339bff01560e7ce346483ee6fe8c07c1b42cf10a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/szl/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/szl/firefox-132.0b6.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "9edc91448587a79b753df4a9e7feaed68311a49fad49c5789c3041a8f4d4b972"; + sha256 = "5d8b034cacf4629b85d977d8cd858dece48055c9f7e7f3c3fdd995bb0cc619d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ta/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ta/firefox-132.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "4b39cd843483758060b930362a30de1b7adde0a302c77391d41486df87c69fdf"; + sha256 = "3b3708ba6ad65cd0e3bdbe76cb6976a6782376370c4da3ad94c7817bb82b91df"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/te/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/te/firefox-132.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "80f4fa70c6346e9f652d8b3c3aa95cb3a20944ee221a06c82ea071368bcc3f52"; + sha256 = "858e451b92da437a93a89b3d512437177b90ca118f9c1bdd84948d3ae1063b71"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/tg/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/tg/firefox-132.0b6.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "c7de592f571c993eef41bab4b119a268ef0dc65b869b5fb66cfe822aef2c8a06"; + sha256 = "56708c84f1784a85e27967b3eed74774730d9673ba4235376328dc09602ae007"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/th/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/th/firefox-132.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "6c1d86bc94fa30f43886b1738ec3461d89b7a86b9d092cc5196a2deb4e7376e7"; + sha256 = "12f1e435827663e7e855db5fca9f829e0b9ba21ef1a7c3dda343900feaae0350"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/tl/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/tl/firefox-132.0b6.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "d878d17dc8a81b374cafe3859bfcef1d2a9fe7db63a274119c4193020948de8b"; + sha256 = "815df93bb5d9bfb1c96a902e02b860f239705426c57a30fb23e87a2c991f4f92"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/tr/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/tr/firefox-132.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "6648c0cca250c0cda65d2aab1a3f6499c8c6f3b1e4b02f718b241dcc301ddad7"; + sha256 = "dde6d679e2e8281ded4ce724e48ab9173a1ced0989e0cba579a29a92a0d93f01"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/trs/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/trs/firefox-132.0b6.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "b6f00626c19e71f33f1f36cf08725925092e96fead027299d3490951e034e352"; + sha256 = "04d725359e36da7f8cedd8aec85f5ce153c36d4c0065caa8ea26998369df5434"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/uk/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/uk/firefox-132.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "646fc4c5329f9105141227ef69012a1e6cae85013e036cfece228a54b6877b18"; + sha256 = "6775475a9b4e504677cf37e63d2fffd120793892e394eb810716e55f8cb01b09"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ur/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ur/firefox-132.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "bea7087f797cfcdb18329f0c86aafce64fdd73fba2229ec22685af49b595f4ea"; + sha256 = "cd35d192d1a3c87d7398cbb82b916f87ab333518b9926edc0ade07fe2e37d2e4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/uz/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/uz/firefox-132.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "7fecca7f57d7491e106f9e278f01b21d970a7ef69dcc8a24d32d18813b52751c"; + sha256 = "298d1cc89d3fb4bc5f351551a1117e3316f89aa3ef12b92ccd55bcc11d5aeb72"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/vi/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/vi/firefox-132.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "9fa33db48f39195c7b7f285ae8586f8683d919e4f2e716e6a5f6b54850a93f7c"; + sha256 = "bafe1dd38b2bc88cf6100aa4fcb96e174271bc5599468e3519ef79d1d0b0c5d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/xh/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/xh/firefox-132.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "3fac756c551fb0dda8227f0ecaf9822c18782ba809abd3b0234c59e192756da4"; + sha256 = "9fcdb11645deb89d7e9c13b2a10337005ab972263e4634c7ec0e9c16caebed5e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/zh-CN/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/zh-CN/firefox-132.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "df4cd8674914d5d79908a8d1cd2456b5bfe5b334118bc366e360c0216c93a79f"; + sha256 = "aa896e7433b6be800b3ae0c7b9093b5e5dd45ee75d93b5401ebabeaf2284d194"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/zh-TW/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/zh-TW/firefox-132.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "d5cad971712572a8e1377c3cecfb8365f5ecc4f313e5101b89191b2e55f8c69f"; + sha256 = "5dbccf5b5ca17430f8dffb80fdbf572f66d916e86a91be335484da5e2e9e66c5"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix index 6e28001ac2..46da04102b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix @@ -1,1035 +1,1035 @@ { - version = "131.0b9"; + version = "132.0b6"; sources = [ - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ach/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ach/firefox-132.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "5d23fc3bbc20283397d0cbda4a92e15e872e6b2775a40c7449fa2e181c53d622"; + sha256 = "5a1691bb3359b1a2b8b80cc7653f1c236a29878c90ac16910a7eefabeb597267"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/af/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/af/firefox-132.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "dae4aa08599af741296083bb6684e0afb7b07dbcaa57b13461c2fa7fe293b1fd"; + sha256 = "9a05fac63ce6ec8b03a37fda416cf06d803eb7db208c8d17fbbfaca1bab37c87"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/an/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/an/firefox-132.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "8cc59a067ffdd783c959765d1b766e0fa7a3944a3df9a0512a7f75164800151e"; + sha256 = "d34fd5349dc517a4cf049760a8b33ca899aa7c2d12895f1321481b9974fd32a9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ar/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ar/firefox-132.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "46a7ebface84fa533e02efba45ba3f79903c6dcf245c8bc83e94b4d764559cfc"; + sha256 = "ac4a95f2c86ff79921a1a2dc6da9253152c7d12e15fcf63af3963045a364c82e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ast/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ast/firefox-132.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "01c8d108820f3dc05c6a20bbd4b4393ea790e902d7e862b313de5ee5f753a8e7"; + sha256 = "362cd6a3842cc8b345ed3abf5bfe62f6d1c5391831a5d8f957285d9df6c9df87"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/az/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/az/firefox-132.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "62d852e798a9afadbd1071988121264e6f2edd535da26b6dced2f25046f62821"; + sha256 = "b4e15b48981aa2c506cba07b34ffdeed74667909577ce5e856c347bea4544ace"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/be/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/be/firefox-132.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "6731243528fdb724cfc4b7c0788c36382566a0433680e90ba2fa2c3c72bca0ff"; + sha256 = "1bf2b7b8fb2bc69ccb74cfb5bc95b5ecb34575bfcf0eb5e0f33cd8ee08150966"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/bg/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/bg/firefox-132.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "21a5b548853da294e6611306f8d1cf37aa423a1942a8916ed27c718f73f65389"; + sha256 = "09d6aff0101b8236e8c1c2377235e49756c66c8dfa0c30ba68e18f669c57087d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/bn/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/bn/firefox-132.0b6.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "e0bbff5dee6e723709f1a6b00a6eb3a65087f86a55d2ad332dc04a97c9d1ef5a"; + sha256 = "828e196c1fc32469cf8133d497f106e45fcd1192c30e7572a2cc0a8c00d54d91"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/br/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/br/firefox-132.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "46123ea811833fcbdfa8c829d35807bda86aa87135ee62786bdf56619de390f9"; + sha256 = "e2e50c4f9128d98bf225c881d675d683ac835ee0592dae6037885377ea461784"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/bs/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/bs/firefox-132.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "c9dcd5a31aec57425584613da9e1d681b42a9d2304582d215914694ec515edcd"; + sha256 = "d3869620429f625c3b4f4434577e3baefb0b8ba4e32beac233d62ed81cfe26d7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ca-valencia/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ca-valencia/firefox-132.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "bfbd17e8ee5bb1f0357c22b4f2b8ef6441199d1cdeabbf1d5609b66b5ce3e52c"; + sha256 = "13c48a8410c63d62716df42ec220f99eec130601cf571206e88c676b9e8a8b1c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ca/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ca/firefox-132.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "63fd254507c9020d439105afe577b2d1b98686f3a2bd30d1bf822cd48b81a991"; + sha256 = "6c8760d78d10422fa00999dc63aeb72d53e8a7bb240413e0de41a40e5530bd36"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/cak/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/cak/firefox-132.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "fd5605b3c0509ed82750c392bc4d63d58549a6a098519e464fd75e770e5a8043"; + sha256 = "6b0a1d1aaea22dd14417e1770bad90357c08eeb9806239cf2c86a04f03583627"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/cs/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/cs/firefox-132.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "4d654ce1bddcfbf9753f718f8babec3764a9f004d1e3313c1d313777f16b2e6d"; + sha256 = "f615ad4ff6f850f70c472c4f4e4ae5318a8cf59b35b2bab570984259b733e337"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/cy/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/cy/firefox-132.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "35290ca239b98a9d3a8a7e3c8663713510d6f408a6f3f3fa0176b803be562cac"; + sha256 = "02afaf8b5c7afc3285dc839ec707ced38aaeab837fc6a9915588fb13a080c754"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/da/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/da/firefox-132.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "df722d1f24f74a68197d11a05ed0fde3171fd58c62f8866748190ca8723bffba"; + sha256 = "7b33411be89aab6e70a99194e6fdd5c065622a0b979e444c8ae75bcc226e6d09"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/de/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/de/firefox-132.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "bdcb5f662d993041ac07e3f8df43f12182625b530e16a8ffb8a93afc1438b550"; + sha256 = "5d5be57ecc4034752dca028b6efc1c2a3dbed34f484dab70b7a27ee19831e840"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/dsb/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/dsb/firefox-132.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "13dfae0e4209179d65ca6a5f34362a3d24a0845f8360c99efd832e29d0903493"; + sha256 = "bfbfba6bd01ec42bdcf2766fe8f3742fcb71122eba6eddf8509a3348221072b7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/el/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/el/firefox-132.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "91efa139db7bcb46958fe804d2c4b6e043310a0425c14b5d75b39f75b9a558a2"; + sha256 = "2ef74d15c9b0d324daf6d10cd3af1f06b05cc9553ce1d5bd54affe5243422bfa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/en-CA/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/en-CA/firefox-132.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "5b43cf25b3f333267071048c09f5fcd23a8847193a21ed8e1cf6c18c03b8e8e3"; + sha256 = "c893b17e245970ef90b0ed94652c20592f0646c310c29e5dd20e1ea54f4ffde9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/en-GB/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/en-GB/firefox-132.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "17f4a3ecf88b33c38e0e2e71244c4e3e31006b8d4bab5344608ff7b9be7bc11f"; + sha256 = "d5f58729e0ea01086fb4c6f2de537a1fe6b7c02fba85ddea7418a58cacf837fa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/en-US/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/en-US/firefox-132.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "215b879b59ad0ea3dc40f13a97d3cf15abb98893f6b4c6e130c5f2a5cf91d2e5"; + sha256 = "62b4f75cec409b2afb909009c4b278f8d18b2c467735a95d4cd983dde4b0d9b4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/eo/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/eo/firefox-132.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "3684b84ffb7285d9d8cd50466b138533ba7ca24d64fade2f1ac6dd9b67fd6176"; + sha256 = "2226b0a6742757c08420bd2225abec0840e1f68e590bd0fee593c493b4010119"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/es-AR/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/es-AR/firefox-132.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "c1af34c2593df1aab4fa0aef07f05e28592fa45077f0dd6bd07193e04f40e448"; + sha256 = "b2b73bd3763707f267009511716d5903b9e91714c680743b51d3b9ea3b9c21bf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/es-CL/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/es-CL/firefox-132.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "36d1b0301608898a9a44175f5c96476f75a56e238e1ba21efbaf17ba76d1dc93"; + sha256 = "620027fbdf95cc3dad730a8c1a23ca0edfa9d189ef2b46a1c0ddc219d066a2aa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/es-ES/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/es-ES/firefox-132.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "831cba83275db5a854bf466597a65959042b4508a8e7a3f2e15766b02a4076b2"; + sha256 = "ec7380befe2f9f210eda51e39eb1c35fb20bc80f791b9a2a3b972b1668f9dae0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/es-MX/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/es-MX/firefox-132.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "9a237406b8b3d5ba31a2ed0cf37eee73a94f6dbb8eac5388f1be125ba7991d36"; + sha256 = "4b978cc773072a4fc16908aa586a234d6294c4300e4d73d43e7af1497547514b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/et/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/et/firefox-132.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "ede90675c7b60b1119393f0bb44f43a66bcede102179a66ebcc3b2ee3fb003f4"; + sha256 = "5945594d5755d912ac26967ebe74edd84ddc3ed986148fb725875ec20cab03cf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/eu/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/eu/firefox-132.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "c5137ee601179644776e011a8556997336fa0e30269999bcd4a669c775343009"; + sha256 = "71776da8c5fda5e104cafebbaf6a5b57dee1fb8b3908005592e06b71564c8aca"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/fa/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/fa/firefox-132.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "10b9248d3cf3fa2047ef33c77d66af15be77db5b8d8a9ac3915d6873bd0a1096"; + sha256 = "7b1096903c176f9cca74b27437bb87ad6d479d7e494553f14aa8d3dad724f853"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ff/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ff/firefox-132.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "e3f8473b8a630d634b1bfc7394d2c19419154e9d9aae4d98aee415b5c4c677f7"; + sha256 = "dbe22722065c1f7a13b003290c6de00f69835966a8cf51b3cbb4effad8aab3d0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/fi/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/fi/firefox-132.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "e37afad7d7adac7b752e9a2cb5747b37151bc8b750166950b97e583c5788276c"; + sha256 = "4235fe2e940396efa7fc28e74065e9fe11295e94329c096de1976020bee8d75a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/fr/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/fr/firefox-132.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "44cc3c181c8d43614e23c2c604869187ae5d4c42e2417d0279701159953b7e43"; + sha256 = "f5742e76561ef0046dd92f83f4459d8064798221513fe546603a50246ef06a23"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/fur/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/fur/firefox-132.0b6.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "a77eea411bbde78c913e154f9203411759ccdb9d4f5817b2f0b1c5363b6c110b"; + sha256 = "03daa72497607f4dc8f2b30bd0050ea5703bdd75832c540ccda17946f84ac6da"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/fy-NL/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/fy-NL/firefox-132.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "57c5020319ca48d7ce3d4d4d641ff4c331de7e945790ecf66b9ca8bc74083d33"; + sha256 = "0fee04713d82b4b848f7a39c92fc1919de493c628abfd0f72159f0158ba96280"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ga-IE/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ga-IE/firefox-132.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "7d52078700bba3faf5b61c9f8abcef8d0a43c3dfc634f2f586a6f18694118565"; + sha256 = "97ac58075af93d2fc12834d3a8de21f6fae27e9249bae42cccd62d1f753bed30"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/gd/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/gd/firefox-132.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "90df77b9b18eef8d8edd9297b14262d08e04aea580c28755a9197c08766fb79a"; + sha256 = "abd1fd086fd93c51dc1786b052d5262c9adaf66c1d8f12efa02a72955aaadae7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/gl/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/gl/firefox-132.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "02f4408e5b740f22fd46cff693cb10027fabf3dbeca45323bdea971394a98f73"; + sha256 = "b013a59b70a05b32eece94ff92416a25bea022823a0b44ee6cc49a9d7131ec8b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/gn/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/gn/firefox-132.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "5f3ce545a399088846c4be2944137caf651839485c5010c75e1a2e15e6d59ad8"; + sha256 = "10c1e93056e3ca2799389615c556632277638abb897fad39c257d2ade8ba8b59"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/gu-IN/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/gu-IN/firefox-132.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "0c33796cf29d3d3e3dc98816d1423456ebd4ae2a278ca8fc93651345538557db"; + sha256 = "36b2c08eec456f1d80523fd6d64639d0e9a7db80d9cc324ed7c7af738ece3dbc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/he/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/he/firefox-132.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "c341666c31e7398e878bdba16acced6430abd872797b39eddb6d26e536bdf845"; + sha256 = "159d9e8c6871c78c136da9c7039c2c206c41c729ca837284b35d012d632446d5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/hi-IN/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/hi-IN/firefox-132.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "be681b246e18d59046560c2852094794ea5261d6c05d0c8fcca6b0f2f807abcf"; + sha256 = "397695812c21d165d9bfc2a272431484b31597f863cb4ed0fee8c74ccaa6e1fb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/hr/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/hr/firefox-132.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "8b6c52bbfe03b134d57f6c70c1015803e02be668a146d9d46772fc9af9692ca5"; + sha256 = "7a52bb6b979508d48223a61d09152c59d29b183164706f9aebd05edeb1958961"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/hsb/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/hsb/firefox-132.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "efe5afcbc5c08948e45b741f7fecb39ebf849038212cdb0b15138b1df633d973"; + sha256 = "34dbce294c7b4572a9421bc2850dfe0217924f30e4ab7496ba2117782817555c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/hu/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/hu/firefox-132.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "53511396b0b54237623e058755df8402ca2f9763dff3d0e72f2081f600c089a8"; + sha256 = "de221fbc6c1a1787161282fef3972e7c43e32fc42d1544d79207bfcba279a685"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/hy-AM/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/hy-AM/firefox-132.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "ad74cb9d1aed355cce15604ffb0ddbf6b3a7beb08730a6b4b02d8d35308ba32f"; + sha256 = "40ca8676c7df07ece83999693fa40288d5125507312a75e012ad14fdaf47a5e7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ia/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ia/firefox-132.0b6.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "6eff25d61aef2e236097ba73b2f061376d48247ac58a6afd1cc274a032a4b4f9"; + sha256 = "adc3c8fb811605c1fa67173cfa65e4710a30f18b77734239f346eccbe84283e1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/id/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/id/firefox-132.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "1f5f7b6daf3d56107e2c2a21a4ee550e21adda704bc6bcf97a42ed6b100795e2"; + sha256 = "98039d5decb131bd0a5ca5b5fd7f439762ddea001d72ad96dcb548057e010262"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/is/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/is/firefox-132.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "39a639d414920e56ea15d1a4ef4d07669c1564d4592fc4f18b7ec32a6244e757"; + sha256 = "602632d386e5a1db4eae14341d372b6306e4a47ede9c31feb9d798884f198389"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/it/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/it/firefox-132.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "1b2b683ee7891e9f80435a2907ed7e56fc2181924ce3ceea2bd117a0623a29a0"; + sha256 = "257a39b133b11ac93ca854147ffc33dbfd1106a3ec6d84d9ebcc778800a05dff"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ja/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ja/firefox-132.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "bf4613f48cbc4babe62da9db153fab829a56d45e487e5a84aa8b893e43a2a320"; + sha256 = "4b6fe5fd644a0e51c1e17febd0c04dd7520c1cf0cc1077163313b9f380b4ff5a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ka/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ka/firefox-132.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "a0b4ae597421b37dd05ac425df62b66b1c332d6570c7164fcc491bf783487348"; + sha256 = "e257ba9c4aa57a743bd5e2d6522d211ad608bad7a1306d7f41b1c7c3376926b5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/kab/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/kab/firefox-132.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "ec40e0ad8dce0ca44e586d9729121494c3d0335cf7d2a49e780b0863ac8e940c"; + sha256 = "e5e260ac7d309fe9dc17345c5abb20e820b7ee6942eea003115ca479452436bf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/kk/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/kk/firefox-132.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "15be145c49e78a637a56b947ff40238b0a8dacf7c0fa740d0376399fd8a9e4d5"; + sha256 = "cf4e3470faa67eedf66e74f71cdf7384f3d70dd54ff2ce9618d5a3e93b426ec3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/km/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/km/firefox-132.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "f07dcc06f9924664f761fa7964a16faa5cb49f610a2300ce78e592ddd1ed241c"; + sha256 = "691de79c92a0bfcafda9a5cbfab41cd8b550f2b194fe383018e2f4d8ea5d019e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/kn/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/kn/firefox-132.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "3ba0c688d9994d1787b08781277b62b5a7f20c7211820532f8308b5914b32398"; + sha256 = "4a637e1810e714b1612453ce9b17413e4dabea2749ef44cbdbc0b9e0bbf54250"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ko/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ko/firefox-132.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "f827cefa00ab62f98a7eb4ea0465a1512afde10c46a44a090adc8e81af15b893"; + sha256 = "108e0d8f0a776628d3dddad21eafca8ce9a081e6138d08ad3cb05eef49f1a6d1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/lij/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/lij/firefox-132.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "f36747a714c88e5493739a7d466c2cfe09bd4d19b091433b944308271d97dd40"; + sha256 = "7bd6fbe3a24dc27f27222fa7cf304429e59e95e3be018e16ace731cceca4552f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/lt/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/lt/firefox-132.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "f1e295669af7a2ba813312702c537d3c29f87fb0c08a0505fd0bc3cd16df5892"; + sha256 = "cf49aca1c480746a7190d14299cc97425f391d46e02b62034d849278104454d5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/lv/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/lv/firefox-132.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "b0b0842d8df5652feb8f05abe9da0f6ee2e0c97284bff212c1f0f21eb22a308c"; + sha256 = "e8c34a49b97eee63712ed4aa7209fda04a0fafb55d6d9cf560e76c50b67befd9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/mk/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/mk/firefox-132.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "1cbc64f7677b16f1b97c4075656c16444ebbc5ee51127b53c9537a672ba3f9f0"; + sha256 = "52527e1d66823f8b6dd0f160bb659eab2652a0edae31cbb1326ffa59532a301e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/mr/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/mr/firefox-132.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "75f76a10b49db491fd6602d6b8079e5781529d0b53a3cddbcd8a31c390825592"; + sha256 = "12f0da186b507d788767ca0e085fa894d3df3a07897246fed12516cf4ac72705"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ms/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ms/firefox-132.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "2eca2edc3867dc8360149a1437370127f394ea6065b44fae22ea4016effe84fd"; + sha256 = "a86f277b73ce624a52c52cf63f3bf84c174befae09d45187ef3016493b616fb0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/my/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/my/firefox-132.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "c6b56c8ad919462b543987e486a8f60c1636e8e2a1b3cdf1465db9cde5501d1a"; + sha256 = "6ddee9113b1d6360718decf4e500778da5a144a9f023850bd73b5a7520b4bf80"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/nb-NO/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/nb-NO/firefox-132.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "9312201d3b6e828161802a790cc04e0426c68d9fa943fc8dd95704bf91fd1a5a"; + sha256 = "a55a695613981f1748e08ee28aa7c17896ac1218cc3fa935e762941218ad2c60"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ne-NP/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ne-NP/firefox-132.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "151c1d81c4f9faea32900eb2ddca5ecd565e09be04f300c26c8210fe4a92bde6"; + sha256 = "0cb9cee504d8aa9bd544f863af1f3806dbf1029f35e3eb7a29af949b34ba45a9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/nl/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/nl/firefox-132.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "4dd12d7ae84478954f2a9f35f7d7c4ea0cdc99614cba6230c9a278ca04981989"; + sha256 = "dd7f2d94ba8576fd5099f4817958d078dff79cc6b4e39557f3fff26e8342a8e9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/nn-NO/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/nn-NO/firefox-132.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "9f3362d620af4311bf9b349903ad0b61320f4ecf4d4ca5d0326de5190d48f7d1"; + sha256 = "a903679b24a1db6df01fcb1a01083ff63585e5e79adec5a91cbe27c69c71ba4f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/oc/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/oc/firefox-132.0b6.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "2ee6e4ca52eed0ecca2464095e53f0688fa0522e44000d3ed47ade39115b129e"; + sha256 = "01b88e5d7d2d87b5e1c2d8a7c6a9f06e5b4d11162c9623876ec57b90820347dd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/pa-IN/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/pa-IN/firefox-132.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "5457d47b7af9d2f7d819e5702d23df6128e10d38c74101928b58353bce9afe8b"; + sha256 = "a0b653952b06c4fcee6dcb095f3738ddc9be9169d235d1c9ddee541ba5bfdad5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/pl/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/pl/firefox-132.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "3bcff5f278d492a88c5b0b975d6c0c3d70bebff3a61b04a7fbc1e6fd332bac77"; + sha256 = "4b873b6f93db430eef7abcb2da88fb6a525bdaa3c7f2872cdfb8f420e1c52479"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/pt-BR/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/pt-BR/firefox-132.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "183e23db5fb34ef93b05b7462a877f654462ebc56abd7e2c9314118978df80a3"; + sha256 = "eb542b6da6754fe3885509ea8fd694189f9925a7ff50afd41a449177b9daa059"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/pt-PT/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/pt-PT/firefox-132.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "4014365d5231361d68e7e4959e12827345c0b80dd948e25eb3df2355e0943525"; + sha256 = "26f12d96589d5ba1371da217aad512fd3724e57c4088153b40b24ce60887824c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/rm/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/rm/firefox-132.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "4ae1c4d6fd687b7d0327e734476a922a4b6520d25ee87ae3284a32a12f870279"; + sha256 = "4e5b2092831a070f2cddb0ed422e4b0af66719cf8780c2332c7b0b0f2121f07f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ro/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ro/firefox-132.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "1f42f2438b54dd695d3672fb097adf6855c400c980c4329bc53bca9d80c12c22"; + sha256 = "05032c39093c377bd6c419525e291e049cadd54cbbe33d833ada6f8361f6ae02"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ru/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ru/firefox-132.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "345ee0426d557861b8b4c1be02b3429f77615eea3e66fd6bca455819c21d1058"; + sha256 = "425aa0b2d60d26dc45c1eb5af753b02e540518b0fc683194f785845ba1b6d500"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/sat/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/sat/firefox-132.0b6.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "4d92c4a392be6012ddc9a5c815e066e4918e74f1ddc3d00ea1433b3f1bae52b3"; + sha256 = "8c7545cb5fa747f37f82b0dbbc65dae682c09c68b6e27803639d2002582f182b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/sc/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/sc/firefox-132.0b6.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "5c92a730192ff70822ea02bd0a1ecf3e9df0ecbc15c3b85da6150880fafd2e7a"; + sha256 = "ac7614e84c5affda5abdf64128e68e82437ccedcbd3474d6fdf5ce96309c8782"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/sco/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/sco/firefox-132.0b6.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "464335c80b3fc31fd418f2c58088af114d50d49f80b7bbebeeb24963387bc3a1"; + sha256 = "3398982406c71be6a4ac6ef4655c3bead6e542e1508d65e59eb2b7c3f8c8a5c6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/si/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/si/firefox-132.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "ff7b9c7607d4991e8bf78a3e1010760c090867a8c0ebcdc4dfbfd726ec820a3f"; + sha256 = "4a1952b6f9b55bd11f6869b1cfe08367f5f1c7b40974b6518b59ed97a9728a36"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/sk/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/sk/firefox-132.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "015d7fc92041f3cc64a63d0ac1090c00cc0ccaab77af4268f986cda4a790260d"; + sha256 = "bcfdc04f07d23d3dbf30e9f3909ca402baa366bed1d5426e23a409b56d0d7186"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/skr/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/skr/firefox-132.0b6.tar.bz2"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "3b78cfa124aa7d22737c0d7c3e4b076ca10bcf6f50ade071f41d2ffb7bbd54bc"; + sha256 = "e192623c19c577737184417438d831dbf447f9d917d9d6deb1fbf04048b0df8a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/sl/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/sl/firefox-132.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "1e4d45ffa94185fda9f83228820ac2624455ac1b41b16975b81497c9b8b019b6"; + sha256 = "8238a41d7a19698c2ea20ab97977283d9dc084807a19e42dab90c74e8be3dad7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/son/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/son/firefox-132.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "9a57563e84acf0815d1ba359e0b4d1c0d942456b2275a90c43fafd36aaf158b5"; + sha256 = "e1f5077c5ecbfa4032957e29d9577377dd4408a644a9079a086dd879477d878a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/sq/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/sq/firefox-132.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "e17129b474e50f6cb8d378f79b7c130ecfdc9d367601a01e65eae1a5540c1dff"; + sha256 = "3cdbd71fef15807ecf86f583e02277bfeb70a85536e9bba9492781305f9beaea"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/sr/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/sr/firefox-132.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "5f0c52f956d17e194dc9da90ca1c7c034c6227ca7caa382057547ca048b71328"; + sha256 = "c2b2c0f954372b2d69ce7ec2a2c5a949902c45d1418be549b7b8e107e7d1d464"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/sv-SE/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/sv-SE/firefox-132.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "086b7dbf44bb89dc41a3c71d59f5bb4becb9cc07db98ea8dbd9966113ec1fae4"; + sha256 = "45ea5e64ff8e10598c78e837477691f049cb893a21270d40a3e8ebb6650248c7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/szl/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/szl/firefox-132.0b6.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "6e7b7660e050b19ef15626f472a9b50af497ffbc306ffe6bca959c10e68f3b68"; + sha256 = "09662dfd9f3dc6d88c00e8d57738359b7679a869398f9d4491d0dcf3be1d9854"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ta/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ta/firefox-132.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "8c9075ec945fa0c4b7a096116f9e5b3f286b5d16afc8476f2592676f65308461"; + sha256 = "33fc4f9ee860528714672e0348d2918e2bf497b2cbc30b2f7cee508de1823247"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/te/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/te/firefox-132.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "962cea48a963d71d5f629f26f847713149d05f81ed2fd79b0e7615208e652f0e"; + sha256 = "8d9a074d4c17b8b7c0ca9b504036c21ee20c471f6b41e02ec53c8e8e6adcd716"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/tg/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/tg/firefox-132.0b6.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "09c8afe3bb1d0d3e8bf071d52795700ce4ce0e6f1c124f4e5a972929ed358d90"; + sha256 = "f2e43929d8bb5bb94e3ccdbf7aa4408adfd1fa1c680b7d6aed52f6df6cac9420"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/th/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/th/firefox-132.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "c4caf317e1312b71ead7ebf0b21d2cfa1678164d9b248a79484912e783e2f271"; + sha256 = "5531272fe2865d652e813a12995280042c70f1bf210f3a4228f250c2cf71febf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/tl/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/tl/firefox-132.0b6.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "51bb699925ead8433d377b53d0de721ee32eecff70552b6ab61fdd957cf862b2"; + sha256 = "2aad34a224f7ec7cf86ce5cd0c48b0a3decc8ee5f302b05205e524ced93d2a59"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/tr/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/tr/firefox-132.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "f7826876af8917cf652df4009ca6dc22884ce4d40247d3506bee90a7bd4687d8"; + sha256 = "cd46bd8ada1736f1f0a3e3338e53a7cff1717a5d0338daad480141865c0e826d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/trs/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/trs/firefox-132.0b6.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "5fb6ae81bc8c1941ffc0ef38b06b31b78b186c426f394d4a67f9be4d63d050fd"; + sha256 = "3113dbdb51a654d54a9da2e79a5cec42cf274a187b255a61a23fd22faee07ede"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/uk/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/uk/firefox-132.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "eefd6322c99a3ba93a4fa786d31f0f776eca34c9e63d0174318f1ba1a3f0d9d4"; + sha256 = "4482f8870fa20bc75b9347b47a642782a5f88d42dfc2b9fe174591e8af870161"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ur/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ur/firefox-132.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "8636ef350c3f91c8e69caa2b8470c16cdef28d578c2a6938db0ab8b456f174c6"; + sha256 = "33bad00acbc7662c1fd81b376878e24f0dfe5ff9142c694d852ff069c05b6c76"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/uz/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/uz/firefox-132.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "2dfe1c15b9080bd8779eba2e0eea8c4e04231aa7e0608151b8bd17c40dd20c0f"; + sha256 = "8a3fc6ded7317446a99571f5660b421b3a5bfec77bdc7e80e6567348a941ec2d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/vi/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/vi/firefox-132.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "2f1784e6c2ecee4b1633e3ea76df75514bd6b16e4f4fafcbdf3777598a2f2c77"; + sha256 = "7fb59762a36306e6561c2c83dab581f4ee277dc802d77659f0c5cf5e3cd7c3d2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/xh/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/xh/firefox-132.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "ed6fbbebef7c75c3816413bef61a580a663b8d37e38b519facb26ed4b77cf53f"; + sha256 = "45193e1b8c725afe88c50ba24b15ed58ea5b0f5a3bc12bdfc98c643e8d7fad5e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/zh-CN/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/zh-CN/firefox-132.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "3a637f025f932a7e5101901d16c8e216d3db8015924c5abcb50d019c5c21bc47"; + sha256 = "63b0bf93b3237f06bbe1a2ce957fb491cd4532effe61af63fcbddaca061ef7ac"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/zh-TW/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/zh-TW/firefox-132.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "6eea1f043278ede18f67308566e2dd642504700be6c16a7259225de5a604505b"; + sha256 = "d61d89fdfcd3d3b7600fe34f756e771f3f90d32bb90516380d797302c34694be"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ach/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ach/firefox-132.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "50fc2e2a82193e3268084a03d6498bf9b5e7c1d20479fc40efb251e879c06b22"; + sha256 = "e66f2f991499b913518afe5a53e37115045fdf834350faf8b644df09e7364ec8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/af/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/af/firefox-132.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "5f9bc2c288b8bb864aa211b0d2f49814a99c3a098726e5ae6ce1b0b42fd5eb6b"; + sha256 = "52b346ea14a7b0ad74dadbdbcd3ed46d320cfb4d7f424d1fdece03ad4d1f66b2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/an/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/an/firefox-132.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "76a0c952bc1c8365645011a19fd1c75e825766f3c40c46c2fc743c10b9a0eb7a"; + sha256 = "33e707f78d4e71b319a1e65ad9fee16ed0bb81623180e793ed8666abe0a11354"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ar/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ar/firefox-132.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "09ac88d33dd97c815fd39010e7dbcacb24a509879401fa2f91ca0e79f54fb238"; + sha256 = "2c90f259700b549c53f181e033fc4e09d5ba2214138b6f91b8a460421f7f6d32"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ast/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ast/firefox-132.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "fadcc3d4873885a5c93c0f4c861b4ece2148696a5dc8997110a782008b922048"; + sha256 = "8bb0dfb593ccc5e069884a94afe9e887745210a90788479cd3138320ff040256"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/az/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/az/firefox-132.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "4cdf4e03d5d9b731769fca3ccb1eab680ca662407f4375bc2c9b152001ea242a"; + sha256 = "5da0ddff94084201d97d428f8042218f49393bf55654caa70791862f9b320910"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/be/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/be/firefox-132.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "ced88b8e0c8850d0c4452a199a6716061380d22596e4e24e6511be176c7181f3"; + sha256 = "20232118c8f7442381f7833bb749826bdc9a9519e70dbbc104a5bce6b9733682"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/bg/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/bg/firefox-132.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "034377422b59cf060c8bb7bddaa196f16917f4b70c11c1a566f0bf4fc5fcb40c"; + sha256 = "9ea61d47b3d79c406ddcb85b459fe61bcfcb0dedc648ae89133bad80144aa82b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/bn/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/bn/firefox-132.0b6.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "af909704445b29982a81a34d5bb0cba22edb464905cad4c92e77489913fc32a5"; + sha256 = "770a816ce4c978629b30d66f13da2b8de2980810fdbe3598338a95b1a77ae68f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/br/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/br/firefox-132.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "54cc7cd3b036d57c9a5c0e5fc0ab225585a80bf787bfec394acdf63849715bbb"; + sha256 = "f14d885a144bfafe40f70862c50cf516049459f4864f272ff3d269b1b77cdf4d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/bs/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/bs/firefox-132.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "5840cb0fd187509740d69939419cc44a3e25ec567cf92355c4cefc2ff209d135"; + sha256 = "a9a1040e40c6702a95db4d0d86fff33acc0ad55f5bc735ffb3fc18ded6feb79a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ca-valencia/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ca-valencia/firefox-132.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "cbd42bb1ecc25d4ffbcb8d8cba9953cc0d55358f76d13ce1db7691953e6c1f68"; + sha256 = "1ac8221af8e449607b71eb3da8f8946e7f2fdce1c9165578387342ba61c6fb48"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ca/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ca/firefox-132.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "d8edea663dd8452b9fad221430d6ab71305d28734ece2ee79d8e8b29c875114a"; + sha256 = "5bea3737723b4c661be9b7beb69cda311c63b38fe5d87cf1344c973eca335594"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/cak/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/cak/firefox-132.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "fb08af9b0ac43b2cc8aedfcef69996f80fcab1664fa4031ac52bf9236bcf9c59"; + sha256 = "37f1d42a53760ddf9a1ed889e2882358592f78494421c7ef69d01a2963c684e8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/cs/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/cs/firefox-132.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "6369dfe17841c9de4b3b5a93032c559d35e67c137cde1e4181aad414e06c5723"; + sha256 = "77584900b9151192e6f265e49ecc2bfaa0028c25b5cec613f384a30d37139f8d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/cy/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/cy/firefox-132.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "0bf424ed838344a98f81933de64b033726cf66ed9c8eb3142c21a10c8fb01f0e"; + sha256 = "1f8521e35a57059bb3aad1d5fa95ac775eda03ead75bfe6116cc67ff587db40f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/da/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/da/firefox-132.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "1bdb66957a5540f3768ffea9c0c23c2293fd0fd3a66aa72a2fd47768854015fd"; + sha256 = "89aa8777ea726995b70101bef359b3cf13079520c445a5d44ca6434bba96b0ae"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/de/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/de/firefox-132.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "88a3d26cd16051096179b93d3e048e6fdb07a66453e037ede38ce7b4ddc63c47"; + sha256 = "987e645e8d7a6b770a3056a115975a9a216143aa05e7ec215c83ad23b77df1bc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/dsb/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/dsb/firefox-132.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "bc33daf72d1f2f53baa59cc247ad7ec81fbed391f310bade3a944378b48d712d"; + sha256 = "d0a1cd64c2ba6d86e405bc05ee5b172f4c696682d2b798bdbecb91da718495e6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/el/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/el/firefox-132.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "6e67db3cc25ea6524d27d061802fd927cfa30161fb7a6fbe0e0503be6ba90073"; + sha256 = "fbf403d72c4919e096d6109250a4c790a2a18bb02561f3a3bb690c2c2e1ac217"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/en-CA/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/en-CA/firefox-132.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "74080ce1da63f5597e2bcb2cec2aa293e514dcf80832188c2ea38e0c9b247dd3"; + sha256 = "e5218c485ea7ee01e739458fd107f8c29547c542a89751f82f82a3b798c4e6e8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/en-GB/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/en-GB/firefox-132.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "71f04becacd320bf673342a72de1f68136048c489ced4a31afee8ebeab2e0db9"; + sha256 = "8ba466d9fa8f14b9821848978adcc5ba96b166848b9201925ff3004d4e1a2ef9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/en-US/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/en-US/firefox-132.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "ff0ae00d7685165a47ca2e6c29980d3fd24a2889a36c066993a86930022f8d0c"; + sha256 = "32c4b2e802a41605096a99b2097c2a00ae7c15c26135785dc8705ced9b6d7f94"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/eo/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/eo/firefox-132.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "b3bf81f117985d8baddd5b14529c139eaca9a9a7473526aa89f63465fae63689"; + sha256 = "fe8ee251678725a011273fafd04670b3d720388d9a4f04266b947bc73c815aba"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/es-AR/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/es-AR/firefox-132.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "a45a2fb851b0f5cc16abb0a8db6cbc24f63c5670e00bdc03197d42c3700aeb4d"; + sha256 = "8a2980ce33cc992a7248addb48826dc8ebb553c768101c01edf4d26cf69d86a4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/es-CL/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/es-CL/firefox-132.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "f6b399aeaae4afd02ff9ef1470c4ac643f35ec291e63da1d0bca35ee80441838"; + sha256 = "cfaf1fabe0274e256e74d9069b89017fe8b7a556898f6730eb9f95cc19cbe0a6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/es-ES/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/es-ES/firefox-132.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "1cf8e064fbe3018a46083120d7a0ed54273a50608c2f3c4f193d5454128668db"; + sha256 = "05841e5fb59d95a46d0cfc82da624dfe9baefea66916e35ee2721c9c85f86986"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/es-MX/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/es-MX/firefox-132.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "47771d5c6a450babe2df7392edaf3db890e74cc0ff2a840fa3073f147b00b692"; + sha256 = "b73618a25a2e274208e9873a3f71a1d87fe39b7a1095fdbdfe1de44a3ea5b62d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/et/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/et/firefox-132.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "c945c1707ecb99efe28f1c954e8b24a30d7ced8efef70e12aafc27573ffb8eba"; + sha256 = "72e81b5d422b6e67f0fbc0866f162d3a9d61d6041b964ca68d7308ce6e320152"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/eu/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/eu/firefox-132.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "a7dfd698b4ddb847190e5433be60c2f4e439eca168a4069f772f258f741f52b2"; + sha256 = "09a284cebf4a9f913b77504f2c9a8e2ad2e6ffd1502ad6b996c674fd1d3c6099"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/fa/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/fa/firefox-132.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "45240bf84f0f36ba76eacd45eaaa50764dc31b50024516a108bc7a0874ed7fd2"; + sha256 = "d359828d106d6d8f3d230d96c479f722333f01bce1edabca23b8038aa331da76"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ff/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ff/firefox-132.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "4c7437671123c8166010004550c4f537b7781a7f0cb613b2d410c8f22b9e9e69"; + sha256 = "fafca6471669a4da24bf97191a49f26a7c65b4a1c53cc06b5e3803dda217c1b9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/fi/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/fi/firefox-132.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "0deeec3c2641dcf2fae91ab2ca9f7bfc2baa4da60e17d4f3222f771d9e164da9"; + sha256 = "76c96649716666bbedc187e0fdf92f7b6ef5ead7df48c43bc91b650e72636d3c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/fr/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/fr/firefox-132.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "21c640f55ab1eadebce4d95126362dbc133f4354dc8eca23cf77041bcfd8f621"; + sha256 = "be8279d893347726c9ebebf9299fa8708c7c00815fec0458ac7a3acfd926877b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/fur/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/fur/firefox-132.0b6.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "60ceaeb0cba8de73fad46fc8804f1f53fc332824636de54fc25860385f332e8e"; + sha256 = "e4817a0d0f17d0346da545dab0352a24224d6d857e601f6f7742d2989da5d15b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/fy-NL/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/fy-NL/firefox-132.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "9c3d979d24bde8a5b942243144c2e99efbf49dbc0b53f467646f4ada4d95beb8"; + sha256 = "151473d60d6805f01bf38996d5f73fa3d82ede2b065d911a8e14a16cd70bed96"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ga-IE/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ga-IE/firefox-132.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "aaedb9933a1d01338d4d22f907948b00c9a88fa83e80530e709bcd3272c5aaec"; + sha256 = "a5a2b8136440ec821b40a5e8b7f7e4562ddd7891a841dc8802be80a59e5f1e12"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/gd/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/gd/firefox-132.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "85ffbc7193f6957c07173c8522e70fe313dd116bee3da52588f61bf3cddff1e7"; + sha256 = "622ce9d6f24fcd37f8d8ef5a3a9e1a732d4bfc2f603de80197ceeffcf9b6696c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/gl/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/gl/firefox-132.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "54a8bb50e9d497728bc455285ff40b53c7ac663e6b12531e17dbe18019bce19d"; + sha256 = "4adcb05f434f997df7f46fcaa19df53f58dac17df707e57f65cf6eb6b2b8f4d3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/gn/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/gn/firefox-132.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "348a0de7fa8d1a8a44d0a4b3de48e7f377e5af3a6ee1a6c5c87d5f3e67e394f0"; + sha256 = "d51507f9da81d364277456513f4448cbe32a15123b9b2b91a09dbc856293ad96"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/gu-IN/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/gu-IN/firefox-132.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "4c5bec0040ba7c7c86327da0936fb82873986535be12aa61085b5fe2fd292a83"; + sha256 = "f390363b651338dd150cfd4a52e046c790ea0213cf8ec91ba57a0b89fc1f1b63"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/he/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/he/firefox-132.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "2706293c91fd55de743916430cf4bc410a53efbe563f5c8794b6fa212b767870"; + sha256 = "df8eab1a07e1e54bba9748676c9f59b0f1145ad877f5e6ecd962f1aef797cd1e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/hi-IN/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/hi-IN/firefox-132.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "620034e178aa1688c851bf618ed05c238e89a4611652d8907bb56858b0a88874"; + sha256 = "27c4c32368e9324cc64bb2cf91d43254bf4b7c80521982be32f75ef495ee3f0f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/hr/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/hr/firefox-132.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "b168e24590ae4e74620ac279982d3277105f01e57b4c7b014965e941596960fa"; + sha256 = "3936fce57b69027bab9a96590fe67291ab1480873c0a68174d0b0fc61738fd8e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/hsb/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/hsb/firefox-132.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "6a1b831ca8b7400962a051e2308c67b231dad5f331daf371440b73f02f15e305"; + sha256 = "7d881992dd651be4fcbb50fe5b4c4b03badc9f65c7b6952c041466e44d7d9641"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/hu/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/hu/firefox-132.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "c2db40b3fa0759bae7fcde219b91cb8c9d80548fd8f58ef006ed58696b0272f5"; + sha256 = "3f831ae076063d9209df8cc70feb71960a538170323b775a4a4ca1e9ceb4edfd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/hy-AM/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/hy-AM/firefox-132.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "e59f4ab6b761122b271f600ce3e3b2045b3264793ef4ba0a5f786f90de227a7e"; + sha256 = "4a66a862bf8c549010ca27b43eca9c09f22fe4630155e8a2f7130731aa6074d2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ia/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ia/firefox-132.0b6.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "cf212e24c3be50a4a82f4e85a4363b1c9561441a98e2711eba4035f3d70e37a3"; + sha256 = "90d238251b4da6da55ef8b435924ca26db43d0aedcf870b4890c98e50a7ffd07"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/id/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/id/firefox-132.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "1ac9397f213d1563840b1644c93cac4e9fbabce5d64d34d0d26cb2ad9cfb4e5a"; + sha256 = "a713d0029c0d847427ffc3c2fbf098eb37556c4aaee3739f8596fb83a47b0139"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/is/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/is/firefox-132.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "4b35afb37dd26bcfb2d1085ed52729624522c71d28429266896234be6d4f4c01"; + sha256 = "40b85698fdc815fa8646c38a92fa2f5303535e89dd084a176f5257ffe9d1f3c6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/it/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/it/firefox-132.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "49cfd104dfb6990e0d710e5f00b0a2261e219306ba79ec4c0c781a7c7434e7c3"; + sha256 = "466b43b80e14ac93c65cd14a8397de012108fb9f4ed2e7e2ae3101a4274ccdb9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ja/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ja/firefox-132.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "f22221daeaedae3617119c7f20967fa4da9d31e3dafcaa7caaef2373a3aa6c9e"; + sha256 = "c192d0fc009525cf37c1a92b35447d36e28f7f634cc4bdf17d4a081d93f4de3d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ka/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ka/firefox-132.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "fc2f5b3f2d5ce8ca01e8a99dcee1711d1ee4023abb8731de5ea46692c4a61290"; + sha256 = "5f89a19083afda92007b8b17768332fce88abe382ba75223d4773914cb350391"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/kab/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/kab/firefox-132.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "055280c45f00288396d36c256526a5dd64adebcf3bfe440e9c9ab2202e55ab5c"; + sha256 = "8630b6b872a9851233a47cb1826d26fd54d61b5191f819f8901581dcee7dcfbf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/kk/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/kk/firefox-132.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "0a5317894efdd746f0e8d40707b0c0f33b8b84edc05df0c4f9002c884902e081"; + sha256 = "443ed4b04c8cf2643f26b0f726466553c79e8d2431a2e85f2405f30b2ea00342"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/km/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/km/firefox-132.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "8c60941a34c898b3856ea187e975a7d6dbbb73a505d5ebaeece645d35106ca59"; + sha256 = "8e01e4eab13f7ea9b78ef2f7309063f117221b402c907b4af529d2c59629acad"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/kn/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/kn/firefox-132.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "93513224080c9949528812a3da30f0a6e178240214fde3c97d1fd9cabbf08598"; + sha256 = "e2c2b109bac9ff9d513a8551f307258afef9304bf986d8834f21b9619c6d360d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ko/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ko/firefox-132.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "5dd5a0d16fc17f9e4cd252f2ab18a12c457a224b2acd163329cb1bd705f05bc4"; + sha256 = "c285e096e7d8da8c6edee6c5c72f6429b2aca3c9f95ae77eebbe5799206fd53a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/lij/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/lij/firefox-132.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "c54c0e099ec3dfb6355a79e1ae2ffa1298a21d786e6b5e04fa9a428872a4f717"; + sha256 = "11272290885f5028fbd9190a05656074e24dc8cf1e506de54a77cedc861645c1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/lt/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/lt/firefox-132.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "c955b89c4d53075394cbb4d1a68e3864522e7e2fb24422917828079ae431f216"; + sha256 = "770a9bb5251c933a000be6529ad1adc67d14900acfccc8f07b3a32fe4e2bbf48"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/lv/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/lv/firefox-132.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "21b15d4bc68237c8ca60b7fcbbe166c2bc31330b5d77d333e25066e671f545ee"; + sha256 = "73c74c2e358ca4179d3e2261c439a06b8f6b22217273165aa63f7ef7778f965b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/mk/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/mk/firefox-132.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "1ce9a53f0dba2c1f93a31c72228c6df2ef70e74cfa155058f764ec2ce05d3e91"; + sha256 = "493ee4f4eaafa98d22d734b4c037b454cc0fea5dccd5865c17c7523f713e5835"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/mr/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/mr/firefox-132.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "b2a70628f72f662edaee06a767fba449a91af37387f0aac0d5c8b40a7c61571e"; + sha256 = "3d02e80827959d4aff8a78cd9e681c1b5ac24965e9f97a0912b9dcd16ad1b69f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ms/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ms/firefox-132.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "c4b7453d3606d8a92acd7848e9e8e9f6aa2e54db11942a09b004b5017a50ef2d"; + sha256 = "e94836fed969144beeefb6aaa1f8fa4ab463e17d03745f9b594b7a7307710133"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/my/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/my/firefox-132.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "c7d0ad3715681816ed5466640315d50fbbd841516c56c6828e8e1a777207f967"; + sha256 = "5d7cae491b790b35f3f54a5f09f8f108488ebabbe91c193c168ba8a9d0111810"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/nb-NO/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/nb-NO/firefox-132.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "2d2d14fc9a898ffbc755ac2b8d7cc67e006fce444c28785adf65f2663deb0815"; + sha256 = "37d252715814c726ff098be56ea4e9f0ebd2060730bc791ce94f5ac09a5a9fcc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ne-NP/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ne-NP/firefox-132.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "4b3da73c884d15c4ab8be803ce8fdc6048e5c64def9f4dc9364b5df49774b67b"; + sha256 = "35780666ed985a7005309225960abf7641fc94ef51cadfd7b07e13f10e21b1c1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/nl/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/nl/firefox-132.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "a240f5ec34f358af7f0c5e1d15f6a9626d9a3e2a39cf75b2427f594be5045fa2"; + sha256 = "9008a849b7f19ced4bcda7180bad556bf7ba99f16b2decd227beecbf87353c38"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/nn-NO/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/nn-NO/firefox-132.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "b4cecd431906789f1a1fbbd617ab332a6a007573c1c5ba5210af4a7de7262ba9"; + sha256 = "7ab1b728c8a008d8d483f8dbb93498f005956aea5bb880880abe0ba07a4fd63e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/oc/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/oc/firefox-132.0b6.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "71230c3129a6ede7cd78fa9bbcd5868aaa1e43747a901645daedd0792aad3b39"; + sha256 = "c2f7948a00fcf8553ef197a8d459595e05022441739dd14eb44bd809d9f2ea1d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/pa-IN/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/pa-IN/firefox-132.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "fdc719499aca5931cafb78b12b779d744239e9321e4b7cedeebec3a86ddcc4ba"; + sha256 = "98b006c8cebf43271bf6626f695f315b94b3cf3bd4313e4e6919e0925570fc32"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/pl/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/pl/firefox-132.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "c0d2437eb209648346e69b674482b7f3d5e95ac3ccb012ec1ecddc7ebb9bd203"; + sha256 = "0e9310909e050e3a3a7903279e052c259658642a806f4ecc19ab941c3f8cfa56"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/pt-BR/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/pt-BR/firefox-132.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "07a5dae4cbdfcf6d2b8d5e34eb0cc95f55884e58a7f6cb3d8183f95225f53c66"; + sha256 = "a2821955bd876cc0e5ab8f0695c378f208b11b6b26b8ad80e62de3c0632bc516"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/pt-PT/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/pt-PT/firefox-132.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "4701a683a54da5ad32765979155a5115e9b4a8310029bdba587650255cc911d4"; + sha256 = "4e69265f84102ddc8633dbd9dc9b42f9b763d318f9cce6323b24915901a2ff4d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/rm/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/rm/firefox-132.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "004a519addc3af848ad71f4d4b85afff5787104006f650748bdaaf3fed861f81"; + sha256 = "ed8365be83de63babb9e779fb676fc7165f5d3dba7b77b6ec700220a34e996c1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ro/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ro/firefox-132.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "2c65bd5d604b3e3f4e431911a4f38ef903060c7cd5d79882287c027b4696e04d"; + sha256 = "ae139d838e133ba25c2c179993a5281d581cfc565ea2dd907e1bf9e555b891b4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ru/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ru/firefox-132.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "b4ac9db58806c4a2f636a912663007268234a9d2c86dcf4be565b194e8ff7aa4"; + sha256 = "3cdcaae6f094ebc14d5d52e900421004144dc3525f57c2785aebdd9d285c13ec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/sat/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/sat/firefox-132.0b6.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "4fd9453ad511871ed46ae1c5890071945724e7876fcd1ea818b3aa34360a4260"; + sha256 = "dd46e31c65618c0f7f89199db22aa5cb7a010488e4e43d26e47b04a5ab3fd0d5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/sc/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/sc/firefox-132.0b6.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "1e2d3dfe585ce3c4472055ea644b75eb4ece0b60c8b5c05781a122d4c2958ae5"; + sha256 = "bd45ea0bc293b1b67328af231abbad527845d5999c2a03f0ffea0dbf63275a0f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/sco/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/sco/firefox-132.0b6.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "7e697b48056401689864604fb64f1344fb2e5be303a09f5e2a35fc1cc665d6a3"; + sha256 = "7a7657056204bb6b19b4946491effc86b73360d29f2c5a680a0db613cdca3191"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/si/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/si/firefox-132.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "a4b8095c01c86f30049085a68631372a563de6941b4af7b31a5ba9502ae49b49"; + sha256 = "c03b64e6e7ecb912782e5f4fc87f494ef2caf034985cb7a004477d8883aae850"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/sk/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/sk/firefox-132.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "1c915b7b06aea488410bb1d0b466ca77c204123f83988cd1466f7f33c77b6165"; + sha256 = "a63bd241b30a31f31e25e091caaa8038e49c682c42f25d1a0b7334b0caf03e34"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/skr/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/skr/firefox-132.0b6.tar.bz2"; locale = "skr"; arch = "linux-i686"; - sha256 = "4e0d908d97ddb16722b16226982fb1c3593ddb4d1ef2c89530da6a6822333522"; + sha256 = "0cd7e2da49bfb2313e0a798921c228faae3b1aa222c43ccfe1ab059d4a1ac6e3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/sl/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/sl/firefox-132.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "64f294228a9df9540bf2669a13aeeedb1591ee5371513819096fe7c7a04efb6b"; + sha256 = "5096116356ad33fcb05f6bffe454ae54b79eee0ea88672263d7b066acdcaef2d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/son/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/son/firefox-132.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "fb28e25eaf88766f9b52a6bfdff1e918b443a62e128536c6b20ef4b2792f208b"; + sha256 = "4bb412e38d2507a24bd677f6d61871ba3025b12db1de774d01992c00b89e19fe"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/sq/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/sq/firefox-132.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "778718548b29c64c6282a2a4ffd3686b0f059e7e32eb54bee2392c34fef5d7e2"; + sha256 = "4e0b947c64582ddddcb7b60e753495353d19f1a32daa5ccaf2703d9aa22348b5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/sr/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/sr/firefox-132.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "63ee43ca2eb024f95da7d4305b725131a5370f35815e18fcb0892bae864c42e9"; + sha256 = "c1113ec613f0640c44cce5db4c8f48f1231773cc78523ea7ee6a239ae472b607"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/sv-SE/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/sv-SE/firefox-132.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "987541c3b2aa680c095bd8c2d7d638bb2d64212da2bbebe3efa2125f966264ec"; + sha256 = "c538a9314bbb012bed16f4d16f98e80e3dfe18416d9442e786954fe73886ba59"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/szl/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/szl/firefox-132.0b6.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "2b0d0e51c4c060e0e9a3b9b3e1fda018ade61b37054b06953440bd3627af476c"; + sha256 = "201acbefe7608a5d0d0ea89f8da966dac62c7acebf679a09c855c1388f5fb816"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ta/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ta/firefox-132.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "95ca89286b0845f752d2dd1da6ee87b3f7b4167099a369652b31ecb831d8d407"; + sha256 = "45661ac364bede078028129a62c856781a56c3f9028d932e87d4218800f9e0e1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/te/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/te/firefox-132.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "21087362b9b7f82cbbe094ee1dd1744a379759dcd7400f423dfc5482bb2922f4"; + sha256 = "6f6ef84f418b307e511ee2623e7e4e1f0f38f81a6a2b2b8917978cab59a670fe"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/tg/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/tg/firefox-132.0b6.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "af3d65fe8cc61128e0fec89eedac704733beb47ce9d4db71f9ffe07019f90f1b"; + sha256 = "49b05c0b7b5e3f399f72786326f83b4ea6a93095430b3d6b5c90165a677c9b9a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/th/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/th/firefox-132.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "3f198213cb7c8221d858c1c824d3fe10dd4d8835b237c0740d46510f0c95df14"; + sha256 = "61be51a10a0bc93f04e8995606e381565fd215f8ed308ea2e2b0761c217058c3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/tl/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/tl/firefox-132.0b6.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "f8615bc06132b22c170a0ba552c9412ccd6c4c9f3b6a760a77e26208d03c5cc1"; + sha256 = "a6c0d272f09e687cc6d66be5995044381f26e03d9d985eebc69e4397d977235f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/tr/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/tr/firefox-132.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "e1362f8b285d082ef2299be9af67bcb65fb58f9620ed19b8f2eb97d902733409"; + sha256 = "aff95021c9647e80c85813f194cb3adfe25845397a478e5cb0e2206901c2de70"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/trs/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/trs/firefox-132.0b6.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "6cb91ad15348984db6bf9bb11259640ea0beaf36bf06afcf82a7d90d66587776"; + sha256 = "68429a694176e397845a8dc88e145c053eefb6d1ecc891fd9bd119f346023cf9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/uk/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/uk/firefox-132.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "0acc83a27be732fbf9e6d94650fcc0c467b7d653fd6dd65f34668831c43fa16b"; + sha256 = "f210e6f0fabbd0c61213903131b8f9a6531eb1d1f473674b91371a22c62bd2ed"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ur/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ur/firefox-132.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "c99a6852c0840f36fd6cde0de174ccbb6516672ea5cf556e40c622a8381e49ab"; + sha256 = "604b41af2ea67cc46928e0d92caff5e76b6e5a29ed7b8100c739bfd9194e7576"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/uz/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/uz/firefox-132.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "6172ea33ceb1fb782a47f014a64b1cd71050e05e4d8dddcf6270575acae422af"; + sha256 = "645d5cab05d4b50abc522e3d8327f658975bd8d60b1a8fc2da01b54f853d062d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/vi/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/vi/firefox-132.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "08880e6ef6d4e967d24ead60208830b61c1ae193ffe8908d1b8e09381e369d81"; + sha256 = "129e9b5a687ef92591a361f3bb4f64963d17264553895b69273b0d42a1a91c6f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/xh/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/xh/firefox-132.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "e74fd0ec0f1779a26a57b410c95e1e25c52828cf0bac4467815583cd6c426ea4"; + sha256 = "f9da5c5f850314b0a3e17fea14cfd1d32e4a8249bccd8edcb7b5ddc04ae0ec39"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/zh-CN/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/zh-CN/firefox-132.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "cf169eaed6e207160ee5ae11d3e9c7f6d61eb4bcc827b0d56bd6216a5e45d5c2"; + sha256 = "7af8a93f0f09203c20081d2635a21e821fc82e1556ae7c8b311a5ea80e23ca19"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/zh-TW/firefox-131.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/zh-TW/firefox-132.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "e8bd7755a146032ec5c5dcc816b355fe40da168008570316dd04161767043cce"; + sha256 = "ce1b86777710d7dc1ed445c68d7ea21b3f0d45f28bfdc816af6da945cb6fb5a2"; } ]; } 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 a004579709..2fe02ca0dd 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,1035 +1,1035 @@ { - version = "131.0.2"; + version = "131.0.3"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/ach/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ach/firefox-131.0.3.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "527b6512afdc455e4aaf0ba9240af3680eff5f1406a01e5d611031e6e82aa131"; + sha256 = "ce47276828a6095998329ce540a2782ef05f528d8bb8b0734a996750c4f74297"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/af/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/af/firefox-131.0.3.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "427a80d18d0aa466e3a74757a45922f22c17778b20d692041a4c68ef29eb8e19"; + sha256 = "0cd67c3385ba09f779020f5beb173a75b90fe8203555bc311e5ccf4b5e45c582"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/an/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/an/firefox-131.0.3.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "b3f43839be8aa08e0c637ca8ac8ff006f55c2a8a8d5f62000161188bf0339dca"; + sha256 = "0e03aae4398859378d4dc590f7df6085e82162ea3ce514e4b90660d452d8a9cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/ar/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ar/firefox-131.0.3.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "89beb5f30b2e7fb6eebad33e73950fce763bc0e5028ac633da0d0a28925c956e"; + sha256 = "de9566430fdc3a7a9de14d302abbb8d55a693bc5ffdb33c9078cb844578701c9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/ast/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ast/firefox-131.0.3.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "5e1a279ff78a09dc067d079bdac89ac4b605317e571b5479f0c360874ea2acc3"; + sha256 = "56ff77e155ffc8e7ba9123d36aa45bd88e05128a360e7820a6531b5d80af3be6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/az/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/az/firefox-131.0.3.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "2fc304846cef2a210e937fa556fd89c1146cffd178f38a15bede9d38227fa056"; + sha256 = "c3c5f15c91011b7ff3fde9f19345a7594e4dcc600df8191e26ee4480219c5a0f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/be/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/be/firefox-131.0.3.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "c1e3f9de73ea2bc2d67e9701776e9aeaf68c68efc6a313995c23210a096bfff5"; + sha256 = "d552d1f041fd36e2d6f46e947dfb35e4aaa2a8d64a5512a6c071e4c4c971fdf3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/bg/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/bg/firefox-131.0.3.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "bef3ad9b1325e90d1cc707e8f1d6292b1e7bdd65a450cd58e7e1301e1ab02539"; + sha256 = "2f13001eb0b1ff4d7b29daee49d1705770b30e7e45c40a5bd900ad4f20c04d28"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/bn/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/bn/firefox-131.0.3.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "e7f926434d77fa6ee7d3ccd3a9594727332c8e34dde1284aa1824872212cad9f"; + sha256 = "4f221f904faa65eaffd6b904aca950985fb78909fdbe7408571e7db255aea7f1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/br/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/br/firefox-131.0.3.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "f3adeb1b84151625b231c97cb13fbac0063506eae79740e8632fb7b89f0b567f"; + sha256 = "9adb4e21ce0a260bb5330a2c4aa7444218267d161ecc2afb900e01a2f50d0e45"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/bs/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/bs/firefox-131.0.3.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "50fc2475f46ebe795be92db93d46023a60fc40220676fcfa358813d89d517592"; + sha256 = "457fa7666193592bb67586997d48a345276b34ad2003885676412daa89cb8ccd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/ca-valencia/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ca-valencia/firefox-131.0.3.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "c04d62e2701767071c793c19e16d5c0d681160e1879b4fe2990504872201abb5"; + sha256 = "2a3a87879e638b7fca61abc8759fac4ac52c36d4eca3e70a65be9927e70f62f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/ca/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ca/firefox-131.0.3.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "f0e22f2be9e7647a3b613b32c685570ff33a837b6cdb0bfccc5dc40703d2f416"; + sha256 = "b758cc28757d5140f35b5587d49f2c90f4af06a5afaedc8dd3fb8883194bad23"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/cak/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/cak/firefox-131.0.3.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "6abc55ba6f9866a5b1564a9905f8f75b8d74630970bf8cd0d5d1c5445927a7a9"; + sha256 = "d16368cdf360e08a6588be9ca9b69622f946296850e34126ff8ba529b1090b6d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/cs/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/cs/firefox-131.0.3.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "fbd1552f25072df5fa972eec2ca7d4dab0b92183fd0b5bbc78a1842607e96b2b"; + sha256 = "23e36436b0fa5a7ae52cbc4f1ae28e94827f59a29af22203fd18adde7e31122f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/cy/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/cy/firefox-131.0.3.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "f92405ab9181ac6a2da4ed1cf5ba58da45068fdd5078c9de307eddcc99cb1280"; + sha256 = "79a0d2f132e43dec9bb9f800614977befdb7b3f9b3d727dd28f5cf61699e3e53"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/da/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/da/firefox-131.0.3.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "1d627b82f98119cb3fe4eb63e9d60fc8b301b9c6f33b9064ae74978e11324d01"; + sha256 = "292198bfb3f0cc0ce72fdb6612537771f2d273793736f8fb00003d864eb658ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/de/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/de/firefox-131.0.3.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "7c7debaeae65be2128b9b72a0348caebed3d3b7ccecc6b71c2a0f3ef7c0868c4"; + sha256 = "16d96676a2716ee32077334e505a751ef7de435f2e9f7d2755d8a52eff3351f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/dsb/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/dsb/firefox-131.0.3.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "bca7844a47613cb12dea31c17edad3d269dd31e948b6266cb81755ab967eeec2"; + sha256 = "0685c4ec44d825d9441342a40f88b77242fdca6458d499d7fdb94b94a01f8431"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/el/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/el/firefox-131.0.3.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "6982d4fca6a8c2522b7c696965cecd2ae6e85835c8738f9aaf7f24e70ef04704"; + sha256 = "561b9796b0064aed074662f301020cd2b918b77b014ecdb329e784c1750eb2fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/en-CA/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/en-CA/firefox-131.0.3.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "bbef2bc9883fdaca9d9e042691edaa7d657b449b963bf1a87beef17252759ab0"; + sha256 = "75e591078f3130b441bc6bbc22a428b3f46e4544bfdc0432deb176f5e50f66d2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/en-GB/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/en-GB/firefox-131.0.3.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "cda36e33d2de502a51a9ce1cd50530661e79c58b114fa97651db45debb98f865"; + sha256 = "7e4909f44680700334ab9e68b7ee676b5c803ada15acb150aa4cc5f28b62d94f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/en-US/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/en-US/firefox-131.0.3.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "e4dfdafd8b82e5d958a78935f55a9b882c9b7da6ce985cb3d3d779e66cb17311"; + sha256 = "fcd1e93221074a7b44445a99d81ea26e95fdc4c7e67000e748dab93cb12c2a13"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/eo/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/eo/firefox-131.0.3.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "8b4161b162f1ec2f95bb267c0cc25781118e9ecbc30ac5511a33d01c160e570b"; + sha256 = "43e2ccaa45495ca3d2ac88975aa026eaa5ff3ad26c7fc7f0b345e08e7a2bce57"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/es-AR/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/es-AR/firefox-131.0.3.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "688234988b4e9c6eae823e7f4f5b154ef46a7d82b3cd948a51960889fe1a5c9e"; + sha256 = "9b54bbd5562423f4cd35dbafcb87eed33cd390bae464aa8a933a10970c7718ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/es-CL/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/es-CL/firefox-131.0.3.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "3145000164c9084c5f1c7330434d9928d8d09ab04b35e4b633d63a854e4d10f7"; + sha256 = "e05306d953a51676de4c1eadba4ef1ddf5d39f7b951e29bd67f21d125b1a8016"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/es-ES/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/es-ES/firefox-131.0.3.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "d065683be41858b32af1105d1cf8384f0fd7702d398f264c46b8af764c2c236e"; + sha256 = "7f3cf35aeb310ee49517d8d8a805d70680dd82fddd6feff89eb8ef6c00095362"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/es-MX/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/es-MX/firefox-131.0.3.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "6088d01fad25fb22492e06cb0d1d8220bf3dec078bfa27d15dce3fd58b596b9b"; + sha256 = "c6321e405ae767190defe1951e3c8dc638beb4d6ba3d5ed864a906f60c72cf2f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/et/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/et/firefox-131.0.3.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "d861f81a1e43af6ae00cd06162fdac10c764679d2cb71a15d39fdb1480af814e"; + sha256 = "9445741ba8f6b4d143850dd83c179e5de81f6227cea223d661a2f4f3b0a24c11"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/eu/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/eu/firefox-131.0.3.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "fe640b6f16c251155f502698059862e92783e5e262ecce84407b34c22353bc5d"; + sha256 = "ede769225205b61fa4e374c94a4e2696df8bab7561a0676a20d87cb3b617fa6c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/fa/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/fa/firefox-131.0.3.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "c0279be2794845a72febe8ebb23d6aa0bcdf01b1a61456050fff24212547b3d3"; + sha256 = "4ca3c41a73193e08c48cc26db5dfbaba240cbca27ad0febccde5b7aafe4af2aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/ff/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ff/firefox-131.0.3.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "902951f2c0cc8ebf3f7840d010a44db59d4b04f19c7078a6441a15f137e8b302"; + sha256 = "4513378ad48bac6b5a2f0f7d0dd25ce8747fdc045f31ea38334b6056ef0de7ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/fi/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/fi/firefox-131.0.3.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "29039a92015229c01ebc6427137a7ac55a5840e6bf611b9a19f16bdaae6ff83b"; + sha256 = "a52e910c49225b7d9ecb3744490877e60099a83cbfce34c8ed95671940612d95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/fr/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/fr/firefox-131.0.3.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "9a4301ffb22bff92e56ef89c93bf75feead7641de935aa8308deac3138bee49c"; + sha256 = "ff1e7a923e40804c167fa7266a7fff3cc35399cf102235c3d7ce7255f8eaf931"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/fur/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/fur/firefox-131.0.3.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "895748cef8cf62da9bb4e7d5b5fb0de37e6aa41a5375d08967c2c468fdd864cb"; + sha256 = "e48a78c85cee91b8d6ef932b9358fb8e4b4a9dea77290c86eeb3bae6ea38cfbd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/fy-NL/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/fy-NL/firefox-131.0.3.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "6df68bc761b69d745338480d55b3ffa783c2372c8f92964d5b642df26234e3a5"; + sha256 = "77084f712f7bd549219407a5c9ebd29a3795b259316718be43d6b84e32e7afd0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/ga-IE/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ga-IE/firefox-131.0.3.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "5609bf0266ecb2107dda877599d5d31058115d838247e7fc47aaca7fc8cc6298"; + sha256 = "9c5db3b47b35fdbaf7a6e76e66d6ab3d1c378754d3ff0690a2d4ced6ede034cd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/gd/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/gd/firefox-131.0.3.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "01ceaa470e7a4ceb122d32fa285a4c6013a65efe5f81514fe8da4f3202c6140a"; + sha256 = "1a490c57b83596340a15ba02c0dbec5c949ab918cb734a475e65b1c0272473d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/gl/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/gl/firefox-131.0.3.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "a660c3ea3354578bf52134b889b66229e71224658fb2d6ee8420f9ac6fb9f2b0"; + sha256 = "3765483fb85e810b3aacca4850c34142d714fe8245e2037fc814c27249f99be4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/gn/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/gn/firefox-131.0.3.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "96c6800986c4d8db286034a81004984e9e055fc4c040e5a13bf92c8589d3bb47"; + sha256 = "ef7319be7e1c911153102f92221b0058eeb0467b76e419fef401cf436ba3ffbd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/gu-IN/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/gu-IN/firefox-131.0.3.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "fe6c2b96625c2e21b2eddfea742525c24d17b715935fde1766a70a56a6cf38f6"; + sha256 = "408d8b9a40fa7f1de3b3641e5f2bec55ed32442291b947cf4c0d8959155b22ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/he/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/he/firefox-131.0.3.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "2931f17eeffb5b04ad6beec6bff778fb28cb58a57eae6c68c3146ae9a76bc750"; + sha256 = "a44352de8e38088aa63900d5da91e572304eded71194dfd4f12038e3a0b58957"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/hi-IN/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/hi-IN/firefox-131.0.3.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "b576b994c1bcc0238e2ac6cc8fa2f2a204abf138c10bb8303e3b761914123601"; + sha256 = "1c020f0c472e47076c45b7da8cd8611099b028bac85cd5c1bda05c34128044f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/hr/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/hr/firefox-131.0.3.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "e1df99138e5e0c6c4d5dd419eedcbe2a13c7e5ab34876b0e7623b3e09561f89a"; + sha256 = "1e078593bb28423916759ac9e1ac42a16b2d0506cdbb6166ededd7900bdfda8c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/hsb/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/hsb/firefox-131.0.3.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "fe8d4188275ee3e99e3a7a9522e6a7c252f3accb5d732c5c511e7c96b45d8b03"; + sha256 = "a451016738f59f58564f32352870dac276f3f5be3d271403a7cc170f20cd810b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/hu/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/hu/firefox-131.0.3.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "2ba69b66d2abdeef334599df98a32b66cc8cc386cb61142bd54934be6267f7b4"; + sha256 = "0effc6e589bb208bd6cf255be743a2e3f87ab9667b5da79c61dad3552123cd2f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/hy-AM/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/hy-AM/firefox-131.0.3.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "fc4264f273a1f6bc62a4312652bbced16dad2140583ec397617ac714b4c202c8"; + sha256 = "c72d175478ed98b98d301c66aff8973166d6d5144232c1e357cd219990aec28c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/ia/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ia/firefox-131.0.3.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "2efef62ee6975b8e90bf680c8e539dfca65917e88d147e17cd03c38a3e0d93a4"; + sha256 = "0b71dfc7db95af38b851bd078bb208acdc11a3463e96b8e980a1a72f2876d2c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/id/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/id/firefox-131.0.3.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "893487ca5380db8d7a23a26fe4849c5e8911137dd4224313bbc468d7841d8f14"; + sha256 = "ba7c1ae12520986d0ad2f80c2d302f6b0ef7b9251e0af91ef7077bed616ddef0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/is/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/is/firefox-131.0.3.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "6b42330188084788c0bacdc2082561609916ac457ecbd8ff5cedee5d8ac7777d"; + sha256 = "108359593d08c9151f5f126499f726887082f1ee6c2876e5c55a13e68b9f7cc4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/it/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/it/firefox-131.0.3.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "424839a7f830de29929881f851b64f6387a863ae9002b1987cd53f2164d2cc16"; + sha256 = "c525529e385a8b125cb2486c6fb8ba616a8dd454d0f5bfb1baf7ff8c375e2792"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/ja/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ja/firefox-131.0.3.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "25b4a500d4521cc87734c9bd6046c37dd2cabaeccafd369a6cc28e9707c3e1b9"; + sha256 = "1772ae1f653aea9113e770e9c33845d2905d440b6d2bc677247f05c414ad2736"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/ka/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ka/firefox-131.0.3.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "7bac8c0adc85bc3028c8a00078242bafd83da33254b951a5b5379943fdbd2efe"; + sha256 = "8ca958603d9b94a68e54b94802de130f65c717378e19905199452a35f27890cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/kab/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/kab/firefox-131.0.3.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "354d024e12979ba7b973f2f4021067ced8259f5ff9a223ab5907c7fea4018c3f"; + sha256 = "6da53a8845754dccc1889b8b888c4ab0a7bb62c679d2edfce2d83cbcc622bfc9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/kk/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/kk/firefox-131.0.3.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "0118f62d2966c5294d58529fbc2c471120883e0b27ca041d7c71994a123b2fce"; + sha256 = "24eb87af3979ac820658205df96bf5b175c1023fbe662fcc3bbe25f27ce4c3a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/km/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/km/firefox-131.0.3.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "67882687e698c39def447698ffa588659234ed115cdb3f3b930f9a38e9e1ca30"; + sha256 = "b979e2f00f65372d13a2c95de9e0bf4af2040ad32f9042f1289d09cf3acebef7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/kn/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/kn/firefox-131.0.3.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "5f498e93a6ee985ac48a4d1d081c2d1bd1b001ca008db92ea80d87b1ce57049c"; + sha256 = "2d32546b2fb266ce46abd45e1f82707377cf8de6fa2579e47848a508d4f2c22f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/ko/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ko/firefox-131.0.3.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "e849db47d9c7099f35f3f1289a87b5da9c9b4b000e22fff072adabad802393d7"; + sha256 = "5bc37161aae629f8b80cb558b29f3284015987cf4233ea3808b45243e9c683c9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/lij/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/lij/firefox-131.0.3.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "4eb17b843956122b4f7f05ad765beac62440cda277fc37b29cae9b855697708f"; + sha256 = "a732f7208e985c38209d4798f6a3a74a2dfffa9465ad40125bb03d14502a9b46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/lt/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/lt/firefox-131.0.3.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "31362336d8ac4a12529fd1976b1ff81b29ed6c65dbd4ebffb06bf72bc1f40c12"; + sha256 = "7a5419e60f4a9723b04fa71ad3ba9c255517f76441acf1b8059dced796aca4fb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/lv/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/lv/firefox-131.0.3.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "39b6cb02cd5ef24d725c9cff0800afd716e856c2f79419c79a1b45e50986f642"; + sha256 = "3636dfc8d55ae6945ad81b33a39696693ff510ddcd8ac1a4bc75d49228f1acd7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/mk/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/mk/firefox-131.0.3.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "fa2f898afc24c4decee3beaea31ff38bb811ed8f823abb89cd6aed97b504614b"; + sha256 = "3506d91692a3dd74ca545b7f6e6ca8626f05e50896377933e222dd74a3c58870"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/mr/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/mr/firefox-131.0.3.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "0b4b33bb20fb50b6d1c55868160301290e0f572df1955b4deb7f53bd1d21f708"; + sha256 = "817032106f3daabeef95c050f788a625979481167c21a86ff95ef0a63d574bcd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/ms/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ms/firefox-131.0.3.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "61cf2b7bfd32b854644944988aa5bed4012e3ebc871d819ae6840285dcd9448e"; + sha256 = "140980a0255f64839f726dc93ad05035946871917bd2fa5ec4bd747046d2e93f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/my/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/my/firefox-131.0.3.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "6824547014b2e19e45692d0b337f9da45b124fa322d84bc09ef3fcb490729a5a"; + sha256 = "c9d18fa0c9db1d079a8bfe6ce693c5bbf50bec76d8a9615626ac07032e9b35a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/nb-NO/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/nb-NO/firefox-131.0.3.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "cfdf63f6bc5808e4bb08ffc55a3b77bae6c2b09ceb8c04d31c78d1339e5a2809"; + sha256 = "11ba3290b7c01c66cfcdcd1d474a979aa81e15da5e5cca91cd0919e8de18a2d1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/ne-NP/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ne-NP/firefox-131.0.3.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "cfd98141bee7492c2f60389f8cf776701353ca96fc41f0902a8ae81a8d7d0a3e"; + sha256 = "cebd7f73b3e8f834f54e699b534ab441affa881d77004639cf6f31b6e7d322a8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/nl/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/nl/firefox-131.0.3.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "babb03ff3a2b0d9e6d8012ef3016f318829adf212d3d7b5fac50f7698518e63c"; + sha256 = "d96d5950779cb4c807eba5ff0538ac0ea97dd4296eecb69169033c8c8de2096a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/nn-NO/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/nn-NO/firefox-131.0.3.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "88b73c62f2a7aee0934dcc20888c33bc0cc4a98c6b16f14524b0dc70861e2d20"; + sha256 = "b7af3b8c3639a71111aa40ba9fd25596152ec55cf9ce0956ed1b00af86d60a66"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/oc/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/oc/firefox-131.0.3.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "bb33a83e0c5b92c58f9954d919afa09c49f065fd65c57e7b95c4006f63173c89"; + sha256 = "6c7cbae9fa6f1917a30716168052f7192bef3f430b6b001425e8d0e003642d27"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/pa-IN/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/pa-IN/firefox-131.0.3.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "abc324edac905e1dc3061a6ee442d00d6369dff5aa29d36ba16048be4b3deb61"; + sha256 = "a83758abfb8ebd43b4c13a1d30c1b28d1cccd933c78ae05b756f1550e36cadbb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/pl/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/pl/firefox-131.0.3.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "a6392cd311337221cf5fcc7cd863dad6caa18fd803f67cde15ef5afbd68bffda"; + sha256 = "8b16c40fe31f2032fa7f74284bc6e21c86be0499f992a003ba9aa883ee79fb2c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/pt-BR/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/pt-BR/firefox-131.0.3.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "aef36414761717f17abb72a96b923bed9d85f92a2fd7b1cde4599238baaaff91"; + sha256 = "01eed64b8533fb5c3c00c9603ad874d490786b48ae8d7234605c0166e1bdfa0a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/pt-PT/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/pt-PT/firefox-131.0.3.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "971d85215cb85084780e074dee0712c704dfb7b82a1a7b71812aaff188e8a1ed"; + sha256 = "619c4565a70b666264b8e23edd44e1656e9565b441435c6aa2590c675b3a2dfa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/rm/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/rm/firefox-131.0.3.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "7d9773d01bcc541909347a4453cf52663f70fc177ab24e7772076660458b87fa"; + sha256 = "86e5d4bdf323258279a2a776ade8b135d2cbc2f7ae29fbb13348a1ac4281c04f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/ro/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ro/firefox-131.0.3.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "9dff6288dcb84fb744b3459558a65d9f5584be8b8270caf8aed17e2a0bf86532"; + sha256 = "55cd7161953e23474edc3f1a1d0e708e38eeff17b5fe5fa8a37216effb6a8942"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/ru/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ru/firefox-131.0.3.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "ad65bb096027ec583349b4ce4cb66bb1d3539435098d609c03d5a2a4109487cb"; + sha256 = "44a82191b04e93e4f537a35753e6b7134f8031af402cd1c4902ba5d714751af5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/sat/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/sat/firefox-131.0.3.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "042a8593c78b841b47c7d164daaf7fd98f766ee5baffc6b886d7f40fc640707a"; + sha256 = "7211d7b59d22dd3e5f2ca5fdc13329d69ec0ded8bf3ee4d9d99dc61c316435df"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/sc/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/sc/firefox-131.0.3.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "ca96dd09fff80be17c86a8d93642860ad8044458cb96ea6876d4a2ad2d76c098"; + sha256 = "bc58f74be8f159a6c982a133e83e46f5ca0390d8d3469df89daec6894ba9b022"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/sco/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/sco/firefox-131.0.3.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "cc07b39d982446d48ec6e42666ed923492bd413b50f58d5ccfdeda5f37435ad1"; + sha256 = "018f10b910c1402f5f03617e57715dc52d86595024593fa75855bcb955fbbaa2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/si/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/si/firefox-131.0.3.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "e4dc05ab27ceafe6f20b291673279c70dcba13ab50f97ba3f069f6fd460cdfab"; + sha256 = "cac0646f559ac272ffb1f6d722ac12e4af8d29c754a87fe2a3efd4165b7857fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/sk/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/sk/firefox-131.0.3.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "1638ab3838cf94f45933e68a154b227c3163f111a61fc3e9c4bb87a13fd4db2c"; + sha256 = "a4be0c45b86fd09d81ae2f28b273f8fccf2c5fc64f6d1361a6b58c289cba25f1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/skr/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/skr/firefox-131.0.3.tar.bz2"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "c764ec80fdb67f80d8ab1b1f7b1015e2de9fa3f7b01f2670ce75df81d3ae1bcd"; + sha256 = "dca803c585ae209ad97bf193990b5072dc02b145e57a576ac24208ccb6081ab5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/sl/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/sl/firefox-131.0.3.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "dc02bff971d084c5a2649e6dbd44f4824296aa3f11276c815504158a155139a1"; + sha256 = "2c6d810fb8e75f8f7e58f5bb44cbe4ee699aec06384249afebac93667990c4ec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/son/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/son/firefox-131.0.3.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "6bc1c8599016ffc0d68889afa1afe4e4a7c047489d10cbc4c135480ca7ab5c04"; + sha256 = "8ec6a4d9bf19ff26caa7235aab596a0a4668aa53d38dcefdb40061ad27b04c0c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/sq/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/sq/firefox-131.0.3.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "d10954422766b3b240eb116e24c92714e8e9fbeb399b3ea228344c775d27de16"; + sha256 = "1495883fcd77635e68b77157213a089841a4eca0bcac68944813c6311ce516cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/sr/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/sr/firefox-131.0.3.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "7e3739bc464ca17051355bd74ba1dee2cc7fb0ac0999a9208e2491b6488cfad2"; + sha256 = "54d80555fb0a66de7e936b7b561f1a897d90b062ed87942d11b557cc75de6c25"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/sv-SE/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/sv-SE/firefox-131.0.3.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "414031af9009a87262f968b5425407a71245b248ad432cd6d8ea6537a01e40e2"; + sha256 = "a12623662b0a36f64f382f3c193deeb19d8d0efec77d33e5c13e72db54e9f417"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/szl/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/szl/firefox-131.0.3.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "992d61038093b9cb968d83a90c809a96e01a81f71f0cdb481b1667af4622acfe"; + sha256 = "8e49f5c4616bc918726f592c42fcb66eae00899169a3b0397221088743387018"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/ta/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ta/firefox-131.0.3.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "c530ae2909247b43a20b9689792950517d320bdc5e90919785b72572275b92e8"; + sha256 = "ca004eb05ce3a76c210eb2d8d6f5cecca1bf2156a335af733e9f74d1e9c65a48"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/te/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/te/firefox-131.0.3.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "b2b719cce62a44ddbf5e008f97aa94284b09bb0c6b1ec21a3211ab2266b3b9ef"; + sha256 = "12ecd877be831b33f46887fd44cf4def9a48e7b0b33505e22d457edb7cacfeeb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/tg/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/tg/firefox-131.0.3.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "52c9aad562314320ed130f1ec4f54d1243b5b814407316e25684664836ca1a98"; + sha256 = "395d06d3ea004b1ff93a22f0d51f7737cf96abc6efe3eafcb5cf04a56e229517"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/th/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/th/firefox-131.0.3.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "59145339f4242eb490afd50046068bda122a5aed76fbcda2d79915c013636a27"; + sha256 = "432272367757339ec6bd3546580667167ed803ef63fe35ea0653e48ad4186c4b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/tl/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/tl/firefox-131.0.3.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "e31b80215abf2411836600306e2f1c3fedc6d77d79d725a65f9beff31dfcecec"; + sha256 = "7bbb560f67061703a64173ada96de177f0f72c82b3b762aaa48f91156c47553a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/tr/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/tr/firefox-131.0.3.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "fb595007d56aabd01b731fc22032f4403b228ad7d90857eab230c7e87ad88be2"; + sha256 = "a909002c7c65a46685b13120ecdb51f0e4258c9642b8b397aef7e3d076347d8e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/trs/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/trs/firefox-131.0.3.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "e13a8b96c8928521a5b924202fcdb51527c7ffff606418a3e1171c607c309789"; + sha256 = "cf864d59c1770f66b72350410de5f399474cadbfb002c5f5bc260c8fd7663e3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/uk/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/uk/firefox-131.0.3.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "f04ba96d8b68ae829ee697506bbefb3107a3be6b967d94e9a71f86150d82412b"; + sha256 = "7e532caeca1b7ed4bb5e504b3bc8e0debc4e6662701dc4a848bde17a5d8ad99c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/ur/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ur/firefox-131.0.3.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "4033bbb80962e5dfe1ba3297ac8b8da890575cb78ed2cf43d88b569d1703a581"; + sha256 = "5ef435a27a1895f40a0650a7dd844a57f81f1d2ff4ee10690ca14b0b609307e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/uz/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/uz/firefox-131.0.3.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "fe2ca7a82c2d2e473cad42828828b31582295d36860edc1ce401f808bf2483a3"; + sha256 = "478711e217df79f2748823d1ec87087a314418741ba94a10c1027400be7ec3f6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/vi/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/vi/firefox-131.0.3.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "adc7e754a99e10bcb025575b7127697f1d9bdc8cc6d9cd19f3dd94ef9d9d4e14"; + sha256 = "de9fb8a496929c4aef13a439c97fd46e209a39c1c5a293f954c92339597b41d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/xh/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/xh/firefox-131.0.3.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "594c6157abb1e790aad5998f33cc4596ddac955ad4846ee6b73bbcdc85251ca9"; + sha256 = "b562f7c49bed4df61b2d70688b1288eb6b49c45e9c12012156826fee17f641ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/zh-CN/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/zh-CN/firefox-131.0.3.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "09751376f6ab2aa0b54774a2a9ea5aa0b960fe3e3968be6b07a11fefb1057f2b"; + sha256 = "21ff6050e4f0f246571441a56bec153c3889d3b97c06cbb3fce02437b8af6c78"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-x86_64/zh-TW/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/zh-TW/firefox-131.0.3.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "d1cbeea48dd5ffba0a327fc21f160a1ee85319880d3573a7daa1abb708c6114f"; + sha256 = "409b4210d26bbfeebcaa430827453342b37d4a0350fe71f38ca5df92566921c3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/ach/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ach/firefox-131.0.3.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "03de31c56efa3f0549ac76fed108aaaed21ec22929e68db46446966ba1c847a7"; + sha256 = "f1c7fbb1c80ecaf8538ba11082480093384ec412425ac631a8e0d26dba97e3c6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/af/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/af/firefox-131.0.3.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "26a1af678adb5f674911f9774983b904ba920ae5d3398a6fc9012a836539dd18"; + sha256 = "d949151dbabb4d604b15bd10122ece59238fb750d553943ed65026be0aff002d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/an/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/an/firefox-131.0.3.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "310e0c2f11fa310f7b8a4f4faac61f7239789c3ef39143fdf5af9b1287a7b3e7"; + sha256 = "179e5dc0a40e699a62ba5ae7bba054fff4591cca4f007d264c00367128dddc04"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/ar/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ar/firefox-131.0.3.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "6f5252403db1ba5d69dded7fe77f645fa2e98107d5493bd3cef2eefd6ffbfb7b"; + sha256 = "a7fd2ec3a42ab565e6700887fd41dbdf722fe0ca060946ebc30ac1413d2a6b4a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/ast/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ast/firefox-131.0.3.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "68e0421ef7dd36084f1c0b359b8290012485435ffd5f38ce2489ac3fe1f3100f"; + sha256 = "cabed080c18c7196702d7efe58fee86765eded008d97e387b9e16dd316c3242e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/az/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/az/firefox-131.0.3.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "612a38963292360f48861f45f0329c684160a7b7a0469d3083d7e44805e3e35a"; + sha256 = "2d99bc14687696e1a1e78c430ba3f76459afe38a78a8a43fd7d5409495fb6d1d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/be/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/be/firefox-131.0.3.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "2198c01b752bcd4ebad05971c415c66874251915b0c16786e047ae35cfb8ec15"; + sha256 = "2ee2c35577ef44732dcead0bd28706d41052160472073d317bc52659af93e68a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/bg/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/bg/firefox-131.0.3.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "f20853b619a2d219b65694ee6ddb59bf182ad7edefda2b306b7080bfa3c3715a"; + sha256 = "ddcaa48d6af6d2140e8b2da203d5b019580803945f6df54635d04dffd748294f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/bn/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/bn/firefox-131.0.3.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "af37330da40ce409d3a157c61840a117a5d04dae5e6ac3d2230efc50f475273a"; + sha256 = "65de4ff251d795abb204e4f912fc0aa1a6f161702f0747558edfc29187443744"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/br/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/br/firefox-131.0.3.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "861c17d1ebf2094f8679fe678c0525eef29d6afbf0781ccb86e9daafd75b333d"; + sha256 = "3df79435c6c9c4a40c99456b6687843802cf97f1c339cb99edcda564586cbf89"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/bs/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/bs/firefox-131.0.3.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "2a5148ac7d36d5bb4e9388ac1f1bad3c06bb39c4b70b183f4a1201a6cb27cc9c"; + sha256 = "9b6f1d25d31aa3a45ca857c2f58e68c70ebc122dde7d373905e28ef7c1ebdd95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/ca-valencia/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ca-valencia/firefox-131.0.3.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "27c4c492da208d2617178d3f644f121af2cf4f3825927da291817218054ce371"; + sha256 = "26356054a5b8b9b8b03a9d6686be12468c535b5395d9a6f35b719a823d0e3cc5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/ca/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ca/firefox-131.0.3.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "12a554bfd7ffde103d3b6e0c267ac810d1397065c4e633bb2d25cdc5f1868153"; + sha256 = "a01df01cc831468ef5cd3abb90063bff6233877deccfba4811d20fa9f964ea45"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/cak/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/cak/firefox-131.0.3.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "db3af6bbca61071d6ee79d87b20d73712eaaab3fd7ed8746075955acbf539ccc"; + sha256 = "3287515bc6a6e31f6b6fcb7f86f5adde8772671150b6cc07b8e4d0527f945646"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/cs/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/cs/firefox-131.0.3.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "d4ce0b7f57f13372eb777b98e560a020b0a472239845467fcdc1047bda5907e6"; + sha256 = "a6b8cecf6a04df386250cd5e05cd6842afc7d1b5572d6f44a0762f32feee35f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/cy/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/cy/firefox-131.0.3.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "66d59de875d50461f71907d9b3f13f2fa27f547113ca9e189717275450d3b716"; + sha256 = "3a5310e276c8fd32f01ef894faffcbc2f209ae9fc74d2fd0ff59acb92604a0c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/da/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/da/firefox-131.0.3.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "a2982b8ed2404d127bff728d349f55532b1d34d191f9b9450ddee813b080e047"; + sha256 = "54b09e0364c2e77783e458c4f88fef07fd99d6871a5ad0b808640c0f717f5fef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/de/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/de/firefox-131.0.3.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "19b5dfd6d408bcc8fefcd67213e977813f1a4d8fc3ffafb996ff570b6b65e7a2"; + sha256 = "687c2a7feb76d6fcfc7da35dedea8ae658547a3a420c2d5f5e0cf6d3f9d1e8e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/dsb/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/dsb/firefox-131.0.3.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "aaa37978ea85f230df2b5fb75a057f27779cd604765ba1cbcb916b1382d99d71"; + sha256 = "87d2724c10312666cf64871356a062b8394f6f30a986849f1d8279f378f9bbe4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/el/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/el/firefox-131.0.3.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "cb4e13115000b5995fe0d912c9ffbe2d949ecaf35825a4980efc150a1656fa7f"; + sha256 = "0e23fadf9196ba7691e016ed6ab8a19d7327f338364ff59893ba0150ef127130"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/en-CA/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/en-CA/firefox-131.0.3.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "3cfc57ec6ab362b0f179d26ddd551de57f0e1370aca681eaa82fb302c56ab648"; + sha256 = "ebc16fd234ed1bcce9405302f516322edef094d6cfc9f72970a3630bae791059"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/en-GB/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/en-GB/firefox-131.0.3.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "5afb012598048c02a5c4c2d75131b1322f0a3678d63c6e5f86e5e93945bbe6a2"; + sha256 = "74600884c3549e3aa7b66e48c790366ba94b531bd2fc78949ac38ee8027173a8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/en-US/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/en-US/firefox-131.0.3.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "c16b3ae2b09dbb734ead021e6658a7fd8e13b27921e81e8217b067d6b5c1fb72"; + sha256 = "84cb77484bf65fda35e2743553990ab67c9395722082c087e884ee7b62e406d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/eo/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/eo/firefox-131.0.3.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "bc7bab135cea44df1c6488c19eff37e2f9209058b23e6fb0b23f76c95777f4f5"; + sha256 = "8d0c73401acfe280857988dc5b3859c0fbc07d0dfe1b50e1fcbe397af01d44c9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/es-AR/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/es-AR/firefox-131.0.3.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "32b613b62374596cfef0bc699b0015bf11606fc1c5a9dd8ed421fc8211101c12"; + sha256 = "66720c6d506236f1ad64b678aba9da2803c452195a5b6c1514b637ad7b2a6187"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/es-CL/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/es-CL/firefox-131.0.3.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "c3b841c29df069e4a36a64b8478589bda74074abd484e4ce5138e4dc34b4bfa2"; + sha256 = "df09892e9cba07d1ffc0619aafa8d97a27d3b223f0fdc7f14925a53342fb8dcd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/es-ES/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/es-ES/firefox-131.0.3.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "fd796eebd62b3077da48f12a98cee7fd496d6e2aa0d42c7d7a9d0cc40ec67850"; + sha256 = "2392955a532eb935fdf3cc98323673106ba9d25f26492c629fe47cd17f3c9c2f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/es-MX/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/es-MX/firefox-131.0.3.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "be53013f134b329a958a7ce414233f4d63826dc12d12409a87a90a303adb6937"; + sha256 = "9b47a1bf83dda68adfe59e6133c25f5664fb3777f582871ca1ad5576a8ec35ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/et/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/et/firefox-131.0.3.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "42f045c4ff9b4b38afe3213de75ed3a5ec6524878da4f000d62032dc26d662bc"; + sha256 = "b4023d8f19a099e6a9069f03f5c9ea8a21a9dbf26de4b9564a854c3749126b26"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/eu/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/eu/firefox-131.0.3.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "792c68072cd0dfa9bf2a4fbd9d3e73e02742de53564dfdb73721e715d578a1c6"; + sha256 = "2831dac7e375e8d5fed4747ed9f0044b05e8bc4a0f405fda9256bf53a711bba0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/fa/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/fa/firefox-131.0.3.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "1a24b7e9631cb9004007aa93b3b0af4e79959623bd3f26d110a319975eadfe3d"; + sha256 = "1e38b9868f4bf4556d3a6fa0ca8e6a0458eb33935419e0966230b3dcd60e61a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/ff/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ff/firefox-131.0.3.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "e54c977af5912e57fa68ab517e0abd7a4d29e833db03426ea3495d18aa06994a"; + sha256 = "e6c44ce503c278a6f367b6839d04372aa94544422bf192b0b0f92aa64adb8422"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/fi/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/fi/firefox-131.0.3.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "c931f44c1212d8ce4f9f89671f6dd8a8ffa40cbd287cebcc301e21d3140d7c03"; + sha256 = "0110d3b07f41a6ed5c0279cc77a939709b1f3978371e4c70d82ae4f8bec11b60"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/fr/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/fr/firefox-131.0.3.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "4fea57e93126a3245516eb96f4ef4f4f6b152a074636803586ad268a6fc8fbfc"; + sha256 = "f96bb3d14c5f674e64205e97cfb131ddb94bcdcb32f7005a36eaf5227c52c43c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/fur/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/fur/firefox-131.0.3.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "1991c1bf0850f5ae57dba9fff457e43c0aa114a1e61aeb0992e4a809bcc8bc5e"; + sha256 = "e7e6d0e7d65b374968009dd23ba907e9d03004f0ecdfc3b30951616c80148ebc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/fy-NL/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/fy-NL/firefox-131.0.3.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "966fedda91135cf0dc17ef0cbfafe86ec67dce378620d06b12a6beae4530c851"; + sha256 = "02f2a24542b6a18c18c98a8576ad33284255cf49d2c8aba7a85ac948829f8ca2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/ga-IE/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ga-IE/firefox-131.0.3.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "d84717cfffbbd8da24c616fe9013ea89efa52e7dd46eacb6f2959553bf29c8a1"; + sha256 = "28a7511af154a282418073c1b99c9f0130ec0334ce0089bc951147321e1753c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/gd/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/gd/firefox-131.0.3.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "58638664036b2a62941ea26540c60c3491302781fc95e63c869e19ac06b9a9d2"; + sha256 = "7fe2e7ef2361c3bb4de236d972800aae9125f34bc5925c36a74a3e38f10396d8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/gl/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/gl/firefox-131.0.3.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "159149639ed016988e0c80f455afb8827b56e51669dc6235f177ccb983b4c130"; + sha256 = "f032980c12d189cad067b2cf395dafeefe72676fb5c2f7dee1fdd2bddd9aa8fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/gn/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/gn/firefox-131.0.3.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "564bc3def2436c69fb9c6d67257fd4bf74dfd3b02fb660b49454598c74c05d3f"; + sha256 = "43b542e8871c301e1e9f6bac209cfb92c0e053a4a79ac359cdfd482ab90aabcf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/gu-IN/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/gu-IN/firefox-131.0.3.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "039d0371c559b811bbdb4b7ef539a80d1332003a9e016b5369c75c09de2b5296"; + sha256 = "ff4e68b57bba86ef4dff88c1b337618fc4c9c77d3842a7a2fb51f534c36b0074"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/he/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/he/firefox-131.0.3.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "7922aa4516af3c0488b8cd7af89943cbdbad6aa323309762224aeac06464b2dc"; + sha256 = "2b39ddb9fe23e564bc263e7235babea6049365d86c841692ac7d4cbdca2dad9b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/hi-IN/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/hi-IN/firefox-131.0.3.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "31d3b9003eb95a78a36cba3c55d6f6fb44100b5ff9e8a1187abc7734d6f40c6e"; + sha256 = "c516d1fd5a7e5b8fac01b882e3b5368c0f6f1bfd8b6ace9fed8fc10bf06b5294"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/hr/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/hr/firefox-131.0.3.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "c96e07aad4df0d4a1d4b12443a34df418ef507672827640b786204727a832973"; + sha256 = "d4759609bef88620183e12d98b3658b3c386875a862761412e1e98e4187c536c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/hsb/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/hsb/firefox-131.0.3.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "c6b0e30e8092b3a795b9c049cb9d5e11a947488fb330685930079fb5bcef443c"; + sha256 = "234e003429cd33afb353b2de9b1ce70fe3920bd9fc50ab5810ab0b22acf6e4d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/hu/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/hu/firefox-131.0.3.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "2dc85073703d29f547f271ff6f959878630baba40cefd7bfc36d44eb134df634"; + sha256 = "a8dbcdda6ba791eb3d0ced43d0250725af9c7bdc4fdc0a72efdc065651802794"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/hy-AM/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/hy-AM/firefox-131.0.3.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "09c33667f6209397deb055361b7dfb00e36cbc2f013ae3bb2626505b6879babc"; + sha256 = "b54d0f12985748c3eba269974b7b6892ac727e98ba750bd0535530ea3fafc218"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/ia/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ia/firefox-131.0.3.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "f67078cfb6a22c087b4d0d299be015df22b7ac83ba770f423915a993a9dce8de"; + sha256 = "8a415be412858202396d63e773535f790dda10a722ee5e584471e2a93cce8171"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/id/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/id/firefox-131.0.3.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "a0d88c7953338c441e6d852ef9f039d1c41d665f821e9a20f06c6c936a0a2a0c"; + sha256 = "0796b4c2b21ea3a68bbb35171a316d2bb2ca9ec985b239290f59e3299fad1e4e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/is/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/is/firefox-131.0.3.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "5f2ef3376cca80471f7ae55bf5a5c3966c689f5bef14a24dd69f900b697e3fd1"; + sha256 = "f3851164668890ce243f4f449f04670e212184750c4a94c425162c7ccdb1ead3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/it/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/it/firefox-131.0.3.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "15ffa20cc125ba635470059da1e66188bd2c2ef3e560efe9db34efc06c5f513c"; + sha256 = "c92f4a741e8676a8606c5cd001665cced335133cb921a736da96239c870c5846"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/ja/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ja/firefox-131.0.3.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "97a9d6fdd3935f1b167e19f2c020db23aef269e0bee82346e707d3cea0b9beb5"; + sha256 = "f88f77beee0ac54e7f8e94db9d657372ea4514c95d7d7a18ada46021e50aa230"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/ka/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ka/firefox-131.0.3.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "89241d1886fb0cbc2889642e9290a804a9a25cb155916b874687fd23e1528327"; + sha256 = "31e00edb58baa39e39d3b74c14ba7333c07b1d0d4ca81695d8a7ea1c80e8b0a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/kab/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/kab/firefox-131.0.3.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "13284e4658715c1087400b5dbccf03a9ac629a599c27d42bc1570865aead0ade"; + sha256 = "7c1eebd4183ec7d63dabc17a51a7c68864eccee29916158d6fe7ba066e4697ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/kk/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/kk/firefox-131.0.3.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "457544007f2581af769551f7187e0b63d723c2afb6c7ad51ef9ede1f9866e46c"; + sha256 = "5f77e4a0928dfdd8d66778471d1bea98e3902a08d5c38f904102142962fc08ad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/km/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/km/firefox-131.0.3.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "4a66e15adaa68167db4bca551cbfede1702f849488d9ab06af431bb96dafbdde"; + sha256 = "61a248d441d36bad22b0041e8e9b34e192dda345e245fc6e637f861abfa2999e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/kn/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/kn/firefox-131.0.3.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "6f707b1143879355150d80132e5a0127c186065cdd32a7c24e6a4e523547b6f5"; + sha256 = "7c6b5530798f88a16ce70a7749317793d1caf8c58bb0bc859dde8fb9eeca6a75"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/ko/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ko/firefox-131.0.3.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "0ad5fbf600e461446d0696869e1e4b6c1d59023cf2d3326bfdcdd1d961012238"; + sha256 = "6f99bbb48f3f1fecf712521f484fc3b4125660bdc927a5d004c4bd09fa75d2ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/lij/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/lij/firefox-131.0.3.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "212b6377d6b965adcaddc08108ac89381df0535970884d28184b267c6b9df7cb"; + sha256 = "362e9a31916be41a3176f88be4f34614bdfcaaf1278667edee14b881691f2c22"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/lt/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/lt/firefox-131.0.3.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "c147e8f500de569eb41f651efed7502a05edf28ab00b22ea492e3a8117986ce4"; + sha256 = "ed7cff096f744bb1aa45c4442ed4306b1601fe09cbc5e30a82b88dadb5c0acd1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/lv/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/lv/firefox-131.0.3.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "8c7cdc6a56ba3819a27c2797902ab5a0726e48833ce28c78424b9d14a7cc1851"; + sha256 = "f42c2238db9238fe53841a54f974de22bc85319a5ccc6a68d1a3b1b89b8ddb1d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/mk/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/mk/firefox-131.0.3.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "978625c709d94ff5eb9f48ea6bb7a8df9e04fa946049047d035156914c631c81"; + sha256 = "8700bc64b622c6fdc292f868447c6e3a5f23027e8130100c8362361fddec6284"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/mr/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/mr/firefox-131.0.3.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "f116ce967dafdab84585f800591dbb7e035a4e3a9066f237b19bdca53bcbd5d3"; + sha256 = "05bc096b8bc39ca8a40bcba39ffa44ded8d4d08c9165f68ae2f89baf8d6da4c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/ms/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ms/firefox-131.0.3.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "eb3acc9024ccf4825810cc3930073f9867f8ca9a599a384c9d21cdfce8c23323"; + sha256 = "ca9d85228b6dfd98a39f28dba22793dbc9f311b776663ee62e89a026ffddc184"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/my/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/my/firefox-131.0.3.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "c6a24d2752bbc0ff19210e974f60716a2a78bf1ae320d2677e0244196c0fde20"; + sha256 = "b365d353b42ccf4b452a092edb61dcc2a6a47cc4396adae97c1bfc1761f618a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/nb-NO/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/nb-NO/firefox-131.0.3.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "f1c601ee6ccdca91f7b858e8e1e5d68da3c5e9bf719c71dcb69056db715ff547"; + sha256 = "56c1589098256b9d848fba171d6c69a37c942ddb3260854071d48b273f32adb2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/ne-NP/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ne-NP/firefox-131.0.3.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "8346a9d07133dd249feeb11b3027a2c5b58ab34e2646c6a313b5b415d181fbe0"; + sha256 = "123af06456c3c452d6f6d8169ed288c8c16074c7e3f149b30056ecdb94db7976"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/nl/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/nl/firefox-131.0.3.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "9bac061c56ee6f64524b0647a7769e332aa009e29b00929c396ee179567d1103"; + sha256 = "1070796e4361c8091231507a8000125b724b9f4495f23385beed3c1343f32200"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/nn-NO/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/nn-NO/firefox-131.0.3.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "932ee1f6bb43850221c0b01ff5843222e9f4e9c402900c1ee4025c7dfa4ca97f"; + sha256 = "7710c9b14b7f76da97b3767fc34db53ff29f9758949de1e7f7dbfbcb352ebdb3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/oc/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/oc/firefox-131.0.3.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "597a74962c9f5aa5d65363e5facb6eb3ac82f14fd530d71417dabfefa27791b9"; + sha256 = "968df78a007ebd60503e326a8130d6e05dc99d2f0267f1a707efb4611aeb1672"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/pa-IN/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/pa-IN/firefox-131.0.3.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "60284dee578b6b77646af44a7492aa80abe9d37e3e9665fd1a5bb783ba2fe438"; + sha256 = "2bb2d2606d426746a76b9f701ee04cb5e348a196c7c772525bb7aac7c50b0067"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/pl/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/pl/firefox-131.0.3.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "c4f49784cebacabda2ef04c85018e4084524f060d705f317695eebd8a90e588a"; + sha256 = "5c87cc2e226d32cbdebe0f31b536028ca78d997e0ffb34582752abd5d26880f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/pt-BR/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/pt-BR/firefox-131.0.3.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "f99eb39bb29b7cde49a68c42bb7b38951ad7909cfd62e87b3e9fcc5bf4e49f21"; + sha256 = "92ee925cb9cc44f999a22eb4792a1b6c6b64f4a7533966ca21565c7b987868e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/pt-PT/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/pt-PT/firefox-131.0.3.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "76fd00ab01465234c701a6439926422175723ea750be7b4198f9b34c85e4094e"; + sha256 = "58a7ece588ed7fb7cdc007a3acb20dff966f16d1cedbd47f6aff730e94b7c5e0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/rm/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/rm/firefox-131.0.3.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "4c1b4250d01c0a6ef44e03cf228dd9b99702f7f05c01a01df1084cbe6dcf0c17"; + sha256 = "73a36134064c4c3f9f74f49dc8d01de0ab7c771a63f9d96faea0a3d5239f2401"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/ro/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ro/firefox-131.0.3.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "d8900e1f2e73f6d92c721f6a2957e2fce6d5f1c394ab01fe83ae07e5c737bbf0"; + sha256 = "bd885e43b0383301caa072eb9f3c7103da1ed0ebbd14df02eb13c111e908c550"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/ru/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ru/firefox-131.0.3.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "fd87c820afda233d7e4e3b035310f99bcdc791410c3c6c9fb8a8742c46ca2553"; + sha256 = "f161f63d6e9061513e547abb4c5fa0ecf2d6d10cd7064bf1c24f2a5cbd44e798"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/sat/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/sat/firefox-131.0.3.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "bc7a20761305e9c28a78ac9d46ea557cb906161c9e4b7d90a8cb65f1fa602fee"; + sha256 = "9b81f886807acc18c0ec02e66404c7428d664d4cbe0e5c1b61ba683f45127e2a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/sc/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/sc/firefox-131.0.3.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "c25978257a485ac84ffc4e9bb334697846bdf4f6792a70ff26bc6bd8d1cd3a34"; + sha256 = "05b6a4036d727c77d4f3dfc2d39f10111cfdd5d00e9c409b0ce08f3ea0ea3c70"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/sco/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/sco/firefox-131.0.3.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "0638816ff9341c124ccc42c0540846241c4ad85cc5db8ce7f08cff61238f75ab"; + sha256 = "e88b1a122270460a4caf5bea4f4dc8d9fe584b8ab8c16a01c8899088e75121e4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/si/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/si/firefox-131.0.3.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "979f2584d10e00d20d7765901c04877ad0b17d1812fdc53b2058f5a2f9320b57"; + sha256 = "b2d4b3b80f633336bee1d9a5b582e8596e2bae87467c247fbddfcdc36b8f1d6c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/sk/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/sk/firefox-131.0.3.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "4acdb909eedc19ef738abe67fb493636f08488288f2329434bce5cd5bd0afa90"; + sha256 = "3773d4862ce1834567991430d915680a97e4cbe8ebd44d2dd37dcdea1e076d94"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/skr/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/skr/firefox-131.0.3.tar.bz2"; locale = "skr"; arch = "linux-i686"; - sha256 = "be931bc1ffcf6842fb5ed14149ead798be516154bc9180a4cb0b5a1d6fdaf0ae"; + sha256 = "c25afab9ff4614fa87681d6bcbdc5f10d4439220467f2b2a3859838d546b96d0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/sl/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/sl/firefox-131.0.3.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "18eb7375de916e9f9793210e9e57bf2ae2262a2b5df07c0246302d7c9e367a30"; + sha256 = "539292a2f243b2a6e03bda2510d24e555d58156583e6feedf8b7dde60224b155"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/son/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/son/firefox-131.0.3.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "9c05cd64d7969fccbe58b1334eb8eb6c825006f7526acfb453059c201497b1e0"; + sha256 = "bdb94090a7ac0a9eb22049d50dc2f330057c065375236a137cb098348efe9eb7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/sq/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/sq/firefox-131.0.3.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "87f8c2e52d0c79b3f9c36d87338fa37a72d759ea9030db8ea0e325eacf006cbc"; + sha256 = "90467f841b2de7b0479ccdfadde6ef7645644b770d18885a9d76049c6a43de54"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/sr/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/sr/firefox-131.0.3.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "f768bda142f6a224611655b1fbc7b7c54b39b973b4c7cb107b5cd8855f2e07ef"; + sha256 = "1c02f6fe4302977cf7ab0b57b3a4f88764c21ee686a22b9604f0f15db38aa21f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/sv-SE/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/sv-SE/firefox-131.0.3.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "44c9ac40b6c0d729a84bd44dbd34f5c31679a68da6235f9a14cea4a3cc9648c9"; + sha256 = "009240e251650fbc7f8aade7025f44fd1798e1b76a8f411c3aa261dd12b68a0d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/szl/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/szl/firefox-131.0.3.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "4d34fb57acc094e7bae5d5b223a95e90c5afbfab7241ad8b2ee04c752c536617"; + sha256 = "fd11d167840bf204f895dc7104a3bd2779e29065ae109901d0c23ceb942de9db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/ta/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ta/firefox-131.0.3.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "cb263fea289fd83a186ab2119f62840862558114187c0a71c180c8608afefc6d"; + sha256 = "f83722089b0a1a5caf5d4b1bd541e2fa84fdfffc04638f22bf5c372cba9d3d66"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/te/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/te/firefox-131.0.3.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "913dfe42eea9deb1fc51898b5c501c2baaf9ac45e1833389f1613e844c7d9590"; + sha256 = "9b8728d6fac9e02819f969a7009f2246a72cc9dd0dc7da324fd255867548b242"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/tg/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/tg/firefox-131.0.3.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "382c3d55d3d15ebf8846a496e867c994b6371374acc46348349bb7cf3ea0057c"; + sha256 = "08f4bc21bb07a46e5e845bd5132835fcfc6d92a77807dd25f9b3119795b48800"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/th/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/th/firefox-131.0.3.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "5c9a7ebe6cb1440a52a5cfaf646a1155520636505e360cf86f261e0c000916eb"; + sha256 = "6eab1ebc3fdac9f2423720cbc9ca1834c0b60432ed44249fc97b4e61578e3b2c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/tl/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/tl/firefox-131.0.3.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "9023c8e221653da3812464e88da05d6ccbe6207e0248343ade81da7fc3601a6d"; + sha256 = "1210863fbc4e94a48f051214ad27596d1cd20b6ee546ec7dfdbefb17f03b32ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/tr/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/tr/firefox-131.0.3.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "64514261ea0056769256f15de8d44b842d72d5df74a2d19e4c85a6428fa2c27d"; + sha256 = "7209a9fb8cda175dd44abf5af5f2a852a20834e954578f324e30df807eae4b56"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/trs/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/trs/firefox-131.0.3.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "75dbb9049b0dcf9fcef852a72e34d6720af5334e8d259860c105a847afca716d"; + sha256 = "0ab1a3fe03acd33f1ea0f6546992ab47e4d8649b043ec6fa1237063e6876a12f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/uk/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/uk/firefox-131.0.3.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "c25c97abda25126de4236025d01539fb20d8b8310c0d2ae6a3b0617603df7ed6"; + sha256 = "7fe939edfc4ddefb2da97ad93d180958de0a8816d036aef1c7165a1169e8b85e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/ur/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ur/firefox-131.0.3.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "e97cef7b1975831dbba2c749c2c0921a7952135179a4315920ddf6254fa02e4c"; + sha256 = "d8131acaa6c87b448be1e4a5076248b10956b9bc9f03db93c649e21c270b0782"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/uz/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/uz/firefox-131.0.3.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "b9cf58f68739e10db1e1e1965b43d6b56dd76ea6a2e1909fffe53545ca0f74a6"; + sha256 = "15767a498cdbb582028295b3f7d8f160601707f2ef112c9ad5a1b42e70185c98"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/vi/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/vi/firefox-131.0.3.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "3d1a607b339aaea4f3256eeb93ebda4fba6b2eb3a2d7827383890bb97803a4e5"; + sha256 = "05c0455bfc5744d4adcb005f538e287197402fdd983aa7af2e4852fece20b079"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/xh/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/xh/firefox-131.0.3.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "ce24d048663738c67db900ef55860d8bb26fda05244204d49aa721813fd95e84"; + sha256 = "977d6a65cbfaa6cef11005a8c646dad48f63dca0da899e359951940d88c458ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/zh-CN/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/zh-CN/firefox-131.0.3.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "09337ba82fc55111c42f3960a07640fc1c2aaae7239300163c56e32d343ed68e"; + sha256 = "ed242a8d527e66c1f5e6b0a4e898cca723430ac8cb1290796ad271b367e808b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.2/linux-i686/zh-TW/firefox-131.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/zh-TW/firefox-131.0.3.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "4cd7f598dd1d61b67623d81e460936ed750f4648d3c2c791cec0ae8555ee1898"; + sha256 = "6e4457920addfe64bb04934b1e646c197d91a7e100553e72c8632375bb06fd15"; } ]; } 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 74504e0ede..882345b6db 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -5,10 +5,10 @@ { firefox = buildMozillaMach rec { pname = "firefox"; - version = "131.0.2"; + version = "131.0.3"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "fb1a1179a8c62de975c93e1ac6f058cb5492e955bbb7ac2d4b83cdd14ba17bdb2450078bd6f626124b14542f3fda9514bea476aaa34ff4f5a2bee6b1625ec963"; + sha512 = "3aa96db839f7a45e34c43b5e7e3333e1100ca11545ad26a8e42987fbc72df5ae7ebebe7dfc8c4e856d2bb4676c0516914a07c001f6047799f314146a3329c0ce"; }; extraPatches = [ @@ -122,34 +122,4 @@ versionSuffix = "esr"; }; }; - - firefox-esr-115 = (buildMozillaMach rec { - pname = "firefox-esr-115"; - version = "115.16.1esr"; - applicationName = "Mozilla Firefox ESR"; - src = fetchurl { - url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "eca42b3494fdab73e67d5c8e8b76520729adb75b5cad85172953dba56b225b0f05dcfea70fe8cc3e1bf1cd3d7103159cc20095d5480bb1b0e6d3ec90588988a8"; - }; - - meta = { - changelog = "https://www.mozilla.org/en-US/firefox/${lib.removeSuffix "esr" version}/releasenotes/"; - description = "Web browser built from Firefox Extended Support Release source tree"; - homepage = "http://www.mozilla.com/en-US/firefox/"; - maintainers = with lib.maintainers; [ hexa ]; - platforms = lib.platforms.unix; - badPlatforms = lib.platforms.darwin; - broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". - # not in `badPlatforms` because cross-compilation on 64-bit machine might work. - license = lib.licenses.mpl20; - mainProgram = "firefox"; - }; - tests = [ nixosTests.firefox-esr-115 ]; - updateScript = callPackage ./update.nix { - attrPath = "firefox-esr-115-unwrapped"; - versionPrefix = "115"; - versionSuffix = "esr"; - }; - }) - .override { python3 = python311; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix index 5cd1246531..73cdd9103d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -15,6 +15,7 @@ , mesa # firefox wants gbm for drm+dmabuf , cups , pciutils +, vulkan-loader , sndio , libjack2 , speechd-minimal @@ -86,7 +87,7 @@ let else []) ); - libs = lib.optionals stdenv.hostPlatform.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups pciutils ] + libs = lib.optionals stdenv.hostPlatform.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups pciutils vulkan-loader ] ++ lib.optional pipewireSupport pipewire ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport libkrb5 diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/floorp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/floorp/default.nix index 08a45eddd1..d75f70c33a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/floorp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/floorp/default.nix @@ -9,7 +9,7 @@ ( (buildMozillaMach rec { pname = "floorp"; - packageVersion = "11.19.0"; + packageVersion = "11.19.1"; applicationName = "Floorp"; binaryName = "floorp"; branding = "browser/branding/official"; @@ -17,14 +17,14 @@ allowAddonSideload = true; # Must match the contents of `browser/config/version.txt` in the source tree - version = "128.3.0"; + version = "128.4.0"; src = fetchFromGitHub { owner = "Floorp-Projects"; repo = "Floorp"; fetchSubmodules = true; rev = "v${packageVersion}"; - hash = "sha256-Sk7oMegNr01tLC1BXpUuImg03C6lEEhaVTSjISV9xAE="; + hash = "sha256-RFJ3aRbLwCf0qaluqImcF9+6frvJbw8QE3jBpxNxFjE="; }; extraConfigureFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix index 232677f9ff..c91d9d1fe9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lagrange"; - version = "1.18.1"; + version = "1.18.3"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${finalAttrs.version}"; - hash = "sha256-iIUWF93RZheW4uf3zgs1jqDjQnn0nFH7GOMaLBR0w0o="; + hash = "sha256-ewpSZD+pCr6gbzT+4lW2+6tssPNLq4rqgUx7p8IsjIY="; }; nativeBuildInputs = [ 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 575b936513..fc7600f56f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "130.0-3", + "packageVersion": "131.0.2-1", "source": { - "rev": "130.0-3", - "sha256": "0ah6k4637fg3v3l13rk6bw6wxsx0mc41hvi9sld5psbl8l2kyk29" + "rev": "131.0.2-1", + "sha256": "1knx485kdjv8d0rn5ai1x1jp0403dvxz9m7lpim1y2d2ilyi26x7" }, "firefox": { - "version": "130.0", - "sha512": "d0d11b38d9e02fa15298ec13336bb086668b4f36b3ce9ced218a265327fd4822b9fea4303402631947ea3c20490c414de87f8df3e7c23d2e02b70f0456b9af40" + "version": "131.0.2", + "sha512": "fb1a1179a8c62de975c93e1ac6f058cb5492e955bbb7ac2d4b83cdd14ba17bdb2450078bd6f626124b14542f3fda9514bea476aaa34ff4f5a2bee6b1625ec963" } } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix index 12968f2f56..6680033e68 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "2.29"; + version = "2.30"; pname = "links2"; src = fetchurl { url = "http://links.twibright.com/download/links-${finalAttrs.version}.tar.bz2"; - hash = "sha256-IqqWwLOOGm+PftnXpBZ6R/w3JGCXdZ72BZ7Pj56teZg="; + hash = "sha256-xGMca1oRUnzcPLeHL8I7fyslwrAh1Za+QQ2ttAMV8WY="; }; buildInputs = diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/lynx/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/lynx/default.nix index 1cad8d5777..51bbb96cba 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/lynx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/lynx/default.nix @@ -46,6 +46,10 @@ stdenv.mkDerivation rec { nuke-refs cfg_defs.h ''; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + meta = with lib; { description = "Text-mode web browser"; homepage = "https://lynx.invisible-island.net/"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/midori/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/midori/default.nix index f937f690b5..3a2a670353 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/midori/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/midori/default.nix @@ -9,7 +9,7 @@ , gcr , libpeas , gtk3 -, webkitgtk +, webkitgtk_4_0 , sqlite , gsettings-desktop-schemas , libsoup @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { gtk3 libpeas sqlite - webkitgtk + webkitgtk_4_0 json-glib libarchive ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix index 16231815c4..b8d17500db 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix @@ -15,7 +15,7 @@ , gdk-pixbuf , cairo , pango -, webkitgtk +, webkitgtk_4_0 , openssl , gstreamer , gst-libav @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { cairo pango gtk3 - webkitgtk + webkitgtk_4_0 openssl libfixposix ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix index 429923f626..73dc8ccc69 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix @@ -51,11 +51,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "113.0.5230.47"; + version = "114.0.5282.102"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - hash = "sha256-0RQTcROUv85yE6ceLkyF09/++WrvK828h5hoN1QYpCE="; + hash = "sha256-PBbozIdA+cfEzGIyL1P+25FZtrnd7ldctOtZYomKd/8="; }; unpackPhase = "dpkg-deb -x $src ."; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/bin.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/bin.nix index e6bb9e887c..7f70a49e1a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "33.3.1"; + version = "33.4.0.1"; src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}"; @@ -158,11 +158,11 @@ stdenv.mkDerivation (finalAttrs: { in { gtk3 = fetchzip { urls = urlRegionVariants "gtk3"; - hash = "sha256-auo45tzMY6bKahSEmUrkcYnz7v+GFbsrG+ePAKRC00U="; + hash = "sha256-34x9L0L42KO7mUDaW41I71ln5xyHGAKBoAJ6HcDC//g="; }; gtk2 = fetchzip { urls = urlRegionVariants "gtk2"; - hash = "sha256-7qrT5fSfwcEAkbq8g/HRoUiDv5+qrzpiysjHTdZVgLc="; + hash = "sha256-TRIgfqKsJxueZ/Oazw7kTLjVyxdh+IUiR+XDaemow9A="; }; }; 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 64fee95385..0586d6cc5f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -26,15 +26,17 @@ let stripRoot = false; }; - version = "3.2.1"; + version = "3.3.1"; in python3.pkgs.buildPythonApplication { pname = "qutebrowser" + lib.optionalString (!isQt6) "-qt5"; inherit version; + pyproject = true; + src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"; - hash = "sha256-AqevKmxds42HsiWwuEEsgNmDgzXzLQ6KOPbX+804iX0="; + hash = "sha256-qttkrMxzC8mhXONByaBYCx82OD7Uh09U0xzh2r6U4Xo="; }; # Needs tox @@ -47,6 +49,10 @@ python3.pkgs.buildPythonApplication { qtwayland ]; + build-system = with python3.pkgs; [ + setuptools + ]; + nativeBuildInputs = [ wrapQtAppsHook asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/surf/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/surf/default.nix index ec31a8d1a3..990036a804 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/surf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/surf/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchgit , pkg-config, wrapGAppsHook3 -, glib, gcr, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk +, glib, gcr, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk_4_0 , xorg, dmenu, findutils, gnused, coreutils, gst_all_1 , patches ? null }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas gtk libsoup - webkitgtk + webkitgtk_4_0 ] ++ (with gst_all_1; [ # Audio & video support for webkitgtk WebView gstreamer @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://surf.suckless.org"; license = licenses.mit; - platforms = webkitgtk.meta.platforms; + platforms = webkitgtk_4_0.meta.platforms; maintainers = with maintainers; [ joachifm ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vimb/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vimb/default.nix index e76b79f9d0..e02e07419e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vimb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vimb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, libsoup, webkitgtk, gtk3, glib-networking +{ lib, stdenv, fetchFromGitHub, pkg-config, libsoup, webkitgtk_4_0, gtk3, glib-networking , gsettings-desktop-schemas, wrapGAppsHook3 }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ wrapGAppsHook3 pkg-config ]; - buildInputs = [ gtk3 libsoup webkitgtk glib-networking gsettings-desktop-schemas ]; + buildInputs = [ gtk3 libsoup webkitgtk_4_0 glib-networking gsettings-desktop-schemas ]; passthru = { inherit gtk3; 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 fb097191cb..b8c6111d14 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix @@ -1,35 +1,38 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ + lib, + buildGoModule, + cilium-cli, + fetchFromGitHub, + installShellFiles, + testers, +}: buildGoModule rec { pname = "cilium-cli"; - version = "0.16.15"; + version = "0.16.19"; src = fetchFromGitHub { owner = "cilium"; - repo = pname; - rev = "v${version}"; - hash = "sha256-5LqRHa0ytprwAAIl7iNZQ9zKnn5wNtFubQdvLuX9qGM="; + repo = "cilium-cli"; + rev = "refs/tags/v${version}"; + hash = "sha256-I5HC1H517oCizZf2mcHOKmgJqnvPjkNVfDy2/9Kkw44="; }; + nativeBuildInputs = [ installShellFiles ]; + vendorHash = null; subPackages = [ "cmd/cilium" ]; ldflags = [ "-s" "-w" - "-X github.com/cilium/cilium-cli/defaults.CLIVersion=${version}" + "-X=github.com/cilium/cilium-cli/defaults.CLIVersion=${version}" ]; # Required to workaround install check error: # 2022/06/25 10:36:22 Unable to start gops: mkdir /homeless-shelter: permission denied HOME = "$TMPDIR"; - doInstallCheck = true; - installCheckPhase = '' - $out/bin/cilium version --client | grep ${version} > /dev/null - ''; - - nativeBuildInputs = [ installShellFiles ]; postInstall = '' installShellCompletion --cmd cilium \ --bash <($out/bin/cilium completion bash) \ @@ -37,11 +40,17 @@ buildGoModule rec { --zsh <($out/bin/cilium completion zsh) ''; + passthru.tests.version = testers.testVersion { + package = cilium-cli; + command = "cilium version --client"; + version = "${version}"; + }; + meta = { - changelog = "https://github.com/cilium/cilium-cli/releases/tag/v${version}"; description = "CLI to install, manage & troubleshoot Kubernetes clusters running Cilium"; - license = lib.licenses.asl20; homepage = "https://www.cilium.io/"; + changelog = "https://github.com/cilium/cilium-cli/releases/tag/v${version}"; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ bryanasdev000 humancalico qjoly ]; mainProgram = "cilium"; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix index 830ef08049..5785c61426 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cni-plugins"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - hash = "sha256-Veuv7DwwnSUnz2p5gemqQB9pr05nLLQ6gG4JvqFbZ/U="; + hash = "sha256-7jl8c/191KiQSzixDXMcSFCrSqZFs4F7ZCe9BwrFqQ8="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3sup/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3sup/default.nix index 454f2ae88a..07d05966b2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3sup/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3sup/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "k3sup"; - version = "0.13.6"; + version = "0.13.7"; src = fetchFromGitHub { owner = "alexellis"; repo = "k3sup"; rev = version; - sha256 = "sha256-ngC1yT0pV/ygGzNTYz71qf8V19hqvz3XP7CP8saGwCI="; + sha256 = "sha256-B9Mo0+dqF15LuhCytMBax2gKjHl9mBkxLXCdb9f0Big="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix index 8832c69794..fd19982b95 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix @@ -62,8 +62,8 @@ rec { }; kops_1_29 = mkKops rec { - version = "1.30.1"; - sha256 = "sha256-aj2OnjkXlBEH830RoJiAlhiFfS1zjVoX38PrsgAaB7A="; + version = "1.29.2"; + sha256 = "sha256-SRj0x9N+yfTG/UL/hu1ds46Zt6d5SUYU0PA9lPHO6jQ="; rev = "v${version}"; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix index 8a2a859439..41971cb793 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubecfg"; - version = "0.34.3"; + version = "0.35.0"; src = fetchFromGitHub { owner = "kubecfg"; repo = "kubecfg"; rev = "v${version}"; - hash = "sha256-zy7SuJ5ChR09CvZ362z6ZDRd/eIyqg06fpv+JP7C4T0="; + hash = "sha256-/xfZcykOGYOnCkKQDUJ9k4xh+bwrDmy2iSNFPVLkjew="; }; - vendorHash = "sha256-TDXZy2I1sxMmtHiE5l9wgW1kJolFYsV5Otv3xfoErWM="; + vendorHash = "sha256-K2IyljE5QS/SZ6EXV42q/a5ru+0UXZ69oLNi94XKxw4="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix index 243495dd6a..529779b877 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule, go }: +{ stdenv, lib, fetchFromGitHub, buildGoModule, installShellFiles, go }: buildGoModule rec { pname = "kubelogin"; @@ -18,6 +18,17 @@ buildGoModule rec { "-X main.goVersion=${lib.getVersion go}" ]; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + $out/bin/kubelogin completion bash >kubelogin.bash + $out/bin/kubelogin completion fish >kubelogin.fish + $out/bin/kubelogin completion zsh >kubelogin.zsh + installShellCompletion kubelogin.{bash,fish,zsh} + ''; + + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Kubernetes credential plugin implementing Azure authentication"; mainProgram = "kubelogin"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix index 93f71492b2..ee435aaffd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "temporal"; - version = "1.25.0"; + version = "1.25.1"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - hash = "sha256-H/kHPS43h+MQgOpKIHoM6hJQxCYq8Yo1GzOQeLFRoNw="; + hash = "sha256-/y03XyJM9OaG8Pceh6RuB5eIU0ue3O0cPnax4ASTt4k="; }; - vendorHash = "sha256-RhWeIT1i86wxAALNhhpWZjWo1v+82vTrGBWCaryE3Ws="; + vendorHash = "sha256-7t/hMTCraDLLYsyoGar8j7Q84temMGY+ZxVmJBGBw0c="; excludedPackages = [ "./build" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix index 2b34e7c6d5..a770622cc7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , buildGoModule -, buildGo123Module , fetchFromGitHub , fetchFromGitLab , callPackage @@ -25,7 +24,7 @@ let , deleteVendor ? false , proxyVendor ? false , mkProviderFetcher ? fetchFromGitHub - , mkProviderGoModule ? buildGo123Module + , mkProviderGoModule ? buildGoModule # "https://registry.terraform.io/providers/vancluever/acme" , homepage ? "" # "registry.terraform.io/vancluever/acme" @@ -46,8 +45,6 @@ let name = "source-${rev}"; inherit owner repo rev hash; }; - # nixpkgs-update: no auto update - # easier to update all providers together meta = { inherit homepage; 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 35ba84a27c..79ef8a462f 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 @@ -27,29 +27,29 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-cNcF8pyqRR1YEc2RuKhOtcpFDkdFU8OFCYHRhefdHHk=", + "hash": "sha256-J/ZdlrYRo7Npr9zYZxvs0LWwqZN/r+IcgfOGMYaIqo4=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.24.0", + "rev": "v4.27.0", "spdx": "MIT", - "vendorHash": "sha256-ENH/TfC/Yv+jjn4giiThfj9SatFxkfwR/Xj3W+FT/Lg=" + "vendorHash": "sha256-vlL4RLe89MZ3z5xyC3r3kI4RqWXwbqWNQZlOxxpsGZo=" }, "akamai": { - "hash": "sha256-d4unurf1WYmVx5z698kAeqKslkVH+tM8G4hrCofDtUs=", + "hash": "sha256-KnX+PAhT7TPp9SRkGwYPvxgk/ExaJPr7vKj9hTbJGhg=", "homepage": "https://registry.terraform.io/providers/akamai/akamai", "owner": "akamai", "repo": "terraform-provider-akamai", - "rev": "v6.4.0", + "rev": "v6.5.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-qnKpQpK/AoFOxPiGHkUMqcF5loc0hVbqOuPaDLzj1Es=" + "vendorHash": "sha256-qLJnhwMz9Lz47Iih7tvFORng8j3IKjBkksLeK9o6TQE=" }, "alicloud": { - "hash": "sha256-lVQAkdwrnZrSZlBqNj2BBpQwzI0d5c+NGaKJxVpgQPg=", + "hash": "sha256-WgED3azjwBZhArLoPxgSPeK+Eatsx45x+x3Hc6jeVbQ=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.230.0", + "rev": "v1.231.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -72,31 +72,31 @@ "vendorHash": "sha256-b8yGtOUZezGRgURXigv8ySaxxHN/vCCDPgoDC5EBlok=" }, "argocd": { - "hash": "sha256-dHIvMFz5XIxxBvBFsEw8lqi6yVoYM9E4tLIoTY+mdiQ=", + "hash": "sha256-3a/g1SbgeMWFMNTY/sYrItyE1rRimdNro8nu9wPTf6M=", "homepage": "https://registry.terraform.io/providers/oboukili/argocd", "owner": "oboukili", "repo": "terraform-provider-argocd", - "rev": "v6.1.1", + "rev": "v6.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-yyTU+D4zMDcJPZ9j7a2ZuPjGBCHvED5R0rvevCEaoAI=" + "vendorHash": "sha256-0UM4I/oxIsWIP1G93KJsJxYofXrO4Yy86PEk0FnB1DE=" }, "artifactory": { - "hash": "sha256-m6eRhNPxMa08OYYkFDt+Ew2iCkJdI/5aQth9qiE0v4o=", + "hash": "sha256-6VwEQ6fGZ1V5AkI5FvQwuFipjREduVkZePGwQqpyxig=", "homepage": "https://registry.terraform.io/providers/jfrog/artifactory", "owner": "jfrog", "repo": "terraform-provider-artifactory", - "rev": "v11.9.1", + "rev": "v12.2.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-+3EemRl+rKoCg2HpHvjMPvN6ajrDOnO5C98NVGkYdo4=" + "vendorHash": "sha256-HAZZ/P7zDbHs/xkIY69QbbcxwgPHEZOqeKCX8jIZTQE=" }, "auth0": { - "hash": "sha256-Yltf+s1gEgP/dbX8EuK45VPBAEzelP+CAcllUaqvnAQ=", + "hash": "sha256-5drMyf+jymrKb6cxB2eCnvVE9hPo9aDGaloZVlOeRlI=", "homepage": "https://registry.terraform.io/providers/auth0/auth0", "owner": "auth0", "repo": "terraform-provider-auth0", - "rev": "v1.6.0", + "rev": "v1.7.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-76Uf6vQpQ6GlumPHd1uBi0gO5aGmm/HAhNY3I7WCr8k=" + "vendorHash": "sha256-Qjaw43kMlTL2eceQwlZpgaA42YDuxq59F/m2qLqvl8s=" }, "avi": { "hash": "sha256-OKUxIJO5WR8ZVkhst1xIgxKsAy+9PNHOmG2NsaRUxFY=", @@ -108,38 +108,38 @@ "vendorHash": "sha256-Sq304WOdKx4J1sD1+YA7uDi+uQtUiXa+BISs/j87dWw=" }, "aviatrix": { - "hash": "sha256-erBjyDX6xG8lpqcPq8iqgsanJKLuSgmiW/9PC8Xbyag=", + "hash": "sha256-zp04r3ySIp7z5Rxx+9ADAoca0Cf5YFX8oWqLSAMkNgI=", "homepage": "https://registry.terraform.io/providers/AviatrixSystems/aviatrix", "owner": "AviatrixSystems", "repo": "terraform-provider-aviatrix", - "rev": "v3.1.5", + "rev": "v3.2.0", "spdx": "MPL-2.0", "vendorHash": null }, "aws": { - "hash": "sha256-Fmhb3mKRviYsl3qQfXuQMI6KBpmDN0rtwJxDjSkj4EM=", + "hash": "sha256-iTRq2y4Qf4y4t8lLFgtpW2BqDjYXCmF8vwOU0z4NCy4=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v5.66.0", + "rev": "v5.72.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-9DWxMDsyWl/bczvbPOmdRTwjIYAKTuNXyBzrCHExNUA=" + "vendorHash": "sha256-6nHAXNPadMqoegsXsqjZWQvQdhCg6f9GABGnKof6+u4=" }, "azuread": { - "hash": "sha256-UOaEfmhGPrqQBkodNYybYb5rnB3X8wpXKHlpKqZnnXU=", + "hash": "sha256-m4ZzZFlcMBAfGN7tHjeYACMwxaG6rpUO4MPVMqjD7Hk=", "homepage": "https://registry.terraform.io/providers/hashicorp/azuread", "owner": "hashicorp", "repo": "terraform-provider-azuread", - "rev": "v2.53.1", + "rev": "v3.0.2", "spdx": "MPL-2.0", "vendorHash": null }, "azurerm": { - "hash": "sha256-tCZKDqMrmwAGqs4eoMWj4lty4aVOkzF16RpEl24GNPc=", + "hash": "sha256-719qqPMI5+sjxT+xmzScivZCz46uP0VarV5ae+Q85PE=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v4.1.0", + "rev": "v4.5.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -162,11 +162,11 @@ "vendorHash": null }, "bigip": { - "hash": "sha256-jCQgjxGBSy2d9DIJeshLVdj6N/SXWEPcd5EpJ5GAXe4=", + "hash": "sha256-ny/FjAStb4qUzVeAkkqgKDb5lzmR6e0J1RaG6CWBrYg=", "homepage": "https://registry.terraform.io/providers/F5Networks/bigip", "owner": "F5Networks", "repo": "terraform-provider-bigip", - "rev": "v1.22.3", + "rev": "v1.22.4", "spdx": "MPL-2.0", "vendorHash": null }, @@ -180,13 +180,13 @@ "vendorHash": "sha256-oDMKf39uNMO9/kyiZ1IuZlj2yIF1q5Z3wewxEBh3yso=" }, "bitwarden": { - "hash": "sha256-YB+9CWd3U6Yl33ZFbTxzjomrLCilpBPKLdn6Yv7LAUA=", + "hash": "sha256-9YYaZmMFR47drh4dg/Zl85VWWBwAEYzMga6WHY2UgPU=", "homepage": "https://registry.terraform.io/providers/maxlaverse/bitwarden", "owner": "maxlaverse", "repo": "terraform-provider-bitwarden", - "rev": "v0.8.1", + "rev": "v0.10.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-BZ1+D0JQrGb6qE25+eTLSHIQdCmzucMPKUY/6x2LwT8=" + "vendorHash": "sha256-TRrVtJdI0ZqBfuIr947cQJh+o663CHOCScAcYDcy048=" }, "brightbox": { "hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=", @@ -198,11 +198,11 @@ "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8=" }, "buildkite": { - "hash": "sha256-kwrhIii1jGpIZBzT58UdgnDtX5279shW77HphLobaEI=", + "hash": "sha256-/VJMhiL41X2CZX0Smdcd8kmoBBXLyP+/knkNdM9HvUY=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v1.10.2", + "rev": "v1.12.0", "spdx": "MIT", "vendorHash": "sha256-PFeWgDw1hkW/ekQfubRSYlaD4d4wJ4GOohOJ00QcEqQ=" }, @@ -234,13 +234,13 @@ "vendorHash": "sha256-j3qdi19dxJL+R8Xa6MDag6KHMuBnzEZ9lUhuSAEZOAQ=" }, "cloudflare": { - "hash": "sha256-9M7PQEBg0qDmyz2B35krNUF9dDo0g28JomFor7b/Nsc=", + "hash": "sha256-R6cJQaBnsARO3qg48ijqVdyrSivLN3Wf96yqTjuaN/c=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v4.41.0", + "rev": "v4.44.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-uLkoG0m3v1vohXO03nCrfxEhvJYfJOvYSIHsgYCjKtc=" + "vendorHash": "sha256-g575BZRdCekfUgF78DENloCeM8TTz5OhLxxgb1OkElc=" }, "cloudfoundry": { "hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=", @@ -253,13 +253,13 @@ "vendorHash": "sha256-6MKWpiDq4yI3mfIJyzEsWLa7gi0+DScI5jKcOcM6Qs0=" }, "cloudinit": { - "hash": "sha256-CmlFKg9ZvcTBLbFjZEwPAKNtXUMNcsxraO4ECCud/9E=", + "hash": "sha256-DnMI+HoarsOwtsK37UpKXziK3fR5NOXW4OyWvA6Wdh4=", "homepage": "https://registry.terraform.io/providers/hashicorp/cloudinit", "owner": "hashicorp", "repo": "terraform-provider-cloudinit", - "rev": "v2.3.4", + "rev": "v2.3.5", "spdx": "MPL-2.0", - "vendorHash": "sha256-Hny481ihxllpoVPL5/0rTV9oCAmyoGKxCYiN986aKTk=" + "vendorHash": "sha256-4TlCpBwXH0JNOPWRELVzUXOyFU9R8dkfZrUO86eu7Bw=" }, "cloudscale": { "hash": "sha256-4RU1CD0WwLMd3NsnJWl2Smc8XBYlP9K8Iev16uqsetE=", @@ -299,13 +299,22 @@ "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA=" }, "datadog": { - "hash": "sha256-s1JCno9cpXk0RdovXjTue77Gv9cLX3lB46jYy2xgOOk=", + "hash": "sha256-8bFMlDEHZzcxSlmahfGo5VKd57KCJqCE7V3Nmc0bcG4=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.44.0", + "rev": "v3.46.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-ZmOuk2uNnFQzXSfRp6Lz/1bplEm0AuB/M94+dRnqhHU=" + "vendorHash": "sha256-aneDpdBydQnBGc3kdCoSBQC8A/MbpcTYDK+Uo5MeXb8=" + }, + "deno": { + "hash": "sha256-7IvJrhXMeAmf8e21QBdYNSJyVMEzLpat4Tm4zHWglW8=", + "homepage": "https://registry.terraform.io/providers/denoland/deno", + "owner": "denoland", + "repo": "terraform-provider-deno", + "rev": "v0.1.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-mJXQVfCmW7ssFCrrRSiNb5Vg2QnS9NoBCgZlDDPMoEU=" }, "dexidp": { "hash": "sha256-ommpazPlY4dMAOB1pgI7942aGH6YYPn6WtaowucQpZY=", @@ -327,11 +336,11 @@ "vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM=" }, "digitalocean": { - "hash": "sha256-EpT0pL6JrQ9BKL7IyUmEYllRyIFbjJepVvVZdxQhFKs=", + "hash": "sha256-sgyAevLDugDoaoeqgCmacqJAUDl35bifEX6euJf74/Y=", "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.40.0", + "rev": "v2.42.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -345,13 +354,13 @@ "vendorHash": null }, "dns": { - "hash": "sha256-D9Y4VjNWvbIC8LjMSJp+KqyV0LvomfaiqjkOItwAF/w=", + "hash": "sha256-2sKDjC6QwztHMiEr6ZuAPDq/ySUjgsjVYfaXcRDN0xo=", "homepage": "https://registry.terraform.io/providers/hashicorp/dns", "owner": "hashicorp", "repo": "terraform-provider-dns", - "rev": "v3.4.1", + "rev": "v3.4.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-yOuZcvaregVLf0O6Teuvv6FtapuQGgHjTkqiH2euV8U=" + "vendorHash": "sha256-osSB88Xzvt5DTDE0AY2+QuKClfbGIVJNrXuy4Cbk1Tg=" }, "dnsimple": { "hash": "sha256-19h4x+kxhFwlNUdTmTLjoLRQB7fNBh0CxxoQDGRPPiQ=", @@ -372,11 +381,11 @@ "vendorHash": "sha256-XxltOTtCgmJ9wZX8Yw39HkwVVZb58kZjAH7jfKPhjKM=" }, "doppler": { - "hash": "sha256-yHWOMDhsqF+DXIKREyx8FftItZiWlWFoRhpub752UtU=", + "hash": "sha256-bi2vpG2+iYYQcS6sqram2Pdulk4cHiQNCoT4Q1Z8pJM=", "homepage": "https://registry.terraform.io/providers/DopplerHQ/doppler", "owner": "DopplerHQ", "repo": "terraform-provider-doppler", - "rev": "v1.10.0", + "rev": "v1.11.0", "spdx": "Apache-2.0", "vendorHash": "sha256-UvpSfCelEsV9gjRWHxdYvVe3HAnYWWY5KYLVYiqc/So=" }, @@ -390,38 +399,38 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-Wj/qrc18/wJekWZdNgzheT1hsIlAPTAf/tAIrpw6N9Y=", + "hash": "sha256-FFUmNDP10Aqj5aBWuYYO1redZlXMNVLEskQAjPSgXoY=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", "repo": "terraform-provider-equinix", - "rev": "v2.4.1", + "rev": "v2.8.0", "spdx": "MIT", - "vendorHash": "sha256-5M/ceHvcwAlIhjpYO1JTQVUmuBLa9pT5opwiC/tp6+8=" + "vendorHash": "sha256-k9NmPXtvjLDWDGMbloJwErNkzuJVe8T6lnlYE2iO5w4=" }, "exoscale": { - "hash": "sha256-i7Lp3NhaxVR317vHfdE/2aXAxmKk7u7kETM7JTJr5BI=", + "hash": "sha256-fS7ZK+d7paUoaPuxXh6N6Sw38dzlxOAVCHgsHUL2Gz8=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.59.2", + "rev": "v0.61.0", "spdx": "MPL-2.0", "vendorHash": null }, "external": { - "hash": "sha256-NCHG3lE+PuKm/8ox+d+zDSoKMXjSCCwi2JWTOn7NezE=", + "hash": "sha256-BgtRCRGo0jf8lQTxmEOxFPuLrVffrXO2E2jBYQV9wqk=", "homepage": "https://registry.terraform.io/providers/hashicorp/external", "owner": "hashicorp", "repo": "terraform-provider-external", - "rev": "v2.3.3", + "rev": "v2.3.4", "spdx": "MPL-2.0", - "vendorHash": "sha256-qeKXdjrDPJWO4xW8by6djJReeYbCjh8VzQmE5/65zII=" + "vendorHash": "sha256-xlcOCdgRTQbJCsL39hs3dUVjssGpyNij0ickjSn8EX0=" }, "fastly": { - "hash": "sha256-NzuWXQtaobbkk4oKcs+aT6ONeIsmLZsyRhW3BP7+5Wg=", + "hash": "sha256-Kpb5TiWDGOvIZLhzxG27wY+h1B9fgYN1WYGrmLps28c=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v5.13.0", + "rev": "v5.14.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -435,13 +444,13 @@ "vendorHash": "sha256-ZbU2z7qUHPR7vDSflesSjgK7x3LYXVe/gnVsy19q6Bs=" }, "fortios": { - "hash": "sha256-/4+FpytrKGDpl6ZZoZ6BpsiiqlxTcxRs+Ag4wVJ9NLw=", + "hash": "sha256-hfL1os1jCEIcpeGiqftASRN1RV2sKDhxyBVWkY3KOHA=", "homepage": "https://registry.terraform.io/providers/fortinetdev/fortios", "owner": "fortinetdev", "repo": "terraform-provider-fortios", - "rev": "1.20.0", + "rev": "1.21.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-eFPOY0oGjTw9JIHNJks5Dgv2vJyS/eaEi+bPQkdBFlc=" + "vendorHash": "sha256-Tgjrt90MSsHjX5UrgXLDTTxSos8OljLX+UgforwXIh0=" }, "gandi": { "hash": "sha256-fsCtmwyxkXfOtiZG27VEb010jglK35yr4EynnUWlFog=", @@ -452,41 +461,50 @@ "spdx": "MPL-2.0", "vendorHash": "sha256-EiTWJ4bw8IwsRTD9Lt28Up2DXH0oVneO2IaO8VqWtkw=" }, + "gitea": { + "hash": "sha256-cIbDYFc6q6GMoQH9bqEA/LqC3MczAM7mewhYRRYQcy0=", + "homepage": "https://registry.terraform.io/providers/go-gitea/gitea", + "owner": "go-gitea", + "repo": "terraform-provider-gitea", + "rev": "v0.5.1", + "spdx": "MIT", + "vendorHash": "sha256-7gA6KoP7NwjwItigBUeCg9AYQ/MggkOHOe/bH7Tf/xA=" + }, "github": { - "hash": "sha256-8TP3iw/NeVjq49HhurCULXbAOvP2ye6mZsVe62FxSAE=", + "hash": "sha256-XnCoXKKAk1RvQiZ7IWxIOalSS5EC/l7jJYf7RVpAT6s=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v6.2.3", + "rev": "v6.3.1", "spdx": "MIT", "vendorHash": null }, "gitlab": { - "hash": "sha256-F+ps7hpRm6+DHJwVOMe2qwVvKSL2o1JUl0Blgd8qFsA=", + "hash": "sha256-fzt7yPU9gaI0V08KNzyLZjZEARkDgk9ID3nNJWU5tJ4=", "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab", "owner": "gitlabhq", "repo": "terraform-provider-gitlab", - "rev": "v17.3.1", + "rev": "v17.4.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-vIGqb5+e9vZkJFsH7f1UU13V80XtQVcsQ1hYu5laV70=" + "vendorHash": "sha256-lwqlWLk0sOtfsh3wf6zjCBH4mIj5ZVIU8D7rae3mNhA=" }, "google": { - "hash": "sha256-RIBSJc5wmBXvd+NWaz3oCOClAOqXEOpSXIR8+wYKfk0=", + "hash": "sha256-u6p937GYGWFZZD0s1BnnESny7fHMHZ+Fctp67ElUYUU=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "repo": "terraform-provider-google", - "rev": "v6.2.0", + "rev": "v6.7.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-iRN3qqJHmpLuuAbmaFCj9wFXAHTXK+farkFlkWt1hyU=" + "vendorHash": "sha256-iJSo5zrJWRpm7kPHxEBBovsn1ICQCNe1fjsp4CdJgBU=" }, "google-beta": { - "hash": "sha256-CxoWwoR4CVW5sVSOpOmfnn5xECKmbSuSpBWVAhW24D0=", + "hash": "sha256-9KaTzEbl4kUpl9ttC7VOvstVXcf6R5zNqAUpr/om8nA=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "repo": "terraform-provider-google-beta", - "rev": "v6.2.0", + "rev": "v6.7.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-RgquPp7hJQcgXZndl9kojAxunGA3KxSneYACru23WUk=" + "vendorHash": "sha256-3cwpIOVynJj9G/sWWXmVbosqlggb5TqMCtMg1pgIGic=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", @@ -498,13 +516,13 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-tUx6L+ESPsa9VWFztNoYAtspnPoNO8QX3AQk3i0VyNc=", + "hash": "sha256-Qn59GOYJ6XI7lFb63mTR9uXV5zvV8sVmYUgPRJi00Wg=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v3.7.0", + "rev": "v3.10.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-d7ugVKmKQovewfeZF5k5KHbELwCSY9Krknow7q/7HWo=" + "vendorHash": "sha256-jAYaVNWMEGLDPgnyD2VJwVpDwn9lcvBNLnKPdlqdRZc=" }, "gridscale": { "hash": "sha256-GVOjkena3zRaOxO3YRYf+gfM2/CRm8VajpuWGTU0F1Y=", @@ -534,13 +552,13 @@ "vendorHash": "sha256-t9nXq30jRSlx9gMR+s8irDVdSE5tg9ZvMp47HZwEm7w=" }, "helm": { - "hash": "sha256-82jM8XZF8X7tYbebMXPYNyhNGqQ51zl3WxYWX2ObD1g=", + "hash": "sha256-8cYhbxbjTfloDd3cLYNPv98TzeC0XVrb4DQ2ScZDYvI=", "homepage": "https://registry.terraform.io/providers/hashicorp/helm", "owner": "hashicorp", "repo": "terraform-provider-helm", - "rev": "v2.15.0", + "rev": "v2.16.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-QERpwymuz45RiH9SMuAJPyl/z8r0a5Wd8NBMFKV6NjI=" + "vendorHash": "sha256-cMdWIciJEUvcrRaMMDlXI7fuJHXV6FCpyqG18Q926iQ=" }, "heroku": { "hash": "sha256-B/NaFe8KOKGJJlF3vZnpdMnbD1VxBktqodPBk+4NZEc=", @@ -570,20 +588,20 @@ "vendorHash": "sha256-zo22ng+J9ItkptdgUt6Pekkd9T7hFTYdVAWnp2k2vrs=" }, "http": { - "hash": "sha256-fYbOfsKTah+5pgJdSftZvVlYmBp75o/6ByJO+ayXDhQ=", + "hash": "sha256-eNF6OQZmJfzVXfvrhjtMJZG7mNYjS61Bplff+VaxrCA=", "homepage": "https://registry.terraform.io/providers/hashicorp/http", "owner": "hashicorp", "repo": "terraform-provider-http", - "rev": "v3.4.4", + "rev": "v3.4.5", "spdx": "MPL-2.0", - "vendorHash": "sha256-+U6k+mAVdGWOKzopp0yfaMmKuhqG0Laut+jHap4hBWs=" + "vendorHash": "sha256-GoOKTT+EOhaPhpbgSW3SycYsE8LEQP0v4eQfiTEnPy8=" }, "huaweicloud": { - "hash": "sha256-Qs5/bDIb2SkQn9oXYU0kgpHY2q2obf8h2bN4prsaNrs=", + "hash": "sha256-hDb3dOKaHL1fw0m+dBx6izhw7tltvzm05IyCGJgbGJw=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.68.1", + "rev": "v1.69.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -606,13 +624,13 @@ "vendorHash": null }, "ibm": { - "hash": "sha256-PgrC6k6xGfGR9DoTBLSbWDjfF5comrpLGxgUIeof1lI=", + "hash": "sha256-GhQ6ao37GUzryuqOIddZiLNAZWoTOQ0HuSp9ROHxMaI=", "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", "repo": "terraform-provider-ibm", - "rev": "v1.69.0", + "rev": "v1.70.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Ve0qfeuDU59W3jCXpNvcZbnLt7OLAreBbGam2Wp/3Ig=" + "vendorHash": "sha256-4ELjuIe7cMSC79pO6UOaV4cnEKChCtBdJ8Q3vUNk9W8=" }, "icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", @@ -687,11 +705,11 @@ "vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao=" }, "kubernetes": { - "hash": "sha256-SXHi6iW946P7EjNOtci2b0ioftxMHtqTIZmTBnHvmU4=", + "hash": "sha256-xznolig6OYs6igpz3CoB5Vu3UHlfDi4zmfbTHWFJacI=", "homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes", "owner": "hashicorp", "repo": "terraform-provider-kubernetes", - "rev": "v2.32.0", + "rev": "v2.33.0", "spdx": "MPL-2.0", "vendorHash": "sha256-MfXuVZC7aroO83CJTNCh5YfbmMlUG1CiPeGgxhUFjN0=" }, @@ -705,22 +723,22 @@ "vendorHash": "sha256-v9N7lj7bEgR5HZm1SO0+DSCmQFVnsRvHPMycYMfpYwo=" }, "libvirt": { - "hash": "sha256-yGlNBbixrQxjh7zgZoK3YXpUmr1vrLiLZhKpXvQULYg=", + "hash": "sha256-341yVJIRXSISVKfdRqv2HiI90TmgR+2uyNQhONdhjHk=", "homepage": "https://registry.terraform.io/providers/dmacvicar/libvirt", "owner": "dmacvicar", "repo": "terraform-provider-libvirt", - "rev": "v0.7.6", + "rev": "v0.8.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-K/PH8DAi6Wj+isPx9xefQcLPKnrimfItZFSPfktTias=" + "vendorHash": "sha256-MzRiAVzZXf9B1XwVz7RIJcXuyBtG7LIqp3OfP0AFl2Q=" }, "linode": { - "hash": "sha256-4uRKers66pbuft7lWKzBbsE3fFWTfyozWvGjmDke210=", + "hash": "sha256-jPKjxvkIxKXs74Y6teZjs7xHzPlzvyUbZaMDRGpy/t0=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v2.27.0", + "rev": "v2.29.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-bWyHzN+W3G83V8sjqn1bfLBuB71/O5DuUWsro58A2xs=" + "vendorHash": "sha256-UXX7jnphsPq25dSkcVT5McV6/FcD99wEhPzazsgKTTA=" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", @@ -732,22 +750,22 @@ "vendorHash": "sha256-Jlg3a91pOhMC5SALzL9onajZUZ2H9mXfU5CKvotbCbw=" }, "local": { - "hash": "sha256-va8CFAHPZvc541Bml0VPN6A5qyUiKBXRfH/3AwxgXTo=", + "hash": "sha256-BwbKkChQFtNHr/UwMNWGD/KU82vxlcXNaRWrsyzYrRg=", "homepage": "https://registry.terraform.io/providers/hashicorp/local", "owner": "hashicorp", "repo": "terraform-provider-local", - "rev": "v2.5.1", + "rev": "v2.5.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-PpLqFek6FnD+xWF8QMS2PFUP7sXXVWWWosq6fpLRzxg=" + "vendorHash": "sha256-t5kQxSjd90mglgMvlMnhWBQlz1r+ZI5BKBD3dqty5lk=" }, "lxd": { - "hash": "sha256-LGho9iCjKn0OR8sbnkduZtLIxcnVwpedvVinA78791c=", + "hash": "sha256-PTpvB+FO94k/wnYQuex+zlpqcwwJSYl3OYRSA1gI7VM=", "homepage": "https://registry.terraform.io/providers/terraform-lxd/lxd", "owner": "terraform-lxd", "repo": "terraform-provider-lxd", - "rev": "v2.3.0", + "rev": "v2.4.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-J1KWnU0IspjoosI5wIAc8ygOImXlc3tFkhV3yDXoDl4=" + "vendorHash": "sha256-JIFYDh3EzsCNwY8Hg8aVnUIuhP+MJpygbmwTyRryM0w=" }, "mailgun": { "hash": "sha256-Sj6iejtaSdAPg2tI5f0b88Lni431cervHxlQWwGl8Bo=", @@ -777,31 +795,31 @@ "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=" }, "migadu": { - "hash": "sha256-/VR2pko5ctH/Gz3zUMhmwlZOpxQPu1AgZ3wRddndf6c=", + "hash": "sha256-2kVMYeIAGUpR+8KotbiCOl837nHJM0G/dhqVmnAzcjk=", "homepage": "https://registry.terraform.io/providers/metio/migadu", "owner": "metio", "repo": "terraform-provider-migadu", - "rev": "2024.9.5", + "rev": "2024.10.10", "spdx": "0BSD", - "vendorHash": "sha256-3pPRgmoC0eYFyu/kNpJty45MfIjBMN5uV8l7iQErAns=" + "vendorHash": "sha256-cFt/fbgJsLATi9aolKl9ra1xAz9zp3JjWk+a5aWs88o=" }, "minio": { - "hash": "sha256-1f6T5sfrBPgwxKKZMknd3JJd7mv90zuGtXInDPKAg0M=", + "hash": "sha256-h2zGfU4Ud5sZ2zjcsWGnaVpGRPTpWVJYTIUvWMrF7AQ=", "homepage": "https://registry.terraform.io/providers/aminueza/minio", "owner": "aminueza", "repo": "terraform-provider-minio", - "rev": "v2.5.0", + "rev": "v2.5.1", "spdx": "AGPL-3.0", "vendorHash": "sha256-Gn4P4NIksv8S4DmnuYArxdSQDQsyCeayJJAIkmm/I6A=" }, "mongodbatlas": { - "hash": "sha256-ZAgoC6HNBIQP3tCo3+kZh7TyMDi+caPstqB5HpjTa5g=", + "hash": "sha256-ztdzVTCQDPOgXVv/39SDfaNM4wR/zh5ReikEGz4S8Jw=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.18.1", + "rev": "v1.21.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-llbYJi3ghgh9y97ri03a7ZBXSUPMs7f3FLd4iLRRmmk=" + "vendorHash": "sha256-DJXpVYF1AQ5q4ASJFsIyag6OTFxpRSealN98859G5Ls=" }, "namecheap": { "hash": "sha256-g3i7jZBOl2umsyRk1z7Radv8a9Ry6oQ8oorv3YbY7Xo=", @@ -822,40 +840,40 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-Q1wY613U8cdAlHd+mVTKVNO4KBqVm2/HcKp66DTzbII=", + "hash": "sha256-KoBCI48Oq/ooyM0XXs9XcT7HELmdAoeDGEZxRB0kNIs=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.45.0", + "rev": "v3.50.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-C3dDWWmV7YrorPps0m0V9DQDraID57+vXWg8pBIYXIE=" + "vendorHash": "sha256-yVtWjfXxxaIj0JtTKRtILzJwW7QWnRWTVc0VYb9vfdk=" }, "nomad": { - "hash": "sha256-OdttxZEY4fiLiK6ReoIFjN3VAvEgARQ9yBAqemVyheU=", + "hash": "sha256-k61iQ9FQG3nscBp5CE/fFCbHpeLawbUAtGPM+IZtfVc=", "homepage": "https://registry.terraform.io/providers/hashicorp/nomad", "owner": "hashicorp", "repo": "terraform-provider-nomad", - "rev": "v2.3.1", + "rev": "v2.4.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-WTfhKSaSzXOsYH8Aso735y5fYCKEjwMtWto5oZ6lU4s=" + "vendorHash": "sha256-YmZvHzrEZVvXI8CIcjX40s+MHTThPeXNQ05cnqkNbbE=" }, "ns1": { - "hash": "sha256-3NDHEpvBlVb3IgkEjJ1g2Jpvy2MbgXSeabuCPlpKZmM=", + "hash": "sha256-Ou4OB58FXUDg9v0eKCLUChcdAFOibng/p7c0K9NOcAY=", "homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1", "owner": "ns1-terraform", "repo": "terraform-provider-ns1", - "rev": "v2.4.1", + "rev": "v2.4.4", "spdx": "MPL-2.0", "vendorHash": "sha256-jTsjVhVEgtI3B+tLl9xLqQsGI2piQc6QA2EHqfVhDxg=" }, "null": { - "hash": "sha256-KOwJXGvMc9Xgq4Kbr72aW6RDwzldUrU1C3aDxpKO3qE=", + "hash": "sha256-zvzBWnxWVXNOebnlgaP8lzwk6DMwwkGxx4i1QKCLSz0=", "homepage": "https://registry.terraform.io/providers/hashicorp/null", "owner": "hashicorp", "repo": "terraform-provider-null", - "rev": "v3.2.2", + "rev": "v3.2.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-9MeLKrKV3OESkJ4kTB9A9c9IYY1QsME0CODIoGU+anU=" + "vendorHash": "sha256-btTvl9WcqWMa5YGkY0PT8c64H6ToNghLKX03dN/3IPs=" }, "nutanix": { "deleteVendor": true, @@ -868,22 +886,22 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-LlRy0i4JGjaeHMQMWUYtKgJOUqm0RFwtyDO+KtQcCRI=", + "hash": "sha256-C9s00paLaYGlxssaK5wUArLiQVTTDYbm0AZdoA1wPQU=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v6.9.0", + "rev": "v6.13.0", "spdx": "MPL-2.0", "vendorHash": null }, "okta": { - "hash": "sha256-lSZWAAZWkM2+fgLpbfsHLvu1m6R8LMrtc7hUPdwiioc=", + "hash": "sha256-Abhm4c7FJjs1+dcwRjHQCoQop1ZAJUbJktQ/SAnbR9o=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v4.10.0", + "rev": "v4.11.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-8Wez4UkS0LsJTtgepdPpyZHhNZADxvGwOEVu6RLBI0o=" + "vendorHash": "sha256-MA0w44ig8sS1+JgJ/TnBSiUlADDn/WP5zCYgcDXGaQk=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", @@ -913,22 +931,22 @@ "vendorHash": "sha256-Hd6vh4ihuR1rRk5yIu1mPuDMb4Not4soKld10MfOuGU=" }, "openstack": { - "hash": "sha256-Vt6cFZBfM5sP62zWeyoCuEPU6vRucGG8z7zeQywDA40=", + "hash": "sha256-Qx4OQzVjhrlILrl5htROVvAzaHQ4AmdkBqpKP17mrBc=", "homepage": "https://registry.terraform.io/providers/terraform-provider-openstack/openstack", "owner": "terraform-provider-openstack", "repo": "terraform-provider-openstack", - "rev": "v2.1.0", + "rev": "v3.0.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-UH4LgC4UATpglZ2lYb92LvEeAgqXyDFzujNnaYCYN3g=" + "vendorHash": "sha256-0Atbzx1DjInPMa1lNxyNKfNMILjN4S814TlIAQeTfdI=" }, "opentelekomcloud": { - "hash": "sha256-CXWaIISfDtT6jTdFKE67LiRPlGaq+9fRO77GqIMrZhs=", + "hash": "sha256-jDPUTAXddTzO7PTZWqjFAQSj4ZUJVP4G/eHqcVPwlMU=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.36.18", + "rev": "v1.36.20", "spdx": "MPL-2.0", - "vendorHash": "sha256-vsK74qZ20VOID5sg7kHjxBXiu1dkyJ961zFf0+QkqH0=" + "vendorHash": "sha256-qMyMPKOpnRQERX95S9yn0Pmi7wLJy1+u4mFvMwHdRx8=" }, "opsgenie": { "hash": "sha256-+msy9kPAryR0Ll5jKOd47DMjeMxEdSIfKZZKVHohQGY=", @@ -940,20 +958,20 @@ "vendorHash": null }, "ovh": { - "hash": "sha256-XVNinT1kjvjrVLB4NXELw1Rf6UZEkX4el+dKzOO0QjY=", + "hash": "sha256-SdolwqXtS4SwR8LaSkZKPnuXgaRoCJKJXvaCFdsmvEw=", "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", "repo": "terraform-provider-ovh", - "rev": "v0.48.0", + "rev": "v0.51.0", "spdx": "MPL-2.0", "vendorHash": null }, "pagerduty": { - "hash": "sha256-+8Ar/PDGSSe9Xs2BoNndrBCXZpgqKHNXz7HNVvok1Eo=", + "hash": "sha256-1IBi5945mjC48bDwbb/0XHjQKrd4klB97+/gzdSJPwY=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v3.15.6", + "rev": "v3.16.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -994,13 +1012,13 @@ "vendorHash": null }, "project": { - "hash": "sha256-rxv1owtlc9P9uZDReH0lKFUUTSL+X+HlkWL5FWz3bHw=", + "hash": "sha256-585wLTAtiN28vn3yuEnfbSy3R0XkHIyaeBlpC5iFtbQ=", "homepage": "https://registry.terraform.io/providers/jfrog/project", "owner": "jfrog", "repo": "terraform-provider-project", - "rev": "v1.7.2", + "rev": "v1.8.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-ld52rPoG4bCfU+qizliuwmz6ncxrhcoAYOEZo5mnCYI=" + "vendorHash": "sha256-4kHMa6WoKYqd9WRecDWm8ea/s4yBFQQ0EHhXdS/x+xM=" }, "proxmox": { "hash": "sha256-ikXLLNoAjrnGGGI3fHTKFXm8YwqNazE/U39JTjOBsW4=", @@ -1021,22 +1039,22 @@ "vendorHash": "sha256-j+3qtGlueKZgf0LuNps4Wc9G3EmpSgl8ZNSLqslyizI=" }, "rancher2": { - "hash": "sha256-n4sEIew7C7tG19paaJjgtCwGt5KhUyoR/OGoLu4Kal8=", + "hash": "sha256-DOyjd46EEc68u7ltp/TOgmr03ipHqy+o2T2n3dbIxYs=", "homepage": "https://registry.terraform.io/providers/rancher/rancher2", "owner": "rancher", "repo": "terraform-provider-rancher2", - "rev": "v5.0.0", + "rev": "v5.1.0", "spdx": "MPL-2.0", "vendorHash": "sha256-uIyLOqabx8wQurxcG70LHm+jBga+bCNyf5XxGrt5OKA=" }, "random": { - "hash": "sha256-10SRHJx7h04qRH4XnBsqiwJ43nxTodj89kkik2UTI6E=", + "hash": "sha256-usHBDTo7uYTH95PVR1aPFU6eBeatSpgmY9RDZhp+MIc=", "homepage": "https://registry.terraform.io/providers/hashicorp/random", "owner": "hashicorp", "repo": "terraform-provider-random", - "rev": "v3.6.2", + "rev": "v3.6.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-No5XSWYIDmlxA9iczZWXXRZyy8JRSefPk36usv+Tf7c=" + "vendorHash": "sha256-OEStyiPoGoqsSzdfwCeNOXufP2kbQJiRRBn0b/gRz6c=" }, "remote": { "hash": "sha256-zuKtkJLTMsrGgk7OIY+K/HhEddgFuEfzK7DcwPnUX6k=", @@ -1048,22 +1066,22 @@ "vendorHash": "sha256-lkooWo0DbpL4zjNQ20TRw+hsHXWZP9u7u95n1WyzTQk=" }, "rundeck": { - "hash": "sha256-VPkHnSOTnRvvX6+K0L0q5IqSSFCE6VPdg2BaSejFMNc=", + "hash": "sha256-PdMesiJh6DwFfgucle8GgWBcJRKFRWJW1oMvKLhVQp0=", "homepage": "https://registry.terraform.io/providers/rundeck/rundeck", "owner": "rundeck", "repo": "terraform-provider-rundeck", - "rev": "v0.4.7", + "rev": "v0.4.9", "spdx": "MPL-2.0", "vendorHash": null }, "scaleway": { - "hash": "sha256-h30SfKtx2l9zp9ZGy1KRoQRmb83B4e48R/URJ2I2J+U=", + "hash": "sha256-Tv71Cdypc8AWE9ZcDL6H7rCertobLhlFD4QNNHQFSG4=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.44.0", + "rev": "v2.46.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-crp1XJRsWBEhRFC1CzLTgBTrTLaM2Y39Mwx+l1mg0Ks=" + "vendorHash": "sha256-prgVm9z7PbJt2Aw2OY76ikbkK4sTyqb8Xmz2aRhhVQg=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", @@ -1075,11 +1093,11 @@ "vendorHash": null }, "selectel": { - "hash": "sha256-cLN0wNT8Yn+uiaGZFzdDg1ZN4pzm5VHriMgRGZv3ZpU=", + "hash": "sha256-EclmqCRBpgYZ5TXJFJtoOuuzuWRcgcla+LRy0qbCG9M=", "homepage": "https://registry.terraform.io/providers/selectel/selectel", "owner": "selectel", "repo": "terraform-provider-selectel", - "rev": "v5.3.0", + "rev": "v5.4.0", "spdx": "MPL-2.0", "vendorHash": "sha256-MP44e56j7rLyT4+TbFDfDb5GNc/LzZNLplm1/qqeGiw=" }, @@ -1129,13 +1147,13 @@ "vendorHash": "sha256-F1AuO/dkldEDRvkwrbq2EjByxjg3K2rohZAM4DzKPUw=" }, "snowflake": { - "hash": "sha256-jIzLT2tQViOdNOQ462fM1SFt0E22QZbUdh33OjmUf+k=", + "hash": "sha256-F1mZ1OPoOuB8Fh5y2MHUssGvAKMHY6GpyTJPAAAPtNo=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.95.0", + "rev": "v0.97.0", "spdx": "MIT", - "vendorHash": "sha256-FPIqTXbGLui6QW1bFhwV4rGgo8IUw3XkmryqmjpM5Sw=" + "vendorHash": "sha256-ZHwHYUk2JntdWWH4sqU63Ud/Zb86YNLTrPmJrwcuWDQ=" }, "sops": { "hash": "sha256-MdsWKV98kWpZpTK5qC7x6vN6cODxeeiVVc+gtlh1s88=", @@ -1147,22 +1165,22 @@ "vendorHash": "sha256-YFV+qXD78eajSeagJPgPu+qIktx1Vh/ZT0fUPOBuZyo=" }, "spacelift": { - "hash": "sha256-kEfZ1ErNMdUGw1eRiX4SphreCCGMQj1Wj0DLFikTfxI=", + "hash": "sha256-HJ+QlbmMvn45l9KjmVzoK/jETIosOSlcLtw4B1kdEIo=", "homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift", "owner": "spacelift-io", "repo": "terraform-provider-spacelift", - "rev": "v1.15.0", + "rev": "v1.16.1", "spdx": "MIT", "vendorHash": "sha256-m/J390su2nUpYMXrrYcOfKSjZb5Y23+g24rroLRss4U=" }, "spotinst": { - "hash": "sha256-ChtaZkztmyFPJvtoE+TUPzZyEEoZ6y3o1CgnKsnK6I4=", + "hash": "sha256-BQL8ZwLAOaNO42Hhmq0XvgcLe7STAIN9xLXaHMM1x6Y=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.190.0", + "rev": "v1.195.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-JGwBQMsMGxH5ceHOd5CbSQFQdL6u99lHpWFgJUyMYRQ=" + "vendorHash": "sha256-/2t6Yv0ceSweRGPNOUOHj/fv6/VQNZEP8et++rxmfiE=" }, "ssh": { "hash": "sha256-1UN5QJyjCuxs2vQYlSuz2jsu/HgGTxOoWWRcv4qcwow=", @@ -1192,58 +1210,58 @@ "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs=" }, "sumologic": { - "hash": "sha256-e/Vmu+odmn/IasHl6dSy5aYLRi/lTcVjpzJl+YYn1mg=", + "hash": "sha256-42W0u9E8xgE+aUxruAPIm1pqOimN2eReWHrWOpnui/4=", "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic", "owner": "SumoLogic", "repo": "terraform-provider-sumologic", - "rev": "v2.31.3", + "rev": "v2.31.5", "spdx": "MPL-2.0", "vendorHash": "sha256-YdWs2orKhbwAZSQYC73t4e/vvVxk8LrBPG9ZC38VcZE=" }, "tailscale": { - "hash": "sha256-GflanQbIPpS0mxmw7LXeTfPly+CmgpsoLHBIMe6f7xM=", + "hash": "sha256-b2ZzXvlzlE+zv3Ufu4M5mcuLhyDkBbMznyM7NbiXAQs=", "homepage": "https://registry.terraform.io/providers/tailscale/tailscale", "owner": "tailscale", "repo": "terraform-provider-tailscale", - "rev": "v0.16.2", + "rev": "v0.17.2", "spdx": "MIT", - "vendorHash": "sha256-RAmAN57hIHvQvZ2pjbLbanixUk8Cart6a3PQPXhnx9U=" + "vendorHash": "sha256-Q/fFd3ahIY1L2s8vE8KY/DtahS948qnoaFLQBQfyNH4=" }, "talos": { - "hash": "sha256-HsblGVHCrOdNDGfNGyGjZxC1LmzZHxjOzknYmY2/BU0=", + "hash": "sha256-bOwvTIXYQwsyKPx6aMY+VzyVuCQimPK8UrPkeWpU48c=", "homepage": "https://registry.terraform.io/providers/siderolabs/talos", "owner": "siderolabs", "repo": "terraform-provider-talos", - "rev": "v0.5.0", + "rev": "v0.6.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-939lQsdp0Ixj9FU7IqxbOAM93GwL+X6gC3kY5/0x+AE=" + "vendorHash": "sha256-tb9raTGqEuvqfMO/5s4Oc7x/EAk4qBWWDiOgRMB3uAU=" }, "temporalcloud": { - "hash": "sha256-OD3cCNRZG9wQSu/aFmnVzcUbJyASusM1rt2PdpWKXkI=", + "hash": "sha256-UaWz9VKyzYtEjOC0hbRrGSB0yP7H7AFP3uKnXcvASwQ=", "homepage": "https://registry.terraform.io/providers/temporalio/temporalcloud", "owner": "temporalio", "repo": "terraform-provider-temporalcloud", - "rev": "v0.0.11", + "rev": "v0.0.13", "spdx": "MPL-2.0", - "vendorHash": "sha256-/yXPJgwpUCKRs3Sf2BbuHp3pfQiheTAh7Auxk3qkTFg=" + "vendorHash": "sha256-UlR5J1Gk+ATwytBoxp6DBVGOo8MAQeGOWxD2Sgg4qJ4=" }, "tencentcloud": { - "hash": "sha256-HgBC+C7z15cdVUBOAaPE3ddhEKMfp7Ow+lWqS/EkD98=", + "hash": "sha256-vj6yGrd9Fqd+XQwlXWS0BV0CZY1gcgE+YyEm/rm6o6o=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.81.120", + "rev": "v1.81.133", "spdx": "MPL-2.0", "vendorHash": null }, "tfe": { - "hash": "sha256-lXwdNtdbCwiotVCGBIiAPHUjNdj+srpBaW30GUWW0ao=", + "hash": "sha256-v5DHEp/O0y4TrOpqOfkBtv4IWTvXV2WPypsRUj3XgOw=", "homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "owner": "hashicorp", "repo": "terraform-provider-tfe", - "rev": "v0.58.1", + "rev": "v0.59.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-eeVkzZ+ATTyZCEq4loEbIb0XO/Ir1jejUaWi4Jd6nMo=" + "vendorHash": "sha256-LgTSyu1TzGT+SV2y9Xoqxv2F828nSTIJp03yMV9OkjM=" }, "thunder": { "hash": "sha256-2i1DSOSt/vbFs0QCPogEBvADhLJFKbrQzwZ20ChCQMk=", @@ -1255,22 +1273,22 @@ "vendorHash": null }, "time": { - "hash": "sha256-mAGBcBMd00r2URY/jqZQBLjo0mN+IMG5ONVKj0AwXNs=", + "hash": "sha256-d8zOwUo/t1AXlN6FH8RUu15DeKE4/ymtRJ2tij98WHE=", "homepage": "https://registry.terraform.io/providers/hashicorp/time", "owner": "hashicorp", "repo": "terraform-provider-time", - "rev": "v0.12.0", + "rev": "v0.12.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-C40wkY1M9d5oPO6TOm/iu99Gcrnnin1ggn9mbOJ0YjY=" + "vendorHash": "sha256-XvvAOSdPbeUT7njmNQfbG9hcfUMy1jAeIzi3ifjQqm8=" }, "tls": { - "hash": "sha256-2K18jY2+oPvelMtZ2o4WJcAPhc93nCvJdHq+VNfmWZI=", + "hash": "sha256-MK75g9gbi+f994hKHBAQRXrPG+hbZqnlyrK8WROiG5Y=", "homepage": "https://registry.terraform.io/providers/hashicorp/tls", "owner": "hashicorp", "repo": "terraform-provider-tls", - "rev": "v4.0.5", + "rev": "v4.0.6", "spdx": "MPL-2.0", - "vendorHash": "sha256-6uzqx9Tz9JcHYHhG/tWYJaUP8yWe533gB0h1+YF+tgQ=" + "vendorHash": "sha256-qsbB7Scw9W4our6B+9NzsK4hrbWP34na7/eNLC99yKc=" }, "triton": { "deleteVendor": true, @@ -1283,11 +1301,11 @@ "vendorHash": "sha256-UuLHaOEG6jmOAgfdNOtLyUimlAr3g6K8n3Ehu64sKqk=" }, "turbot": { - "hash": "sha256-lVKJKMCAm8paXxfPo6YvJBnHdmV4iwaTYmwdN31s/e4=", + "hash": "sha256-UUiTJ7x3EX/l0hSoYQexjeU+z8U+p2yT8MNNRfQnUyA=", "homepage": "https://registry.terraform.io/providers/turbot/turbot", "owner": "turbot", "repo": "terraform-provider-turbot", - "rev": "v1.11.1", + "rev": "v1.11.2", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1319,22 +1337,22 @@ "vendorHash": "sha256-z9qg6NVKYIU2OQTW8g72t6B69aTL/BeLCUFeoII75cE=" }, "vcd": { - "hash": "sha256-4+7CblKeop9Uwpl7XxjmR33XE/mcmZfOuFJrJuqzZmw=", + "hash": "sha256-lWpJb2Dsx2wljQEignrbudFP/K2X8IfkY0IHLnO/Gtw=", "homepage": "https://registry.terraform.io/providers/vmware/vcd", "owner": "vmware", "repo": "terraform-provider-vcd", - "rev": "v3.13.0", + "rev": "v3.14.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-GKI3eXgXA92URJiwafcVchBcW7JQQ7hM14ThA6B6wKg=" + "vendorHash": "sha256-xR0PkeeUjt49KlB7+zIJ2ELcTNS46pQnBrr76X5KneY=" }, "venafi": { - "hash": "sha256-0ea6ael4NQDHFOrXsMKE/KRRpARKjrxPBFykB8Bk1JA=", + "hash": "sha256-9Nn2dFF9W8STQoRXFNiXYCrHEWiirNvOAAS1f1brutw=", "homepage": "https://registry.terraform.io/providers/Venafi/venafi", "owner": "Venafi", "repo": "terraform-provider-venafi", - "rev": "v0.21.0", + "rev": "v0.21.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-PPoPNl7Lc/siAAupLS07vbDipAO1Q0mmDuqSE5/om50=" + "vendorHash": "sha256-xZTd/L5ZRTRuDsdyNZEZPmlOu9nUIAE5W1UG94aOS/o=" }, "virtualbox": { "hash": "sha256-Oijdx22s7wIDC+Sms097rFVNRF9tzMlUNlPMV7GSsiI=", @@ -1364,11 +1382,11 @@ "vendorHash": null }, "vsphere": { - "hash": "sha256-V13LeUNJ4LbP18CMRphU/w/7eytg49j5//gl/sZSV04=", + "hash": "sha256-3894yq6UBG7k9Udnlc8bdLO87jCnA4oBR7TZlbx3uEw=", "homepage": "https://registry.terraform.io/providers/hashicorp/vsphere", "owner": "hashicorp", "repo": "terraform-provider-vsphere", - "rev": "v2.9.1", + "rev": "v2.9.3", "spdx": "MPL-2.0", "vendorHash": "sha256-ozdbYuqz6ua1ubh48IkLxJZ6xAV2ho9mkhtnCTwzRIM=" }, @@ -1391,12 +1409,12 @@ "vendorHash": "sha256-GRnVhGpVgFI83Lg34Zv1xgV5Kp8ioKTFV5uaqS80ATg=" }, "yandex": { - "hash": "sha256-47aAZuGLhiHLzk0mvHD48NfoSUs1Ec3R4DGEpbvPyj8=", + "hash": "sha256-DPEVUFPcJKZyid7E2Guk04nffnujsyo34MQ+ORlpfqA=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.128.0", + "rev": "v0.130.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-4uHYcg+dJg1bJQRsJWDT9VEsPs5JOvGIdrw8cj0IkrE=" + "vendorHash": "sha256-JeIDE4RvJQ5PTNyoFrcAV4E8HTDh4YUjUkkYdtri+gk=" } } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix index 630df5b8ae..8e7a7381a9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -165,8 +165,8 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.9.7"; - hash = "sha256-L0F0u96et18IlqAUsc0HK+cLeav2OqN4kxs58hPNMIM="; + version = "1.9.8"; + hash = "sha256-0xBhOdaIbw1fLmbI4KDvQoHD4BmVZoiMT/zv9MnwuD4="; vendorHash = "sha256-tH9KQF4oHcQh34ikB9Bx6fij/iLZN+waxv5ZilqGGlU="; patches = [ ./provider-path-0_15.patch ]; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/zarf/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/zarf/default.nix index ffc69b5147..c030a86e0a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/zarf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/zarf/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "zarf"; - version = "0.40.1"; + version = "0.41.0"; src = fetchFromGitHub { owner = "defenseunicorns"; repo = "zarf"; rev = "v${version}"; - hash = "sha256-tSMaDb8lflkedDa5ICXthqMpWBkHg+UQ20aTrF4+hUQ="; + hash = "sha256-rY9xWqJ+2Yfs6VRHTF89LmuEruAavDI7MgBm4UFEuBs="; }; - vendorHash = "sha256-7G+gROPw8Ab6iGMr7vnmC7jAm7jLPd5pbLOkKqDKIDc="; + vendorHash = "sha256-Cz+w0tOEamCxf61hvQ03X/kXPY+qrmdBN8s26lr/wZ8="; proxyVendor = true; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/dropbox/default.nix b/third_party/nixpkgs/pkgs/applications/networking/dropbox/default.nix index 303678bbe3..158f41abe2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/dropbox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/dropbox/default.nix @@ -43,7 +43,7 @@ buildFHSEnv { targetPkgs = pkgs: with pkgs; with xorg; [ libICE libSM libX11 libXcomposite libXdamage libXext libXfixes libXrender - libXxf86vm libxcb xkeyboardconfig + libXxf86vm libGL libxcb xkeyboardconfig curl dbus firefox-bin fontconfig freetype gcc glib gnutar libxml2 libxslt procps zlib mesa libxshmfence libpthreadstubs libappindicator ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix index f751c13329..6f75e836ab 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -18,7 +18,7 @@ libxml2, openssl, sqlite, - webkitgtk, + webkitgtk_6_0, glib-networking, librsvg, gst_all_1, @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { libxml2 openssl sqlite - webkitgtk + webkitgtk_6_0 # TLS support for loading external content in webkitgtk WebView glib-networking diff --git a/third_party/nixpkgs/pkgs/applications/networking/geph/default.nix b/third_party/nixpkgs/pkgs/applications/networking/geph/default.nix index 43761b659b..1a8fa7d547 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/geph/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/geph/default.nix @@ -11,7 +11,7 @@ perl, pkg-config, glib, - webkitgtk, + webkitgtk_4_0, libayatana-appindicator, cairo, openssl, @@ -88,7 +88,7 @@ in buildInputs = [ glib - webkitgtk + webkitgtk_4_0 libayatana-appindicator cairo openssl diff --git a/third_party/nixpkgs/pkgs/applications/networking/giara/default.nix b/third_party/nixpkgs/pkgs/applications/networking/giara/default.nix index 872c869f16..110d5c0476 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/giara/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/giara/default.nix @@ -8,7 +8,7 @@ , wrapGAppsHook4 , gtk4 , gdk-pixbuf -, webkitgtk +, webkitgtk_4_0 , gtksourceview5 , glib-networking , libadwaita @@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ gtk4 gdk-pixbuf - webkitgtk + webkitgtk_4_0 gtksourceview5 glib-networking libadwaita diff --git a/third_party/nixpkgs/pkgs/applications/networking/gnome-network-displays/default.nix b/third_party/nixpkgs/pkgs/applications/networking/gnome-network-displays/default.nix index 819e26b1a4..a8ae96e12e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/gnome-network-displays/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/gnome-network-displays/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-network-displays"; - version = "0.92.2"; + version = "0.93.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-network-displays/${lib.versions.majorMinor finalAttrs.version}/gnome-network-displays-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-df35UJnRolVSiYcArpnrglxNKbTKA3LAGsNwlDF7cj4="; + sha256 = "sha256-xxvR8zR+Yglo0e9HRrSFPbgEriYpcRN5K0SXg/D0Oo4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/darwin.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/darwin.nix index aff995a1ce..e81f1f488c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/darwin.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/darwin.nix @@ -1,25 +1,51 @@ -{ pname, version, src, meta, stdenv, binaryName, desktopName, lib, undmg, makeWrapper, writeScript, python3, runCommand -, branch -, withOpenASAR ? false, openasar -, withVencord ? false, vencord }: +{ + pname, + version, + src, + meta, + stdenv, + binaryName, + desktopName, + lib, + undmg, + makeWrapper, + writeScript, + python3, + runCommand, + branch, + withOpenASAR ? false, + openasar, + withVencord ? false, + vencord, +}: let - disableBreakingUpdates = runCommand "disable-breaking-updates.py" - { - pythonInterpreter = "${python3.interpreter}"; - configDirName = lib.toLower binaryName; - meta.mainProgram = "disable-breaking-updates.py"; - } '' - mkdir -p $out/bin - cp ${./disable-breaking-updates.py} $out/bin/disable-breaking-updates.py - substituteAllInPlace $out/bin/disable-breaking-updates.py - chmod +x $out/bin/disable-breaking-updates.py - ''; + disableBreakingUpdates = + runCommand "disable-breaking-updates.py" + { + pythonInterpreter = "${python3.interpreter}"; + configDirName = lib.toLower binaryName; + meta.mainProgram = "disable-breaking-updates.py"; + } + '' + mkdir -p $out/bin + cp ${./disable-breaking-updates.py} $out/bin/disable-breaking-updates.py + substituteAllInPlace $out/bin/disable-breaking-updates.py + chmod +x $out/bin/disable-breaking-updates.py + ''; in stdenv.mkDerivation { - inherit pname version src meta; + inherit + pname + version + src + meta + ; - nativeBuildInputs = [ undmg makeWrapper ]; + nativeBuildInputs = [ + undmg + makeWrapper + ]; sourceRoot = "."; @@ -37,14 +63,16 @@ stdenv.mkDerivation { runHook postInstall ''; - postInstall = lib.strings.optionalString withOpenASAR '' - cp -f ${openasar} $out/Applications/${desktopName}.app/Contents/Resources/app.asar - '' + lib.strings.optionalString withVencord '' - mv $out/Applications/${desktopName}.app/Contents/Resources/app.asar $out/Applications/${desktopName}.app/Contents/Resources/_app.asar - mkdir $out/Applications/${desktopName}.app/Contents/Resources/app.asar - echo '{"name":"discord","main":"index.js"}' > $out/Applications/${desktopName}.app/Contents/Resources/app.asar/package.json - echo 'require("${vencord}/patcher.js")' > $out/Applications/${desktopName}.app/Contents/Resources/app.asar/index.js - ''; + postInstall = + lib.strings.optionalString withOpenASAR '' + cp -f ${openasar} $out/Applications/${desktopName}.app/Contents/Resources/app.asar + '' + + lib.strings.optionalString withVencord '' + mv $out/Applications/${desktopName}.app/Contents/Resources/app.asar $out/Applications/${desktopName}.app/Contents/Resources/_app.asar + mkdir $out/Applications/${desktopName}.app/Contents/Resources/app.asar + echo '{"name":"discord","main":"index.js"}' > $out/Applications/${desktopName}.app/Contents/Resources/app.asar/package.json + echo 'require("${vencord}/patcher.js")' > $out/Applications/${desktopName}.app/Contents/Resources/app.asar/index.js + ''; passthru = { # make it possible to run disableBreakingUpdates standalone @@ -54,12 +82,11 @@ stdenv.mkDerivation { #!nix-shell -i bash -p curl gnugrep common-updater-scripts set -x set -eou pipefail; - url=$(curl -sI "https://discordapp.com/api/download/${ - builtins.replaceStrings [ "discord-" "discord" ] [ "" "stable" ] pname - }?platform=osx&format=dmg" | grep -oP 'location: \K\S+') - version=''${url##https://dl*.discordapp.net/apps/osx/} - version=''${version%%/*.dmg} - update-source-version ${lib.optionalString (!stdenv.buildPlatform.isDarwin) "pkgsCross.aarch64-darwin."}${pname} "$version" --file=./pkgs/applications/networking/instant-messengers/discord/default.nix --version-key=${branch} + url=$(curl -sI -o /dev/null -w '%header{location}' "https://discord.com/api/download/${branch}?platform=osx&format=dmg") + version=$(echo $url | grep -oP '/\K(\d+\.){2}\d+') + update-source-version ${ + lib.optionalString (!stdenv.buildPlatform.isDarwin) "pkgsCross.aarch64-darwin." + }${pname} "$version" --file=./pkgs/applications/networking/instant-messengers/discord/default.nix --version-key=${branch} ''; }; } 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 500b0a28f1..d6f42cfdb5 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 @@ -1,84 +1,108 @@ -{ branch ? "stable", callPackage, fetchurl, lib, stdenv }: +{ + branch ? "stable", + callPackage, + fetchurl, + lib, + stdenv, +}: let versions = - if stdenv.hostPlatform.isLinux then { - stable = "0.0.70"; - ptb = "0.0.105"; - canary = "0.0.492"; - development = "0.0.28"; - } else { - stable = "0.0.318"; - ptb = "0.0.133"; - canary = "0.0.591"; - development = "0.0.49"; - }; + if stdenv.hostPlatform.isLinux then + { + stable = "0.0.71"; + ptb = "0.0.111"; + canary = "0.0.503"; + development = "0.0.30"; + } + else + { + stable = "0.0.322"; + ptb = "0.0.141"; + canary = "0.0.612"; + development = "0.0.53"; + }; version = versions.${branch}; srcs = rec { x86_64-linux = { stable = fetchurl { - url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-Ujlewrhbqal97hCG6+Iu+OqntWZJ/oY6ZHeL+HmoU38="; + url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; + hash = "sha256-PMcavgUhL8c1YFaWsooZObDa7APMqCD1IaysED5fWac="; }; ptb = fetchurl { - url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-u/4wWssZxKlHrRW/Vd9pqUfqN2VQGYv1SDktpRsOayM="; + url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; + hash = "sha256-mms/qTA3XS+R5CDFWFS2RxiHOWnpU348nYagt9L2k2w="; }; canary = fetchurl { - url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-NjcNgKYm1Twm8nN3sFlZCG/3x5fcSmX7X2On7CeZm0M="; + url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; + hash = "sha256-Z0dv/jM0RipRI73vO9O5qqE0xf8qJtljZ3Zjr0Tf/KA="; }; development = fetchurl { - url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-326KAuqt3VQSgyJAdsdc7YgrdF3vCVoJoKUCVC2UdaU="; + url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; + hash = "sha256-HxMJQd5fM1VNfrBey4SbnnBkFQYZgbxg4YTy6FIC9Ps="; }; }; x86_64-darwin = { stable = fetchurl { - url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-Ot6IM6EAg4MQPp0JqvUOZNAor6Nr6luc6pGY+722GMo="; + url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg"; + hash = "sha256-RLAdcCcRrUtDSdaj/RdVLJGvufpIjZoMAKxp0Jyu17A="; }; ptb = fetchurl { - url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-FFp6CRgD/kpCVxJ4+es0DaOGaW5v2Aa+lzJdG2Zu8eY="; + url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; + hash = "sha256-EVwosCb/34W4+dx/u/5aq3pl6FqU1QiFT17yPydtGBU="; }; canary = fetchurl { - url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-TIXe8cy6feME0900R5aWyItZfUrUA8zXo0pqwQ79yAM="; + url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; + hash = "sha256-xvrsohxoCTODG3Au5E773SEX5UXbBJ98J2Eb3Vtybfw="; }; development = fetchurl { - url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-kfHnS1NHuPD7UR7XvMdtY2LPsDRJVQHk7/Nm+cR/KGc="; + url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; + hash = "sha256-DhY8s7Mhzos0ygB/WuoE07WK6hoIh/FcETeIsffw+e0="; }; }; aarch64-darwin = x86_64-darwin; }; - src = srcs.${stdenv.hostPlatform.system}.${branch} or (throw "${stdenv.hostPlatform.system} not supported on ${branch}"); + src = + srcs.${stdenv.hostPlatform.system}.${branch} + or (throw "${stdenv.hostPlatform.system} not supported on ${branch}"); - meta = with lib; { + meta = { description = "All-in-one cross-platform voice and text chat for gamers"; - homepage = "https://discordapp.com/"; downloadPage = "https://discordapp.com/download"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ Scrumplex artturin infinidoge jopejoe1 ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + homepage = "https://discordapp.com/"; + license = lib.licenses.unfree; mainProgram = "discord"; + maintainers = with lib.maintainers; [ + artturin + donteatoreo + infinidoge + jopejoe1 + Scrumplex + ]; + platforms = [ + "x86_64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; - package = - if stdenv.hostPlatform.isLinux - then ./linux.nix - else ./darwin.nix; + package = if stdenv.hostPlatform.isLinux then ./linux.nix else ./darwin.nix; packages = ( builtins.mapAttrs - (_: value: - callPackage package (value + ( + _: value: + callPackage package ( + value // { - inherit src version branch; - meta = meta // { mainProgram = value.binaryName; }; - })) + inherit src version branch; + meta = meta // { + mainProgram = value.binaryName; + }; + } + ) + ) { - stable = rec { + stable = { pname = "discord"; binaryName = "Discord"; desktopName = "Discord"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/linux.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/linux.nix index e0375ecf7b..8d745b0bd8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -1,34 +1,92 @@ -{ pname, version, src, meta, binaryName, desktopName, autoPatchelfHook -, makeDesktopItem, lib, stdenv, wrapGAppsHook3, makeShellWrapper, alsa-lib, at-spi2-atk -, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf -, glib, gtk3, libcxx, libdrm, libglvnd, libnotify, libpulseaudio, libuuid, libX11 -, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes -, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss -, pango, systemd, libappindicator-gtk3, libdbusmenu, writeScript, python3, runCommand -, libunity -, speechd-minimal -, wayland -, branch -, withOpenASAR ? false, openasar -, withVencord ? false, vencord -, withTTS ? true }: +{ + pname, + version, + src, + meta, + binaryName, + desktopName, + autoPatchelfHook, + makeDesktopItem, + lib, + stdenv, + wrapGAppsHook3, + makeShellWrapper, + alsa-lib, + at-spi2-atk, + at-spi2-core, + atk, + cairo, + cups, + dbus, + expat, + fontconfig, + freetype, + gdk-pixbuf, + glib, + gtk3, + libcxx, + libdrm, + libglvnd, + libnotify, + libpulseaudio, + libuuid, + libX11, + libXScrnSaver, + libXcomposite, + libXcursor, + libXdamage, + libXext, + libXfixes, + libXi, + libXrandr, + libXrender, + libXtst, + libxcb, + libxshmfence, + mesa, + nspr, + nss, + pango, + systemd, + libappindicator-gtk3, + libdbusmenu, + writeScript, + python3, + runCommand, + libunity, + speechd-minimal, + wayland, + branch, + withOpenASAR ? false, + openasar, + withVencord ? false, + vencord, + withTTS ? true, +}: let - disableBreakingUpdates = runCommand "disable-breaking-updates.py" - { - pythonInterpreter = "${python3.interpreter}"; - configDirName = lib.toLower binaryName; - meta.mainProgram = "disable-breaking-updates.py"; - } '' - mkdir -p $out/bin - cp ${./disable-breaking-updates.py} $out/bin/disable-breaking-updates.py - substituteAllInPlace $out/bin/disable-breaking-updates.py - chmod +x $out/bin/disable-breaking-updates.py - ''; + disableBreakingUpdates = + runCommand "disable-breaking-updates.py" + { + pythonInterpreter = "${python3.interpreter}"; + configDirName = lib.toLower binaryName; + meta.mainProgram = "disable-breaking-updates.py"; + } + '' + mkdir -p $out/bin + cp ${./disable-breaking-updates.py} $out/bin/disable-breaking-updates.py + substituteAllInPlace $out/bin/disable-breaking-updates.py + chmod +x $out/bin/disable-breaking-updates.py + ''; in stdenv.mkDerivation rec { - inherit pname version src meta; + inherit + pname + version + src + meta + ; nativeBuildInputs = [ alsa-lib @@ -50,48 +108,51 @@ stdenv.mkDerivation rec { dontWrapGApps = true; - libPath = lib.makeLibraryPath ([ - libcxx - systemd - libpulseaudio - libdrm - mesa - stdenv.cc.cc - alsa-lib - atk - at-spi2-atk - at-spi2-core - cairo - cups - dbus - expat - fontconfig - freetype - gdk-pixbuf - glib - gtk3 - libglvnd - libnotify - libX11 - libXcomposite - libunity - libuuid - libXcursor - libXdamage - libXext - libXfixes - libXi - libXrandr - libXrender - libXtst - nspr - libxcb - pango - libXScrnSaver - libappindicator-gtk3 - libdbusmenu - wayland - ] ++ lib.optional withTTS speechd-minimal); + libPath = lib.makeLibraryPath ( + [ + libcxx + systemd + libpulseaudio + libdrm + mesa + stdenv.cc.cc + alsa-lib + atk + at-spi2-atk + at-spi2-core + cairo + cups + dbus + expat + fontconfig + freetype + gdk-pixbuf + glib + gtk3 + libglvnd + libnotify + libX11 + libXcomposite + libunity + libuuid + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + nspr + libxcb + pango + libXScrnSaver + libappindicator-gtk3 + libdbusmenu + wayland + ] + ++ lib.optional withTTS speechd-minimal + ); installPhase = '' runHook preInstall @@ -113,9 +174,7 @@ stdenv.mkDerivation rec { ln -s $out/opt/${binaryName}/${binaryName} $out/bin/ # Without || true the install would fail on case-insensitive filesystems - ln -s $out/opt/${binaryName}/${binaryName} $out/bin/${ - lib.strings.toLower binaryName - } || true + ln -s $out/opt/${binaryName}/${binaryName} $out/bin/${lib.strings.toLower binaryName} || true ln -s $out/opt/${binaryName}/discord.png $out/share/pixmaps/${pname}.png ln -s $out/opt/${binaryName}/discord.png $out/share/icons/hicolor/256x256/apps/${pname}.png @@ -125,14 +184,16 @@ stdenv.mkDerivation rec { runHook postInstall ''; - postInstall = lib.strings.optionalString withOpenASAR '' - cp -f ${openasar} $out/opt/${binaryName}/resources/app.asar - '' + lib.strings.optionalString withVencord '' - mv $out/opt/${binaryName}/resources/app.asar $out/opt/${binaryName}/resources/_app.asar - mkdir $out/opt/${binaryName}/resources/app.asar - echo '{"name":"discord","main":"index.js"}' > $out/opt/${binaryName}/resources/app.asar/package.json - echo 'require("${vencord}/patcher.js")' > $out/opt/${binaryName}/resources/app.asar/index.js - ''; + postInstall = + lib.strings.optionalString withOpenASAR '' + cp -f ${openasar} $out/opt/${binaryName}/resources/app.asar + '' + + lib.strings.optionalString withVencord '' + mv $out/opt/${binaryName}/resources/app.asar $out/opt/${binaryName}/resources/_app.asar + mkdir $out/opt/${binaryName}/resources/app.asar + echo '{"name":"discord","main":"index.js"}' > $out/opt/${binaryName}/resources/app.asar/package.json + echo 'require("${vencord}/patcher.js")' > $out/opt/${binaryName}/resources/app.asar/index.js + ''; desktopItem = makeDesktopItem { name = pname; @@ -140,7 +201,10 @@ stdenv.mkDerivation rec { icon = pname; inherit desktopName; genericName = meta.description; - categories = [ "Network" "InstantMessaging" ]; + categories = [ + "Network" + "InstantMessaging" + ]; mimeTypes = [ "x-scheme-handler/discord" ]; }; @@ -151,11 +215,8 @@ stdenv.mkDerivation rec { #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnugrep common-updater-scripts set -eou pipefail; - url=$(curl -sI "https://discordapp.com/api/download/${ - builtins.replaceStrings [ "discord-" "discord" ] [ "" "stable" ] pname - }?platform=linux&format=tar.gz" | grep -oP 'location: \K\S+') - version=''${url##https://dl*.discordapp.net/apps/linux/} - version=''${version%%/*.tar.gz} + url=$(curl -sI -o /dev/null -w '%header{location}' "https://discord.com/api/download/${branch}?platform=linux&format=tar.gz") + version=$(echo $url | grep -oP '/\K(\d+\.){2}\d+') update-source-version ${pname} "$version" --file=./pkgs/applications/networking/instant-messengers/discord/default.nix --version-key=${branch} ''; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index fc40e11dca..4369b9ddaf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -17,6 +17,8 @@ , CoreServices , desktopToDarwinBundle , useKeytar ? true +# command line arguments which are always set +, commandLineArgs ? "" }: let @@ -106,7 +108,8 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \ --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \ --add-flags "$out/share/element/electron" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags ${lib.escapeShellArg commandLineArgs} runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix index 01a4d3c89e..9775639596 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix @@ -1,9 +1,9 @@ { - "version" = "1.11.79"; + "version" = "1.11.81"; "hashes" = { - "desktopSrcHash" = "sha256-w9JWrStxmiiffu8kKVxM5h8Frxig7v4Vul3YwTnJias="; - "desktopYarnHash" = "0fwkdrfhfl6knvx552q2lpp5pd54qbzkm4kx6jvcrdwjk3x4cgqd"; - "webSrcHash" = "sha256-rla55a0SgeWddXpgaDfsvPcL00NP4DbMDgtc25TM4dw="; - "webYarnHash" = "084nm85y2fmzi27i0050hnxa4m2bqcbl7fn33zd1yini8dwr2n7s"; + "desktopSrcHash" = "sha256-Dr1Bu05UzfqXDceBC6GP3A3Actt5ycUZlJ+MSLYkDZ0="; + "desktopYarnHash" = "19ly8as7y1a1vwaxzmziwia3idnndf1iyz0l160zc213pd3nzabz"; + "webSrcHash" = "sha256-NaoBGyoHyCfmcOOokkQL6DrLxVQufVdZP/pgVMY6CPA="; + "webYarnHash" = "1ap2cjxz5332sm7b1fv0530pibgrfman90i7msyr6a1zfvvds0cc"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix index 8436a518d6..1772fb7a9c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -21,11 +21,11 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "1.9.3"; + version = "1.9.5"; src = fetchurl { url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; - hash = "sha256-TxWyUDoBvscKa2ogPrFlzLC2q+5RMyMnAiOpQdpFP4M="; + hash = "sha256-f99NsOsWp+vGecI2DxRfZOCrz/DxaRPEX5LI642HVjw="; }; format = "pyproject"; @@ -60,14 +60,6 @@ python3.pkgs.buildPythonApplication rec { nativeCheckInputs = [ xvfb-run dbus ]; - preBuild = '' - python pep517build/build_metadata.py -o dist/metadata - ''; - - postInstall = '' - python pep517build/install_metadata.py dist/metadata --prefix=$out - ''; - checkPhase = '' xvfb-run dbus-run-session \ --config-file=${dbus}/share/dbus-1/session.conf \ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix index d4876e2037..b5fe07ef71 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { hash = "sha256-G2jjsc/i9Qgo0TP+ZE4gB/1cjuZ9l8R7e59K2DGD5GY="; }; - nativeBuildInpts = [ + nativeBuildInputs = [ ppx_sexp_conv ppx_deriving ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix index 995284672b..d8f898ef11 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -6,7 +6,7 @@ let src = fetchurl { url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage"; - hash = "sha256-pm4Ji1gv5vNMgB9ZWNKMLZSUE9wBklQ/MnFOKHP+Rcc="; + hash = "sha256-x9GDiSkkO0zYx/veB6xSr6/9/SW6JRTGAASlvWd/P0c="; }; desktopItem = (makeDesktopItem { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 57185f5e42..f7a3a80dff 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -3,6 +3,8 @@ signal-desktop = if hostPlatform.system == "aarch64-linux" then callPackage ./signal-desktop-aarch64.nix { } + else if hostPlatform.isDarwin then + callPackage ./signal-desktop-darwin.nix { } else callPackage ./signal-desktop.nix { }; signal-desktop-beta = (callPackage ./signal-desktop-beta.nix { }).overrideAttrs (old: { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index 97abf0e749..85e9b9c9f6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -273,7 +273,7 @@ stdenv.mkDerivation rec { emily ]; mainProgram = pname; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; } 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 f557734764..26855ca784 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.25.0-beta.2"; + version = "7.30.0-beta.1"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; - hash = "sha256-7L+ldJYJXB9VkC12s8AyUdECVXnyN8PNo7AFIyEHcS8="; + hash = "sha256-p7FhdB/GysBXKjExioe5kP3uutHgcSdFfcwI/l4Kn8E="; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-darwin.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-darwin.nix new file mode 100644 index 0000000000..ff5137debe --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-darwin.nix @@ -0,0 +1,61 @@ +{ + stdenv, + lib, + fetchurl, + _7zz, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "signal-desktop"; + version = "7.29.0"; + + src = fetchurl { + url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg"; + hash = "sha256-R/NYPb7bvLbyDYntw2K75SC1/sqNO7HAJ3QUwGThvUg="; + }; + sourceRoot = "."; + + nativeBuildInputs = [ _7zz ]; + + dontConfigure = true; + dontBuild = true; + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + cp -r Signal.app $out/Applications + + runHook postInstall + ''; + + passthru = { + updateScript.command = [ ./update.sh ]; + }; + + meta = { + description = "Private, simple, and secure messenger"; + longDescription = '' + Signal Desktop is an Electron application that links with your + "Signal Android" or "Signal iOS" app. + ''; + homepage = "https://signal.org/"; + downloadPage = "https://signal.org/download/macos/"; + changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${finalAttrs.version}"; + license = with lib.licenses; [ + agpl3Only + + # Various npm packages + free + + # has non-redistributable Apple emoji packaged, see main derivation + unfree + ]; + maintainers = with lib.maintainers; [ nickhu ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) 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 0cc920d5f4..27a7a01564 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.27.0"; + version = "7.29.0"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-Ff/hRoanAVlaAu5ofZ6oy4ULifk3O0HiQK0Z8Wd1H1g="; + hash = "sha256-TftTt9pN4EjgZs3N94TlCzXK64g1g+oGPx1ZLVX02VA="; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/update.sh b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/update.sh index 37c0f33d12..1c5f2386da 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/update.sh +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/update.sh @@ -26,6 +26,12 @@ signal-desktop) --system aarch64-linux \ --override-filename "$SCRIPT_DIR/signal-desktop-aarch64.nix" \ signal-desktop + + echo "Updating signal-desktop for darwin" + nix-update --version "$latestVersion" \ + --system aarch64-darwin \ + --override-filename "$SCRIPT_DIR/signal-desktop-darwin.nix" \ + signal-desktop ;; signal-desktop-beta) latestTagBeta=$(curl_github https://api.github.com/repos/signalapp/Signal-Desktop/releases | jq -r ".[0].tag_name") diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix index 9359480b0e..c70c18ec51 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -45,14 +45,14 @@ let pname = "slack"; - x86_64-darwin-version = "4.39.95"; - x86_64-darwin-sha256 = "1bvafqnh60ps5dba473l6zpm6hw7qcmpj55mxm6amakvkp63d92s"; + x86_64-darwin-version = "4.40.128"; + x86_64-darwin-sha256 = "0hfgl2pfarnd9gh921rfz9s9kkvyf8fmmhgb6j87jgbwf8rjrjmm"; - x86_64-linux-version = "4.39.95"; - x86_64-linux-sha256 = "06d4mnvk3fj57laygf08nlh970wb4jvq1kycv27h1bq6bq365b6n"; + x86_64-linux-version = "4.40.128"; + x86_64-linux-sha256 = "1p7ybwrsfy5iq5ggpz1p4mx58ilwzsvn7k149i5ifi0zifahwwdg"; - aarch64-darwin-version = "4.39.95"; - aarch64-darwin-sha256 = "0kmbf9nd6ccng8a9qb02i2n2mcrjk45cqphx0k7drwd4nyn6zzmy"; + aarch64-darwin-version = "4.40.128"; + aarch64-darwin-sha256 = "0h6659lny80kxrqaf9qidirkw702wi7hjwwdhk9y0gcy87s9rqwd"; version = { x86_64-darwin = x86_64-darwin-version; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix index c136d121aa..922efe2d7b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch2 , pkg-config , cmake , ninja @@ -42,6 +43,18 @@ stdenv.mkDerivation { fetchSubmodules = true; }; + patches = [ + # Remove usage of AVCodecContext::reordered_opaque + (fetchpatch2 { + name = "webrtc-ffmpeg-7.patch"; + url = "https://webrtc.googlesource.com/src/+/e7d10047096880feb5e9846375f2da54aef91202%5E%21/?format=TEXT"; + decode = "base64 -d"; + stripLen = 1; + extraPrefix = "src/"; + hash = "sha256-EdwHeVko8uDsP5GTw2ryWiQgRVCAdPc1me6hySdiwMU="; + }) + ]; + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace src/modules/desktop_capture/linux/wayland/egl_dmabuf.cc \ --replace '"libEGL.so.1"' '"${libGL}/lib/libEGL.so.1"' \ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 88bd1f97cb..6f62467028 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -63,14 +63,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop"; - version = "5.6.1"; + version = "5.6.3"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-MMXaNJ9uadThBghOObt4KNP73Wd2rCnJJXSHkwEKFxw="; + hash = "sha256-frz425V5eRulNVxCf457TWQAzU/f9/szD/sx3/LYQ2Y="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index 64541fc79e..425b82f15d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, pkg-config, cmake, crc32c, @@ -41,6 +42,18 @@ stdenv.mkDerivation { fetchSubmodules = true; }; + patches = [ + # Remove usage of AVCodecContext::reordered_opaque + (fetchpatch2 { + name = "webrtc-ffmpeg-7.patch"; + url = "https://webrtc.googlesource.com/src/+/e7d10047096880feb5e9846375f2da54aef91202%5E%21/?format=TEXT"; + decode = "base64 -d"; + stripLen = 1; + extraPrefix = "src/"; + hash = "sha256-EdwHeVko8uDsP5GTw2ryWiQgRVCAdPc1me6hySdiwMU="; + }) + ]; + outputs = [ "out" "dev" diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/trillian-im/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/trillian-im/default.nix index 0d4a6299ad..a31adac956 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/trillian-im/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/trillian-im/default.nix @@ -16,7 +16,7 @@ , librsvg , libzip , openssl -, webkitgtk +, webkitgtk_4_0 , libappindicator-gtk3 }: @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { librsvg libzip openssl - webkitgtk + webkitgtk_4_0 libappindicator-gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix index 0925bae8a6..47b1ccfd49 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix @@ -20,7 +20,7 @@ , pcre , pcre2 , pkg-config -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 , xorg }: @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { pcre pcre2 sqlite - webkitgtk + webkitgtk_4_0 xorg.libXdmcp xorg.libXtst ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 22bf7fb11e..1b4ae2a4e7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -6,7 +6,7 @@ , stdenv , lib , udev -, wrapGAppsHook3 +, buildPackages , cpio , xar , libdbusmenu @@ -57,6 +57,7 @@ let homepage = "https://wire.com/"; downloadPage = "https://wire.com/download/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + knownVulnerabilities = [ "CVE-2024-6775" ]; license = licenses.gpl3Plus; maintainers = with maintainers; [ arianvp @@ -97,7 +98,7 @@ let autoPatchelfHook dpkg makeWrapper - wrapGAppsHook3 + (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; }) ]; buildInputs = [ @@ -137,7 +138,7 @@ let ]; preFixup = '' - gappsWrapperArgs+=(--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --ozone-platform=wayland --enable-features=WaylandWindowDecorations}}") + gappsWrapperArgs+=(--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}") ''; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix index 65b5bbd5d6..88a3656011 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix @@ -2,22 +2,16 @@ stdenv.mkDerivation rec { pname = "wee-slack"; - version = "2.10.2"; + version = "2.11.0"; src = fetchFromGitHub { repo = "wee-slack"; owner = "wee-slack"; rev = "v${version}"; - sha256 = "sha256-EtPhaNFYDxxSrSLXHHnY4ARpRycNNxbg5QPKtnPem04="; + sha256 = "sha256-xQO/yi4pJSnO/ldzVQkC7UhAfpy57xzO58NV7KZm4E8="; }; patches = [ - # Fix for https://github.com/wee-slack/wee-slack/issues/930 - (fetchpatch { - url = "https://github.com/wee-slack/wee-slack/commit/e610b39aee2d9a49d080924d47d96c5d140f66ac.patch"; - hash = "sha256-+yBZSx0LsoXmTmdN9d3VV2KNzpXfgfNVp4ZqfS4oKzg="; - }) - (substituteAll { src = ./libpath.patch; env = "${buildEnv { diff --git a/third_party/nixpkgs/pkgs/applications/networking/jmeter/default.nix b/third_party/nixpkgs/pkgs/applications/networking/jmeter/default.nix index ab8589c839..8cb9d830c9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/jmeter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/jmeter/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "jmeter"; version = "5.6.3"; src = fetchurl { - url = "https://archive.apache.org/dist/jmeter/binaries/apache-${pname}-${version}.tgz"; + url = "mirror://apache/jmeter/binaries/apache-${pname}-${version}.tgz"; sha256 = "sha256-9o78F/4GD2mMSKar4lmakzknSGvaKSTb4Ux0iVMY3d4="; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/lls/default.nix b/third_party/nixpkgs/pkgs/applications/networking/lls/default.nix index 3662477fde..91733f7d24 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/lls/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/lls/default.nix @@ -5,21 +5,24 @@ }: rustPlatform.buildRustPackage rec { pname = "lls"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "jcaesar"; repo = "lls"; rev = "v${version}"; - hash = "sha256-FtRPRR+/R3JTEI90mAEHFyhqloAbNEdR3jkquKa9Ahw="; + hash = "sha256-f2f09ptMBZfBY1jjOEc8ElAoEj4LKXXSdXLlYLf8Z3M="; }; - cargoHash = "sha256-yjRbg/GzCs5d3zXL22j5U9c4BlOcRHyggHCovj4fMIs="; + cargoHash = "sha256-LS0azaKBFWW86R4XO5BkCHMEG2UwgkVQIwLELxewiu0="; meta = with lib; { description = "Tool to list listening sockets"; license = licenses.mit; - maintainers = [ maintainers.k900 ]; + maintainers = [ + maintainers.k900 + maintainers.jcaesar + ]; platforms = platforms.linux; homepage = "https://github.com/jcaesar/lls"; mainProgram = "lls"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/astroid/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/astroid/default.nix index a1e6177f72..559c17bd74 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, adwaita-icon-theme, gmime3, webkitgtk, ronn +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, adwaita-icon-theme, gmime3, webkitgtk_4_0, ronn , libsass, notmuch, boost, wrapGAppsHook3, glib-networking, protobuf , gtkmm3, libpeas, gsettings-desktop-schemas, gobject-introspection, python3 @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtkmm3 gmime3 webkitgtk libsass libpeas + gtkmm3 gmime3 webkitgtk_4_0 libsass libpeas python3 notmuch boost gsettings-desktop-schemas adwaita-icon-theme glib-networking protobuf diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/balsa/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/balsa/default.nix index e6453e377d..acec1b5cf0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/balsa/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/balsa/default.nix @@ -18,7 +18,7 @@ , openssl , pkg-config , sqlite -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 }: @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { libsecret openssl sqlite - webkitgtk + webkitgtk_4_0 ]; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix index d0345f9466..523d6971df 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -31,7 +31,7 @@ , enablePluginBsfilter ? true , enablePluginClamd ? true , enablePluginDillo ? true -, enablePluginFancy ? true, webkitgtk +, enablePluginFancy ? true, webkitgtk_4_0 , enablePluginFetchInfo ? true , enablePluginKeywordWarner ? true , enablePluginLibravatar ? enablePluginRavatar @@ -67,7 +67,7 @@ let { flags = [ "dbus" ]; enabled = enableDbus; deps = [ dbus dbus-glib ]; } { flags = [ "dillo-plugin" ]; enabled = enablePluginDillo; } { flags = [ "enchant" ]; enabled = enableEnchant; deps = [ enchant ]; } - { flags = [ "fancy-plugin" ]; enabled = enablePluginFancy; deps = [ webkitgtk ]; } + { flags = [ "fancy-plugin" ]; enabled = enablePluginFancy; deps = [ webkitgtk_4_0 ]; } { flags = [ "fetchinfo-plugin" ]; enabled = enablePluginFetchInfo; } { flags = [ "keyword_warner-plugin" ]; enabled = enablePluginKeywordWarner; } { flags = [ "gnutls" ]; enabled = enableGnuTLS; deps = [ gnutls ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 6db733da41..58506961e8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "128.2.3esr"; + version = "128.3.1esr"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/af/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/af/thunderbird-128.3.1esr.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "11450c70fbb9952707384ef5900ffce76c0ddc079cd02993a37393da3b6f35e1"; + sha256 = "daec0c206763600ea16dc09db4c11ed82132bf6ed4275307f5635677891f3d43"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/ar/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ar/thunderbird-128.3.1esr.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "99b09985161dda620e53c5afe9387357b7e8ef0f46c3af332c15167c9bfa32fc"; + sha256 = "04801b87ddc17b059a61cf4d16e2d7eda45ca96c0de497e93e02b24be8590176"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/ast/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ast/thunderbird-128.3.1esr.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "5cca2e4b9ce3e52625fb9442c15aa5166a836a3625c0bcc9fad0a6a888d564b8"; + sha256 = "046a8218164d1dc3f7e1b7d1f134c9fb94f9fe30702e7f0ce8474145725590c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/be/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/be/thunderbird-128.3.1esr.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "c2cbc174ef0bf8616a09cfe863dcd850722c8f0fb8bb3d071fa7af6da7088fd2"; + sha256 = "2c1bec26b01f2ac25df9537f34582c18677fc93203e94c378323f0ff161ab6bb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/bg/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/bg/thunderbird-128.3.1esr.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "92ac1d843307d3a13da2bd7eaacda090aa3ca9b26e3da33a2d8e4780ccb7affe"; + sha256 = "64a6c820bc35b416aff30822417486104bbde4842efec785db6b2e1f35b66b70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/br/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/br/thunderbird-128.3.1esr.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "c15561c692845ab1d750dfe2fbfa0031d4b713afe5b1359644ececef0def1e3e"; + sha256 = "9074dd4e49c2a73f62cf0454d29e8bdd417dbf129489baca9848912cc60c8fe8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/ca/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ca/thunderbird-128.3.1esr.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "efdfcf6d564b5e82f0b0e8d2bd93ba32258cbc403cefda46036e07bc813630cb"; + sha256 = "ded677ad4962afc9372067f8c87f0d1623275a03cc98b125fd721ef3c3df6028"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/cak/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/cak/thunderbird-128.3.1esr.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "fdbea8ea3eca0ba502c3340f02462ce4f03064498de8c37b86559a5c491a2829"; + sha256 = "7ca0781d25f77cc72dcfc1b8ad88fa222a90c8af2fad1535c30f6e0df04cc2bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/cs/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/cs/thunderbird-128.3.1esr.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "34233723a02da1021520ea9630d8397d29ff135ad0f80e499d6bca3a0b8c34c2"; + sha256 = "e8f6bd963a49342d176c4b45ceb7038c3a18a6002060237cd06c807f27338c29"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/cy/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/cy/thunderbird-128.3.1esr.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "0fa356291b99737024a5aae863c18456ddcbb7300369367ad083aab9a48b2dfa"; + sha256 = "97486ec291bbec41a3813a1e289bd044ea3ccea71a66c9182cf13481bb17765a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/da/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/da/thunderbird-128.3.1esr.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "c7f51211239bcc5265e2ab81d257b8a6ff0811aa5294b7bce68c08f2fa8e3524"; + sha256 = "2f83197baae9097bf2a13f3d781416e32e711de14f2e9e6f3be4ef909975b5c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/de/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/de/thunderbird-128.3.1esr.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "a128e567f8701ae72fd82e329d660603c2c30963b80a88e646e00254312d5141"; + sha256 = "d5164afcd92be1e64887d056b0a97a2c8b8a8e0f8b52d0d71380ab44deb54c16"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/dsb/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/dsb/thunderbird-128.3.1esr.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "869b352a024d9ceec41ba4d4c6d70085e8e9986dc9733da691abdd41e5d57389"; + sha256 = "74552c085365a7a381b634dd2db32620acd3cdb4e3dd8d93d24344c45149d027"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/el/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/el/thunderbird-128.3.1esr.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "623d36518dbc976b50e8a6fc7e14240eff158dde50fafe1ecaead4d6ad5554af"; + sha256 = "abb4db492bf0599dc08a0af742a863729abd45b67134a450faf9bb4dc9fbd048"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/en-CA/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/en-CA/thunderbird-128.3.1esr.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "321b39bc363f058e04742a4bf64e66a3d36abdbf5876ccec21657b69f1abc6a4"; + sha256 = "149e106c120954f9d6c8021a426d487e482deba81aa2916cef9bbfebe100f6a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/en-GB/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/en-GB/thunderbird-128.3.1esr.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "c40566dd51219c4373af3b476b8ec4189c8ca6de34befd84d76dcd9af1badc52"; + sha256 = "553f881b15952c5cc4ee31f7fe6d5425a8aecb2e292968972c6a920f2fea89e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/en-US/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/en-US/thunderbird-128.3.1esr.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "e1886acd969d75f1030f9dc68d3f360548b15e7ff6260182ebeaffcde53d11d2"; + sha256 = "6a4738c5b07b2c6e8668cccf2c3c24f78e2d8ae7a04a1963638e8404d96f12d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/es-AR/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/es-AR/thunderbird-128.3.1esr.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "04f3275d8aa8cf68618e84bbf12df8974e63acd50e799d06032c96931a1f3c8c"; + sha256 = "9b886923b198af374e589666abe029d6cf905f5a0e77acccb35817815a3bf42e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/es-ES/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/es-ES/thunderbird-128.3.1esr.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "a879e7d4a0791ca53bb1904b7a162119ce2271d9d7d33a1fcacf4b92338ec58e"; + sha256 = "6fad8af3dfba46a88889a147931f202bbaecbf44db174e33237974b0e1d461aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/es-MX/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/es-MX/thunderbird-128.3.1esr.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "2367511c520bc2a10e9ca986e56f0fa79d77af710a97367c30a8a963a932d060"; + sha256 = "76dbaa277644f72c11b2826973253daea1cd263265aac3d393303f3d4eca736a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/et/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/et/thunderbird-128.3.1esr.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "256167062672846e90962e3a7a3c60c04c34c18c35c8b3b47b98663922b2421e"; + sha256 = "89a9ce893dd7002dfb6e249309f25f45bc93ee84a7895c7911d41d7934643686"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/eu/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/eu/thunderbird-128.3.1esr.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "4b5928bd99c088366b08c09de01b7d5dc5f1f11deb5ad48db29f0e266f3790e0"; + sha256 = "8743449758bd59afbb83e82bd62ea0f53c2a6c4c61ad095604d5b50a4b7323a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/fi/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/fi/thunderbird-128.3.1esr.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "878cc0b6831e75f80408ab25629b6dc97d993be97f0144b87dee331019119124"; + sha256 = "5a59846d72690a074f4bddafe97d7f088341e8de0c43e958a6d2df7021b016da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/fr/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/fr/thunderbird-128.3.1esr.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "ebf090c97372ace2ab04ce43545b05328ae50b7e7ccfe4f1bae0abc6bf7bf18f"; + sha256 = "6de6c9b793215ab2b1c1ccb93bcb535a99a165085842064dadd0a5b42a57b71a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/fy-NL/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/fy-NL/thunderbird-128.3.1esr.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "945f072fc92cd3db1e2ce9de0fc5c8fc08e13a8764db54f9494a896fd4add7c7"; + sha256 = "ae85b76c1b512ba5d062ea4f157a587056afa859c238b511f8eeb412ae583682"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/ga-IE/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ga-IE/thunderbird-128.3.1esr.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "556a3a879c173038f829c5a94f659b3fe86848465498b6cd287aace380409a7f"; + sha256 = "59168b9e0dec31685222fd9bd8b83d0f230d3308484a4a2ea5416dacd7f49728"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/gd/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/gd/thunderbird-128.3.1esr.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "614ef8d8f5229e7c153fb239e056002bfde8a1920cffc3e317dbafd0b486b8f7"; + sha256 = "4c35f2ea2fb781301d87649111c6d770e94f8487fbe8925f6156cd7227e50961"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/gl/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/gl/thunderbird-128.3.1esr.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "b81c0470717d21cc95412e938c651aceef010bd771a90b6b1b2166c56a064bee"; + sha256 = "da4c2677e61e8759c5f4ff5f51f737201f047b5166636000bf73377a0b39c0eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/he/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/he/thunderbird-128.3.1esr.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "22885a85a65c0be0d292ac9c7275ef07c6c04c79a9d8b383d17e2d23d5f78e8b"; + sha256 = "94085a1d0106c7ce6bad8383fa85e530a79f8a38157ad94e5352f45847c7ba31"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/hr/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/hr/thunderbird-128.3.1esr.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "a8f2235ac630a23d1e00d670caaa9ccb0f939d97171449554fe59be6c9051510"; + sha256 = "49a4dd6bc68b28a96fc59235fa16db4903561eea11a836e62e55f284a1526a23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/hsb/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/hsb/thunderbird-128.3.1esr.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "341f8c2753ff38c0e9d61a634ef448a1f2c91cdba9a7d7c494748ec6918da6d2"; + sha256 = "e9e4ca0683a0eeecdacc7d92d8a59fea75459f7cfbdfe2f4406fed041429f041"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/hu/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/hu/thunderbird-128.3.1esr.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "b3ae6f2fc7cce5cb2bb2634e261c0b73f218bb50ca0b81d8afe588b83a0e601d"; + sha256 = "379bfeb3e5554643b009d7f62074ccf6e95a6c46807f938e73054625b752f77c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/hy-AM/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/hy-AM/thunderbird-128.3.1esr.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "23c25370fa8c9822fd4f34bced4df5f889375d487709698e7a81154152b54583"; + sha256 = "37ada95839dacc8907a2dc89bdc424d7dc73aa18f9ecf6c69afd8807e4470d4e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/id/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/id/thunderbird-128.3.1esr.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "989719255963ca2d3550022c43c724368a7c48e484b4557c300311237902eea2"; + sha256 = "204f8b79def7de4a490487588c2e9558259d88ae92a96754579b183639c64e8d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/is/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/is/thunderbird-128.3.1esr.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "afae9e8d124da04903874a35879b20bb45e9f03c0aeba78108e3765bb0803b63"; + sha256 = "17ee110e6e07d69f63b64d38ead0691a6ca521428c3716230f8a0aca6e23c800"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/it/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/it/thunderbird-128.3.1esr.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "f55d86350731c4b89eafde39d7badd228c22ae7d250d51f1f922632b27d9c66c"; + sha256 = "d17a2eb22847628217e7a918c33de0ab20db2576a28ebe177f37fbd9d84bbb9b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/ja/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ja/thunderbird-128.3.1esr.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "54315aaeb33ff3b1b795545e5c7cdabb32a3fb6b36a0b0175cf7e770fece96a6"; + sha256 = "07f36b8b7458d725c8df846f1fce58e7ed2569b4324e4b7cfa1750fbd21b0088"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/ka/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ka/thunderbird-128.3.1esr.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "881373f2c3903b72b3f626a7ae245921f235e00b23943b9379e589e6c01b178c"; + sha256 = "d6675e3d23156b74f38b3805d3fca6fad8df6a1ec6adb311c1c783d928772531"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/kab/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/kab/thunderbird-128.3.1esr.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "2f01762ab42c86c65d0a88034c6f931fa599411a3cc705772a9bedef139191f4"; + sha256 = "a4cc73ef677a343d49b61009de05bffacad1c8cbf368d8ac79e87fe12a24f1c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/kk/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/kk/thunderbird-128.3.1esr.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "60202a6ae70d4c83b65c46803d0cd7cb2fe1b4524be63544c18a83f980cf470a"; + sha256 = "4d3d0010e55a9665a6f330e73acc8a9d924587d216c3ec2558e24ba83789194d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/ko/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ko/thunderbird-128.3.1esr.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "69e259e3737e4f759be6cc069acaa58c5a36e20eefb6712c4c75936e7b6aa509"; + sha256 = "55ed9d48ec45a9cd04705a8be89701262c7cf2aa16f545f08b361d89d30bd160"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/lt/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/lt/thunderbird-128.3.1esr.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "74e750b692f59232f96094af91bf9053df8a680774e20dad34c6436dee10f9e9"; + sha256 = "4f84a793e672bdfca124eaf1f64c2753a2a424d2c689403ea8f06ab18d2c0922"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/lv/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/lv/thunderbird-128.3.1esr.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "3e2fbc8693718ce8c4cab0bb1b8ec973d84a95342a6a7783cf5518a5fb3cf459"; + sha256 = "28e40e746c71f4d391a3fa4c640e0c248698fba1bcc4f3fa245d98774da0b393"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/ms/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ms/thunderbird-128.3.1esr.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "b98245ec7b41493883fd06af08f94d350b22e61e36ad3f289af2239cba5e84d8"; + sha256 = "fb3c86acd2353143535397dd0dc0c478ab1a77ca13a7b44f2d726bfdbacbafae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/nb-NO/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/nb-NO/thunderbird-128.3.1esr.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "e40f4b73190e85cd2c60c9a87336669e3a36d599642ab4415097fd4485287ede"; + sha256 = "9ed19c21dcc40642559eed238d40d39b19f6582060f92814279e111e481f72d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/nl/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/nl/thunderbird-128.3.1esr.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "c76ae2e8e46d062964c913d57742a1195768af6eb273e01b5488f692dc40a7a8"; + sha256 = "6ced73e12b0c29295e00f32c72d86389c586c0442cda1592a74285b2509a0a55"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/nn-NO/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/nn-NO/thunderbird-128.3.1esr.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "b1c25025a407d698a45e6e0077a74aba3fb80389ec9fc7cefb2f847adcec7c40"; + sha256 = "1b2601fd6f4ba3c5442a9108d3647be6ddfa63afb582ea12a949fc082e7ab925"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/pa-IN/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/pa-IN/thunderbird-128.3.1esr.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "4c8ddacd077e71f005e02c2c4c1553c6d83a96b4df1b15705dd75a302d7f6cee"; + sha256 = "6489cbfa303b20bd0cf44592ef4ad2594447c440694077c8987d48049aee7235"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/pl/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/pl/thunderbird-128.3.1esr.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "4f8acd938e09f5fbe1a61d22ea93935e44a94ce00b416da48e8e74cbfcd8b2e6"; + sha256 = "db7dc4b36b5a76e9e7fbd703d02e3d6cb3fb48d2263144bb75418e59c9038f91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/pt-BR/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/pt-BR/thunderbird-128.3.1esr.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "1cb2d1eb626c9784555f3dce178b4b4e119213af1c9181b829442b9fb935f0ef"; + sha256 = "378bcb5617eccb26bc86d6357b35edb343b2f339ee4e35d114aafb788bf35261"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/pt-PT/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/pt-PT/thunderbird-128.3.1esr.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "d44ed828ddf0b6ea644470dd90e332be92893d6a37abd5cdba0bec4bdafcfef9"; + sha256 = "f33c33c70d8271061bbbafbccc325206c9b37f56637907a87e4d11aefc4675bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/rm/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/rm/thunderbird-128.3.1esr.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "77d56c77323ed0cf994f79bd9a81aa516b183542794a3ca5e4fb15f11595fa37"; + sha256 = "40e60095cc4f7e10b052b15a80b1e58228c94b6c77cf5f90b5fcc8cadf094472"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/ro/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ro/thunderbird-128.3.1esr.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "8080b95078f732104df47d426cd353468fa743dc98682dfd83d72091a6701d12"; + sha256 = "4b3d0eb8cfe07e345c2effe075b391ce82d75db4ed3c5015e25762a1919abe0d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/ru/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ru/thunderbird-128.3.1esr.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "2ddd6a04de6b15e439c43435772c09823e7814561d9228db63b17fcd6c00a6c1"; + sha256 = "76ab341bfb48acadd8ba0211be37e37912f002e5f814e60cb0c92182c6ffe5c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/sk/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/sk/thunderbird-128.3.1esr.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "ed9f68ac0accc5ae9a4e86fc723a2d4128255ffd48264e0290a63792b5171c8a"; + sha256 = "9af224be897872875d06abefb82f7d0b6230b3d10bb4ce7c33accab3a1303b7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/sl/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/sl/thunderbird-128.3.1esr.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "d85ef11dc6f123696a0d9b021ebc1b78b606e9cc372b92ecdbf227d3fd275c3b"; + sha256 = "c66eb160c777449c032212972200997cf3303d916f50019db88a4ab21d737126"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/sq/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/sq/thunderbird-128.3.1esr.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "59bb9dcb795ce15413c836ec671ba0760eba831741ecd94d181199171d26d3b3"; + sha256 = "dfb18940364e6686a2ae369fb6f5b410e978c42efc7e506288603d0c76ce22c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/sr/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/sr/thunderbird-128.3.1esr.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "257e912ea0396a95681fc72a4f8db2248250defbb0a146c8618a067e582f14c6"; + sha256 = "0b1c98eb37db5c6ff1d216a598e352d1a77ec3a94bab7fa49790ba275714c188"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/sv-SE/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/sv-SE/thunderbird-128.3.1esr.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "4d1fb17a41af616be0e357e4accb2757adfc6d81ca586136f93dc44144b30c4b"; + sha256 = "a2916749179de24c63b8f393d19a3ba4ec5f6e77584f44ac5ebc24a4b0c94ca1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/th/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/th/thunderbird-128.3.1esr.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "e52c7d23fa7c8ab9e1868eda178ae82ab0d9c86f3a8bb1b112817692e05fcc24"; + sha256 = "bb25041295fac38b2888e95c40835ca289f10be95d71ab32fedb7d0dcaee1c04"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/tr/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/tr/thunderbird-128.3.1esr.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "ffa0651c001df67568e7e87b5755943894a9f55f4a8f67d7e10d08dd49a635a6"; + sha256 = "4a512e2bdf3ccadade3166a8acf62935244fc63b760db6e7c35a74299e49144b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/uk/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/uk/thunderbird-128.3.1esr.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "b208ef12f677ad325d460b9a67d68e9b78a0ba4b7cd9c4eff6b2a25ba0e1f051"; + sha256 = "9094442afcaabeab3424972cfede908526c7d3ddd600adcae6c345450fb42be9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/uz/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/uz/thunderbird-128.3.1esr.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "7a11f1ae369d4dc1805d9221184718011533b8a657ebbc7205a60526ce1d7b97"; + sha256 = "d4969535da853732d20475bfca72d871c76f39131cdac0d00607e0bc5ccabf5c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/vi/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/vi/thunderbird-128.3.1esr.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "057b2458a6b6759833c86f5e7019b3495a70e2656ad7089f1491c0dfda28e689"; + sha256 = "95bc29e5c14fadafaf5598687f4242ec80cccbd5724988fe471282ea65473e18"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/zh-CN/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/zh-CN/thunderbird-128.3.1esr.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "74d44042e2ac9e95336f1d13930424dc420f5bcef9f0308e2f19a6fc34c97dda"; + sha256 = "bc578ed3316fa130328219d7ae34c40250b57ad47394c4e2113d2d53031c3879"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/zh-TW/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/zh-TW/thunderbird-128.3.1esr.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "5ccf633ad828fffc3c9e352c78d245df61f2c56eea49e8bda021645d1425e85a"; + sha256 = "2ec4a508e96715026c4c4541d83e5f14b67c88c9e31e22bfb4ff6280eacbc1c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/af/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/af/thunderbird-128.3.1esr.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "997ac3091e641305cf282723590d48204fd542376d0227ce98cd9a7bf24230c0"; + sha256 = "75b27678d06857225ad241c90101d39b1e3e42c8a1f1e17f817bc13287bf185c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/ar/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ar/thunderbird-128.3.1esr.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "f5f0564d607ff19d51508dd17f908e38d8d4f53bb4241b4e828a5bba2c1b8eee"; + sha256 = "e2bf282b127efea3c1deeb9a375b42b4425ba30bcd730eb911dda3cd93034a77"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/ast/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ast/thunderbird-128.3.1esr.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "2e585288ae394f9f32038ae75ae47398857c21c88af68cac8d3c7801f2b6b55b"; + sha256 = "035213d412786ec052430d4860278fc5c0ffe4b999a5924f3bf1a13683e73d3d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/be/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/be/thunderbird-128.3.1esr.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "0379fbb7416bb4c92ba77403f5769cc810387c3b5f9518b1061ed2f2e3f179a1"; + sha256 = "8d0aab6ed5c1cb36cc70939545ec0eee2566483bbe89a1b319c63718201ea01f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/bg/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/bg/thunderbird-128.3.1esr.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "1a07ca44cd3071c4adc640a53ff2f0e9b66b8b4a2855b8ba1a491e98d14ec3e0"; + sha256 = "f22334ee6b9f47bb6de1623d457aa3a50932dc1f0e047037b07a86793134eca8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/br/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/br/thunderbird-128.3.1esr.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "cd47f44426a82afd286064963782403eaaccabf40fc43335761770c7595c6776"; + sha256 = "0c2e506a17eb9d3d23fc366212644b3e3f78be621adbe2410a1ef8ab0803d86e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/ca/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ca/thunderbird-128.3.1esr.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "51009f72230f084d005fe9424d5e4f161a1428e650e7b9cd396132a64352ecfd"; + sha256 = "0fc351e87d10b1f33391990716581b4417f1f9759351732ca765e29e9c077c74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/cak/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/cak/thunderbird-128.3.1esr.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "27d392a801b4727cc002685248f2b9abdd6a7987fedb88e1f6dd5a237f3a2f0b"; + sha256 = "653eedb42f9327be63d4ccde4e9a15e431235130d70c5e1e4b90ad1766fabd65"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/cs/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/cs/thunderbird-128.3.1esr.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "1de78102a09e564cae08bcf4228aa06ee191abe89975e0e5936cdd98b82d6919"; + sha256 = "afab7db6f33f730ad5dcbad73c68aa679eeac995a8f87cd3dd69ffeb9cc05507"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/cy/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/cy/thunderbird-128.3.1esr.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "fdc84d26c11acbd6d92d3ac2104e15317eb82fdec3c3d0fa8a5c31ce023ad039"; + sha256 = "d4efd6a9bde2a8177c2322ed797c73a347913c7c34eefad3c8059efa3b291e87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/da/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/da/thunderbird-128.3.1esr.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "eb0a2cd1d6113d8e0bfa2233adf3b00dfa950ebf2fc3319fe1b6afa75a616c98"; + sha256 = "ed872e714c0ee80a9ae40ca91ef2675aeac20125ae53245b41003614c8ba2a9e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/de/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/de/thunderbird-128.3.1esr.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "4953cae2c051b63f360964c8efbe7ab4f682e06e4058382b959b6ce843418c96"; + sha256 = "3feabd14c409d43f07973ae4054ce5a3c13ce1b1023bfe9c9614bad39a36f432"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/dsb/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/dsb/thunderbird-128.3.1esr.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "88381b5b23427bce3b53893aef9d334b54101cd30b2af501cc87fcb319f43c3b"; + sha256 = "0f9f5e55650af7cb264b300286f426d730a9f6594a1e6a5d9f1305dfa067c767"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/el/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/el/thunderbird-128.3.1esr.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "8b5d6484cc05473b039dd74edbc30184e9ab83e40f2ed3193638dde0da7f2eca"; + sha256 = "7f399e76ed236a3067f0e179c1d902561770234a20cfbb78345b4156549a1eab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/en-CA/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/en-CA/thunderbird-128.3.1esr.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "b5c9adc111b62a9ba3d4b06c9d79953edd00a25df424ebc6ee8f9263923e6333"; + sha256 = "0bc5ef5a3e472463ebf823b16efb36cff728c432829ec73fea7f9bed1c6fcd81"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/en-GB/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/en-GB/thunderbird-128.3.1esr.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "4cc02fc3f7417620256357927e9fb199ffd081996b2d08a149ebe57f4156d932"; + sha256 = "22d878733613360bae796d07249fa6be2ecfb12680c7102dc7d6d3a2fb947a89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/en-US/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/en-US/thunderbird-128.3.1esr.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "ade6909367c4311c478d50a16fffdf2aadab51dbe59a5a7df0203adbc93d4846"; + sha256 = "0c0a466b278372a784b551922c4c47ca1af8161ee024d17588524d92e4364dbe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/es-AR/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/es-AR/thunderbird-128.3.1esr.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "461c5f11d7ae6145bb7e9779cd44c8c7107d779d30d3a20621d046b2ba092fd9"; + sha256 = "c60187c27a612747e8cd05ec3d6ad704da2c9fbf48ea4d9bf1a70be778047b43"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/es-ES/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/es-ES/thunderbird-128.3.1esr.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "09bc297bcb61f8fb4216147fc360ee3071349f213f642edd5ccbab3d86ff2cb1"; + sha256 = "a06dd9c977dbef9679b02a9a36ad75b0929791d7dcbd5a5c05912d338201e8df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/es-MX/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/es-MX/thunderbird-128.3.1esr.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "bb4332ab92aefd60e3ccad37049e1a908449c7d9809cc67343149634fa451a66"; + sha256 = "a776bfe85b70468620ad977659908d61e79925fb8bfd36a4ace30dc06ebffcdf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/et/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/et/thunderbird-128.3.1esr.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "b567ac1b9703db4c4b56b4c05d587a5c7d298f8b76858f26b2ca528a375d805b"; + sha256 = "c1e860a0361fdaac8811f25eb2aeaba7973ebbbdcbf769fc42791c7638aa4fae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/eu/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/eu/thunderbird-128.3.1esr.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "2d8f103540ca51ea231de0f6885b8b717eb4055016cd54d7b10849f52db3723c"; + sha256 = "88383b1d46ae04586637692c6dcd3a59795519a64db0feb830bdef66b55f8f76"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/fi/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/fi/thunderbird-128.3.1esr.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "7b170156acbf6a4fb315e78ad08c173d7ddcf00714ce7b40e64f9198297ed715"; + sha256 = "fa11ef201144fd9f51fa36c8d7cdf3106f445bfdeed203db7f2fe50ad315527a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/fr/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/fr/thunderbird-128.3.1esr.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "43972b7689800f1c2e69edca8a907d179c99ac8778931be912daefeb331a36bb"; + sha256 = "5427eb293b84db327fd6002dc84f39531c5a34aff7fe3b01e591a4ff5e243b07"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/fy-NL/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/fy-NL/thunderbird-128.3.1esr.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "5f2296663581feee2c24906bd479681fe4380c725bbdff9f299c4217b2f744ae"; + sha256 = "6a6a3e6d7f2a26f1cc70e6d26741e882e12344836b83735fe0cc15c560b3f554"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/ga-IE/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ga-IE/thunderbird-128.3.1esr.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "c478695ffca7d13bbdd415259304f3e2c4adc52cdc16d27fb3130c6332f9360b"; + sha256 = "ff9f0296f2694213d58c330e68b56aa657392bfcccd765ac0bf2847155ed014d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/gd/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/gd/thunderbird-128.3.1esr.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "eac3e5806ef6c62a45a0fe6e7fd3ef2d6bafc7665d70501536fa4cd0c1b745b7"; + sha256 = "79a080ab46a998ae7584ba26afae53418764b206e44993bb56bed846a6317be2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/gl/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/gl/thunderbird-128.3.1esr.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "204f8cf41b39d991634bb79bcb0260b2f403ea93522a1fa907ad3311a5bb96c1"; + sha256 = "19187ae587048da83c6a0a99e8f72fddf0cdc92c4481d40c534a0664a65d920a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/he/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/he/thunderbird-128.3.1esr.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "f2df6508f6e9caa6647cd4b6eaadde869ee4001afa438d596932c2bd49d927d8"; + sha256 = "e37fd7a629ba735e5916f61a6d46ca71e5698a6d16b73442ed74534f87703ecf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/hr/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/hr/thunderbird-128.3.1esr.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "1c632e191f37f8e63692d4f4b8dbdf831148f8ef29ba44fde7b2cfd52e6d9cf0"; + sha256 = "86c8c6f34e76873060b34b33a235b5696191f3d58042be62f5de59cbb82261e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/hsb/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/hsb/thunderbird-128.3.1esr.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "c3f3acb8c5e45a2ccf97d25eee4c3c0e9af00785e55d8d8a5ada3edb2761cefa"; + sha256 = "80489dfdf52594c34798629d7fef66e67a8b5aaac3c6275e25c092ed0de015bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/hu/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/hu/thunderbird-128.3.1esr.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "10bcb2f4d27a065d72d6d6a4b88dfc826f974faf5b2b1bcffb8e723c0d0d29ac"; + sha256 = "2277897b93514a1995886d637b668a469ffed943c05e91f7e209fab23ee1232a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/hy-AM/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/hy-AM/thunderbird-128.3.1esr.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "267a887612e3fa82ed92ca98b97976fe3baf0ede1fc47ad30d8c4939c4d54a33"; + sha256 = "b321af1421b2649d5ddc42a23e31ea76068062cf8a956495969835dd0e0fe7a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/id/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/id/thunderbird-128.3.1esr.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "a7ecdfcd9bfcfc17c2a32c697ec0afb0370e8f5ca066e2224ebc540d8bc61f0f"; + sha256 = "4c38b3f5afb7b65a8a8089c2d258016dc4c8e60154499bb4ea2c110a29a7f7bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/is/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/is/thunderbird-128.3.1esr.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "64d6dbbec1d876b614ca601a58faa4baca7680a4045a9c54b4331b5bd104b86a"; + sha256 = "d7c2925526dac179bf7c857b9044058818c5a49aeacca405fe120e01a0fdc28d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/it/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/it/thunderbird-128.3.1esr.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "106a92c15da3e96903b511ee7759e764b3378713b54f13437713b9c02982798a"; + sha256 = "4c637d4998c5d8db04a7356401eb64cd362476f91ff037979b94487548e9f0d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/ja/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ja/thunderbird-128.3.1esr.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "a65e9f47fd722de2281d151c95ede105cb912c8b62d3348fab904a4fdcb6579a"; + sha256 = "4591a2d3b55f402fe47b2f7342f34fcc0e5ad6f5147f72929bef8fd59598cef1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/ka/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ka/thunderbird-128.3.1esr.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "af553455b4ab549cba61e23baab72524716bd166baf8de9a0e6bb01697acceba"; + sha256 = "032fbf3360e7facac683e28a205b53e9a1db756c8bd41330a15f7120ed645b1a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/kab/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/kab/thunderbird-128.3.1esr.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "4efed1d221fcedb3151f686d4b19cb5cb18e5d90e0ff23506bcb98144724c185"; + sha256 = "5fec42cf09826f24ffeb20a3c7f0c200a1b257e4af4a8d223c4b7f98fb35eec2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/kk/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/kk/thunderbird-128.3.1esr.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "b02d3630206093a381dc252b8839c6d5e0e11ba36e0beb34f0e764f41d51faca"; + sha256 = "200e305315c566f34d2242fd37bee6f2726d8b6bacb37c74b0e5597e9296df60"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/ko/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ko/thunderbird-128.3.1esr.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "c87297bec4f3865ef06aa313bfc8fe2f7d12d7a44bc4d83f47769f65b629b2f7"; + sha256 = "06f60ced2c75f13ffae69cf2355089c2b343e72b9e61cd97edf01f401c11fb77"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/lt/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/lt/thunderbird-128.3.1esr.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "a7c131b03b732030a2c887bcd9931b92aacc8e620d46bae6d4e30a54f76523ec"; + sha256 = "5d3074b599a9c61357b872f041dbedba6f8667f92a833e6889e16bf2a0ba31fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/lv/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/lv/thunderbird-128.3.1esr.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "7641f0b0168b66a18ebda4598d6b039cff57cbea38fe25e467b35cdc28040476"; + sha256 = "dbffd3f40caa2b2a7f2201f645e27ee5060a124c304079f99055a0ba6bad513c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/ms/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ms/thunderbird-128.3.1esr.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "ffd61330b4945c626093ae1a20b3a7ace51e4d93e32346da53cd27b0df9d1da5"; + sha256 = "2fe336e4ab817e8100ba448a4888cd0bf66728e2779f8179ecfea55bc255e20c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/nb-NO/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/nb-NO/thunderbird-128.3.1esr.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "4927bd51e18922d4f6b3ec2d6134d33943f5daa61ae0a80529a3aea3345bade6"; + sha256 = "c3096875a2400685f1c4333531eeb3594f598b774f138e746c909976b16b895e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/nl/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/nl/thunderbird-128.3.1esr.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "b3010b541469aae57a0909d6f72c0f76482782d85cceef4e1dc970d36e53ae3a"; + sha256 = "3302794bdc4ba877d01b0ba80fca2661098e707f2abb0304bd2c29fc6cb3cc4b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/nn-NO/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/nn-NO/thunderbird-128.3.1esr.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "60c0c4cdd0f0b7a2f892206c1e7adcaa4e32e8cf2b29d55a2dfce0881e66096f"; + sha256 = "770457094739c924397e643ed303f57a57b9491229abab8d98699a0507d9db1d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/pa-IN/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/pa-IN/thunderbird-128.3.1esr.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "a59494d8eb43583d5e70a2c0c92aa9373edab5903435e337383c93aae848ff60"; + sha256 = "8be61392ae2faeba72ae3eaf698339357a1e5112be77fafc5f104bfde3a5155b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/pl/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/pl/thunderbird-128.3.1esr.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "73fc938c2eb420aef5fbc023dd8d1834cf08325a18d23515155cb311198239ff"; + sha256 = "0e0c57066ef2851b6729ba1c6aa192b2b7693cc5e367e4016b458cb45871030a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/pt-BR/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/pt-BR/thunderbird-128.3.1esr.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "fa203684e790a9529f34398763fe2410a6bf8d56b887fb9c1dca91fdca624c7d"; + sha256 = "89db9f5388ab006923def3d3818e61c0d0417e26f3c3a7049da453ae82e215b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/pt-PT/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/pt-PT/thunderbird-128.3.1esr.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "63b53d16d3a1ddd88455a2eae7fe185d7abde743f284ac634d3e63bdb38d88b8"; + sha256 = "678301cd525223c99b5b6f129fddba153bd9766478a8733ebe69ae0eaae40880"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/rm/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/rm/thunderbird-128.3.1esr.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "5cd0a65ea1e41e6d1a9c833edf75c5a67ce77ec9bb85107d1ba282f2abe91fde"; + sha256 = "3e6f814093d3dcd8df427574bb10c56ea6bd917c1dc532d8334b8880b7e91b90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/ro/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ro/thunderbird-128.3.1esr.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "a000256b2ae3a67ccf6f805fbb6c122fd624448021312a7311773a59f412c5ae"; + sha256 = "39c23d82b6dacff632753ba2ba9f0a194c2891cfcc1e67efbbde1f8421085ac0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/ru/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ru/thunderbird-128.3.1esr.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "531a05a5e7b5e4c1de4968a5b3e29aa28e7cb36358d8ffb2dd39f0e1a47738ab"; + sha256 = "c9d051f3faec44babcd36e6fb6c9619142dee3d775185ea86305392f88d45aeb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/sk/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/sk/thunderbird-128.3.1esr.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "178ff0a5f05544cf8b2275bc96328055dab6250fb6b4292a51a8295981340d05"; + sha256 = "509b5a60e239d4a8cf9a6f91ef4267de44ccc21f9314b232170093fa450af44b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/sl/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/sl/thunderbird-128.3.1esr.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "5750677fa4c9fa04d9c91a93962eb5ee701deab20889adb3bf7c913832358d87"; + sha256 = "aa5b49aaa7fa64f9e9ea9a01d75da4f5c89c65449d56861b48083ca00a0822cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/sq/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/sq/thunderbird-128.3.1esr.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "1d64734c7b31fd002978dfb08cb058310638bddbe55bab225bd9e2015e7b7f86"; + sha256 = "3ffca31bd4bf981110a55eef165d789e253eec7c206b08c880fc3a0b92da58fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/sr/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/sr/thunderbird-128.3.1esr.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "ce5dae0a9ba5be012eb5e44ce06a7b4c18f4b137caca1b19dbc4bdad32d777a9"; + sha256 = "0e25ba5b8ba286e81bfeb481f354b69bd56fc727340ce6fde36124a7ce9d330c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/sv-SE/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/sv-SE/thunderbird-128.3.1esr.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "418e5fbbd04816de06031f56fe73033dbc72df70de688f80604fc5a16275c304"; + sha256 = "ab8be644fc47332387f67b3bbe7ad5920bd908e99bf029b85c896a44d3fe8a80"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/th/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/th/thunderbird-128.3.1esr.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "4ca1e251bb36653242a8061491304f345f016c2582a68726869453ce2047df8c"; + sha256 = "6965ca5780abcd2e8e69244e883d171ce541a4d2075a99ae6c0682f4b76c081a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/tr/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/tr/thunderbird-128.3.1esr.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "2934a095eddd73b84a3fe2fba2d8273e36c1b853cf8f00951fb58ab96ef142f5"; + sha256 = "e3fcb1b58165e4a7f3553ecf5e9c2759fb831fe25c504365ff0bcd2f0756a186"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/uk/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/uk/thunderbird-128.3.1esr.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "ff82f18e9ba352df0d395534f306fc78b696341f193619c5e3de03dba8dde09a"; + sha256 = "89e8999739ac1c9979c702e946130d7bd2f0d9ad209a926ee205425d54bfcf40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/uz/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/uz/thunderbird-128.3.1esr.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "679ecaa3f670e49cc741ce113280db9d55d9bbf3798337f9959e1e2e0f6ccf06"; + sha256 = "71e9b2d9ca7dcfc1b71524e1dc0fbd17f078e690838eee5e711b753bbccc4b45"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/vi/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/vi/thunderbird-128.3.1esr.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "753006173e67f07c87066915be9312826547fb7ee500a1aafffc1d56ba56c34c"; + sha256 = "13d3365e9643664cbf5006fbf0de101950ca1874283c49792d1ccff437a45158"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/zh-CN/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/zh-CN/thunderbird-128.3.1esr.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "0eb18aba4976e0b17de9584773e4bb66883c1624423fec104e8b893132f24bac"; + sha256 = "a283f7503a4b0af6349dd87c6be3aa9f4e8227ae98754515b635d602c756569c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/zh-TW/thunderbird-128.2.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/zh-TW/thunderbird-128.3.1esr.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "e28e778c121abc8259445bbee5e5bd0b787f21faac556b7c77452096d60fb219"; + sha256 = "ba88abbc91d4e55687eed8fe41aa0e52622b688752341430f7b32d134a750d09"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 41c7c27a1b..09783123a3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -56,18 +56,19 @@ in rec { thunderbird = thunderbird-128; thunderbird-115 = common { - version = "115.15.0"; - sha512 = "b161b99e09b6d1ba833f77264e35034ad199438b4fc88d244a6b68c84693fa2e90fbab60dafb827a2e23b37c484f9843a58751d93826ba7cdd0391114d253de2"; + version = "115.16.0esr"; + sha512 = "1c70050a773c92593dca2a34b25e9e6edcef6fbb9b081024e4dba024450219e06aace52d9fb90ccc2e8069b7bba0396258c86cc19848a7ac705b42641f6e36a5"; updateScript = callPackage ./update.nix { attrPath = "thunderbirdPackages.thunderbird-115"; versionPrefix = "115"; + versionSuffix = "esr"; }; }; thunderbird-128 = common { - version = "128.2.3esr"; - sha512 = "f852d1fe6b8d41aa2f0fbc0fceae93cccf1e5f88d9c0447f504de775283289b82b246b79a01e8eb26e9c87197fb33138fb18c75ecc3f5f1bcfefa3920a7c7512"; + version = "128.3.1esr"; + sha512 = "9fef04a0c498eb16688c141cb7d45e803ecc75ea6fc6117ff8ad1e6b049716f49b435f3e5a1baa703fa937e25483137e22256e58572eeacf317de264b961ba6a"; updateScript = callPackage ./update.nix { attrPath = "thunderbirdPackages.thunderbird-128"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix index 9713389954..e117549d57 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -8,8 +8,8 @@ , libxml2 , libxslt , sqlite -, libsoup -, webkitgtk +, libsoup_3 +, webkitgtk_4_1 , json-glib , gst_all_1 , libnotify @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 - webkitgtk + webkitgtk_4_1 libxml2 libxslt sqlite - libsoup + libsoup_3 libpeas gsettings-desktop-schemas json-glib diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index 2d8cf8780f..d61ee7bb15 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "6.9.8"; + version = "6.13.3"; pname = "frostwire"; src = fetchurl { - url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz"; - sha256 = "sha256-gslNdvxA4rGKg0bjf2KWw7w9NMp3zqrii144AfKsV4s="; + url = "https://github.com/frostwire/frostwire/releases/download/frostwire-desktop-${version}-build-322/frostwire-${version}.amd64.tar.gz"; + hash = "sha256-wRT8Oo+niOFBpEnq3pgjO9jpagZMgSE44V9RBYnGwig="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix index e542dabc6d..e6cd3a31ad 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -93,5 +93,8 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ Anton-Latukha kashw2 ]; + mainProgram = + "qbittorrent" + + lib.optionalString (!guiSupport) "-nox"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix b/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix index 16c2bcf66c..336afd89ce 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protonmail-bridge"; - version = "3.13.0"; + version = "3.14.0"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; rev = "v${version}"; - hash = "sha256-rwESt2s/TCAFNkf+JwMa7sfYpRvMT8FoIii4EzR/Z6U="; + hash = "sha256-Pup+A637FvsX4dV0G7K/LMB4HCruh5BT1iu4tIXRI7I="; }; - vendorHash = "sha256-jmXh53KwzPvmu7RP1F1Ein9/EfJ5m/GGVAqjJVcEVsE="; + vendorHash = "sha256-I/OFpEa3aB+qDBS/sbX5WOgrlSyR7aZaQYrsaSVNAAk="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/legacy.nix b/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/legacy.nix deleted file mode 100644 index 19a2fe7288..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/legacy.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ - lib, - buildPythonApplication, - fetchFromGitHub, - setuptools, - wrapGAppsHook3, - gdk-pixbuf, - glib-networking, - gobject-introspection, - imagemagick, - librsvg, - pango, - python3, - webkitgtk, - # Python libs - protonvpn-nm-lib, - psutil, - # Optionals - withIndicator ? true, - libappindicator-gtk3, -}: - -buildPythonApplication rec { - pname = "protonvpn-gui"; - version = "1.12.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "linux-app"; - rev = "refs/tags/${version}"; - sha256 = "sha256-MPS4d/yNkccsc/j85h7/4k4xL8uSCvhj/9JWPa7ezLY="; - }; - - nativeBuildInputs = [ - gdk-pixbuf - gobject-introspection - imagemagick - setuptools - wrapGAppsHook3 - ]; - - propagatedBuildInputs = [ - glib-networking # needed for the login captcha - protonvpn-nm-lib - psutil - ]; - - buildInputs = [ - librsvg - pango - webkitgtk - ] ++ lib.optionals withIndicator [ libappindicator-gtk3 ]; - - postInstall = '' - # Setting icons - for size in 16 32 48 64 72 96 128 192 512 1024; do - mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - convert -resize $size'x'$size \ - protonvpn_gui/assets/icons/protonvpn-logo.png \ - $out/share/icons/hicolor/$size'x'$size/apps/protonvpn.png - done - - install -Dm644 protonvpn.desktop -t $out/share/applications/ - chmod 644 $out/${python3.sitePackages}/protonvpn_gui/assets/icons/plus-server.png - substituteInPlace $out/share/applications/protonvpn.desktop \ - --replace 'protonvpn-logo' protonvpn - ''; - - # Project has a dummy test - doCheck = false; - - meta = with lib; { - description = "Official ProtonVPN Linux app"; - homepage = "https://github.com/ProtonVPN/linux-app"; - maintainers = [ ]; - license = licenses.gpl3Plus; - mainProgram = "protonvpn"; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/qv2ray/default.nix b/third_party/nixpkgs/pkgs/applications/networking/qv2ray/default.nix index 1105933a9a..bf3dd2bd23 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/qv2ray/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/qv2ray/default.nix @@ -6,7 +6,7 @@ , qttools , cmake , grpc -, protobuf +, protobuf_21 , openssl , pkg-config , c-ares @@ -57,7 +57,7 @@ mkDerivation rec { libGL zlib grpc - protobuf + protobuf_21 openssl c-ares ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix index b59a82f720..dd4a8113cc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -1,5 +1,5 @@ { lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook3, which, more -, file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, webkitgtk, gtk2-x11, gtk3 +, file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, webkitgtk_4_0, gtk2-x11, gtk3 , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 , gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 , libjpeg, libredirect, tzdata, cacert, systemd, libcxx, symlinkJoin @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { gdk-pixbuf gnome2.gtkglext glib-networking - webkitgtk + webkitgtk_4_0 gtk2 gtk2-x11 gtk3 diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix index edebb68591..c88f380961 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix @@ -30,7 +30,7 @@ mkDerivation rec { src = let - base_url = "https://dl.tvcdn.de/download/linux/version_${lib.versions.major version}x"; + base_url = "https://dl.teamviewer.com/download/linux/version_${lib.versions.major version}x"; in { x86_64-linux = fetchurl { diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix index 551f8e57f7..a9182b739f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , fetchurl , cups , libssh @@ -15,7 +16,7 @@ , pkg-config }: -qt5.mkDerivation rec { +stdenv.mkDerivation rec { pname = "x2goclient"; version = "4.1.2.2"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/synology-drive-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/synology-drive-client/default.nix index fb930edd14..69f7b4d153 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/synology-drive-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/synology-drive-client/default.nix @@ -25,7 +25,7 @@ let update-source-version synology-drive-client "$version" ''; - linux = qt5.mkDerivation { + linux = stdenv.mkDerivation { inherit pname version meta passthru; src = fetchurl { @@ -33,7 +33,7 @@ let sha256 = "sha256-VeS5bPcMM4JDCSH5GXkl4OgQjrPKaNDh5PfX28/zqaU="; }; - nativeBuildInputs = [ autoPatchelfHook dpkg ]; + nativeBuildInputs = [ qt5.wrapQtAppsHook autoPatchelfHook dpkg ]; buildInputs = [ glibc gtk3 pango libxcb ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/termius/default.nix b/third_party/nixpkgs/pkgs/applications/networking/termius/default.nix index 487b13e557..21234f5a34 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/termius/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/termius/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { pname = "termius"; - version = "9.6.1"; - revision = "204"; + version = "9.7.2"; + revision = "205"; src = fetchurl { # find the latest version with @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # and the sha512 with # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_${revision}.snap"; - hash = "sha512-ok3B/h+d0Q7k5i+IjgGB+4S5g2kzrQT/b4dYz4k07OnyfjJRgJ4X4f7BFFrwKLd+IbIC5OIibrvivWnkSWU3Ew=="; + hash = "sha512-LihbkFIFpulewNIHl1oiXJF1npuqNLvVjN8CAmDDf46PAXdpaiMMluHWIJ4NljAACh6d4Uw6m2pKgEDfFN1y6g=="; }; desktopItem = makeDesktopItem { diff --git a/third_party/nixpkgs/pkgs/applications/networking/weather/meteo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/weather/meteo/default.nix index 92ccc8f46e..e62d4edfe9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/weather/meteo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/weather/meteo/default.nix @@ -16,7 +16,7 @@ , json-glib , libappindicator , libsoup -, webkitgtk +, webkitgtk_4_0 }: stdenv.mkDerivation rec { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { json-glib libappindicator libsoup - webkitgtk + webkitgtk_4_0 ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/office/bookworm/default.nix b/third_party/nixpkgs/pkgs/applications/office/bookworm/default.nix index f35a0e5158..48ad4ce472 100644 --- a/third_party/nixpkgs/pkgs/applications/office/bookworm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/bookworm/default.nix @@ -23,7 +23,7 @@ , unar , unzip , vala -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 }: @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { poppler python3 sqlite - webkitgtk + webkitgtk_4_0 ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/office/notes-up/default.nix b/third_party/nixpkgs/pkgs/applications/office/notes-up/default.nix index 4bc6060cfa..4541f77dc3 100644 --- a/third_party/nixpkgs/pkgs/applications/office/notes-up/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/notes-up/default.nix @@ -17,7 +17,7 @@ , libgee , pantheon , sqlite -, webkitgtk +, webkitgtk_4_0 }: stdenv.mkDerivation rec { @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { libgee pantheon.granite sqlite - webkitgtk + webkitgtk_4_0 ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/office/osmo/default.nix b/third_party/nixpkgs/pkgs/applications/office/osmo/default.nix index c49d9bc2c4..de1086f1f5 100644 --- a/third_party/nixpkgs/pkgs/applications/office/osmo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/osmo/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, gtk3, libxml2, gettext, libical, libnotify -, libarchive, gspell, webkitgtk, libgringotts, wrapGAppsHook3 }: +, libarchive, gspell, webkitgtk_4_0, libgringotts, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "osmo"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config gettext wrapGAppsHook3 ]; buildInputs = [ gtk3 libxml2 libical libnotify libarchive - gspell webkitgtk libgringotts ]; + gspell webkitgtk_4_0 libgringotts ]; meta = with lib; { description = "Handy personal organizer"; diff --git a/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix b/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix index eae9e42485..75adb0425c 100644 --- a/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix @@ -1,30 +1,32 @@ -{ lib -, fetchFromGitHub -, glibcLocales -, installShellFiles -, jq -, python3 +{ + fetchFromGitHub, + installShellFiles, + jq, + lib, + python3, }: python3.pkgs.buildPythonApplication rec { pname = "todoman"; version = "4.4.0"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "pimutils"; - repo = pname; + repo = "todoman"; rev = "refs/tags/v${version}"; hash = "sha256-5tQaNT6QVN9mxa9t6OvMux4ZGy4flUqszTAwet2QL0w="; }; nativeBuildInputs = [ installShellFiles - ] ++ (with python3.pkgs; [ - setuptools-scm - ]); + ]; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ + setuptools-scm + ]; + + dependencies = with python3.pkgs; [ atomicwrites click click-log @@ -34,22 +36,18 @@ python3.pkgs.buildPythonApplication rec { parsedatetime python-dateutil pyxdg + pytz tabulate urwid ]; nativeCheckInputs = with python3.pkgs; [ - flake8 - flake8-import-order freezegun hypothesis pytestCheckHook - glibcLocales pytest-cov-stub ]; - LC_ALL = "en_US.UTF-8"; - postInstall = '' installShellCompletion --bash contrib/completion/bash/_todo substituteInPlace contrib/completion/zsh/_todo --replace "jq " "${lib.getExe jq} " @@ -87,9 +85,14 @@ python3.pkgs.buildPythonApplication rec { now. Unsupported fields may not be shown but are never deleted or altered. ''; - changelog = "https://todoman.readthedocs.io/en/stable/changelog.html#v${builtins.replaceStrings ["."] ["-"] version}"; + changelog = "https://todoman.readthedocs.io/en/stable/changelog.html#v${ + builtins.replaceStrings [ "." ] [ "-" ] version + }"; license = lib.licenses.isc; - maintainers = with lib.maintainers; [ leenaars antonmosich ]; + maintainers = with lib.maintainers; [ + leenaars + antonmosich + ]; mainProgram = "todo"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/radio/cloudlog/default.nix b/third_party/nixpkgs/pkgs/applications/radio/cloudlog/default.nix index 00aa166d41..22713841cc 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.15"; + version = "2.6.16"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - hash = "sha256-G+PnzyOG/HZ8I66BHdtK0GOUF7ATrTYpzM9sVaSjMDQ="; + hash = "sha256-1GdIC1vC/SG9duQkrOXIe24OyIwdLgeEiG7i+KYP8Cs="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix b/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix index 36535678a8..e22bef1541 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.22.0"; + version = "7.22.1"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${finalAttrs.version}"; - hash = "sha256-cF6vKwAWz32/XYUWvq/4Wu73TFQ2jaGIFxWmeXmlPCE="; + hash = "sha256-Vhxs1KVUDCbl/9abZByUuy230PV4RrYrRjEXgYc8oZU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/radio/welle-io/default.nix b/third_party/nixpkgs/pkgs/applications/radio/welle-io/default.nix index 39ebfe8886..5a4ce6a9bc 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/welle-io/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/welle-io/default.nix @@ -1,20 +1,40 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config -, qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2, qtgraphicaleffects -, faad2, rtl-sdr, soapysdr-with-plugins, libusb-compat-0_1, fftwSinglePrec, lame, mpg123 -} : +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + wrapQtAppsHook, + qtbase, + qtcharts, + qtmultimedia, + qtdeclarative, + qt5compat, + faad2, + rtl-sdr, + soapysdr-with-plugins, + libusb-compat-0_1, + fftwSinglePrec, + lame, + mpg123, +}: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "welle-io"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "AlbrechtL"; repo = "welle.io"; rev = "v${version}"; - sha256 = "sha256-xXiCL/A2SwCSr5SA4AQQEdieRzBksXx9Z78bHtlFiW4="; + hash = "sha256-sSknzZiD9/MLyO+gAYopogOQu5HRcqaRcfqwq4Rld7A="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + ]; buildInputs = [ faad2 @@ -25,22 +45,27 @@ mkDerivation rec { qtbase qtcharts qtmultimedia - qtquickcontrols - qtquickcontrols2 - qtgraphicaleffects + qt5compat rtl-sdr soapysdr-with-plugins ]; cmakeFlags = [ - "-DRTLSDR=true" "-DSOAPYSDR=true" + "-DRTLSDR=true" + "-DSOAPYSDR=true" ]; - meta = with lib; { + meta = { description = "DAB/DAB+ Software Radio"; homepage = "https://www.welle.io/"; - maintainers = with maintainers; [ ck3d markuskowa ]; - license = licenses.gpl2Only; - platforms = [ "x86_64-linux" "i686-linux" ] ++ platforms.darwin; + maintainers = with lib.maintainers; [ + ck3d + markuskowa + ]; + license = lib.licenses.gpl2Only; + platforms = [ + "x86_64-linux" + "i686-linux" + ] ++ lib.platforms.darwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/cmtk/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/cmtk/default.nix index 1263f8194c..531f9047ba 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/cmtk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/cmtk/default.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-iE164NCOSOypZLLZfZy9RTyrS+YnY9ECqfb4QhlsMS4="; }; + postPatch = '' + substituteInPlace apps/vtkxform.cxx --replace-fail \ + "float xyzFloat[3] = { xyz[0], xyz[1], xyz[2] };" \ + "float xyzFloat[3] = { (float)xyz[0], (float)xyz[1], (float)xyz[2] };" + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ @@ -28,10 +34,10 @@ stdenv.mkDerivation (finalAttrs: { llvmPackages.openmp ]; - env.NIX_CFLAGS_COMPILE = toString [ - (lib.optionalString stdenv.cc.isGNU "-std=c++11") - (lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing") - (lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "-Dfinite=isfinite") + cmakeFlags = [ + (lib.cmakeFeature "CMAKE_CXX_STANDARD" "14") + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ + (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Dfinite=isfinite") ]; meta = with lib; { 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 e8786fe4b9..5435503e7f 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.2.0"; + version = "3.3.0"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "sha256-4lj6Lj9fphzWeZ7I4HP0mpX73OrxY9imCXGyYZuG+kE="; + sha256 = "sha256-WIGadmBka3SzTigvXU0hyNuuoi3e/5bjJYdV2voPhtw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/stacks/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/stacks/default.nix index 3d385b54d4..ddaa6bafd5 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/stacks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/stacks/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "stacks"; - version = "2.66"; + version = "2.68"; src = fetchurl { url = "http://catchenlab.life.illinois.edu/stacks/source/${pname}-${version}.tar.gz"; - sha256 = "sha256-9pHmcLYMdn9xy3vhlOU42Io/4L61auoncfpZNRPUN/I="; + sha256 = "sha256-ncUeo1bWDrRVewstGohUqvrkkq7Yf5dOAknMCapedlA="; }; buildInputs = [ zlib ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/subread/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/subread/default.nix index d2ee518883..66fc2152a4 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/subread/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/subread/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "subread"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { url = "mirror://sourceforge/subread/subread-${version}/subread-${version}-source.tar.gz"; - sha256 = "sha256-8P3aa5hjTSlGAolIwiAlPhCg8nx/pfJJE7ZbOsbLsEU="; + sha256 = "sha256-/tjt3hn52NiqEo721K5atnvOLb8iWJ9AlJlaE6cVq3U="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix index b7f2abd37b..45cd9c934c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "verilator"; - version = "5.026"; + version = "5.028"; # Verilator gets the version from this environment variable # if it can't do git describe while building. @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-Ds6w95tqlKjIFnkq2kKyslprKCwMOtBOoy7LuTon3KM="; + hash = "sha256-YgK60fAYG5575uiWmbCODqNZMbRfFdOVcJXz5h5TLuE="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/cadical/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/cadical/default.nix index 6d49ef0ab3..8e5408d12f 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/cadical/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/cadical/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cadical"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "arminbiere"; repo = "cadical"; rev = "rel-${version}"; - sha256 = "sha256-qoeEM9SdpuFuBPeQlCzuhPLcJ+bMQkTUTGiT8QdU8rc="; + sha256 = "sha256-sSvJgHxsRaJ/xHEK32fox0MFI7u+pj5ERLfNn2s8kC8="; }; outputs = [ "out" "dev" "lib" ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/kissat/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/kissat/default.nix index 9a34409730..a2360b0952 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/kissat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/kissat/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "kissat"; - version = "3.1.1"; + version = "4.0.1"; src = fetchFromGitHub { owner = "arminbiere"; repo = "kissat"; rev = "rel-${version}"; - sha256 = "sha256-zK20/vhbVihrxmd52DjByDUO99pBAr8SlJtQpX5fmwY="; + sha256 = "sha256-+y9TlSEgnMTtRT9F6OBSle9OqGfljChcHOFJ5lgwjyk="; }; outputs = [ "out" "dev" "lib" ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/mathematica/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/mathematica/default.nix index 9d0a308f44..617fd46b05 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/mathematica/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/mathematica/default.nix @@ -51,10 +51,7 @@ let versions = callPackage ./versions.nix { }; sublist = l: lib.sublist 0 n l; in lib.compareLists lib.compare (sublist as) (sublist bs) == 0; - matchesDoc = v: - builtins.match (if webdoc - then ".*[0-9]_LIN(UX)?.sh" - else ".*_B[Nn][Dd][Ll].sh") v.src.name != null; + matchesDoc = v: (builtins.match ".*[0-9]_LIN(UX)?.sh" v.src.name != null) == webdoc; in diff --git a/third_party/nixpkgs/pkgs/applications/science/math/nasc/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/nasc/default.nix index b544d5fc6b..cd96b1d669 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/nasc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/nasc/default.nix @@ -11,7 +11,7 @@ , gtksourceview , libgee , nix-update-script -, webkitgtk +, webkitgtk_4_0 , libqalculate , intltool , gnuplot @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { gtksourceview libgee pantheon.granite - webkitgtk + webkitgtk_4_0 # We add libqalculate's runtime dependencies because nasc has it as a modified subproject. ] ++ libqalculate.buildInputs ++ libqalculate.propagatedBuildInputs; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix index 2a6225eab7..d529b7e0ea 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs:{ pname = "wxmaxima"; - version = "24.05.0"; + version = "24.08.0"; src = fetchFromGitHub { owner = "wxMaxima-developers"; repo = "wxmaxima"; rev = "Version-${finalAttrs.version}"; - hash = "sha256-pl3sO28HANL9F41aaJznxUsH2Y7W/FO82Rik2/ik2Ag="; + hash = "sha256-W9sZlCPi+pz37OQoICnRGQR2hoe/UciMN6NIzDgHNPQ="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/golly/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/golly/default.nix index b509387fe8..8a2bb17d2d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/golly/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/golly/default.nix @@ -1,15 +1,15 @@ -{lib, stdenv, fetchurl, wxGTK, perl, python3, zlib, libGLU, libGL, libX11, SDL2}: +{lib, stdenv, fetchurl, wxGTK, python3, zlib, libGLU, libGL, libX11, SDL2}: stdenv.mkDerivation rec { pname = "golly"; - version = "4.2"; + version = "4.3"; src = fetchurl { - hash = "sha256-VpEoqSPaZMP/AGIYZAbk5R/f8Crqvx8pKYN1O9Bl6V0="; + hash = "sha256-UdJHgGPn7FDN4rYTgfPBAoYE5FGC43TP8OFBmYIqCB0="; url="mirror://sourceforge/project/golly/golly/golly-${version}/golly-${version}-src.tar.gz"; }; buildInputs = [ - wxGTK perl python3 zlib libGLU libGL libX11 SDL2 + wxGTK python3 zlib libGLU libGL libX11 SDL2 ]; nativeBuildInputs = [ @@ -22,16 +22,14 @@ stdenv.mkDerivation rec { postPatch = '' sed -e 's@PYTHON_SHLIB@${python3}/lib/libpython3.so@' -i wxprefs.cpp - sed -e 's@PERL_SHLIB@'"$(find "${perl}/lib/" -name libperl.so)"'@' -i wxprefs.cpp ! grep _SHLIB *.cpp grep /lib/libpython wxprefs.cpp - grep /libperl wxprefs.cpp ''; makeFlags=[ "-f" "makefile-gtk" - "ENABLE_SOUND=1" "ENABLE_PERL=1" + "ENABLE_SOUND=1" "GOLLYDIR=${placeholder "out"}/share/golly" ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix deleted file mode 100644 index 07cc2ceaed..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix +++ /dev/null @@ -1,138 +0,0 @@ -{ lib -, fetchPypi -, python3 -, stress -}: - -python3.pkgs.buildPythonApplication rec { - pname = "snakemake"; - version = "8.20.1"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-adNwIA1z/TwWsa0gQb4hAsUvHInjd30sm1dYKXvvXy8="; - }; - - postPatch = '' - patchShebangs --build tests/ - substituteInPlace tests/common.py \ - --replace-fail 'os.environ["PYTHONPATH"] = os.getcwd()' "pass" \ - --replace-fail 'del os.environ["PYTHONPATH"]' "pass" - substituteInPlace snakemake/unit_tests/__init__.py \ - --replace-fail '"unit_tests/templates"' '"'"$PWD"'/snakemake/unit_tests/templates"' - ''; - - propagatedBuildInputs = with python3.pkgs; [ - appdirs - configargparse - connection-pool - datrie - docutils - gitpython - humanfriendly - immutables - jinja2 - jsonschema - nbformat - psutil - pulp - pygments - pyyaml - requests - reretry - smart-open - snakemake-interface-executor-plugins - snakemake-interface-common - snakemake-interface-storage-plugins - snakemake-interface-report-plugins - stopit - tabulate - throttler - toposort - wrapt - yte - ]; - - # See - # https://github.com/snakemake/snakemake/blob/main/.github/workflows/main.yml#L99 - # for the current basic test suite. Slurm, Tibanna and Tes require extra - # setup. - - nativeCheckInputs = with python3.pkgs; [ - numpy - pandas - pytestCheckHook - pytest-mock - requests-mock - snakemake-executor-plugin-cluster-generic - snakemake-storage-plugin-fs - stress - ]; - - pytestFlagsArray = [ - "tests/tests.py" - "tests/test_expand.py" - "tests/test_io.py" - "tests/test_schema.py" - "tests/test_executor_test_suite.py" - "tests/test_api.py" - ]; - - # Some will be disabled via https://github.com/snakemake/snakemake/pull/3074 - disabledTests = [ - # requires graphviz - "test_filegraph" - # requires s3 - "test_storage" - "test_default_storage" - "test_output_file_cache_storage" - # requires peppy and eido - "test_pep" - "test_modules_peppy" - # requires perl - "test_shadow" - # requires snakemake-storage-plugin-http - "test_ancient" - "test_modules_prefix" - # requires snakemake-storage-plugin-s3 - "test_deploy_sources" - # requires modules - "test_env_modules" - # issue with locating template file - "test_generate_unit_tests" - # weird - "test_strict_mode" - "test_issue1256" - "test_issue2574" - "test_github_issue1384" - # future-proofing - "conda" - "singularity" - "apptainer" - "container" - ]; - - pythonImportsCheck = [ - "snakemake" - ]; - - preCheck = '' - export HOME="$(mktemp -d)" - ''; - - meta = with lib; { - homepage = "https://snakemake.github.io"; - license = licenses.mit; - description = "Python-based execution environment for make-like workflows"; - mainProgram = "snakemake"; - longDescription = '' - Snakemake is a workflow management system that aims to reduce the complexity of - creating workflows by providing a fast and comfortable execution environment, - together with a clean and readable specification language in Python style. Snakemake - workflows are essentially Python scripts extended by declarative code to define - rules. Rules describe how to create output files from input files. - ''; - maintainers = with maintainers; [ helkafen renatoGarcia veprbl ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/raspa/data.nix b/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/raspa/data.nix index bcc9dc3b37..3361393eef 100644 --- a/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/raspa/data.nix +++ b/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/raspa/data.nix @@ -1,6 +1,5 @@ { lib , stdenvNoCC -, gzip , raspa }: @@ -10,8 +9,6 @@ stdenvNoCC.mkDerivation rec { outputs = [ "out" "doc" ]; - nativeBuildInpuhs = [ gzip ]; - installPhase = '' runHook preInstall mkdir -p "$out/share/raspa" diff --git a/third_party/nixpkgs/pkgs/applications/science/networking/sumo/default.nix b/third_party/nixpkgs/pkgs/applications/science/networking/sumo/default.nix index 4906b0b80c..88127f6db4 100644 --- a/third_party/nixpkgs/pkgs/applications/science/networking/sumo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/networking/sumo/default.nix @@ -1,4 +1,4 @@ -{ lib, bzip2, cmake, eigen, fetchFromGitHub, ffmpeg_7, fox_1_6, gdal, +{ lib, bzip2, cmake, eigen, fetchFromGitHub, ffmpeg, fox_1_6, gdal, git, gl2ps, gpp , gtest, jdk, libGL, libGLU, libX11, libjpeg, libpng, libtiff, libxcrypt, openscenegraph , proj, python3, python3Packages, stdenv, swig, xercesc, xorg, zlib }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 eigen - ffmpeg_7 + ffmpeg fox_1_6 gdal gl2ps diff --git a/third_party/nixpkgs/pkgs/applications/system/supergfxctl/default.nix b/third_party/nixpkgs/pkgs/applications/system/supergfxctl/default.nix index 3fd0182e66..2318a4c967 100644 --- a/third_party/nixpkgs/pkgs/applications/system/supergfxctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/system/supergfxctl/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "supergfxctl"; - version = "5.2.1"; + version = "5.2.4"; src = fetchFromGitLab { owner = "asus-linux"; repo = "supergfxctl"; rev = version; - hash = "sha256-gjMLyT3pvQhmjz9SFbYlDAqg+tCX5ORkCkcnyBzO5ws="; + hash = "sha256-ie5JPHBvypUtPStwA/aO4GeQ/qbHTzUJF3T4QuW6JNc="; }; - cargoHash = "sha256-ndugyiAYPDyue2Ajxx22BNvYc9iBTxZqP5OxaqmC7U0="; + cargoHash = "sha256-qZC4axeRnKgUNGDFzmdvN/mwkcqsh8KwLlM6oGT19e8="; postPatch = '' substituteInPlace data/supergfxd.service --replace /usr/bin/supergfxd $out/bin/supergfxd diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix index 79c069838b..41f3b5bd8b 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "393"; + version = "394"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - hash = "sha256-3Dq/Uz1mrj20nmeDsOHinw5NBFtLPax5el6Tvic17Hs="; + hash = "sha256-oqDLIG6wQj3tw0eU9cLTjIM5DS3REGtmq6CWDDqXbHo="; }; patches = [ ./sixel-256.support.patch ]; 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 d04b844e84..746c8d40a3 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix @@ -1,17 +1,25 @@ -{ lib, fetchFromGitHub, buildGoModule, installShellFiles, stdenv, testers, gh }: +{ + lib, + fetchFromGitHub, + buildGoModule, + installShellFiles, + stdenv, + testers, + gh, +}: buildGoModule rec { pname = "gh"; - version = "2.58.0"; + version = "2.59.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; - rev = "v${version}"; - hash = "sha256-KHJKE550XlGdB++jq/1kHP4o1QISbPtbt4GU9uIP3RE="; + rev = "refs/tags/v${version}"; + hash = "sha256-QOc99KmcGk9b9uy1/y1FSe0zYE1q0g06k7niqtsMDmY="; }; - vendorHash = "sha256-6T9LQNzGpADLwI0pFvjBe5rqbXOEDZmjYCy4RhNqcFI="; + vendorHash = "sha256-Mje0IbvRj6pmOe8s8PX87ntPE+ZZeciLyOP6fmv7PmI="; nativeBuildInputs = [ installShellFiles ]; @@ -21,19 +29,22 @@ buildGoModule rec { runHook postBuild ''; - installPhase = '' - runHook preInstall - install -Dm755 bin/gh -t $out/bin - '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installManPage share/man/*/*.[1-9] + installPhase = + '' + runHook preInstall + install -Dm755 bin/gh -t $out/bin + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installManPage share/man/*/*.[1-9] - installShellCompletion --cmd gh \ - --bash <($out/bin/gh completion -s bash) \ - --fish <($out/bin/gh completion -s fish) \ - --zsh <($out/bin/gh completion -s zsh) - '' + '' - runHook postInstall - ''; + installShellCompletion --cmd gh \ + --bash <($out/bin/gh completion -s bash) \ + --fish <($out/bin/gh completion -s fish) \ + --zsh <($out/bin/gh completion -s zsh) + '' + + '' + runHook postInstall + ''; # most tests require network access doCheck = false; 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 bde79f07d6..23db007dc2 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/ghr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/ghr/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "ghr"; - version = "0.16.2"; + version = "0.17.0"; src = fetchFromGitHub { owner = "tcnksm"; repo = "ghr"; rev = "v${version}"; - sha256 = "sha256-xClqqTVCEGghaf63kN40mwo49lkS8KC4k/36NYIngFI="; + sha256 = "sha256-Is0D8tElv86s++NV6upu8RXvce65uPWQGIOl0Ftxf/M="; }; - vendorHash = "sha256-Wzzg66yJaHJUCfC2aH3Pk+B0d5l/+L7/bcNhQxo8ro0="; + vendorHash = "sha256-gVDZgV7EF4LrCDX25tGpECecLi8IgstpzCOGfJ5+rhA="; # Tests require a Github API token, and networking doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-branchstack/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-branchstack/default.nix deleted file mode 100644 index b536642cbf..0000000000 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-branchstack/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib -, fetchPypi -, buildPythonApplication -, git-revise -}: - -buildPythonApplication rec { - pname = "git-branchstack"; - version = "0.2.0"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-gja93LOcVCQ6l+Cygvsm+3uomvxtvUl6t23GIb/tKyQ="; - }; - - buildInputs = [ - git-revise - ]; - - meta = with lib; { - homepage = "https://github.com/krobelus/git-branchstack"; - description = "Efficiently manage Git branches without leaving your local branch"; - license = licenses.mit; - maintainers = [ maintainers.AndersonTorres ]; - }; -} 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 3e5dcec035..864e233bac 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 @@ -4,6 +4,7 @@ , rustPlatform , Security , SystemConfiguration +, installShellFiles }: rustPlatform.buildRustPackage rec { @@ -26,6 +27,23 @@ rustPlatform.buildRustPackage rec { Security SystemConfiguration ]; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + export OUT_DIR=$(mktemp -d) + + # Generate shell completions + $out/bin/git-cliff-completions + installShellCompletion \ + --bash $OUT_DIR/git-cliff.bash \ + --fish $OUT_DIR/git-cliff.fish \ + --zsh $OUT_DIR/_git-cliff + + # Generate man page + $out/bin/git-cliff-mangen + installManPage $OUT_DIR/git-cliff.1 + ''; + meta = with lib; { description = "Highly customizable Changelog Generator that follows Conventional Commit specifications"; homepage = "https://github.com/orhun/git-cliff"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-credential-manager/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-credential-manager/default.nix index 1cef974df5..ac2b0a8f49 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-credential-manager/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-credential-manager/default.nix @@ -34,6 +34,7 @@ buildDotnetModule rec { lib.optional withLibsecretSupport libsecret; makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath ([ git ] ++ lib.optionals withGpgSupport [ gnupg pass ])}" + "--inherit-argv0" ]; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git/default.nix index 3d7f96bb5f..9e9130fce6 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git/default.nix @@ -29,7 +29,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.46.0"; + version = "2.46.1"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - hash = "sha256-fxI0YqKLfKPr4mB0hfcWhVTCsQ38FVx+xGMAZmrCf5U="; + hash = "sha256-iIyvuL1qtMu+vBaAQKiFDrCI+B3DrCYXGVz8CHfw9UM="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; 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 9b4b7f2ae0..033870a4e4 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": "17.2.8", - "repo_hash": "172ba8vlaqphyhi6d5r9j3km7krxcis81dzlr5xch4i0apd0yyag", + "version": "17.2.9", + "repo_hash": "060d5rzbcnhr1fsvbaiirgjm5rjr5c5r6yi601lxvksffyn5hmxw", "yarn_hash": "10y540bxwaz355p9r4q34199aibadrd5p4d9ck2y3n6735k0hm74", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v17.2.8-ee", + "rev": "v17.2.9-ee", "passthru": { - "GITALY_SERVER_VERSION": "17.2.8", - "GITLAB_PAGES_VERSION": "17.2.8", + "GITALY_SERVER_VERSION": "17.2.9", + "GITLAB_PAGES_VERSION": "17.2.9", "GITLAB_SHELL_VERSION": "14.37.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.2.0", - "GITLAB_WORKHORSE_VERSION": "17.2.8" + "GITLAB_WORKHORSE_VERSION": "17.2.9" } } 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 3fe22d7050..45f5914852 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 @@ -6,7 +6,7 @@ }: let - version = "17.2.8"; + version = "17.2.9"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -20,7 +20,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-3LaBETnwWmiIi7r68NB8LeJ7fo6oP28fS3TbU5JanOE="; + hash = "sha256-UgNQtM3NdAUJVP+vvTHtZWSjCmVzsHlEtXQroxKorIY="; }; vendorHash = "sha256-FqnGVRldhevJgBBvJcvGXzRaYWqSHzZiXIQmCNzJv+4="; 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 e30dcebfd6..7fb6746892 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 = "17.2.8"; + version = "17.2.9"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-NaLRCLmgDI4ArJyntkmYICVEpwZtAU6XVTmXAh4kOSc="; + hash = "sha256-ggfPZ/PMjgfRzzPZdVCVydd/4mdCfh2xh7QWGjp5U/0="; }; vendorHash = "sha256-yNHeM8MExcLwv2Ga4vtBmPFBt/Rj7Gd4QQYDlnAIo+c="; 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 ef6709b945..235ddbf54a 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 = "17.2.8"; + version = "17.2.9"; # nixpkgs-update: no auto update src = fetchFromGitLab { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gogs/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gogs/default.nix deleted file mode 100644 index 5b7a986cf2..0000000000 --- a/third_party/nixpkgs/pkgs/applications/version-management/gogs/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper -, git, bash, gzip, openssh, pam -, sqliteSupport ? true -, pamSupport ? true -}: - -buildGoModule rec { - pname = "gogs"; - version = "0.13.0"; - - src = fetchFromGitHub { - owner = "gogs"; - repo = "gogs"; - rev = "v${version}"; - sha256 = "sha256-UfxE+NaqDr3XUXpvlV989Iwjq/lsAwpMTDAPkcOmma8="; - }; - - vendorHash = "sha256-ISJOEJ1DWO4nnMpDuZ36Nq528LhgekDh3XUF8adlj2w="; - - subPackages = [ "." ]; - - postPatch = '' - patchShebangs . - ''; - - nativeBuildInputs = [ makeWrapper openssh ]; - - buildInputs = lib.optional pamSupport pam; - - tags = - ( lib.optional sqliteSupport "sqlite" - ++ lib.optional pamSupport "pam"); - - postInstall = '' - - wrapProgram $out/bin/gogs \ - --prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]} - ''; - - meta = with lib; { - description = "Painless self-hosted Git service"; - homepage = "https://gogs.io"; - license = licenses.mit; - maintainers = [ maintainers.schneefux ]; - mainProgram = "gogs"; - knownVulnerabilities = [ '' - Gogs has known unpatched vulnerabilities and upstream maintainers appears to be unresponsive. - - More information can be found in forgejo's blogpost: https://forgejo.org/2023-11-release-v1-20-5-1/ - - You might want to consider migrating to Gitea or forgejo. - '' ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/subversion/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/subversion/default.nix index 11d9c7fefd..39966c8c73 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/subversion/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/subversion/default.nix @@ -136,7 +136,7 @@ let in { subversion = common { - version = "1.14.3"; - sha256 = "sha256-lJ79RRoJQ19+hXNXTHHHtxsZTYRIkPpJzWHSJi6hpEA="; + version = "1.14.4"; + sha256 = "sha256-ROrRFucuSA8Q8SPJFLtvn4wEFxHAQe16v/G4Y0oZnjw="; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/glaxnimate/default.nix b/third_party/nixpkgs/pkgs/applications/video/glaxnimate/default.nix index 7c6d8500d8..984e5db8f6 100644 --- a/third_party/nixpkgs/pkgs/applications/video/glaxnimate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/glaxnimate/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, fetchpatch , cmake , zlib , potrace @@ -47,6 +48,15 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # Backport fix for newer ffmpeg + # FIXME: remove in next update + (fetchpatch { + url = "https://invent.kde.org/graphics/glaxnimate/-/commit/4fb2b67a0f0ce2fbffb6fe9f87c3bf7914c8a602.patch"; + hash = "sha256-QjCnscGa7n+zwrImA4mbQiTQb9jmDGm8Y/7TK8jZXvM="; + }) + ]; + nativeBuildInputs = [ cmake wrapQtAppsHook diff --git a/third_party/nixpkgs/pkgs/applications/video/gpu-screen-recorder/0001-Don-t-install-systemd-unit-files-using-absolute-path.patch b/third_party/nixpkgs/pkgs/applications/video/gpu-screen-recorder/0001-Don-t-install-systemd-unit-files-using-absolute-path.patch deleted file mode 100644 index 1403d59b86..0000000000 --- a/third_party/nixpkgs/pkgs/applications/video/gpu-screen-recorder/0001-Don-t-install-systemd-unit-files-using-absolute-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -From cd8c6561079ee4c53b4bed390edd75a730ac685d Mon Sep 17 00:00:00 2001 -From: Tim Schumacher -Date: Thu, 4 Jul 2024 16:26:36 +0200 -Subject: [PATCH] Don't install systemd unit files using absolute paths - ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index a188f16..7807abe 100644 ---- a/meson.build -+++ b/meson.build -@@ -54,7 +54,7 @@ executable('gsr-kms-server', 'kms/server/kms_server.c', dependencies : dependenc - executable('gpu-screen-recorder', src, dependencies : dep, install : true) - - if get_option('systemd') == true -- install_data(files('extra/gpu-screen-recorder.service'), install_dir : '/usr/lib/systemd/user') -+ install_data(files('extra/gpu-screen-recorder.service'), install_dir : 'lib/systemd/user') - endif - - if get_option('capabilities') == true --- -2.45.1 - diff --git a/third_party/nixpkgs/pkgs/applications/video/gpu-screen-recorder/default.nix b/third_party/nixpkgs/pkgs/applications/video/gpu-screen-recorder/default.nix index 663d826402..3df7380579 100644 --- a/third_party/nixpkgs/pkgs/applications/video/gpu-screen-recorder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/gpu-screen-recorder/default.nix @@ -5,11 +5,15 @@ makeWrapper, meson, ninja, + addDriverRunpath, pkg-config, libXcomposite, libpulseaudio, + dbus, ffmpeg, wayland, + vulkan-headers, + pipewire, libdrm, libva, libglvnd, @@ -20,16 +24,15 @@ wrapperDir ? "/run/wrappers/bin", }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "gpu-screen-recorder"; - version = "unstable-2024-07-05"; + version = "4.2.1"; - # Snapshot tarballs use the following versioning format: - # printf "r%s.%s\n" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" src = fetchurl { - url = "https://dec05eba.com/snapshot/gpu-screen-recorder.git.r641.48cd80f.tar.gz"; - hash = "sha256-hIEK8EYIxQTTiFePPZf4V0nsxqxkfcDeOG9GK9whn+0="; + url = "https://dec05eba.com/snapshot/gpu-screen-recorder.git.${finalAttrs.version}.tar.gz"; + hash = "sha256-eCjAlPEg8lkL8T0lgxr0F8ouFGwqfsRxDSQuG6RbpZE="; }; + sourceRoot = "."; nativeBuildInputs = [ @@ -42,8 +45,11 @@ stdenv.mkDerivation { buildInputs = [ libXcomposite libpulseaudio + dbus ffmpeg + pipewire wayland + vulkan-headers libdrm libva libXdamage @@ -52,30 +58,35 @@ stdenv.mkDerivation { libXfixes ]; - patches = [ ./0001-Don-t-install-systemd-unit-files-using-absolute-path.patch ]; - mesonFlags = [ - "-Dsystemd=true" - - # Capabilities are handled by security.wrappers if possible. - "-Dcapabilities=false" + # Enable Wayland support + (lib.mesonBool "portal" true) + # Handle by the module + (lib.mesonBool "capabilities" false) + (lib.mesonBool "systemd" false) + (lib.mesonBool "nvidia_suspend_fix" false) ]; postInstall = '' mkdir $out/bin/.wrapped mv $out/bin/gpu-screen-recorder $out/bin/.wrapped/ makeWrapper "$out/bin/.wrapped/gpu-screen-recorder" "$out/bin/gpu-screen-recorder" \ - --prefix LD_LIBRARY_PATH : ${libglvnd}/lib \ - --prefix PATH : ${wrapperDir} \ - --suffix PATH : $out/bin + --prefix LD_LIBRARY_PATH : "${ + lib.makeLibraryPath [ + libglvnd + addDriverRunpath.driverLink + ] + }" \ + --prefix PATH : "${wrapperDir}" \ + --suffix PATH : "$out/bin" ''; meta = { description = "Screen recorder that has minimal impact on system performance by recording a window using the GPU only"; - mainProgram = "gpu-screen-recorder"; homepage = "https://git.dec05eba.com/gpu-screen-recorder/about/"; license = lib.licenses.gpl3Only; + mainProgram = "gpu-screen-recorder"; maintainers = [ lib.maintainers.babbaj ]; platforms = [ "x86_64-linux" ]; }; -} +}) 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 b0c19e80a0..d84527dcae 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,34 +1,35 @@ -{ stdenv -, lib -, fetchurl -, pkg-config -, desktop-file-utils -, makeWrapper -, meson -, ninja -, gtk3 -, libayatana-appindicator -, libpulseaudio -, libdrm -, gpu-screen-recorder -, libglvnd -, libX11 -, libXrandr -, wayland -, wrapGAppsHook3 -, wrapperDir ? "/run/wrappers/bin" +{ + stdenv, + lib, + fetchurl, + pkg-config, + addDriverRunpath, + desktop-file-utils, + makeWrapper, + meson, + ninja, + gtk3, + libayatana-appindicator, + libpulseaudio, + libdrm, + gpu-screen-recorder, + libglvnd, + libX11, + libXrandr, + wayland, + wrapGAppsHook3, + wrapperDir ? "/run/wrappers/bin", }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "gpu-screen-recorder-gtk"; - version = "unstable-2024-07-05"; + version = "4.2.1"; - # Snapshot tarballs use the following versioning format: - # printf "r%s.%s\n" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" src = fetchurl { - url = "https://dec05eba.com/snapshot/gpu-screen-recorder-gtk.git.r311.c611c51.tar.gz"; - hash = "sha256-86EdmeZ2dlffSfJOrTVGPtYyL3j6DmCQIALX2rpeS1Y="; + url = "https://dec05eba.com/snapshot/gpu-screen-recorder-gtk.git.${finalAttrs.version}.tar.gz"; + hash = "sha256-qk5bI23fypvv0yN9Ql7TOerBhoRzj65EcoAy3lMGMqc="; }; + sourceRoot = "."; nativeBuildInputs = [ @@ -50,23 +51,30 @@ stdenv.mkDerivation { wayland ]; - preFixup = let - gpu-screen-recorder-wrapped = gpu-screen-recorder.override { - inherit wrapperDir; - }; - in '' - gappsWrapperArgs+=(--prefix PATH : ${wrapperDir}) - gappsWrapperArgs+=(--suffix PATH : ${lib.makeBinPath [ gpu-screen-recorder-wrapped ]}) - # we also append /run/opengl-driver/lib as it otherwise fails to find libcuda. - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libglvnd ]}:/run/opengl-driver/lib) - ''; + preFixup = + let + gpu-screen-recorder-wrapped = gpu-screen-recorder.override { + inherit wrapperDir; + }; + in + '' + gappsWrapperArgs+=(--prefix PATH : ${wrapperDir}) + gappsWrapperArgs+=(--suffix PATH : ${lib.makeBinPath [ gpu-screen-recorder-wrapped ]}) + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + libglvnd + addDriverRunpath.driverLink + ] + }) + ''; meta = { + changelog = "https://git.dec05eba.com/gpu-screen-recorder-gtk/tree/com.dec05eba.gpu_screen_recorder.appdata.xml#n82"; description = "GTK frontend for gpu-screen-recorder."; - mainProgram = "gpu-screen-recorder-gtk"; homepage = "https://git.dec05eba.com/gpu-screen-recorder-gtk/about/"; license = lib.licenses.gpl3Only; + mainProgram = "gpu-screen-recorder-gtk"; maintainers = with lib.maintainers; [ babbaj ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/default.nix b/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/default.nix index 013b6bdf36..6c25495b03 100644 --- a/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/default.nix @@ -77,11 +77,6 @@ mkDerivation rec { postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/bin $out/Applications mv "$out/Jellyfin Media Player.app" $out/Applications - - # move web-client resources - mv $out/Resources/* "$out/Applications/Jellyfin Media Player.app/Contents/Resources/" - rmdir $out/Resources - ln -s "$out/Applications/Jellyfin Media Player.app/Contents/MacOS/Jellyfin Media Player" $out/bin/jellyfinmediaplayer ''; @@ -89,7 +84,7 @@ mkDerivation rec { homepage = "https://github.com/jellyfin/jellyfin-media-player"; description = "Jellyfin Desktop Client based on Plex Media Player"; license = with licenses; [ gpl2Only mit ]; - platforms = [ "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "aarch64-linux" "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ]; maintainers = with maintainers; [ jojosch kranzes ]; mainProgram = "jellyfinmediaplayer"; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/makemkv/default.nix b/third_party/nixpkgs/pkgs/applications/video/makemkv/default.nix index cb568d07cb..81a1160af2 100644 --- a/third_party/nixpkgs/pkgs/applications/video/makemkv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/makemkv/default.nix @@ -1,13 +1,16 @@ { + autoPatchelfHook, + common-updater-scripts, + curl, + fetchurl, + ffmpeg, lib, mkDerivation, - fetchurl, - autoPatchelfHook, - pkg-config, - curl, - ffmpeg, openssl, + pkg-config, qtbase, + rubyPackages, + writeShellApplication, zlib, withJava ? true, @@ -15,21 +18,21 @@ }: let - version = "1.17.7"; + version = "1.17.8"; # Using two URLs as the first one will break as soon as a new version is released src_bin = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz" ]; - hash = "sha256-jFvIMbyVKx+HPMhFDGTjktsLJHm2JtGA8P/JZWaJUdA="; + hash = "sha256-jg9UdDDZr+7ZdseJtb7N+y7Prhyq3hLo4+EZpzRxcEE="; }; src_oss = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz" ]; - hash = "sha256-di5VLUb57HWnxi3LfZfA/Z5qFRINDvb1oIDO4pHToO8="; + hash = "sha256-knUrzj/J+Xk5N1tg0q9iIXT+hqStkkjL3Yc2Yp5tvIo="; }; in mkDerivation { @@ -83,6 +86,35 @@ mkDerivation { runHook postInstall ''; + passthru = { + srcs = { + inherit src_bin src_oss; + }; + updateScript = lib.getExe (writeShellApplication { + name = "update-makemkv"; + runtimeInputs = [ + common-updater-scripts + curl + rubyPackages.nokogiri + ]; + text = '' + get_version() { + # shellcheck disable=SC2016 + curl --fail --silent 'https://forum.makemkv.com/forum/viewtopic.php?f=3&t=224' \ + | nokogiri -e 'puts $_.css("head title").first.text.match(/\bMakeMKV (\d+\.\d+\.\d+) /)[1]' + } + oldVersion=${lib.escapeShellArg version} + newVersion=$(get_version) + if [[ $oldVersion == "$newVersion" ]]; then + echo "$0: New version same as old version, nothing to do." >&2 + exit + fi + update-source-version makemkv "$newVersion" --source-key=passthru.srcs.src_bin + update-source-version makemkv "$newVersion" --source-key=passthru.srcs.src_oss --ignore-same-version + ''; + }); + }; + meta = with lib; { description = "Convert blu-ray and dvd to mkv"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix b/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix index 7d4ced909d..54fa98268a 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix @@ -8,6 +8,7 @@ , cmark , docbook_xsl , expat +, fetchpatch2 , file , flac , fmt @@ -58,6 +59,13 @@ stdenv.mkDerivation rec { hash = "sha256-UU57ZgH1sxCXspwfKXScw08aJYiv+k526U8q8N1tA+4="; }; + patches = [ + (fetchpatch2 { + url = "https://gitlab.com/mbunkus/mkvtoolnix/-/commit/fc83003f541ac690fe308c3f4ac36e62814a40db.diff"; + hash = "sha256-HOS79g5xm70upV5Okv1COEg0SanXs7brRRB59Ofx5HA="; + }) + ]; + nativeBuildInputs = [ autoreconfHook docbook_xsl diff --git a/third_party/nixpkgs/pkgs/applications/video/mplayer/default.nix b/third_party/nixpkgs/pkgs/applications/video/mplayer/default.nix index 352c7b7eda..a9f2abb355 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mplayer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mplayer/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchurl, fetchsvn, pkg-config, freetype, yasm, ffmpeg_7 +{ config, lib, stdenv, fetchurl, fetchsvn, pkg-config, freetype, yasm, ffmpeg , aalibSupport ? true, aalib , fontconfigSupport ? true, fontconfig, freefont_ttf , fribidiSupport ? true, fribidi @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkg-config yasm ]; - buildInputs = [ freetype ffmpeg_7 ] + buildInputs = [ freetype ffmpeg ] ++ lib.optional aalibSupport aalib ++ lib.optional fontconfigSupport fontconfig ++ lib.optional fribidiSupport fribidi diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix index c7bcdfc4f7..520bcb3bb8 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix @@ -85,6 +85,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-yRSw4VWDwMwysDB3Hw/tsmTjEQUhipvrVRQcZkbtuoI="; includes = [ "*/CompilerConfig.cmake" ]; }) + + (fetchpatch { + name = "qt-6.8.patch"; + url = "https://github.com/obsproject/obs-websocket/commit/d9befb9e0a4898695eef5ccbc91a4fac02027854.patch"; + extraPrefix = "plugins/obs-websocket/"; + stripLen = 1; + hash = "sha256-7SDBRr9G40b9DfbgdaYJxTeiDSLUfVixtMtM3cLTVZs="; + }) ]; nativeBuildInputs = [ @@ -162,6 +170,7 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=sign-compare" # https://github.com/obsproject/obs-studio/issues/10200 + "-Wno-error=stringop-overflow=" ]; dontWrapGApps = true; 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 f7e21b796c..f3384ed2ab 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 @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , cmake -, extra-cmake-modules +, pkg-config , ninja , wayland , wayland-scanner @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { "-DBUILD_PLUGIN=OFF" ]; - nativeBuildInputs = [ cmake extra-cmake-modules ninja wayland-scanner ]; + nativeBuildInputs = [ cmake ninja pkg-config wayland-scanner ]; buildInputs = [ libGL libffi diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix index 41b33b528a..51fcb7468b 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , obs-studio -, webkitgtk +, webkitgtk_4_0 , glib-networking , meson , cmake @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ obs-studio - webkitgtk + webkitgtk_4_0 glib-networking ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/simplescreenrecorder/default.nix b/third_party/nixpkgs/pkgs/applications/video/simplescreenrecorder/default.nix index 9b503abab6..d02c7cffaa 100644 --- a/third_party/nixpkgs/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/simplescreenrecorder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, alsa-lib, ffmpeg_7, libjack2, libX11, libXext, libXinerama, qtx11extras +{ lib, stdenv, mkDerivation, fetchFromGitHub, alsa-lib, ffmpeg, libjack2, libX11, libXext, libXinerama, qtx11extras , libXfixes, libGLU, libGL, pkg-config, libpulseaudio, libv4l, qtbase, qttools, cmake, ninja, nix-update-script }: @@ -29,7 +29,7 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ninja ]; buildInputs = [ - alsa-lib ffmpeg_7 libjack2 libX11 libXext libXfixes libXinerama libGLU libGL + alsa-lib ffmpeg libjack2 libX11 libXext libXfixes libXinerama libGLU libGL libpulseaudio libv4l qtbase qttools qtx11extras ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/webcamoid/default.nix b/third_party/nixpkgs/pkgs/applications/video/webcamoid/default.nix index 15f6313c42..0118d6c09b 100644 --- a/third_party/nixpkgs/pkgs/applications/video/webcamoid/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/webcamoid/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, fetchpatch2, pkg-config, libxcb, mkDerivation, cmake , qtbase, qtdeclarative, qtquickcontrols, qtquickcontrols2 -, ffmpeg_7, gst_all_1, libpulseaudio, alsa-lib, jack2 +, ffmpeg, gst_all_1, libpulseaudio, alsa-lib, jack2 , v4l-utils }: mkDerivation rec { pname = "webcamoid"; @@ -24,7 +24,7 @@ mkDerivation rec { buildInputs = [ libxcb qtbase qtdeclarative qtquickcontrols qtquickcontrols2 - ffmpeg_7 + ffmpeg gst_all_1.gstreamer gst_all_1.gst-plugins-base alsa-lib libpulseaudio jack2 v4l-utils diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix index 96e457b407..c36ed73617 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix @@ -6,18 +6,18 @@ rustPlatform.buildRustPackage rec { pname = "crosvm"; - version = "127.0"; + version = "128.1"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "8fdfed12c960850e9d5e809cfd2a40ce3bdd98d6"; - hash = "sha256-W0zLYM91xoq9vURgYs2noc9F9RtvoXztIIHMx0HVK5g="; + rev = "57702acf01cbd0e560e058dc97d22378d0c49ecc"; + hash = "sha256-lQStmmTxMC9Iq6vJxJMFIUUtaixJNGuBfAvBo9KKrjU="; fetchSubmodules = true; }; separateDebugInfo = true; - cargoHash = "sha256-nEJBRlwMqTahaIC9WdtoxGLVfc+U9sJ0ilzLhavcbD0="; + cargoHash = "sha256-qKCO9Rkk04HznExgYKJgpssZDjWfhsY2XOBifvtHFos="; nativeBuildInputs = [ pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix index fdc3515d5e..1ffa016159 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix @@ -323,9 +323,9 @@ rec { }; docker_27 = callPackage dockerGen rec { - version = "27.3.0"; + version = "27.3.1"; cliRev = "v${version}"; - cliHash = "sha256-1z2MmWq+HD2fhpZqXu0G7oBL3Mc0NN/fR69aMWRelns="; + cliHash = "sha256-Iurud1BwswGZCFgJ04/wl1U9AKcsXDmzFXLFCrjfc0Y="; mobyRev = "v${version}"; mobyHash = "sha256-AKl06k2ePWOFhL3oH086HcLLYs2Da+wLOcGjGnQ0SXE="; runcRev = "v1.1.14"; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix index 619cc9daeb..c5f1191605 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix @@ -144,6 +144,16 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-oC+bRjEHixv1QEFO9XAm4HHOwoiT+NkhknKGPydnZ5E="; revert = true; }) + + # musl changes https://gitlab.com/qemu-project/qemu/-/issues/2215 + (fetchpatch { + url = "https://gitlab.com/qemu-project/qemu/-/commit/ac1bbe8ca46c550b3ad99c85744119a3ace7b4f4.diff"; + sha256 = "sha256-wSlf8+7WHk2Z4I5cLFa37MRroQucPIuFzzyWnG9IpeY="; + }) + (fetchpatch { + url = "https://gitlab.com/qemu-project/qemu/-/commit/99174ce39e86ec6aea7bb7ce326b16e3eed9e3da.diff"; + sha256 = "sha256-Cpt01d1ARoCTuJuC66no4doPgL+4/ZqnJTWwjU2MxnY="; + }) ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/cage/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/cage/default.nix index 9d22cefc46..ab9f8c5e23 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/cage/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/cage/default.nix @@ -1,5 +1,4 @@ { lib, stdenv, fetchFromGitHub -, substituteAll , meson, ninja, pkg-config, wayland-scanner, scdoc, makeWrapper , wlroots, wayland, wayland-protocols, pixman, libxkbcommon, xcbutilwm , systemd, libGL, libX11, mesa @@ -9,24 +8,15 @@ stdenv.mkDerivation rec { pname = "cage"; - version = "0.1.5-unstable-2024-07-29"; + version = "0.2.0"; src = fetchFromGitHub { owner = "cage-kiosk"; repo = "cage"; - rev = "d3fb99d6654325ec46277cfdb589f89316bed701"; - hash = "sha256-WP0rWO9Wbs/09wTY8IlIUybnVUnwiNdXD9JgsoVG4rM="; + rev = "refs/tags/v${version}"; + hash = "sha256-2SFtz62z0EF8cpFTC6wGi125MD4a5mkXqP/C+7fH+3g="; }; - patches = [ - # TODO: Remove on next stable release. - (substituteAll { - src = ./inject-git-commit.patch; - gitCommit = lib.substring 0 7 src.rev; - gitBranch = "master"; - }) - ]; - depsBuildBuild = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/cage/inject-git-commit.patch b/third_party/nixpkgs/pkgs/applications/window-managers/cage/inject-git-commit.patch deleted file mode 100644 index b1c73f4a07..0000000000 --- a/third_party/nixpkgs/pkgs/applications/window-managers/cage/inject-git-commit.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/meson.build b/meson.build -index 4c0cbe280f..d4479741c8 100644 ---- a/meson.build -+++ b/meson.build -@@ -68,14 +68,12 @@ - - version = '@0@'.format(meson.project_version()) - git = find_program('git', native: true, required: false) --if git.found() -- git_commit = run_command([git, 'rev-parse', '--short', 'HEAD'], check: false) -- git_branch = run_command([git, 'rev-parse', '--abbrev-ref', 'HEAD'], check: false) -- if git_commit.returncode() == 0 and git_branch.returncode() == 0 -+if true -+ if true - version = '@0@-@1@ (branch \'@2@\')'.format( - meson.project_version(), -- git_commit.stdout().strip(), -- git_branch.stdout().strip(), -+ '@gitCommit@'.strip(), -+ '@gitBranch@'.strip(), - ) - endif - endif 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 574d2806b3..eaa86ba624 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.43.0"; + version = "0.44.0"; src = fetchFromGitHub { owner = "outfoxxed"; repo = "hy3"; rev = "refs/tags/hl${version}"; - hash = "sha256-hBvwaMlgBuR2cB1Kx6cA1z7x38HXUujNcHtBsKhaEZs="; + hash = "sha256-6TVaB+nWVanqZWqievg+m7tVNrSpQ9CQcwXJQeyU/Q0="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix index 6b16f3c5c7..d0770b439f 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix @@ -8,13 +8,13 @@ mkHyprlandPlugin hyprland { pluginName = "hypr-dynamic-cursors"; - version = "0-unstable-2024-08-01"; + version = "0-unstable-2024-10-10"; src = fetchFromGitHub { owner = "VirtCode"; repo = "hypr-dynamic-cursors"; - rev = "ed2ff68862ae02e04dd06488eb7228e4412f5c33"; - hash = "sha256-02G/SPd/X7zSIFF3V6dkh8mGGWoO0/m6/Yld7HyPmJs="; + rev = "3ff4c2a053f7673b3b8cd45ada0886cbda13ebcc"; + hash = "sha256-XMR9wDNXmY3pPp3imT5vA4Gc6yC3R2Fatp4B53uLHzI="; }; dontUseCmakeConfigure = true; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix index 67b3955199..00db238707 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix @@ -13,13 +13,13 @@ mkHyprlandPlugin hyprland rec { pluginName = "hyprgrass"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "horriblename"; repo = "hyprgrass"; rev = "v${version}"; - hash = "sha256-3CN9ZioI5XBtp6WF61hH2EyASHUIPJQCTXiW1rt9n5w="; + hash = "sha256-0dYMlNYuevQvsd6+imOkic3c6RSssM8WSx1hAepJ/wU="; }; nativeBuildInputs = [ 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 bb5a4dc9f6..99ea4f860c 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.43.0"; + version = "0.44.0"; hyprland-plugins-src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland-plugins"; rev = "refs/tags/v${version}"; - hash = "sha256-dPcWAeRJoG5CyWC32X3XX+Og0v/k1/S1N0T5dQWT32k="; + hash = "sha256-/SeOrMuPEOjngI+MBlzqxQ/sJxkJFIYoef+wJ/PmX2w="; }; in mkHyprlandPlugin hyprland { diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix index 3d39c7d216..53618795c7 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix @@ -9,13 +9,13 @@ mkHyprlandPlugin hyprland { pluginName = "hyprscroller"; - version = "0-unstable-2024-09-06"; + version = "0-unstable-2024-10-10"; src = fetchFromGitHub { owner = "dawsers"; repo = "hyprscroller"; - rev = "07671d7d42b92a85fc7e62cd8f02b0d9c52a8dea"; - hash = "sha256-RLI202fBXz+mDXX5Em70FU+16ChbA/YtpORYiOSX8uc="; + rev = "1a907fd38594ec58a8fe5d68be0dcf2f9e76b0f8"; + hash = "sha256-cgwHl2YtqrnS0ThUyycFGYoYozpq7zT9POARrQAoahY="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix index ff658d30ce..e667f55d9c 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix @@ -8,13 +8,13 @@ mkHyprlandPlugin hyprland { pluginName = "hyprspace"; - version = "0-unstable-2024-08-21"; + version = "0-unstable-2024-09-16"; src = fetchFromGitHub { owner = "KZDKM"; repo = "hyprspace"; - rev = "743ec37d02bb2b7261f28de16bf404cebfd96105"; - hash = "sha256-w0j/3OeSrpx+S8if1M2ONBsZvJQ1hBQkdTQEiMCHy7o="; + rev = "8f14fa2e10d24742d713f04c278bc7651037b74b"; + hash = "sha256-lMIFDORuyMYHtUPrRWU5WjGcS+ZMrR4/wBSO+sgUVSY="; }; dontUseCmakeConfigure = true; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix index 13e51037fc..4d8182af5e 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix @@ -8,13 +8,13 @@ }: mkHyprlandPlugin hyprland rec { pluginName = "hyprsplit"; - version = "0.43.0"; + version = "0.44.1"; src = fetchFromGitHub { owner = "shezdy"; repo = "hyprsplit"; rev = "refs/tags/v${version}"; - hash = "sha256-r533kNIyfgPi/q8ddIYyDK1Pmupt/F3ncHuFo3zjDkU="; + hash = "sha256-l+DQHWPMyUCXbKhbIFVooTKKnCRQ97Ic5smw4VzUcTc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix index b64e97345a..b4736bc960 100644 --- a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix @@ -31,7 +31,6 @@ , isCCTools ? bintools.isCCTools or false , expand-response-params , targetPackages ? {} -, useMacosReexportHack ? false , wrapGas ? false # Note: the hardening flags are part of the bintools-wrapper, rather than @@ -228,16 +227,9 @@ stdenvNoCC.mkDerivation { fi done - '' + (if !useMacosReexportHack then '' if [ -e ''${ld:-$ldPath/${targetPrefix}ld} ]; then wrap ${targetPrefix}ld ${./ld-wrapper.sh} ''${ld:-$ldPath/${targetPrefix}ld} fi - '' else '' - ldInner="${targetPrefix}ld-reexport-delegate" - wrap "$ldInner" ${./macos-sierra-reexport-hack.bash} ''${ld:-$ldPath/${targetPrefix}ld} - wrap "${targetPrefix}ld" ${./ld-wrapper.sh} "$out/bin/$ldInner" - unset ldInner - '') + '' for variant in $ldPath/${targetPrefix}ld.*; do basename=$(basename "$variant") @@ -421,7 +413,5 @@ stdenvNoCC.mkDerivation { attrByPath ["meta" "description"] "System binary utilities" bintools_ + " (wrapper script)"; priority = 10; - } // optionalAttrs useMacosReexportHack { - platforms = platforms.darwin; }; } diff --git a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/macos-sierra-reexport-hack.bash b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/macos-sierra-reexport-hack.bash deleted file mode 100644 index 255071adf6..0000000000 --- a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/macos-sierra-reexport-hack.bash +++ /dev/null @@ -1,246 +0,0 @@ -#! @shell@ - -set -eu -o pipefail - -# For cmd | while read; do ...; done -shopt -s lastpipe - -path_backup="$PATH" -if [ -n "@coreutils_bin@" ]; then - PATH="@coreutils_bin@/bin" -fi - -declare -ri recurThreshold=200 -declare -i overflowCount=0 - -declare -ar origArgs=("$@") - -# Throw away what we won't need -declare -a parentArgs=() - -while (( $# )); do - case "$1" in - -l) - echo "cctools LD does not support '-l foo'" >&2 - exit 1 - ;; - -lazy_library | -reexport_library | -upward_library | -weak_library) - overflowCount+=1 - shift 2 - ;; - -l* | *.so.* | *.dylib | -lazy-l* | -reexport-l* | -upward-l* | -weak-l*) - overflowCount+=1 - shift 1 - ;; - *.a | *.o) - shift 1 - ;; - -L | -F) - # Evidentally ld doesn't like using the child's RPATH, so it still - # needs these. - parentArgs+=("$1" "$2") - shift 2 - ;; - -L?* | -F?*) - parentArgs+=("$1") - shift 1 - ;; - -o) - outputName="$2" - parentArgs+=("$1" "$2") - shift 2 - ;; - -install_name | -dylib_install_name | -dynamic-linker | -plugin) - parentArgs+=("$1" "$2") - shift 2 - ;; - -rpath) - # Only an rpath to the child is needed, which we will add - shift 2 - ;; - *) - if [[ -f "$1" ]]; then - # Propabably a non-standard object file like Haskell's - # `.dyn_o`. Skip it like other inputs - : - else - parentArgs+=("$1") - fi - shift 1 - ;; - esac -done - - - -if (( "$overflowCount" <= "$recurThreshold" )); then - if [ -n "${NIX_DEBUG:-}" ]; then - echo "ld-wrapper: Only ${overflowCount} inputs counted while ${recurThreshold} is the ceiling, linking normally. " >&2 - fi - PATH="$path_backup" - exec @prog@ "${origArgs[@]}" -fi - - - -if [ -n "${NIX_DEBUG:-}" ]; then - echo "ld-wrapper: ${overflowCount} inputs counted when ${recurThreshold} is the ceiling, inspecting further. " >&2 -fi - -# Collect the normalized linker input -declare -a norm=() - -# Arguments are null-separated -@prog@ --dump-normalized-lib-args "${origArgs[@]}" | - while IFS= read -r -d '' input; do - norm+=("$input") - done - -declare -i leafCount=0 -declare lastLeaf='' -declare -a childrenInputs=() trailingInputs=() -while (( "${#norm[@]}" )); do - case "${norm[0]}" in - -lazy_library | -upward_library) - # TODO(@Ericson2314): Don't do that, but intersperse children - # between such args. - echo "ld-wrapper: Warning: Potentially changing link order" >&2 - trailingInputs+=("${norm[0]}" "${norm[1]}") - norm=("${norm[@]:2}") - ;; - -reexport_library | -weak_library) - childrenInputs+=("${norm[0]}" "${norm[1]}") - if [[ "${norm[1]}" != "$lastLeaf" ]]; then - leafCount+=1 - lastLeaf="${norm[1]}" - fi - norm=("${norm[@]:2}") - ;; - *.so | *.dylib) - childrenInputs+=(-reexport_library "${norm[0]}") - if [[ "${norm[0]}" != "$lastLeaf" ]]; then - leafCount+=1 - lastLeaf="${norm[0]}" - fi - norm=("${norm[@]:1}") - ;; - *.o | *.a) - # Don't delegate object files or static libs - parentArgs+=("${norm[0]}") - norm=("${norm[@]:1}") - ;; - *) - if [[ -f "${norm[0]}" ]]; then - # Propabably a non-standard object file. We'll let it by. - parentArgs+=("${norm[0]}") - norm=("${norm[@]:1}") - else - echo "ld-wrapper: Internal Error: Invalid normalized argument" >&2 - exit 255 - fi - ;; - esac -done - - - -if (( "$leafCount" <= "$recurThreshold" )); then - if [ -n "${NIX_DEBUG:-}" ]; then - echo "ld-wrapper: Only ${leafCount} *dynamic* inputs counted while ${recurThreshold} is the ceiling, linking normally. " >&2 - fi - PATH="$path_backup" - exec @prog@ "${origArgs[@]}" -fi - - - -if [ -n "${NIX_DEBUG:-}" ]; then - echo "ld-wrapper: ${leafCount} *dynamic* inputs counted when ${recurThreshold} is the ceiling, delegating to children. " >&2 -fi - -declare -r outputNameLibless=$( \ - if [[ -z "${outputName:+isUndefined}" ]]; then - echo unnamed - return 0; - fi - baseName=$(basename ${outputName}) - if [[ "$baseName" = lib* ]]; then - baseName="${baseName:3}" - fi - echo "$baseName") - -declare -ra children=( - "$outputNameLibless-reexport-delegate-0" - "$outputNameLibless-reexport-delegate-1" -) - -mkdir -p "$out/lib" - -symbolBloatObject=$outputNameLibless-symbol-hack.o -if [[ ! -f $symbolBloatObject ]]; then - # `-Q` means use GNU Assembler rather than Clang, avoiding an awkward - # dependency cycle. - printf '.private_extern _______child_hack_foo\nchild_hack_foo:\n' | - PATH="$PATH:@out@/bin" @targetPrefix@as -Q -- -o $symbolBloatObject -fi - -# Split inputs between children -declare -a child0Inputs=() child1Inputs=("${childrenInputs[@]}") -let "countFirstChild = $leafCount / 2" || true -lastLeaf='' -while (( "$countFirstChild" )); do - case "${child1Inputs[0]}" in - -reexport_library | -weak_library) - child0Inputs+=("${child1Inputs[0]}" "${child1Inputs[1]}") - if [[ "${child1Inputs[1]}" != "$lastLeaf" ]]; then - let countFirstChild-=1 || true - lastLeaf="${child1Inputs[1]}" - fi - child1Inputs=("${child1Inputs[@]:2}") - ;; - *.so | *.dylib) - child0Inputs+=(-reexport_library "${child1Inputs[0]}") - if [[ "${child1Inputs[0]}" != "$lastLeaf" ]]; then - let countFirstChild-=1 || true - lastLeaf="${child1Inputs[1]}" - fi - child1Inputs=("${child1Inputs[@]:2}") - ;; - *) - echo "ld-wrapper: Internal Error: Invalid delegated input" >&2 - exit -1 - ;; - esac -done - - -# First half of libs -@out@/bin/@targetPrefix@ld \ - -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ - -o "$out/lib/lib${children[0]}.dylib" \ - -install_name "$out/lib/lib${children[0]}.dylib" \ - "$symbolBloatObject" "${child0Inputs[@]}" "${trailingInputs[@]}" - -# Second half of libs -@out@/bin/@targetPrefix@ld \ - -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ - -o "$out/lib/lib${children[1]}.dylib" \ - -install_name "$out/lib/lib${children[1]}.dylib" \ - "$symbolBloatObject" "${child1Inputs[@]}" "${trailingInputs[@]}" - -parentArgs+=("-L$out/lib" -rpath "$out/lib") -if [[ $outputName != *reexport-delegate* ]]; then - parentArgs+=("-l${children[0]}" "-l${children[1]}") -else - parentArgs+=("-reexport-l${children[0]}" "-reexport-l${children[1]}") -fi - -parentArgs+=("${trailingInputs[@]}") - -if [ -n "${NIX_DEBUG:-}" ]; then - echo "flags using delegated children to @prog@:" >&2 - printf " %q\n" "${parentArgs[@]}" >&2 -fi - -PATH="$path_backup" -exec @prog@ "${parentArgs[@]}" diff --git a/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix b/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix index 4eeb3b0f16..f80807cc1e 100644 --- a/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix +++ b/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix @@ -12,6 +12,7 @@ , targetPkgs ? pkgs: [] , multiPkgs ? pkgs: [] , multiArch ? false # Whether to include 32bit packages +, includeClosures ? false # Whether to include closures of all packages , nativeBuildInputs ? [] , extraBuildCommands ? "" , extraBuildCommandsMulti ? "" @@ -87,7 +88,6 @@ let etcProfile = writeText "profile" '' export PS1='${name}-fhsenv:\u@\h:\w\$ ' export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive' - export LD_LIBRARY_PATH="/run/opengl-driver/lib:/run/opengl-driver-32/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" export PATH="/run/wrappers/bin:/usr/bin:/usr/sbin:$PATH" export TZDIR='/etc/zoneinfo' @@ -172,6 +172,7 @@ let ${pkgs.glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas fi ''; + inherit includeClosures; }; staticUsrProfileMulti = buildEnv { @@ -179,6 +180,7 @@ let paths = baseMultiPaths ++ multiPaths; extraOutputsToInstall = [ "out" "lib" ] ++ extraOutputsToInstall; ignoreCollisions = true; + inherit includeClosures; }; # setup library paths only for the targeted architecture @@ -209,7 +211,7 @@ let chmod u+w -R lib64/ # symlink 32-bit ld-linux.so - ln -Ls ${staticUsrProfileTarget}/lib/32/ld-linux.so.2 lib/ + ln -Lsf ${staticUsrProfileTarget}/lib/32/ld-linux.so.2 lib/ ''; setupLibDirs = if isTargetBuild @@ -243,7 +245,7 @@ let done cd .. - for i in var etc opt; do + for i in etc opt; do if [ -d "${staticUsrProfileTarget}/$i" ]; then cp -rsHf "${staticUsrProfileTarget}/$i" "$i" fi diff --git a/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/container-init.cc b/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/container-init.cc new file mode 100644 index 0000000000..351e92477a --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/container-init.cc @@ -0,0 +1,63 @@ +#include + +#include +#include +#include + +#include + +const char LD_SO_CONF[] = R"(/lib +/lib/x86_64-linux-gnu +/lib64 +/usr/lib +/usr/lib/x86_64-linux-gnu +/usr/lib64 +/lib/i386-linux-gnu +/lib32 +/usr/lib/i386-linux-gnu +/usr/lib32 +/run/opengl-driver/lib +/run/opengl-driver-32/lib +)"; + +int main(int, const char *argv[]) { + std::ofstream ld_so_conf; + ld_so_conf.open("/etc/ld.so.conf"); + ld_so_conf << LD_SO_CONF; + ld_so_conf.close(); + if (!ld_so_conf) { + perror("Failed to generate ld.so.conf"); + return 1; + } + + int e; + pid_t pid; + const char *ldconfig_argv[] = {"/bin/ldconfig", NULL}; + char *ldconfig_envp[] = {NULL}; + if ((e = posix_spawn(&pid, ldconfig_argv[0], NULL, NULL, + (char *const *)ldconfig_argv, ldconfig_envp))) { + fprintf(stderr, "Failed to run ldconfig: %s\n", strerror(e)); + return 1; + } + + int status; + if (waitpid(pid, &status, 0) == -1) { + perror("Failed to wait for ldconfig"); + return 1; + } + if (WIFEXITED(status)) { + if (WEXITSTATUS(status)) { + fprintf(stderr, "ldconfig exited %d\n", WEXITSTATUS(status)); + return 1; + } + } else { + fprintf(stderr, "ldconfig killed by signal %d\n", WTERMSIG(status)); + return 1; + } + + argv[0] = "/init"; + execv(argv[0], (char *const *)argv); + + perror("Failed to exec stage 2 init"); + return 1; +} diff --git a/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/default.nix b/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/default.nix index 5be1172352..8bf5aebeb5 100644 --- a/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/default.nix @@ -5,6 +5,7 @@ , writeShellScript , glibc , pkgsi686Linux +, runCommandCC , coreutils , bubblewrap }: @@ -98,29 +99,30 @@ let ]; in map (path: "/etc/${path}") files; - # Create this on the fly instead of linking from /nix - # The container might have to modify it and re-run ldconfig if there are - # issues running some binary with LD_LIBRARY_PATH - createLdConfCache = '' - cat > /etc/ld.so.conf < /dev/null + # Here's the problem case: + # - we need to run bash to run the init script + # - LD_PRELOAD may be set to another dynamic library, requiring us to discover its dependencies + # - oops! ldconfig is part of the init script, and it hasn't run yet + # - everything explodes + # + # In particular, this happens with fhsenvs in fhsenvs, e.g. when running + # a wrapped game from Steam. + # + # So, instead of doing that, we build a tiny static (important!) shim + # that executes ldconfig in a completely clean environment to generate + # the initial cache, and then execs into the "real" init, which is the + # first time we see anything dynamically linked at all. + # + # Also, the real init is placed strategically at /init, so we don't + # have to recompile this every time. + containerInit = runCommandCC "container-init" { + buildInputs = [ stdenv.cc.libc.static or null ]; + } '' + $CXX -static -s -o $out ${./container-init.cc} ''; - init = run: writeShellScript "${name}-init" '' + + realInit = run: writeShellScript "${name}-init" '' source /etc/profile - ${createLdConfCache} exec ${run} "$@" ''; @@ -253,6 +255,7 @@ let --symlink /etc/ld.so.cache ${glibc}/etc/ld.so.cache \ --ro-bind ${glibc}/etc/rpc ${glibc}/etc/rpc \ --remount-ro ${glibc}/etc \ + --symlink ${realInit runScript} /init \ '' + optionalString fhsenv.isMultiBuild (indentLines '' --tmpfs ${pkgsi686Linux.glibc}/etc \ --symlink /etc/ld.so.conf ${pkgsi686Linux.glibc}/etc/ld.so.conf \ @@ -265,7 +268,7 @@ let "''${auto_mounts[@]}" "''${x11_args[@]}" ${concatStringsSep "\n " extraBwrapArgs} - ${init runScript} ${initArgs} + ${containerInit} ${initArgs} ) exec "''${cmd[@]}" ''; diff --git a/third_party/nixpkgs/pkgs/build-support/buildenv/builder.pl b/third_party/nixpkgs/pkgs/build-support/buildenv/builder.pl index 975e76df05..12d922770a 100755 --- a/third_party/nixpkgs/pkgs/build-support/buildenv/builder.pl +++ b/third_party/nixpkgs/pkgs/build-support/buildenv/builder.pl @@ -255,6 +255,21 @@ while (scalar(keys %postponed) > 0) { } } +my $extraPathsFilePath = $ENV{"extraPathsFrom"}; +if ($extraPathsFilePath) { + open FILE, $extraPathsFilePath or die "cannot open extra paths file $extraPathsFilePath: $!"; + + while(my $line = ) { + chomp $line; + addPkg($line, + $ENV{"ignoreCollisions"} eq "1", + $ENV{"checkCollisionContents"} eq "1", + 1000) + if -d $line; + } + + close FILE; +} # Create the symlinks. my $nrLinks = 0; diff --git a/third_party/nixpkgs/pkgs/build-support/buildenv/default.nix b/third_party/nixpkgs/pkgs/build-support/buildenv/default.nix index cb0c308ec2..5183a358ce 100644 --- a/third_party/nixpkgs/pkgs/build-support/buildenv/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/buildenv/default.nix @@ -1,7 +1,7 @@ # buildEnv creates a tree of symlinks to the specified paths. This is # a fork of the hardcoded buildEnv in the Nix distribution. -{ buildPackages, runCommand, lib, substituteAll }: +{ buildPackages, runCommand, lib, substituteAll, writeClosure }: let builder = substituteAll { @@ -23,6 +23,9 @@ lib.makeOverridable , # Whether to ignore collisions or abort. ignoreCollisions ? false +, # Whether to include closures of all input paths. + includeClosures ? false + , # If there is a collision, check whether the contents and permissions match # and only if not, throw a collision error. checkCollisionContents ? true @@ -49,27 +52,35 @@ lib.makeOverridable , passthru ? {} , meta ? {} }: +let + chosenOutputs = map (drv: { + paths = + # First add the usual output(s): respect if user has chosen explicitly, + # and otherwise use `meta.outputsToInstall`. The attribute is guaranteed + # to exist in mkDerivation-created cases. The other cases (e.g. runCommand) + # aren't expected to have multiple outputs. + (if (! drv ? outputSpecified || ! drv.outputSpecified) + && drv.meta.outputsToInstall or null != null + then map (outName: drv.${outName}) drv.meta.outputsToInstall + else [ drv ]) + # Add any extra outputs specified by the caller of `buildEnv`. + ++ lib.filter (p: p!=null) + (builtins.map (outName: drv.${outName} or null) extraOutputsToInstall); + priority = drv.meta.priority or lib.meta.defaultPriority; + }) paths; -runCommand name + pathsForClosure = lib.pipe chosenOutputs [ + (map (p: p.paths)) + lib.flatten + (lib.remove null) + ]; +in runCommand name rec { inherit manifest ignoreCollisions checkCollisionContents passthru meta pathsToLink extraPrefix postBuild nativeBuildInputs buildInputs; - pkgs = builtins.toJSON (map (drv: { - paths = - # First add the usual output(s): respect if user has chosen explicitly, - # and otherwise use `meta.outputsToInstall`. The attribute is guaranteed - # to exist in mkDerivation-created cases. The other cases (e.g. runCommand) - # aren't expected to have multiple outputs. - (if (! drv ? outputSpecified || ! drv.outputSpecified) - && drv.meta.outputsToInstall or null != null - then map (outName: drv.${outName}) drv.meta.outputsToInstall - else [ drv ]) - # Add any extra outputs specified by the caller of `buildEnv`. - ++ lib.filter (p: p!=null) - (builtins.map (outName: drv.${outName} or null) extraOutputsToInstall); - priority = drv.meta.priority or lib.meta.defaultPriority; - }) paths); + pkgs = builtins.toJSON chosenOutputs; + extraPathsFrom = lib.optional includeClosures (writeClosure pathsForClosure); preferLocalBuild = true; allowSubstitutes = false; # XXX: The size is somewhat arbitrary diff --git a/third_party/nixpkgs/pkgs/build-support/closure-info.nix b/third_party/nixpkgs/pkgs/build-support/closure-info.nix index f2aa4964d9..cbeefc0e10 100644 --- a/third_party/nixpkgs/pkgs/build-support/closure-info.nix +++ b/third_party/nixpkgs/pkgs/build-support/closure-info.nix @@ -4,13 +4,13 @@ # "nix-store --load-db" and "nix-store --register-validity # --hash-given". -{ stdenv, coreutils, jq }: +{ stdenvNoCC, coreutils, jq }: { rootPaths }: assert builtins.langVersion >= 5; -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { name = "closure-info"; __structuredAttrs = true; diff --git a/third_party/nixpkgs/pkgs/build-support/coq/default.nix b/third_party/nixpkgs/pkgs/build-support/coq/default.nix index 866b0d3256..2533875376 100644 --- a/third_party/nixpkgs/pkgs/build-support/coq/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/coq/default.nix @@ -146,7 +146,7 @@ stdenv.mkDerivation (removeAttrs ({ }) // (optionalAttrs (args?useMelquiondRemake) rec { COQUSERCONTRIB = "$out/lib/coq/${coq.coq-version}/user-contrib"; - preConfigurePhases = "autoconf"; + preConfigurePhases = [ "autoconf" ]; configureFlags = [ "--libdir=${COQUSERCONTRIB}/${useMelquiondRemake.logpath or ""}" ]; buildPhase = "./remake -j$NIX_BUILD_CORES"; installPhase = "./remake install"; diff --git a/third_party/nixpkgs/pkgs/build-support/dart/build-dart-application/default.nix b/third_party/nixpkgs/pkgs/build-support/dart/build-dart-application/default.nix index bd1d2ac1b4..7b8057f50a 100644 --- a/third_party/nixpkgs/pkgs/build-support/dart/build-dart-application/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/dart/build-dart-application/default.nix @@ -60,7 +60,25 @@ let generators = callPackage ./generators.nix { inherit dart; } { buildDrvArgs = args; }; pubspecLockFile = builtins.toJSON pubspecLock; - pubspecLockData = pub2nix.readPubspecLock { inherit src packageRoot pubspecLock gitHashes sdkSourceBuilders customSourceBuilders; }; + pubspecLockData = pub2nix.readPubspecLock { + inherit src packageRoot pubspecLock gitHashes customSourceBuilders; + sdkSourceBuilders = { + # https://github.com/dart-lang/pub/blob/e1fbda73d1ac597474b82882ee0bf6ecea5df108/lib/src/sdk/dart.dart#L80 + "dart" = name: runCommand "dart-sdk-${name}" { passthru.packageRoot = "."; } '' + for path in '${dart}/pkg/${name}'; do + if [ -d "$path" ]; then + ln -s "$path" "$out" + break + fi + done + + if [ ! -e "$out" ]; then + echo 1>&2 'The Dart SDK does not contain the requested package: ${name}!' + exit 1 + fi + ''; + } // sdkSourceBuilders; + }; packageConfig = generators.linkPackageConfig { packageConfig = pub2nix.generatePackageConfig { pname = if args.pname != null then "${args.pname}-${args.version}" else null; diff --git a/third_party/nixpkgs/pkgs/build-support/go/module.nix b/third_party/nixpkgs/pkgs/build-support/go/module.nix index e1e3991843..3a3ae71de5 100644 --- a/third_party/nixpkgs/pkgs/build-support/go/module.nix +++ b/third_party/nixpkgs/pkgs/build-support/go/module.nix @@ -1,56 +1,62 @@ { go, cacert, git, lib, stdenv }: { name ? "${args'.pname}-${args'.version}" + # The source used to build the derivation. , src + # Native build inputs used for the derivation. , nativeBuildInputs ? [ ] , passthru ? { } , patches ? [ ] - # A function to override the goModules derivation + # A function to override the `goModules` derivation. , overrideModAttrs ? (finalAttrs: previousAttrs: { }) - # path to go.mod and go.sum directory + # Directory to the `go.mod` and `go.sum` relative to the `src`. , modRoot ? "./" - # vendorHash is the SRI hash of the vendored dependencies - # - # if vendorHash is null, then we won't fetch any dependencies and - # rely on the vendor folder within the source. + # The SRI hash of the vendored dependencies. + # If `vendorHash` is `null`, no dependencies are fetched and + # the build relies on the vendor folder within the source. , vendorHash ? throw ( if args'?vendorSha256 then "buildGoModule: Expect vendorHash instead of vendorSha256" else "buildGoModule: vendorHash is missing" ) + # Whether to delete the vendor folder supplied with the source. , deleteVendor ? false + # Whether to fetch (go mod download) and proxy the vendor directory. # This is useful if your code depends on c code and go mod tidy does not # include the needed sources to build or if any dependency has case-insensitive # conflicts which will produce platform dependant `vendorHash` checksums. , proxyVendor ? false - # We want parallel builds by default + # We want parallel builds by default. , enableParallelBuilding ? true # Do not enable this without good reason - # IE: programs coupled with the compiler + # IE: programs coupled with the compiler. , allowGoReference ? false + # Go env. variable to enable CGO. , CGO_ENABLED ? go.CGO_ENABLED + # Meta data for the final derivation. , meta ? { } - # Not needed with buildGoModule + # Not needed with `buildGoModule`. , goPackagePath ? "" + # Go linker flags. , ldflags ? [ ] - + # Go build flags. , GOFLAGS ? [ ] - # needed for buildFlags{,Array} warning -, buildFlags ? "" -, buildFlagsArray ? "" + # Needed for buildFlags{,Array} warning +, buildFlags ? "" # deprecated +, buildFlagsArray ? "" # deprecated , ... }@args': @@ -79,10 +85,10 @@ in inherit (go) GOOS GOARCH; inherit GO111MODULE GOTOOLCHAIN; - # The following inheritence behavior is not trivial to expect, and some may + # The following inheritance behavior is not trivial to expect, and some may # argue it's not ideal. Changing it may break vendor hashes in Nixpkgs and # out in the wild. In anycase, it's documented in: - # doc/languages-frameworks/go.section.md + # doc/languages-frameworks/go.section.md. prePatch = finalAttrs.prePatch or ""; patches = finalAttrs.patches or [ ]; patchFlags = finalAttrs.patchFlags or [ ]; @@ -160,8 +166,8 @@ in outputHashMode = "recursive"; outputHash = finalAttrs.vendorHash; - # Handle empty vendorHash; avoid - # error: empty hash requires explicit hash algorithm + # Handle empty `vendorHash`; avoid error: + # empty hash requires explicit hash algorithm. outputHashAlgo = if finalAttrs.vendorHash == "" then "sha256" else null; # in case an overlay clears passthru by accident, don't fail evaluation }).overrideAttrs (finalAttrs.passthru.overrideModAttrs or overrideModAttrs); @@ -323,7 +329,7 @@ in } // passthru; meta = { - # Add default meta information + # Add default meta information. platforms = go.meta.platforms or lib.platforms.all; } // meta; } diff --git a/third_party/nixpkgs/pkgs/build-support/make-darwin-bundle/default.nix b/third_party/nixpkgs/pkgs/build-support/make-darwin-bundle/default.nix index 52dd54b0b2..a80ebf8fac 100644 --- a/third_party/nixpkgs/pkgs/build-support/make-darwin-bundle/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/make-darwin-bundle/default.nix @@ -22,5 +22,5 @@ writeShellScript "make-darwin-bundle-${name}" ('' ${writeDarwinBundle}/bin/write-darwin-bundle "''${!outputBin}" "${name}" "${exec}" } - preDistPhases+=" makeDarwinBundlePhase" + appendToVar preDistPhases makeDarwinBundlePhase '') diff --git a/third_party/nixpkgs/pkgs/build-support/release/binary-tarball.nix b/third_party/nixpkgs/pkgs/build-support/release/binary-tarball.nix index 37c5f8c7ee..aeaa8edb52 100644 --- a/third_party/nixpkgs/pkgs/build-support/release/binary-tarball.nix +++ b/third_party/nixpkgs/pkgs/build-support/release/binary-tarball.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation ( prefix = "/usr/local"; - postPhases = "finalPhase"; + postPhases = [ "finalPhase" ]; } // args // diff --git a/third_party/nixpkgs/pkgs/build-support/release/debian-build.nix b/third_party/nixpkgs/pkgs/build-support/release/debian-build.nix index ab84a504b5..e73b39c4e6 100644 --- a/third_party/nixpkgs/pkgs/build-support/release/debian-build.nix +++ b/third_party/nixpkgs/pkgs/build-support/release/debian-build.nix @@ -18,7 +18,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( prefix = "/usr"; - prePhases = "installExtraDebsPhase sysInfoPhase"; + prePhases = [ "installExtraDebsPhase" "sysInfoPhase" ]; } // removeAttrs args ["vmTools" "lib"] // diff --git a/third_party/nixpkgs/pkgs/build-support/release/source-tarball.nix b/third_party/nixpkgs/pkgs/build-support/release/source-tarball.nix index fbc8bc6b25..4effd63f74 100644 --- a/third_party/nixpkgs/pkgs/build-support/release/source-tarball.nix +++ b/third_party/nixpkgs/pkgs/build-support/release/source-tarball.nix @@ -31,8 +31,8 @@ stdenv.mkDerivation ( showBuildStats = true; - preConfigurePhases = "autoconfPhase"; - postPhases = "finalPhase"; + preConfigurePhases = [ "autoconfPhase" ]; + postPhases = [ "finalPhase" ]; # Autoconfiscate the sources. autoconfPhase = '' diff --git a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix index 40b7a61812..6ce4cadfd1 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix @@ -44,8 +44,7 @@ , buildFeatures ? [ ] , checkFeatures ? buildFeatures , useNextest ? false -# Enable except on aarch64 pkgsStatic, where we use lld for reasons -, auditable ? !cargo-auditable.meta.broken && !(stdenv.hostPlatform.isStatic && stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isDarwin) +, auditable ? !cargo-auditable.meta.broken , depsExtraArgs ? {} @@ -97,6 +96,11 @@ assert useSysroot -> !(args.doCheck or true); stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "cargoLock" ]) // lib.optionalAttrs useSysroot { RUSTFLAGS = "--sysroot ${sysroot} " + (args.RUSTFLAGS or ""); +} // lib.optionalAttrs (stdenv.isDarwin && buildType == "debug") { + RUSTFLAGS = + "-C split-debuginfo=packed " + + lib.optionalString useSysroot "--sysroot ${sysroot} " + + (args.RUSTFLAGS or ""); } // { inherit buildAndTestSubdir cargoDeps; @@ -151,23 +155,10 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg strictDeps = true; meta = meta // { - badPlatforms = meta.badPlatforms or [] ++ [ - # Rust is currently unable to target the n32 ABI - lib.systems.inspect.patterns.isMips64n32 - ]; - } // lib.optionalAttrs (rustc.meta ? platforms) { + badPlatforms = meta.badPlatforms or [] ++ rustc.badTargetPlatforms; # default to Rust's platforms platforms = lib.intersectLists meta.platforms or lib.platforms.all - (rustc.meta.platforms ++ [ - # Platforms without host tools from - # https://doc.rust-lang.org/nightly/rustc/platform-support.html - "armv7a-darwin" - "armv5tel-linux" "armv7a-linux" "m68k-linux" "mips-linux" - "mips64-linux" "mipsel-linux" "mips64el-linux" "riscv32-linux" - "armv6l-netbsd" "mipsel-netbsd" "riscv64-netbsd" - "x86_64-redox" - "wasm32-wasi" - ]); + rustc.targetPlatforms; }; }) diff --git a/third_party/nixpkgs/pkgs/build-support/rust/fetch-cargo-tarball/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/fetch-cargo-tarball/default.nix index c16f3540e6..96db232ce2 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/fetch-cargo-tarball/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/fetch-cargo-tarball/default.nix @@ -136,7 +136,7 @@ stdenv.mkDerivation ( # Packages with git dependencies generate non-default cargo configs, so # always install it rather than trying to write a standard default template. - install -D $CARGO_CONFIG $name/.cargo/config; + install -D $CARGO_CONFIG $name/.cargo/config runHook postBuild ''; diff --git a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-build-hook.sh b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-build-hook.sh index 26dde914f2..749ebed8b0 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-build-hook.sh +++ b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-build-hook.sh @@ -1,4 +1,4 @@ -declare -a cargoBuildFlags +# shellcheck shell=bash disable=SC2154,SC2164 cargoBuildHook() { echo "Executing cargoBuildHook" @@ -9,44 +9,38 @@ cargoBuildHook() { # separateDebugInfo. export "CARGO_PROFILE_${cargoBuildType@U}_STRIP"=false - if [ ! -z "${buildAndTestSubdir-}" ]; then + if [ -n "${buildAndTestSubdir-}" ]; then # ensure the output doesn't end up in the subdirectory - export CARGO_TARGET_DIR="$(pwd)/target" + CARGO_TARGET_DIR="$(pwd)/target" + export CARGO_TARGET_DIR pushd "${buildAndTestSubdir}" fi + local flagsArray=( + "-j" "$NIX_BUILD_CORES" + "--target" "@rustHostPlatformSpec@" + "--offline" + ) + if [ "${cargoBuildType}" != "debug" ]; then - cargoBuildProfileFlag="--profile ${cargoBuildType}" + flagsArray+=("--profile" "${cargoBuildType}") fi if [ -n "${cargoBuildNoDefaultFeatures-}" ]; then - cargoBuildNoDefaultFeaturesFlag=--no-default-features + flagsArray+=("--no-default-features") fi if [ -n "${cargoBuildFeatures-}" ]; then - if [ -n "$__structuredAttrs" ]; then - OLDIFS="$IFS" - IFS=','; cargoBuildFeaturesFlag="--features=${cargoBuildFeatures[*]}" - IFS="$OLDIFS" - unset OLDIFS - else - cargoBuildFeaturesFlag="--features=${cargoBuildFeatures// /,}" - fi + flagsArray+=("--features=$(concatStringsSep "," cargoBuildFeatures)") fi - ( - set -x - @setEnv@ cargo build -j $NIX_BUILD_CORES \ - --target @rustHostPlatformSpec@ \ - --offline \ - ${cargoBuildProfileFlag} \ - ${cargoBuildNoDefaultFeaturesFlag} \ - ${cargoBuildFeaturesFlag} \ - ${cargoBuildFlags} - ) + concatTo flagsArray cargoBuildFlags - if [ ! -z "${buildAndTestSubdir-}" ]; then + echoCmd 'cargoBuildHook flags' "${flagsArray[@]}" + @setEnv@ cargo build "${flagsArray[@]}" + + if [ -n "${buildAndTestSubdir-}" ]; then popd fi diff --git a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-check-hook.sh b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-check-hook.sh index 96b87dbf15..07eae85d13 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-check-hook.sh +++ b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-check-hook.sh @@ -1,5 +1,4 @@ -declare -a checkFlags -declare -a cargoTestFlags +# shellcheck shell=bash disable=SC2154,SC2164 cargoCheckHook() { echo "Executing cargoCheckHook" @@ -10,37 +9,37 @@ cargoCheckHook() { pushd "${buildAndTestSubdir}" fi + local flagsArray=("-j" "$NIX_BUILD_CORES") + if [[ -z ${dontUseCargoParallelTests-} ]]; then - threads=$NIX_BUILD_CORES + prependToVar checkFlags "--test-threads=$NIX_BUILD_CORES" else - threads=1 + prependToVar checkFlags "--test-threads=1" fi if [ "${cargoCheckType}" != "debug" ]; then - cargoCheckProfileFlag="--profile ${cargoCheckType}" + flagsArray+=("--profile" "${cargoCheckType}") fi if [ -n "${cargoCheckNoDefaultFeatures-}" ]; then - cargoCheckNoDefaultFeaturesFlag=--no-default-features + flagsArray+=("--no-default-features") fi if [ -n "${cargoCheckFeatures-}" ]; then - cargoCheckFeaturesFlag="--features=${cargoCheckFeatures// /,}" + flagsArray+=("--features=$(concatStringsSep "," cargoCheckFeatures)") fi - argstr="${cargoCheckProfileFlag} ${cargoCheckNoDefaultFeaturesFlag} ${cargoCheckFeaturesFlag} - --target @rustHostPlatformSpec@ --offline ${cargoTestFlags}" - - ( - set -x - cargo test \ - -j $NIX_BUILD_CORES \ - ${argstr} -- \ - --test-threads=${threads} \ - ${checkFlags} \ - ${checkFlagsArray+"${checkFlagsArray[@]}"} + flagsArray+=( + "--target" "@rustHostPlatformSpec@" + "--offline" ) + prependToVar checkFlags "--" + concatTo flagsArray cargoTestFlags checkFlags checkFlagsArray + + echoCmd 'cargoCheckHook flags' "${flagsArray[@]}" + cargo test "${flagsArray[@]}" + if [[ -n "${buildAndTestSubdir-}" ]]; then popd fi diff --git a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-install-hook.sh b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-install-hook.sh index 24a6e6fa9e..4cf7840220 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-install-hook.sh +++ b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-install-hook.sh @@ -36,6 +36,11 @@ cargoInstallHook() { -maxdepth 1 \ -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \ -print0 | xargs -r -0 cp -t $out/lib + + # If present, copy any .dSYM directories for debugging on darwin + # https://github.com/NixOS/nixpkgs/issues/330036 + find "${releaseDir}" -maxdepth 1 -name '*.dSYM' -exec cp -RLt $out/bin/ {} + + rmdir --ignore-fail-on-non-empty $out/lib $out/bin runHook postInstall diff --git a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh index 16d32513a0..4719d1bad8 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh +++ b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh @@ -1,5 +1,4 @@ -declare -a checkFlags -declare -a cargoTestFlags +# shellcheck shell=bash disable=SC2154,SC2164 cargoNextestHook() { echo "Executing cargoNextestHook" @@ -10,35 +9,34 @@ cargoNextestHook() { pushd "${buildAndTestSubdir}" fi + local flagsArray=( + "--target" "@rustHostPlatformSpec@" + "--offline" + ) + if [[ -z ${dontUseCargoParallelTests-} ]]; then - threads=$NIX_BUILD_CORES + flagsArray+=("-j" "$NIX_BUILD_CORES") else - threads=1 + flagsArray+=("-j" "1") fi if [ "${cargoCheckType}" != "debug" ]; then - cargoCheckProfileFlag="--cargo-profile ${cargoCheckType}" + flagsArray+=("--cargo-profile" "${cargoCheckType}") fi if [ -n "${cargoCheckNoDefaultFeatures-}" ]; then - cargoCheckNoDefaultFeaturesFlag=--no-default-features + flagsArray+=("--no-default-features") fi if [ -n "${cargoCheckFeatures-}" ]; then - cargoCheckFeaturesFlag="--features=${cargoCheckFeatures// /,}" + flagsArray+=("--features=$(concatStringsSep "," cargoCheckFeatures)") fi - argstr="${cargoCheckProfileFlag} ${cargoCheckNoDefaultFeaturesFlag} ${cargoCheckFeaturesFlag} - --target @rustHostPlatformSpec@ --offline ${cargoTestFlags}" + prependToVar checkFlags "--" + concatTo flagsArray cargoTestFlags checkFlags checkFlagsArray - ( - set -x - cargo nextest run \ - -j ${threads} \ - ${argstr} -- \ - ${checkFlags} \ - ${checkFlagsArray+"${checkFlagsArray[@]}"} - ) + echoCmd 'cargoNextestHook flags' "${flagsArray[@]}" + cargo nextest run "${flagsArray[@]}" if [[ -n "${buildAndTestSubdir-}" ]]; then popd diff --git a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-setup-hook.sh b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-setup-hook.sh index 693c0b0875..1c779a6541 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-setup-hook.sh +++ b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-setup-hook.sh @@ -22,7 +22,7 @@ cargoSetupPostUnpackHook() { mkdir .cargo fi - config="$cargoDepsCopy/.cargo/config"; + config="$cargoDepsCopy/.cargo/config.toml" if [[ ! -e $config ]]; then config=@defaultConfig@ fi; @@ -30,9 +30,9 @@ cargoSetupPostUnpackHook() { tmp_config=$(mktemp) substitute $config $tmp_config \ --subst-var-by vendor "$cargoDepsCopy" - cat ${tmp_config} >> .cargo/config + cat ${tmp_config} >> .cargo/config.toml - cat >> .cargo/config <<'EOF' + cat >> .cargo/config.toml <<'EOF' @cargoConfig@ EOF diff --git a/third_party/nixpkgs/pkgs/build-support/rust/hooks/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/hooks/default.nix index 874f23fe7e..7703ff4aba 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/hooks/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/hooks/default.nix @@ -66,10 +66,10 @@ cargoConfig = '' [target."${stdenv.buildPlatform.rust.rustcTarget}"] - "linker" = "${rust.envVars.linkerForBuild}" + "linker" = "${rust.envVars.ccForBuild}" ${lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) '' [target."${stdenv.hostPlatform.rust.rustcTarget}"] - "linker" = "${rust.envVars.linkerForHost}" + "linker" = "${rust.envVars.ccForHost}" ''} "rustflags" = [ "-C", "target-feature=${if stdenv.hostPlatform.isStatic then "+" else "-"}crt-static" ] ''; diff --git a/third_party/nixpkgs/pkgs/build-support/rust/hooks/maturin-build-hook.sh b/third_party/nixpkgs/pkgs/build-support/rust/hooks/maturin-build-hook.sh index c1e701425f..2eab2124e7 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/hooks/maturin-build-hook.sh +++ b/third_party/nixpkgs/pkgs/build-support/rust/hooks/maturin-build-hook.sh @@ -1,3 +1,5 @@ +# shellcheck shell=bash disable=SC2154,SC2164 + maturinBuildHook() { echo "Executing maturinBuildHook" @@ -6,24 +8,26 @@ maturinBuildHook() { # Put the wheel to dist/ so that regular Python tooling can find it. local dist="$PWD/dist" - if [ ! -z "${buildAndTestSubdir-}" ]; then + if [ -n "${buildAndTestSubdir-}" ]; then pushd "${buildAndTestSubdir}" fi - ( - set -x - @setEnv@ maturin build \ - --jobs=$NIX_BUILD_CORES \ - --offline \ - --target @rustTargetPlatformSpec@ \ - --manylinux off \ - --strip \ - --release \ - --out "$dist" \ - ${maturinBuildFlags-} + local flagsArray=( + "--jobs=$NIX_BUILD_CORES" + "--offline" + "--target" "@rustTargetPlatformSpec@" + "--manylinux" "off" + "--strip" + "--release" + "--out" "$dist" ) - if [ ! -z "${buildAndTestSubdir-}" ]; then + concatTo flagsArray maturinBuildFlags + + echoCmd 'maturinBuildHook flags' "${flagsArray[@]}" + @setEnv@ maturin build "${flagsArray[@]}" + + if [ -n "${buildAndTestSubdir-}" ]; then popd fi diff --git a/third_party/nixpkgs/pkgs/build-support/rust/import-cargo-lock.nix b/third_party/nixpkgs/pkgs/build-support/rust/import-cargo-lock.nix index 3db3f0e5e1..e88931d0f3 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/import-cargo-lock.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/import-cargo-lock.nix @@ -229,7 +229,7 @@ let else "cp $lockFileContentsPath $out/Cargo.lock" } - cat > $out/.cargo/config < $out/.cargo/config.toml <> $out/.cargo/config <> $out/.cargo/config.toml <> $out/.cargo/config + cat "$crate/.cargo-config" >> $out/.cargo/config.toml fi fi done diff --git a/third_party/nixpkgs/pkgs/build-support/rust/lib/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/lib/default.nix index 3229748548..c23f779bfe 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/lib/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/lib/default.nix @@ -14,19 +14,11 @@ rec { # passed on a build=x86_64/host=aarch64 compilation. envVars = let - # As a workaround for https://github.com/rust-lang/rust/issues/89626 use lld on pkgsStatic aarch64 - shouldUseLLD = platform: platform.isAarch64 && platform.isStatic && !stdenv.hostPlatform.isDarwin; - ccForBuild = "${pkgsBuildHost.stdenv.cc}/bin/${pkgsBuildHost.stdenv.cc.targetPrefix}cc"; cxxForBuild = "${pkgsBuildHost.stdenv.cc}/bin/${pkgsBuildHost.stdenv.cc.targetPrefix}c++"; - linkerForBuild = ccForBuild; ccForHost = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; cxxForHost = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"; - linkerForHost = if shouldUseLLD stdenv.targetPlatform - && !stdenv.cc.bintools.isLLVM - then "${pkgsBuildHost.llvmPackages.bintools}/bin/${stdenv.cc.targetPrefix}ld.lld" - else ccForHost; # Unfortunately we must use the dangerous `pkgsTargetTarget` here # because hooks are artificially phase-shifted one slot earlier @@ -34,10 +26,6 @@ rec { # a targetPlatform to them). ccForTarget = "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc"; cxxForTarget = "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++"; - linkerForTarget = if shouldUseLLD pkgsTargetTarget.stdenv.targetPlatform - && !pkgsTargetTarget.stdenv.cc.bintools.isLLVM # whether stdenv's linker is lld already - then "${pkgsBuildTarget.llvmPackages.bintools}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}ld.lld" - else ccForTarget; rustBuildPlatform = stdenv.buildPlatform.rust.rustcTarget; rustBuildPlatformSpec = stdenv.buildPlatform.rust.rustcTargetSpec; @@ -47,9 +35,9 @@ rec { rustTargetPlatformSpec = stdenv.targetPlatform.rust.rustcTargetSpec; in { inherit - ccForBuild cxxForBuild linkerForBuild rustBuildPlatform rustBuildPlatformSpec - ccForHost cxxForHost linkerForHost rustHostPlatform rustHostPlatformSpec - ccForTarget cxxForTarget linkerForTarget rustTargetPlatform rustTargetPlatformSpec; + ccForBuild cxxForBuild rustBuildPlatform rustBuildPlatformSpec + ccForHost cxxForHost rustHostPlatform rustHostPlatformSpec + ccForTarget cxxForTarget rustTargetPlatform rustTargetPlatformSpec; # Prefix this onto a command invocation in order to set the # variables needed by cargo. @@ -65,15 +53,15 @@ rec { + lib.optionalString (rustTargetPlatform != rustHostPlatform) '' "CC_${stdenv.targetPlatform.rust.cargoEnvVarTarget}=${ccForTarget}" \ "CXX_${stdenv.targetPlatform.rust.cargoEnvVarTarget}=${cxxForTarget}" \ - "CARGO_TARGET_${stdenv.targetPlatform.rust.cargoEnvVarTarget}_LINKER=${linkerForTarget}" \ + "CARGO_TARGET_${stdenv.targetPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForTarget}" \ '' + '' "CC_${stdenv.hostPlatform.rust.cargoEnvVarTarget}=${ccForHost}" \ "CXX_${stdenv.hostPlatform.rust.cargoEnvVarTarget}=${cxxForHost}" \ - "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER=${linkerForHost}" \ + "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForHost}" \ '' + '' "CC_${stdenv.buildPlatform.rust.cargoEnvVarTarget}=${ccForBuild}" \ "CXX_${stdenv.buildPlatform.rust.cargoEnvVarTarget}=${cxxForBuild}" \ - "CARGO_TARGET_${stdenv.buildPlatform.rust.cargoEnvVarTarget}_LINKER=${linkerForBuild}" \ + "CARGO_TARGET_${stdenv.buildPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForBuild}" \ "CARGO_BUILD_TARGET=${rustBuildPlatform}" \ "HOST_CC=${pkgsBuildHost.stdenv.cc}/bin/cc" \ "HOST_CXX=${pkgsBuildHost.stdenv.cc}/bin/c++" \ diff --git a/third_party/nixpkgs/pkgs/build-support/rust/rustc-wrapper/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/rustc-wrapper/default.nix index 0defa63550..0b16740ae5 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/rustc-wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/rustc-wrapper/default.nix @@ -30,7 +30,9 @@ runCommand "${rustc-unwrapped.pname}-wrapper-${rustc-unwrapped.version}" { }; passthru = { - inherit (rustc-unwrapped) pname version src llvm llvmPackages; + inherit (rustc-unwrapped) + pname version src llvm llvmPackages + tier1TargetPlatforms targetPlatforms badTargetPlatforms; unwrapped = rustc-unwrapped; }; diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.sh index 59b596d271..392163646a 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.sh +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.sh @@ -53,19 +53,11 @@ autoPatchelf() { esac done - if [ -n "$__structuredAttrs" ]; then - local ignoreMissingDepsArray=( "${autoPatchelfIgnoreMissingDeps[@]}" ) - local appendRunpathsArray=( "${appendRunpaths[@]}" ) - local runtimeDependenciesArray=( "${runtimeDependencies[@]}" ) - local patchelfFlagsArray=( "${patchelfFlags[@]}" ) - local autoPatchelfFlagsArray=( "${autoPatchelfFlags[@]}" ) - else - readarray -td' ' ignoreMissingDepsArray < <(echo -n "$autoPatchelfIgnoreMissingDeps") - local appendRunpathsArray=($appendRunpaths) - local runtimeDependenciesArray=($runtimeDependencies) - local patchelfFlagsArray=($patchelfFlags) - local autoPatchelfFlagsArray=($autoPatchelfFlags) - fi + concatTo ignoreMissingDepsArray autoPatchelfIgnoreMissingDeps + concatTo appendRunpathsArray appendRunpaths + concatTo runtimeDependenciesArray runtimeDependencies + concatTo patchelfFlagsArray patchelfFlags + concatTo autoPatchelfFlagsArray autoPatchelfFlags # Check if ignoreMissingDepsArray contains "1" and if so, replace it with # "*", printing a deprecation warning. diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/autoreconf.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/autoreconf.sh index bb168aad4c..3d12a17b78 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/autoreconf.sh +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/autoreconf.sh @@ -1,4 +1,4 @@ -preConfigurePhases="${preConfigurePhases:-} autoreconfPhase" +appendToVar preConfigurePhases autoreconfPhase autoreconfPhase() { runHook preAutoreconf diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh index 2b48fea4ff..61e9ed5705 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh @@ -1,4 +1,4 @@ -postPhases+=" cleanupBuildDir" +appendToVar postPhases cleanupBuildDir # Force GCC to build with coverage instrumentation. Also disable # optimisation, since it may confuse things. diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/keep-build-tree.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/keep-build-tree.sh index 754900bfc3..653149bdf2 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/keep-build-tree.sh +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/keep-build-tree.sh @@ -1,4 +1,4 @@ -prePhases+=" moveBuildDir" +appendToVar prePhases moveBuildDir moveBuildDir() { mkdir -p $out/.build diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/make-coverage-analysis-report.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/make-coverage-analysis-report.sh index 9108b4c503..d6a03019dc 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/make-coverage-analysis-report.sh +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/make-coverage-analysis-report.sh @@ -1,4 +1,4 @@ -postPhases+=" coverageReportPhase" +appendToVar postPhases coverageReportPhase coverageReportPhase() { lcov --directory . --capture --output-file app.info diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/move-build-tree.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/move-build-tree.sh index 2718070f39..29495e1d9f 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/move-build-tree.sh +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/move-build-tree.sh @@ -1,11 +1,11 @@ -prePhases+=" moveBuildDir" +appendToVar prePhases moveBuildDir moveBuildDir() { mkdir -p $out/.build cd $out/.build } -postPhases+=" removeBuildDir" +appendToVar postPhases removeBuildDir removeBuildDir() { rm -rf $out/.build diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh index ebd3afa05d..0c5e1a81c7 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh @@ -1,4 +1,4 @@ -preConfigurePhases+=" updateAutotoolsGnuConfigScriptsPhase" +appendToVar preConfigurePhases updateAutotoolsGnuConfigScriptsPhase updateAutotoolsGnuConfigScriptsPhase() { if [ -n "${dontUpdateAutotoolsGnuConfigScripts-}" ]; then return; fi diff --git a/third_party/nixpkgs/pkgs/build-support/trivial-builders/default.nix b/third_party/nixpkgs/pkgs/build-support/trivial-builders/default.nix index a02fe1fd6d..2dc130e55d 100644 --- a/third_party/nixpkgs/pkgs/build-support/trivial-builders/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/trivial-builders/default.nix @@ -595,7 +595,7 @@ rec { makeSetupHook = { name ? lib.warn "calling makeSetupHook without passing a name is deprecated." "hook" , deps ? [ ] - # hooks go in nativeBuildInput so these will be nativeBuildInput + # hooks go in nativeBuildInputs so these will be nativeBuildInputs , propagatedBuildInputs ? [ ] # these will be buildInputs , depsTargetTargetPropagated ? [ ] diff --git a/third_party/nixpkgs/pkgs/build-support/xen/default.nix b/third_party/nixpkgs/pkgs/build-support/xen/default.nix index 9b57c335c8..6dc8e38d92 100644 --- a/third_party/nixpkgs/pkgs/build-support/xen/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/xen/default.nix @@ -60,7 +60,6 @@ branch ? lib.versions.majorMinor version, version, vendor ? "nixos", - withEFI ? true, withFlask ? false, withSeaBIOS ? true, withOVMF ? true, @@ -280,8 +279,6 @@ stdenv.mkDerivation (finalAttrs: { "GIT=${coreutils}/bin/false" "WGET=${coreutils}/bin/false" - ] - ++ optionals withEFI [ "EFI_VENDOR=${vendor}" "INSTALL_EFI_STRIP=1" "LD=${getExe' binutils-unwrapped-all-targets "ld"}" @@ -386,8 +383,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - efi = - if withEFI then "boot/xen-${version}.efi" else throw "This Xen was compiled without an EFI binary."; + efi = "boot/xen-${version}.efi"; flaskPolicy = if withFlask then "boot/xenpolicy-${version}" @@ -434,18 +430,11 @@ stdenv.mkDerivation (finalAttrs: { Use with the `qemu_xen` package. '' - # Then, if any of the optional with* components are being built, add the "Includes:" string. - + optionalString (withEFI || withFlask) ( - "\nIncludes:" - # Originally, this was a call for the complicated withPrefetchedSources. Since there aren't - # that many optional components, we just use lib.strings.optionalString, because it's simpler. - # Optional components that aren't being built are automatically hidden. - + optionalString withEFI "\n* `xen.efi`: The Xen Project's [EFI binary](https://xenbits.xenproject.org/docs/${branch}-testing/misc/efi.html), available on the `boot` output of this package." - + optionalString withFlask "\n* `xsm-flask`: The [FLASK Xen Security Module](https://wiki.xenproject.org/wiki/Xen_Security_Modules_:_XSM-FLASK). The `xenpolicy-${version}` file is available on the `boot` output of this package." - + optionalString withSeaBIOS "\n* `seabios`: Support for the SeaBIOS boot firmware on HVM domains." - + optionalString withOVMF "\n* `ovmf`: Support for the OVMF UEFI boot firmware on HVM domains." - + optionalString withIPXE "\n* `ipxe`: Support for the iPXE boot firmware on HVM domains." - ) + + "\nIncludes:\n* `xen.efi`: The Xen Project's [EFI binary](https://xenbits.xenproject.org/docs/${branch}-testing/misc/efi.html), available on the `boot` output of this package." + + optionalString withFlask "\n* `xsm-flask`: The [FLASK Xen Security Module](https://wiki.xenproject.org/wiki/Xen_Security_Modules_:_XSM-FLASK). The `xenpolicy-${version}` file is available on the `boot` output of this package." + + optionalString withSeaBIOS "\n* `seabios`: Support for the SeaBIOS boot firmware on HVM domains." + + optionalString withOVMF "\n* `ovmf`: Support for the OVMF UEFI boot firmware on HVM domains." + + optionalString withIPXE "\n* `ipxe`: Support for the iPXE boot firmware on HVM domains." # Finally, we write a notice explaining which vulnerabilities this Xen is NOT vulnerable to. # This will hopefully give users the peace of mind that their Xen is secure, without needing # to search the source code for the XSA patches. diff --git a/third_party/nixpkgs/pkgs/build-support/xen/patches.nix b/third_party/nixpkgs/pkgs/build-support/xen/patches.nix index 66ca02e52d..7b8395154f 100644 --- a/third_party/nixpkgs/pkgs/build-support/xen/patches.nix +++ b/third_party/nixpkgs/pkgs/build-support/xen/patches.nix @@ -142,14 +142,11 @@ in In x86's APIC (Advanced Programmable Interrupt Controller) architecture, error conditions are reported in a status register. Furthermore, the OS can opt to receive an interrupt when a new error occurs. - It is possible to configure the error interrupt with an illegal vector, which generates an error when an error interrupt is raised. - This case causes Xen to recurse through vlapic_error(). The recursion itself is bounded; errors accumulate in the the status register and only generate an interrupt when a new status bit becomes set. - However, the lock protecting this state in Xen will try to be taken recursively, and deadlock. ''; diff --git a/third_party/nixpkgs/pkgs/by-name/aa/aaaaxy/package.nix b/third_party/nixpkgs/pkgs/by-name/aa/aaaaxy/package.nix index 4f832429ff..67f8ef1a71 100644 --- a/third_party/nixpkgs/pkgs/by-name/aa/aaaaxy/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/aa/aaaaxy/package.nix @@ -20,17 +20,17 @@ buildGoModule rec { pname = "aaaaxy"; - version = "1.5.202"; + version = "1.5.208"; src = fetchFromGitHub { owner = "divVerent"; repo = pname; rev = "v${version}"; - hash = "sha256-UR6rcdNXrDotakDhUW7EFYKpGEqGVmAPUUwrEG9Fiqs="; + hash = "sha256-VfF8bQP7pFaTezOJpda4N9KbCHr5ST/wCvdNRiojio0="; fetchSubmodules = true; }; - vendorHash = "sha256-rNCzCSVENwoVTWOEcXBCWgVAwiBZtGsbyz3QBT+WUGw="; + vendorHash = "sha256-PBwI3S8ZvmVD57/ICALe+HvgtbPQpJKNPfkWo+uUeSo="; buildInputs = [ alsa-lib @@ -71,6 +71,9 @@ buildGoModule rec { # To work around this, use environment variables. postBuild = '' substituteInPlace 'vendor/github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/opengl/gl/procaddr_linbsd.go' \ + --replace-fail \ + 'import (' \ + 'import ("os"' \ --replace-fail \ '{"libGL.so", "libGL.so.2", "libGL.so.1", "libGL.so.0"}' \ '{os.Getenv("EBITENGINE_LIBGL")}' \ diff --git a/third_party/nixpkgs/pkgs/by-name/aa/aaphoto/package.nix b/third_party/nixpkgs/pkgs/by-name/aa/aaphoto/package.nix index 57744eb6b8..ee9cf9cde5 100644 --- a/third_party/nixpkgs/pkgs/by-name/aa/aaphoto/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/aa/aaphoto/package.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchurl +, fetchFromGitHub , jasper , libpng , libjpeg @@ -12,9 +12,11 @@ stdenv.mkDerivation rec { pname = "aaphoto"; version = "0.45"; - src = fetchurl { - url = "http://log69.com/downloads/aaphoto_sources_${version}.tar.gz"; - sha256 = "sha256-06koJM7jNVFqVgqg6BmOZ74foqk6yjUIFnwULzPZ4go="; + src = fetchFromGitHub { + owner = "log69"; + repo = "aaphoto"; + rev = "581b3fad60382bdd36356155112559f731e31be3"; + hash = "sha256-PcvZ6v8vcZcrSn9EJ0CqxYz9gOJXlcVIkLLzFik0Pec="; }; nativeBuildInputs = lib.optionals stdenv.cc.isClang [ @@ -33,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://log69.com/aaphoto_en.html"; + homepage = "https://github.com/log69/aaphoto"; description = "Free and open source automatic photo adjusting software"; longDescription = '' Auto Adjust Photo tries to give a solution for the automatic color diff --git a/third_party/nixpkgs/pkgs/by-name/ab/abcmidi/package.nix b/third_party/nixpkgs/pkgs/by-name/ab/abcmidi/package.nix index ed0d22eb4a..5ee24ad3af 100644 --- a/third_party/nixpkgs/pkgs/by-name/ab/abcmidi/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ab/abcmidi/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "abcmidi"; - version = "2024.08.13"; + version = "2024.10.10"; src = fetchFromGitHub { owner = "sshlien"; repo = "abcmidi"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-+X7ZPjZtqxEq2GSzdhLA48aqHfWFimST1GCfZ/NLjeU="; + hash = "sha256-dAxr1RJrYppt/Gw6ZF3fL0lDhwJNG5v75M6VA1okrtw="; }; meta = { diff --git a/third_party/nixpkgs/pkgs/by-name/ad/adcskiller/package.nix b/third_party/nixpkgs/pkgs/by-name/ad/adcskiller/package.nix new file mode 100644 index 0000000000..2107951366 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ad/adcskiller/package.nix @@ -0,0 +1,46 @@ +{ + lib, + fetchFromGitHub, + python3, + coercer, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "adcskiller"; + version = "0-unstable-2024-05-19"; + format = "other"; + + src = fetchFromGitHub { + owner = "grimlockx"; + repo = "ADCSKiller"; + rev = "d74bfea91f24a09df74262998d60f213609b45c6"; + hash = "sha256-ekyGDM9up3h6h21uLEstgn33x+KngX4tOLMhL4B6BA8="; + }; + + buildInputs = [ + coercer + ]; + + propagatedBuildInputs = with python3.pkgs; [ + ldap3 + certipy + ]; + + installPhase = '' + runHook preInstall + + install -vD $pname.py $out/bin/$pname + + substituteInPlace $out/bin/$pname --replace '"Coercer"' '"coercer"' + + runHook postInstall + ''; + + meta = with lib; { + description = "Python-based tool designed to automate the process of discovering and exploiting Active Directory Certificate Services (ADCS) vulnerabilities"; + homepage = "https://github.com/grimlockx/ADCSKiller"; + license = licenses.mit; + maintainers = with maintainers; [ exploitoverload ]; + mainProgram = "ADCSKiller"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ae/aerospace/package.nix b/third_party/nixpkgs/pkgs/by-name/ae/aerospace/package.nix new file mode 100644 index 0000000000..f62116273a --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ae/aerospace/package.nix @@ -0,0 +1,58 @@ +{ + fetchzip, + gitUpdater, + installShellFiles, + lib, + stdenv, + versionCheckHook, +}: + +let + appName = "AeroSpace.app"; + version = "0.14.2-Beta"; +in +stdenv.mkDerivation { + pname = "aerospace"; + + inherit version; + + src = fetchzip { + url = "https://github.com/nikitabobko/AeroSpace/releases/download/v${version}/AeroSpace-v${version}.zip"; + hash = "sha256-v2D/IV9Va0zbGHEwSGt6jvDqQYqha290Lm6u+nZTS3A="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/Applications + mv ${appName} $out/Applications + cp -R bin $out + mkdir -p $out/share + runHook postInstall + ''; + + postInstall = '' + installManPage manpage/* + installShellCompletion --bash shell-completion/bash/aerospace + installShellCompletion --fish shell-completion/fish/aerospace.fish + installShellCompletion --zsh shell-completion/zsh/_aerospace + ''; + + passthru.tests.can-print-version = [ versionCheckHook ]; + + passthru.updateScript = gitUpdater { + url = "https://github.com/nikitabobko/AeroSpace.git"; + rev-prefix = "v"; + }; + + meta = { + license = lib.licenses.mit; + mainProgram = "aerospace"; + homepage = "https://github.com/nikitabobko/AeroSpace"; + description = "i3-like tiling window manager for macOS"; + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ alexandru0-dev ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ai/aider-chat/package.nix b/third_party/nixpkgs/pkgs/by-name/ai/aider-chat/package.nix index d1ed4c6f93..d8d42d73c4 100644 --- a/third_party/nixpkgs/pkgs/by-name/ai/aider-chat/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ai/aider-chat/package.nix @@ -12,7 +12,7 @@ let self = python3; packageOverrides = _: super: { tree-sitter = super.tree-sitter_0_21; }; }; - version = "0.57.0"; + version = "0.59.0"; in python3.pkgs.buildPythonApplication { pname = "aider-chat"; @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication { owner = "paul-gauthier"; repo = "aider"; rev = "refs/tags/v${version}"; - hash = "sha256-ErDepSju8B4GochHKxL03aUfOLAiNfTaXBAllAZ144M="; + hash = "sha256-20LicYj1j5gGzhF+SxPUKu858nHZgwDF1JxXeHRtYe0="; }; pythonRelaxDeps = true; @@ -68,6 +68,7 @@ python3.pkgs.buildPythonApplication { streamlit tokenizers watchdog + pydub ] ++ lib.optionals (!tensorflow.meta.broken) [ llama-index-core diff --git a/third_party/nixpkgs/pkgs/by-name/al/alacarte/package.nix b/third_party/nixpkgs/pkgs/by-name/al/alacarte/package.nix index c9b1c9d7c6..e7d7795ed1 100644 --- a/third_party/nixpkgs/pkgs/by-name/al/alacarte/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/al/alacarte/package.nix @@ -17,14 +17,14 @@ }: python3.pkgs.buildPythonApplication rec { pname = "alacarte"; - version = "3.52.0"; + version = "3.54.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "alacarte"; rev = version; - hash = "sha256-SkolSk6RireH3aKkRTUCib/nflqD02PR9uVtXePRHQY="; + hash = "sha256-btqSlO0vM4fmoBcxh3mshv0t2oZSxm8Vr26UvH5fVvE="; }; format = "other"; diff --git a/third_party/nixpkgs/pkgs/by-name/al/alpaca/package.nix b/third_party/nixpkgs/pkgs/by-name/al/alpaca/package.nix index ab0bb3a833..eb025a0a96 100644 --- a/third_party/nixpkgs/pkgs/by-name/al/alpaca/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/al/alpaca/package.nix @@ -13,18 +13,19 @@ gtksourceview5, xdg-utils, ollama, + vte-gtk4, }: python3Packages.buildPythonApplication rec { pname = "alpaca"; - version = "2.0.6"; + version = "2.6.5"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "Jeffser"; repo = "Alpaca"; rev = "refs/tags/${version}"; - hash = "sha256-4c6pisd3o7mycivHd1QZ2N7s8pYzrQXiZMbVvl5ciPA="; + hash = "sha256-tXUM2XxYXUTXsycfq0hmkzc4quHKh7+0qit1YuKdCeQ="; }; nativeBuildInputs = [ @@ -40,6 +41,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ libadwaita gtksourceview5 + vte-gtk4 ]; dependencies = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/by-name/al/alsa-firmware/package.nix b/third_party/nixpkgs/pkgs/by-name/al/alsa-firmware/package.nix index 8f63166679..2bf35a11a6 100644 --- a/third_party/nixpkgs/pkgs/by-name/al/alsa-firmware/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/al/alsa-firmware/package.nix @@ -29,7 +29,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-hotplug-dir=$(out)/lib/firmware" ]; depsBuildBuild = lib.optional ( - stdenv.buildPlatform != stdenv.hostPlatform || stdenv.hostPlatform.isAarch64 + stdenv.buildPlatform != stdenv.hostPlatform + || stdenv.hostPlatform.isAarch64 + || stdenv.hostPlatform.isRiscV64 ) buildPackages.stdenv.cc; dontStrip = true; diff --git a/third_party/nixpkgs/pkgs/by-name/al/alsa-lib/package.nix b/third_party/nixpkgs/pkgs/by-name/al/alsa-lib/package.nix index 6d162b6a12..8647c91f3f 100644 --- a/third_party/nixpkgs/pkgs/by-name/al/alsa-lib/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/al/alsa-lib/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "alsa-lib"; - version = "1.2.11"; + version = "1.2.12"; src = fetchurl { url = "mirror://alsa/lib/alsa-lib-${finalAttrs.version}.tar.bz2"; - hash = "sha256-nz8vabmV+a03NZBy+8aaOoi/uggfyD6b4w4UZieVu00="; + hash = "sha256-SGjNkIYnJ52lpjT0aHAWJb6MwlHYQmLH5baiGDka0NI="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/by-name/al/alsa-utils/package.nix b/third_party/nixpkgs/pkgs/by-name/al/alsa-utils/package.nix index cc70a8578d..b8086e0839 100644 --- a/third_party/nixpkgs/pkgs/by-name/al/alsa-utils/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/al/alsa-utils/package.nix @@ -1,7 +1,7 @@ { lib , stdenv +, directoryListingUpdater , fetchurl -, fetchpatch , alsa-lib , alsa-plugins , gettext @@ -9,6 +9,7 @@ , ncurses , libsamplerate , pciutils +, procps , which , fftw , pipewire @@ -30,23 +31,12 @@ let in stdenv.mkDerivation rec { pname = "alsa-utils"; - version = "1.2.10"; + version = "1.2.12"; src = fetchurl { url = "mirror://alsa/utils/alsa-utils-${version}.tar.bz2"; - hash = "sha256-EEti7H8Cp84WynefSBVhbfHMIZM1A3g6kQe1lE+DBjo="; + hash = "sha256-mLxmd9DAB0AGZ5BRgiMkoKsIea6lWKj2i1EXgNMM2SQ="; }; - patches = [ - # Backport fixes for musl libc. Remove on next release - (fetchpatch { - url = "https://github.com/alsa-project/alsa-utils/commit/8c229270f6bae83b705a03714c46067a7aa57b02.patch"; - hash = "sha256-sUaBHY8EHf4805nF6tyNV5jYXcJf3O+r04VXFu4dUCE="; - }) - (fetchpatch { - url = "https://github.com/alsa-project/alsa-utils/commit/0925ad7f09b2dc77015784f9ac2f5e34dd0dd5c3.patch"; - hash = "sha256-bgGU9On82AUbOjo+KN6WfuhqUAWM87OHnKN7plpG284="; - }) - ]; nativeBuildInputs = [ gettext makeWrapper ]; buildInputs = [ alsa-lib ncurses libsamplerate fftw ]; @@ -57,10 +47,14 @@ stdenv.mkDerivation rec { postFixup = '' mv $out/bin/alsa-info.sh $out/bin/alsa-info - wrapProgram $out/bin/alsa-info --prefix PATH : "${lib.makeBinPath [ which pciutils ]}" + wrapProgram $out/bin/alsa-info --prefix PATH : "${lib.makeBinPath [ which pciutils procps ]}" wrapProgram $out/bin/aplay --set-default ALSA_PLUGIN_DIR ${plugin-dir} ''; + passthru.updateScript = directoryListingUpdater { + url = "https://www.alsa-project.org/files/pub/utils/"; + }; + meta = with lib; { homepage = "http://www.alsa-project.org/"; description = "ALSA, the Advanced Linux Sound Architecture utils"; diff --git a/third_party/nixpkgs/pkgs/by-name/al/alt-tab-macos/package.nix b/third_party/nixpkgs/pkgs/by-name/al/alt-tab-macos/package.nix index c32e3b712c..72dbd13b7d 100644 --- a/third_party/nixpkgs/pkgs/by-name/al/alt-tab-macos/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/al/alt-tab-macos/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "alt-tab-macos"; - version = "6.71.0"; + version = "6.73.0"; src = fetchurl { url = "https://github.com/lwouis/alt-tab-macos/releases/download/v${finalAttrs.version}/AltTab-${finalAttrs.version}.zip"; - hash = "sha256-46K9ePNqZyaV5Da6VRCT6PvG+Ad0vsuvs7sfNRUbKB4="; + hash = "sha256-l/Nuyr5jYBR6LtScgM2LP0mq1NEMkRNVGWZDhiZkAa8="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/by-name/am/am2rlauncher/package.nix b/third_party/nixpkgs/pkgs/by-name/am/am2rlauncher/package.nix index 33dde993cd..cf2f5ebc71 100644 --- a/third_party/nixpkgs/pkgs/by-name/am/am2rlauncher/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/am/am2rlauncher/package.nix @@ -4,7 +4,7 @@ , glibc , gtk3 , libappindicator -, webkitgtk +, webkitgtk_4_0 , e2fsprogs , libnotify , libgit2 @@ -63,7 +63,7 @@ buildDotnetModule { glibc gtk3 libappindicator - webkitgtk + webkitgtk_4_0 e2fsprogs libnotify libgit2 diff --git a/third_party/nixpkgs/pkgs/by-name/am/amdvlk/package.nix b/third_party/nixpkgs/pkgs/by-name/am/amdvlk/package.nix index a50e51685f..c4362b99e1 100644 --- a/third_party/nixpkgs/pkgs/by-name/am/amdvlk/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/am/amdvlk/package.nix @@ -23,6 +23,8 @@ let suffix = if stdenv.system == "x86_64-linux" then "64" else "32"; + # Fix https://github.com/NixOS/nixpkgs/issues/348903 until the glslang update to 15.0.0 is merged into master + glslang_fixed = glslang.overrideAttrs (finalAttrs: oldAttrs: { cmakeFlags = [ ]; }); in stdenv.mkDerivation (finalAttrs: { @@ -59,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { [ cmake directx-shader-compiler - glslang + glslang_fixed ninja patchelf perl diff --git a/third_party/nixpkgs/pkgs/by-name/ao/aocl-utils/package.nix b/third_party/nixpkgs/pkgs/by-name/ao/aocl-utils/package.nix index b4a64d316c..1dc44ad7c0 100644 --- a/third_party/nixpkgs/pkgs/by-name/ao/aocl-utils/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ao/aocl-utils/package.nix @@ -1,18 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, cmake } : +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: stdenv.mkDerivation rec { pname = "aocl-utils"; - version = "4.2"; + version = "5.0"; src = fetchFromGitHub { owner = "amd"; repo = "aocl-utils"; rev = version; - hash = "sha256-tjmCgVSU4XjBhbKMUY3hsvj3bvuXvVdf5Bqva5nr1tc="; + hash = "sha256-96j3Sw+Ts+CZzjPpUlt8cRYO5z0iASo+W/x1nrrAyQE="; }; + patches = [ ./pkg-config.patch ]; + nativeBuildInputs = [ cmake ]; + cmakeFlags = [ + (lib.cmakeBool "AU_BUILD_STATIC_LIBS" stdenv.hostPlatform.isStatic) + (lib.cmakeBool "AU_BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) + ]; + meta = with lib; { description = "Interface to all AMD AOCL libraries to access CPU features"; homepage = "https://github.com/amd/aocl-utils"; diff --git a/third_party/nixpkgs/pkgs/by-name/ao/aocl-utils/pkg-config.patch b/third_party/nixpkgs/pkgs/by-name/ao/aocl-utils/pkg-config.patch new file mode 100644 index 0000000000..ba0cd1848c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ao/aocl-utils/pkg-config.patch @@ -0,0 +1,14 @@ +diff --git a/CMake/aocl-utils.pc.in b/CMake/aocl-utils.pc.in +index 18ce5eb..bcdc39b 100644 +--- a/CMake/aocl-utils.pc.in ++++ b/CMake/aocl-utils.pc.in +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${prefix}/@AU_INSTALL_LIB_DIR@ +-includedir=${prefix}/@AU_INSTALL_INCLUDE_DIR@ ++libdir=@AU_INSTALL_LIB_DIR@ ++includedir=@AU_INSTALL_INCLUDE_DIR@ + + Name: @PROJECT_FULL_NAME@ + Description: @AU_DESCRIPTION@ diff --git a/third_party/nixpkgs/pkgs/by-name/ap/apvlv/package.nix b/third_party/nixpkgs/pkgs/by-name/ap/apvlv/package.nix index 0e5b60fd4a..29be062652 100644 --- a/third_party/nixpkgs/pkgs/by-name/ap/apvlv/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ap/apvlv/package.nix @@ -20,7 +20,7 @@ poppler, stdenv, testers, - webkitgtk, + webkitgtk_4_0, wrapGAppsHook3, }: @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { libxshmfence # otherwise warnings in compilation pcre poppler - webkitgtk + webkitgtk_4_0 ]; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/aq/aquamarine/package.nix b/third_party/nixpkgs/pkgs/by-name/aq/aquamarine/package.nix index 49cd0b53c4..e5452579a5 100644 --- a/third_party/nixpkgs/pkgs/by-name/aq/aquamarine/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/aq/aquamarine/package.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "aquamarine"; - version = "0.4.1"; + version = "0.4.3"; src = fetchFromGitHub { owner = "hyprwm"; repo = "aquamarine"; rev = "v${finalAttrs.version}"; - hash = "sha256-/NO/h/qD/eJXAQr/fHA4mdDgYsNT9thHQ+oT6KPi2ac="; + hash = "sha256-44bnoY0nAvbBQ/lVjmn511yL39Sv7SknV0BDxn34P3Q="; }; nativeBuildInputs = [ 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 2956a9ed02..39e8d88255 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.61.2-54148"; + version = "1.63.1-54714"; src = fetchurl { url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg"; - hash = "sha256-y5oQFPdk6Y7AjzeTrA2U8MhGkPi6RJUcGqsvpjJ++UE="; + hash = "sha256-jL8iAh+e8Z72VG9XQbswjyTPtjO2Pm8ealRte8xr1PQ="; }; 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 b31d642c70..5259b5560c 100644 --- a/third_party/nixpkgs/pkgs/by-name/ar/arcan/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ar/arcan/package.nix @@ -2,6 +2,7 @@ lib, SDL2, callPackage, + fetchpatch2, cmake, espeak-ng, ffmpeg, @@ -60,6 +61,14 @@ stdenv.mkDerivation (finalAttrs: { inherit (sources.letoram-arcan) pname version src; + patches = [ + # (encode) remove deprecated use of pts/channel-layout + (fetchpatch2 { + url = "https://github.com/letoram/arcan/commit/e717c1b5833bdc2dea7dc6f64eeaf39c683ebd26.patch?full_index=1"; + hash = "sha256-nUmOWfphGtGiLehUa78EJWqTlD7SvqJgl8lnn90vTFU="; + }) + ]; + nativeBuildInputs = [ cmake makeWrapper diff --git a/third_party/nixpkgs/pkgs/by-name/ar/arcan/sources.nix b/third_party/nixpkgs/pkgs/by-name/ar/arcan/sources.nix index 6701021eb6..01f800a4aa 100644 --- a/third_party/nixpkgs/pkgs/by-name/ar/arcan/sources.nix +++ b/third_party/nixpkgs/pkgs/by-name/ar/arcan/sources.nix @@ -6,13 +6,13 @@ letoram-arcan = let self = { pname = "arcan"; - version = "0.6.3"; + version = "0.6.3.3"; src = fetchFromGitHub { owner = "letoram"; repo = "arcan"; rev = self.version; - hash = "sha256-ZSKOkNrFa2QgmXmmXnLkB1pehmVJbEFVeNs43Z2DSKo="; + hash = "sha256-YH3VGU3gSR5gqHnAlA2vrzU8vasKd0hOpc+2ludnV+Y="; }; }; in diff --git a/third_party/nixpkgs/pkgs/by-name/ar/arti/package.nix b/third_party/nixpkgs/pkgs/by-name/ar/arti/package.nix index 6185ec1c68..0fdb1f5011 100644 --- a/third_party/nixpkgs/pkgs/by-name/ar/arti/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ar/arti/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "arti"; - version = "1.2.7"; + version = "1.2.8"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -19,10 +19,10 @@ rustPlatform.buildRustPackage rec { owner = "core"; repo = "arti"; rev = "arti-v${version}"; - hash = "sha256-lyko4xwTn03/Es8icOx8GIrjC4XDXvZPDYHYILw8Opo="; + hash = "sha256-vw/hebZ23Pk+hQx3YN9iXsKWq20fqpwp91E2tul8zmA="; }; - cargoHash = "sha256-I45SaawWAK7iTZDFhJT4YVO439D/3NmWLp3FtFmhLC0="; + cargoHash = "sha256-4F+0KEVoeppNQ26QQ+a2CSIbrklE8NY3+OK11I5JstA="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; @@ -47,8 +47,7 @@ rustPlatform.buildRustPackage rec { ]; checkFlags = [ - # problematic tests that were fixed after the release - "--skip=reload_cfg::test::watch_single_file" + # problematic test that hangs the build "--skip=reload_cfg::test::watch_multiple" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/as/astro-language-server/package.nix b/third_party/nixpkgs/pkgs/by-name/as/astro-language-server/package.nix index e2bdedc60f..33d0b5aedc 100644 --- a/third_party/nixpkgs/pkgs/by-name/as/astro-language-server/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/as/astro-language-server/package.nix @@ -2,22 +2,22 @@ lib, stdenv, fetchFromGitHub, - pnpm_8, + pnpm, nodejs_22, }: stdenv.mkDerivation (finalAttrs: { pname = "astro-language-server"; - version = "2.14.2"; + version = "2.15.0"; src = fetchFromGitHub { owner = "withastro"; repo = "language-tools"; rev = "@astrojs/language-server@${finalAttrs.version}"; - hash = "sha256-4GaLyaRUN9qS2U7eSzASB6fSQY2+fWtgfb54uuHjuh4="; + hash = "sha256-2MaoW04mX016VIrtfnBX/jzMNCOXE10lSInSyhqot5E="; }; - pnpmDeps = pnpm_8.fetchDeps { + pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version @@ -25,12 +25,12 @@ stdenv.mkDerivation (finalAttrs: { pnpmWorkspace prePnpmInstall ; - hash = "sha256-q9a4nFPRhR6W/PT1l/Q1799iDmI+WTsudUP8rb8e97g="; + hash = "sha256-zCCDlwsKPZQVEYrv85WcMY2JlWgz0tD6iHLSJg1RkRU="; }; nativeBuildInputs = [ nodejs_22 - pnpm_8.configHook + pnpm.configHook ]; buildInputs = [ nodejs_22 ]; diff --git a/third_party/nixpkgs/pkgs/by-name/at/attic-client/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/at/attic-client/Cargo.lock index 53a47e002f..879da15577 100644 --- a/third_party/nixpkgs/pkgs/by-name/at/attic-client/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/at/attic-client/Cargo.lock @@ -325,6 +325,7 @@ dependencies = [ "maybe-owned", "rand", "regex", + "rsa 0.9.6", "ryu", "sea-orm", "sea-orm-migration", @@ -355,6 +356,7 @@ dependencies = [ "jwt-simple", "lazy_static", "regex", + "rsa 0.9.6", "serde", "serde_with", "tracing", diff --git a/third_party/nixpkgs/pkgs/by-name/at/attic-client/package.nix b/third_party/nixpkgs/pkgs/by-name/at/attic-client/package.nix index 44b6f1b1d8..3433db9802 100644 --- a/third_party/nixpkgs/pkgs/by-name/at/attic-client/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/at/attic-client/package.nix @@ -2,6 +2,7 @@ , rustPlatform , fetchFromGitHub , nix +, nixosTests , boost , pkg-config , stdenv @@ -11,13 +12,13 @@ }: rustPlatform.buildRustPackage { pname = "attic"; - version = "0-unstable-2024-10-04"; + version = "0-unstable-2024-10-06"; src = fetchFromGitHub { owner = "zhaofengli"; repo = "attic"; - rev = "61ebdef2e263c091f24807b07701be5cb8068dea"; - hash = "sha256-whgxjoDF7aey3xWy2b9Dp+NHsszK6By+raEbygcSU6w="; + rev = "1b29816235b7573fca7f964709fd201e1a187024"; + hash = "sha256-icNt2T1obK3hFNgBOgiiyOoiScUfz9blmRbNp3aOUBE="; }; nativeBuildInputs = [ @@ -53,7 +54,13 @@ rustPlatform.buildRustPackage { fi ''; - passthru.updateScript = ./update.sh; + passthru = { + tests = { + inherit (nixosTests) atticd; + }; + + updateScript = ./update.sh; + }; meta = with lib; { description = "Multi-tenant Nix Binary Cache"; diff --git a/third_party/nixpkgs/pkgs/by-name/at/attract-mode/package.nix b/third_party/nixpkgs/pkgs/by-name/at/attract-mode/package.nix index 21be9ce314..1a488894e8 100644 --- a/third_party/nixpkgs/pkgs/by-name/at/attract-mode/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/at/attract-mode/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, pkg-config, expat, - ffmpeg_7, + ffmpeg, freetype, libarchive, libjpeg, @@ -32,7 +32,7 @@ stdenv.mkDerivation { buildInputs = [ expat - ffmpeg_7 + ffmpeg freetype libarchive libjpeg diff --git a/third_party/nixpkgs/pkgs/by-name/au/audacity/package.nix b/third_party/nixpkgs/pkgs/by-name/au/audacity/package.nix new file mode 100644 index 0000000000..cbd16b1234 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/au/audacity/package.nix @@ -0,0 +1,224 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + makeWrapper, + wrapGAppsHook3, + pkg-config, + python3, + gettext, + file, + libvorbis, + libmad, + libjack2, + lv2, + lilv, + mpg123, + opusfile, + rapidjson, + serd, + sord, + sqlite, + sratom, + suil, + libsndfile, + soxr, + flac, + lame, + twolame, + expat, + libid3tag, + libopus, + libuuid, + ffmpeg, + soundtouch, + pcre, + portaudio, # given up fighting their portaudio.patch? + portmidi, + linuxHeaders, + alsa-lib, + at-spi2-core, + dbus, + libepoxy, + libXdmcp, + libXtst, + libpthreadstubs, + libsbsms_2_3_0, + libselinux, + libsepol, + libxkbcommon, + util-linux, + wavpack, + wxGTK32, + gtk3, + libpng, + libjpeg, + darwin, +}: + +# TODO +# 1. detach sbsms + +stdenv.mkDerivation (finalAttrs: { + pname = "audacity"; + version = "3.6.4"; + + src = fetchFromGitHub { + owner = "audacity"; + repo = "audacity"; + rev = "Audacity-${finalAttrs.version}"; + hash = "sha256-72k79UFxhk8JUCnMzbU9lZ0Ua3Ui41EkhPGSnGkf9mE="; + }; + + postPatch = + '' + mkdir src/private + substituteInPlace scripts/build/macOS/fix_bundle.py \ + --replace "path.startswith('/usr/lib/')" "path.startswith('${builtins.storeDir}')" + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + substituteInPlace libraries/lib-files/FileNames.cpp \ + --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h + '' + + + lib.optionalString + (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0") + '' + sed -z -i "s/NSAppearanceName.*systemAppearance//" src/AudacityApp.mm + ''; + + nativeBuildInputs = + [ + cmake + gettext + pkg-config + python3 + makeWrapper + wrapGAppsHook3 + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + linuxHeaders + ]; + + buildInputs = + [ + expat + ffmpeg + file + flac + gtk3 + lame + libid3tag + libjack2 + libmad + libopus + libsbsms_2_3_0 + libsndfile + libvorbis + lilv + lv2 + mpg123 + opusfile + pcre + portmidi + rapidjson + serd + sord + soundtouch + soxr + sqlite + sratom + suil + twolame + portaudio + wavpack + wxGTK32 + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib # for portaudio + at-spi2-core + dbus + libepoxy + libXdmcp + libXtst + libpthreadstubs + libxkbcommon + libselinux + libsepol + libuuid + util-linux + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.CoreAudioKit # for portaudio + libpng + libjpeg + ]; + + cmakeFlags = [ + "-DAUDACITY_BUILD_LEVEL=2" + "-DAUDACITY_REV_LONG=nixpkgs" + "-DAUDACITY_REV_TIME=nixpkgs" + "-DDISABLE_DYNAMIC_LOADING_FFMPEG=ON" + "-Daudacity_conan_enabled=Off" + "-Daudacity_use_ffmpeg=loaded" + "-Daudacity_has_vst3=Off" + "-Daudacity_has_crashreports=Off" + + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + + # Fix duplicate store paths + "-DCMAKE_INSTALL_LIBDIR=lib" + ]; + + # [ 57%] Generating LightThemeAsCeeCode.h... + # ../../utils/image-compiler: error while loading shared libraries: + # lib-theme.so: cannot open shared object file: No such file or directory + preBuild = '' + export LD_LIBRARY_PATH=$PWD/Release/lib/audacity + ''; + + doCheck = false; # Test fails + + dontWrapGApps = true; + + # Replace audacity's wrapper, to: + # - put it in the right place, it shouldn't be in "$out/audacity" + # - Add the ffmpeg dynamic dependency + postFixup = + lib.optionalString stdenv.hostPlatform.isLinux '' + wrapProgram "$out/bin/audacity" \ + "''${gappsWrapperArgs[@]}" \ + --prefix LD_LIBRARY_PATH : "$out/lib/audacity":${lib.makeLibraryPath [ ffmpeg ]} \ + --suffix AUDACITY_MODULES_PATH : "$out/lib/audacity/modules" \ + --suffix AUDACITY_PATH : "$out/share/audacity" + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/{Applications,bin} + mv $out/Audacity.app $out/Applications/ + makeWrapper $out/Applications/Audacity.app/Contents/MacOS/Audacity $out/bin/audacity + ''; + + meta = { + description = "Sound editor with graphical UI"; + mainProgram = "audacity"; + homepage = "https://www.audacityteam.org"; + changelog = "https://github.com/audacity/audacity/releases"; + license = with lib.licenses; [ + gpl2Plus + # Must be GPL3 when building with "technologies that require it, + # such as the VST3 audio plugin interface". + # https://github.com/audacity/audacity/discussions/2142. + gpl3 + # Documentation. + cc-by-30 + ]; + maintainers = with lib.maintainers; [ + veprbl + wegank + ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/au/audiobookshelf/package.nix b/third_party/nixpkgs/pkgs/by-name/au/audiobookshelf/package.nix index efa34166f0..e5b2e8b5b1 100644 --- a/third_party/nixpkgs/pkgs/by-name/au/audiobookshelf/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/au/audiobookshelf/package.nix @@ -6,6 +6,7 @@ buildNpmPackage, nodejs_18, ffmpeg-full, + nunicode, util-linux, python3, getopt, @@ -45,8 +46,7 @@ let inherit stdenv ffmpeg-full - pname - nodejs + nunicode getopt ; }; diff --git a/third_party/nixpkgs/pkgs/by-name/au/audiobookshelf/source.json b/third_party/nixpkgs/pkgs/by-name/au/audiobookshelf/source.json index 350ca60dfd..4320f1380e 100644 --- a/third_party/nixpkgs/pkgs/by-name/au/audiobookshelf/source.json +++ b/third_party/nixpkgs/pkgs/by-name/au/audiobookshelf/source.json @@ -1,9 +1,9 @@ { "owner": "advplyr", "repo": "audiobookshelf", - "rev": "ce213c3d89458baeb77324ce59a5f2137740564e", - "hash": "sha256-7vPhvsjGJQvus5Mmx8543OuBeuPWC/4cLfHHYmN2lnk=", - "version": "2.13.4", - "depsHash": "sha256-1CmtuzE8R6zkb0DT7gt9MrxErAw0mqY2AkJZh3PjuBQ=", - "clientDepsHash": "sha256-BfrVN70i1e4JWELxLS0jliHLfG4/kN8tj8aQOjsnZ/M=" + "rev": "80e0cac4747e61d1fbb5374ec4ac41d3499042e2", + "hash": "sha256-gwu9AvxrfW1QSgUy3Q4di1xa964ZMZpRkgdFQlit9+4=", + "version": "2.15.0", + "depsHash": "sha256-TDZUrzVcmKn4izRn8E+uf6Mh22fRsHeVm5h+wRZAX8o=", + "clientDepsHash": "sha256-7R5+Yam9Y4+bj/8wrAE25g4sivg/sw5G0pAZFGPRpMI=" } diff --git a/third_party/nixpkgs/pkgs/by-name/au/audiobookshelf/wrapper.nix b/third_party/nixpkgs/pkgs/by-name/au/audiobookshelf/wrapper.nix index 87d3358a42..4dabeae303 100644 --- a/third_party/nixpkgs/pkgs/by-name/au/audiobookshelf/wrapper.nix +++ b/third_party/nixpkgs/pkgs/by-name/au/audiobookshelf/wrapper.nix @@ -1,4 +1,9 @@ -{ stdenv, ffmpeg-full, pname, nodejs, getopt }: '' +{ + stdenv, + ffmpeg-full, + nunicode, + getopt, +}: '' #!${stdenv.shell} port=8000 @@ -55,6 +60,7 @@ SKIP_BINARIES_CHECK=1 \ FFMPEG_PATH=${ffmpeg-full}/bin/ffmpeg \ FFPROBE_PATH=${ffmpeg-full}/bin/ffprobe \ + NUSQLITE3_PATH=${nunicode.sqlite}/lib/libnusqlite3 \ CONFIG_PATH="$config" \ METADATA_PATH="$metadata" \ PORT="$port" \ diff --git a/third_party/nixpkgs/pkgs/by-name/au/authentik/package.nix b/third_party/nixpkgs/pkgs/by-name/au/authentik/package.nix index 74511b866a..82a0144e1a 100644 --- a/third_party/nixpkgs/pkgs/by-name/au/authentik/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/au/authentik/package.nix @@ -70,7 +70,7 @@ let openapi-generator-cli generate -i ./schema.yml \ -g typescript-fetch -o $out \ -c ./scripts/api-ts-config.yaml \ - --additional-properties=npmVersion=${nodejs.pkgs.npm.version} \ + --additional-properties=npmVersion="$(${lib.getExe' nodejs "npm"} --version)" \ --git-repo-id authentik --git-user-id goauthentik runHook postBuild ''; diff --git a/third_party/nixpkgs/pkgs/by-name/au/autosuspend/package.nix b/third_party/nixpkgs/pkgs/by-name/au/autosuspend/package.nix index 479f6d69d7..16217b9f3f 100644 --- a/third_party/nixpkgs/pkgs/by-name/au/autosuspend/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/au/autosuspend/package.nix @@ -6,7 +6,8 @@ python3.pkgs.buildPythonApplication rec { pname = "autosuspend"; - version = "7.0.1"; + version = "7.0.2"; + pyproject = true; disabled = python3.pythonOlder "3.10"; @@ -14,9 +15,13 @@ python3.pkgs.buildPythonApplication rec { owner = "languitar"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Zjo8H5PU6JezrBF0XBHvmePUTNeX74BX4NsHtPozcKs="; + hash = "sha256-QmZX5I1D1iYUQ6Ll0tkbpjzqaOIBaGAltKHwUqLB6uk="; }; + build-system = with python3.pkgs; [ + setuptools + ]; + dependencies = with python3.pkgs; [ dbus-python icalendar diff --git a/third_party/nixpkgs/pkgs/by-name/aw/aws-workspaces/package.nix b/third_party/nixpkgs/pkgs/by-name/aw/aws-workspaces/package.nix index bffc25ca48..fad93e74d4 100644 --- a/third_party/nixpkgs/pkgs/by-name/aw/aws-workspaces/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/aw/aws-workspaces/package.nix @@ -11,7 +11,7 @@ , gtk3 , openssl_1_1 , icu70 -, webkitgtk +, webkitgtk_4_0 , librsvg , gdk-pixbuf , libsoup @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { gtk3 openssl_1_1.out icu70 - webkitgtk + webkitgtk_4_0 librsvg gdk-pixbuf libsoup diff --git a/third_party/nixpkgs/pkgs/by-name/ay/ayatana-ido/package.nix b/third_party/nixpkgs/pkgs/by-name/ay/ayatana-ido/package.nix index ae8f9419fb..85023786dd 100644 --- a/third_party/nixpkgs/pkgs/by-name/ay/ayatana-ido/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ay/ayatana-ido/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "ayatana-ido"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = pname; rev = version; - sha256 = "sha256-WEPW9BstDv2k/5dTEDQza3eOQ9bd6CEVvmd817sEPAs="; + sha256 = "sha256-KeErrT2umMaIVfLDr4CcQCmFrMb8/h6pNYbunuC/JtI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/azpainter/default.nix b/third_party/nixpkgs/pkgs/by-name/az/azpainter/package.nix similarity index 55% rename from third_party/nixpkgs/pkgs/applications/graphics/azpainter/default.nix rename to third_party/nixpkgs/pkgs/by-name/az/azpainter/package.nix index b1493b94ce..dee38a7d7e 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/azpainter/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/az/azpainter/package.nix @@ -1,34 +1,55 @@ -{ lib, stdenv, fetchFromGitLab -, desktop-file-utils, shared-mime-info, ninja, pkg-config -, libiconv -, libX11, libXcursor, libXext, libXi -, freetype, fontconfig -, libjpeg, libpng, libtiff, libwebp -, zlib +{ + lib, + stdenv, + fetchFromGitLab, + desktop-file-utils, + desktopToDarwinBundle, + shared-mime-info, + ninja, + pkg-config, + libiconv, + libX11, + libXcursor, + libXext, + libXi, + freetype, + fontconfig, + libjpeg, + libpng, + libtiff, + libwebp, + zlib, }: stdenv.mkDerivation rec { pname = "azpainter"; - version = "3.0.8"; + version = "3.0.9a"; src = fetchFromGitLab { owner = "azelpg"; repo = pname; rev = "v${version}"; - hash = "sha256-NiQYX/Dcl/t30Jx08DKr6EP5ODS00pyEGKh/qiNT5t4="; + hash = "sha256-QWXlRbCGDk1DRtePeDM3tnbtkdlhbkn/oNTqHvmtEA4="; }; nativeBuildInputs = [ desktop-file-utils # for update-desktop-database - shared-mime-info # for update-mime-info + shared-mime-info # for update-mime-info ninja pkg-config - ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ - libX11 libXcursor libXext libXi - freetype fontconfig - libjpeg libpng libtiff libwebp + libX11 + libXcursor + libXext + libXi + freetype + fontconfig + libjpeg + libpng + libtiff + libwebp zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; diff --git a/third_party/nixpkgs/pkgs/by-name/az/azure-cli/extensions-manual.nix b/third_party/nixpkgs/pkgs/by-name/az/azure-cli/extensions-manual.nix index d46a523ca2..d6f65b53cd 100644 --- a/third_party/nixpkgs/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/third_party/nixpkgs/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -8,6 +8,9 @@ mkAzExtension, mycli, python3Packages, + autoPatchelfHook, + python3, + openssl_1_1, }: { @@ -58,6 +61,26 @@ meta.maintainers = with lib.maintainers; [ mikut ]; }; + confcom = mkAzExtension rec { + pname = "confcom"; + version = "1.0.0"; + url = "https://azcliprod.blob.core.windows.net/cli-extensions/confcom-${version}-py3-none-any.whl"; + sha256 = "73823e10958a114b4aca84c330b4debcc650c4635e74c568679b6c32c356411d"; + description = "Microsoft Azure Command-Line Tools Confidential Container Security Policy Generator Extension"; + nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = [ openssl_1_1 ]; + propagatedBuildInputs = with python3Packages; [ + pyyaml + deepdiff + docker + tqdm + ]; + postInstall = '' + chmod +x $out/${python3.sitePackages}/azext_confcom/bin/genpolicy-linux + ''; + meta.maintainers = with lib.maintainers; [ miampf ]; + }; + containerapp = mkAzExtension rec { pname = "containerapp"; version = "1.0.0b1"; diff --git a/third_party/nixpkgs/pkgs/by-name/az/azure-cli/python-packages.nix b/third_party/nixpkgs/pkgs/by-name/az/azure-cli/python-packages.nix index 5bde744504..0b09811647 100644 --- a/third_party/nixpkgs/pkgs/by-name/az/azure-cli/python-packages.nix +++ b/third_party/nixpkgs/pkgs/by-name/az/azure-cli/python-packages.nix @@ -119,6 +119,17 @@ let overrideAzureMgmtPackage super.azure-mgmt-batchai "7.0.0b1" "zip" "sha256-mT6vvjWbq0RWQidugR229E8JeVEiobPD3XA/nDM3I6Y="; + azure-mgmt-billing = + (overrideAzureMgmtPackage super.azure-mgmt-billing "6.0.0" "zip" + "sha256-1PXFpBiKRW/h6zK2xF9VyiBpx0vkHrdpIYQLOfL1wH8=" + ).overridePythonAttrs + (attrs: { + propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ + self.msrest + self.msrestazure + ]; + }); + # AttributeError: type object 'CustomDomainsOperations' has no attribute 'disable_custom_https' azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "12.0.0" "zip" diff --git a/third_party/nixpkgs/pkgs/by-name/ba/baddns/package.nix b/third_party/nixpkgs/pkgs/by-name/ba/baddns/package.nix new file mode 100644 index 0000000000..77003ba502 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ba/baddns/package.nix @@ -0,0 +1,64 @@ +{ + lib, + stdenv, + fetchFromGitHub, + python3, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "baddns"; + version = "1.1.869"; + pyproject = true; + + src = fetchFromGitHub { + owner = "blacklanternsecurity"; + repo = "baddns"; + rev = "refs/tags/v${version}"; + hash = "sha256-BoRR7duvkXjI8vVP59IOACuIV7NmQe1loMEUgPfsdNw="; + }; + + pythonRelaxDeps = true; + + build-system = with python3.pkgs; [ + poetry-core + poetry-dynamic-versioning + ]; + + dependencies = with python3.pkgs; [ + colorama + dnspython + httpx + python-dateutil + python-whois + pyyaml + setuptools + tldextract + ]; + + nativeCheckInputs = with python3.pkgs; [ + mock + pyfakefs + pytest-asyncio + pytest-httpx + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "baddns" ]; + + disabledTests = [ + # Tests require network access + "test_cli_validation_customnameservers_valid" + "test_modules_customnameservers" + "test_references_cname_css" + "test_references_cname_js" + ]; + + meta = { + description = "Tool to check subdomains for subdomain takeovers and other DNS issues"; + homepage = "https://github.com/blacklanternsecurity/baddns/"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "baddns"; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/backup/bakelite/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bakelite/package.nix similarity index 80% rename from third_party/nixpkgs/pkgs/tools/backup/bakelite/default.nix rename to third_party/nixpkgs/pkgs/by-name/ba/bakelite/package.nix index d950556276..7eb87f2b5a 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/bakelite/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ba/bakelite/package.nix @@ -1,14 +1,18 @@ -{ lib, stdenv, fetchFromGitHub }: +{ + lib, + stdenv, + fetchFromGitHub, +}: stdenv.mkDerivation rec { pname = "bakelite"; - version = "unstable-2022-02-12"; + version = "unstable-2023-03-30"; src = fetchFromGitHub { owner = "richfelker"; repo = pname; - rev = "373901734d114e42aa385e6a7843745674e4ca08"; - hash = "sha256-HBnYlUyTkvPTbdsZD02yCq5C7yXOHYK4l4mDRUkcN5I="; + rev = "65d69e88e0972d1493ebbd9bf9d1bfde36272636"; + hash = "sha256-OjBw9aYD2h7BWYgQzZp03hGCyQcRgmm2AjrcT/QrQAo="; }; hardeningEnable = [ "pie" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ba/batik/package.nix b/third_party/nixpkgs/pkgs/by-name/ba/batik/package.nix index 18bdb7c37e..753e9bd7fe 100644 --- a/third_party/nixpkgs/pkgs/by-name/ba/batik/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ba/batik/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "batik"; - version = "1.17"; + version = "1.18"; src = fetchurl { url = "mirror://apache/xmlgraphics/batik/binaries/batik-bin-${finalAttrs.version}.tar.gz"; - hash = "sha256-sEJphF3grlwZCEt3gHHm4JF8RpvKKBLLvKXf2lu/dhA="; + hash = "sha256-k2kC/441o0qizY9nwbWJh3Hv45FJeuDgrhynPhvZg0Y="; }; nativeBuildInputs = [ 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 a230087ae8..532f8be2aa 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 @@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bcachefs-tools"; - version = "1.11.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-L2eIYdQnnmKNI8QWSy8nk4GzJ8jv+qt98gqdzcJH31Q="; + hash = "sha256-w55Fs1RZ4c55vTvb3jArPcmBLij1nuLi2MUHMMXPhng="; }; nativeBuildInputs = [ @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoTarball { src = finalAttrs.src; - hash = "sha256-Ol3wKdxKYJWDC/JREOfVSQRNnWVano7qilMRvqrLsgA=="; + hash = "sha256-rO4AjCnxmHQPk0hxgXK4yxUK5eag/+Q+fRG/BsRi0i0="; }; makeFlags = [ diff --git a/third_party/nixpkgs/pkgs/by-name/bi/biglybt/package.nix b/third_party/nixpkgs/pkgs/by-name/bi/biglybt/package.nix index 81c2fa31f9..4f11683dd1 100644 --- a/third_party/nixpkgs/pkgs/by-name/bi/biglybt/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bi/biglybt/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "biglybt"; - version = "3.6.0.0"; + version = "3.7.0.0"; src = fetchurl { url = "https://github.com/BiglySoftware/BiglyBT/releases/download/v${version}/GitHub_BiglyBT_unix.tar.gz"; - hash = "sha256-a7g9sB3orO2m0X7qNwQ1dDygYPhs/b6kX0RDSG8Wq2U="; + hash = "sha256-CfLKoX77yCanSzHq+Fy3jRqQAC2GeUo2SO9x0mk2Tf4="; }; nativeBuildInputs = [ wrapGAppsHook3 ]; diff --git a/third_party/nixpkgs/pkgs/by-name/bi/biome/package.nix b/third_party/nixpkgs/pkgs/by-name/bi/biome/package.nix index 3213241e94..a1250b34e9 100644 --- a/third_party/nixpkgs/pkgs/by-name/bi/biome/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bi/biome/package.nix @@ -12,16 +12,16 @@ }: rustPlatform.buildRustPackage rec { pname = "biome"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "biomejs"; repo = "biome"; rev = "cli/v${version}"; - hash = "sha256-erwGLcE5w/UnjZ1aVF3ZYD2OQGI8xt7lVBvpWkJ56tc="; + hash = "sha256-GZV8M/yUDMom6xvSvSfDRjcMGm+thiaTR3fggkBLmRE="; }; - cargoHash = "sha256-m9r0fcnkDPT2J1DjjbLCzdAxqh8DCFAWA3jikuaVVGQ="; + cargoHash = "sha256-5VZGyOQAz/p4r4v8CHOTcdgolw44HtZM0NuhTw4Wx3A="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/by-name/bi/bitwarden-desktop/package.nix b/third_party/nixpkgs/pkgs/by-name/bi/bitwarden-desktop/package.nix index a45712bfe8..6531632cc1 100644 --- a/third_party/nixpkgs/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -2,7 +2,6 @@ , buildNpmPackage , cargo , copyDesktopItems -, dbus , electron_32 , fetchFromGitHub , glib @@ -135,7 +134,6 @@ in buildNpmPackage rec { doCheck = true; nativeCheckInputs = [ - dbus (gnome-keyring.override { useWrappedDaemon = false; }) ]; @@ -146,14 +144,12 @@ in buildNpmPackage rec { checkPhase = '' runHook preCheck - pushd ${cargoRoot} - export HOME=$(mktemp -d) - export -f cargoCheckHook runHook _eval _callImplicitHook _logHook - export cargoCheckType=release - dbus-run-session \ - --config-file=${dbus}/share/dbus-1/session.conf \ - -- bash -e -c cargoCheckHook - popd + ( + cd ${cargoRoot} + HOME=$(mktemp -d) + cargoCheckType=release + cargoCheckHook + ) runHook postCheck ''; diff --git a/third_party/nixpkgs/pkgs/by-name/bl/bluetui/package.nix b/third_party/nixpkgs/pkgs/by-name/bl/bluetui/package.nix new file mode 100644 index 0000000000..4d96d24fd1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/bl/bluetui/package.nix @@ -0,0 +1,38 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + dbus, +}: + +rustPlatform.buildRustPackage rec { + pname = "bluetui"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "pythops"; + repo = "bluetui"; + rev = "v${version}"; + hash = "sha256-9svPIZzKuI4XBlxBsKucGLdX2dkfAy9ERT5oj8Su9TM="; + }; + + cargoHash = "sha256-w6rrZQNu5kLKEWSXFa/vSqwm76zWZug/ZqztMDY7buE="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + dbus + ]; + + meta = { + description = "TUI for managing bluetooth on Linux"; + homepage = "https://github.com/pythops/bluetui"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ donovanglover ]; + mainProgram = "bluetui"; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/bl/bluez/package.nix b/third_party/nixpkgs/pkgs/by-name/bl/bluez/package.nix index 77b2fdf7df..bd9a612416 100644 --- a/third_party/nixpkgs/pkgs/by-name/bl/bluez/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bl/bluez/package.nix @@ -11,7 +11,7 @@ , json_c , libical , pkg-config -, python3 +, python3Packages , readline , systemdMinimal , udev @@ -24,28 +24,28 @@ stdenv.mkDerivation (finalAttrs: { pname = "bluez"; - version = "5.76"; + version = "5.78"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/bluez-${finalAttrs.version}.tar.xz"; - hash = "sha256-VeLGRZCa2C2DPELOhewgQ04O8AcJQbHqtz+s3SQLvWM="; + hash = "sha256-gw/tGRXF03W43g9eb0X83qDcxf9f+z0x227Q8A1zxeM="; }; patches = [ - # hog-lib: Fix passing wrong parameters to bt_uhid_get_report_reply - (fetchpatch { - url = "https://github.com/bluez/bluez/commit/5ebaeab4164f80539904b9a520d9b7a8307e06e2.patch"; - hash = "sha256-f1A8DmRPfm+zid4XMj1zsfcLZ0WTEax3YPbydKZF9RE="; + # Upstream fix is wrong: + # https://github.com/bluez/bluez/issues/843#issuecomment-2352696535 + (fetchurl { + name = "basename.patch"; + url = "https://github.com/void-linux/void-packages/raw/187b45d47d93b6857a95cae10c2132d76e4955fc/srcpkgs/bluez/patches/basename.patch"; + hash = "sha256-Jb4u7rxIShDp1yUgaQVDJo2HJfZBzRoVlcDEWxooFgk="; }) - ] + ] ++ lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_64) # Disable one failing test with musl libc, also seen by alpine # https://github.com/bluez/bluez/issues/726 - ++ lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_64) - (fetchurl { - url = "https://git.alpinelinux.org/aports/plain/main/bluez/disable_aics_unit_testcases.patch?id=8e96f7faf01a45f0ad8449c1cd825db63a8dfd48"; - hash = "sha256-1PJkipqBO3qxxOqRFQKfpWlne1kzTCgtnTFYI1cFQt4="; - }) - ; + (fetchurl { + url = "https://git.alpinelinux.org/aports/plain/main/bluez/disable_aics_unit_testcases.patch?id=8e96f7faf01a45f0ad8449c1cd825db63a8dfd48"; + hash = "sha256-1PJkipqBO3qxxOqRFQKfpWlne1kzTCgtnTFYI1cFQt4="; + }); buildInputs = [ alsa-lib @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { glib json_c libical - python3 + python3Packages.python readline udev ]; @@ -62,7 +62,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ docutils pkg-config - python3.pkgs.wrapPython + python3Packages.pygments + python3Packages.wrapPython ]; outputs = [ "out" "dev" ] @@ -70,8 +71,8 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace tools/hid2hci.rules \ - --replace /sbin/udevadm ${systemdMinimal}/bin/udevadm \ - --replace "hid2hci " "$out/lib/udev/hid2hci " + --replace-fail /sbin/udevadm ${systemdMinimal}/bin/udevadm \ + --replace-fail "hid2hci " "$out/lib/udev/hid2hci " '' + # Disable some tests: # - test-mesh-crypto depends on the following kernel settings: @@ -122,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = stdenv.hostPlatform.isx86_64; postInstall = let - pythonPath = with python3.pkgs; [ + pythonPath = with python3Packages; [ dbus-python pygobject3 ]; diff --git a/third_party/nixpkgs/pkgs/by-name/bn/bngblaster/package.nix b/third_party/nixpkgs/pkgs/by-name/bn/bngblaster/package.nix index 5fb86282c3..cda862c0bf 100644 --- a/third_party/nixpkgs/pkgs/by-name/bn/bngblaster/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bn/bngblaster/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bngblaster"; - version = "0.9.7"; + version = "0.9.8"; src = fetchFromGitHub { owner = "rtbrick"; repo = "bngblaster"; rev = finalAttrs.version; - hash = "sha256-h4m/tPiLFRi3Dwh6QPmnCCZR4XNOZaz9xoDhOXAcIEQ="; + hash = "sha256-6pOkFu5BQHyESGW4Yxq5QjUG+fZOGxT2OAnglrav6fE="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/boundary/package.nix similarity index 77% rename from third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix rename to third_party/nixpkgs/pkgs/by-name/bo/boundary/package.nix index 6a7ddd1d73..ebc99cedda 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/bo/boundary/package.nix @@ -1,8 +1,12 @@ -{ stdenv, lib, fetchzip }: +{ + stdenv, + lib, + fetchzip, +}: stdenv.mkDerivation rec { pname = "boundary"; - version = "0.15.4"; + version = "0.18.0"; src = let @@ -14,16 +18,17 @@ stdenv.mkDerivation rec { x86_64-darwin = "darwin_amd64"; aarch64-darwin = "darwin_arm64"; }; - sha256 = selectSystem { - x86_64-linux = "sha256-43Q69Pp5NLB4fITy2X8d0XHp5EX+gFLnwtHOontISoU="; - aarch64-linux = "sha256-z87peCBv50eJr/kiFWPZUOeb0WCN4X+0JnxCvn3lCXo="; - x86_64-darwin = "sha256-SAhlZNGq5rkNitKVd+EjLOeeTErhWg14tHFG4Bsexv8="; - aarch64-darwin = "sha256-2DJgOdgJY6eUR2sqWS47vNjdkQGXOEEsSXhZeUBZxxs="; + hash = selectSystem { + x86_64-linux = "sha256-Wp1gPFQkOv+ZCEy0D2Tw9l6aCZekdpkXYcTZNheJHEg="; + aarch64-linux = "sha256-jBYu4m3L+j/coJ4D9cPA8mSBYiLiUyVKp98x6mdrrrk="; + x86_64-darwin = "sha256-OuiF1pgutt69ghlkLkEwkWMIFjvAsY7YUZERHNiToMs="; + aarch64-darwin = "sha256-sYKA02euri/K8FM8GoY7Y/WWLE2nBSoiNoxSdUPunWA="; }; in fetchzip { url = "https://releases.hashicorp.com/boundary/${version}/boundary_${version}_${suffix}.zip"; - inherit sha256; + inherit hash; + stripRoot = false; }; dontConfigure = true; @@ -64,7 +69,10 @@ stdenv.mkDerivation rec { ''; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.bsl11; - maintainers = with maintainers; [ jk techknowlogick ]; + maintainers = with maintainers; [ + jk + techknowlogick + ]; platforms = platforms.unix; mainProgram = "boundary"; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/boundary/update.sh b/third_party/nixpkgs/pkgs/by-name/bo/boundary/update.sh old mode 100755 new mode 100644 similarity index 55% rename from third_party/nixpkgs/pkgs/tools/networking/boundary/update.sh rename to third_party/nixpkgs/pkgs/by-name/bo/boundary/update.sh index 0533c07967..0418b2b3dd --- a/third_party/nixpkgs/pkgs/tools/networking/boundary/update.sh +++ b/third_party/nixpkgs/pkgs/by-name/bo/boundary/update.sh @@ -4,21 +4,18 @@ set -euo pipefail ROOT="$(dirname "$(readlink -f "$0")")" -NIX_DRV="$ROOT/default.nix" +NIX_DRV="$ROOT/package.nix" if [ ! -f "$NIX_DRV" ]; then - echo "ERROR: cannot find default.nix in $ROOT" + echo "ERROR: cannot find package.nix in $ROOT" exit 1 fi -fetch_arch() { - VER="$1"; ARCH="$2" - URL="https://releases.hashicorp.com/boundary/${VER}/boundary_${VER}_${ARCH}.zip" - nix-prefetch "{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - pname = \"boundary\"; version = \"${VER}\"; - src = fetchzip { url = \"$URL\"; }; -} -" +function calc_hash () { + local version=$1 + local arch=$2 + url="https://releases.hashicorp.com/boundary/${version}/boundary_${version}_${arch}.zip" + zip_hash=$(nix-prefetch-url --unpack $url) + nix hash to-sri --type sha256 "$zip_hash" } replace_sha() { @@ -28,10 +25,10 @@ replace_sha() { # https://releases.hashicorp.com/boundary/0.1.4/boundary_0.1.4_linux_amd64.zip BOUNDARY_VER=$(curl -Ls -w "%{url_effective}" -o /dev/null https://github.com/hashicorp/boundary/releases/latest | awk -F'/' '{print $NF}' | sed 's/v//') -BOUNDARY_LINUX_X64_SHA256=$(fetch_arch "$BOUNDARY_VER" "linux_amd64") -BOUNDARY_DARWIN_X64_SHA256=$(fetch_arch "$BOUNDARY_VER" "darwin_amd64") -BOUNDARY_LINUX_AARCH64_SHA256=$(fetch_arch "$BOUNDARY_VER" "linux_arm64") -BOUNDARY_DARWIN_AARCH64_SHA256=$(fetch_arch "$BOUNDARY_VER" "darwin_arm64") +BOUNDARY_LINUX_X64_SHA256=$(calc_hash "$BOUNDARY_VER" "linux_amd64") +BOUNDARY_DARWIN_X64_SHA256=$(calc_hash "$BOUNDARY_VER" "darwin_amd64") +BOUNDARY_LINUX_AARCH64_SHA256=$(calc_hash "$BOUNDARY_VER" "linux_arm64") +BOUNDARY_DARWIN_AARCH64_SHA256=$(calc_hash "$BOUNDARY_VER" "darwin_arm64") sed -i "s/version = \".*\"/version = \"$BOUNDARY_VER\"/" "$NIX_DRV" diff --git a/third_party/nixpkgs/pkgs/by-name/bo/boxbuddy/package.nix b/third_party/nixpkgs/pkgs/by-name/bo/boxbuddy/package.nix index db8e357899..34c3cd1911 100644 --- a/third_party/nixpkgs/pkgs/by-name/bo/boxbuddy/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bo/boxbuddy/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "boxbuddy"; - version = "2.2.12"; + version = "2.2.13"; src = fetchFromGitHub { owner = "Dvlv"; repo = "BoxBuddyRS"; rev = version; - hash = "sha256-PoPIIwe2SlK/iQTyqIhMG0dRobU98L5hnOciMmi9coo="; + hash = "sha256-47LOwBm7ql3Nvx6PZ2+x5aR9LSpzc8xuixdvKGdNS94="; }; - cargoHash = "sha256-En5TVCW/URJEry4sTd+vdi8K1YO2L0X5pYu/TGsrx6U="; + cargoHash = "sha256-W4W2tnnNgBcGD0/t5pobj4ca/YrRkHE1l5dIVe21KPU="; # The software assumes it is installed either in flatpak or in the home directory # so the xdg data path needs to be patched here diff --git a/third_party/nixpkgs/pkgs/by-name/bu/buf/package.nix b/third_party/nixpkgs/pkgs/by-name/bu/buf/package.nix index 5f8bfc30eb..637d21c4dc 100644 --- a/third_party/nixpkgs/pkgs/by-name/bu/buf/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bu/buf/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.44.0"; + version = "1.45.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = "buf"; rev = "v${version}"; - hash = "sha256-I0Y9gsNqCFLR2Bkt55HyER6wznTNoZW5345zUmuOFXQ="; + hash = "sha256-zmk9o0P4BaUqng9E/s6KKWntwS4NmTg/xPTrQruTQSo="; }; - vendorHash = "sha256-4ykve9X//ckYPDkq76i0ojOiyzjrPJ/J2z7mA5giWKE="; + vendorHash = "sha256-NMrPBUwbDsXW8tc5l1Liqd19+v2RrXf6dlcwVnHxVXQ="; patches = [ # Skip a test that requires networking to be available to work. diff --git a/third_party/nixpkgs/pkgs/by-name/ca/caido/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/caido/package.nix index 35061f3f7f..2a3ecc3374 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/caido/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/caido/package.nix @@ -15,14 +15,14 @@ let "cli" "desktop" ]; - version = "0.41.0"; + version = "0.42.0"; cli = fetchurl { url = "https://caido.download/releases/v${version}/caido-cli-v${version}-linux-x86_64.tar.gz"; - hash = "sha256-aQhax0efp5L3JNqGsOWsoO6z5pVVc/rxlz+5mvZoPNU="; + hash = "sha256-Y0ygbdL9IKvTRLwR0oW1LjFQZfPxKOoZnSDV2zgtJjM="; }; desktop = fetchurl { url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-x86_64.AppImage"; - hash = "sha256-DgXxOOWaLJG1h1nB+mkw77APh06WiJo9V9ZFCiWeha8="; + hash = "sha256-zS/lbcXK1iN2tuUMWc6Us0q2eUypD8mXsw0C+QKE3+w="; }; appimageContents = appimageTools.extractType2 { inherit pname version; diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cargo-make/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-make/package.nix index 0bd36afc16..7136085fa8 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/cargo-make/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-make/package.nix @@ -2,6 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config +, installShellFiles , bzip2 , openssl , stdenv @@ -21,7 +22,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-RjsYrFbS/OiMQKTiPshGcBI9KF75Z5stn2HaB6mniZE="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + installShellFiles + ]; buildInputs = [ bzip2 @@ -30,6 +34,10 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.SystemConfiguration ]; + postInstall = '' + installShellCompletion extra/shell/*.bash + ''; + # Some tests fail because they need network access. # However, Travis ensures a proper build. # See also: diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cargo-tauri/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-tauri/package.nix index 867dff3b7c..1746042b42 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/cargo-tauri/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-tauri/package.nix @@ -9,7 +9,7 @@ libsoup, openssl, pkg-config, - webkitgtk, + webkitgtk_4_0, }: rustPlatform.buildRustPackage rec { @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 libsoup - webkitgtk + webkitgtk_4_0 ] ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cargo-tauri/test-app.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-tauri/test-app.nix index d9304e3891..1cfa3eee9c 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/cargo-tauri/test-app.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-tauri/test-app.nix @@ -8,7 +8,7 @@ libsoup, openssl, pkg-config, - webkitgtk, + webkitgtk_4_0, wrapGAppsHook3, }: @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.isLinux [ glib-networking libsoup - webkitgtk + webkitgtk_4_0 ] ++ lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/third_party/nixpkgs/pkgs/by-name/ca/castxml/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/castxml/package.nix index c0fe17a1d0..fc8eccd1dc 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/castxml/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/castxml/package.nix @@ -32,24 +32,21 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ] ++ lib.optionals (withManual || withHTML) [ sphinx ]; buildInputs = [ + libclang libffi libxml2 llvm zlib - ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libclang ]; + ]; - cmakeFlags = - [ - (lib.cmakeOptionType "path" "CLANG_RESOURCE_DIR" - "${lib.getLib libclang}/lib/clang/${lib.versions.major libclang.version}" - ) + cmakeFlags = [ + (lib.cmakeOptionType "path" "CLANG_RESOURCE_DIR" + "${lib.getLib libclang}/lib/clang/${lib.versions.major libclang.version}" + ) - (lib.cmakeBool "SPHINX_HTML" withHTML) - (lib.cmakeBool "SPHINX_MAN" withManual) - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - (lib.cmakeOptionType "path" "Clang_DIR" "${lib.getDev libclang}/lib/cmake/clang") - ]; + (lib.cmakeBool "SPHINX_HTML" withHTML) + (lib.cmakeBool "SPHINX_MAN" withManual) + ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/catboost/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/catboost/package.nix similarity index 65% rename from third_party/nixpkgs/pkgs/development/libraries/catboost/default.nix rename to third_party/nixpkgs/pkgs/by-name/ca/catboost/package.nix index ca0d22ff00..1d0ef404a6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/catboost/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/catboost/package.nix @@ -1,20 +1,21 @@ -{ lib -, config -, fetchFromGitHub -, cmake -, cctools -, libiconv -, llvmPackages -, ninja -, openssl -, python3Packages -, ragel -, yasm -, zlib -, cudaSupport ? config.cudaSupport -, cudaPackages ? {} -, llvmPackages_12 -, pythonSupport ? false +{ + lib, + config, + fetchFromGitHub, + cmake, + cctools, + libiconv, + llvmPackages, + ninja, + openssl, + python3Packages, + ragel, + yasm, + zlib, + cudaSupport ? config.cudaSupport, + cudaPackages ? { }, + llvmPackages_12, + pythonSupport ? false, }: let inherit (llvmPackages) stdenv; @@ -22,13 +23,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "catboost"; - version = "1.2.5"; + version = "1.2.7"; src = fetchFromGitHub { owner = "catboost"; repo = "catboost"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-2dfCCCa0LheytkLRbYuBd25M320f1kbhBWKIVjslor0="; + hash = "sha256-I3geFdVQ1Pm61eRXi+ueaxel3QRb8EJV9f4zV2Q7kk4="; }; patches = [ @@ -50,33 +51,50 @@ stdenv.mkDerivation (finalAttrs: { done ''; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; - nativeBuildInputs = [ - cmake - llvmPackages.bintools - ninja - (python3Packages.python.withPackages (ps: with ps; [ six ])) - ragel - yasm - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - cctools - ] ++ lib.optionals cudaSupport (with cudaPackages; [ - cuda_nvcc - ]); + nativeBuildInputs = + [ + cmake + llvmPackages.bintools + ninja + (python3Packages.python.withPackages (ps: with ps; [ six ])) + ragel + yasm + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + cctools + ] + ++ lib.optionals cudaSupport ( + with cudaPackages; + [ + cuda_nvcc + ] + ); - buildInputs = [ - openssl - zlib - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - ] ++ lib.optionals cudaSupport (with cudaPackages; [ - cuda_cudart - cuda_cccl - libcublas - ]); + buildInputs = + [ + openssl + zlib + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ] + ++ lib.optionals cudaSupport ( + with cudaPackages; + [ + cuda_cudart + cuda_cccl + libcublas + ] + ); env = { + PROGRAM_VERSION = finalAttrs.version; + # catboost requires clang 14+ for build, but does clang 12 for cuda build. # after bumping the default version of llvm, check for compatibility with the cuda backend and pin it. # see https://catboost.ai/en/docs/installation/build-environment-setup-for-cmake#compilers,-linkers-and-related-tools @@ -112,10 +130,16 @@ stdenv.mkDerivation (finalAttrs: { library, used for ranking, classification, regression and other machine learning tasks for Python, R, Java, C++. Supports computation on CPU and GPU. ''; + changelog = "https://github.com/catboost/catboost/releases/tag/v${finalAttrs.version}"; license = licenses.asl20; platforms = platforms.unix; homepage = "https://catboost.ai"; - maintainers = with maintainers; [ PlushBeaver natsukium ]; + maintainers = with maintainers; [ + PlushBeaver + natsukium + ]; mainProgram = "catboost"; + # /nix/store/hzxiynjmmj35fpy3jla7vcqwmzj9i449-Libsystem-1238.60.2/include/sys/_types/_mbstate_t.h:31:9: error: unknown type name '__darwin_mbstate_t' + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/catboost/remove-conan.patch b/third_party/nixpkgs/pkgs/by-name/ca/catboost/remove-conan.patch similarity index 61% rename from third_party/nixpkgs/pkgs/development/libraries/catboost/remove-conan.patch rename to third_party/nixpkgs/pkgs/by-name/ca/catboost/remove-conan.patch index 44411ad416..4e3ab6f436 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/catboost/remove-conan.patch +++ b/third_party/nixpkgs/pkgs/by-name/ca/catboost/remove-conan.patch @@ -1,16 +1,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index ed6c53b220..5c6fb8f157 100644 +index 24ffd1225a..700adcc246 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -29,7 +29,6 @@ include(cmake/global_flags.cmake) +@@ -39,7 +39,6 @@ include(cmake/global_flags.cmake) include(cmake/global_vars.cmake) include(cmake/archive.cmake) include(cmake/common.cmake) --include(cmake/conan.cmake) +-include(cmake/conan1_deprecated.cmake) include(cmake/cuda.cmake) include(cmake/cython.cmake) include(cmake/fbs.cmake) -@@ -38,21 +37,6 @@ include(cmake/recursive_library.cmake) +@@ -48,21 +47,6 @@ include(cmake/recursive_library.cmake) include(cmake/shared_libs.cmake) include(cmake/swig.cmake) @@ -24,11 +24,16 @@ index ed6c53b220..5c6fb8f157 100644 - BUILD missing - REMOTE conancenter - SETTINGS ${settings} -- ENV "CONAN_CMAKE_GENERATOR=${CMAKE_GENERATOR}" -- CONF "tools.cmake.cmaketoolchain:generator=${CMAKE_GENERATOR}" +- ENV "CONAN_CMAKE_GENERATOR=${CMAKE_GENERATOR}" +- CONF "tools.cmake.cmaketoolchain:generator=${CMAKE_GENERATOR}" - ) -endif() - + if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) include(CMakeLists.linux-x86_64.txt) - elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND HAVE_CUDA) +@@ -93,4 +77,3 @@ elseif (ANDROID AND CMAKE_ANDROID_ARCH STREQUAL "x86") + elseif (ANDROID AND CMAKE_ANDROID_ARCH STREQUAL "x86_64") + include(CMakeLists.android-x86_64.txt) + endif() +- diff --git a/third_party/nixpkgs/pkgs/by-name/ca/catppuccinifier-gui/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/catppuccinifier-gui/package.nix index d4dbc5b390..101ba9bb74 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/catppuccinifier-gui/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/catppuccinifier-gui/package.nix @@ -11,7 +11,7 @@ libsoup, fetchzip, openssl_3, - webkitgtk, + webkitgtk_4_0, gdk-pixbuf, pkg-config, makeDesktopItem, @@ -39,7 +39,7 @@ stdenv.mkDerivation { buildInputs = [ curl wget - webkitgtk + webkitgtk_4_0 gtk3 cairo gdk-pixbuf diff --git a/third_party/nixpkgs/pkgs/by-name/cc/ccextractor/package.nix b/third_party/nixpkgs/pkgs/by-name/cc/ccextractor/package.nix index 0ddfdfe3f3..293784acd4 100644 --- a/third_party/nixpkgs/pkgs/by-name/cc/ccextractor/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cc/ccextractor/package.nix @@ -18,7 +18,7 @@ zlib, utf8proc, freetype, - ffmpeg_7, + ffmpeg, libarchive, curl, libiconv, @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { zlib utf8proc freetype - ffmpeg_7 + ffmpeg libarchive curl libiconv @@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: { ]; env = { - FFMPEG_INCLUDE_DIR = "${lib.getDev ffmpeg_7}/include"; + FFMPEG_INCLUDE_DIR = "${lib.getDev ffmpeg}/include"; # Upstream’s FFmpeg binding crate needs an explicit path to a shared # object to do dynamic linking. The key word is *an* explicit path; @@ -120,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: { "swresample" "swscale" ]; - ffmpegLibDir = "${lib.getLib ffmpeg_7}/lib"; + ffmpegLibDir = "${lib.getLib ffmpeg}/lib"; ffmpegLibExt = stdenv.hostPlatform.extensions.library; ffmpegLibPath = ffmpegLibName: "${ffmpegLibDir}/lib${ffmpegLibName}.${ffmpegLibExt}"; ffmpegLinkerScript = writeTextFile { diff --git a/third_party/nixpkgs/pkgs/by-name/cc/ccid/package.nix b/third_party/nixpkgs/pkgs/by-name/cc/ccid/package.nix index af3afd1b24..d2ae6be01f 100644 --- a/third_party/nixpkgs/pkgs/by-name/cc/ccid/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cc/ccid/package.nix @@ -13,16 +13,16 @@ stdenv.mkDerivation rec { pname = "ccid"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://ccid.apdu.fr/files/${pname}-${version}.tar.bz2"; - hash = "sha256-GUcI91/jadRd18Feiz6Kfbi0nPxVV1dMoqLnbvEsoMo="; + url = "https://ccid.apdu.fr/files/${pname}-${version}.tar.xz"; + hash = "sha256-LsqPsH6P58DTna6sp7l81zxA7Ztyc4okrT3L38kY4eo="; }; postPatch = '' patchShebangs . - substituteInPlace src/Makefile.in --replace-fail /bin/echo echo + substituteInPlace src/Makefile.am --replace-fail /bin/echo echo ''; configureFlags = [ 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 25eae2931c..435b8e0c9b 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 @@ -32,7 +32,7 @@ , sqlite , stdenv , util-linuxMinimal -, webkitgtk +, webkitgtk_4_0 }: stdenv.mkDerivation (finalAttrs: { @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { python3 sqlite util-linuxMinimal - webkitgtk + webkitgtk_4_0 ]; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/by-name/ch/chow-tape-model/package.nix b/third_party/nixpkgs/pkgs/by-name/ch/chow-tape-model/package.nix index e080ee6c05..9e9e3ae6b3 100644 --- a/third_party/nixpkgs/pkgs/by-name/ch/chow-tape-model/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ch/chow-tape-model/package.nix @@ -32,7 +32,7 @@ , python3 , sqlite , gcc11Stdenv -, webkitgtk +, webkitgtk_4_0 }: let # JUCE version in submodules is incompatible with GCC12 @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { pcre2 python3 sqlite - webkitgtk + webkitgtk_4_0 ]; # Link-time-optimization fails without these diff --git a/third_party/nixpkgs/pkgs/tools/networking/chrony/makefile.patch b/third_party/nixpkgs/pkgs/by-name/ch/chrony/makefile.patch similarity index 100% rename from third_party/nixpkgs/pkgs/tools/networking/chrony/makefile.patch rename to third_party/nixpkgs/pkgs/by-name/ch/chrony/makefile.patch diff --git a/third_party/nixpkgs/pkgs/by-name/ch/chrony/package.nix b/third_party/nixpkgs/pkgs/by-name/ch/chrony/package.nix new file mode 100644 index 0000000000..9cfdfd020c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ch/chrony/package.nix @@ -0,0 +1,116 @@ +{ + lib, + stdenv, + overrideSDK, + fetchurl, + pkg-config, + gnutls, + libedit, + texinfo, + libcap, + libseccomp, + pps-tools, + nixosTests, +}: + +let + stdenv' = + if stdenv.hostPlatform.isDarwin then + overrideSDK stdenv { + darwinSdkVersion = "11.0"; + darwinMinVersion = "10.13"; + } + else + stdenv; +in +stdenv'.mkDerivation rec { + pname = "chrony"; + version = "4.6.1"; + + src = fetchurl { + url = "https://chrony-project.org/releases/${pname}-${version}.tar.gz"; + hash = "sha256-Vx/3P78K4wl/BgTsouALHYuy6Rr/4aNJR4X/IdYZnFw="; + }; + + outputs = [ + "out" + "man" + ]; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = + [ + gnutls + libedit + texinfo + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libcap + libseccomp + pps-tools + ]; + + configureFlags = [ + "--enable-ntp-signd" + "--sbindir=$(out)/bin" + "--chronyrundir=/run/chrony" + ] ++ lib.optional stdenv.hostPlatform.isLinux "--enable-scfilter"; + + patches = [ + # Cleanup the installation script + ./makefile.patch + ]; + + postPatch = '' + patchShebangs test + + # nts_ke_session unit test fails, so drop it. + # TODO: try again when updating? + rm test/unit/nts_ke_session.c + ''; + + enableParallelBuilding = true; + doCheck = true; + + hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ]; + + passthru.tests = { + inherit (nixosTests) chrony chrony-ptp; + }; + + meta = { + description = "Sets your computer's clock from time servers on the Net"; + homepage = "https://chrony-project.org/"; + license = lib.licenses.gpl2Only; + platforms = + with lib.platforms; + builtins.concatLists [ + linux + freebsd + netbsd + darwin + illumos + ]; + maintainers = with lib.maintainers; [ + fpletz + thoughtpolice + vifino + ]; + + longDescription = '' + Chronyd is a daemon which runs in background on the system. It obtains + measurements via the network of the system clock’s offset relative to + time servers on other systems and adjusts the system time accordingly. + For isolated systems, the user can periodically enter the correct time by + hand (using Chronyc). In either case, Chronyd determines the rate at + which the computer gains or loses time, and compensates for this. Chronyd + implements the NTP protocol and can act as either a client or a server. + + Chronyc provides a user interface to Chronyd for monitoring its + performance and configuring various settings. It can do so while running + on the same computer as the Chronyd instance it is controlling or a + different computer. + ''; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ci/cimg/package.nix b/third_party/nixpkgs/pkgs/by-name/ci/cimg/package.nix index 5d2a68e4be..6b55ca7551 100644 --- a/third_party/nixpkgs/pkgs/by-name/ci/cimg/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ci/cimg/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cimg"; - version = "3.4.2"; + version = "3.4.3"; src = fetchFromGitHub { owner = "GreycLab"; repo = "CImg"; rev = "refs/tags/v.${finalAttrs.version}"; - hash = "sha256-lYs8V/phdyM1kpcxBDS3vAjxFgGCaaOCdNHU3//dgDs="; + hash = "sha256-Abe7mSbdj06MossUQXCKZPzzfyvJyRVeLfzINYNPv4g="; }; outputs = [ "out" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ci/cinny-desktop/package.nix b/third_party/nixpkgs/pkgs/by-name/ci/cinny-desktop/package.nix index e333f1cda4..48bbe1fe84 100644 --- a/third_party/nixpkgs/pkgs/by-name/ci/cinny-desktop/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ci/cinny-desktop/package.nix @@ -14,24 +14,24 @@ glib, glib-networking, libayatana-appindicator, - webkitgtk, + webkitgtk_4_0, }: rustPlatform.buildRustPackage rec { pname = "cinny-desktop"; # We have to be using the same version as cinny-web or this isn't going to work. - version = "4.2.1"; + version = "4.2.2"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny-desktop"; rev = "refs/tags/v${version}"; - hash = "sha256-W73ma8ScF3LGv45yhZCV80zhh7URLuWhbi+JumyTp+4="; + hash = "sha256-W8WSnfUqWTtyb6x0Kmej5sAxsi1Kh/uDkIx6SZhgSvw="; }; sourceRoot = "${src.name}/src-tauri"; - cargoHash = "sha256-ved2W4+Dt7pN9j9vIaDlAkaY517nBEgPKgu8ArcHXsM="; + cargoHash = "sha256-rg4NdxyJfnEPmFjb2wKJcF7ga7t5WNX/LB0haOvGbXU="; postPatch = let @@ -84,7 +84,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ glib-networking libayatana-appindicator - webkitgtk + webkitgtk_4_0 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools diff --git a/third_party/nixpkgs/pkgs/by-name/ci/cinny-unwrapped/package.nix b/third_party/nixpkgs/pkgs/by-name/ci/cinny-unwrapped/package.nix index 643b7017de..b4eda88f64 100644 --- a/third_party/nixpkgs/pkgs/by-name/ci/cinny-unwrapped/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ci/cinny-unwrapped/package.nix @@ -14,16 +14,16 @@ buildNpmPackage rec { pname = "cinny-unwrapped"; - version = "4.2.1"; + version = "4.2.2"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny"; rev = "v${version}"; - hash = "sha256-+sJQosQMji2iLGgOMRykSJm0zIhghsOsROJZvTQk2zQ="; + hash = "sha256-S8vOydjQLL2JK5g8B/PBaDRd+Er3JEKrsYSkDrOdi2k="; }; - npmDepsHash = "sha256-VSTpe1CA6lv5MoqXyk1iZSwzRc6Axy5cM8PmqPOyheA="; + npmDepsHash = "sha256-W3XXrhg7BblS0w4jI6oQDNggt7G56AzHQKC9tD0TrvU="; # Fix error: no member named 'aligned_alloc' in the global namespace env.NIX_CFLAGS_COMPILE = lib.optionalString ( diff --git a/third_party/nixpkgs/pkgs/by-name/ci/circom/package.nix b/third_party/nixpkgs/pkgs/by-name/ci/circom/package.nix index 895f3a6ba3..f16bf84c4f 100644 --- a/third_party/nixpkgs/pkgs/by-name/ci/circom/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ci/circom/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "circom"; - version = "2.1.9"; + version = "2.2.0"; src = fetchFromGitHub { owner = "iden3"; repo = "circom"; rev = "v${version}"; - hash = "sha256-l8204koaKTluYEvk6j9+MokdOqFCq2oExT5P2aW3kzc="; + hash = "sha256-OxfqbsxSIy0tLDMfDmdCZeMb2LCSG7I+Vm9RHb7tXFc="; }; - cargoHash = "sha256-M4FR/dPLIq1Ps0j1B69khmSl4uRE5wxN4dh3iuO/9A4="; + cargoHash = "sha256-KmUTlzRRmtD9vKJmh0MSUQxN8gz4qnp9fLs5Z0Lmypw="; doCheck = false; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/by-name/cl/clash-verge-rev/service.nix b/third_party/nixpkgs/pkgs/by-name/cl/clash-verge-rev/service.nix index 21baad40d3..3c8575f5b1 100644 --- a/third_party/nixpkgs/pkgs/by-name/cl/clash-verge-rev/service.nix +++ b/third_party/nixpkgs/pkgs/by-name/cl/clash-verge-rev/service.nix @@ -5,7 +5,7 @@ pkg-config, openssl, pname, - webkitgtk, + webkitgtk_4_0, service-cargo-hash, meta, }: @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl - webkitgtk + webkitgtk_4_0 ]; env = { diff --git a/third_party/nixpkgs/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix b/third_party/nixpkgs/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix index 64386c552d..966efa763d 100644 --- a/third_party/nixpkgs/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix +++ b/third_party/nixpkgs/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix @@ -9,7 +9,7 @@ rustPlatform, makeDesktopItem, meta, - webkitgtk, + webkitgtk_4_0, openssl, }: rustPlatform.buildRustPackage { @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl - webkitgtk + webkitgtk_4_0 ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/clean-css-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clean-css-cli/package.nix similarity index 61% rename from third_party/nixpkgs/pkgs/development/tools/clean-css-cli/default.nix rename to third_party/nixpkgs/pkgs/by-name/cl/clean-css-cli/package.nix index 62782c311d..195aa7537d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/clean-css-cli/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/cl/clean-css-cli/package.nix @@ -1,20 +1,23 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub +{ + lib, + buildNpmPackage, + fetchFromGitHub, }: -buildNpmPackage rec { - pname = "clean-css-cli"; - version = "5.6.2"; - +let + version = "5.6.3"; src = fetchFromGitHub { owner = "clean-css"; repo = "clean-css-cli"; rev = "v${version}"; - hash = "sha256-ONWJn6mehXeNwRVEEM+Ad/heXwNWC9E9yA5eUQsi98A="; + hash = "sha256-tsFNcQg55uY2gL5xLLLS6INLlYzbsU6M3hnsYeOFGEw="; }; +in +buildNpmPackage { + pname = "clean-css-cli"; + inherit version src; - npmDepsHash = "sha256-eVd6YSTHhp6qzGYn5PlikUgjNS+GJoRwfm6KPrEJKGE="; + npmDepsHash = "sha256-uvI9esVVOE18syHUCJpoiDY+Vh3hJO+GsMOTZSYJaxg="; dontNpmBuild = true; @@ -24,6 +27,6 @@ buildNpmPackage rec { homepage = "https://github.com/clean-css/clean-css-cli"; license = lib.licenses.mit; mainProgram = "cleancss"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ momeemt ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/wayland/cliphist/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/cliphist/package.nix similarity index 61% rename from third_party/nixpkgs/pkgs/tools/wayland/cliphist/default.nix rename to third_party/nixpkgs/pkgs/by-name/cl/cliphist/package.nix index 0cbb856162..7c8e6c73a1 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/cliphist/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/cl/cliphist/package.nix @@ -2,25 +2,30 @@ lib, buildGoModule, fetchFromGitHub, + nix-update-script, }: buildGoModule rec { pname = "cliphist"; - version = "0.5.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "sentriz"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-U78G7X9x3GQg3qcBINni8jWa0wSXQu+TjYChuRPPcLE="; + repo = "cliphist"; + rev = "refs/tags/v${version}"; + hash = "sha256-tImRbWjYCdIY8wVMibc5g5/qYZGwgT9pl4pWvY7BDlI="; }; - vendorHash = "sha256-O4jOFWygmFxm8ydOq1xtB1DESyWpFGXeSp8a6tT+too="; + vendorHash = "sha256-gG8v3JFncadfCEUa7iR6Sw8nifFNTciDaeBszOlGntU="; postInstall = '' cp ${src}/contrib/* $out/bin/ ''; + passthru = { + updateScript = nix-update-script { }; + }; + meta = with lib; { description = "Wayland clipboard manager"; homepage = "https://github.com/sentriz/cliphist"; diff --git a/third_party/nixpkgs/pkgs/by-name/cl/cloak-pt/package.nix b/third_party/nixpkgs/pkgs/by-name/cl/cloak-pt/package.nix index ec797d0d60..bcd3441bb4 100644 --- a/third_party/nixpkgs/pkgs/by-name/cl/cloak-pt/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cl/cloak-pt/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: let - version = "2.9.0"; + version = "2.10.0"; in buildGoModule { pname = "Cloak"; @@ -14,10 +14,10 @@ buildGoModule { owner = "cbeuw"; repo = "Cloak"; rev = "v${version}"; - hash = "sha256-IclSnSJAUSWWAk8UZbUJLMVcnoZk5Yvsd1n3u67cM2g="; + hash = "sha256-JbwjsLVOxQc6v47+6rG2f1JLS8ieZI6jYV/twtaVx9M="; }; - vendorHash = "sha256-kkb/gPnDbJvfc5Qqc5HuM1c9OwOu1ijfO7nNNnY3mOo="; + vendorHash = "sha256-0veClhg9GujI5VrHVzAevIXkjqtZ6r7RGTP2QeWbO2w="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/by-name/co/codechecker/package.nix b/third_party/nixpkgs/pkgs/by-name/co/codechecker/package.nix new file mode 100644 index 0000000000..26a7f62799 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/co/codechecker/package.nix @@ -0,0 +1,124 @@ +{ + lib, + python3, + fetchPypi, + fetchFromGitHub, + clang, + clang-tools, + cppcheck, + gcc, + makeWrapper, + withClang ? false, + withClangTools ? false, + withCppcheck ? false, + withGcc ? false, +}: +let + python = python3.override { + packageOverrides = self: super: rec { + # codechecker is incompatible with SQLAlchemy greater than 1.3 + sqlalchemy = super.sqlalchemy_1_4.overridePythonAttrs (oldAttrs: rec { + version = "1.3.23"; + pname = oldAttrs.pname; + src = fetchFromGitHub { + owner = "sqlalchemy"; + repo = "sqlalchemy"; + rev = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; + hash = "sha256-hWA0/f7rQpEfYTg10i0rBK3qeJbw3p6HW7S59rLnD0Q="; + }; + doCheck = false; + # That test does not exist in the 1.3 branch so we get an error for disabling it + disabledTestPaths = builtins.filter ( + testPath: testPath != "test/ext/mypy" + ) oldAttrs.disabledTestPaths; + }); + sqlalchemy_1_4 = sqlalchemy; + + # The current alembic version is not compatible with SQLAlchemy 1.3 so we need to downgrade it + alembic = super.alembic.overridePythonAttrs (oldAttrs: rec { + pname = "alembic"; + version = "1.5.5"; + src = fetchPypi { + inherit pname version; + hash = "sha256-3wAowZJ1os/xN+OWF6Oc3NvRFzczuHtr+iV7fAhgITs="; + }; + doCheck = false; + dependencies = oldAttrs.dependencies ++ [ + super.python-dateutil + super.python-editor + ]; + }); + }; + }; + python3Packages = python.pkgs; +in +python3Packages.buildPythonApplication rec { + pname = "codechecker"; + version = "6.24.0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-ftZACUf2lAHokcUXj45LRA7/3goOcIy521cGl6qhR98="; + }; + + nativeBuildInputs = with python3Packages; [ + setuptools + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = with python3Packages; [ + lxml + sqlalchemy + alembic + portalocker + psutil + multiprocess + thrift + gitpython + types-pyyaml + sarif-tools + pytest + pycodestyle + pylint + mkdocs + coverage + ]; + + pythonRelaxDeps = [ + "thrift" + "portalocker" + "types-pyyaml" + "lxml" + "psutil" + "multiprocess" + "gitpython" + "sarif-tools" + "pyyaml" + ]; + + postInstall = '' + wrapProgram "$out/bin/CodeChecker" --prefix PATH : ${ + lib.makeBinPath ( + [ ] + ++ lib.optional withClang clang + ++ lib.optional withClangTools clang-tools + ++ lib.optional withCppcheck cppcheck + ++ lib.optional withGcc gcc + ) + } + ''; + + meta = with lib; { + homepage = "https://github.com/Ericsson/codechecker"; + changelog = "https://github.com/Ericsson/codechecker/releases/tag/v${version}"; + description = "Analyzer tooling, defect database and viewer extension for the Clang Static Analyzer and Clang Tidy"; + license = licenses.asl20-llvm; + maintainers = with maintainers; [ + zebreus + felixsinger + ]; + mainProgram = "CodeChecker"; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/co/coeurl/package.nix b/third_party/nixpkgs/pkgs/by-name/co/coeurl/package.nix new file mode 100644 index 0000000000..b3a24e910b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/co/coeurl/package.nix @@ -0,0 +1,47 @@ +{ + lib, + stdenv, + fetchFromGitLab, + ninja, + pkg-config, + meson, + libevent, + curl, + spdlog, +}: + +stdenv.mkDerivation rec { + pname = "coeurl"; + version = "0.3.1"; + + src = fetchFromGitLab { + domain = "nheko.im"; + owner = "nheko-reborn"; + repo = pname; + rev = "v${version}"; + hash = "sha256-NGplM5c/dMGSQbhKeuPOTWL8KsqvMd/76YuwCxnqNNE="; + }; + postPatch = '' + substituteInPlace subprojects/curl.wrap --replace '[provides]' '[provide]' + ''; + + nativeBuildInputs = [ + ninja + pkg-config + meson + ]; + + buildInputs = [ + libevent + curl + spdlog + ]; + + meta = with lib; { + description = "Simple async wrapper around CURL for C++"; + homepage = "https://nheko.im/nheko-reborn/coeurl"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ rnhmjoj ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/co/consul/package.nix b/third_party/nixpkgs/pkgs/by-name/co/consul/package.nix index 824d0128f9..882b16248a 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/consul/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/consul/package.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "consul"; - version = "1.19.2"; + version = "1.20.0"; # Note: Currently only release tags are supported, because they have the Consul UI # vendored. See @@ -22,7 +22,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-BDEKnwX4OZ9eRvcZ3StpJTJM4P0/VvQGEQyaPg0AJhM="; + hash = "sha256-yHhaaZZ/KxQk8RVkqNfyfWTPS5K+BhckcxqdC5gN+ko="; }; # This corresponds to paths with package main - normally unneeded but consul @@ -32,7 +32,7 @@ buildGoModule rec { "connect/certgen" ]; - vendorHash = "sha256-n37MNBWMQnX6nMV7FvWF8acO5W4Y3GHzZj2rkulZruY="; + vendorHash = "sha256-7Nw2zuTyAR7mzxFkeOuhbh9OAlshZA0JKOVQdckIF90="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/by-name/co/copycat/package.nix b/third_party/nixpkgs/pkgs/by-name/co/copycat/package.nix index 59b36bda19..125a49f428 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/copycat/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/copycat/package.nix @@ -1,7 +1,9 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, + darwin, }: rustPlatform.buildRustPackage rec { @@ -17,6 +19,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-LYVhvq5l+PCZXW+elWi3zZFxLekgPn+plo4dybbLK9g="; + buildInputs = lib.optionals (stdenv.isDarwin) [ + darwin.apple_sdk_11_0.frameworks.AppKit + ]; + meta = { description = "Utility to copy project tree contents to clipboard"; homepage = "https://github.com/DeeKahy/CopyCat"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/corerad/default.nix b/third_party/nixpkgs/pkgs/by-name/co/corerad/package.nix similarity index 64% rename from third_party/nixpkgs/pkgs/tools/networking/corerad/default.nix rename to third_party/nixpkgs/pkgs/by-name/co/corerad/package.nix index 4caad92fc4..462cd493e8 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/corerad/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/corerad/package.nix @@ -1,17 +1,23 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests }: +{ + lib, + buildGoModule, + fetchFromGitHub, + nixosTests, + gitUpdater, +}: buildGoModule rec { pname = "corerad"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "mdlayher"; repo = "corerad"; rev = "v${version}"; - hash = "sha256-vIKmE9Lq8We7BTMUHIgnOU370ZnNW7YG75WALWdG+4A="; + hash = "sha256-tVK4chDV26vpuTaqVWe498j8ijZN2OOhe97LLE+xK9Y="; }; - vendorHash = "sha256-dsqFleXpL8yAcdigqxJsk/Sxvp9OTqbGK3xDEiHkM8A="; + vendorHash = "sha256-cmfRN7mU99TBtYmCsuHzliYqdfUHzDOFvKbnTZJqhLg="; # Since the tarball pulled from GitHub doesn't contain git tag information, # we fetch the expected tag's timestamp from a file in the root of the @@ -21,15 +27,21 @@ buildGoModule rec { ldflags+=" -X github.com/mdlayher/corerad/internal/build.linkTimestamp=$(<.gittagtime)" ''; - passthru.tests = { - inherit (nixosTests) corerad; + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + tests = { + inherit (nixosTests) corerad; + }; }; meta = with lib; { homepage = "https://github.com/mdlayher/corerad"; description = "Extensible and observable IPv6 NDP RA daemon"; license = licenses.asl20; - maintainers = with maintainers; [ mdlayher jmbaur ]; + maintainers = with maintainers; [ + mdlayher + jmbaur + ]; platforms = platforms.linux; mainProgram = "corerad"; }; diff --git a/third_party/nixpkgs/pkgs/by-name/co/coroot/package.nix b/third_party/nixpkgs/pkgs/by-name/co/coroot/package.nix new file mode 100644 index 0000000000..7d1b6d502d --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/co/coroot/package.nix @@ -0,0 +1,62 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + fetchNpmDeps, + fetchpatch, + pkg-config, + nodejs, + npmHooks, + lz4, +}: + +buildGoModule rec { + pname = "coroot"; + version = "1.5.9"; + + src = fetchFromGitHub { + owner = "coroot"; + repo = "coroot"; + rev = "v${version}"; + hash = "sha256-z6eD+qAdwu7DoyKTlAQqucdWRtT+h4qCPt0eTQceYXw="; + }; + # github.com/grafana/pyroscope-go/godeltaprof 0.1.6 is broken on go 1.23 + # use patch from https://github.com/coroot/coroot/pull/357 until it gets fixed + patches = [ + (fetchpatch { + url = "https://github.com/coroot/coroot/commit/9bf6ac0ad4dfaa7f13e6d9b5ce5e331d1478aafc.patch"; + hash = "sha256-5otqdYyQ57sNjF84CRgx0wcztsRdTdsNuhEkvGyw7UE="; + }) + ]; + + vendorHash = "sha256-W0UNw8FEIHDKQDCjBryDSJB/UhNyAtMxC6A/9lr79sg="; + npmDeps = fetchNpmDeps { + src = "${src}/front"; + hash = "sha256-inZV+iv837+7ntBae/oLSNLxpzoqEcJNPNdBE+osJHQ="; + }; + + nativeBuildInputs = [ + pkg-config + nodejs + npmHooks.npmConfigHook + ]; + buildInputs = [ lz4 ]; + + overrideModAttrs = oldAttrs: { + nativeBuildInputs = lib.remove npmHooks.npmConfigHook oldAttrs.nativeBuildInputs; + preBuild = null; + }; + + npmRoot = "front"; + preBuild = '' + npm --prefix="$npmRoot" run build-prod + ''; + + meta = { + description = "Open-source APM & Observability tool"; + homepage = "https://coroot.com"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ errnoh ]; + mainProgram = "coroot"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-comp/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/co/cosmic-comp/Cargo.lock index 443bc0ac42..652b9d67a6 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-comp/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-comp/Cargo.lock @@ -539,16 +539,16 @@ dependencies = [ [[package]] name = "calloop" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58a38167d6fba8c67cce63c4a91f2a73ca42cbdaf6fb9ba164f1e07b43ecc10" +checksum = "a1ead1e1514bce44c0f40e027899fbc595907fc112635bed21b3b5d975c0a5e7" dependencies = [ "async-task", "bitflags 2.6.0", - "log", "polling", "rustix", "slab", + "tracing", ] [[package]] @@ -823,7 +823,7 @@ dependencies = [ "anyhow", "bitflags 2.6.0", "bytemuck", - "calloop 0.14.0", + "calloop 0.14.1", "cosmic-comp-config", "cosmic-config", "cosmic-protocols", @@ -847,6 +847,7 @@ dependencies = [ "ordered-float", "png", "profiling", + "rand", "regex", "ron", "rust-embed", @@ -885,10 +886,10 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/#b40839638ab0e1d96de3f817eded647e6952db40" +source = "git+https://github.com/pop-os/libcosmic/#af68a3f660402b850dfd00041372d964d3b098d7" dependencies = [ "atomicwrites", - "calloop 0.14.0", + "calloop 0.14.1", "cosmic-config-derive", "dirs", "iced_futures", @@ -904,7 +905,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/#b40839638ab0e1d96de3f817eded647e6952db40" +source = "git+https://github.com/pop-os/libcosmic/#af68a3f660402b850dfd00041372d964d3b098d7" dependencies = [ "quote", "syn 1.0.109", @@ -913,7 +914,7 @@ dependencies = [ [[package]] name = "cosmic-protocols" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-protocols?branch=main#de2fead49d6af3a221db153642e4d7c2235aafc4" +source = "git+https://github.com/pop-os/cosmic-protocols?branch=main#91aeb55052a8e6e15a7ddd53e039a9350f16fa69" dependencies = [ "bitflags 2.6.0", "wayland-backend", @@ -926,7 +927,7 @@ dependencies = [ [[package]] name = "cosmic-settings-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-settings-daemon#362c77f9faaeb7f1b9e4aa79a7d5588001f04874" +source = "git+https://github.com/pop-os/cosmic-settings-daemon#1ed68808e85ce681da882446ec572d44c68a6866" dependencies = [ "cosmic-config", "serde", @@ -939,7 +940,7 @@ dependencies = [ [[package]] name = "cosmic-text" version = "0.12.1" -source = "git+https://github.com/pop-os/cosmic-text.git#e16b39f29c84773a05457fe39577a602de27855c" +source = "git+https://github.com/pop-os/cosmic-text.git#e8f567cf5b456dfab749a575c257acaa36f622d9" dependencies = [ "bitflags 2.6.0", "fontdb", @@ -949,6 +950,7 @@ dependencies = [ "rustc-hash", "rustybuzz 0.14.1", "self_cell 1.0.4", + "smol_str", "swash", "sys-locale", "ttf-parser 0.21.1", @@ -961,7 +963,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/#b40839638ab0e1d96de3f817eded647e6952db40" +source = "git+https://github.com/pop-os/libcosmic/#af68a3f660402b850dfd00041372d964d3b098d7" dependencies = [ "almost", "cosmic-config", @@ -1077,7 +1079,7 @@ version = "0.19.0" source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" dependencies = [ "bitflags 2.6.0", - "libloading 0.8.5", + "libloading 0.7.4", "winapi", ] @@ -1218,7 +1220,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.5", + "libloading 0.7.4", ] [[package]] @@ -2155,7 +2157,7 @@ dependencies = [ "bitflags 2.6.0", "com", "libc", - "libloading 0.8.5", + "libloading 0.7.4", "thiserror", "widestring", "winapi", @@ -2305,7 +2307,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/#b40839638ab0e1d96de3f817eded647e6952db40" +source = "git+https://github.com/pop-os/libcosmic/#a962865230f3b9ecba40c0c09e9c279e832c9f10" dependencies = [ "dnd", "iced_core", @@ -2321,7 +2323,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/#b40839638ab0e1d96de3f817eded647e6952db40" +source = "git+https://github.com/pop-os/libcosmic/#a962865230f3b9ecba40c0c09e9c279e832c9f10" dependencies = [ "bitflags 2.6.0", "dnd", @@ -2341,7 +2343,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/#b40839638ab0e1d96de3f817eded647e6952db40" +source = "git+https://github.com/pop-os/libcosmic/#a962865230f3b9ecba40c0c09e9c279e832c9f10" dependencies = [ "futures", "iced_core", @@ -2353,7 +2355,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/#b40839638ab0e1d96de3f817eded647e6952db40" +source = "git+https://github.com/pop-os/libcosmic/#a962865230f3b9ecba40c0c09e9c279e832c9f10" dependencies = [ "bitflags 2.6.0", "bytemuck", @@ -2377,7 +2379,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/#b40839638ab0e1d96de3f817eded647e6952db40" +source = "git+https://github.com/pop-os/libcosmic/#a962865230f3b9ecba40c0c09e9c279e832c9f10" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2389,7 +2391,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/#b40839638ab0e1d96de3f817eded647e6952db40" +source = "git+https://github.com/pop-os/libcosmic/#a962865230f3b9ecba40c0c09e9c279e832c9f10" dependencies = [ "dnd", "iced_core", @@ -2401,7 +2403,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/#b40839638ab0e1d96de3f817eded647e6952db40" +source = "git+https://github.com/pop-os/libcosmic/#a962865230f3b9ecba40c0c09e9c279e832c9f10" dependencies = [ "iced_core", "once_cell", @@ -2411,7 +2413,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/#b40839638ab0e1d96de3f817eded647e6952db40" +source = "git+https://github.com/pop-os/libcosmic/#a962865230f3b9ecba40c0c09e9c279e832c9f10" dependencies = [ "bytemuck", "cosmic-text", @@ -2428,7 +2430,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/#b40839638ab0e1d96de3f817eded647e6952db40" +source = "git+https://github.com/pop-os/libcosmic/#a962865230f3b9ecba40c0c09e9c279e832c9f10" dependencies = [ "as-raw-xcb-connection", "bitflags 2.6.0", @@ -2457,7 +2459,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/#b40839638ab0e1d96de3f817eded647e6952db40" +source = "git+https://github.com/pop-os/libcosmic/#a962865230f3b9ecba40c0c09e9c279e832c9f10" dependencies = [ "dnd", "iced_renderer", @@ -2790,7 +2792,7 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/#b40839638ab0e1d96de3f817eded647e6952db40" +source = "git+https://github.com/pop-os/libcosmic/#af68a3f660402b850dfd00041372d964d3b098d7" dependencies = [ "apply", "chrono", @@ -2836,7 +2838,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.52.6", + "windows-targets 0.48.5", ] [[package]] @@ -4086,9 +4088,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.34.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4" +checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc" dependencies = [ "memchr", ] @@ -4480,12 +4482,6 @@ dependencies = [ "regex", ] -[[package]] -name = "scan_fmt" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b53b0a5db882a8e2fdaae0a43f7b39e7e9082389e978398bdf223a55b581248" - [[package]] name = "scoped-tls" version = "1.0.1" @@ -4703,12 +4699,12 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smithay" version = "0.3.0" -source = "git+https://github.com/smithay//smithay?rev=e7f0857#e7f08570bceab6107863267ae168d0afb018e8f5" +source = "git+https://github.com/smithay//smithay?rev=08d31e1#08d31e17ea4ac47cddeb56e2ac18ee50b331911b" dependencies = [ "appendlist", "ash 0.38.0+1.3.281", "bitflags 2.6.0", - "calloop 0.14.0", + "calloop 0.14.1", "cc", "cgmath", "cursor-icon", @@ -4723,7 +4719,6 @@ dependencies = [ "glow 0.12.3", "indexmap 2.3.0", "input", - "lazy_static", "libc", "libloading 0.8.5", "libseat", @@ -4733,7 +4728,6 @@ dependencies = [ "profiling", "rand", "rustix", - "scan_fmt", "scopeguard", "smallvec", "tempfile", @@ -4794,7 +4788,7 @@ dependencies = [ [[package]] name = "smithay-egui" version = "0.1.0" -source = "git+https://github.com/Smithay/smithay-egui.git?rev=cdc652e0#cdc652e0d4823b16a5bd9badd288e38512789dc5" +source = "git+https://github.com/Smithay/smithay-egui.git?rev=0d0b4ca0#0d0b4ca01a851b97cd27bdc94cce1c1f52723ad5" dependencies = [ "cgmath", "egui", @@ -5233,6 +5227,7 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ + "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -5702,9 +5697,9 @@ dependencies = [ [[package]] name = "wayland-backend" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993" +checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6" dependencies = [ "cc", "downcast-rs", @@ -5716,9 +5711,9 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.5" +version = "0.31.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943" +checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d" dependencies = [ "bitflags 2.6.0", "rustix", @@ -5760,9 +5755,9 @@ dependencies = [ [[package]] name = "wayland-protocols" -version = "0.32.3" +version = "0.32.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62989625a776e827cc0f15d41444a3cea5205b963c3a25be48ae1b52d6b4daaa" +checksum = "2b5755d77ae9040bb872a25026555ce4cb0ae75fd923e90d25fba07d81057de0" dependencies = [ "bitflags 2.6.0", "wayland-backend", @@ -5813,9 +5808,9 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.31.4" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6" +checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3" dependencies = [ "proc-macro2", "quick-xml", @@ -5824,9 +5819,9 @@ dependencies = [ [[package]] name = "wayland-server" -version = "0.31.4" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a4bab6d420ee4a609b63ef4d5f9b5d309c6b93a029fccab70f2594c0cb3ae" +checksum = "0f18d47038c0b10479e695d99ed073e400ccd9bdbb60e6e503c96f62adcb12b6" dependencies = [ "bitflags 2.6.0", "downcast-rs", @@ -5838,9 +5833,9 @@ dependencies = [ [[package]] name = "wayland-sys" -version = "0.31.4" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148" +checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09" dependencies = [ "dlib", "log", @@ -5956,7 +5951,7 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.5", + "libloading 0.7.4", "log", "metal", "naga", diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-comp/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-comp/package.nix index 544c214894..09e457dc85 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-comp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-comp/package.nix @@ -21,13 +21,13 @@ rustPlatform.buildRustPackage rec { pname = "cosmic-comp"; - version = "1.0.0-alpha.1"; + version = "1.0.0-alpha.2"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-comp"; rev = "epoch-${version}"; - hash = "sha256-4NAIpyaITFNaTDBcsleIwKPq8nHNa77C7y+5hCIYXZE="; + hash = "sha256-IbGMp+4nRg4v5yRvp3ujGx7+nJ6wJmly6dZBXbQAnr8="; }; cargoLock = { @@ -35,16 +35,17 @@ rustPlatform.buildRustPackage rec { outputHashes = { "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA="; "clipboard_macos-0.1.0" = "sha256-cG5vnkiyDlQnbEfV2sPbmBYKv1hd3pjJrymfZb8ziKk="; - "cosmic-config-0.1.0" = "sha256-nZCefRCq40K0Mcsav+akZbX89kHnliqAkB7vKx5WIwY="; - "cosmic-protocols-0.1.0" = "sha256-qgo8FMKo/uCbhUjfykRRN8KSavbyhZpu82M8npLcIPI="; - "cosmic-settings-config-0.1.0" = "sha256-/Qav6r4VQ8ZDSs/tqHeutxYH3u4HiTBFWTfAYUSl2HQ="; - "cosmic-text-0.12.1" = "sha256-x0XTxzbmtE2d4XCG/Nuq3DzBpz15BbnjRRlirfNJEiU="; + "cosmic-config-0.1.0" = "sha256-MZLjSIhPz+cpaSHA1R1S+9FD60ys+tHaJ+2Cz+2B/uE="; + "cosmic-protocols-0.1.0" = "sha256-6XM6kcM2CEGAziCkal4uO0EL1nEWOKb3rFs7hFh6r7Y="; + "cosmic-settings-config-0.1.0" = "sha256-j4tAclYoenNM+iBwk8iHOj4baIXc4wkclPl5RZsADGI="; + "cosmic-text-0.12.1" = "sha256-3opGta6Co8l+hIQRVGkfSy6IqJXq/N8ZzqF+YGQADmI="; "d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4="; "glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg="; + "iced-0.12.0" = "sha256-1RSl5Zd6pkSdAD0zkjL8mzgBbCuc0AE564uI8zrNCyc="; "id_tree-1.8.0" = "sha256-uKdKHRfPGt3vagOjhnri3aYY5ar7O3rp2/ivTfM2jT0="; - "smithay-0.3.0" = "sha256-puo6xbWRTIco8luz3Jz83VXoRMkyb0ZH7kKHGlTzS5Q="; + "smithay-0.3.0" = "sha256-vep0/Hv1E5YvnHFV91+4Y3CTxOYCAndEnguw/XJ3sNM="; "smithay-clipboard-0.8.0" = "sha256-4InFXm0ahrqFrtNLeqIuE3yeOpxKZJZx+Bc0yQDtv34="; - "smithay-egui-0.1.0" = "sha256-FcSoKCwYk3okwQURiQlDUcfk9m/Ne6pSblGAzHDaVHg="; + "smithay-egui-0.1.0" = "sha256-i8Rlo221v8G7QUAVVBtBNdOtQv1Drv2oj+EhTBak25g="; "softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg="; "taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI="; }; @@ -77,6 +78,14 @@ rustPlatform.buildRustPackage rec { "-Wl,--pop-state" ]; + makeFlags = [ + "prefix=$(out)" + "CARGO_TARGET_DIR=target/${stdenv.hostPlatform.rust.cargoShortTarget}" + ]; + + # Use default stdenv installPhase, not the buildRustPackage one. + installPhase = "installPhase"; + # These libraries are only used by the X11 backend, which will not # be the common case, so just make them available, don't link them. postInstall = '' diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-edit/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/co/cosmic-edit/Cargo.lock index af9c97f029..908e65e54c 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-edit/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-edit/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.26" +version = "0.2.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e53b0a3d5760cd2ba9b787ae0c6440ad18ee294ff71b05e3381c900a7d16cfd" +checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -91,9 +91,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" dependencies = [ "gimli", ] @@ -104,6 +104,23 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "aes" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + [[package]] name = "ahash" version = "0.8.11" @@ -151,7 +168,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" dependencies = [ "android-properties", - "bitflags 2.5.0", + "bitflags 2.6.0", "cc", "cesu8", "jni", @@ -188,9 +205,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", @@ -203,49 +220,43 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", ] -[[package]] -name = "any_ascii" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70033777eb8b5124a81a1889416543dddef2de240019b674c81285a2635a7e1e" - [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "apply" @@ -262,6 +273,15 @@ dependencies = [ "num-traits", ] +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] + [[package]] name = "arc-swap" version = "1.7.1" @@ -270,9 +290,9 @@ checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" @@ -282,9 +302,9 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "as-raw-xcb-connection" @@ -317,7 +337,7 @@ dependencies = [ "serde_repr", "tokio", "url", - "zbus 4.3.0", + "zbus 4.4.0", ] [[package]] @@ -334,7 +354,7 @@ dependencies = [ "serde_repr", "tokio", "url", - "zbus 4.3.0", + "zbus 4.4.0", ] [[package]] @@ -373,13 +393,13 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.12.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" +checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec" dependencies = [ "async-task", "concurrent-queue", - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-lite 2.3.0", "slab", ] @@ -429,9 +449,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.3" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" dependencies = [ "async-lock 3.4.0", "cfg-if", @@ -439,11 +459,11 @@ dependencies = [ "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.7.2", - "rustix 0.38.34", + "polling 3.7.3", + "rustix 0.38.37", "slab", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -472,7 +492,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" dependencies = [ - "async-io 2.3.3", + "async-io 2.3.4", "blocking", "futures-lite 2.3.0", ] @@ -490,18 +510,18 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.34", + "rustix 0.38.37", "windows-sys 0.48.0", ] [[package]] name = "async-process" -version = "2.2.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" +checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb" dependencies = [ "async-channel", - "async-io 2.3.3", + "async-io 2.3.4", "async-lock 3.4.0", "async-signal", "async-task", @@ -509,9 +529,8 @@ dependencies = [ "cfg-if", "event-listener 5.3.1", "futures-lite 2.3.0", - "rustix 0.38.34", + "rustix 0.38.37", "tracing", - "windows-sys 0.52.0", ] [[package]] @@ -522,25 +541,25 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "async-signal" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" dependencies = [ - "async-io 2.3.3", + "async-io 2.3.4", "async-lock 3.4.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.34", + "rustix 0.38.37", "signal-hook-registry", "slab", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -551,13 +570,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -571,7 +590,7 @@ name = "atomicwrites" version = "0.4.2" source = "git+https://github.com/jackpot51/rust-atomicwrites#043ab4859d53ffd3d55334685303d8df39c9f768" dependencies = [ - "rustix 0.38.34", + "rustix 0.38.37", "tempfile", "windows-sys 0.48.0", ] @@ -632,17 +651,17 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.8.0", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -651,6 +670,21 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "basic-toml" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "823388e228f614e9558c6804262db37960ec8821856535f5c3f59913140558f8" +dependencies = [ + "serde", +] + [[package]] name = "bincode" version = "1.3.3" @@ -689,9 +723,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", ] @@ -764,9 +798,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", "regex-automata", @@ -793,22 +827,22 @@ checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" [[package]] name = "bytemuck" -version = "1.16.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" +checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -819,9 +853,30 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" + +[[package]] +name = "bzip2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" +dependencies = [ + "bzip2-sys", + "libc", +] + +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] [[package]] name = "calloop" @@ -829,10 +884,10 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "log", - "polling 3.7.2", - "rustix 0.38.34", + "polling 3.7.3", + "rustix 0.38.37", "slab", "thiserror", ] @@ -843,10 +898,10 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "log", - "polling 3.7.2", - "rustix 0.38.34", + "polling 3.7.3", + "rustix 0.38.37", "slab", "thiserror", ] @@ -858,7 +913,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" dependencies = [ "calloop 0.12.4", - "rustix 0.38.34", + "rustix 0.38.37", "wayland-backend", "wayland-client", ] @@ -870,20 +925,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" dependencies = [ "calloop 0.13.0", - "rustix 0.38.34", + "rustix 0.38.37", "wayland-backend", "wayland-client", ] [[package]] name = "cc" -version = "1.0.99" +version = "1.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" +checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" dependencies = [ "jobserver", "libc", - "once_cell", + "shlex", ] [[package]] @@ -892,6 +947,17 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" +[[package]] +name = "cfb" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" +dependencies = [ + "byteorder", + "fnv", + "uuid", +] + [[package]] name = "cfg-if" version = "1.0.0" @@ -922,14 +988,24 @@ dependencies = [ "num-traits", "pure-rust-locales", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", ] [[package]] name = "clipboard-win" -version = "5.3.1" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" dependencies = [ "error-code", ] @@ -1011,9 +1087,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "com" @@ -1085,6 +1161,12 @@ dependencies = [ "tiny-keccak", ] +[[package]] +name = "constant_time_eq" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" + [[package]] name = "core-foundation" version = "0.9.4" @@ -1097,9 +1179,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core-graphics" @@ -1128,7 +1210,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#9e344b15c31ede67e0f79508108aa117d366eefa" +source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1147,7 +1229,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#9e344b15c31ede67e0f79508108aa117d366eefa" +source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "quote", "syn 1.0.109", @@ -1187,18 +1269,22 @@ dependencies = [ [[package]] name = "cosmic-files" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-files.git#3fef386fd3447191fcffe8da6e1d2125fe2b0a27" +source = "git+https://github.com/pop-os/cosmic-files.git#774ccf955f59f24cf9493f9249d20788ad394d48" dependencies = [ "chrono", "dirs", - "env_logger 0.11.3", + "env_logger 0.11.5", + "flate2", "fork", + "freedesktop_entry_parser", "fs_extra", + "glob", "i18n-embed", "i18n-embed-fl", + "icu_collator", + "icu_provider", "ignore", "image", - "lexical-sort", "libc", "libcosmic", "log", @@ -1208,17 +1294,23 @@ dependencies = [ "open", "paste", "rayon", + "recently-used-xbel", "regex", "rust-embed", "serde", "shlex", "slotmap", "smol_str", + "tar", "tokio", "trash", + "unix_permissions_ext", "url", + "uzers", "vergen", + "walkdir", "xdg-mime", + "zip", ] [[package]] @@ -1228,15 +1320,15 @@ source = "git+https://github.com/pop-os/cosmic-syntax-theme.git#b1e1eb0234568911 dependencies = [ "handlebars", "serde", - "toml 0.8.14", + "toml 0.8.19", ] [[package]] name = "cosmic-text" version = "0.12.1" -source = "git+https://github.com/pop-os/cosmic-text.git#e16b39f29c84773a05457fe39577a602de27855c" +source = "git+https://github.com/pop-os/cosmic-text.git#4fe90bb6126c22f589b46768d7754d65ae300c5e" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cosmic_undo_2", "fontdb", "log", @@ -1246,6 +1338,7 @@ dependencies = [ "rustc-hash", "rustybuzz 0.14.1", "self_cell 1.0.4", + "smol_str", "swash", "syntect", "sys-locale", @@ -1259,7 +1352,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#9e344b15c31ede67e0f79508108aa117d366eefa" +source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "almost", "cosmic-config", @@ -1286,13 +1379,28 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] +[[package]] +name = "crc" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + [[package]] name = "crc32fast" version = "1.4.2" @@ -1385,16 +1493,16 @@ name = "d3d12" version = "0.19.0" source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" dependencies = [ - "bitflags 2.5.0", - "libloading 0.8.3", + "bitflags 2.6.0", + "libloading 0.8.5", "winapi", ] [[package]] name = "darling" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ "darling_core", "darling_macro", @@ -1402,27 +1510,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "darling_macro" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -1444,6 +1552,12 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" +[[package]] +name = "deflate64" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b" + [[package]] name = "deranged" version = "0.3.11" @@ -1464,6 +1578,17 @@ dependencies = [ "syn 1.0.109", ] +[[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.77", +] + [[package]] name = "derive_setters" version = "0.1.6" @@ -1473,7 +1598,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -1484,6 +1609,7 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "crypto-common", + "subtle", ] [[package]] @@ -1536,13 +1662,13 @@ checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -1551,7 +1677,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.3", + "libloading 0.8.5", ] [[package]] @@ -1568,10 +1694,10 @@ name = "dnd" version = "0.1.0" source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "mime 0.1.0", "raw-window-handle", - "smithay-client-toolkit 0.19.1", + "smithay-client-toolkit 0.19.2", "smithay-clipboard", ] @@ -1587,11 +1713,11 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", "drm-ffi", "drm-fourcc", - "rustix 0.38.34", + "rustix 0.38.37", ] [[package]] @@ -1601,7 +1727,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" dependencies = [ "drm-sys", - "rustix 0.38.34", + "rustix 0.38.37", ] [[package]] @@ -1617,14 +1743,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176" dependencies = [ "libc", - "linux-raw-sys 0.6.4", + "linux-raw-sys 0.6.5", ] [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encoding_rs" @@ -1679,14 +1805,14 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "env_filter" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" dependencies = [ "log", "regex", @@ -1707,9 +1833,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" dependencies = [ "anstream", "anstyle", @@ -1736,9 +1862,9 @@ dependencies = [ [[package]] name = "error-code" -version = "3.2.0" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" +checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f" [[package]] name = "etagere" @@ -1752,9 +1878,9 @@ dependencies = [ [[package]] name = "euclid" -version = "0.22.10" +version = "0.22.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f0eb73b934648cd7a4a61f1b15391cd95dab0b4da6e2e66c2a072c144b4a20" +checksum = "ad9cdb4b747e485a12abb0e6566612956c7a1bafa3bdb8d682c5b6d403589e48" dependencies = [ "num-traits", ] @@ -1807,7 +1933,7 @@ dependencies = [ "flume", "half", "lebe", - "miniz_oxide", + "miniz_oxide 0.7.4", "rayon-core", "smallvec", "zune-inflate", @@ -1830,9 +1956,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" @@ -1854,14 +1980,13 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +version = "0.2.24" +source = "git+https://github.com/jackpot51/filetime#186e19d3190ead16b05329400cb5b2350d8f44cf" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", + "libredox 0.1.3", + "windows-sys 0.59.0", ] [[package]] @@ -1875,12 +2000,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -1959,20 +2084,20 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "font-types" -version = "0.5.5" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34fd7136aca682873d859ef34494ab1a7d3f57ecd485ed40eb6437ee8c85aa29" +checksum = "8f0189ccb084f77c5523e08288d418cbaa09c451a08515678a0aa265df9a8b60" dependencies = [ "bytemuck", ] [[package]] name = "fontconfig-parser" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" +checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7" dependencies = [ - "roxmltree", + "roxmltree 0.20.0", ] [[package]] @@ -1983,7 +2108,7 @@ checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" dependencies = [ "fontconfig-parser", "log", - "memmap2 0.9.4", + "memmap2 0.9.5", "slotmap", "tinyvec", "ttf-parser 0.20.0", @@ -2007,7 +2132,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -2058,10 +2183,19 @@ dependencies = [ ] [[package]] -name = "fs_extra" +name = "freedesktop_entry_parser" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" +checksum = "db9c27b72f19a99a895f8ca89e2d26e4ef31013376e56fdafef697627306c3e4" +dependencies = [ + "nom 7.1.3", + "thiserror", +] + +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "git+https://github.com/pop-os/fs_extra.git#7e7222eb2b7830d40b67cd02e6ebd156524ee866" [[package]] name = "fsevent-sys" @@ -2142,7 +2276,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-core", "futures-io", "parking", @@ -2157,7 +2291,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -2243,9 +2377,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" [[package]] name = "gl_generator" @@ -2272,9 +2406,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19" dependencies = [ "aho-corasick", "bstr", @@ -2321,7 +2455,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "gpu-alloc-types", ] @@ -2331,7 +2465,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -2353,7 +2487,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "gpu-descriptor-types", "hashbrown", ] @@ -2364,14 +2498,14 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] name = "grep" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2b024ec1e686cb64d78beb852030b0e632af93817f1ed25be0173af0e94939" +checksum = "308ae749734e28d749a86f33212c7b756748568ce332f970ac1d9cd8531f32e6" dependencies = [ "grep-cli", "grep-matcher", @@ -2382,9 +2516,9 @@ dependencies = [ [[package]] name = "grep-cli" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea40788c059ab8b622c4d074732750bfb3bd2912e2dd58eabc11798a4d5ad725" +checksum = "47f1288f0e06f279f84926fa4c17e3fcd2a22b357927a82f2777f7be26e4cec0" dependencies = [ "bstr", "globset", @@ -2405,9 +2539,9 @@ dependencies = [ [[package]] name = "grep-printer" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "743c12a03c8aee38b6e5bd0168d8ebb09345751323df4a01c56e792b1f38ceb2" +checksum = "c112110ae4a891aa4d83ab82ecf734b307497d066f437686175e83fbd4e013fe" dependencies = [ "bstr", "grep-matcher", @@ -2420,9 +2554,9 @@ dependencies = [ [[package]] name = "grep-regex" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f748bb135ca835da5cbc67ca0e6955f968db9c5df74ca4f56b18e1ddbc68230d" +checksum = "9edd147c7e3296e7a26bd3a81345ce849557d5a8e48ed88f736074e760f91f7e" dependencies = [ "bstr", "grep-matcher", @@ -2433,9 +2567,9 @@ dependencies = [ [[package]] name = "grep-searcher" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba536ae4f69bec62d8839584dd3153d3028ef31bb229f04e09fb5a9e5a193c54" +checksum = "b9b6c14b3fc2e0a107d6604d3231dec0509e691e62447104bc385a46a7892cda" dependencies = [ "bstr", "encoding_rs", @@ -2443,7 +2577,7 @@ dependencies = [ "grep-matcher", "log", "memchr", - "memmap2 0.9.4", + "memmap2 0.9.5", ] [[package]] @@ -2502,10 +2636,10 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "com", "libc", - "libloading 0.8.3", + "libloading 0.8.5", "thiserror", "widestring", "winapi", @@ -2541,6 +2675,15 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + [[package]] name = "humantime" version = "2.1.0" @@ -2549,15 +2692,15 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "i18n-config" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9ce3c48cbc21fd5b22b9331f32b5b51f6ad85d969b99e793427332e76e7640" +checksum = "8e88074831c0be5b89181b05e6748c4915f77769ecc9a4c372f88b169a8509c9" dependencies = [ + "basic-toml", "log", "serde", "serde_derive", "thiserror", - "toml 0.8.14", "unic-langid", ] @@ -2600,7 +2743,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.66", + "syn 2.0.77", "unic-langid", ] @@ -2614,14 +2757,14 @@ dependencies = [ "i18n-config", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -2643,7 +2786,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#9e344b15c31ede67e0f79508108aa117d366eefa" +source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "dnd", "iced_accessibility", @@ -2662,7 +2805,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#9e344b15c31ede67e0f79508108aa117d366eefa" +source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "accesskit", "accesskit_unix", @@ -2672,9 +2815,9 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#9e344b15c31ede67e0f79508108aa117d366eefa" +source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "dnd", "iced_accessibility", "log", @@ -2683,7 +2826,7 @@ dependencies = [ "palette", "raw-window-handle", "serde", - "smithay-client-toolkit 0.19.1", + "smithay-client-toolkit 0.19.2", "smol_str", "thiserror", "web-time", @@ -2694,7 +2837,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#9e344b15c31ede67e0f79508108aa117d366eefa" +source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "futures", "iced_core", @@ -2707,9 +2850,9 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#9e344b15c31ede67e0f79508108aa117d366eefa" +source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", "cosmic-text", "glam", @@ -2731,7 +2874,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#9e344b15c31ede67e0f79508108aa117d366eefa" +source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2743,13 +2886,13 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#9e344b15c31ede67e0f79508108aa117d366eefa" +source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "dnd", "iced_accessibility", "iced_core", "iced_futures", - "smithay-client-toolkit 0.19.1", + "smithay-client-toolkit 0.19.2", "thiserror", "window_clipboard", ] @@ -2757,7 +2900,7 @@ dependencies = [ [[package]] name = "iced_sctk" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#9e344b15c31ede67e0f79508108aa117d366eefa" +source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "enum-repr", "float-cmp", @@ -2770,11 +2913,11 @@ dependencies = [ "itertools", "lazy_static", "raw-window-handle", - "smithay-client-toolkit 0.19.1", + "smithay-client-toolkit 0.19.2", "thiserror", "tracing", "wayland-backend", - "wayland-protocols 0.32.1", + "wayland-protocols 0.32.4", "window_clipboard", "xkbcommon", "xkbcommon-dl", @@ -2784,7 +2927,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#9e344b15c31ede67e0f79508108aa117d366eefa" +source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "iced_core", "once_cell", @@ -2794,7 +2937,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#9e344b15c31ede67e0f79508108aa117d366eefa" +source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "bytemuck", "cosmic-text", @@ -2811,10 +2954,10 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#9e344b15c31ede67e0f79508108aa117d366eefa" +source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "as-raw-xcb-connection", - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", "futures", "glam", @@ -2826,12 +2969,12 @@ dependencies = [ "once_cell", "raw-window-handle", "resvg", - "rustix 0.38.34", - "smithay-client-toolkit 0.19.1", + "rustix 0.38.37", + "smithay-client-toolkit 0.19.2", "tiny-xlib", "wayland-backend", "wayland-client", - "wayland-protocols 0.32.1", + "wayland-protocols 0.32.4", "wayland-sys", "wgpu", "x11rb", @@ -2840,7 +2983,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#9e344b15c31ede67e0f79508108aa117d366eefa" +source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "dnd", "iced_accessibility", @@ -2857,7 +3000,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#9e344b15c31ede67e0f79508108aa117d366eefa" +source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "dnd", "iced_accessibility", @@ -3034,7 +3177,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -3055,9 +3198,9 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" +checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b" dependencies = [ "crossbeam-deque", "globset", @@ -3095,14 +3238,23 @@ checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" [[package]] name = "indexmap" -version = "2.2.6" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown", ] +[[package]] +name = "infer" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc150e5ce2330295b8616ce0e3f53250e53af31759a9dbedad1621ba29151847" +dependencies = [ + "cfb", +] + [[package]] name = "inotify" version = "0.9.6" @@ -3123,6 +3275,15 @@ dependencies = [ "libc", ] +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + [[package]] name = "instant" version = "0.1.13" @@ -3173,11 +3334,11 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ - "hermit-abi 0.3.9", + "hermit-abi 0.4.0", "libc", "windows-sys 0.52.0", ] @@ -3194,9 +3355,9 @@ dependencies = [ [[package]] name = "is_terminal_polyfill" -version = "1.70.0" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" @@ -3237,9 +3398,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] @@ -3255,9 +3416,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -3278,7 +3439,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.8.3", + "libloading 0.8.5", "pkg-config", ] @@ -3290,11 +3451,11 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" [[package]] name = "known-folders" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4397c789f2709d23cfcb703b316e0766a8d4b17db2d47b0ab096ef6047cae1d8" +checksum = "b7d9a1740cc8b46e259a0eb787d79d855e79ff10b9855a5eba58868d5da7927c" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3323,14 +3484,14 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", ] [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lebe" @@ -3351,25 +3512,16 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "lexical-sort" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c09e4591611e231daf4d4c685a66cb0410cc1e502027a20ae55f2bb9e997207a" -dependencies = [ - "any_ascii", -] - [[package]] name = "libc" -version = "0.2.155" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#9e344b15c31ede67e0f79508108aa117d366eefa" +source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "apply", "ashpd 0.9.1", @@ -3386,6 +3538,7 @@ dependencies = [ "iced_futures", "iced_renderer", "iced_runtime", + "iced_sctk", "iced_style", "iced_tiny_skia", "iced_wgpu", @@ -3402,7 +3555,7 @@ dependencies = [ "tracing", "unicode-segmentation", "url", - "zbus 4.3.0", + "zbus 4.4.0", ] [[package]] @@ -3417,12 +3570,12 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -3437,7 +3590,7 @@ version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", "redox_syscall 0.4.1", ] @@ -3448,16 +3601,11 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", + "redox_syscall 0.5.4", ] -[[package]] -name = "line-wrap" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" - [[package]] name = "linked-hash-map" version = "0.5.6" @@ -3478,9 +3626,9 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "linux-raw-sys" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4" +checksum = "2a385b1be4e5c3e362ad2ffa73c392e53f031eaa5b7d648e64cd87f27f6063d7" [[package]] name = "litemap" @@ -3512,16 +3660,22 @@ dependencies = [ ] [[package]] -name = "log" -version = "0.4.21" +name = "lockfree-object-pool" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lru" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" dependencies = [ "hashbrown", ] @@ -3552,7 +3706,7 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edecfb8d234a2b0be031ab02ebcdd9f3b9ee418fb35e265f7a540a48d197bff9" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", "euclid", "num-traits", ] @@ -3578,6 +3732,16 @@ dependencies = [ "num-traits", ] +[[package]] +name = "lzma-rs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" +dependencies = [ + "byteorder", + "crc", +] + [[package]] name = "malloc_buf" version = "0.0.6" @@ -3604,9 +3768,9 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" dependencies = [ "libc", ] @@ -3635,7 +3799,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block", "core-graphics-types", "foreign-types", @@ -3660,9 +3824,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" dependencies = [ "mime 0.3.17", "unicase", @@ -3684,6 +3848,15 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + [[package]] name = "mio" version = "0.8.11" @@ -3696,6 +3869,18 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "wasi", + "windows-sys 0.52.0", +] + [[package]] name = "modit" version = "0.1.4" @@ -3716,9 +3901,9 @@ name = "naga" version = "0.19.0" source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", "bit-set", - "bitflags 2.5.0", + "bitflags 2.6.0", "codespan-reporting", "hexf-parse", "indexmap", @@ -3737,7 +3922,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "jni-sys", "log", "ndk-sys", @@ -3775,13 +3960,13 @@ dependencies = [ [[package]] name = "nix" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", - "cfg_aliases 0.1.1", + "cfg_aliases 0.2.1", "libc", "memoffset 0.9.1", ] @@ -3824,7 +4009,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", @@ -3832,7 +4017,7 @@ dependencies = [ "kqueue", "libc", "log", - "mio", + "mio 0.8.11", "walkdir", "windows-sys 0.48.0", ] @@ -3867,9 +4052,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", @@ -3943,23 +4128,23 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -4036,7 +4221,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block2 0.5.1", "libc", "objc2 0.5.2", @@ -4062,9 +4247,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.0" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "memchr", ] @@ -4099,9 +4284,9 @@ dependencies = [ [[package]] name = "open" -version = "5.1.4" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5ca541f22b1c46d4bb9801014f234758ab4297e7870b904b6a8415b980a7388" +checksum = "61a877bf6abd716642a53ef1b89fb498923a4afca5c754f9050b4d081c05c4b3" dependencies = [ "is-wsl", "libc", @@ -4164,16 +4349,16 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "owned_ttf_parser" -version = "0.21.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b41438d2fc63c46c74a2203bf5ccd82c41ba04347b2fcf5754f230b167067d5" +checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90" dependencies = [ - "ttf-parser 0.21.1", + "ttf-parser 0.24.1", ] [[package]] @@ -4198,14 +4383,14 @@ dependencies = [ "by_address", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "parking" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" @@ -4250,9 +4435,9 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.2", + "redox_syscall 0.5.4", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -4278,6 +4463,16 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" +[[package]] +name = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest", + "hmac", +] + [[package]] name = "percent-encoding" version = "2.3.1" @@ -4286,9 +4481,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.10" +version = "2.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" +checksum = "fdbef9d1d47087a895abd220ed25eb4ad973a5e26f6a4367b038c25e28dfc2d9" dependencies = [ "memchr", "thiserror", @@ -4297,9 +4492,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.10" +version = "2.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" +checksum = "4d3a6e3394ec80feb3b6393c725571754c6188490265c61aaf260810d6b95aa0" dependencies = [ "pest", "pest_generator", @@ -4307,22 +4502,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.10" +version = "2.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" +checksum = "94429506bde1ca69d1b5601962c73f4172ab4726571a59ea95931218cb0e930e" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "pest_meta" -version = "2.7.10" +version = "2.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" +checksum = "ac8a071862e93690b6e34e9a5fb8e33ff3734473ac0245b27232222c4906a33f" dependencies = [ "once_cell", "pest", @@ -4359,7 +4554,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -4391,31 +4586,30 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-io", ] [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "plist" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9" +checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ - "base64", + "base64 0.22.1", "indexmap", - "line-wrap", - "quick-xml", + "quick-xml 0.32.0", "serde", "time", ] @@ -4430,7 +4624,7 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.7.4", ] [[package]] @@ -4451,17 +4645,17 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.2" +version = "3.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ "cfg-if", "concurrent-queue", "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.34", + "rustix 0.38.37", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4478,9 +4672,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "presser" @@ -4500,11 +4697,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit 0.22.21", ] [[package]] @@ -4533,9 +4730,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -4563,18 +4760,28 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" dependencies = [ "memchr", ] [[package]] -name = "quote" -version = "1.0.36" +name = "quick-xml" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -4655,14 +4862,30 @@ checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" [[package]] name = "read-fonts" -version = "0.19.3" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8b8af39d1f23869711ad4cea5e7835a20daa987f80232f7f2a2374d648ca64d" +checksum = "8c141b9980e1150201b2a3a32879001c8f975fe313ec3df5471a9b5c79a880cd" dependencies = [ "bytemuck", "font-types", ] +[[package]] +name = "recently-used-xbel" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "079a81183e41e5cf17fd9ec55db30d6be6cddfad7fd619862efac27f1be28c9b" +dependencies = [ + "chrono", + "dirs", + "infer", + "mime_guess", + "quick-xml 0.36.2", + "serde", + "thiserror", + "url", +] + [[package]] name = "redox_syscall" version = "0.2.16" @@ -4692,18 +4915,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox 0.1.3", @@ -4712,9 +4935,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.5" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -4787,9 +5010,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.37" +version = "0.8.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" dependencies = [ "bytemuck", ] @@ -4800,8 +5023,8 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ - "base64", - "bitflags 2.5.0", + "base64 0.21.7", + "bitflags 2.6.0", "serde", "serde_derive", ] @@ -4813,10 +5036,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" [[package]] -name = "rust-embed" -version = "8.4.0" +name = "roxmltree" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19549741604902eb99a7ed0ee177a0663ee1eda51a29f71401f166e47e77806a" +checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" + +[[package]] +name = "rust-embed" +version = "8.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa66af4a4fdd5e7ebc276f115e895611a34739a9c1c01028383d612d550953c0" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -4825,22 +5054,22 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "8.4.0" +version = "8.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb9f96e283ec64401f30d3df8ee2aaeb2561f34c824381efa24a35f79bf40ee4" +checksum = "6125dbc8867951125eec87294137f4e9c2c96566e61bf72c45095a7c77761478" dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.66", + "syn 2.0.77", "walkdir", ] [[package]] name = "rust-embed-utils" -version = "8.4.0" +version = "8.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38c74a686185620830701348de757fd36bef4aa9680fd23c49fc539ddcc1af32" +checksum = "2e5347777e9aacb56039b0e1f28785929a8a3b709e87482e7442c72e7c12529d" dependencies = [ "sha2", "walkdir", @@ -4893,11 +5122,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys 0.4.14", @@ -4916,7 +5145,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 0.20.0", @@ -4932,7 +5161,7 @@ version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", "libm", "smallvec", @@ -4972,13 +5201,13 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sctk-adwaita" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" +checksum = "70b31447ca297092c5a9916fc3b955203157b37c19ca8edde4f52e9843e602c7" dependencies = [ "ab_glyph", "log", - "memmap2 0.9.4", + "memmap2 0.9.5", "smithay-client-toolkit 0.18.1", "tiny-skia", ] @@ -5015,32 +5244,33 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "indexmap", "itoa", + "memchr", "ryu", "serde", ] @@ -5053,14 +5283,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "serde_spanned" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -5125,9 +5355,9 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "skrifa" -version = "0.19.3" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab45fb68b53576a43d4fc0e9ec8ea64e29a4d2cc7f44506964cb75f288222e9" +checksum = "abea4738067b1e628c6ce28b2c216c19e9ea95715cdb332680e821c3bec2ef23" dependencies = [ "bytemuck", "read-fonts", @@ -5163,14 +5393,14 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "calloop 0.12.4", "calloop-wayland-source 0.2.0", "cursor-icon", "libc", "log", - "memmap2 0.9.4", - "rustix 0.38.34", + "memmap2 0.9.5", + "rustix 0.38.37", "thiserror", "wayland-backend", "wayland-client", @@ -5184,27 +5414,27 @@ dependencies = [ [[package]] name = "smithay-client-toolkit" -version = "0.19.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "837d3067369e24aeda699a5d9fc5aa14ca14a84dd70aeed7156bfa04a5605b32" +checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", "calloop 0.13.0", "calloop-wayland-source 0.3.0", "cursor-icon", "libc", "log", - "memmap2 0.9.4", + "memmap2 0.9.5", "pkg-config", - "rustix 0.38.34", + "rustix 0.38.37", "thiserror", "wayland-backend", "wayland-client", "wayland-csd-frame", "wayland-cursor", - "wayland-protocols 0.32.1", - "wayland-protocols-wlr 0.3.1", + "wayland-protocols 0.32.4", + "wayland-protocols-wlr 0.3.4", "wayland-scanner", "xkbcommon", "xkeysym", @@ -5217,7 +5447,7 @@ source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-5#5a3007de dependencies = [ "libc", "raw-window-handle", - "smithay-client-toolkit 0.19.1", + "smithay-client-toolkit 0.19.2", "wayland-backend", ] @@ -5261,15 +5491,15 @@ dependencies = [ "cocoa", "core-graphics", "drm", - "fastrand 2.1.0", + "fastrand 2.1.1", "foreign-types", "js-sys", "log", - "memmap2 0.9.4", + "memmap2 0.9.5", "objc", "raw-window-handle", "redox_syscall 0.4.1", - "rustix 0.38.34", + "rustix 0.38.37", "tiny-xlib", "wasm-bindgen", "wayland-backend", @@ -5295,7 +5525,7 @@ version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -5331,6 +5561,12 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + [[package]] name = "svg_fmt" version = "0.4.3" @@ -5349,9 +5585,9 @@ dependencies = [ [[package]] name = "swash" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d7773d67fe3373048cf840bfcc54ec3207cfc1e95c526b287ef2eb5eff9faf6" +checksum = "93cdc334a50fcc2aa3f04761af3b28196280a6aaadb1ef11215c478ae32615ac" dependencies = [ "skrifa", "yazi", @@ -5371,9 +5607,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -5388,7 +5624,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -5427,22 +5663,34 @@ name = "taffy" version = "0.3.11" source = "git+https://github.com/DioxusLabs/taffy?rev=7781c70#7781c70241f7f572130c13106f2a869a9cf80885" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", "grid", "num-traits", "slotmap", ] [[package]] -name = "tempfile" -version = "3.10.1" +name = "tar" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "tempfile" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", - "fastrand 2.1.0", - "rustix 0.38.34", - "windows-sys 0.52.0", + "fastrand 2.1.1", + "once_cell", + "rustix 0.38.37", + "windows-sys 0.59.0", ] [[package]] @@ -5456,22 +5704,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -5534,7 +5782,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" dependencies = [ "arrayref", - "arrayvec 0.7.4", + "arrayvec 0.7.6", "bytemuck", "cfg-if", "log", @@ -5561,7 +5809,7 @@ checksum = "1d52f22673960ad13af14ff4025997312def1223bfa7c8e4949d099e6b3d5d1c" dependencies = [ "as-raw-xcb-connection", "ctor-lite", - "libloading 0.8.3", + "libloading 0.8.5", "pkg-config", "tracing", ] @@ -5578,9 +5826,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -5593,39 +5841,38 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.38.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", "libc", - "mio", - "num_cpus", + "mio 1.0.2", "pin-project-lite", "signal-hook-registry", "socket2 0.5.7", "tokio-macros", "tracing", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", @@ -5643,21 +5890,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.14" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.14", + "toml_edit 0.22.21", ] [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] @@ -5675,26 +5922,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.21.1" +version = "0.22.21" 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" +checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.13", + "winnow 0.6.18", ] [[package]] @@ -5716,7 +5952,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -5730,9 +5966,8 @@ dependencies = [ [[package]] name = "trash" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d8fbfb70b1fad5c0b788f9b2e1bf4d04e5ac6efa828f1ed9ee462c50ff9cf05" +version = "5.1.1" +source = "git+https://github.com/jackpot51/trash-rs.git?branch=cosmic#483f83908beef9166f30dfe7b57568ab01c4e140" dependencies = [ "chrono", "libc", @@ -5757,6 +5992,12 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" +[[package]] +name = "ttf-parser" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a" + [[package]] name = "two-face" version = "0.3.0" @@ -5860,9 +6101,9 @@ checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-linebreak" @@ -5872,30 +6113,30 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-properties" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" +checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524" [[package]] name = "unicode-script" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" +checksum = "9fb421b350c9aff471779e262955939f565ec18b86c15364e6bdf0d662ca7c1f" [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-vo" @@ -5905,15 +6146,21 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + +[[package]] +name = "unix_permissions_ext" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7497808a85e03f612f13e9c5061e4c81cdee86e6c00adfa1096690990ccd08e9" [[package]] name = "url" @@ -5939,7 +6186,7 @@ version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b0a51b72ab80ca511d126b77feeeb4fb1e972764653e61feac30adc161a756" dependencies = [ - "base64", + "base64 0.21.7", "log", "pico-args", "usvg-parser", @@ -5959,7 +6206,7 @@ dependencies = [ "imagesize", "kurbo", "log", - "roxmltree", + "roxmltree 0.19.0", "simplecss", "siphasher", "svgtypes", @@ -6013,10 +6260,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] -name = "vergen" -version = "8.3.1" +name = "uuid" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27d6bdd219887a9eadd19e1c34f32e47fa332301184935c6d9bca26f3cca525" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" + +[[package]] +name = "uzers" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4df81ff504e7d82ad53e95ed1ad5b72103c11253f39238bcc0235b90768a97dd" +dependencies = [ + "libc", + "log", +] + +[[package]] +name = "vergen" +version = "8.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2990d9ea5967266ea0ccf413a4aa5c42a93dbcfda9cb49a97de6931726b12566" dependencies = [ "anyhow", "cfg-if", @@ -6026,9 +6289,9 @@ dependencies = [ [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "waker-fn" @@ -6054,34 +6317,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -6091,9 +6355,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6101,22 +6365,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-timer" @@ -6135,13 +6399,13 @@ dependencies = [ [[package]] name = "wayland-backend" -version = "0.3.4" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34e9e6b6d4a2bb4e7e69433e0b35c7923b95d4dc8503a84d25ec917a4bbfdf07" +checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6" dependencies = [ "cc", "downcast-rs", - "rustix 0.38.34", + "rustix 0.38.37", "scoped-tls", "smallvec", "wayland-sys", @@ -6149,12 +6413,12 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.3" +version = "0.31.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e63801c85358a431f986cffa74ba9599ff571fc5774ac113ed3b490c19a1133" +checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d" dependencies = [ - "bitflags 2.5.0", - "rustix 0.38.34", + "bitflags 2.6.0", + "rustix 0.38.37", "wayland-backend", "wayland-scanner", ] @@ -6165,18 +6429,18 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cursor-icon", "wayland-backend", ] [[package]] name = "wayland-cursor" -version = "0.31.3" +version = "0.31.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a206e8b2b53b1d3fcb9428fec72bc278ce539e2fa81fe2bfc1ab27703d5187b9" +checksum = "3a94697e66e76c85923b0d28a0c251e8f0666f58fc47d316c0f4da6da75d37cb" dependencies = [ - "rustix 0.38.34", + "rustix 0.38.37", "wayland-client", "xcursor", ] @@ -6187,7 +6451,7 @@ version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-scanner", @@ -6195,11 +6459,11 @@ dependencies = [ [[package]] name = "wayland-protocols" -version = "0.32.1" +version = "0.32.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d0f1056570486e26a3773ec633885124d79ae03827de05ba6c85f79904026c" +checksum = "2b5755d77ae9040bb872a25026555ce4cb0ae75fd923e90d25fba07d81057de0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-scanner", @@ -6211,7 +6475,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-protocols 0.31.2", @@ -6224,7 +6488,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-protocols 0.31.2", @@ -6233,33 +6497,33 @@ dependencies = [ [[package]] name = "wayland-protocols-wlr" -version = "0.3.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7dab47671043d9f5397035975fe1cac639e5bca5cc0b3c32d09f01612e34d24" +checksum = "dad87b5fd1b1d3ca2f792df8f686a2a11e3fe1077b71096f7a175ab699f89109" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols 0.32.1", + "wayland-protocols 0.32.4", "wayland-scanner", ] [[package]] name = "wayland-scanner" -version = "0.31.2" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67da50b9f80159dec0ea4c11c13e24ef9e7574bd6ce24b01860a175010cea565" +checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3" dependencies = [ "proc-macro2", - "quick-xml", + "quick-xml 0.36.2", "quote", ] [[package]] name = "wayland-sys" -version = "0.31.2" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "105b1842da6554f91526c14a2a2172897b7f745a805d62af4ce698706be79c12" +checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09" dependencies = [ "dlib", "log", @@ -6269,9 +6533,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -6298,7 +6562,7 @@ name = "wgpu" version = "0.19.0" source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", "cfg-if", "cfg_aliases 0.1.1", "js-sys", @@ -6322,9 +6586,9 @@ name = "wgpu-core" version = "0.19.0" source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", "bit-vec", - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg_aliases 0.1.1", "codespan-reporting", "indexmap", @@ -6348,10 +6612,10 @@ version = "0.19.0" source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" dependencies = [ "android_system_properties", - "arrayvec 0.7.4", + "arrayvec 0.7.6", "ash", "bit-set", - "bitflags 2.5.0", + "bitflags 2.6.0", "block", "cfg_aliases 0.1.1", "core-graphics-types", @@ -6365,7 +6629,7 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.3", + "libloading 0.8.5", "log", "metal", "naga", @@ -6390,7 +6654,7 @@ name = "wgpu-types" version = "0.19.0" source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "js-sys", "web-sys", ] @@ -6419,11 +6683,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6465,7 +6729,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core 0.52.0", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -6475,7 +6739,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" dependencies = [ "windows-core 0.56.0", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -6484,7 +6748,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -6496,7 +6760,7 @@ dependencies = [ "windows-implement 0.56.0", "windows-interface 0.56.0", "windows-result", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -6518,7 +6782,7 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -6540,7 +6804,7 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -6549,7 +6813,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -6576,7 +6840,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -6611,18 +6884,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -6639,9 +6912,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -6657,9 +6930,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -6675,15 +6948,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -6699,9 +6972,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -6717,9 +6990,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -6735,9 +7008,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -6753,9 +7026,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winit" @@ -6765,7 +7038,7 @@ dependencies = [ "ahash", "android-activity", "atomic-waker", - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", "calloop 0.12.4", "cfg_aliases 0.1.1", @@ -6776,7 +7049,7 @@ dependencies = [ "js-sys", "libc", "log", - "memmap2 0.9.4", + "memmap2 0.9.5", "ndk", "ndk-sys", "objc2 0.4.1", @@ -6785,7 +7058,7 @@ dependencies = [ "percent-encoding", "raw-window-handle", "redox_syscall 0.3.5", - "rustix 0.38.34", + "rustix 0.38.37", "sctk-adwaita", "smithay-client-toolkit 0.18.1", "smol_str", @@ -6815,9 +7088,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.13" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] @@ -6854,9 +7127,9 @@ dependencies = [ "as-raw-xcb-connection", "gethostname", "libc", - "libloading 0.8.3", + "libloading 0.8.5", "once_cell", - "rustix 0.38.34", + "rustix 0.38.37", "x11rb-protocol", ] @@ -6867,10 +7140,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" [[package]] -name = "xcursor" -version = "0.3.5" +name = "xattr" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +dependencies = [ + "libc", + "linux-raw-sys 0.4.14", + "rustix 0.38.37", +] + +[[package]] +name = "xcursor" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61" [[package]] name = "xdg" @@ -6880,12 +7164,12 @@ checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" [[package]] name = "xdg-home" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6918,7 +7202,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "dlib", "log", "once_cell", @@ -6936,9 +7220,9 @@ dependencies = [ [[package]] name = "xml-rs" -version = "0.8.20" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" +checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26" [[package]] name = "xmlwriter" @@ -6948,9 +7232,9 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] name = "xxhash-rust" -version = "0.8.10" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03" +checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984" [[package]] name = "yaml-rust" @@ -6987,7 +7271,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", "synstructure", ] @@ -7035,16 +7319,16 @@ dependencies = [ [[package]] name = "zbus" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23915fcb26e7a9a9dc05fd93a9870d336d6d032cd7e8cebf1c5c37666489fdd5" +checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" dependencies = [ "async-broadcast 0.7.1", "async-executor", "async-fs 2.1.2", - "async-io 2.3.3", + "async-io 2.3.4", "async-lock 3.4.0", - "async-process 2.2.3", + "async-process 2.3.0", "async-recursion", "async-task", "async-trait", @@ -7055,7 +7339,7 @@ dependencies = [ "futures-sink", "futures-util", "hex", - "nix 0.28.0", + "nix 0.29.0", "ordered-stream", "rand", "serde", @@ -7067,9 +7351,9 @@ dependencies = [ "uds_windows", "windows-sys 0.52.0", "xdg-home", - "zbus_macros 4.3.0", + "zbus_macros 4.4.0", "zbus_names 3.0.0", - "zvariant 4.1.1", + "zvariant 4.2.0", ] [[package]] @@ -7088,15 +7372,15 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02bcca0b586d2f8589da32347b4784ba424c4891ed86aa5b50d5e88f6b2c4f5d" +checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.66", - "zvariant_utils 2.0.0", + "syn 2.0.77", + "zvariant_utils 2.1.0", ] [[package]] @@ -7118,7 +7402,7 @@ checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" dependencies = [ "serde", "static_assertions", - "zvariant 4.1.1", + "zvariant 4.2.0", ] [[package]] @@ -7129,22 +7413,23 @@ checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697" [[package]] name = "zerocopy" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -7164,10 +7449,30 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", "synstructure", ] +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + [[package]] name = "zerovec" version = "0.10.4" @@ -7187,7 +7492,78 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", +] + +[[package]] +name = "zip" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494" +dependencies = [ + "aes", + "arbitrary", + "bzip2", + "constant_time_eq", + "crc32fast", + "crossbeam-utils", + "deflate64", + "displaydoc", + "flate2", + "hmac", + "indexmap", + "lzma-rs", + "memchr", + "pbkdf2", + "rand", + "sha1", + "thiserror", + "time", + "zeroize", + "zopfli", + "zstd", +] + +[[package]] +name = "zopfli" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946" +dependencies = [ + "bumpalo", + "crc32fast", + "lockfree-object-pool", + "log", + "once_cell", + "simd-adler32", +] + +[[package]] +name = "zstd" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "7.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" +dependencies = [ + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.13+zstd.1.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" +dependencies = [ + "cc", + "pkg-config", ] [[package]] @@ -7215,16 +7591,16 @@ dependencies = [ [[package]] name = "zvariant" -version = "4.1.1" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7" +checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" dependencies = [ "endi", "enumflags2", "serde", "static_assertions", "url", - "zvariant_derive 4.1.1", + "zvariant_derive 4.2.0", ] [[package]] @@ -7242,15 +7618,15 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "4.1.1" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8" +checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.66", - "zvariant_utils 2.0.0", + "syn 2.0.77", + "zvariant_utils 2.1.0", ] [[package]] @@ -7266,11 +7642,11 @@ dependencies = [ [[package]] name = "zvariant_utils" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" +checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-edit/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-edit/package.nix index 40d6eb082d..72eded832b 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-edit/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-edit/package.nix @@ -20,13 +20,13 @@ rustPlatform.buildRustPackage rec { pname = "cosmic-edit"; - version = "1.0.0-alpha.1"; + version = "1.0.0-alpha.2"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-edit"; rev = "epoch-${version}"; - hash = "sha256-ZG5Ctyp2crTDS0WxhQqwN4T6WR5qW79HTbICMlOA3P8="; + hash = "sha256-3goolnDRGQkQ3zN08WKzN6Dxt+Sh1lR+tFxeWjO3VKY="; }; cargoLock = { @@ -35,22 +35,25 @@ rustPlatform.buildRustPackage rec { "accesskit-0.12.2" = "sha256-1UwgRyUe0PQrZrpS7574oNLi13fg5HpgILtZGW6JNtQ="; "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA="; "clipboard_macos-0.1.0" = "sha256-cG5vnkiyDlQnbEfV2sPbmBYKv1hd3pjJrymfZb8ziKk="; - "cosmic-config-0.1.0" = "sha256-DgMh0gqWUmXjBhBySR0CMnv/8O3XbS2BwomU9eNt+4o="; - "cosmic-files-0.1.0" = "sha256-QDkHhU0zE0szFwGuVuSYrXd7AUdTU1rYxlAsaHr2YvQ="; + "cosmic-config-0.1.0" = "sha256-gXrMEoAN+7nYAEcs4w6wROhQTjMCxkGn+muJutktLyk="; + "cosmic-files-0.1.0" = "sha256-rBR6IPpMgOltyaRPPZ5V8tYH/xtQphgrPWci/kvlgEg="; "cosmic-syntax-theme-0.1.0" = "sha256-BNb9wrryD5FJImboD3TTdPRIfiBqPpItqwGdT1ZiNng="; - "cosmic-text-0.12.1" = "sha256-x0XTxzbmtE2d4XCG/Nuq3DzBpz15BbnjRRlirfNJEiU="; + "cosmic-text-0.12.1" = "sha256-u2Tw+XhpIKeFg8Wgru/sjGw6GUZ2m50ZDmRBJ1IM66w="; "d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4="; + "filetime-0.2.24" = "sha256-lU7dPotdnmyleS2B75SmDab7qJfEzmJnHPF18CN/Y98="; + "fs_extra-1.3.0" = "sha256-ftg5oanoqhipPnbUsqnA4aZcyHqn9XsINJdrStIPLoE="; "glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg="; "smithay-clipboard-0.8.0" = "sha256-4InFXm0ahrqFrtNLeqIuE3yeOpxKZJZx+Bc0yQDtv34="; "softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg="; "taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI="; + "trash-5.1.1" = "sha256-So8rQ8gLF5o79Az396/CQY/veNo4ticxYpYZPfMJyjQ="; "winit-0.29.10" = "sha256-ScTII2AzK3SC8MVeASZ9jhVWsEaGrSQ2BnApTxgfxK4="; }; }; # COSMIC applications now uses vergen for the About page # Update the COMMIT_DATE to match when the commit was made - env.VERGEN_GIT_COMMIT_DATE = "2024-08-02"; + env.VERGEN_GIT_COMMIT_DATE = "2024-09-24"; env.VERGEN_GIT_SHA = src.rev; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-icons/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-icons/package.nix index 23031d56b9..5a613ac310 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-icons/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-icons/package.nix @@ -1,18 +1,19 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -, just -, pop-icon-theme -, hicolor-icon-theme -, unstableGitUpdater +{ + lib, + stdenvNoCC, + fetchFromGitHub, + just, + pop-icon-theme, + hicolor-icon-theme, + nix-update-script, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation { pname = "cosmic-icons"; version = "1.0.0-alpha.2"; src = fetchFromGitHub { owner = "pop-os"; - repo = pname; + repo = "cosmic-icons"; rev = "341c84467fd863f0319cadf49b3d4bac1bf3029a"; hash = "sha256-VA2QKuzTQBgubfjPXdpejFtZxqOZUXds/fZrfN6/8Nk="; }; @@ -32,7 +33,12 @@ stdenvNoCC.mkDerivation rec { dontDropIconThemeCache = true; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "epoch-(.*)" + ]; + }; meta = with lib; { description = "System76 Cosmic icon theme for Linux"; diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-settings-daemon/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/co/cosmic-settings-daemon/Cargo.lock new file mode 100644 index 0000000000..7e306e1227 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-settings-daemon/Cargo.lock @@ -0,0 +1,5521 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "accesskit" +version = "0.12.2" +source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" + +[[package]] +name = "accesskit_consumer" +version = "0.17.0" +source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +dependencies = [ + "accesskit", +] + +[[package]] +name = "accesskit_unix" +version = "0.7.1" +source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +dependencies = [ + "accesskit", + "accesskit_consumer", + "atspi", + "futures-lite 1.13.0", + "once_cell", + "serde", + "tokio", + "tokio-stream", + "zbus 3.15.2", +] + +[[package]] +name = "acpid_plug" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4749b4cc0bc6e487b73236a5b77e0cfe33122f4516f94fea48479dd66b17b4b0" +dependencies = [ + "futures-util", + "tokio", +] + +[[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.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "aliasable" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" + +[[package]] +name = "allocator-api2" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + +[[package]] +name = "almost" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3aa2999eb46af81abb65c2d30d446778d7e613b60bbf4e174a027e80f90a3c14" + +[[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" + +[[package]] +name = "apply" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f47b57fc4521e3cae26a4d45b5227f8fadee4c345be0fefd8d5d1711afb8aeb9" + +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + +[[package]] +name = "arrayref" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "as-raw-xcb-connection" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" + +[[package]] +name = "ash" +version = "0.37.3+1.3.251" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +dependencies = [ + "libloading 0.7.4", +] + +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-broadcast" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" +dependencies = [ + "event-listener 5.3.1", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" +dependencies = [ + "async-task", + "concurrent-queue", + "fastrand 2.1.0", + "futures-lite 2.3.0", + "slab", +] + +[[package]] +name = "async-fs" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" +dependencies = [ + "async-lock 3.4.0", + "blocking", + "futures-lite 2.3.0", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite 1.13.0", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.27", + "slab", + "socket2 0.4.10", + "waker-fn", +] + +[[package]] +name = "async-io" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +dependencies = [ + "async-lock 3.4.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.3.0", + "parking", + "polling 3.7.2", + "rustix 0.38.34", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +dependencies = [ + "event-listener 5.3.1", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.34", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-process" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" +dependencies = [ + "async-channel", + "async-io 2.3.3", + "async-lock 3.4.0", + "async-signal", + "async-task", + "blocking", + "cfg-if", + "event-listener 5.3.1", + "futures-lite 2.3.0", + "rustix 0.38.34", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "async-signal" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32" +dependencies = [ + "async-io 2.3.3", + "async-lock 3.4.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.34", + "signal-hook-registry", + "slab", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-task" +version = "4.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" + +[[package]] +name = "async-trait" +version = "0.1.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "atomicwrites" +version = "0.4.2" +source = "git+https://github.com/jackpot51/rust-atomicwrites#043ab4859d53ffd3d55334685303d8df39c9f768" +dependencies = [ + "rustix 0.38.34", + "tempfile", + "windows-sys 0.48.0", +] + +[[package]] +name = "atspi" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6059f350ab6f593ea00727b334265c4dfc7fd442ee32d264794bd9bdc68e87ca" +dependencies = [ + "atspi-common", + "atspi-connection", + "atspi-proxies", +] + +[[package]] +name = "atspi-common" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92af95f966d2431f962bc632c2e68eda7777330158bf640c4af4249349b2cdf5" +dependencies = [ + "enumflags2", + "serde", + "static_assertions", + "zbus 3.15.2", + "zbus_names 2.6.1", + "zvariant 3.15.2", +] + +[[package]] +name = "atspi-connection" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c65e7d70f86d4c0e3b2d585d9bf3f979f0b19d635a336725a88d279f76b939" +dependencies = [ + "atspi-common", + "atspi-proxies", + "futures-lite 1.13.0", + "zbus 3.15.2", +] + +[[package]] +name = "atspi-proxies" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6495661273703e7a229356dcbe8c8f38223d697aacfaf0e13590a9ac9977bb52" +dependencies = [ + "atspi-common", + "serde", + "zbus 3.15.2", +] + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "backtrace" +version = "0.3.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +dependencies = [ + "serde", +] + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blocking" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" +dependencies = [ + "async-channel", + "async-task", + "futures-io", + "futures-lite 2.3.0", + "piper", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "by_address" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06" + +[[package]] +name = "bytemuck" +version = "1.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" + +[[package]] +name = "calloop" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" +dependencies = [ + "bitflags 2.6.0", + "log", + "polling 3.7.2", + "rustix 0.38.34", + "slab", + "thiserror", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" +dependencies = [ + "calloop", + "rustix 0.38.34", + "wayland-backend", + "wayland-client", +] + +[[package]] +name = "cc" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "324c74f2155653c90b04f25b2a47a8a631360cb908f92a772695f430c7e31052" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "windows-targets 0.52.6", +] + +[[package]] +name = "clap" +version = "4.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" +dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_lex" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" + +[[package]] +name = "clipboard-win" +version = "5.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" +dependencies = [ + "error-code", +] + +[[package]] +name = "clipboard_macos" +version = "0.1.0" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +dependencies = [ + "objc", + "objc-foundation", + "objc_id", +] + +[[package]] +name = "clipboard_wayland" +version = "0.2.2" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +dependencies = [ + "dnd", + "mime", + "smithay-clipboard", +] + +[[package]] +name = "clipboard_x11" +version = "0.4.2" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +dependencies = [ + "thiserror", + "x11rb", +] + +[[package]] +name = "cocoa" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics", + "foreign-types", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-foundation", + "core-graphics-types", + "libc", + "objc", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "colorchoice" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" + +[[package]] +name = "com" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6" +dependencies = [ + "com_macros", +] + +[[package]] +name = "com_macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5" +dependencies = [ + "com_macros_support", + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "com_macros_support" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "const-random" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" +dependencies = [ + "const-random-macro", +] + +[[package]] +name = "const-random-macro" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" +dependencies = [ + "getrandom", + "once_cell", + "tiny-keccak", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core-graphics" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "cosmic-comp-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-comp#0a97147e45c4e893ab354bea78b30eaac1e4e633" +dependencies = [ + "cosmic-config", + "input", + "serde", +] + +[[package]] +name = "cosmic-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#cfa1adaf468d6284a1c2f0791690c92677c9046d" +dependencies = [ + "atomicwrites", + "cosmic-config-derive", + "dirs", + "iced_futures", + "known-folders", + "notify", + "once_cell", + "ron", + "serde", + "tracing", + "xdg", +] + +[[package]] +name = "cosmic-config-derive" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#cfa1adaf468d6284a1c2f0791690c92677c9046d" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "cosmic-settings-config" +version = "0.1.0" +dependencies = [ + "cosmic-config", + "serde", + "serde_with", + "thiserror", + "tracing", + "xkbcommon", +] + +[[package]] +name = "cosmic-settings-daemon" +version = "0.1.0" +dependencies = [ + "acpid_plug", + "anyhow", + "chrono", + "clap", + "cosmic-comp-config", + "cosmic-config", + "cosmic-theme", + "dirs", + "geoclue2", + "libcosmic", + "locale1", + "memoize", + "notify", + "notify-rust", + "sunrise", + "tokio", + "tokio-stream", + "udev", + "upower_dbus", + "walkdir", + "zbus 4.3.1", +] + +[[package]] +name = "cosmic-text" +version = "0.12.0" +source = "git+https://github.com/pop-os/cosmic-text.git#0e2d050a8d87c2e97e94ae205c9beda5858123b6" +dependencies = [ + "bitflags 2.6.0", + "fontdb", + "log", + "rangemap", + "rayon", + "rustc-hash", + "rustybuzz 0.14.1", + "self_cell", + "swash", + "sys-locale", + "ttf-parser 0.21.1", + "unicode-bidi", + "unicode-linebreak", + "unicode-script", + "unicode-segmentation", +] + +[[package]] +name = "cosmic-theme" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#cfa1adaf468d6284a1c2f0791690c92677c9046d" +dependencies = [ + "almost", + "cosmic-config", + "csscolorparser", + "dirs", + "lazy_static", + "palette", + "ron", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "css-color" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42aaeae719fd78ce501d77c6cdf01f7e96f26bcd5617a4903a1c2b97e388543a" + +[[package]] +name = "csscolorparser" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" +dependencies = [ + "phf", + "serde", +] + +[[package]] +name = "ctor-lite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f791803201ab277ace03903de1594460708d2d54df6053f2d9e82f592b19e3b" + +[[package]] +name = "cursor-icon" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" + +[[package]] +name = "d3d12" +version = "0.19.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +dependencies = [ + "bitflags 2.6.0", + "libloading 0.8.4", + "winapi", +] + +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.71", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "data-url" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_setters" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e8ef033054e131169b8f0f9a7af8f5533a9436fadf3c500ed547f730f07090d" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading 0.8.4", +] + +[[package]] +name = "dlv-list" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" +dependencies = [ + "const-random", +] + +[[package]] +name = "dnd" +version = "0.1.0" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +dependencies = [ + "bitflags 2.6.0", + "mime", + "raw-window-handle", + "smithay-client-toolkit", + "smithay-clipboard", +] + +[[package]] +name = "downcast-rs" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + +[[package]] +name = "drm" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde" +dependencies = [ + "bitflags 2.6.0", + "bytemuck", + "drm-ffi", + "drm-fourcc", + "rustix 0.38.34", +] + +[[package]] +name = "drm-ffi" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" +dependencies = [ + "drm-sys", + "rustix 0.38.34", +] + +[[package]] +name = "drm-fourcc" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" + +[[package]] +name = "drm-sys" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176" +dependencies = [ + "libc", + "linux-raw-sys 0.6.4", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + +[[package]] +name = "enum-repr" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bad30c9c0fa1aaf1ae5010dab11f1117b15d35faf62cda4bbbc53b9987950f18" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "enumflags2" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "error-code" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" + +[[package]] +name = "etagere" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e2f1e3be19fb10f549be8c1bf013e8675b4066c445e36eb76d2ebb2f54ee495" +dependencies = [ + "euclid", + "svg_fmt", +] + +[[package]] +name = "euclid" +version = "0.22.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0f0eb73b934648cd7a4a61f1b15391cd95dab0b4da6e2e66c2a072c144b4a20" +dependencies = [ + "num-traits", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener 5.3.1", + "pin-project-lite", +] + +[[package]] +name = "exr" +version = "1.72.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[package]] +name = "fast-srgb8" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.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 = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +dependencies = [ + "num-traits", +] + +[[package]] +name = "float_next_after" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" + +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "spin", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "font-types" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34fd7136aca682873d859ef34494ab1a7d3f57ecd485ed40eb6437ee8c85aa29" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "fontconfig-parser" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" +dependencies = [ + "roxmltree", +] + +[[package]] +name = "fontdb" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" +dependencies = [ + "fontconfig-parser", + "log", + "memmap2 0.9.4", + "slotmap", + "tinyvec", + "ttf-parser 0.20.0", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fraction" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59a78dd758a47a7305478e0e054f9fde4e983b9f9eccda162bf7ca03b79e9d40" +dependencies = [ + "lazy_static", + "num", +] + +[[package]] +name = "freedesktop-icons" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8ef34245e0540c9a3ce7a28340b98d2c12b75da0d446da4e8224923fcaa0c16" +dependencies = [ + "dirs", + "once_cell", + "rust-ini", + "thiserror", + "xdg", +] + +[[package]] +name = "fsevent-sys" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", + "num_cpus", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand 2.1.0", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "geoclue2" +version = "0.1.0" +source = "git+https://github.com/pop-os/dbus-settings-bindings#cd21ddcb1b5cbfc80ab84b34d3c8b1ff3d81179a" +dependencies = [ + "serde", + "serde_repr", + "zbus 4.3.1", +] + +[[package]] +name = "gethostname" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" +dependencies = [ + "libc", + "windows-targets 0.48.5", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gif" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gif" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + +[[package]] +name = "gl_generator" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" +dependencies = [ + "khronos_api", + "log", + "xml-rs", +] + +[[package]] +name = "glam" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" + +[[package]] +name = "glow" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glutin_wgl_sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +dependencies = [ + "gl_generator", +] + +[[package]] +name = "glyphon" +version = "0.5.0" +source = "git+https://github.com/pop-os/glyphon.git?tag=v0.5.0#1b0646ff8f74da92d3be704dfc2257d7f4d7eed8" +dependencies = [ + "cosmic-text", + "etagere", + "lru 0.12.3", + "wgpu", +] + +[[package]] +name = "gpu-alloc" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" +dependencies = [ + "bitflags 2.6.0", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "gpu-allocator" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" +dependencies = [ + "log", + "presser", + "thiserror", + "winapi", + "windows 0.52.0", +] + +[[package]] +name = "gpu-descriptor" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +dependencies = [ + "bitflags 2.6.0", + "gpu-descriptor-types", + "hashbrown 0.14.5", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "grid" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df00eed8d1f0db937f6be10e46e8072b0671accb504cf0f959c5c52c679f5b9" + +[[package]] +name = "guillotiere" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782" +dependencies = [ + "euclid", + "svg_fmt", +] + +[[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash 0.7.8", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash 0.8.11", + "allocator-api2", +] + +[[package]] +name = "hassle-rs" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" +dependencies = [ + "bitflags 2.6.0", + "com", + "libc", + "libloading 0.8.4", + "thiserror", + "widestring", + "winapi", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core 0.52.0", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "iced" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#cfa1adaf468d6284a1c2f0791690c92677c9046d" +dependencies = [ + "dnd", + "iced_core", + "iced_futures", + "iced_renderer", + "iced_widget", + "image", + "mime", + "thiserror", + "window_clipboard", +] + +[[package]] +name = "iced_accessibility" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#cfa1adaf468d6284a1c2f0791690c92677c9046d" +dependencies = [ + "accesskit", + "accesskit_unix", +] + +[[package]] +name = "iced_core" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#cfa1adaf468d6284a1c2f0791690c92677c9046d" +dependencies = [ + "bitflags 2.6.0", + "dnd", + "iced_accessibility", + "log", + "mime", + "num-traits", + "palette", + "raw-window-handle", + "serde", + "smithay-client-toolkit", + "smol_str", + "thiserror", + "web-time", + "window_clipboard", + "xxhash-rust", +] + +[[package]] +name = "iced_futures" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#cfa1adaf468d6284a1c2f0791690c92677c9046d" +dependencies = [ + "futures", + "iced_core", + "log", + "wasm-bindgen-futures", + "wasm-timer", +] + +[[package]] +name = "iced_graphics" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#cfa1adaf468d6284a1c2f0791690c92677c9046d" +dependencies = [ + "bitflags 2.6.0", + "bytemuck", + "cosmic-text", + "glam", + "half", + "iced_core", + "iced_futures", + "image", + "kamadak-exif", + "log", + "lyon_path", + "once_cell", + "raw-window-handle", + "rustc-hash", + "thiserror", + "unicode-segmentation", + "xxhash-rust", +] + +[[package]] +name = "iced_renderer" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#cfa1adaf468d6284a1c2f0791690c92677c9046d" +dependencies = [ + "iced_graphics", + "iced_tiny_skia", + "iced_wgpu", + "log", + "thiserror", +] + +[[package]] +name = "iced_runtime" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#cfa1adaf468d6284a1c2f0791690c92677c9046d" +dependencies = [ + "dnd", + "iced_accessibility", + "iced_core", + "iced_futures", + "smithay-client-toolkit", + "thiserror", + "window_clipboard", +] + +[[package]] +name = "iced_sctk" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#cfa1adaf468d6284a1c2f0791690c92677c9046d" +dependencies = [ + "enum-repr", + "float-cmp", + "futures", + "iced_futures", + "iced_graphics", + "iced_runtime", + "iced_style", + "itertools", + "lazy_static", + "raw-window-handle", + "smithay-client-toolkit", + "thiserror", + "tracing", + "wayland-backend", + "wayland-protocols", + "window_clipboard", + "xkbcommon", + "xkbcommon-dl", + "xkeysym", +] + +[[package]] +name = "iced_style" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#cfa1adaf468d6284a1c2f0791690c92677c9046d" +dependencies = [ + "iced_core", + "once_cell", + "palette", +] + +[[package]] +name = "iced_tiny_skia" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#cfa1adaf468d6284a1c2f0791690c92677c9046d" +dependencies = [ + "bytemuck", + "cosmic-text", + "iced_graphics", + "kurbo", + "log", + "resvg", + "rustc-hash", + "softbuffer", + "tiny-skia", + "xxhash-rust", +] + +[[package]] +name = "iced_wgpu" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#cfa1adaf468d6284a1c2f0791690c92677c9046d" +dependencies = [ + "as-raw-xcb-connection", + "bitflags 2.6.0", + "bytemuck", + "futures", + "glam", + "glyphon", + "guillotiere", + "iced_graphics", + "log", + "lyon", + "once_cell", + "raw-window-handle", + "resvg", + "rustix 0.38.34", + "smithay-client-toolkit", + "tiny-xlib", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-sys", + "wgpu", + "x11rb", +] + +[[package]] +name = "iced_widget" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#cfa1adaf468d6284a1c2f0791690c92677c9046d" +dependencies = [ + "dnd", + "iced_renderer", + "iced_runtime", + "iced_style", + "num-traits", + "ouroboros", + "thiserror", + "unicode-segmentation", + "window_clipboard", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "image" +version = "0.24.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif 0.13.1", + "jpeg-decoder", + "num-traits", + "png", + "qoi", + "tiff", +] + +[[package]] +name = "imagesize" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +dependencies = [ + "equivalent", + "hashbrown 0.14.5", + "serde", +] + +[[package]] +name = "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 = "input" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7911ce3db9c10c5ab4a35c49af778a5f9a827bd0f7371d9be56175d8dd2740d0" +dependencies = [ + "bitflags 2.6.0", + "input-sys", + "io-lifetimes", + "libc", + "log", + "udev", +] + +[[package]] +name = "input-sys" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd4f5b4d1c00331c5245163aacfe5f20be75b564c7112d45893d4ae038119eb0" + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jpeg-decoder" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" +dependencies = [ + "rayon", +] + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kamadak-exif" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4fc70d0ab7e5b6bafa30216a6b48705ea964cdfc29c050f2412295eba58077" +dependencies = [ + "mutate_once", +] + +[[package]] +name = "khronos-egl" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" +dependencies = [ + "libc", + "libloading 0.8.4", + "pkg-config", +] + +[[package]] +name = "khronos_api" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" + +[[package]] +name = "known-folders" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4397c789f2709d23cfcb703b316e0766a8d4b17db2d47b0ab096ef6047cae1d8" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "kqueue" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + +[[package]] +name = "kurbo" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[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 = "libcosmic" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#cfa1adaf468d6284a1c2f0791690c92677c9046d" +dependencies = [ + "apply", + "chrono", + "cosmic-config", + "cosmic-theme", + "css-color", + "derive_setters", + "fraction", + "freedesktop-icons", + "iced", + "iced_core", + "iced_futures", + "iced_renderer", + "iced_runtime", + "iced_sctk", + "iced_style", + "iced_tiny_skia", + "iced_widget", + "lazy_static", + "palette", + "serde", + "slotmap", + "taffy", + "thiserror", + "tracing", + "unicode-segmentation", + "url", +] + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libloading" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" +dependencies = [ + "cfg-if", + "windows-targets 0.52.6", +] + +[[package]] +name = "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.6.0", + "libc", +] + +[[package]] +name = "libudev-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "linux-raw-sys" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4" + +[[package]] +name = "locale1" +version = "0.1.0" +source = "git+https://github.com/pop-os/dbus-settings-bindings#cd21ddcb1b5cbfc80ab84b34d3c8b1ff3d81179a" +dependencies = [ + "zbus 4.3.1", +] + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "lru" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" +dependencies = [ + "hashbrown 0.12.3", +] + +[[package]] +name = "lru" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +dependencies = [ + "hashbrown 0.14.5", +] + +[[package]] +name = "lyon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e7f9cda98b5430809e63ca5197b06c7d191bf7e26dfc467d5a3f0290e2a74f" +dependencies = [ + "lyon_algorithms", + "lyon_tessellation", +] + +[[package]] +name = "lyon_algorithms" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3bca95f9a4955b3e4a821fbbcd5edfbd9be2a9a50bb5758173e5358bfb4c623" +dependencies = [ + "lyon_path", + "num-traits", +] + +[[package]] +name = "lyon_geom" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edecfb8d234a2b0be031ab02ebcdd9f3b9ee418fb35e265f7a540a48d197bff9" +dependencies = [ + "arrayvec", + "euclid", + "num-traits", +] + +[[package]] +name = "lyon_path" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c08a606c7a59638d6c6aa18ac91a06aa9fb5f765a7efb27e6a4da58700740d7" +dependencies = [ + "lyon_geom", + "num-traits", +] + +[[package]] +name = "lyon_tessellation" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "579d42360a4b09846eff2feef28f538696c7d6c7439bfa65874ff3cbe0951b2c" +dependencies = [ + "float_next_after", + "lyon_path", + "num-traits", +] + +[[package]] +name = "mac-notification-sys" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51fca4d74ff9dbaac16a01b924bc3693fa2bba0862c2c633abc73f9a8ea21f64" +dependencies = [ + "cc", + "dirs-next", + "objc-foundation", + "objc_id", + "time", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memmap2" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoize" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5df4051db13d0816cf23196d3baa216385ae099339f5d0645a8d9ff2305e82b8" +dependencies = [ + "lazy_static", + "lru 0.7.8", + "memoize-inner", +] + +[[package]] +name = "memoize-inner" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27bdece7e91f0d1e33df7b46ec187a93ea0d4e642113a1039ac8bfdd4a3273ac" +dependencies = [ + "lazy_static", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "metal" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +dependencies = [ + "bitflags 2.6.0", + "block", + "core-graphics-types", + "foreign-types", + "log", + "objc", + "paste", +] + +[[package]] +name = "mime" +version = "0.1.0" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +dependencies = [ + "smithay-clipboard", +] + +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "mutate_once" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" + +[[package]] +name = "naga" +version = "0.19.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +dependencies = [ + "arrayvec", + "bit-set", + "bitflags 2.6.0", + "codespan-reporting", + "hexf-parse", + "indexmap 2.2.6", + "log", + "num-traits", + "rustc-hash", + "spirv", + "termcolor", + "thiserror", + "unicode-xid", +] + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", +] + +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "cfg_aliases 0.2.1", + "libc", + "memoffset 0.9.1", +] + +[[package]] +name = "notify" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" +dependencies = [ + "bitflags 2.6.0", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "log", + "mio", + "walkdir", + "windows-sys 0.48.0", +] + +[[package]] +name = "notify-rust" +version = "4.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5312f837191c317644f313f7b2b39f9cb1496570c74f7c17152dd3961219551f" +dependencies = [ + "log", + "mac-notification-sys", + "serde", + "tauri-winrt-notification", + "zbus 4.3.1", +] + +[[package]] +name = "num" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.9", + "libc", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ordered-multimap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" +dependencies = [ + "dlv-list", + "hashbrown 0.14.5", +] + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "ouroboros" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954" +dependencies = [ + "aliasable", + "ouroboros_macro", + "static_assertions", +] + +[[package]] +name = "ouroboros_macro" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "palette" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cbf71184cc5ecc2e4e1baccdb21026c20e5fc3dcf63028a086131b3ab00b6e6" +dependencies = [ + "approx", + "fast-srgb8", + "palette_derive", + "phf", + "serde", +] + +[[package]] +name = "palette_derive" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5030daf005bface118c096f510ffb781fc28f9ab6a32ab224d8631be6851d30" +dependencies = [ + "by_address", + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.6", +] + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.10", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.5.3", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pico-args" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" +dependencies = [ + "atomic-waker", + "fastrand 2.1.0", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "png" +version = "0.17.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi 0.4.0", + "pin-project-lite", + "rustix 0.38.34", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "presser" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "profiling" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" + +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", +] + +[[package]] +name = "quick-xml" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "range-alloc" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" + +[[package]] +name = "rangemap" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" + +[[package]] +name = "raw-window-handle" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "rctree" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" + +[[package]] +name = "read-fonts" +version = "0.19.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8b8af39d1f23869711ad4cea5e7835a20daa987f80232f7f2a2374d648ca64d" +dependencies = [ + "bytemuck", + "font-types", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "redox_users" +version = "0.4.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", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "renderdoc-sys" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" + +[[package]] +name = "resvg" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cadccb3d99a9efb8e5e00c16fbb732cbe400db2ec7fc004697ee7d97d86cf1f4" +dependencies = [ + "gif 0.12.0", + "jpeg-decoder", + "log", + "pico-args", + "png", + "rgb", + "svgtypes", + "tiny-skia", + "usvg", +] + +[[package]] +name = "rgb" +version = "0.8.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade4539f42266ded9e755c605bdddf546242b2c961b03b06a7375260788a0523" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "ron" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" +dependencies = [ + "base64 0.21.7", + "bitflags 2.6.0", + "serde", + "serde_derive", +] + +[[package]] +name = "roxmltree" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" + +[[package]] +name = "rust-ini" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e0698206bcb8882bf2a9ecb4c1e7785db57ff052297085a6efd4fe42302068a" +dependencies = [ + "cfg-if", + "ordered-multimap", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.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 = "rustix" +version = "0.37.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys 0.4.14", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustybuzz" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" +dependencies = [ + "bitflags 2.6.0", + "bytemuck", + "smallvec", + "ttf-parser 0.20.0", + "unicode-bidi-mirroring 0.1.0", + "unicode-ccc 0.1.2", + "unicode-properties", + "unicode-script", +] + +[[package]] +name = "rustybuzz" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c" +dependencies = [ + "bitflags 2.6.0", + "bytemuck", + "libm", + "smallvec", + "ttf-parser 0.21.1", + "unicode-bidi-mirroring 0.2.0", + "unicode-ccc 0.2.0", + "unicode-properties", + "unicode-script", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "self_cell" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" + +[[package]] +name = "serde" +version = "1.0.204" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.204" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "serde_json" +version = "1.0.120" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +dependencies = [ + "indexmap 2.2.6", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "serde_with" +version = "3.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" +dependencies = [ + "base64 0.22.1", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.2.6", + "serde", + "serde_derive", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "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 = "simplecss" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d" +dependencies = [ + "log", +] + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "skrifa" +version = "0.19.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab45fb68b53576a43d4fc0e9ec8ea64e29a4d2cc7f44506964cb75f288222e9" +dependencies = [ + "bytemuck", + "read-fonts", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "slotmap" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" +dependencies = [ + "version_check", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "smithay-client-toolkit" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" +dependencies = [ + "bitflags 2.6.0", + "bytemuck", + "calloop", + "calloop-wayland-source", + "cursor-icon", + "libc", + "log", + "memmap2 0.9.4", + "pkg-config", + "rustix 0.38.34", + "thiserror", + "wayland-backend", + "wayland-client", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols", + "wayland-protocols-wlr", + "wayland-scanner", + "xkbcommon", + "xkeysym", +] + +[[package]] +name = "smithay-clipboard" +version = "0.8.0" +source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-5#d099e82a4c1e7d3e88dc34b7333de21928b1b22c" +dependencies = [ + "libc", + "raw-window-handle", + "smithay-client-toolkit", + "wayland-backend", +] + +[[package]] +name = "smol_str" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" +dependencies = [ + "serde", +] + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "softbuffer" +version = "0.4.1" +source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-4.0#6e75b1ad7e98397d37cb187886d05969bc480995" +dependencies = [ + "as-raw-xcb-connection", + "bytemuck", + "cfg_aliases 0.2.1", + "cocoa", + "core-graphics", + "drm", + "fastrand 2.1.0", + "foreign-types", + "js-sys", + "log", + "memmap2 0.9.4", + "objc", + "raw-window-handle", + "redox_syscall 0.4.1", + "rustix 0.38.34", + "tiny-xlib", + "wasm-bindgen", + "wayland-backend", + "wayland-client", + "wayland-sys", + "web-sys", + "windows-sys 0.52.0", + "x11rb", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spirv" +version = "0.3.0+sdk-1.3.268.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strict-num" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" +dependencies = [ + "float-cmp", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "sunrise" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3217c5830416956b1f2dc731f526150a82c144ebe83d2f0e78853c8356a22ada" +dependencies = [ + "chrono", +] + +[[package]] +name = "svg_fmt" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20e16a0f46cf5fd675563ef54f26e83e20f2366bcf027bcb3cc3ed2b98aaf2ca" + +[[package]] +name = "svgtypes" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70" +dependencies = [ + "kurbo", + "siphasher", +] + +[[package]] +name = "swash" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d7773d67fe3373048cf840bfcc54ec3207cfc1e95c526b287ef2eb5eff9faf6" +dependencies = [ + "skrifa", + "yazi", + "zeno", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sys-locale" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" +dependencies = [ + "libc", +] + +[[package]] +name = "taffy" +version = "0.3.11" +source = "git+https://github.com/DioxusLabs/taffy?rev=7781c70#7781c70241f7f572130c13106f2a869a9cf80885" +dependencies = [ + "arrayvec", + "grid", + "num-traits", + "slotmap", +] + +[[package]] +name = "tauri-winrt-notification" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f89f5fb70d6f62381f5d9b2ba9008196150b40b75f3068eb24faeddf1c686871" +dependencies = [ + "quick-xml 0.31.0", + "windows 0.56.0", + "windows-version", +] + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand 2.1.0", + "rustix 0.38.34", + "windows-sys 0.52.0", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "tiff" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] +name = "tiny-skia" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "log", + "png", + "tiny-skia-path", +] + +[[package]] +name = "tiny-skia-path" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + +[[package]] +name = "tiny-xlib" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d52f22673960ad13af14ff4025997312def1223bfa7c8e4949d099e6b3d5d1c" +dependencies = [ + "as-raw-xcb-connection", + "ctor-lite", + "libloading 0.8.4", + "pkg-config", + "tracing", +] + +[[package]] +name = "tinyvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.38.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.7", + "tokio-macros", + "tracing", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[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 = "toml_datetime" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.2.6", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.2.6", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "ttf-parser" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" + +[[package]] +name = "ttf-parser" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "udev" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50051c6e22be28ee6f217d50014f3bc29e81c20dc66ff7ca0d5c5226e1dcc5a1" +dependencies = [ + "io-lifetimes", + "libc", + "libudev-sys", + "pkg-config", +] + +[[package]] +name = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset 0.9.1", + "tempfile", + "winapi", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-bidi-mirroring" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" + +[[package]] +name = "unicode-bidi-mirroring" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86" + +[[package]] +name = "unicode-ccc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" + +[[package]] +name = "unicode-ccc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-linebreak" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-properties" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" + +[[package]] +name = "unicode-script" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-vo" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" + +[[package]] +name = "unicode-width" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "upower_dbus" +version = "0.3.2" +source = "git+https://github.com/pop-os/dbus-settings-bindings#cd21ddcb1b5cbfc80ab84b34d3c8b1ff3d81179a" +dependencies = [ + "serde", + "serde_repr", + "zbus 4.3.1", +] + +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "usvg" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b0a51b72ab80ca511d126b77feeeb4fb1e972764653e61feac30adc161a756" +dependencies = [ + "base64 0.21.7", + "log", + "pico-args", + "usvg-parser", + "usvg-text-layout", + "usvg-tree", + "xmlwriter", +] + +[[package]] +name = "usvg-parser" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bd4e3c291f45d152929a31f0f6c819245e2921bfd01e7bd91201a9af39a2bdc" +dependencies = [ + "data-url", + "flate2", + "imagesize", + "kurbo", + "log", + "roxmltree", + "simplecss", + "siphasher", + "svgtypes", + "usvg-tree", +] + +[[package]] +name = "usvg-text-layout" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d383a3965de199d7f96d4e11a44dd859f46e86de7f3dca9a39bf82605da0a37c" +dependencies = [ + "fontdb", + "kurbo", + "log", + "rustybuzz 0.12.1", + "unicode-bidi", + "unicode-script", + "unicode-vo", + "usvg-tree", +] + +[[package]] +name = "usvg-tree" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ee3d202ebdb97a6215604b8f5b4d6ef9024efd623cf2e373a6416ba976ec7d3" +dependencies = [ + "rctree", + "strict-num", + "svgtypes", + "tiny-skia-path", +] + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "waker-fn" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.71", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "wasm-timer" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" +dependencies = [ + "futures", + "js-sys", + "parking_lot 0.11.2", + "pin-utils", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "wayland-backend" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993" +dependencies = [ + "cc", + "downcast-rs", + "rustix 0.38.34", + "scoped-tls", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-client" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943" +dependencies = [ + "bitflags 2.6.0", + "rustix 0.38.34", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-csd-frame" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" +dependencies = [ + "bitflags 2.6.0", + "cursor-icon", + "wayland-backend", +] + +[[package]] +name = "wayland-cursor" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ef9489a8df197ebf3a8ce8a7a7f0a2320035c3743f3c1bd0bdbccf07ce64f95" +dependencies = [ + "rustix 0.38.34", + "wayland-client", + "xcursor", +] + +[[package]] +name = "wayland-protocols" +version = "0.32.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62989625a776e827cc0f15d41444a3cea5205b963c3a25be48ae1b52d6b4daaa" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd993de54a40a40fbe5601d9f1fbcaef0aebcc5fda447d7dc8f6dcbaae4f8953" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6" +dependencies = [ + "proc-macro2", + "quick-xml 0.34.0", + "quote", +] + +[[package]] +name = "wayland-sys" +version = "0.31.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148" +dependencies = [ + "dlib", + "log", + "once_cell", + "pkg-config", +] + +[[package]] +name = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "weezl" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" + +[[package]] +name = "wgpu" +version = "0.19.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +dependencies = [ + "arrayvec", + "cfg-if", + "cfg_aliases 0.1.1", + "js-sys", + "log", + "naga", + "parking_lot 0.12.3", + "profiling", + "raw-window-handle", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-core" +version = "0.19.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags 2.6.0", + "cfg_aliases 0.1.1", + "codespan-reporting", + "indexmap 2.2.6", + "log", + "naga", + "once_cell", + "parking_lot 0.12.3", + "profiling", + "raw-window-handle", + "rustc-hash", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-hal" +version = "0.19.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags 2.6.0", + "block", + "cfg_aliases 0.1.1", + "core-graphics-types", + "d3d12", + "glow", + "glutin_wgl_sys", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor", + "hassle-rs", + "js-sys", + "khronos-egl", + "libc", + "libloading 0.8.4", + "log", + "metal", + "naga", + "objc", + "once_cell", + "parking_lot 0.12.3", + "profiling", + "range-alloc", + "raw-window-handle", + "renderdoc-sys", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types", + "winapi", +] + +[[package]] +name = "wgpu-types" +version = "0.19.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +dependencies = [ + "bitflags 2.6.0", + "js-sys", + "web-sys", +] + +[[package]] +name = "widestring" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "window_clipboard" +version = "0.4.1" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +dependencies = [ + "clipboard-win", + "clipboard_macos", + "clipboard_wayland", + "clipboard_x11", + "dnd", + "mime", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core 0.52.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" +dependencies = [ + "windows-core 0.56.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-implement" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "windows-interface" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows-version" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "x11rb" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" +dependencies = [ + "as-raw-xcb-connection", + "gethostname", + "libc", + "libloading 0.8.4", + "once_cell", + "rustix 0.38.34", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" + +[[package]] +name = "xcursor" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" + +[[package]] +name = "xdg" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" + +[[package]] +name = "xdg-home" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "xkbcommon" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e" +dependencies = [ + "libc", + "memmap2 0.8.0", + "xkeysym", +] + +[[package]] +name = "xkbcommon-dl" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" +dependencies = [ + "bitflags 2.6.0", + "dlib", + "log", + "once_cell", + "xkeysym", +] + +[[package]] +name = "xkeysym" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "xml-rs" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" + +[[package]] +name = "xmlwriter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" + +[[package]] +name = "xxhash-rust" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63658493314859b4dfdf3fb8c1defd61587839def09582db50b8a4e93afca6bb" + +[[package]] +name = "yazi" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" + +[[package]] +name = "zbus" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" +dependencies = [ + "async-broadcast 0.5.1", + "async-process 1.8.1", + "async-recursion", + "async-trait", + "byteorder", + "derivative", + "enumflags2", + "event-listener 2.5.3", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.26.4", + "once_cell", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tokio", + "tracing", + "uds_windows", + "winapi", + "xdg-home", + "zbus_macros 3.15.2", + "zbus_names 2.6.1", + "zvariant 3.15.2", +] + +[[package]] +name = "zbus" +version = "4.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "851238c133804e0aa888edf4a0229481c753544ca12a60fd1c3230c8a500fe40" +dependencies = [ + "async-broadcast 0.7.1", + "async-executor", + "async-fs", + "async-io 2.3.3", + "async-lock 3.4.0", + "async-process 2.2.3", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "enumflags2", + "event-listener 5.3.1", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.29.0", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tokio", + "tracing", + "uds_windows", + "windows-sys 0.52.0", + "xdg-home", + "zbus_macros 4.3.1", + "zbus_names 3.0.0", + "zvariant 4.1.2", +] + +[[package]] +name = "zbus_macros" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils 1.0.1", +] + +[[package]] +name = "zbus_macros" +version = "4.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d5a3f12c20bd473be3194af6b49d50d7bb804ef3192dc70eddedb26b85d9da7" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.71", + "zvariant_utils 2.0.0", +] + +[[package]] +name = "zbus_names" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" +dependencies = [ + "serde", + "static_assertions", + "zvariant 3.15.2", +] + +[[package]] +name = "zbus_names" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" +dependencies = [ + "serde", + "static_assertions", + "zvariant 4.1.2", +] + +[[package]] +name = "zeno" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697" + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[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 = "zvariant" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "zvariant_derive 3.15.2", +] + +[[package]] +name = "zvariant" +version = "4.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1724a2b330760dc7d2a8402d841119dc869ef120b139d29862d6980e9c75bfc9" +dependencies = [ + "endi", + "enumflags2", + "serde", + "static_assertions", + "zvariant_derive 4.1.2", +] + +[[package]] +name = "zvariant_derive" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils 1.0.1", +] + +[[package]] +name = "zvariant_derive" +version = "4.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55025a7a518ad14518fb243559c058a2e5b848b015e31f1d90414f36e3317859" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.71", + "zvariant_utils 2.0.0", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "zvariant_utils" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-settings-daemon/package.nix index 6db310e489..f2ddef390d 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-settings-daemon/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-settings-daemon/package.nix @@ -1,25 +1,51 @@ -{ lib -, fetchFromGitHub -, rustPlatform -, pkg-config -, udev +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + libinput, + udev, }: rustPlatform.buildRustPackage rec { pname = "cosmic-settings-daemon"; - version = "unstable-2023-12-29"; + version = "1.0.0-alpha.2"; src = fetchFromGitHub { owner = "pop-os"; - repo = pname; - rev = "f7183b68c6ca3f68054b5dd6457b1d5798a75a48"; - hash = "sha256-Wck0NY6CUjD16gxi74stayiahs4UiqS7iQCkbOXCgKE="; + repo = "cosmic-settings-daemon"; + rev = "epoch-${version}"; + hash = "sha256-mtnMqG3aUSgtN3+Blj3w90UsX8NUu/QlzYgr64KPE9s="; }; - cargoHash = "sha256-vCs20RdGhsI1+f78KEau7ohtoGTrGP9QH91wooQlgOE="; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "accesskit-0.12.2" = "sha256-1UwgRyUe0PQrZrpS7574oNLi13fg5HpgILtZGW6JNtQ="; + "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA="; + "clipboard_macos-0.1.0" = "sha256-cG5vnkiyDlQnbEfV2sPbmBYKv1hd3pjJrymfZb8ziKk="; + "cosmic-comp-config-0.1.0" = "sha256-224Z6/KF6x0mOOe81Ny+9RTjHt+Y63UZ+4+mQ8Y7aqU="; + "cosmic-config-0.1.0" = "sha256-S7/SZgOCeiuFkKNoPfG5YizAs3cGdjb7XIiMbHZ56ss="; + "cosmic-text-0.12.0" = "sha256-VUUCcW5XnkmCB8cQ5t2xT70wVD5WKXEOPNgNd2xod2A="; + "d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4="; + "geoclue2-0.1.0" = "sha256-+1XB7r45Uc71fLnNR4U0DUF2EB8uzKeE4HIrdvKhFXo="; + "glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg="; + "smithay-clipboard-0.8.0" = "sha256-pBQZ+UXo9hZ907mfpcZk+a+8pKrIWdczVvPkjT3TS8U="; + "softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg="; + "taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI="; + }; + }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ udev ]; + buildInputs = [ + libinput + udev + ]; + + postInstall = '' + mkdir -p $out/share/polkit-1/rules.d + cp data/polkit-1/rules.d/*.rules $out/share/polkit-1/rules.d/ + ''; meta = with lib; { homepage = "https://github.com/pop-os/cosmic-settings-daemon"; diff --git a/third_party/nixpkgs/pkgs/by-name/co/coz/package.nix b/third_party/nixpkgs/pkgs/by-name/co/coz/package.nix index 3bf4826b4d..90e08f176a 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/coz/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/coz/package.nix @@ -1,50 +1,46 @@ -{ lib, stdenv -, fetchFromGitHub -, libelfin -, ncurses -, python3 -, python3Packages -, makeWrapper +{ + lib, + docutils, + fetchFromGitHub, + libelfin, + ncurses, + pkg-config, + python3Packages, + makeWrapper, }: -stdenv.mkDerivation rec { + +python3Packages.buildPythonApplication rec { pname = "coz"; - version = "0.2.1"; + version = "0.2.2"; + pyproject = false; # Built with make src = fetchFromGitHub { owner = "plasma-umass"; repo = "coz"; rev = version; - hash = "sha256-DHpXKyqaDflD2olAXnyaxXvwsB3Tx4hKCeugxL0ZVG0="; + hash = "sha256-tvFXInxjodB0jEgEKgnOGapiVPomBG1hvrhYtG2X5jI="; }; - postPatch = '' - sed -i -e '/pid_t gettid/,+2d' libcoz/ccutil/thread.h - ''; - - postConfigure = '' - # This is currently hard-coded. Will be fixed in the next release. - sed -e "s|/usr/lib/|$out/lib/|" -i ./coz - ''; - nativeBuildInputs = [ + pkg-config ncurses - makeWrapper - python3Packages.wrapPython + docutils ]; buildInputs = [ + ncurses libelfin - (python3.withPackages (p: [ p.docutils ])) ]; - installPhase = '' - mkdir -p $out/share/man/man1 - make install prefix=$out + dependencies = [ python3Packages.docutils ]; - # fix executable includes + makeFlags = [ "prefix=${placeholder "out"}" ]; + + strictDeps = true; + + # fix executable includes + postInstall = '' chmod -x $out/include/coz.h - - wrapPythonPrograms ''; meta = { @@ -52,6 +48,9 @@ stdenv.mkDerivation rec { description = "Profiler based on casual profiling"; mainProgram = "coz"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ zimbatm ]; + maintainers = with lib.maintainers; [ + zimbatm + aleksana + ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/cp/cpplint/package.nix b/third_party/nixpkgs/pkgs/by-name/cp/cpplint/package.nix new file mode 100644 index 0000000000..e8f7c8ef8c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/cp/cpplint/package.nix @@ -0,0 +1,47 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + versionCheckHook, +}: + +python3Packages.buildPythonApplication rec { + pname = "cpplint"; + version = "2.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "cpplint"; + repo = "cpplint"; + rev = "refs/tags/${version}"; + hash = "sha256-076363ZwcriPb+Fn9S5jay8oL+LlBTNh+IqQRCAndRo="; + }; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace-fail "pytest-cov" "" \ + --replace-fail "--cov-fail-under=90 --cov=cpplint" "" + ''; + + build-system = with python3Packages; [ + setuptools + ]; + + nativeCheckInputs = with python3Packages; [ + parameterized + pytestCheckHook + pytest-timeout + testfixtures + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + + meta = { + homepage = "https://github.com/cpplint/cpplint"; + description = "Static code checker for C++"; + changelog = "https://github.com/cpplint/cpplint/releases/tag/${version}"; + mainProgram = "cpplint"; + maintainers = [ lib.maintainers.bhipple ]; + license = [ lib.licenses.bsd3 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/cp/cpu-x/package.nix b/third_party/nixpkgs/pkgs/by-name/cp/cpu-x/package.nix index 372ebbce2a..bbc48a1371 100644 --- a/third_party/nixpkgs/pkgs/by-name/cp/cpu-x/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cp/cpu-x/package.nix @@ -39,13 +39,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cpu-x"; - version = "5.0.4"; + version = "5.1.0"; src = fetchFromGitHub { owner = "X0rg"; repo = "CPU-X"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-8jJP0gxH3B6qLrhKNa4P9ZfSjxaXTeBB1+UuadflLQo="; + hash = "sha256-4wW8elGsU3EhDDMPxa5di01NlB0dJ8MN8TiaIBo2qxo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/cr/crow/package.nix b/third_party/nixpkgs/pkgs/by-name/cr/crow/package.nix new file mode 100644 index 0000000000..357a98600c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/cr/crow/package.nix @@ -0,0 +1,41 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + asio, + python3, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "crow"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "crowcpp"; + repo = "crow"; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-fokj+KiS6frPVOoOvETxW3ue95kCcYhdhOlN3efzBd4="; + }; + + propagatedBuildInputs = [ asio ]; + nativeBuildInputs = [ + asio + cmake + python3 + ]; + + cmakeFlags = [ + (lib.cmakeBool "CROW_BUILD_EXAMPLES" false) + ]; + + doCheck = true; + + meta = { + description = "A Fast and Easy to use microframework for the web"; + homepage = "https://crowcpp.org/"; + maintainers = with lib.maintainers; [ l33tname ]; + platforms = lib.platforms.all; + license = lib.licenses.bsd3; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/cz/czkawka/package.nix b/third_party/nixpkgs/pkgs/by-name/cz/czkawka/package.nix index 934b6d1dca..0ec3c8d6d0 100644 --- a/third_party/nixpkgs/pkgs/by-name/cz/czkawka/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cz/czkawka/package.nix @@ -17,6 +17,7 @@ testers, wrapGAppsHook4, xvfb-run, + versionCheckHook, }: let @@ -26,21 +27,16 @@ let self = buildRustPackage' { pname = "czkawka"; - version = "7.0.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "qarmin"; repo = "czkawka"; - rev = self.version; - hash = "sha256-SOWtLmehh1F8SoDQ+9d7Fyosgzya5ZztCv8IcJZ4J94="; + rev = "refs/tags/${self.version}"; + hash = "sha256-Uxko2TRIjqQvd7n9C+P7oMUrm3YY5j7TVzvijEjDwOM="; }; - cargoPatches = [ - # Updates time and time-macros from Cargo.lock - ./0000-time.diff - ]; - - cargoHash = "sha256-cQv8C0P3xizsvnJODkTMJQA98P4nYSCHFT75isJE6es="; + cargoHash = "sha256-DR2JU+QcGWliNoRMjSjJns7FsicpNAX5gTariFuQ/dw="; nativeBuildInputs = [ gobject-introspection @@ -85,6 +81,13 @@ let install -Dm444 -t $out/share/metainfo data/com.github.qarmin.czkawka.metainfo.xml ''; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = "${placeholder "out"}/bin/czkawka_cli"; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + passthru = { tests.version = testers.testVersion { package = self; diff --git a/third_party/nixpkgs/pkgs/by-name/da/darcs-to-git/package.nix b/third_party/nixpkgs/pkgs/by-name/da/darcs-to-git/package.nix index e3abd5d2e4..8ab4a7d63f 100644 --- a/third_party/nixpkgs/pkgs/by-name/da/darcs-to-git/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/da/darcs-to-git/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation { pname = "darcs-to-git"; - version = "0-unstable-2024-02-20"; + version = "0-unstable-2024-09-30"; src = fetchFromGitHub { owner = "purcell"; repo = "darcs-to-git"; - rev = "2a31a95726658fef1b48e1f0010928fc2a69d5bf"; - hash = "sha256-ep36lAYUnO3kX0ff3PxrBHog5CIGsJaERiNN5DmmAQI="; + rev = "9d556cb7daa06b9de3cb97487b98bab2869a7fe7"; + hash = "sha256-0GKSzqgJgi1w4uZOqixp/F6i7hK2ZmuQI0px8FEDFXM="; }; patchPhase = 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 9b5bf26200..d8f5a5362c 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 @@ -11,7 +11,7 @@ gtk3, swt, glib, - webkitgtk, + webkitgtk_4_0, glib-networking, }: @@ -72,7 +72,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { swt gtk3 glib - webkitgtk + webkitgtk_4_0 glib-networking ] }" diff --git a/third_party/nixpkgs/pkgs/by-name/de/delfin/package.nix b/third_party/nixpkgs/pkgs/by-name/de/delfin/package.nix index 359098559b..085845400a 100644 --- a/third_party/nixpkgs/pkgs/by-name/de/delfin/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/de/delfin/package.nix @@ -21,20 +21,20 @@ stdenv.mkDerivation rec { pname = "delfin"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitea { domain = "codeberg.org"; owner = "avery42"; repo = "delfin"; rev = "v${version}"; - hash = "sha256-kCPLfGeMsWAjNrtrxUeXaLv1ZkDCfhDl0HLwYDaoMTY="; + hash = "sha256-F4ipIOqMS42nXHRSRpzIlTh61g2xjpog7Zmxn6D29nE="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-LOW4Gm69e0Cyif3UuzYITy0GMGEgZOHURNxrsZRLdWo="; + hash = "sha256-ciw178jBwz4I6I1x6iI45RJ2ITw0JfukLWNyBmE3FZg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/de/deno/1/librusty_v8.nix b/third_party/nixpkgs/pkgs/by-name/de/deno/1/librusty_v8.nix new file mode 100644 index 0000000000..f36371830e --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/de/deno/1/librusty_v8.nix @@ -0,0 +1,12 @@ +# auto-generated file -- DO NOT EDIT! +{ fetchLibrustyV8 }: + +fetchLibrustyV8 { + version = "0.105.0"; + shas = { + x86_64-linux = "sha256-9yON4DNPxm4IUZSLZp9VZtzSRPPWX1tEuQLVJmN8cLs="; + aarch64-linux = "sha256-5vAjw2vimjCHKPxjIp5vcwMCWUUDYVlk4QyOeEI0DLY="; + x86_64-darwin = "sha256-o4WRkg4ptiJTNMkorn5K+P8xOJwpChM5PqkZCjP076g="; + aarch64-darwin = "sha256-ZuWBnvxu1PgDtjtguxtj3BhFO01AChlbjAS0kZUws3A="; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/de/deno/1/package.nix b/third_party/nixpkgs/pkgs/by-name/de/deno/1/package.nix new file mode 100644 index 0000000000..3b27741531 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/de/deno/1/package.nix @@ -0,0 +1,118 @@ +{ + stdenv, + lib, + callPackage, + fetchFromGitHub, + rustPlatform, + cmake, + protobuf, + installShellFiles, + libiconv, + darwin, + librusty_v8 ? callPackage ./librusty_v8.nix { + inherit (callPackage ../fetchers.nix { }) fetchLibrustyV8; + }, +}: +rustPlatform.buildRustPackage rec { + pname = "deno"; + version = "1.46.3"; + + src = fetchFromGitHub { + owner = "denoland"; + repo = "deno"; + rev = "refs/tags/v${version}"; + hash = "sha256-AM6SjcIHo6Koxcnznhkv3cXoKaMy2TEVpiWe/bczDuA="; + }; + + cargoHash = "sha256-D+CZpb6OTzM5Il0k8GQB7qSONy4myE5yKlaSkLLqHT8="; + + postPatch = '' + # upstream uses lld on aarch64-darwin for faster builds + # within nix lld looks for CoreFoundation rather than CoreFoundation.tbd and fails + substituteInPlace .cargo/config.toml --replace "-fuse-ld=lld " "" + ''; + + # uses zlib-ng but can't dynamically link yet + # https://github.com/rust-lang/libz-sys/issues/158 + nativeBuildInputs = [ + # required by libz-ng-sys crate + cmake + # required by deno_kv crate + protobuf + installShellFiles + ]; + buildInputs = lib.optionals stdenv.isDarwin ( + [ + libiconv + darwin.libobjc + ] + ++ (with darwin.apple_sdk_11_0.frameworks; [ + Security + CoreServices + Metal + MetalPerformanceShaders + Foundation + QuartzCore + ]) + ); + + buildAndTestSubdir = "cli"; + + # work around "error: unknown warning group '-Wunused-but-set-parameter'" + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unknown-warning-option"; + # The v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem + # To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE + env.RUSTY_V8_ARCHIVE = librusty_v8; + + # Tests have some inconsistencies between runs with output integration tests + # Skipping until resolved + doCheck = false; + + preInstall = '' + find ./target -name libswc_common${stdenv.hostPlatform.extensions.sharedLibrary} -delete + ''; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd deno \ + --bash <($out/bin/deno completions bash) \ + --fish <($out/bin/deno completions fish) \ + --zsh <($out/bin/deno completions zsh) + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/deno --help + $out/bin/deno --version | grep "deno ${version}" + runHook postInstallCheck + ''; + + passthru.tests = callPackage ./tests { }; + + meta = with lib; { + homepage = "https://deno.land/"; + changelog = "https://github.com/denoland/deno/releases/tag/v${version}"; + description = "Secure runtime for JavaScript and TypeScript"; + longDescription = '' + Deno aims to be a productive and secure scripting environment for the modern programmer. + Deno will always be distributed as a single executable. + Given a URL to a Deno program, it is runnable with nothing more than the ~15 megabyte zipped executable. + Deno explicitly takes on the role of both runtime and package manager. + It uses a standard browser-compatible protocol for loading modules: URLs. + Among other things, Deno is a great replacement for utility scripts that may have been historically written with + bash or python. + ''; + license = licenses.mit; + mainProgram = "deno"; + maintainers = with maintainers; [ jk ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + # NOTE: `aligned_alloc` error on darwin SDK < 10.15. Can't do usual overrideSDK with rust toolchain in current implementation. + # Should be fixed with darwin SDK refactor and can be revisited. + badPlatforms = [ "x86_64-darwin" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/de/deno/1/tests/basic.ts b/third_party/nixpkgs/pkgs/by-name/de/deno/1/tests/basic.ts new file mode 100644 index 0000000000..5959aa217b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/de/deno/1/tests/basic.ts @@ -0,0 +1 @@ +console.log(1 + 1) diff --git a/third_party/nixpkgs/pkgs/by-name/de/deno/1/tests/default.nix b/third_party/nixpkgs/pkgs/by-name/de/deno/1/tests/default.nix new file mode 100644 index 0000000000..c28490ee0d --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/de/deno/1/tests/default.nix @@ -0,0 +1,79 @@ +{ + deno, + runCommand, + lib, + testers, +}: +let + testDenoRun = + name: + { + args ? "", + dir ? ./. + "/${name}", + file ? "index.ts", + expected ? "", + expectFailure ? false, + }: + let + command = "deno run ${args} ${dir}/${file}"; + in + runCommand "deno-test-${name}" + { + nativeBuildInputs = [ deno ]; + meta.timeout = 60; + } + '' + HOME=$(mktemp -d) + if output=$(${command} 2>&1); then + if [[ $output =~ '${expected}' ]]; then + echo "Test '${name}' passed" + touch $out + else + echo -n ${lib.escapeShellArg command} >&2 + echo " output did not match what was expected." >&2 + echo "The expected was:" >&2 + echo '${expected}' >&2 + echo "The output was:" >&2 + echo "$output" >&2 + exit 1 + fi + else + if [[ "${toString expectFailure}" == "1" ]]; then + echo "Test '${name}' failed as expected" + touch $out + exit 0 + fi + echo -n ${lib.escapeShellArg command} >&2 + echo " returned a non-zero exit code." >&2 + echo "$output" >&2 + exit 1 + fi + ''; +in +(lib.mapAttrs testDenoRun { + basic = { + dir = ./.; + file = "basic.ts"; + expected = "2"; + }; + import-json = { + expected = "hello from JSON"; + }; + import-ts = { + expected = "hello from ts"; + }; + read-file = { + args = "--allow-read"; + expected = "hello from a file"; + }; + fail-read-file = { + expectFailure = true; + dir = ./read-file; + }; +}) +// { + version = testers.testVersion { + package = deno; + command = "deno --version"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/de/deno/1/tests/import-json/data.json b/third_party/nixpkgs/pkgs/by-name/de/deno/1/tests/import-json/data.json new file mode 100644 index 0000000000..7f0de9ebe0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/de/deno/1/tests/import-json/data.json @@ -0,0 +1 @@ +{ "msg": "hello from JSON" } diff --git a/third_party/nixpkgs/pkgs/by-name/de/deno/1/tests/import-json/index.ts b/third_party/nixpkgs/pkgs/by-name/de/deno/1/tests/import-json/index.ts new file mode 100644 index 0000000000..525f25f74d --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/de/deno/1/tests/import-json/index.ts @@ -0,0 +1,2 @@ +import file from "./data.json" assert { type: "json" }; +console.log(file.msg); diff --git a/third_party/nixpkgs/pkgs/by-name/de/deno/1/tests/import-ts/index.ts b/third_party/nixpkgs/pkgs/by-name/de/deno/1/tests/import-ts/index.ts new file mode 100644 index 0000000000..34fec283a1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/de/deno/1/tests/import-ts/index.ts @@ -0,0 +1,3 @@ +import { sayHello } from "./lib.ts" + +sayHello("ts") diff --git a/third_party/nixpkgs/pkgs/by-name/de/deno/1/tests/import-ts/lib.ts b/third_party/nixpkgs/pkgs/by-name/de/deno/1/tests/import-ts/lib.ts new file mode 100644 index 0000000000..3b5e05aaaa --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/de/deno/1/tests/import-ts/lib.ts @@ -0,0 +1,3 @@ +export function sayHello(thing: string) { + console.log(`hello from ${thing}`); +} diff --git a/third_party/nixpkgs/pkgs/by-name/de/deno/1/tests/read-file/data.txt b/third_party/nixpkgs/pkgs/by-name/de/deno/1/tests/read-file/data.txt new file mode 100644 index 0000000000..7eee1b0c10 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/de/deno/1/tests/read-file/data.txt @@ -0,0 +1 @@ +hello from a file diff --git a/third_party/nixpkgs/pkgs/by-name/de/deno/1/tests/read-file/index.ts b/third_party/nixpkgs/pkgs/by-name/de/deno/1/tests/read-file/index.ts new file mode 100644 index 0000000000..be792a3d66 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/de/deno/1/tests/read-file/index.ts @@ -0,0 +1,5 @@ +// trim 'file://' prefix +const thisDir = Deno.mainModule.substring(7, Deno.mainModule.length); +const getParent = (path: string) => path.substring(0, path.lastIndexOf("/")) +const text = await Deno.readTextFile(getParent(thisDir) + "/data.txt"); +console.log(text); diff --git a/third_party/nixpkgs/pkgs/by-name/de/deno/fetchers.nix b/third_party/nixpkgs/pkgs/by-name/de/deno/fetchers.nix new file mode 100644 index 0000000000..b98b4aa6fa --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/de/deno/fetchers.nix @@ -0,0 +1,21 @@ +# not a stable interface, do not reference outside the deno package but make a +# copy if you need +{ + lib, + stdenv, + fetchurl, +}: + +{ + fetchLibrustyV8 = + args: + fetchurl { + name = "librusty_v8-${args.version}"; + url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a.gz"; + sha256 = args.shas.${stdenv.hostPlatform.system}; + meta = { + inherit (args) version; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/de/deno/librusty_v8.nix b/third_party/nixpkgs/pkgs/by-name/de/deno/librusty_v8.nix index bb9e09d2e2..9a9e756ac7 100644 --- a/third_party/nixpkgs/pkgs/by-name/de/deno/librusty_v8.nix +++ b/third_party/nixpkgs/pkgs/by-name/de/deno/librusty_v8.nix @@ -1,23 +1,12 @@ # auto-generated file -- DO NOT EDIT! -{ lib, stdenv, fetchurl }: +{ fetchLibrustyV8 }: -let - fetch_librusty_v8 = args: fetchurl { - name = "librusty_v8-${args.version}"; - url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a.gz"; - sha256 = args.shas.${stdenv.hostPlatform.system}; - meta = { - inherit (args) version; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - }; - }; -in -fetch_librusty_v8 { - version = "0.105.0"; +fetchLibrustyV8 { + version = "0.106.0"; shas = { - x86_64-linux = "sha256-9yON4DNPxm4IUZSLZp9VZtzSRPPWX1tEuQLVJmN8cLs="; - aarch64-linux = "sha256-5vAjw2vimjCHKPxjIp5vcwMCWUUDYVlk4QyOeEI0DLY="; - x86_64-darwin = "sha256-o4WRkg4ptiJTNMkorn5K+P8xOJwpChM5PqkZCjP076g="; - aarch64-darwin = "sha256-ZuWBnvxu1PgDtjtguxtj3BhFO01AChlbjAS0kZUws3A="; + x86_64-linux = "sha256-jLYl/CJp2Z+Ut6qZlh6u+CtR8KN+ToNTB+72QnVbIKM="; + aarch64-linux = "sha256-uAkBMg6JXA+aILd8TzDtuaEdM3Axiw43Ad5tZzxNt5w="; + x86_64-darwin = "sha256-60aR0YvQT8KyacY8J3fWKZcf9vny51VUB19NVpurS/A="; + aarch64-darwin = "sha256-pd/I6Mclj2/r/uJTIywnolPKYzeLu1c28d/6D56vkzQ="; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/de/deno/package.nix b/third_party/nixpkgs/pkgs/by-name/de/deno/package.nix index 687d837952..efb9cdcf79 100644 --- a/third_party/nixpkgs/pkgs/by-name/de/deno/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/de/deno/package.nix @@ -9,20 +9,26 @@ installShellFiles, libiconv, darwin, - librusty_v8 ? callPackage ./librusty_v8.nix { }, + librusty_v8 ? callPackage ./librusty_v8.nix { + inherit (callPackage ./fetchers.nix { }) fetchLibrustyV8; + }, }: + +let + canExecute = stdenv.buildPlatform.canExecute stdenv.hostPlatform; +in rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.46.3"; + version = "2.0.0"; src = fetchFromGitHub { owner = "denoland"; repo = "deno"; rev = "refs/tags/v${version}"; - hash = "sha256-AM6SjcIHo6Koxcnznhkv3cXoKaMy2TEVpiWe/bczDuA="; + hash = "sha256-3PfAjn2zWgxJOYgKwR7lvXu+rIENIHBMPwMM6dWNgR4="; }; - cargoHash = "sha256-D+CZpb6OTzM5Il0k8GQB7qSONy4myE5yKlaSkLLqHT8="; + cargoHash = "sha256-3r5B9yWXKO/8ah+Etflws8RnlRTAdaaC5HZMlZduyHE="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds @@ -54,14 +60,13 @@ rustPlatform.buildRustPackage rec { ]) ); - # work around "error: unknown warning group '-Wunused-but-set-parameter'" - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unknown-warning-option"; - buildAndTestSubdir = "cli"; + # work around "error: unknown warning group '-Wunused-but-set-parameter'" + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unknown-warning-option"; # The v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem # To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE - RUSTY_V8_ARCHIVE = librusty_v8; + env.RUSTY_V8_ARCHIVE = librusty_v8; # Tests have some inconsistencies between runs with output integration tests # Skipping until resolved @@ -71,15 +76,15 @@ rustPlatform.buildRustPackage rec { find ./target -name libswc_common${stdenv.hostPlatform.extensions.sharedLibrary} -delete ''; - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + postInstall = lib.optionalString (canExecute) '' installShellCompletion --cmd deno \ --bash <($out/bin/deno completions bash) \ --fish <($out/bin/deno completions fish) \ --zsh <($out/bin/deno completions zsh) ''; - doInstallCheck = true; - installCheckPhase = '' + doInstallCheck = canExecute; + installCheckPhase = lib.optionalString (canExecute) '' runHook preInstallCheck $out/bin/deno --help $out/bin/deno --version | grep "deno ${version}" diff --git a/third_party/nixpkgs/pkgs/by-name/de/deno/tests/default.nix b/third_party/nixpkgs/pkgs/by-name/de/deno/tests/default.nix index b6787c913b..c28490ee0d 100644 --- a/third_party/nixpkgs/pkgs/by-name/de/deno/tests/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/de/deno/tests/default.nix @@ -1,43 +1,54 @@ -{ deno, runCommand, lib, testers }: +{ + deno, + runCommand, + lib, + testers, +}: let testDenoRun = name: - { args ? "" - , dir ? ./. + "/${name}" - , file ? "index.ts" - , expected ? "" - , expectFailure ? false + { + args ? "", + dir ? ./. + "/${name}", + file ? "index.ts", + expected ? "", + expectFailure ? false, }: let command = "deno run ${args} ${dir}/${file}"; in - runCommand "deno-test-${name}" { nativeBuildInputs = [ deno ]; meta.timeout = 60; } '' - HOME=$(mktemp -d) - if output=$(${command} 2>&1); then - if [[ $output =~ '${expected}' ]]; then - echo "Test '${name}' passed" - touch $out + runCommand "deno-test-${name}" + { + nativeBuildInputs = [ deno ]; + meta.timeout = 60; + } + '' + HOME=$(mktemp -d) + if output=$(${command} 2>&1); then + if [[ $output =~ '${expected}' ]]; then + echo "Test '${name}' passed" + touch $out + else + echo -n ${lib.escapeShellArg command} >&2 + echo " output did not match what was expected." >&2 + echo "The expected was:" >&2 + echo '${expected}' >&2 + echo "The output was:" >&2 + echo "$output" >&2 + exit 1 + fi else + if [[ "${toString expectFailure}" == "1" ]]; then + echo "Test '${name}' failed as expected" + touch $out + exit 0 + fi echo -n ${lib.escapeShellArg command} >&2 - echo " output did not match what was expected." >&2 - echo "The expected was:" >&2 - echo '${expected}' >&2 - echo "The output was:" >&2 + echo " returned a non-zero exit code." >&2 echo "$output" >&2 exit 1 fi - else - if [[ "${toString expectFailure}" == "1" ]]; then - echo "Test '${name}' failed as expected" - touch $out - exit 0 - fi - echo -n ${lib.escapeShellArg command} >&2 - echo " returned a non-zero exit code." >&2 - echo "$output" >&2 - exit 1 - fi - ''; + ''; in (lib.mapAttrs testDenoRun { basic = { @@ -59,8 +70,8 @@ in expectFailure = true; dir = ./read-file; }; -}) // -{ +}) +// { version = testers.testVersion { package = deno; command = "deno --version"; diff --git a/third_party/nixpkgs/pkgs/by-name/de/deno/tests/import-json/index.ts b/third_party/nixpkgs/pkgs/by-name/de/deno/tests/import-json/index.ts index 525f25f74d..3768d0c2cb 100644 --- a/third_party/nixpkgs/pkgs/by-name/de/deno/tests/import-json/index.ts +++ b/third_party/nixpkgs/pkgs/by-name/de/deno/tests/import-json/index.ts @@ -1,2 +1,2 @@ -import file from "./data.json" assert { type: "json" }; +import file from "./data.json" with { type: "json" }; console.log(file.msg); diff --git a/third_party/nixpkgs/pkgs/by-name/de/deno/update/common.ts b/third_party/nixpkgs/pkgs/by-name/de/deno/update/common.ts index a31805269c..ee0d2c0dd1 100644 --- a/third_party/nixpkgs/pkgs/by-name/de/deno/update/common.ts +++ b/third_party/nixpkgs/pkgs/by-name/de/deno/update/common.ts @@ -3,15 +3,11 @@ interface GHRelease { } const decode = (buffer: Uint8Array) => new TextDecoder("utf-8").decode(buffer); -const decodeTrim = (b: Uint8Array) => decode(b).trimEnd(); export const run = async (command: string, args: string[]) => { - const cmd = Deno.run({ - cmd: [command, ...args], - stdout: "piped", - stderr: "piped", - }); - if (!(await cmd.status()).success) { - const error = await cmd.stderrOutput().then(decodeTrim); + const cmd = new Deno.Command(command, { args }); + const { code, stdout, stderr } = await cmd.output(); + if (code !== 0) { + const error = decode(stderr).trimEnd(); // Known error we can ignore if (error.includes("'allow-unsafe-native-code-during-evaluation'")) { // Extract the target sha256 out of the error @@ -26,7 +22,7 @@ export const run = async (command: string, args: string[]) => { } throw new Error(error); } - return cmd.output().then(decodeTrim); + return decode(stdout).trimEnd(); }; // Exports diff --git a/third_party/nixpkgs/pkgs/by-name/de/deno/update/librusty_v8.ts b/third_party/nixpkgs/pkgs/by-name/de/deno/update/librusty_v8.ts index 301af63cb9..ce739a8167 100644 --- a/third_party/nixpkgs/pkgs/by-name/de/deno/update/librusty_v8.ts +++ b/third_party/nixpkgs/pkgs/by-name/de/deno/update/librusty_v8.ts @@ -1,4 +1,4 @@ -import * as toml from "https://deno.land/std@0.202.0/toml/mod.ts"; +import * as toml from "jsr:@std/toml@1.0.1"; import { getExistingVersion, logger, run, write } from "./common.ts"; const log = logger("librusty_v8"); @@ -40,22 +40,15 @@ fetchurl { const templateDeps = (version: string, deps: PrefetchResult[]) => `# auto-generated file -- DO NOT EDIT! -{ lib, stdenv, fetchurl }: +{ fetchLibrustyV8 }: -let - fetch_librusty_v8 = args: fetchurl { - name = "librusty_v8-\${args.version}"; - url = "https://github.com/denoland/rusty_v8/releases/download/v\${args.version}/librusty_v8_release_\${stdenv.hostPlatform.rust.rustcTarget}.a.gz"; - sha256 = args.shas.\${stdenv.hostPlatform.system}; - meta = { - inherit (args) version; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - }; - }; -in -fetch_librusty_v8 { +fetchLibrustyV8 { version = "${version}"; shas = { + x86_64-linux = "sha256-jLYl/CJp2Z+Ut6qZlh6u+CtR8KN+ToNTB+72QnVbIKM="; + aarch64-linux = "sha256-uAkBMg6JXA+aILd8TzDtuaEdM3Axiw43Ad5tZzxNt5w="; + x86_64-darwin = "sha256-60aR0YvQT8KyacY8J3fWKZcf9vny51VUB19NVpurS/A="; + aarch64-darwin = "sha256-pd/I6Mclj2/r/uJTIywnolPKYzeLu1c28d/6D56vkzQ="; ${deps.map(({ arch, sha256 }) => ` ${arch.nix} = "${sha256}";`).join("\n")} }; } diff --git a/third_party/nixpkgs/pkgs/by-name/de/desktop-postflop/package.nix b/third_party/nixpkgs/pkgs/by-name/de/desktop-postflop/package.nix index 4f81bfa494..0eb643a44b 100644 --- a/third_party/nixpkgs/pkgs/by-name/de/desktop-postflop/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/de/desktop-postflop/package.nix @@ -7,7 +7,7 @@ , pkg-config , gtk3 , libsoup -, webkitgtk +, webkitgtk_4_0 }: rustPlatform.buildRustPackage rec { @@ -58,7 +58,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ gtk3 libsoup - webkitgtk + webkitgtk_4_0 ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/by-name/de/devenv/package.nix b/third_party/nixpkgs/pkgs/by-name/de/devenv/package.nix index 0e5de7b6cc..5e1ab56f70 100644 --- a/third_party/nixpkgs/pkgs/by-name/de/devenv/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/de/devenv/package.nix @@ -26,7 +26,7 @@ let doInstallCheck = false; }); - version = "1.3"; + version = "1.3.1"; in rustPlatform.buildRustPackage { pname = "devenv"; inherit version; @@ -35,10 +35,10 @@ in rustPlatform.buildRustPackage { owner = "cachix"; repo = "devenv"; rev = "v${version}"; - hash = "sha256-14hqEeVy72nYDOFn7HK6Mff7L49kUI5K6wMLVHG3A90="; + hash = "sha256-FhlknassIb3rKEucqnfFAzgny1ANmenJcTyRaXYwbA0="; }; - cargoHash = "sha256-E4pU/tZHxMrKSheqWF5qeOfS/NZ/Uw5jY+AbSUHmoaI="; + cargoHash = "sha256-dJ8A2kVXkpJcRvMLE/IawFUZNJqok/IRixTRGtLsE3w="; buildAndTestSubdir = "devenv"; diff --git a/third_party/nixpkgs/pkgs/by-name/di/digikam/package.nix b/third_party/nixpkgs/pkgs/by-name/di/digikam/package.nix index dabd19fc9a..39a61d7e0e 100644 --- a/third_party/nixpkgs/pkgs/by-name/di/digikam/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/di/digikam/package.nix @@ -4,6 +4,7 @@ lib, fetchFromGitLab, fetchgit, + fetchpatch, cmake, ninja, @@ -71,7 +72,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-GJYlxJkvFEXppVk0yC9ojszylfAGt3eBMAjNUu60XDY="; }; - patches = [ ./disable-tests-download.patch ]; + patches = [ + ./disable-tests-download.patch + + # Fix build with Qt 6.8 + # FIXME: remove in next update + (fetchpatch { + url = "https://invent.kde.org/graphics/digikam/-/commit/a8b49ed8df676cae0f48b3369831edde2b74903e.patch"; + hash = "sha256-93kQ/Dg/A9FR83ChyiUaRwyelE1Iq14eIecUteVbnqI="; + }) + ]; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/by-name/di/dinit/package.nix b/third_party/nixpkgs/pkgs/by-name/di/dinit/package.nix index 26f1ad4c7e..3d88f2ccfa 100644 --- a/third_party/nixpkgs/pkgs/by-name/di/dinit/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/di/dinit/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "dinit"; - version = "0.19.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "davmac314"; repo = "dinit"; rev = "v${version}"; - hash = "sha256-ApB0pEFSyawNASF/rqRmhT4FLofZzYmNdNmG2FGpnnk="; + hash = "sha256-z5qfC+aUwSK7UJ2RcyNHcUAUYXKbMrWmqmcn7fJVLD8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/by-name/di/disko/package.nix b/third_party/nixpkgs/pkgs/by-name/di/disko/package.nix index f7553a70fc..2a3818f45e 100644 --- a/third_party/nixpkgs/pkgs/by-name/di/disko/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/di/disko/package.nix @@ -6,16 +6,17 @@ , nix , nixos-install , coreutils +, testers }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "disko"; - version = "1.8.0"; + version = "1.8.2"; src = fetchFromGitHub { owner = "nix-community"; repo = "disko"; rev = "v${finalAttrs.version}"; - hash = "sha256-5zShvCy9S4tuISFjNSjb+TWpPtORqPbRZ0XwbLbPLho="; + hash = "sha256-O0QVhsj9I/hmcIqJ4qCqFyzvjYL+dtzJP0C5MFd8O/Y="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ bash ]; @@ -27,7 +28,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { for i in disko disko-install; do sed -e "s|libexec_dir=\".*\"|libexec_dir=\"$out/share/disko\"|" "$i" > "$out/bin/$i" chmod 755 "$out/bin/$i" - wrapProgram "$out/bin/$i" --prefix PATH : ${lib.makeBinPath [ nix coreutils nixos-install ]} + wrapProgram "$out/bin/$i" \ + --set DISKO_VERSION "${finalAttrs.version}" \ + --prefix PATH : ${lib.makeBinPath [ nix coreutils nixos-install ]} done runHook postInstall ''; @@ -38,12 +41,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { $out/bin/disko-install --help runHook postInstallCheck ''; + + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; + meta = { homepage = "https://github.com/nix-community/disko"; description = "Declarative disk partitioning and formatting using nix"; license = lib.licenses.mit; mainProgram = "disko"; - maintainers = with lib.maintainers; [ mic92 lassulus ]; + maintainers = with lib.maintainers; [ mic92 lassulus iFreilicht ]; platforms = lib.platforms.linux; }; }) 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 a60a03c393..859d509b25 100644 --- a/third_party/nixpkgs/pkgs/by-name/do/dorion/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/do/dorion/package.nix @@ -7,7 +7,7 @@ , gst_all_1 , libappindicator , libayatana-appindicator -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 }: @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - webkitgtk + webkitgtk_4_0 ]; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/do/double-entry-generator/package.nix b/third_party/nixpkgs/pkgs/by-name/do/double-entry-generator/package.nix new file mode 100644 index 0000000000..f57f8b185b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/do/double-entry-generator/package.nix @@ -0,0 +1,49 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: +buildGoModule rec { + pname = "double-entry-generator"; + version = "2.7.1"; + src = fetchFromGitHub { + owner = "deb-sig"; + repo = "double-entry-generator"; + hash = "sha256-2Y8Spj1LAVZsUgChDYDCZ63pTH+nqs2ff9xcmC+gr0c="; + rev = "v${version}"; + }; + + vendorHash = "sha256-Xedva9oGteOnv3rP4Wo3sOHIPyuy2TYwkZV2BAuxY4M="; + + excludedPackages = [ "hack" ]; + + ldflags = [ + "-s" + "-w" + "-X=github.com/deb-sig/double-entry-generator/pkg/version.VERSION=${version}" + "-X=github.com/deb-sig/double-entry-generator/pkg/version.REPOROOT=github.com/deb-sig/double-entry-generator" + "-X=github.com/deb-sig/double-entry-generator/pkg/version.COMMIT=${src.rev}" + ]; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + touch build-local + ln -s $out/bin ./ + make SHELL=bash GIT_COMMIT= VERSION= DOCKER_LABELS= -o test-go test + + runHook postInstallCheck + ''; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Rule-based double-entry bookkeeping importer (from Alipay/WeChat/Huobi etc. to Beancount/Ledger)"; + homepage = "https://github.com/deb-sig/double-entry-generator"; + license = licenses.asl20; + maintainers = with maintainers; [ rennsax ]; + mainProgram = "double-entry-generator"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/dr/druid/package.nix b/third_party/nixpkgs/pkgs/by-name/dr/druid/package.nix index 3d8c59b3f0..312b589bfb 100644 --- a/third_party/nixpkgs/pkgs/by-name/dr/druid/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/dr/druid/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { }; mysqlConnector = fetchurl { - url = "https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.48/mysql-connector-java-5.1.48.jar"; + url = "mirror://maven/mysql/mysql-connector-java/5.1.48/mysql-connector-java-5.1.48.jar"; hash = "sha256-VuJsqqOCH1rkr0T5x09mz4uE6gFRatOAPLsOkEm27Kg="; }; diff --git a/third_party/nixpkgs/pkgs/by-name/ds/dsp/package.nix b/third_party/nixpkgs/pkgs/by-name/ds/dsp/package.nix index f827e28168..9e2e815a17 100644 --- a/third_party/nixpkgs/pkgs/by-name/ds/dsp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ds/dsp/package.nix @@ -13,6 +13,7 @@ , ladspaH , libtool , libpulseaudio +, fetchpatch }: stdenv.mkDerivation (finalAttrs: { @@ -28,6 +29,15 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; + patches = [ + # fix compatibility with ffmpeg7 + # https://github.com/bmc0/dsp/commit/58a9d0c1f99f2d4c7fc51b6dbe563447ec60120f + (fetchpatch { + url = "https://github.com/bmc0/dsp/commit/58a9d0c1f99f2d4c7fc51b6dbe563447ec60120f.patch?full_index=1"; + hash = "sha256-7WgJegDL9sVCRnRwm/f1ZZl2eiuRT5oAQaYoDLjEoqs="; + }) + ]; + buildInputs = [ fftw zita-convolver diff --git a/third_party/nixpkgs/pkgs/by-name/dv/dvdstyler/package.nix b/third_party/nixpkgs/pkgs/by-name/dv/dvdstyler/package.nix index 7ec4658aee..55c2c27198 100644 --- a/third_party/nixpkgs/pkgs/by-name/dv/dvdstyler/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/dv/dvdstyler/package.nix @@ -7,7 +7,7 @@ , docbook-xsl-nons , dvdauthor , dvdplusrwtools -, ffmpeg_7 +, ffmpeg , flex , fontconfig , gettext @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { cdrtools dvdauthor dvdplusrwtools - ffmpeg_7 + ffmpeg fontconfig glib libexif diff --git a/third_party/nixpkgs/pkgs/by-name/ea/eask-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/ea/eask-cli/package.nix index 745830c0d5..d6f2567c00 100644 --- a/third_party/nixpkgs/pkgs/by-name/ea/eask-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ea/eask-cli/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "eask-cli"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "emacs-eask"; repo = "cli"; rev = version; - hash = "sha256-bTig1g9G/2NYlvlo6TBMIQjmCqaC8AOwvTiPDbLv//Q="; + hash = "sha256-FgmeAsqbnlw7yOMslAJnZWuG3nDDjcXlS2pI3X9x1PA="; }; - npmDepsHash = "sha256-JEk+dbLndXn8Bfz9HZWzY9Blk2ZyEf5AH6M4+X1uwaM="; + npmDepsHash = "sha256-IgL58W4j3xbtVpGz316DpnYPyZD5dmDvg7Z1Irr3jig="; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/by-name/ea/easytier/package.nix b/third_party/nixpkgs/pkgs/by-name/ea/easytier/package.nix index 68f63261c8..c994c1eec6 100644 --- a/third_party/nixpkgs/pkgs/by-name/ea/easytier/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ea/easytier/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "easytier"; - version = "2.0.0"; + version = "2.0.3"; src = fetchFromGitHub { owner = "EasyTier"; repo = "EasyTier"; rev = "refs/tags/v${version}"; - hash = "sha256-Qej6g9oxY6Wvv7jbyK9TN7QE7sfrdref7XPj10mSKUg="; + hash = "sha256-0bS2VzddRZcFGmHugR0yXHjHqz06tpL4+IhQ6ReaU4Y="; }; - cargoHash = "sha256-UegTL9ZdqLQYtcg8sJSGkie3ezt9OFMX0iVm/B1D91I="; + cargoHash = "sha256-AkEgEymgq2asxT4oR+NtGe8bUEPRUskVvwIJYrCD7xs="; nativeBuildInputs = [ protobuf ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ed/edk2/package.nix b/third_party/nixpkgs/pkgs/by-name/ed/edk2/package.nix index b4919f27ef..e986e42bd4 100644 --- a/third_party/nixpkgs/pkgs/by-name/ed/edk2/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ed/edk2/package.nix @@ -63,16 +63,18 @@ edk2 = stdenv.mkDerivation { }) ]; + # EDK2 is currently working on OpenSSL 3.3.x support. Use buildpackages.openssl again, + # when "https://github.com/tianocore/edk2/pull/6167" is merged. postPatch = '' # We don't want EDK2 to keep track of OpenSSL, they're frankly bad at it. rm -r CryptoPkg/Library/OpensslLib/openssl mkdir -p CryptoPkg/Library/OpensslLib/openssl ( cd CryptoPkg/Library/OpensslLib/openssl - tar --strip-components=1 -xf ${buildPackages.openssl.src} + tar --strip-components=1 -xf ${buildPackages.openssl_3.src} # Apply OpenSSL patches. - ${lib.pipe buildPackages.openssl.patches [ + ${lib.pipe buildPackages.openssl_3.patches [ (builtins.filter ( patch: !builtins.elem (baseNameOf patch) [ diff --git a/third_party/nixpkgs/pkgs/by-name/ei/eiwd/package.nix b/third_party/nixpkgs/pkgs/by-name/ei/eiwd/package.nix index ed59d32299..c2d54101db 100644 --- a/third_party/nixpkgs/pkgs/by-name/ei/eiwd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ei/eiwd/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "eiwd"; - version = "2.16-1"; + version = "2.22-1"; src = fetchFromGitHub { owner = "illiliti"; repo = "eiwd"; rev = finalAttrs.version; - hash = "sha256-TQA9aVdXGX2hje7lRQ8T9QDpSTYGpB5cIDlNYsUg/dM="; + hash = "sha256-rmkXR4RZbtD6lh8cGrHLWVGTw4fQqP9+Z9qaftG1ld0="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/by-name/el/elektroid/package.nix b/third_party/nixpkgs/pkgs/by-name/el/elektroid/package.nix index 75b6c83295..467f7987d8 100644 --- a/third_party/nixpkgs/pkgs/by-name/el/elektroid/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/el/elektroid/package.nix @@ -14,7 +14,7 @@ }: let - version = "3.0.1"; + version = "3.1"; in stdenv.mkDerivation { inherit version; @@ -25,7 +25,7 @@ stdenv.mkDerivation { owner = "dagargo"; repo = "elektroid"; rev = version; - hash = "sha256-Qv4jvk6N0IMgYGCPWNYGDZJKGA+UPzhHeYfSrkq5hy4="; + hash = "sha256-YJcvJlnRUhwjQ6P3jgjyDtoJhuije1uY77mGNGZure0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/en/en-croissant/package.nix b/third_party/nixpkgs/pkgs/by-name/en/en-croissant/package.nix index 81489925d1..71b2de6659 100644 --- a/third_party/nixpkgs/pkgs/by-name/en/en-croissant/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/en/en-croissant/package.nix @@ -14,7 +14,7 @@ openssl, libsoup, - webkitgtk, + webkitgtk_4_0, gst_all_1, darwin, }: @@ -66,7 +66,7 @@ buildRustPackage rec { lib.optionals stdenv.hostPlatform.isLinux [ openssl libsoup - webkitgtk + webkitgtk_4_0 gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-bad diff --git a/third_party/nixpkgs/pkgs/by-name/en/ente-auth/package.nix b/third_party/nixpkgs/pkgs/by-name/en/ente-auth/package.nix index e39d908668..268ffdf2b5 100644 --- a/third_party/nixpkgs/pkgs/by-name/en/ente-auth/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/en/ente-auth/package.nix @@ -2,7 +2,7 @@ lib, flutter324, fetchFromGitHub, - webkitgtk, + webkitgtk_4_0, sqlite, libayatana-appindicator, makeDesktopItem, @@ -52,7 +52,7 @@ flutter324.buildFlutterApplication rec { ]; buildInputs = [ - webkitgtk + webkitgtk_4_0 sqlite libayatana-appindicator ]; diff --git a/third_party/nixpkgs/pkgs/by-name/er/errands/package.nix b/third_party/nixpkgs/pkgs/by-name/er/errands/package.nix index 8886e2fa3d..d983a41b29 100644 --- a/third_party/nixpkgs/pkgs/by-name/er/errands/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/er/errands/package.nix @@ -17,7 +17,7 @@ }: python3Packages.buildPythonApplication rec { pname = "errands"; - version = "46.2.4"; + version = "46.2.5"; pyproject = false; @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { owner = "mrvladus"; repo = "Errands"; rev = "refs/tags/${version}"; - hash = "sha256-qk3CbxMj3PiuK7KkgtmH/A549mpNd70gYAW56P5nmu8="; + hash = "sha256-peIsTSmqjLHdmd5Xrqh6XKXjEbwhNE+FOH/pEY0QqdI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/eslint_d/default.nix b/third_party/nixpkgs/pkgs/by-name/es/eslint_d/package.nix similarity index 58% rename from third_party/nixpkgs/pkgs/development/tools/eslint_d/default.nix rename to third_party/nixpkgs/pkgs/by-name/es/eslint_d/package.nix index 6cd40d882f..6e6607372d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/eslint_d/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/es/eslint_d/package.nix @@ -1,20 +1,22 @@ -{ lib, buildNpmPackage, fetchFromGitHub }: +{ lib, buildNpmPackage, fetchFromGitHub, eslint_d, testers }: buildNpmPackage rec { pname = "eslint_d"; - version = "14.0.3"; + version = "14.1.1"; src = fetchFromGitHub { owner = "mantoni"; repo = "eslint_d.js"; rev = "v${version}"; - hash = "sha256-r0pb9qbWfyVUHuHrNhiYm+0zlF5WId3dH7QCubzZDts="; + hash = "sha256-r+AQFFzB3PhvER6oVHpqQiFuaHuT+2O8gL2zu8aCTbs="; }; - npmDepsHash = "sha256-0Db18y7MUnnnr8v+bBOUhGBCsZcZ9OGtGqSVH7/wYQc="; + npmDepsHash = "sha256-XOFRzGPrisXE8GyqVO5xms+o9OwA9w0y+uJkcdyX+z0="; dontNpmBuild = true; + passthru.tests.version = testers.testVersion { package = eslint_d; version = src.rev; }; + meta = with lib; { description = "Makes eslint the fastest linter on the planet"; homepage = "https://github.com/mantoni/eslint_d.js"; diff --git a/third_party/nixpkgs/pkgs/by-name/eu/eudev/package.nix b/third_party/nixpkgs/pkgs/by-name/eu/eudev/package.nix index 7e407aa475..089e811ad8 100644 --- a/third_party/nixpkgs/pkgs/by-name/eu/eudev/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/eu/eudev/package.nix @@ -6,6 +6,7 @@ , kmod , pkg-config , util-linux +, testers }: stdenv.mkDerivation (finalAttrs: { @@ -56,6 +57,10 @@ stdenv.mkDerivation (finalAttrs: { "udevrulesdir=$(out)/var/lib/udev/rules.d" ]; + passthru.tests = { + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + meta = { homepage = "https://github.com/eudev-project/eudev"; description = "Fork of udev with the aim of isolating it from init"; @@ -80,6 +85,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/eudev-project/eudev/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ raskin AndersonTorres ]; + pkgConfigModules = [ "libudev" "udev" ]; inherit (kmod.meta) platforms; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/ex/exo/package.nix b/third_party/nixpkgs/pkgs/by-name/ex/exo/package.nix index 1880b3386e..fb2bfbe7b1 100644 --- a/third_party/nixpkgs/pkgs/by-name/ex/exo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ex/exo/package.nix @@ -6,14 +6,14 @@ }: python3Packages.buildPythonApplication { pname = "exo"; - version = "0-unstable-2024-10-06"; + version = "0-unstable-2024-10-09"; pyproject = true; src = fetchFromGitHub { owner = "exo-explore"; repo = "exo"; - rev = "7b2a523fd1e5f1281d89bc1f664a29dc2003b787"; - hash = "sha256-o4tNbU9oa7WsAQ6eiTHqQVhliXbG/Y8d7PeH2TTWgGk="; + rev = "c1a26cd7fa447b2802a4bececfd7cb9d316c0600"; + hash = "sha256-jtcfGmk03Yf5IaswIvi6N9oMXzNPYlJBf4WMLkogUVo="; }; build-system = with python3Packages; [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/by-name/fa/fastcdr/package.nix b/third_party/nixpkgs/pkgs/by-name/fa/fastcdr/package.nix index 4d342c6bbb..3e8678a8a7 100644 --- a/third_party/nixpkgs/pkgs/by-name/fa/fastcdr/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fa/fastcdr/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastcdr"; - version = "2.2.4"; + version = "2.2.5"; src = fetchFromGitHub { owner = "eProsima"; repo = "Fast-CDR"; rev = "v${finalAttrs.version}"; - hash = "sha256-R+StDJVqT0ktbr4cQBwEAPmju+pmBvxonezsIsPwmgc="; + hash = "sha256-bJ8/7k6+YzVsklppCoI7+pS5wVvpSDPLGrrcMejCj3g="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/by-name/fc/fcp/0001-update-Cargo.lock.patch b/third_party/nixpkgs/pkgs/by-name/fc/fcp/0001-update-Cargo.lock.patch new file mode 100644 index 0000000000..0119e5c20a --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/fc/fcp/0001-update-Cargo.lock.patch @@ -0,0 +1,889 @@ +From ffb3ab5b45301a7848ccd53ab077e37d0e8382c3 Mon Sep 17 00:00:00 2001 +From: wxt <3264117476@qq.com> +Date: Sat, 28 Sep 2024 10:09:27 +0800 +Subject: [PATCH] update Cargo.lock + +--- + Cargo.lock | 465 +++++++++++++++++++++++++++++------------------------ + 1 file changed, 254 insertions(+), 211 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 6829f6f..8ae6c05 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -2,6 +2,15 @@ + # It is not intended for manual editing. + version = 3 + ++[[package]] ++name = "aho-corasick" ++version = "1.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" ++dependencies = [ ++ "memchr", ++] ++ + [[package]] + name = "atty" + version = "0.2.14" +@@ -15,48 +24,42 @@ dependencies = [ + + [[package]] + name = "autocfg" +-version = "1.0.1" ++version = "1.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" ++checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + + [[package]] + name = "bitflags" +-version = "1.2.1" ++version = "1.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + + [[package]] +-name = "bstr" +-version = "0.2.16" ++name = "bumpalo" ++version = "3.16.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279" +-dependencies = [ +- "lazy_static", +- "memchr", +- "regex-automata", +- "serde", +-] ++checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + + [[package]] +-name = "bumpalo" +-version = "3.7.0" ++name = "byteorder" ++version = "1.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" ++checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + + [[package]] + name = "cast" +-version = "0.2.7" ++version = "0.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a" +-dependencies = [ +- "rustc_version", +-] ++checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + + [[package]] + name = "cc" +-version = "1.0.69" ++version = "1.1.22" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" ++checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0" ++dependencies = [ ++ "shlex", ++] + + [[package]] + name = "cfg-if" +@@ -66,9 +69,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + + [[package]] + name = "clap" +-version = "2.33.3" ++version = "2.34.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" ++checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" + dependencies = [ + "bitflags", + "textwrap", +@@ -77,16 +80,16 @@ dependencies = [ + + [[package]] + name = "criterion" +-version = "0.3.4" ++version = "0.3.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ab327ed7354547cc2ef43cbe20ef68b988e70b4b593cbd66a2a61733123a3d23" ++checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" + dependencies = [ + "atty", + "cast", + "clap", + "criterion-plot", + "csv", +- "itertools 0.10.1", ++ "itertools", + "lazy_static", + "num-traits", + "oorandom", +@@ -103,65 +106,45 @@ dependencies = [ + + [[package]] + name = "criterion-plot" +-version = "0.4.3" ++version = "0.4.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d" ++checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" + dependencies = [ + "cast", +- "itertools 0.9.0", +-] +- +-[[package]] +-name = "crossbeam-channel" +-version = "0.5.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" +-dependencies = [ +- "cfg-if", +- "crossbeam-utils", ++ "itertools", + ] + + [[package]] + name = "crossbeam-deque" +-version = "0.8.0" ++version = "0.8.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" ++checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" + dependencies = [ +- "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", + ] + + [[package]] + name = "crossbeam-epoch" +-version = "0.9.5" ++version = "0.9.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" ++checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" + dependencies = [ +- "cfg-if", + "crossbeam-utils", +- "lazy_static", +- "memoffset", +- "scopeguard", + ] + + [[package]] + name = "crossbeam-utils" +-version = "0.8.5" ++version = "0.8.20" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" +-dependencies = [ +- "cfg-if", +- "lazy_static", +-] ++checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + + [[package]] + name = "csv" +-version = "1.1.6" ++version = "1.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" ++checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" + dependencies = [ +- "bstr", + "csv-core", + "itoa", + "ryu", +@@ -170,9 +153,9 @@ dependencies = [ + + [[package]] + name = "csv-core" +-version = "0.1.10" ++version = "0.1.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" ++checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" + dependencies = [ + "memchr", + ] +@@ -192,9 +175,9 @@ dependencies = [ + + [[package]] + name = "either" +-version = "1.6.1" ++version = "1.13.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" ++checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + + [[package]] + name = "fcp" +@@ -208,9 +191,9 @@ dependencies = [ + + [[package]] + name = "getrandom" +-version = "0.2.3" ++version = "0.2.15" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" ++checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" + dependencies = [ + "cfg-if", + "libc", +@@ -219,9 +202,9 @@ dependencies = [ + + [[package]] + name = "half" +-version = "1.7.1" ++version = "1.8.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3" ++checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" + + [[package]] + name = "hermit-abi" +@@ -234,78 +217,66 @@ dependencies = [ + + [[package]] + name = "itertools" +-version = "0.9.0" ++version = "0.10.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" +-dependencies = [ +- "either", +-] +- +-[[package]] +-name = "itertools" +-version = "0.10.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" ++checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" + dependencies = [ + "either", + ] + + [[package]] + name = "itoa" +-version = "0.4.7" ++version = "1.0.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" ++checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + + [[package]] + name = "js-sys" +-version = "0.3.51" ++version = "0.3.70" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "83bdfbace3a0e81a4253f73b49e960b053e396a11012cbd49b9b74d6a2b67062" ++checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" + dependencies = [ + "wasm-bindgen", + ] + + [[package]] + name = "lazy_static" +-version = "1.4.0" ++version = "1.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + + [[package]] + name = "libc" +-version = "0.2.98" ++version = "0.2.159" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790" ++checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" + + [[package]] + name = "log" +-version = "0.4.14" ++version = "0.4.22" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +-dependencies = [ +- "cfg-if", +-] ++checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + + [[package]] + name = "memchr" +-version = "2.4.0" ++version = "2.7.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" ++checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + + [[package]] + name = "memoffset" +-version = "0.6.4" ++version = "0.6.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" ++checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" + dependencies = [ + "autocfg", + ] + + [[package]] + name = "nix" +-version = "0.22.0" ++version = "0.22.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cf1e25ee6b412c2a1e3fcb6a4499a5c1bfe7f43e014bdce9a6b6666e5aa2d187" ++checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf" + dependencies = [ + "bitflags", + "cc", +@@ -316,34 +287,30 @@ dependencies = [ + + [[package]] + name = "num-traits" +-version = "0.2.14" ++version = "0.2.19" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" ++checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" + dependencies = [ + "autocfg", + ] + + [[package]] +-name = "num_cpus" +-version = "1.13.0" ++name = "once_cell" ++version = "1.19.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +-dependencies = [ +- "hermit-abi", +- "libc", +-] ++checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + + [[package]] + name = "oorandom" +-version = "11.1.3" ++version = "11.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" ++checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" + + [[package]] + name = "plotters" +-version = "0.3.1" ++version = "0.3.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "32a3fd9ec30b9749ce28cd91f255d569591cdf937fe280c312143e3c4bad6f2a" ++checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747" + dependencies = [ + "num-traits", + "plotters-backend", +@@ -354,53 +321,55 @@ dependencies = [ + + [[package]] + name = "plotters-backend" +-version = "0.3.2" ++version = "0.3.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d88417318da0eaf0fdcdb51a0ee6c3bed624333bff8f946733049380be67ac1c" ++checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a" + + [[package]] + name = "plotters-svg" +-version = "0.3.1" ++version = "0.3.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "521fa9638fa597e1dc53e9412a4f9cefb01187ee1f7413076f9e6749e2885ba9" ++checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670" + dependencies = [ + "plotters-backend", + ] + + [[package]] + name = "ppv-lite86" +-version = "0.2.10" ++version = "0.2.20" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" ++checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" ++dependencies = [ ++ "zerocopy", ++] + + [[package]] + name = "proc-macro2" +-version = "1.0.27" ++version = "1.0.86" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038" ++checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" + dependencies = [ +- "unicode-xid", ++ "unicode-ident", + ] + + [[package]] + name = "quote" +-version = "1.0.9" ++version = "1.0.37" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" ++checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" + dependencies = [ + "proc-macro2", + ] + + [[package]] + name = "rand" +-version = "0.8.4" ++version = "0.8.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" ++checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" + dependencies = [ + "libc", + "rand_chacha", + "rand_core", +- "rand_hc", + ] + + [[package]] +@@ -415,22 +384,13 @@ dependencies = [ + + [[package]] + name = "rand_core" +-version = "0.6.3" ++version = "0.6.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" ++checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" + dependencies = [ + "getrandom", + ] + +-[[package]] +-name = "rand_hc" +-version = "0.3.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" +-dependencies = [ +- "rand_core", +-] +- + [[package]] + name = "rand_pcg" + version = "0.3.1" +@@ -442,64 +402,58 @@ dependencies = [ + + [[package]] + name = "rayon" +-version = "1.5.1" ++version = "1.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" ++checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" + dependencies = [ +- "autocfg", +- "crossbeam-deque", + "either", + "rayon-core", + ] + + [[package]] + name = "rayon-core" +-version = "1.9.1" ++version = "1.12.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" ++checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" + dependencies = [ +- "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", +- "lazy_static", +- "num_cpus", + ] + + [[package]] + name = "regex" +-version = "1.5.4" ++version = "1.10.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" ++checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" + dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-automata", + "regex-syntax", + ] + + [[package]] + name = "regex-automata" +-version = "0.1.10" ++version = "0.4.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" ++checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" ++dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++] + + [[package]] + name = "regex-syntax" +-version = "0.6.25" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +- +-[[package]] +-name = "rustc_version" +-version = "0.4.0" ++version = "0.8.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +-dependencies = [ +- "semver", +-] ++checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + + [[package]] + name = "ryu" +-version = "1.0.5" ++version = "1.0.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" ++checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + + [[package]] + name = "same-file" +@@ -510,32 +464,20 @@ dependencies = [ + "winapi-util", + ] + +-[[package]] +-name = "scopeguard" +-version = "1.1.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +- +-[[package]] +-name = "semver" +-version = "1.0.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5f3aac57ee7f3272d8395c6e4f502f434f0e289fcd62876f70daa008c20dcabe" +- + [[package]] + name = "serde" +-version = "1.0.126" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03" ++checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" + dependencies = [ + "serde_derive", + ] + + [[package]] + name = "serde_cbor" +-version = "0.11.1" ++version = "0.11.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622" ++checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" + dependencies = [ + "half", + "serde", +@@ -543,9 +485,9 @@ dependencies = [ + + [[package]] + name = "serde_derive" +-version = "1.0.126" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43" ++checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" + dependencies = [ + "proc-macro2", + "quote", +@@ -554,24 +496,31 @@ dependencies = [ + + [[package]] + name = "serde_json" +-version = "1.0.64" ++version = "1.0.128" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" ++checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" + dependencies = [ + "itoa", ++ "memchr", + "ryu", + "serde", + ] + ++[[package]] ++name = "shlex" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" ++ + [[package]] + name = "syn" +-version = "1.0.73" ++version = "2.0.79" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7" ++checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" + dependencies = [ + "proc-macro2", + "quote", +- "unicode-xid", ++ "unicode-ident", + ] + + [[package]] +@@ -594,53 +543,53 @@ dependencies = [ + ] + + [[package]] +-name = "unicode-width" +-version = "0.1.8" ++name = "unicode-ident" ++version = "1.0.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" ++checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + + [[package]] +-name = "unicode-xid" +-version = "0.2.2" ++name = "unicode-width" ++version = "0.1.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" ++checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" + + [[package]] + name = "walkdir" +-version = "2.3.2" ++version = "2.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" ++checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" + dependencies = [ + "same-file", +- "winapi", + "winapi-util", + ] + + [[package]] + name = "wasi" +-version = "0.10.2+wasi-snapshot-preview1" ++version = "0.11.0+wasi-snapshot-preview1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" ++checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + + [[package]] + name = "wasm-bindgen" +-version = "0.2.74" ++version = "0.2.93" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd" ++checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" + dependencies = [ + "cfg-if", ++ "once_cell", + "wasm-bindgen-macro", + ] + + [[package]] + name = "wasm-bindgen-backend" +-version = "0.2.74" ++version = "0.2.93" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900" ++checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" + dependencies = [ + "bumpalo", +- "lazy_static", + "log", ++ "once_cell", + "proc-macro2", + "quote", + "syn", +@@ -649,9 +598,9 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-macro" +-version = "0.2.74" ++version = "0.2.93" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4" ++checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" + dependencies = [ + "quote", + "wasm-bindgen-macro-support", +@@ -659,9 +608,9 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-macro-support" +-version = "0.2.74" ++version = "0.2.93" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97" ++checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" + dependencies = [ + "proc-macro2", + "quote", +@@ -672,15 +621,15 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-shared" +-version = "0.2.74" ++version = "0.2.93" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f" ++checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" + + [[package]] + name = "web-sys" +-version = "0.3.51" ++version = "0.3.70" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e828417b379f3df7111d3a2a9e5753706cae29c41f7c4029ee9fd77f3e09e582" ++checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" + dependencies = [ + "js-sys", + "wasm-bindgen", +@@ -704,11 +653,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + + [[package]] + name = "winapi-util" +-version = "0.1.5" ++version = "0.1.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" ++checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" + dependencies = [ +- "winapi", ++ "windows-sys", + ] + + [[package]] +@@ -716,3 +665,97 @@ name = "winapi-x86_64-pc-windows-gnu" + version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++ ++[[package]] ++name = "windows-sys" ++version = "0.59.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" ++dependencies = [ ++ "windows-targets", ++] ++ ++[[package]] ++name = "windows-targets" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" ++dependencies = [ ++ "windows_aarch64_gnullvm", ++ "windows_aarch64_msvc", ++ "windows_i686_gnu", ++ "windows_i686_gnullvm", ++ "windows_i686_msvc", ++ "windows_x86_64_gnu", ++ "windows_x86_64_gnullvm", ++ "windows_x86_64_msvc", ++] ++ ++[[package]] ++name = "windows_aarch64_gnullvm" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" ++ ++[[package]] ++name = "windows_aarch64_msvc" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" ++ ++[[package]] ++name = "windows_i686_gnu" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" ++ ++[[package]] ++name = "windows_i686_gnullvm" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" ++ ++[[package]] ++name = "windows_i686_msvc" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" ++ ++[[package]] ++name = "windows_x86_64_gnu" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" ++ ++[[package]] ++name = "windows_x86_64_gnullvm" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" ++ ++[[package]] ++name = "windows_x86_64_msvc" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" ++ ++[[package]] ++name = "zerocopy" ++version = "0.7.35" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" ++dependencies = [ ++ "byteorder", ++ "zerocopy-derive", ++] ++ ++[[package]] ++name = "zerocopy-derive" ++version = "0.7.35" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] +-- +2.46.0 + diff --git a/third_party/nixpkgs/pkgs/by-name/fc/fcp/package.nix b/third_party/nixpkgs/pkgs/by-name/fc/fcp/package.nix new file mode 100644 index 0000000000..e2ca5ee7af --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/fc/fcp/package.nix @@ -0,0 +1,53 @@ +{ + expect, + fetchFromGitHub, + lib, + rustPlatform, + stdenv, + fetchpatch, +}: + +rustPlatform.buildRustPackage rec { + pname = "fcp"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "svetlitski"; + repo = "fcp"; + rev = "refs/tags/v${version}"; + sha256 = "0f242n8w88rikg1srimdifadhggrb2r1z0g65id60ahb4bjm8a0x"; + }; + + cargoPatches = [ + (fetchpatch { + url = "https://github.com/Svetlitski/fcp/commit/1988f88be54a507b804b037cb3887fecf11bb571.patch"; + hash = "sha256-fafpy1tviT1rV+jv1Yxg6xEsFZ9qXWQi5LykagDA5xI="; + }) + (fetchpatch { + url = "https://github.com/Svetlitski/fcp/commit/89bcfc9aa1055dcf541da7a6477ffd3107023f48.patch"; + hash = "sha256-NJ9MMeWf6Ywu+p5uDSWWpAcb01PoMbuSAZ3Qxl9jEaY="; + }) + ./0001-update-Cargo.lock.patch + ]; + + cargoHash = "sha256-wFXvaARflHsT1xz3muC/BPRmhnXEEIk2pBsu87E7Wo8="; + + nativeBuildInputs = [ expect ]; + + # character_device fails with "File name too long" on darwin + doCheck = !stdenv.hostPlatform.isDarwin; + + postPatch = '' + patchShebangs tests/*.exp + ''; + + meta = { + description = "Significantly faster alternative to the classic Unix cp(1) command"; + homepage = "https://github.com/svetlitski/fcp"; + changelog = "https://github.com/svetlitski/fcp/releases/tag/v${version}"; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ figsoda ]; + mainProgram = "fcp"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/fe/feather/package.nix b/third_party/nixpkgs/pkgs/by-name/fe/feather/package.nix index 643775892b..ea4c5cfb74 100644 --- a/third_party/nixpkgs/pkgs/by-name/fe/feather/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fe/feather/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "feather"; - version = "2.6.8"; + version = "2.7.0"; src = fetchFromGitHub { owner = "feather-wallet"; repo = "feather"; rev = finalAttrs.version; - hash = "sha256-l1kyNpUIqezMfInhrKgnTnArqeSjvhBwdqVi0aUlKF8="; + hash = "sha256-CwydKX8cCtmrUSLUHNCDOteVmkjzj0zMHgwUyrWrWm8="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/by-name/fe/febio-studio/package.nix b/third_party/nixpkgs/pkgs/by-name/fe/febio-studio/package.nix index 5897fae85a..b960541357 100644 --- a/third_party/nixpkgs/pkgs/by-name/fe/febio-studio/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fe/febio-studio/package.nix @@ -16,7 +16,7 @@ tetgenSupport ? true, tetgen, ffmpegSupport ? true, - ffmpeg_7, + ffmpeg, dicomSupport ? false, dcmtk, withModelRepo ? true, @@ -75,7 +75,7 @@ stdenv'.mkDerivation (finalAttrs: { libssh ] ++ lib.optional tetgenSupport tetgen - ++ lib.optional ffmpegSupport ffmpeg_7 + ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional dicomSupport dcmtk; meta = { diff --git a/third_party/nixpkgs/pkgs/by-name/fe/felix-fm/package.nix b/third_party/nixpkgs/pkgs/by-name/fe/felix-fm/package.nix index 7b938a93c0..ff704f6d27 100644 --- a/third_party/nixpkgs/pkgs/by-name/fe/felix-fm/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fe/felix-fm/package.nix @@ -1,37 +1,28 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, fetchpatch2 -, pkg-config -, bzip2 -, libgit2 -, nix-update-script -, zlib -, zstd -, zoxide +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + bzip2, + libgit2, + nix-update-script, + zlib, + zstd, + zoxide, }: rustPlatform.buildRustPackage rec { pname = "felix"; - version = "2.13.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "kyoheiu"; repo = "felix"; - rev = "v${version}"; - hash = "sha256-7KuL3YkKhjcZSMSipbNITaA9/MGo54f3lz3fVOgy52s="; + rev = "refs/tags/v${version}"; + hash = "sha256-PcC0lZ41qTVE4V3VdwBq83qYfEJO3RJouuS2+bpcBfo="; }; - cargoPatches = [ - # https://github.com/kyoheiu/felix/pull/292 - (fetchpatch2 { - name = "update-cargo.lock-for-2.13.0.patch"; - url = "https://github.com/kyoheiu/felix/commit/5085b147103878ee8138d4fcf7b204223ba2c3eb.patch"; - hash = "sha256-7Bga9hcJCXExA/jnrR/HuZgOOVBbWs1tdTwxldcvdU8="; - }) - ]; - - cargoHash = "sha256-FX3AsahU5ZLMuylwo1jihP9G4Dw1SFv1oMXcuOqDTF8="; + cargoHash = "sha256-4tvk7H2CrTx9m1f0PLnNv+LWg6oIGTUfirRhIaz2lHo="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/by-name/fi/figma-linux/package.nix b/third_party/nixpkgs/pkgs/by-name/fi/figma-linux/package.nix index 159dcd85b8..29fd84f2f3 100644 --- a/third_party/nixpkgs/pkgs/by-name/fi/figma-linux/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fi/figma-linux/package.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "figma-linux"; - version = "0.11.4"; + version = "0.11.5"; src = fetchurl { url = "https://github.com/Figma-Linux/figma-linux/releases/download/v${finalAttrs.version}/figma-linux_${finalAttrs.version}_linux_amd64.deb"; - hash = "sha256-ukUsNgWOtIRe54vsmRdI62syjIPwSsgNV7kITCw0YUQ="; + hash = "sha256-6lFeiecliyuTdnUCCbLpoQWiu5k3OPHxb+VF17GtERo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/fo/font-manager/package.nix b/third_party/nixpkgs/pkgs/by-name/fo/font-manager/package.nix index aff880f06d..dc9b27fdd3 100644 --- a/third_party/nixpkgs/pkgs/by-name/fo/font-manager/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fo/font-manager/package.nix @@ -20,7 +20,7 @@ , wrapGAppsHook4 , gobject-introspection # withWebkit enables the "webkit" feature, also known as Google Fonts -, withWebkit ? true, glib-networking, libsoup, webkitgtk +, withWebkit ? true, glib-networking, libsoup_3, webkitgtk_6_0 }: stdenv.mkDerivation rec { @@ -58,8 +58,8 @@ stdenv.mkDerivation rec { adwaita-icon-theme ] ++ lib.optionals withWebkit [ glib-networking # for SSL so that Google Fonts can load - libsoup - webkitgtk + libsoup_3 + webkitgtk_6_0 ]; mesonFlags = [ diff --git a/third_party/nixpkgs/pkgs/by-name/fo/forgejo/generic.nix b/third_party/nixpkgs/pkgs/by-name/fo/forgejo/generic.nix index 8ca9a12e96..daef0e418e 100644 --- a/third_party/nixpkgs/pkgs/by-name/fo/forgejo/generic.nix +++ b/third_party/nixpkgs/pkgs/by-name/fo/forgejo/generic.nix @@ -1,5 +1,6 @@ { lts ? false , version +, rev ? "refs/tags/v${version}" , hash , npmDepsHash , vendorHash @@ -30,8 +31,7 @@ let domain = "codeberg.org"; owner = "forgejo"; repo = "forgejo"; - rev = "v${version}"; - inherit hash; + inherit rev hash; }; frontend = buildNpmPackage { @@ -156,8 +156,8 @@ buildGoModule rec { description = "Self-hosted lightweight software forge"; homepage = "https://forgejo.org"; changelog = "https://codeberg.org/forgejo/forgejo/releases/tag/${src.rev}"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ emilylange urandom bendlas adamcstephens ]; + license = if lib.versionAtLeast version "9.0.0" then lib.licenses.gpl3Plus else lib.licenses.mit; + maintainers = with lib.maintainers; [ emilylange urandom bendlas adamcstephens marie ]; broken = stdenv.hostPlatform.isDarwin; mainProgram = "gitea"; }; diff --git a/third_party/nixpkgs/pkgs/by-name/fo/forgejo/package.nix b/third_party/nixpkgs/pkgs/by-name/fo/forgejo/package.nix index 6632a8a365..67f96257b4 100644 --- a/third_party/nixpkgs/pkgs/by-name/fo/forgejo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fo/forgejo/package.nix @@ -1,8 +1,8 @@ import ./generic.nix { - version = "8.0.3"; - hash = "sha256-PvCWUiJIs9ktuJetPYZT0V8S8+OYahCDZiZQpvWWXhY="; - npmDepsHash = "sha256-E4eq4OompY8e+722PbSFCmcarpYBpO/n9X6GVU9AhDU="; - vendorHash = "sha256-4l4kscwesW/cR8mZjE3G9HcVm0d1ukxbtBY6RXYRi8k="; + version = "9.0.0"; + hash = "sha256-GzkuJ2aJ7I4/xDLLIrwcgXuInXoXzMWvQ7Z1mdGaOPw="; + npmDepsHash = "sha256-UFUNOR+ks3hDmT7uVEToX+rMmlFL6gQqigAxl6RP37Q="; + vendorHash = "sha256-j3BY6fEXCL82TDna80vjL25FDFLUhyMtmQW8d6GLQdk="; lts = false; nixUpdateExtraArgs = [ "--override-filename" diff --git a/third_party/nixpkgs/pkgs/by-name/fr/freeplane/package.nix b/third_party/nixpkgs/pkgs/by-name/fr/freeplane/package.nix index 83a59347f9..28c8f589a9 100644 --- a/third_party/nixpkgs/pkgs/by-name/fr/freeplane/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fr/freeplane/package.nix @@ -40,6 +40,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { gradleFlags = [ "-Dorg.gradle.java.home=${jdk}" "-x" "test" ]; + # share/freeplane/core/org.freeplane.core/META-INF doesn't + # always get generated with parallel building enabled + enableParallelBuilding = false; + preBuild = "mkdir -p freeplane/build"; gradleBuildTask = "build"; diff --git a/third_party/nixpkgs/pkgs/by-name/ft/ftgl/fix-warnings.patch b/third_party/nixpkgs/pkgs/by-name/ft/ftgl/fix-warnings.patch new file mode 100644 index 0000000000..7dea7e8fb0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ft/ftgl/fix-warnings.patch @@ -0,0 +1,39 @@ +diff --git a/src/FTContour.cpp b/src/FTContour.cpp +index c668d32..ef13576 100644 +--- a/src/FTContour.cpp ++++ b/src/FTContour.cpp +@@ -174,7 +174,7 @@ void FTContour::SetParity(int parity) + } + + +-FTContour::FTContour(FT_Vector* contour, char* tags, unsigned int n) ++FTContour::FTContour(FT_Vector* contour, unsigned char* tags, unsigned int n) + { + FTPoint prev, cur(contour[(n - 1) % n]), next(contour[0]); + double olddir, dir = atan2((next - cur).Y(), (next - cur).X()); +diff --git a/src/FTContour.h b/src/FTContour.h +index d2d187c..dc64e3a 100644 +--- a/src/FTContour.h ++++ b/src/FTContour.h +@@ -52,7 +52,7 @@ class FTContour + * @param pointTags + * @param numberOfPoints + */ +- FTContour(FT_Vector* contour, char* pointTags, unsigned int numberOfPoints); ++ FTContour(FT_Vector* contour, unsigned char* pointTags, unsigned int numberOfPoints); + + /** + * Destructor +diff --git a/src/FTVectoriser.cpp b/src/FTVectoriser.cpp +index 26e7da8..53d738e 100644 +--- a/src/FTVectoriser.cpp ++++ b/src/FTVectoriser.cpp +@@ -168,7 +168,7 @@ void FTVectoriser::ProcessContours() + for(int i = 0; i < ftContourCount; ++i) + { + FT_Vector* pointList = &outline.points[startIndex]; +- char* tagList = &outline.tags[startIndex]; ++ unsigned char* tagList = &outline.tags[startIndex]; + + endIndex = outline.contours[i]; + contourLength = (endIndex - startIndex) + 1; diff --git a/third_party/nixpkgs/pkgs/by-name/ft/ftgl/package.nix b/third_party/nixpkgs/pkgs/by-name/ft/ftgl/package.nix index ee2a3e2457..506a756ba2 100644 --- a/third_party/nixpkgs/pkgs/by-name/ft/ftgl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ft/ftgl/package.nix @@ -8,12 +8,8 @@ , libGL , libGLU , pkg-config -, darwin }: -let - inherit (darwin.apple_sdk.frameworks) OpenGL GLUT; -in stdenv.mkDerivation rec { pname = "ftgl"; version = "2.4.0"; @@ -33,6 +29,10 @@ stdenv.mkDerivation rec { --replace ' -dylib_file $GL_DYLIB: $GL_DYLIB' "" ''; + patches = [ + ./fix-warnings.patch + ]; + nativeBuildInputs = [ autoreconfHook doxygen @@ -40,24 +40,13 @@ stdenv.mkDerivation rec { ]; buildInputs = [ freetype - ] ++ (if stdenv.hostPlatform.isDarwin then [ - OpenGL - GLUT - ] else [ libGL libGLU libglut - ]); - - configureFlags = [ - "--with-ft-prefix=${lib.getDev freetype}" ]; - enableParallelBuilding = true; - postInstall = '' - install -Dm644 src/FTSize.h -t ${placeholder "out"}/include/FTGL - install -Dm644 src/FTFace.h -t ${placeholder "out"}/include/FTGL + install -Dm644 src/FTSize.h src/FTFace.h -t $out/include/FTGL ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/by-name/ft/ftjam/package.nix b/third_party/nixpkgs/pkgs/by-name/ft/ftjam/package.nix index 7bfdc5f804..b78215472a 100644 --- a/third_party/nixpkgs/pkgs/by-name/ft/ftjam/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ft/ftjam/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { version = "2.5.2"; src = fetchurl { - url = "https://downloads.sourceforge.net/project/freetype/ftjam/${finalAttrs.version}/ftjam-${finalAttrs.version}.tar.bz2"; + url = "mirror://sourceforge/project/freetype/ftjam/${finalAttrs.version}/ftjam-${finalAttrs.version}.tar.bz2"; hash = "sha256-6JdzUAqSkS3pGOn+v/q+S2vOedaa8ZRDX04DK4ptZqM="; }; diff --git a/third_party/nixpkgs/pkgs/by-name/ga/gapless/package.nix b/third_party/nixpkgs/pkgs/by-name/ga/gapless/package.nix index feacd598c9..1f42ef3e89 100644 --- a/third_party/nixpkgs/pkgs/by-name/ga/gapless/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ga/gapless/package.nix @@ -15,14 +15,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "gapless"; - version = "3.8.1"; + version = "4.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "neithern"; repo = "g4music"; rev = "v${finalAttrs.version}"; - hash = "sha256-pABiz7AIfkuB2Z0ErZoHfIrgdllO83ucbUFNjZ9wc+o="; + hash = "sha256-t9YthW8HZz2kXYPvidVRy7GVB2cRGEOCrXZtIpW65MA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/ga/gat/package.nix b/third_party/nixpkgs/pkgs/by-name/ga/gat/package.nix index 577a1ea1ca..a712114277 100644 --- a/third_party/nixpkgs/pkgs/by-name/ga/gat/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ga/gat/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gat"; - version = "0.18.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "koki-develop"; repo = "gat"; rev = "refs/tags/v${version}"; - hash = "sha256-QIC3SvuCu8HIwxieNnSsbBa8nTL5aL46eUDpti2gmJU="; + hash = "sha256-wbtTqCSvNGqlliAKdKZyTCeenmcorqQKROAOc4NJal4="; }; vendorHash = "sha256-xLoLLn9lsEZ+SjIbVRzhwM9mXkltfA0Zoiz1T7hpTEc="; diff --git a/third_party/nixpkgs/pkgs/by-name/ge/gerrit/package.nix b/third_party/nixpkgs/pkgs/by-name/ge/gerrit/package.nix index c837ce4979..df65ab9837 100644 --- a/third_party/nixpkgs/pkgs/by-name/ge/gerrit/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ge/gerrit/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gerrit"; - version = "3.10.1"; + version = "3.10.2"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war"; - hash = "sha256-gWONjpn/YrSHtabacI+7Ao9pGeqcialRaaca2ct5oDM="; + hash = "sha256-jsyL7j4ENzHVi07Uii0ouWXF3hkoGrq3NJi8fB1kj8o="; }; buildCommand = '' diff --git a/third_party/nixpkgs/pkgs/by-name/gg/gg-jj/package.nix b/third_party/nixpkgs/pkgs/by-name/gg/gg-jj/package.nix deleted file mode 100644 index 9ca0383c17..0000000000 --- a/third_party/nixpkgs/pkgs/by-name/gg/gg-jj/package.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ - rustPlatform, - callPackage, - pkg-config, - lib, - fetchFromGitHub, - libayatana-appindicator, - openssl, - webkitgtk_4_1, -}: - -rustPlatform.buildRustPackage rec { - pname = "gg-jj"; - version = "0.20.0"; - - src = fetchFromGitHub { - owner = "gulbanana"; - repo = "gg"; - rev = "refs/tags/v${version}"; - hash = "sha256-xOi/AUlH0FeenTXz3hsDYixCEl+yr22PGy6Ow4TKxY0="; - }; - - sourceRoot = "${src.name}/src-tauri"; - - webui = callPackage ./webui.nix { - inherit - src - pname - version - meta - ; - }; - - env = { - OPENSSL_NO_VENDOR = 1; - }; - - buildInputs = [ - webkitgtk_4_1 - openssl - ]; - - nativeBuildInputs = [ - pkg-config - ]; - - cargoHash = "sha256-u3SkRA7327ZwqEnB+Xq2JDbI0k5HfeKzV17dvQ8B6xk="; - - postPatch = '' - buildRoot=$(pwd) - pushd $cargoDepsCopy/libappindicator-sys - oldHash=$(sha256sum src/lib.rs | cut -d " " -f 1) - substituteInPlace src/lib.rs \ - --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" - substituteInPlace .cargo-checksum.json \ - --replace-fail $oldHash $(sha256sum src/lib.rs | cut -d " " -f 1) - popd - - pushd $cargoDepsCopy/jj-cli - oldHash=$(sha256sum build.rs | cut -d " " -f 1) - substituteInPlace build.rs \ - --replace-fail 'let path = std::env::var("CARGO_MANIFEST_DIR").unwrap();' "let path = \"$buildRoot\";" - substituteInPlace .cargo-checksum.json \ - --replace-fail $oldHash $(sha256sum build.rs | cut -d " " -f 1) - popd - - substituteInPlace ./tauri.conf.json \ - --replace-fail '"frontendDist": "../dist"' '"frontendDist": "${webui}"' \ - --replace-fail '"beforeBuildCommand": "npm run build"' '"beforeBuildCommand": ""' - ''; - - meta = { - homepage = "https://github.com/gulbanana/gg"; - changelog = "https://github.com/gulbanana/gg/releases/tag/v${version}"; - description = "GUI for jj users"; - maintainers = with lib.maintainers; [ bot-wxt1221 ]; - mainProgram = "gg"; - license = lib.licenses.apsl20; - }; -} diff --git a/third_party/nixpkgs/pkgs/by-name/gg/gg-jj/webui.nix b/third_party/nixpkgs/pkgs/by-name/gg/gg-jj/webui.nix deleted file mode 100644 index 8d5ef5260c..0000000000 --- a/third_party/nixpkgs/pkgs/by-name/gg/gg-jj/webui.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - version, - src, - pname, - pnpm, - meta, - buildNpmPackage, -}: - -buildNpmPackage { - inherit version src meta; - pname = "${pname}-webui"; - - npmDepsHash = "sha256-oHBFuX65D/FgnGa03jjpIKAdH8Q4c2NrpD64bhfe720="; - - buildPhase = '' - runHook preBuild - - node --max_old_space_size=1024000 ./node_modules/vite/bin/vite.js build - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - cp -r dist $out - - runHook postInstall - ''; -} diff --git a/third_party/nixpkgs/pkgs/by-name/gi/git-branchstack/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-branchstack/package.nix new file mode 100644 index 0000000000..e0cdfaa884 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gi/git-branchstack/package.nix @@ -0,0 +1,30 @@ +{ + lib, + fetchPypi, + python3Packages, +}: + +let + self = python3Packages.buildPythonApplication { + pname = "git-branchstack"; + version = "0.2.0"; + + src = fetchPypi { + pname = "git-branchstack"; + inherit (self) version; + hash = "sha256-gja93LOcVCQ6l+Cygvsm+3uomvxtvUl6t23GIb/tKyQ="; + }; + + dependencies = with python3Packages; [ + git-revise + ]; + + meta = { + homepage = "https://github.com/krobelus/git-branchstack"; + description = "Efficiently manage Git branches without leaving your local branch"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres ]; + }; + }; +in +self diff --git a/third_party/nixpkgs/pkgs/by-name/gi/git-prole/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-prole/package.nix new file mode 100644 index 0000000000..f3b2a4723d --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gi/git-prole/package.nix @@ -0,0 +1,40 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + git, + bash, + nix-update-script, +}: +let + version = "0.1.1"; +in +rustPlatform.buildRustPackage { + pname = "git-prole"; + inherit version; + + src = fetchFromGitHub { + owner = "9999years"; + repo = "git-prole"; + rev = "refs/tags/v${version}"; + hash = "sha256-IJsNZt5eID1ghz5Rj53OfidgPoMS2qq+7qgqYEu4zPc="; + }; + + cargoHash = "sha256-2z7UEHVomm2zuImdcQq0G9fEhKrHLrPNUhVrFugG3w4="; + + nativeCheckInputs = [ + git + bash + ]; + + meta = { + homepage = "https://github.com/9999years/git-prole"; + changelog = "https://github.com/9999years/git-prole/releases/tag/v${version}"; + description = "`git-worktree(1)` manager"; + license = [ lib.licenses.mit ]; + maintainers = [ lib.maintainers._9999years ]; + mainProgram = "git-prole"; + }; + + passthru.updateScript = nix-update-script { }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/gi/gitbutler/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitbutler/package.nix index 68679cfcfe..af81f5021f 100644 --- a/third_party/nixpkgs/pkgs/by-name/gi/gitbutler/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gi/gitbutler/package.nix @@ -19,7 +19,7 @@ moreutils, openssl, rust, - webkitgtk, + webkitgtk_4_0, nix-update-script, cacert, }: @@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ glib-networking libsoup - webkitgtk + webkitgtk_4_0 ] ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/third_party/nixpkgs/pkgs/by-name/gi/gitea/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitea/package.nix index 3b5e5ccdf5..e68a58be66 100644 --- a/third_party/nixpkgs/pkgs/by-name/gi/gitea/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gi/gitea/package.nix @@ -33,18 +33,18 @@ let }; in buildGoModule rec { pname = "gitea"; - version = "1.22.2"; + version = "1.22.3"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${gitea.version}"; - hash = "sha256-PwA23cbRgw5crzZmngDjAAIODMtguwBCqc9NqWMjF3o="; + hash = "sha256-F1vvyf/FE/OIfDjM0CCOef/cXy+GPA+8n1AypE0r6p8="; }; proxyVendor = true; - vendorHash = "sha256-rMTKmztQNse/9CK1qFGWmSwqunwh918EvcuIHk6BSTY="; + vendorHash = "sha256-iKf4ozCBcTJQ6bm6dX4dd4buVMGNDVF+rLuYkb7Zxw8="; outputs = [ "out" "data" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/gi/gitxray/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitxray/package.nix new file mode 100644 index 0000000000..f72da4c085 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gi/gitxray/package.nix @@ -0,0 +1,34 @@ +{ + lib, + python3, + fetchFromGitHub, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "gitxray"; + version = "1.0.15-unstable-2024-09-20"; + pyproject = true; + + src = fetchFromGitHub { + owner = "kulkansecurity"; + repo = "gitxray"; + # https://github.com/kulkansecurity/gitxray/issues/1 + rev = "7e02f8c789f1c8bf3f4df6c1c301d1a666cedd1c"; + hash = "sha256-ucXHfclvaAbSi2HtrhkR2iW0r7jWq9yHqROwRAowOhA="; + }; + + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ requests ]; + + pythonImportsCheck = [ "gitxray" ]; + + meta = { + description = "Tool which leverages Public GitHub REST APIs for various tasks"; + homepage = "https://github.com/kulkansecurity/gitxray"; + changelog = "https://github.com/kulkansecurity/gitxray/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "gitxray"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/glab/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/glab/package.nix similarity index 81% rename from third_party/nixpkgs/pkgs/applications/version-management/glab/default.nix rename to third_party/nixpkgs/pkgs/by-name/gl/glab/package.nix index 31af001051..c0a321858f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/glab/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/gl/glab/package.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitLab, installShellFiles, stdenv }: +{ lib, buildGo123Module, fetchFromGitLab, installShellFiles, stdenv }: -buildGoModule rec { +buildGo123Module rec { pname = "glab"; - version = "1.45.0"; + version = "1.47.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; rev = "v${version}"; - hash = "sha256-jTpddpS+FYSQg2aRxQiVlG+bitiIqmZ4kxOJLPZkICo="; + hash = "sha256-mAM11nQ6YJJWNFOR9xQbgma7Plvo4MdcW2Syniw7o60="; }; - vendorHash = "sha256-o0sYObTeDgG+3X3YEnDbk1h4DkEiMwEgYMF7hGjCL3Q="; + vendorHash = "sha256-uwSVdebZtIpSol553gJC0ItkEqa6qXXOAVFvzjsHSSI="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/by-name/gn/gnome-font-viewer/package.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-font-viewer/package.nix index c05243ecb5..070f9f9038 100644 --- a/third_party/nixpkgs/pkgs/by-name/gn/gnome-font-viewer/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gn/gnome-font-viewer/package.nix @@ -58,6 +58,10 @@ stdenv.mkDerivation rec { # Do not run meson-postinstall.sh preConfigure = "sed -i '2,$ d' meson-postinstall.sh"; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + }; + passthru = { updateScript = gnome.updateScript { packageName = "gnome-font-viewer"; diff --git a/third_party/nixpkgs/pkgs/by-name/gn/gnome-graphs/package.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-graphs/package.nix index 46f9de8f34..3a635d515d 100644 --- a/third_party/nixpkgs/pkgs/by-name/gn/gnome-graphs/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gn/gnome-graphs/package.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { pname = "gnome-graphs"; - version = "1.8.1"; + version = "1.8.2"; pyproject = false; src = fetchFromGitLab { @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { owner = "World"; repo = "Graphs"; rev = "v${version}"; - hash = "sha256-ae6lyyr3vvENyn1kKc8Va4I++7B0rdURwjEpA9klLGg="; + hash = "sha256-juKo4pFAjowGaykHkByfA9kEJ68z1ttGhA0OsfHt/XM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/gn/gnome-notes/package.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-notes/package.nix index 0f4c8dbfc5..888f528593 100644 --- a/third_party/nixpkgs/pkgs/by-name/gn/gnome-notes/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gn/gnome-notes/package.nix @@ -19,7 +19,7 @@ libuuid, curl, libhandy, - webkitgtk, + webkitgtk_4_0, gnome, adwaita-icon-theme, libxml2, @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { libuuid curl libhandy - webkitgtk + webkitgtk_4_0 tracker gnome-online-accounts gsettings-desktop-schemas diff --git a/third_party/nixpkgs/pkgs/by-name/gn/gnome-settings-daemon/package.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-settings-daemon/package.nix index 8f9b06f0df..7466859ec7 100644 --- a/third_party/nixpkgs/pkgs/by-name/gn/gnome-settings-daemon/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gn/gnome-settings-daemon/package.nix @@ -3,6 +3,7 @@ lib, substituteAll, fetchurl, + fetchpatch, meson, ninja, pkg-config, @@ -37,6 +38,7 @@ tzdata, gcr_4, gnome-session-ctl, + withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, }: stdenv.mkDerivation (finalAttrs: { @@ -56,6 +58,18 @@ stdenv.mkDerivation (finalAttrs: { src = ./fix-paths.patch; inherit tzdata; }) + + (fetchpatch { + name = "backport-no-systemd-fix-1.patch"; + url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/46f998d7308cb18832666bc34ee54b1d9c27739f.patch"; + includes = [ "plugins/sharing/gsd-sharing-manager.c" ]; + hash = "sha256-P5FJUY50Pg3MuwHwGUz28/TMZkT7j+fmGPozWb9rVYo="; + }) + (fetchpatch { + name = "backport-no-systemd-fix-2.patch"; + url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/1a4d50f4ee611bdede6072c0bfd2a1b2e327c5fc.patch"; + hash = "sha256-pROhnE9GziS9h0nMWZBsd8YtW6RxMrwmaSOe0UtkUJU="; + }) ]; nativeBuildInputs = [ @@ -71,34 +85,41 @@ stdenv.mkDerivation (finalAttrs: { python3 ]; - buildInputs = [ - gtk3 - glib - gsettings-desktop-schemas - modemmanager - networkmanager - libnotify - libgnomekbd # for org.gnome.libgnomekbd.keyboard schema - gnome-desktop - libpulseaudio - alsa-lib - libcanberra-gtk3 - upower - colord - libgweather - polkit - geocode-glib_2 - geoclue2 - systemd - libgudev - libwacom - gcr_4 - ]; + buildInputs = + [ + gtk3 + glib + gsettings-desktop-schemas + modemmanager + networkmanager + libnotify + libgnomekbd # for org.gnome.libgnomekbd.keyboard schema + gnome-desktop + libpulseaudio + alsa-lib + libcanberra-gtk3 + upower + colord + libgweather + polkit + geocode-glib_2 + geoclue2 + libgudev + libwacom + gcr_4 + ] + ++ lib.optionals withSystemd [ + systemd + ]; - mesonFlags = [ - "-Dudev_dir=${placeholder "out"}/lib/udev" - "-Dgnome_session_ctl_path=${gnome-session-ctl}/libexec/gnome-session-ctl" - ]; + mesonFlags = + [ + "-Dudev_dir=${placeholder "out"}/lib/udev" + (lib.mesonBool "systemd" withSystemd) + ] + ++ lib.optionals withSystemd [ + "-Dgnome_session_ctl_path=${gnome-session-ctl}/libexec/gnome-session-ctl" + ]; # Default for release buildtype but passed manually because # we're using plain diff --git a/third_party/nixpkgs/pkgs/by-name/gn/gnucash/package.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnucash/package.nix index 9f7ca73646..c7d7e6c513 100644 --- a/third_party/nixpkgs/pkgs/by-name/gn/gnucash/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gn/gnucash/package.nix @@ -22,7 +22,7 @@ , perlPackages , pkg-config , swig -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 }: @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { libxml2 libxslt swig - webkitgtk + webkitgtk_4_0 ] ++ (with perlPackages; [ JSONParse diff --git a/third_party/nixpkgs/pkgs/by-name/go/gobusybox/package.nix b/third_party/nixpkgs/pkgs/by-name/go/gobusybox/package.nix new file mode 100644 index 0000000000..1ac398570b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/go/gobusybox/package.nix @@ -0,0 +1,42 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "gobusybox"; + version = "0.2.0-unstable-2024-03-05"; + + src = fetchFromGitHub { + owner = "u-root"; + repo = "gobusybox"; + rev = "d8fbaca23e26beab648c86c8a67335ad65d0d15c"; + hash = "sha256-hS6YwN6eekyDjp7E6sisW+8HO5WHTEC68XyKZFPihK4="; + }; + + sourceRoot = "${src.name}/src"; + + subPackages = [ + "cmd/gencmddeps" + "cmd/goanywhere" + "cmd/makebb" + "cmd/makebbmain" + "cmd/rewritepkg" + ]; + + CGO_ENABLED = "0"; + + vendorHash = "sha256-s4bQLXNFhyAk+UNI1xJXQABjBXtPFXiWvmdttV/6Bm8="; + + ldflags = [ "-s" ]; + + meta = { + description = "Tools for compiling many Go commands into one binary to save space"; + longDescription = "Builds are supported for vendor-based Go and module-based Go"; + homepage = "https://github.com/u-root/gobusybox"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ katexochen ]; + mainProgram = "makebb"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/go/gomanagedocker/package.nix b/third_party/nixpkgs/pkgs/by-name/go/gomanagedocker/package.nix new file mode 100644 index 0000000000..d31d435a7a --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/go/gomanagedocker/package.nix @@ -0,0 +1,41 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + stdenv, + darwin, + xorg, +}: +let + version = "1.4"; +in +buildGoModule { + pname = "gomanagedocker"; + inherit version; + + src = fetchFromGitHub { + owner = "ajayd-san"; + repo = "gomanagedocker"; + rev = "refs/tags/v${version}"; + hash = "sha256-oM0DCOHdVPJFWgmHF8yeGGo6XvuTCXar7NebM1obahg="; + }; + + vendorHash = "sha256-M/jfQWCBrv7hZm450yLBmcjWtNSCziKOpfipxI6U9ak="; + + buildInputs = + lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] + ++ lib.optionals stdenv.isLinux [ xorg.libX11 ]; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + description = "TUI tool to manage your docker images, containers and volumes"; + homepage = "https://github.com/ajayd-san/gomanagedocker"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ genga898 ]; + mainProgram = "gomanagedocker"; + }; +} 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 d0fa310bcf..c06b8d0f74 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 @@ -166,11 +166,11 @@ let linux = stdenv.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "129.0.6668.89"; + version = "130.0.6723.58"; 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-7siTsIW29x4XZ+Zut9b5BFSTtc5tuhxusxnkJPouG1w="; + hash = "sha256-HWFC+9Op4ja/S3eP56N9hkOkMbCrbF+NHEcxSLb85Hg="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -266,11 +266,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "129.0.6668.90"; + version = "130.0.6723.59"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/n4gcpoygckhm4y53qwq7lkpnqu_129.0.6668.90/GoogleChrome-129.0.6668.90.dmg"; - hash = "sha256-viQSX8ogY5ywPqgVmMToHdZysxLuC8U78UJ9fIUrGCs="; + url = "http://dl.google.com/release2/chrome/oehlfkedv43jkzlol2mqd6xife_130.0.6723.59/GoogleChrome-130.0.6723.59.dmg"; + hash = "sha256-ioEWtD49XtZTItz+bCiDobV0nW82Dv6S41/oHlUsatU="; }; dontPatch = true; diff --git a/third_party/nixpkgs/pkgs/by-name/go/google-chrome/update.sh b/third_party/nixpkgs/pkgs/by-name/go/google-chrome/update.sh index cf5113eac6..e7d2988ffe 100755 --- a/third_party/nixpkgs/pkgs/by-name/go/google-chrome/update.sh +++ b/third_party/nixpkgs/pkgs/by-name/go/google-chrome/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -I nixpkgs=./. -i bash -p curl jq gawk libossp_uuid libxml2 nix +# shellcheck shell=bash set -euo pipefail @@ -10,7 +11,7 @@ get_version_info() { local start_pattern="$2" local end_pattern="$3" - local url="https://versionhistory.googleapis.com/v1/chrome/platforms/${platform}/channels/stable/versions/all/releases?filter=endtime=none,fraction>=0.5&order_by=version%20desc" + local url="https://versionhistory.googleapis.com/v1/chrome/platforms/${platform}/channels/stable/versions/all/releases?filter=endtime=none,fraction%3E=0.5&order_by=version%20desc" local response local version local current_version diff --git a/third_party/nixpkgs/pkgs/by-name/gp/gpauth/package.nix b/third_party/nixpkgs/pkgs/by-name/gp/gpauth/package.nix index e1199c9ed3..c54be41b2f 100644 --- a/third_party/nixpkgs/pkgs/by-name/gp/gpauth/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gp/gpauth/package.nix @@ -6,7 +6,7 @@ openssl, pkg-config, perl, - webkitgtk, + webkitgtk_4_0, }: rustPlatform.buildRustPackage rec { @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libsoup openssl - webkitgtk + webkitgtk_4_0 ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/by-name/gr/greenmask/package.nix b/third_party/nixpkgs/pkgs/by-name/gr/greenmask/package.nix index 4e5504ce76..bec5628c99 100644 --- a/third_party/nixpkgs/pkgs/by-name/gr/greenmask/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gr/greenmask/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "greenmask"; - version = "0.1.14"; + version = "0.2.0"; src = fetchFromGitHub { owner = "GreenmaskIO"; repo = "greenmask"; rev = "refs/tags/v${version}"; - hash = "sha256-R/JJnHBp9MPnq/fIDwYrePIUH3/FvDPFaRpmrpwhU6o="; + hash = "sha256-ouDYXXlmvLRuR6ATUAk2Gn9toTVxRwQY1CgMyQUN/B0="; }; - vendorHash = "sha256-WCsZ5DU+mZk9M1lldBY4q2PXI8DDFytPojzGJ6wqXsg="; + vendorHash = "sha256-M7HcTQp4pzfSLvyCiV/loqqprKM1B93LOr4wxOVoHjk="; subPackages = [ "cmd/greenmask/" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/gr/grimoire/package.nix b/third_party/nixpkgs/pkgs/by-name/gr/grimoire/package.nix new file mode 100644 index 0000000000..c17abb54ed --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gr/grimoire/package.nix @@ -0,0 +1,35 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "grimoire"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "DataDog"; + repo = "grimoire"; + rev = "refs/tags/v${version}"; + hash = "sha256-V6j6PBoZqTvGfYSbpxd0vOyTb/i2EV8pDVSuZeq1s5o="; + }; + + vendorHash = "sha256-K1kVXSfIjBpuJ7TyTCtaWj6jWRXPQdBvUlf5LC60tj0="; + + subPackages = [ "cmd/grimoire/" ]; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + description = "Tool to generate datasets of cloud audit logs for common attacks"; + homepage = "https://github.com/DataDog/grimoire"; + changelog = "https://github.com/DataDog/grimoire/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "grimoire"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/image-utf8-fix.patch b/third_party/nixpkgs/pkgs/by-name/gs/gscan2pdf/image-utf8-fix.patch similarity index 100% rename from third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/image-utf8-fix.patch rename to third_party/nixpkgs/pkgs/by-name/gs/gscan2pdf/image-utf8-fix.patch diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix b/third_party/nixpkgs/pkgs/by-name/gs/gscan2pdf/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix rename to third_party/nixpkgs/pkgs/by-name/gs/gscan2pdf/package.nix diff --git a/third_party/nixpkgs/pkgs/by-name/gz/gzdoom/package.nix b/third_party/nixpkgs/pkgs/by-name/gz/gzdoom/package.nix index 1856d47942..c7d5d81e36 100644 --- a/third_party/nixpkgs/pkgs/by-name/gz/gzdoom/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gz/gzdoom/package.nix @@ -28,14 +28,14 @@ stdenv.mkDerivation rec { pname = "gzdoom"; - version = "4.12.2"; + version = "4.13.0"; src = fetchFromGitHub { owner = "ZDoom"; repo = "gzdoom"; rev = "g${version}"; fetchSubmodules = true; - hash = "sha256-taie1Iod3pXvuxxBC7AArmtndkIV0Di9mtJoPvPkioo="; + hash = "sha256-Cm4ww/QXTzRiSojeGtZ+CwAL2oSxKaTaTLiGkcNjxaE="; }; outputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/ha/harbor-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/ha/harbor-cli/package.nix new file mode 100644 index 0000000000..c47f50ecc2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ha/harbor-cli/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + testers, + harbor-cli, + installShellFiles, +}: + +buildGoModule rec { + pname = "harbor-cli"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "goharbor"; + repo = "harbor-cli"; + rev = "v${version}"; + hash = "sha256-WSADuhr6p8N0Oh1xIG7yItM6t0EWUiAkzNbdKsSc4WA="; + }; + + vendorHash = "sha256-UUD9/5+McR1t5oO4/6TSScT7hhSKM0OpBf94LVQG1Pw="; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/goharbor/harbor-cli/cmd/harbor/internal/version.Version=${version}" + ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd harbor \ + --bash <($out/bin/harbor completion bash) \ + --fish <($out/bin/harbor completion fish) \ + --zsh <($out/bin/harbor completion zsh) + ''; + + passthru.tests.version = testers.testVersion { + package = harbor-cli; + command = "harbor version"; + }; + + meta = { + homepage = "https://github.com/goharbor/harbor-cli"; + description = "Command-line tool facilitates seamless interaction with the Harbor container registry"; + changelog = "https://github.com/goharbor/harbor-cli/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ aaronjheng ]; + mainProgram = "harbor"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ha/hare/setup-hook.sh b/third_party/nixpkgs/pkgs/by-name/ha/hare/setup-hook.sh index 3a427fd703..388ed9bcf2 100644 --- a/third_party/nixpkgs/pkgs/by-name/ha/hare/setup-hook.sh +++ b/third_party/nixpkgs/pkgs/by-name/ha/hare/setup-hook.sh @@ -18,7 +18,7 @@ echoCmd "HAREPATH" "$HAREPATH" echoCmd "hare" "$(command -v hare)" echoCmd "hare-native" "$(command -v hare-native)" ' -prePhases+=("hareSetStdlibPhase" "hareInfoPhase") +appendToVar prePhases hareSetStdlibPhase hareInfoPhase readonly hare_unconditional_flags="@hare_unconditional_flags@" case "${hareBuildType:-"release"}" in diff --git a/third_party/nixpkgs/pkgs/by-name/ha/harper/package.nix b/third_party/nixpkgs/pkgs/by-name/ha/harper/package.nix index a18ab300af..ac067d4369 100644 --- a/third_party/nixpkgs/pkgs/by-name/ha/harper/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ha/harper/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "harper"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "elijah-potter"; repo = "harper"; rev = "v${version}"; - hash = "sha256-83Fg1oywYuvyc5aFeujH/g8Czi8r0wBUr1Bj6vwxNec="; + hash = "sha256-2Frt0vpCGnF3pZREY+ynPkdCLf2zsde49cEsNrqFUtY="; }; - cargoHash = "sha256-Bt2KZ+m7VJXw4FYWt+ioo1XjZHNzbg/8fo8xrfEd6lI="; + cargoHash = "sha256-S3N9cn8Y4j5epvndvivgKyhjQQ5mNg89iSOlOx1Jmo0="; meta = { description = "Grammar Checker for Developers"; diff --git a/third_party/nixpkgs/pkgs/by-name/ha/hatch/package.nix b/third_party/nixpkgs/pkgs/by-name/ha/hatch/package.nix index ef82772526..b4e5b6c42c 100644 --- a/third_party/nixpkgs/pkgs/by-name/ha/hatch/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ha/hatch/package.nix @@ -1,27 +1,26 @@ { lib, + stdenv, python3Packages, fetchFromGitHub, replaceVars, git, cargo, - stdenv, + versionCheckHook, darwin, nix-update-script, - testers, - hatch, }: python3Packages.buildPythonApplication rec { pname = "hatch"; - version = "1.12.0"; + version = "1.13.0"; pyproject = true; src = fetchFromGitHub { owner = "pypa"; repo = "hatch"; rev = "refs/tags/hatch-v${version}"; - hash = "sha256-HW2vDVsFrdFRRaPNuGDg9DZpJd8OuYDIqA3KQRa3m9o="; + hash = "sha256-jD8mr0PXlGK9YkBPZhNTimuxmq6dJG7cfQP/UEmHTZY="; }; patches = [ (replaceVars ./paths.patch { uv = lib.getExe python3Packages.uv; }) ]; @@ -61,11 +60,16 @@ python3Packages.buildPythonApplication rec { pytest-xdist setuptools ] - ++ [ cargo ] + ++ [ + cargo + versionCheckHook + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.ps ]; + versionCheckProgramArg = [ "--version" ]; + preCheck = '' export HOME=$(mktemp -d); ''; @@ -101,9 +105,6 @@ python3Packages.buildPythonApplication rec { "test_new_selected_python" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # https://github.com/NixOS/nixpkgs/issues/209358 - "test_scripts_no_environment" - # This test assumes it is running on macOS with a system shell on the PATH. # It is not possible to run it in a nix build using a /nix/store shell. # See https://github.com/pypa/hatch/pull/709 for the relevant code. @@ -126,8 +127,12 @@ python3Packages.buildPythonApplication rec { ]; passthru = { - tests.version = testers.testVersion { package = hatch; }; - updateScript = nix-update-script { }; + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "hatch-v([0-9.]+)" + ]; + }; }; meta = { diff --git a/third_party/nixpkgs/pkgs/by-name/he/headphones-toolbox/package.nix b/third_party/nixpkgs/pkgs/by-name/he/headphones-toolbox/package.nix index 2b71ad126e..2eb5257fee 100644 --- a/third_party/nixpkgs/pkgs/by-name/he/headphones-toolbox/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/he/headphones-toolbox/package.nix @@ -3,7 +3,7 @@ , dpkg , fetchurl , autoPatchelfHook -, webkitgtk +, webkitgtk_4_0 }: stdenv.mkDerivation (finalAttrs: { @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - webkitgtk + webkitgtk_4_0 ]; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/ho/homebank/package.nix b/third_party/nixpkgs/pkgs/by-name/ho/homebank/package.nix index ff5a4f5e86..74eafcc0ac 100644 --- a/third_party/nixpkgs/pkgs/by-name/ho/homebank/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ho/homebank/package.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "homebank"; - version = "5.8.3"; + version = "5.8.5"; src = fetchurl { url = "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz"; - hash = "sha256-5Ag9UjAdxT5R6cYV6VT7ktaVHqd0kzQoLCpfS5q5xMI="; + hash = "sha256-TrRFHleEA5VGjC1qP+TQFq2gun1Hyn8c7AQYwKEznpc="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ho/homebox/package.nix b/third_party/nixpkgs/pkgs/by-name/ho/homebox/package.nix index 2745805fbc..a0bb01845f 100644 --- a/third_party/nixpkgs/pkgs/by-name/ho/homebox/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ho/homebox/package.nix @@ -1,33 +1,34 @@ { lib, - buildGoModule, + buildGo123Module, fetchFromGitHub, pnpm, nodejs, - go, + go_1_23, git, cacert, + nixosTests, }: let pname = "homebox"; - version = "0.13.0"; + version = "0.15.2"; src = fetchFromGitHub { owner = "sysadminsmedia"; repo = "homebox"; rev = "v${version}"; - hash = "sha256-mhb4q0ja94TjvOzl28WVb3uzkR9MKlqifFJgUo6hfrA="; + hash = "sha256-2jB2Oo0dK36n5tQPrGNyPO3Q0yNkUms4RPQzXiDzuks="; }; in -buildGoModule { +buildGo123Module { inherit pname version src; - vendorHash = "sha256-QRmP6ichKjwDWEx13sEs1oetc4nojGyJnKafAATTNTA="; + vendorHash = "sha256-Ftm5tR3w8S3mjYLJG0+17nYP5kDbaAd8QkbZpNt7WuE="; modRoot = "backend"; # the goModules derivation inherits our buildInputs and buildPhases # Since we do pnpm thing in those it fails if we don't explicitely remove them overrideModAttrs = _: { nativeBuildInputs = [ - go + go_1_23 git cacert ]; @@ -37,7 +38,7 @@ buildGoModule { pnpmDeps = pnpm.fetchDeps { inherit pname version; src = "${src}/frontend"; - hash = "sha256-MdTZJ/Ichpwc54r7jZjiFD12YOdRzHSuzRZ/PnDk2mY="; + hash = "sha256-SyKET+W9Fn1WETzF4KlAtLOzNI/DOavHUbC7Yfv6kFw="; }; pnpmRoot = "../frontend"; @@ -72,6 +73,12 @@ buildGoModule { "-X main.commit=${version}" ]; + passthru = { + tests = { + inherit (nixosTests) homebox; + }; + }; + meta = { mainProgram = "api"; homepage = "https://homebox.software/"; 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 3cb4665f5e..9c1742ebc7 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.9.6"; + version = "23.10.1"; src = fetchFromGitHub { owner = "htcondor"; repo = "htcondor"; rev = "v${version}"; - hash = "sha256-Xm1K3KESOVStOi6iyCGA8qbQ2IcyS//sF5pvnnMZAlA="; + hash = "sha256-5gxylfqG87dUEQT3e3vNgtTqWk0QTgWXwAdEAiIuc/E="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/by-name/hy/hydra/package.nix b/third_party/nixpkgs/pkgs/by-name/hy/hydra/package.nix index 343d7d0a75..42ebcc581c 100644 --- a/third_party/nixpkgs/pkgs/by-name/hy/hydra/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/hy/hydra/package.nix @@ -124,13 +124,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "hydra"; - version = "0-unstable-2024-09-24"; + version = "0-unstable-2024-10-08"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "95003f2eb503f71979856470c7caea946f1ae7f0"; - hash = "sha256-6FI0QIkMAL35J8mzAiAntCsFbMMZBuOBpKuDIctflaA="; + rev = "c69e30122bf7e7a7d3de70dc2418263c6e44159b"; + hash = "sha256-khkY1GG43/VUBt6g7Egt0Zz0V/rXxnDUpOLtanFum7Y="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/hylafaxplus/config.site b/third_party/nixpkgs/pkgs/by-name/hy/hylafaxplus/config.site similarity index 100% rename from third_party/nixpkgs/pkgs/servers/hylafaxplus/config.site rename to third_party/nixpkgs/pkgs/by-name/hy/hylafaxplus/config.site diff --git a/third_party/nixpkgs/pkgs/servers/hylafaxplus/libtiff-4.patch b/third_party/nixpkgs/pkgs/by-name/hy/hylafaxplus/libtiff-4.patch similarity index 100% rename from third_party/nixpkgs/pkgs/servers/hylafaxplus/libtiff-4.patch rename to third_party/nixpkgs/pkgs/by-name/hy/hylafaxplus/libtiff-4.patch diff --git a/third_party/nixpkgs/pkgs/servers/hylafaxplus/default.nix b/third_party/nixpkgs/pkgs/by-name/hy/hylafaxplus/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/hylafaxplus/default.nix rename to third_party/nixpkgs/pkgs/by-name/hy/hylafaxplus/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/hylafaxplus/post-install-check.sh b/third_party/nixpkgs/pkgs/by-name/hy/hylafaxplus/post-install-check.sh similarity index 100% rename from third_party/nixpkgs/pkgs/servers/hylafaxplus/post-install-check.sh rename to third_party/nixpkgs/pkgs/by-name/hy/hylafaxplus/post-install-check.sh diff --git a/third_party/nixpkgs/pkgs/servers/hylafaxplus/post-install.sh b/third_party/nixpkgs/pkgs/by-name/hy/hylafaxplus/post-install.sh similarity index 100% rename from third_party/nixpkgs/pkgs/servers/hylafaxplus/post-install.sh rename to third_party/nixpkgs/pkgs/by-name/hy/hylafaxplus/post-install.sh diff --git a/third_party/nixpkgs/pkgs/servers/hylafaxplus/post-patch.sh b/third_party/nixpkgs/pkgs/by-name/hy/hylafaxplus/post-patch.sh similarity index 100% rename from third_party/nixpkgs/pkgs/servers/hylafaxplus/post-patch.sh rename to third_party/nixpkgs/pkgs/by-name/hy/hylafaxplus/post-patch.sh diff --git a/third_party/nixpkgs/pkgs/by-name/hy/hypre/package.nix b/third_party/nixpkgs/pkgs/by-name/hy/hypre/package.nix index 1b5c918bee..0fafb235b7 100644 --- a/third_party/nixpkgs/pkgs/by-name/hy/hypre/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/hy/hypre/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { name = "hypre"; - version = "2.31.0"; + version = "2.32.0"; src = fetchFromGitHub { owner = "hypre-space"; repo = "hypre"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-eFOyM3IzQUNm7cSnORA3NrKYotEBmLKC8mi+fcwPMQA="; + hash = "sha256-h16+nZ6+GfddfBJDF6sphuZ9Sff++PxW2R58XgJsnsI="; }; sourceRoot = "${finalAttrs.src.name}/src"; 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 850a0cb050..0f61f205b5 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": "0f594732b063a90d44df8c5d402d658f27471dfe", - "commit_message": "props: bump version to 0.43.0", - "date": "2024-09-08", - "tag": "v0.43.0" + "branch": "v0.44.1-b", + "commit_hash": "4520b30d498daca8079365bdb909a8dea38e8d55", + "commit_message": "version: bump to 0.44.1", + "date": "2024-10-09", + "tag": "v0.44.1" } 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 a3a7d061dc..36219143a9 100644 --- a/third_party/nixpkgs/pkgs/by-name/hy/hyprland/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/hy/hyprland/package.nix @@ -82,14 +82,14 @@ assert assertMsg (!hidpiXWayland) customStdenv.mkDerivation (finalAttrs: { pname = "hyprland" + optionalString debug "-debug"; - version = "0.44.0"; + version = "0.44.1"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland"; fetchSubmodules = true; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-XgDhPx+tKs+2lyWM/ZqIHnMArd/c0LGmwAwu0EG1uJM="; + hash = "sha256-hnoPoxMFetuoXQuAMgvopl1kCRQ33FYaVVBgV9FIFkM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/by-name/ic/ice-bar/package.nix b/third_party/nixpkgs/pkgs/by-name/ic/ice-bar/package.nix index 95b1170f2a..a55201ae0a 100644 --- a/third_party/nixpkgs/pkgs/by-name/ic/ice-bar/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ic/ice-bar/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "ice-bar"; - version = "0.9.0"; + version = "0.11.9"; src = fetchurl { url = "https://github.com/jordanbaird/Ice/releases/download/${finalAttrs.version}/Ice.zip"; - hash = "sha256-MvkJRP8Stz9VIK3vBnWezVKq2KkPfUa/NUBxJtYzHhU="; + hash = "sha256-nC7gIF4OdkUYoacbyr1cv5xpJkWDqhFW11UNZvgrQtE="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/by-name/id/ida-free/package.nix b/third_party/nixpkgs/pkgs/by-name/id/ida-free/package.nix index 594163049b..d825ade468 100644 --- a/third_party/nixpkgs/pkgs/by-name/id/ida-free/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/id/ida-free/package.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { icon = fetchurl { urls = [ - "https://www.hex-rays.com/products/ida/news/8_1/images/icon_free.png" "https://web.archive.org/web/20221105181231if_/https://hex-rays.com/products/ida/news/8_1/images/icon_free.png" ]; hash = "sha256-widkv2VGh+eOauUK/6Sz/e2auCNFAsc8n9z0fdrSnW0="; diff --git a/third_party/nixpkgs/pkgs/by-name/im/immersed-vr/darwin.nix b/third_party/nixpkgs/pkgs/by-name/im/immersed/darwin.nix similarity index 100% rename from third_party/nixpkgs/pkgs/by-name/im/immersed-vr/darwin.nix rename to third_party/nixpkgs/pkgs/by-name/im/immersed/darwin.nix diff --git a/third_party/nixpkgs/pkgs/by-name/im/immersed-vr/linux.nix b/third_party/nixpkgs/pkgs/by-name/im/immersed/linux.nix similarity index 100% rename from third_party/nixpkgs/pkgs/by-name/im/immersed-vr/linux.nix rename to third_party/nixpkgs/pkgs/by-name/im/immersed/linux.nix diff --git a/third_party/nixpkgs/pkgs/by-name/im/immersed-vr/package.nix b/third_party/nixpkgs/pkgs/by-name/im/immersed/package.nix similarity index 97% rename from third_party/nixpkgs/pkgs/by-name/im/immersed-vr/package.nix rename to third_party/nixpkgs/pkgs/by-name/im/immersed/package.nix index 874cac3bf5..ece3cb1dbc 100644 --- a/third_party/nixpkgs/pkgs/by-name/im/immersed-vr/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/im/immersed/package.nix @@ -5,7 +5,7 @@ , stdenv }: let - pname = "immersed-vr"; + pname = "immersed"; version = "10.5.0"; sources = rec { diff --git a/third_party/nixpkgs/pkgs/by-name/im/immich-machine-learning/package.nix b/third_party/nixpkgs/pkgs/by-name/im/immich-machine-learning/package.nix index 94cc69f50e..1029055a3b 100644 --- a/third_party/nixpkgs/pkgs/by-name/im/immich-machine-learning/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/im/immich-machine-learning/package.nix @@ -8,27 +8,6 @@ let python = python3.override { self = python; - - packageOverrides = self: super: { - pydantic = super.pydantic_1; - - versioningit = super.versioningit.overridePythonAttrs (_: { - doCheck = false; - }); - - albumentations = super.albumentations.overridePythonAttrs (old: rec { - version = "1.4.3"; - src = fetchFromGitHub { - owner = "albumentations-team"; - repo = "albumentations"; - rev = version; - hash = "sha256-JIBwjYaUP4Sc1bVM/zlj45cz9OWpb/LOBsIqk1m+sQA="; - }; - dependencies = old.dependencies ++ [ - self.scikit-learn - ]; - }); - }; }; in python.pkgs.buildPythonApplication rec { @@ -44,7 +23,10 @@ python.pkgs.buildPythonApplication rec { substituteInPlace app/test_main.py --replace-fail ": cv2.Mat" "" ''; - pythonRelaxDeps = [ "setuptools" ]; + pythonRelaxDeps = [ + "pydantic-settings" + "setuptools" + ]; pythonRemoveDeps = [ "opencv-python-headless" ]; build-system = with python.pkgs; [ @@ -60,6 +42,8 @@ python.pkgs.buildPythonApplication rec { pillow fastapi uvicorn + pydantic + pydantic-settings aiocache rich ftfy @@ -69,7 +53,6 @@ python.pkgs.buildPythonApplication rec { gunicorn huggingface-hub tokenizers - pydantic ] ++ uvicorn.optional-dependencies.standard; diff --git a/third_party/nixpkgs/pkgs/by-name/im/immich/package.nix b/third_party/nixpkgs/pkgs/by-name/im/immich/package.nix index fe62f0ddc3..fcbfb2607f 100644 --- a/third_party/nixpkgs/pkgs/by-name/im/immich/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/im/immich/package.nix @@ -225,7 +225,12 @@ buildNpmPackage' { description = "Self-hosted photo and video backup solution"; homepage = "https://immich.app/"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ jvanbruegge ]; + maintainers = with lib.maintainers; [ + dotlambda + jvanbruegge + Scrumplex + titaniumtown + ]; platforms = lib.platforms.linux; mainProgram = "server"; }; diff --git a/third_party/nixpkgs/pkgs/by-name/im/immich/sources.json b/third_party/nixpkgs/pkgs/by-name/im/immich/sources.json index 28fa298d1a..fb2e715428 100644 --- a/third_party/nixpkgs/pkgs/by-name/im/immich/sources.json +++ b/third_party/nixpkgs/pkgs/by-name/im/immich/sources.json @@ -1,22 +1,22 @@ { - "version": "1.117.0", - "hash": "sha256-v4TxKL+NaaAFxlJx/AG/5JxWnPK9uO6GjM4aoW53nzQ=", + "version": "1.118.1", + "hash": "sha256-rWBW0EwehuWnKk6qEte+dPd9l7FbLzwdkCSKMm22Orw=", "components": { "cli": { - "npmDepsHash": "sha256-ARjrBHx4aOiNy2PbHWS7kP9Z8QiNyTeyImSxIsXwPnU=", - "version": "2.2.23" + "npmDepsHash": "sha256-0je82BtDH6cUzoMrmeIS0jLmWPbmkdIQJ/SnmbAMtbw=", + "version": "2.2.25" }, "server": { - "npmDepsHash": "sha256-RjaTRqfZpDhI8lMVvsgICUn8g4NFnqcPptem/AwRr38=", - "version": "1.117.0" + "npmDepsHash": "sha256-Jxb47Y4x9A6s4zGODIp6rze7iQ/w8Gvt31NHSATLYCM=", + "version": "1.118.1" }, "web": { - "npmDepsHash": "sha256-TZnpbLJbTNFwI2Kvng88z0T1jFf4Tj2xwR0X0wCLaD0=", - "version": "1.117.0" + "npmDepsHash": "sha256-BUgkdsC6raURkyy6eN31uCMKmBbL+fCbGabfHJgJn8g=", + "version": "1.118.1" }, "open-api/typescript-sdk": { - "npmDepsHash": "sha256-G+iivJ0jibRCw/RChv5heVwY7c7oY/EG4bL+kpjoADQ=", - "version": "1.117.0" + "npmDepsHash": "sha256-Ga/aU5hojd3SgtoiM5QLsmzS5k7CRvh13a4lkC0BZA8=", + "version": "1.118.1" } } } diff --git a/third_party/nixpkgs/pkgs/by-name/in/influxdb-cxx/package.nix b/third_party/nixpkgs/pkgs/by-name/in/influxdb-cxx/package.nix index a5fb9cef67..1869990db5 100644 --- a/third_party/nixpkgs/pkgs/by-name/in/influxdb-cxx/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/in/influxdb-cxx/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, catch2_3, libcpr, trompeloeil }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, catch2_3, libcpr_1_10_5, trompeloeil }: stdenv.mkDerivation (finalAttrs: { pname = "influxdb-cxx"; @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - buildInputs = [ boost libcpr ] + buildInputs = [ boost libcpr_1_10_5 ] ++ lib.optionals finalAttrs.finalPackage.doCheck [ catch2_3 trompeloeil ]; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/by-name/in/intune-portal/package.nix b/third_party/nixpkgs/pkgs/by-name/in/intune-portal/package.nix index 8fa8aa976e..f9ff4b6119 100644 --- a/third_party/nixpkgs/pkgs/by-name/in/intune-portal/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/in/intune-portal/package.nix @@ -7,7 +7,7 @@ , curlMinimal , openssl , libsecret -, webkitgtk +, webkitgtk_4_0 , libsoup , gtk3 , atk @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { curlMinimal openssl libsecret - webkitgtk + webkitgtk_4_0 libsoup gtk3 atk diff --git a/third_party/nixpkgs/pkgs/by-name/ja/jam/package.nix b/third_party/nixpkgs/pkgs/by-name/ja/jam/package.nix index b721f58f9b..9fbe6f4c77 100644 --- a/third_party/nixpkgs/pkgs/by-name/ja/jam/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ja/jam/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { env = { LOCATE_TARGET = "bin.unix"; # Jam uses c89 conventions - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-std=c89"; + NIX_CFLAGS_COMPILE = "-std=c89"; }; enableParallelBuilding = true; @@ -49,21 +49,26 @@ stdenv.mkDerivation (finalAttrs: { export AR="$AR rc" ''; - # When cross-compiling, we need to set the preprocessor macros - # OSMAJOR/OSMINOR/OSPLAT to the values from the target platform, not the host - # platform. This looks a little ridiculous because the vast majority of build - # tools don't embed target-specific information into their binary, but in this - # case we behave more like a compiler than a make(1)-alike. - postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) '' - cat >>jam.h <>jam.h < Jamfile + os=$(jam -d0) + [[ $os != UNKNOWN* ]] && touch $out + ''; + }; }; meta = { diff --git a/third_party/nixpkgs/pkgs/by-name/jo/josm/package.nix b/third_party/nixpkgs/pkgs/by-name/jo/josm/package.nix index 920b294562..35f395b69d 100644 --- a/third_party/nixpkgs/pkgs/by-name/jo/josm/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/jo/josm/package.nix @@ -1,22 +1,23 @@ -{ lib, stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm +{ lib, stdenv, fetchurl, fetchFromGitHub, makeWrapper, unzip, jre, libXxf86vm , extraJavaOpts ? "-Djosm.restart=true -Djava.net.useSystemProxies=true" }: let pname = "josm"; - version = "19207"; + version = "19230"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - hash = "sha256-dYDJmGXIKd2GhjyKBpQjoIfz9giBsgFdC0TaKplxiPY="; + hash = "sha256-d2KyTPIw7N+ZveNUa5W3yiV6pCouigTq+GICSEkTiis="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java21.zip"; - hash = "sha256-A34nd+RBipON5zOKBD57L1l2KACYEUHNjxs0N6xqoXc="; + hash = "sha256-IrFtRlNdXZI6ucfZC6yEancV4E5lEP7+VNhaZ6p9t4I="; }; - pkg = fetchsvn { - url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; - rev = version; - hash = "sha256-L7P6FtqKLB4e+ezPzXePM33qj5esNoRlTFXi0/GhdsA="; + pkg = fetchFromGitHub { + owner = "JOSM"; + repo = "josm"; + rev = "refs/tags/${version}-tested"; + hash = "sha256-s6vc09qdQbJb2b0j4t7CVPmbfWpjc5Pl3JBCPgGVZMY="; }; }; @@ -41,7 +42,7 @@ stdenv.mkDerivation rec { ${unzip}/bin/unzip ${srcs.macosx} 'JOSM.app/*' -d $out/Applications '' else '' install -Dm644 ${srcs.jar} $out/share/josm/josm.jar - cp -R ${srcs.pkg}/usr/share $out + cp -R ${srcs.pkg}/native/linux/tested/usr/share $out # Add libXxf86vm to path because it is needed by at least Kendzi3D plugin makeWrapper ${jre}/bin/java $out/bin/josm \ @@ -49,14 +50,14 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH ":" '${libXxf86vm}/lib' ''; - meta = with lib; { + meta = { description = "Extensible editor for OpenStreetMap"; homepage = "https://josm.openstreetmap.de/"; changelog = "https://josm.openstreetmap.de/wiki/Changelog"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ rycee sikmir ]; - platforms = platforms.all; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ rycee sikmir ]; + platforms = lib.platforms.all; mainProgram = "josm"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ju/justbuild/package.nix b/third_party/nixpkgs/pkgs/by-name/ju/justbuild/package.nix index 86274edd4f..1882757865 100644 --- a/third_party/nixpkgs/pkgs/by-name/ju/justbuild/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ju/justbuild/package.nix @@ -11,7 +11,7 @@ openssl, pkg-config, - protobuf_25, + protobuf, grpc, pandoc, python3, @@ -23,18 +23,23 @@ curl, libarchive, + + nix-update-script, + testers, + justbuild, }: -let stdenv = gccStdenv; +let + stdenv = gccStdenv; in stdenv.mkDerivation rec { pname = "justbuild"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "just-buildsystem"; repo = "justbuild"; - rev = "v${version}"; - hash = "sha256-kv7HpDEYZml5uk06s8Cxt5rEpxaJBz9s+or6Od1q4Io="; + rev = "refs/tags/v${version}"; + hash = "sha256-N9K1n2ttxhD0q2BXprt/nQdQseUtpaFmEZUcxRJV5C8="; }; bazelapi = fetchurl { @@ -47,68 +52,69 @@ stdenv.mkDerivation rec { hash = "sha256-W7awJTzPZLU9bHJJYlp+P2w7xkAqvVLTd4v6SCWHA6A="; }; - nativeBuildInputs = - [ - # Tools for the bootstrap process - jq - pkg-config - python3 - unzip - wget - coreutils + nativeBuildInputs = [ + # Tools for the bootstrap process + jq + pkg-config + python3 + unzip + wget + coreutils - # Dependencies of just - cli11 - # Using fmt 10 because this is the same version upstream currently - # uses for bundled builds - # For future updates: The currently used version can be found in the file - # etc/repos.json: https://github.com/just-buildsystem/justbuild/blob/master/etc/repos.json - # under the key .repositories.fmt - fmt_10 - microsoft-gsl - nlohmann_json + # Dependencies of just + cli11 + # Using fmt 10 because this is the same version upstream currently + # uses for bundled builds + # For future updates: The currently used version can be found in the file + # etc/repos.json: https://github.com/just-buildsystem/justbuild/blob/master/etc/repos.json + # under the key .repositories.fmt + fmt_10 + microsoft-gsl + nlohmann_json - # Dependencies of the compiled just-mr - curl - libarchive - ]; + # Dependencies of the compiled just-mr + curl + libarchive + ]; buildInputs = [ grpc libgit2 openssl - protobuf_25 + protobuf python3 ]; - postPatch = '' - sed -ie 's|\./bin/just-mr.py|${python3}/bin/python3 ./bin/just-mr.py|' bin/bootstrap.py - sed -ie 's|#!/usr/bin/env python3|#!${python3}/bin/python3|' bin/parallel-bootstrap-traverser.py - jq '.repositories.protobuf.pkg_bootstrap.local_path = "${protobuf_25}"' etc/repos.json > etc/repos.json.patched - mv etc/repos.json.patched etc/repos.json - jq '.repositories.com_github_grpc_grpc.pkg_bootstrap.local_path = "${grpc}"' etc/repos.json > etc/repos.json.patched - mv etc/repos.json.patched etc/repos.json - jq '.unknown.PATH = []' etc/toolchain/CC/TARGETS > etc/toolchain/CC/TARGETS.patched - mv etc/toolchain/CC/TARGETS.patched etc/toolchain/CC/TARGETS - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - sed -ie 's|-Wl,-z,stack-size=8388608|-Wl,-stack_size,0x800000|' bin/bootstrap.py - ''; + postPatch = + '' + sed -ie 's|\./bin/just-mr.py|${python3}/bin/python3 ./bin/just-mr.py|' bin/bootstrap.py + sed -ie 's|#!/usr/bin/env python3|#!${python3}/bin/python3|' bin/parallel-bootstrap-traverser.py + jq '.repositories.protobuf.pkg_bootstrap.local_path = "${protobuf}"' etc/repos.json > etc/repos.json.patched + mv etc/repos.json.patched etc/repos.json + jq '.repositories.com_github_grpc_grpc.pkg_bootstrap.local_path = "${grpc}"' etc/repos.json > etc/repos.json.patched + mv etc/repos.json.patched etc/repos.json + jq '.unknown.PATH = []' etc/toolchain/CC/TARGETS > etc/toolchain/CC/TARGETS.patched + mv etc/toolchain/CC/TARGETS.patched etc/toolchain/CC/TARGETS + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + sed -ie 's|-Wl,-z,stack-size=8388608|-Wl,-stack_size,0x800000|' bin/bootstrap.py + ''; - /* The build phase follows the bootstrap procedure that is explained in - https://github.com/just-buildsystem/justbuild/blob/master/INSTALL.md + /* + The build phase follows the bootstrap procedure that is explained in + https://github.com/just-buildsystem/justbuild/blob/master/INSTALL.md - The bootstrap of the just binary depends on two proto libraries, which are - supplied as external distfiles. + The bootstrap of the just binary depends on two proto libraries, which are + supplied as external distfiles. - The microsoft-gsl library does not provide a pkg-config file, so one is - created here. In case also the GNU Scientific Library would be used (which - has also the pkg-config name gsl) this would cause a conflict. However, it - is very unlikely that a build tool will ever depend on a GPL math library. - - The extra build flags (ADD_CFLAGS and ADD_CXXFLAGS) are only needed in the - current version of just, the next release will contain a fix from upstream. - https://github.com/just-buildsystem/justbuild/commit/5abcd4140a91236c7bda1c21ce69e76a28da7c8a + The microsoft-gsl library does not provide a pkg-config file, so one is + created here. In case also the GNU Scientific Library would be used (which + has also the pkg-config name gsl) this would cause a conflict. However, it + is very unlikely that a build tool will ever depend on a GPL math library. + The extra build flags (ADD_CFLAGS and ADD_CXXFLAGS) are only needed in the + current version of just, the next release will contain a fix from upstream. + https://github.com/just-buildsystem/justbuild/commit/5abcd4140a91236c7bda1c21ce69e76a28da7c8a */ buildPhase = '' @@ -165,11 +171,22 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = justbuild; + command = "just version"; + version = builtins.replaceStrings [ "." ] [ "," ] version; + }; + }; + + meta = { broken = stdenv.hostPlatform.isDarwin; description = "Generic build tool"; homepage = "https://github.com/just-buildsystem/justbuild"; - license = licenses.asl20; - maintainers = with maintainers; [clkamp]; + changelog = "https://github.com/just-buildsystem/justbuild/releases/tag/v${version}"; + mainProgram = "just"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ clkamp ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/kc/kcl/package.nix b/third_party/nixpkgs/pkgs/by-name/kc/kcl/package.nix index b016abe16b..890f7bf33c 100644 --- a/third_party/nixpkgs/pkgs/by-name/kc/kcl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/kc/kcl/package.nix @@ -1,6 +1,6 @@ { lib , stdenv -, buildGoModule +, buildGo123Module , fetchFromGitHub , kclvm_cli , kclvm @@ -9,18 +9,18 @@ , darwin , }: -buildGoModule rec { +buildGo123Module rec { pname = "kcl"; - version = "0.9.8"; + version = "0.10.0"; src = fetchFromGitHub { owner = "kcl-lang"; repo = "cli"; rev = "v${version}"; - hash = "sha256-s8pFnItmw3+l9GKqdqX0Rxsy47h6vO+yUtVNCuyn/m8="; + hash = "sha256-0KxT4t77EDB7Vr/cb+P20ARRR+7g5uZiF5QYOArUhgI="; }; - vendorHash = "sha256-DGYYH5sKhpcWHYoUim4NyflzqsXFc4MCOqIw5jIfIiM="; + vendorHash = "sha256-9APQDYCBvG38y0ZYuacfyUmjoEV9jGqRg7OZ7mArzIU="; # By default, libs and bins are stripped. KCL will crash on darwin if they are. dontStrip = stdenv.hostPlatform.isDarwin; diff --git a/third_party/nixpkgs/pkgs/by-name/kc/kclvm/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/kc/kclvm/Cargo.lock index 37ec7f1b81..122b5f8cea 100644 --- a/third_party/nixpkgs/pkgs/by-name/kc/kclvm/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/kc/kclvm/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", ] @@ -79,9 +79,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", @@ -94,33 +94,33 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.3" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -135,6 +135,12 @@ dependencies = [ "backtrace", ] +[[package]] +name = "arrayref" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" + [[package]] name = "arrayvec" version = "0.7.4" @@ -160,18 +166,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", -] - -[[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", + "syn 2.0.72", ] [[package]] @@ -182,9 +177,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -236,9 +231,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitmaps" @@ -249,6 +244,19 @@ dependencies = [ "typenum", ] +[[package]] +name = "blake3" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if 1.0.0", + "constant_time_eq", +] + [[package]] name = "block-buffer" version = "0.7.3" @@ -319,9 +327,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" [[package]] name = "cast" @@ -331,9 +339,12 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.98" +version = "1.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" +dependencies = [ + "shlex", +] [[package]] name = "cfg-if" @@ -359,7 +370,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -386,73 +397,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" dependencies = [ "ciborium-io", - "half 2.4.1", + "half", ] [[package]] name = "clap" -version = "2.34.0" +version = "4.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "bitflags 1.3.2", - "textwrap 0.11.0", - "unicode-width", -] - -[[package]] -name = "clap" -version = "3.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" -dependencies = [ - "bitflags 1.3.2", - "clap_lex 0.2.4", - "indexmap 1.9.3", - "textwrap 0.16.1", -] - -[[package]] -name = "clap" -version = "4.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "35723e6a11662c2afb578bcf0b88bf6ea8e21282a953428f240574fcc3a2b5b3" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "49eb96cbfa7cfa35017b7cd548c75b14c3118c98b423041d70562665e07fb0fa" dependencies = [ "anstream", "anstyle", - "clap_lex 0.7.0", + "clap_lex", "strsim 0.11.1", ] [[package]] name = "clap_lex" -version = "0.2.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "clap_lex" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "colorchoice" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "compiler_base_error" @@ -516,6 +495,12 @@ version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "373e9fafaa20882876db20562275ff58d50e0caa2590077fe7ce7bef90211d0d" +[[package]] +name = "constant_time_eq" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" + [[package]] name = "core-foundation-sys" version = "0.8.6" @@ -542,45 +527,19 @@ dependencies = [ [[package]] name = "criterion" -version = "0.3.6" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" -dependencies = [ - "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" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" dependencies = [ "anes", - "atty", "cast", "ciborium", - "clap 3.2.25", - "criterion-plot 0.5.0", + "clap", + "criterion-plot", + "is-terminal", "itertools", - "lazy_static", "num-traits", + "once_cell", "oorandom", "plotters", "rayon", @@ -592,16 +551,6 @@ dependencies = [ "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" @@ -663,24 +612,38 @@ dependencies = [ ] [[package]] -name = "csv" -version = "1.3.0" +name = "darling" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ - "csv-core", - "itoa", - "ryu", - "serde", + "darling_core", + "darling_macro", ] [[package]] -name = "csv-core" -version = "0.1.11" +name = "darling_core" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ - "memchr", + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.11.1", + "syn 2.0.72", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.72", ] [[package]] @@ -705,6 +668,37 @@ dependencies = [ "powerfmt", ] +[[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", + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[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.72", +] + [[package]] name = "diff" version = "0.1.13" @@ -769,13 +763,13 @@ checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -785,10 +779,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59f8e79d1fbf76bdfbde321e902714bf6c49df88a7dda6fc682fc2979226962d" [[package]] -name = "either" -version = "1.12.0" +name = "dns-lookup" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "e5766087c2235fec47fafa4cfecc81e494ee679d0fd4a59887ea0919bfb0e4fc" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "socket2", + "windows-sys 0.48.0", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "ena" @@ -805,6 +811,70 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" +[[package]] +name = "encoding" +version = "0.2.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" +dependencies = [ + "encoding-index-japanese", + "encoding-index-korean", + "encoding-index-simpchinese", + "encoding-index-singlebyte", + "encoding-index-tradchinese", +] + +[[package]] +name = "encoding-index-japanese" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-korean" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-simpchinese" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-singlebyte" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-tradchinese" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding_index_tests" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" + [[package]] name = "enquote" version = "1.1.0" @@ -816,9 +886,9 @@ dependencies = [ [[package]] name = "env_filter" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" dependencies = [ "log", "regex", @@ -826,9 +896,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" dependencies = [ "anstream", "anstyle", @@ -1057,7 +1127,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -1130,10 +1200,22 @@ dependencies = [ ] [[package]] -name = "gimli" -version = "0.28.1" +name = "getset" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "glob" @@ -1141,12 +1223,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" -[[package]] -name = "half" -version = "1.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" - [[package]] name = "half" version = "2.4.1" @@ -1198,15 +1274,6 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - [[package]] name = "hermit-abi" version = "0.3.9" @@ -1231,6 +1298,17 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "hostname" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "windows", +] + [[package]] name = "http" version = "1.1.0" @@ -1253,9 +1331,9 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http", @@ -1263,12 +1341,12 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", - "futures-core", + "futures-util", "http", "http-body", "pin-project-lite", @@ -1276,9 +1354,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 = "humantime" @@ -1288,9 +1366,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "1.3.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", @@ -1307,9 +1385,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.26.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" dependencies = [ "futures-util", "http", @@ -1320,13 +1398,14 @@ dependencies = [ "tokio", "tokio-rustls", "tower-service", + "webpki-roots", ] [[package]] name = "hyper-util" -version = "0.1.4" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d8d52be92d09acc2e01dddb7fde3ad983fc6489c7db4837e605bc3fca4cb63e" +checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" dependencies = [ "bytes", "futures-channel", @@ -1365,6 +1444,12 @@ dependencies = [ "cc", ] +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + [[package]] name = "idna" version = "0.5.0" @@ -1436,7 +1521,7 @@ source = "git+https://github.com/TheDan64/inkwell?branch=master#4030f764f1c889f3 dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -1512,10 +1597,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] -name = "is_terminal_polyfill" -version = "1.70.0" +name = "is-terminal" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" @@ -1534,9 +1630,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] @@ -1611,11 +1707,11 @@ dependencies = [ [[package]] name = "kcl-language-server" -version = "0.9.3" +version = "0.10.0" dependencies = [ "anyhow", "chrono", - "clap 4.5.4", + "clap", "compiler_base_session", "crossbeam-channel", "dashmap", @@ -1655,7 +1751,7 @@ dependencies = [ [[package]] name = "kclvm" -version = "0.9.3" +version = "0.10.0" dependencies = [ "kclvm-api", "kclvm-ast", @@ -1677,10 +1773,10 @@ dependencies = [ [[package]] name = "kclvm-api" -version = "0.9.3" +version = "0.10.0" dependencies = [ "anyhow", - "criterion 0.4.0", + "criterion", "futures", "indexmap 1.9.3", "jsonrpc-stdio-server", @@ -1717,7 +1813,7 @@ dependencies = [ [[package]] name = "kclvm-ast" -version = "0.9.3" +version = "0.10.0" dependencies = [ "compiler_base_span", "kclvm-error", @@ -1732,7 +1828,7 @@ dependencies = [ [[package]] name = "kclvm-ast-pretty" -version = "0.9.3" +version = "0.10.0" dependencies = [ "compiler_base_macros", "compiler_base_session", @@ -1746,10 +1842,10 @@ dependencies = [ [[package]] name = "kclvm-cmd" -version = "0.9.3" +version = "0.10.0" dependencies = [ "anyhow", - "clap 4.5.4", + "clap", "compiler_base_session", "kclvm-api", "kclvm-config", @@ -1764,7 +1860,7 @@ dependencies = [ [[package]] name = "kclvm-compiler" -version = "0.9.3" +version = "0.10.0" dependencies = [ "ahash", "bit-set", @@ -1784,7 +1880,7 @@ dependencies = [ [[package]] name = "kclvm-config" -version = "0.9.3" +version = "0.10.0" dependencies = [ "ahash", "anyhow", @@ -1807,11 +1903,10 @@ dependencies = [ [[package]] name = "kclvm-driver" -version = "0.9.3" +version = "0.10.0" dependencies = [ "anyhow", "flate2", - "glob", "indexmap 2.2.6", "kclvm-ast", "kclvm-config", @@ -1831,11 +1926,10 @@ dependencies = [ [[package]] name = "kclvm-error" -version = "0.9.3" +version = "0.10.0" dependencies = [ "annotate-snippets", "anyhow", - "atty", "compiler_base_error", "compiler_base_macros", "compiler_base_session", @@ -1853,7 +1947,7 @@ dependencies = [ [[package]] name = "kclvm-evaluator" -version = "0.9.3" +version = "0.10.0" dependencies = [ "anyhow", "generational-arena", @@ -1870,7 +1964,7 @@ dependencies = [ [[package]] name = "kclvm-lexer" -version = "0.9.3" +version = "0.10.0" dependencies = [ "expect-test", "kclvm-error", @@ -1880,7 +1974,7 @@ dependencies = [ [[package]] name = "kclvm-loader" -version = "0.9.3" +version = "0.10.0" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -1896,7 +1990,7 @@ dependencies = [ [[package]] name = "kclvm-macros" -version = "0.9.3" +version = "0.10.0" dependencies = [ "proc-macro2", "quote", @@ -1906,7 +2000,7 @@ dependencies = [ [[package]] name = "kclvm-parser" -version = "0.9.3" +version = "0.10.0" dependencies = [ "anyhow", "bstr", @@ -1917,6 +2011,7 @@ dependencies = [ "either", "enquote", "expect-test", + "glob", "indexmap 1.9.3", "insta", "kclvm-ast", @@ -1927,6 +2022,7 @@ dependencies = [ "kclvm-span", "kclvm-utils", "num-bigint", + "parking_lot 0.12.3", "petgraph", "regex", "rustc_lexer", @@ -1938,13 +2034,14 @@ dependencies = [ [[package]] name = "kclvm-query" -version = "0.9.3" +version = "0.10.0" dependencies = [ "anyhow", "compiler_base_macros", "compiler_base_session", "fancy-regex", "indexmap 1.9.3", + "insta", "kclvm-ast", "kclvm-ast-pretty", "kclvm-error", @@ -1958,14 +2055,14 @@ dependencies = [ [[package]] name = "kclvm-runner" -version = "0.9.3" +version = "0.10.0" dependencies = [ "anyhow", "cc", "chrono", "compiler_base_macros", "compiler_base_session", - "criterion 0.3.6", + "criterion", "glob", "indexmap 1.9.3", "kclvm-ast", @@ -1993,16 +2090,21 @@ dependencies = [ [[package]] name = "kclvm-runtime" -version = "0.9.3" +version = "0.10.0" dependencies = [ "ahash", + "anyhow", "base64 0.13.1", + "blake3", "bstr", "chrono", + "dns-lookup", + "encoding", "fancy-regex", "generational-arena", "glob", "handlebars", + "hostname", "indexmap 1.9.3", "itertools", "kclvm_runtime_internal_macros", @@ -2026,7 +2128,7 @@ dependencies = [ [[package]] name = "kclvm-sema" -version = "0.9.3" +version = "0.10.0" dependencies = [ "ahash", "anyhow", @@ -2036,7 +2138,7 @@ dependencies = [ "compiler_base_macros", "compiler_base_session", "compiler_base_span", - "criterion 0.3.6", + "criterion", "fancy-regex", "generational-arena", "indexmap 1.9.3", @@ -2049,6 +2151,7 @@ dependencies = [ "kclvm-utils", "lazy_static", "once_cell", + "parking_lot 0.12.3", "petgraph", "phf", "regex", @@ -2060,7 +2163,7 @@ dependencies = [ [[package]] name = "kclvm-span" -version = "0.9.3" +version = "0.10.0" dependencies = [ "compiler_base_span", "kclvm-macros", @@ -2070,12 +2173,12 @@ dependencies = [ [[package]] name = "kclvm-tools" -version = "0.9.3" +version = "0.10.0" dependencies = [ "anyhow", "compiler_base_session", "compiler_base_span", - "criterion 0.3.6", + "criterion", "fancy-regex", "indexmap 1.9.3", "insta", @@ -2103,7 +2206,7 @@ dependencies = [ [[package]] name = "kclvm-utils" -version = "0.9.3" +version = "0.10.0" dependencies = [ "anyhow", "fslock", @@ -2112,9 +2215,9 @@ dependencies = [ [[package]] name = "kclvm-version" -version = "0.9.3" +version = "0.10.0" dependencies = [ - "vergen", + "vergen-gitcl", ] [[package]] @@ -2148,9 +2251,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" @@ -2174,7 +2277,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", ] @@ -2235,9 +2338,9 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lsp-server" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248f65b78f6db5d8e1b1604b4098a28b43d21a8eb1deeca22b1c421b276c7095" +checksum = "550446e84739dcaf6d48a4a093973850669e13e8a34d8f8d64851041be267cd9" dependencies = [ "crossbeam-channel", "log", @@ -2299,9 +2402,9 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[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" @@ -2320,9 +2423,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[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", ] @@ -2339,6 +2442,18 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "mio" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" +dependencies = [ + "hermit-abi", + "libc", + "wasi", + "windows-sys 0.52.0", +] + [[package]] name = "miow" version = "0.5.0" @@ -2367,7 +2482,7 @@ dependencies = [ "inotify", "kqueue", "libc", - "mio", + "mio 0.8.11", "walkdir", "windows-sys 0.45.0", ] @@ -2378,7 +2493,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", @@ -2386,16 +2501,16 @@ dependencies = [ "kqueue", "libc", "log", - "mio", + "mio 0.8.11", "walkdir", "windows-sys 0.48.0", ] [[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", @@ -2431,7 +2546,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.9", + "hermit-abi", "libc", ] @@ -2446,9 +2561,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e" dependencies = [ "memchr", ] @@ -2497,9 +2612,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oorandom" -version = "11.1.3" +version = "11.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" +checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" [[package]] name = "opaque-debug" @@ -2519,12 +2634,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" 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" @@ -2568,9 +2677,9 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.5.1", + "redox_syscall 0.5.3", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -2587,9 +2696,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" +checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" dependencies = [ "memchr", "thiserror", @@ -2598,9 +2707,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" +checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a" dependencies = [ "pest", "pest_generator", @@ -2608,22 +2717,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" +checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] name = "pest_meta" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" +checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f" dependencies = [ "once_cell", "pest", @@ -2701,7 +2810,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -2776,6 +2885,30 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + [[package]] name = "proc-macro-hack" version = "0.5.20+deprecated" @@ -2784,9 +2917,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.84" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -2797,7 +2930,7 @@ version = "0.1.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -2897,8 +3030,8 @@ dependencies = [ [[package]] name = "protoc-bin-vendored" -version = "3.1.0" -source = "git+https://github.com/andermatt64/rust-protoc-bin-vendored#b6274dad0ed303b6dd27389722744947419649e5" +version = "3.2.0" +source = "git+https://github.com/kcl-lang/rust-protoc-bin-vendored#53c1f87ffc3027642ea6b822025b1dc699a3135b" dependencies = [ "protoc-bin-vendored-linux-aarch_64", "protoc-bin-vendored-linux-ppcle_64", @@ -2911,38 +3044,84 @@ dependencies = [ [[package]] name = "protoc-bin-vendored-linux-aarch_64" -version = "3.1.0" -source = "git+https://github.com/andermatt64/rust-protoc-bin-vendored#b6274dad0ed303b6dd27389722744947419649e5" +version = "3.2.0" +source = "git+https://github.com/kcl-lang/rust-protoc-bin-vendored#53c1f87ffc3027642ea6b822025b1dc699a3135b" [[package]] name = "protoc-bin-vendored-linux-ppcle_64" -version = "3.1.0" -source = "git+https://github.com/andermatt64/rust-protoc-bin-vendored#b6274dad0ed303b6dd27389722744947419649e5" +version = "3.2.0" +source = "git+https://github.com/kcl-lang/rust-protoc-bin-vendored#53c1f87ffc3027642ea6b822025b1dc699a3135b" [[package]] name = "protoc-bin-vendored-linux-x86_32" -version = "3.1.0" -source = "git+https://github.com/andermatt64/rust-protoc-bin-vendored#b6274dad0ed303b6dd27389722744947419649e5" +version = "3.2.0" +source = "git+https://github.com/kcl-lang/rust-protoc-bin-vendored#53c1f87ffc3027642ea6b822025b1dc699a3135b" [[package]] name = "protoc-bin-vendored-linux-x86_64" -version = "3.1.0" -source = "git+https://github.com/andermatt64/rust-protoc-bin-vendored#b6274dad0ed303b6dd27389722744947419649e5" +version = "3.2.0" +source = "git+https://github.com/kcl-lang/rust-protoc-bin-vendored#53c1f87ffc3027642ea6b822025b1dc699a3135b" [[package]] name = "protoc-bin-vendored-macos-aarch_64" -version = "3.1.0" -source = "git+https://github.com/andermatt64/rust-protoc-bin-vendored#b6274dad0ed303b6dd27389722744947419649e5" +version = "3.2.0" +source = "git+https://github.com/kcl-lang/rust-protoc-bin-vendored#53c1f87ffc3027642ea6b822025b1dc699a3135b" [[package]] name = "protoc-bin-vendored-macos-x86_64" -version = "3.1.0" -source = "git+https://github.com/andermatt64/rust-protoc-bin-vendored#b6274dad0ed303b6dd27389722744947419649e5" +version = "3.2.0" +source = "git+https://github.com/kcl-lang/rust-protoc-bin-vendored#53c1f87ffc3027642ea6b822025b1dc699a3135b" [[package]] name = "protoc-bin-vendored-win32" -version = "3.1.0" -source = "git+https://github.com/andermatt64/rust-protoc-bin-vendored#b6274dad0ed303b6dd27389722744947419649e5" +version = "3.2.0" +source = "git+https://github.com/kcl-lang/rust-protoc-bin-vendored#53c1f87ffc3027642ea6b822025b1dc699a3135b" + +[[package]] +name = "quinn" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe" +dependencies = [ + "bytes", + "rand", + "ring", + "rustc-hash", + "rustls", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" +dependencies = [ + "libc", + "once_cell", + "socket2", + "windows-sys 0.52.0", +] [[package]] name = "quote" @@ -3078,11 +3257,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -3098,13 +3277,13 @@ 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-automata 0.4.7", "regex-syntax", ] @@ -3116,9 +3295,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[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", @@ -3127,15 +3306,15 @@ 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 = "reqwest" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" dependencies = [ "base64 0.22.1", "bytes", @@ -3154,6 +3333,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "quinn", "rustls", "rustls-pemfile", "rustls-pki-types", @@ -3350,7 +3530,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", @@ -3359,11 +3539,11 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.4" +version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ - "log", + "once_cell", "ring", "rustls-pki-types", "rustls-webpki", @@ -3389,9 +3569,9 @@ checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" -version = "0.102.4" +version = "0.102.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" dependencies = [ "ring", "rustls-pki-types", @@ -3516,32 +3696,22 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] -[[package]] -name = "serde_cbor" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" -dependencies = [ - "half 1.8.3", - "serde", -] - [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -3563,7 +3733,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -3614,9 +3784,9 @@ dependencies = [ [[package]] name = "sha1_smol" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" +checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" [[package]] name = "sha2" @@ -3642,6 +3812,12 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-hook-registry" version = "1.4.2" @@ -3653,9 +3829,9 @@ dependencies = [ [[package]] name = "similar" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" +checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e" [[package]] name = "siphasher" @@ -3788,9 +3964,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "suggestions" @@ -3814,9 +3990,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -3825,9 +4001,9 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "0.1.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" [[package]] name = "synstructure" @@ -3843,9 +4019,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.40" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" dependencies = [ "filetime", "libc", @@ -3883,39 +4059,24 @@ dependencies = [ "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.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -4010,9 +4171,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", ] @@ -4029,9 +4190,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -4044,39 +4205,38 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.39.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" dependencies = [ "backtrace", "bytes", "libc", - "mio", - "num_cpus", + "mio 1.0.1", "parking_lot 0.12.3", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] name = "tokio-rustls" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ "rustls", "rustls-pki-types", @@ -4190,7 +4350,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -4231,9 +4391,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typetag" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "661d18414ec032a49ece2d56eee03636e43c4e8d577047ab334c0ba892e29aaf" +checksum = "1f7ec175048b96728c30152928c52161bfcc8ea2bd3fb7ed4ccb7dec060b2834" dependencies = [ "erased-serde", "inventory", @@ -4244,13 +4404,13 @@ dependencies = [ [[package]] name = "typetag-impl" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac73887f47b9312552aa90ef477927ff014d63d1920ca8037c6c1951eab64bb1" +checksum = "84b5474fd169a5b02b6782b56bbbbff27e85947d4488e5501123687db3148647" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -4330,7 +4490,7 @@ checksum = "1ed7f4237ba393424195053097c1516bd4590dc82b84f2f97c5c69e12704555b" dependencies = [ "proc-macro-hack", "quote", - "syn 2.0.66", + "syn 2.0.72", "unic-langid-impl", ] @@ -4410,9 +4570,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 = "unicode-xid" @@ -4440,9 +4600,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", @@ -4452,15 +4612,15 @@ 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 = "uuid" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom", "serde", @@ -4468,22 +4628,48 @@ dependencies = [ [[package]] name = "vergen" -version = "8.3.1" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27d6bdd219887a9eadd19e1c34f32e47fa332301184935c6d9bca26f3cca525" +checksum = "c32e7318e93a9ac53693b6caccfb05ff22e04a44c7cf8a279051f24c09da286f" dependencies = [ "anyhow", - "cfg-if 1.0.0", + "derive_builder", "rustc_version 0.4.0", "rustversion", + "vergen-lib", +] + +[[package]] +name = "vergen-gitcl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bbdc9746577cb4767f218d320ee0b623d415e8130332f8f562b910b61cc2c4e" +dependencies = [ + "anyhow", + "derive_builder", + "rustversion", "time 0.3.36", + "vergen", + "vergen-lib", +] + +[[package]] +name = "vergen-lib" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e06bee42361e43b60f363bad49d63798d0f42fb1768091812270eca00c784720" +dependencies = [ + "anyhow", + "derive_builder", + "getset", + "rustversion", ] [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "walkdir" @@ -4531,7 +4717,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", "wasm-bindgen-shared", ] @@ -4565,7 +4751,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4601,9 +4787,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.1" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" dependencies = [ "rustls-pki-types", ] @@ -4651,13 +4837,23 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-targets 0.52.6", +] + [[package]] name = "windows-core" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -4699,7 +4895,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -4734,18 +4930,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -4762,9 +4958,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -4780,9 +4976,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -4798,15 +4994,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -4822,9 +5018,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -4840,9 +5036,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -4858,9 +5054,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -4876,9 +5072,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winreg" diff --git a/third_party/nixpkgs/pkgs/by-name/kc/kclvm/package.nix b/third_party/nixpkgs/pkgs/by-name/kc/kclvm/package.nix index 17e9cefc8f..76774e510c 100644 --- a/third_party/nixpkgs/pkgs/by-name/kc/kclvm/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/kc/kclvm/package.nix @@ -10,13 +10,13 @@ }: rustPlatform.buildRustPackage rec { pname = "kclvm"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "kcl-lang"; repo = "kcl"; rev = "v${version}"; - hash = "sha256-nk5oJRTBRj0LE2URJqno8AoZ+/342C2tEt8d6k2MAc8="; + hash = "sha256-OMPo2cT0ngwHuGghVSfGoDgf+FThj2GsZ3Myb1wSxQM="; }; sourceRoot = "${src.name}/kclvm"; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { lockFile = ./Cargo.lock; outputHashes = { "inkwell-0.2.0" = "sha256-JxSlhShb3JPhsXK8nGFi2uGPp8XqZUSiqniLBrhr+sM="; - "protoc-bin-vendored-3.1.0" = "sha256-RRqpPMJygpKGG5NYzD93iy4htpVqFhYMmfPgbRtpUqg="; + "protoc-bin-vendored-3.2.0" = "sha256-cYLAjjuYWat+8RS3vtNVS/NAJYw2NGeMADzGBL1L2Ww="; }; }; 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 index 98d155e8c7..876cc3010a 100644 --- 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 @@ -7,4 +7,4 @@ + +[[package]] +name = "kclvm_cli" -+version = "0.9.3" ++version = "0.10.0" 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 index 79b3b10f66..100c892f39 100644 --- a/third_party/nixpkgs/pkgs/by-name/kc/kclvm_cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/kc/kclvm_cli/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { }; sourceRoot = "${src.name}/cli"; - cargoHash = "sha256-hILG2YcwsAzzJPJno+2KzAHM226HYmQPQt9JVVYn9Jk="; + cargoHash = "sha256-2694O2q6UbNySgn76aBTjdqt2Hh1GrdRaro064fGBrI="; cargoPatches = [ ./cargo_lock.patch ]; buildInputs = [ kclvm rustc ] ++ ( diff --git a/third_party/nixpkgs/pkgs/by-name/ke/keyguard/deps.json b/third_party/nixpkgs/pkgs/by-name/ke/keyguard/deps.json index 3017ea8f5d..e453731341 100644 --- a/third_party/nixpkgs/pkgs/by-name/ke/keyguard/deps.json +++ b/third_party/nixpkgs/pkgs/by-name/ke/keyguard/deps.json @@ -562,9 +562,9 @@ "module": "sha256-+zlsWwe1d5qQ0kC9H2hm+B+ANhnjgTku0ZxxzeWjtw4=", "pom": "sha256-pLWsZsp+eXmLWodQv0wst1w49OU561YWT8m5wxPb354=" }, - "androidx/profileinstaller#profileinstaller/1.4.0": { - "module": "sha256-Ob+ZeijY7tLLMZgZ9vNSobo6eLnJeQBPvgXia499Fgs=", - "pom": "sha256-1f45mBo7S3w5WFEw2gv8k4NQVMg0pDjT5j4GXl94vlU=" + "androidx/profileinstaller#profileinstaller/1.4.1": { + "module": "sha256-bxHPZeS/hESZXMc+WqP4GwgtZucgwFkrxfyA0/c4UPc=", + "pom": "sha256-bd5DgntAU15AU9HFLUsiekEVVsKJ5lQAyaHMYeK0HOM=" }, "androidx/room#room-common/2.6.1": { "module": "sha256-DqB+9xQ6tSYswOSOgvO63WrfFks3AasqwPbwmej2PTs=", @@ -641,11 +641,11 @@ "com/android/application#com.android.application.gradle.plugin/8.7.0": { "pom": "sha256-7h5ZwC4JeVS67atxKbxn0cANSSfoAFPMLT2TB1hiPQU=" }, - "com/android/billingclient#billing-ktx/7.1.0": { - "pom": "sha256-j0sHmA2e27XbWm6gZ01a8znZkylNFaleKlHzr6pKKdE=" + "com/android/billingclient#billing-ktx/7.1.1": { + "pom": "sha256-PMPwTqj+PMOAi75eG0Y/3jQzM1RDOqeRERHQzK6Dt9g=" }, - "com/android/billingclient#billing/7.1.0": { - "pom": "sha256-OxlqMhxa5qAsnRjnu6t87dmLNrnxkEDk2LwIo52jh1I=" + "com/android/billingclient#billing/7.1.1": { + "pom": "sha256-S+5D2uFUS1LoqOUCefEyBPcrve1/ECdDCbG4ekhLdgU=" }, "com/android/databinding#baseLibrary/8.7.0": { "jar": "sha256-eUETcJ2rIbBsJis3lec8twj7rK5hcV80Nh4a9iN6GHA=", diff --git a/third_party/nixpkgs/pkgs/by-name/ke/keyguard/package.nix b/third_party/nixpkgs/pkgs/by-name/ke/keyguard/package.nix index 513d55f176..75e7e43834 100644 --- a/third_party/nixpkgs/pkgs/by-name/ke/keyguard/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ke/keyguard/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, gradle, binutils, - dpkg, fakeroot, jdk17, fontconfig, @@ -17,31 +16,42 @@ cups, lcms2, alsa-lib, + makeDesktopItem, + copyDesktopItems, }: let - gradleBuildTask = ":desktopApp:packageDeb"; + gradleBuildTask = ":desktopApp:createDistributable"; gradleUpdateTask = gradleBuildTask; + desktopItems = [ + (makeDesktopItem { + name = "Keyguard"; + exec = "Keyguard"; + icon = "Keyguard"; + comment = "Keyguard"; + desktopName = "Keyguard"; + }) + ]; in stdenv.mkDerivation (finalAttrs: { pname = "keyguard"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "AChep"; repo = "keyguard-app"; - rev = "25b505f7679e40bd42f5ff59218deb0f2aac2083"; - hash = "sha256-+WXeHcILukCheUzD59ffP+eMLXF8T5qm3NWNUugWIqg="; + rev = "eb36b853a7ac67a0f72d5684e6751d41969b07dd"; + hash = "sha256-tMNc8OlYsiYmVtac2jngvrFZjgI7eNFVIxXUfIJUdK4="; }; - inherit gradleBuildTask gradleUpdateTask; + inherit gradleBuildTask gradleUpdateTask desktopItems; nativeBuildInputs = [ gradle binutils - dpkg fakeroot jdk17 autoPatchelfHook + copyDesktopItems ]; mitmCache = gradle.fetchDeps { @@ -75,13 +85,7 @@ stdenv.mkDerivation (finalAttrs: { runHook preInstall mkdir -p $out/ - dpkg -x ./desktopApp/build/compose/binaries/main/deb/*.deb $out - mv $out/opt/keyguard/* -t $out/ - rm -r $out/opt - install -Dm0644 $out/lib/*-Keyguard.desktop $out/share/applications/Keyguard.desktop - substituteInPlace $out/share/applications/Keyguard.desktop \ - --replace-fail 'Exec=/opt/keyguard/bin/Keyguard' 'Exec=Keyguard' \ - --replace-fail 'Icon=/opt/keyguard/lib/Keyguard.png' 'Icon=Keyguard' + cp -a ./desktopApp/build/compose/binaries/main/app/*/* $out/ install -Dm0644 $out/lib/Keyguard.png $out/share/pixmaps/Keyguard.png runHook postInstall diff --git a/third_party/nixpkgs/pkgs/by-name/kg/kgeotag/package.nix b/third_party/nixpkgs/pkgs/by-name/kg/kgeotag/package.nix index c894c99118..485cce4599 100644 --- a/third_party/nixpkgs/pkgs/by-name/kg/kgeotag/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/kg/kgeotag/package.nix @@ -1,18 +1,18 @@ -{ cmake, extra-cmake-modules, fetchFromGitLab, lib, libsForQt5 }: +{ stdenv, cmake, extra-cmake-modules, fetchFromGitLab, lib, libsForQt5 }: -libsForQt5.mkDerivation rec { +stdenv.mkDerivation rec { pname = "kgeotag"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitLab { domain = "invent.kde.org"; repo = "kgeotag"; owner = "graphics"; rev = "v${version}"; - hash = "sha256-G9SyGvoSOL6nsWnMuSIUSFHFUwZUzExBJBkKN46o8GI="; + hash = "sha256-lUfU6SHRCglC81BTcVFFOp/psWXsUFOTEPUrZutrJaY="; }; - nativeBuildInputs = [ cmake extra-cmake-modules ]; + nativeBuildInputs = [ cmake extra-cmake-modules libsForQt5.wrapQtAppsHook ]; buildInputs = [ libsForQt5.libkexiv2 libsForQt5.marble ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ki/kiwitalk/package.nix b/third_party/nixpkgs/pkgs/by-name/ki/kiwitalk/package.nix index b700b198bc..74639a6fbb 100644 --- a/third_party/nixpkgs/pkgs/by-name/ki/kiwitalk/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ki/kiwitalk/package.nix @@ -8,7 +8,7 @@ , desktop-file-utils , openssl , libayatana-appindicator -, webkitgtk +, webkitgtk_4_0 , pkg-config , pnpm , nodejs @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ openssl libayatana-appindicator - webkitgtk + webkitgtk_4_0 ]; postInstall = lib.optionalString stdenv.isLinux '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/third_party/nixpkgs/pkgs/by-name/km/kmod-blacklist-ubuntu/package.nix similarity index 90% rename from third_party/nixpkgs/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix rename to third_party/nixpkgs/pkgs/by-name/km/kmod-blacklist-ubuntu/package.nix index 464b77ce96..b127caff4e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/km/kmod-blacklist-ubuntu/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl }: let - version = "30+20230519-1ubuntu3"; # mantic 2023-08-26 + version = "31+20240202-2ubuntu8"; # Oriole 2024-10-03 in stdenv.mkDerivation { pname = "kmod-blacklist"; @@ -9,7 +9,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_${version}.debian.tar.xz"; - hash = "sha256-VGw1/rUjl9/j6026ut0dvC0/8maAAz8umb0D3YGf8p4="; + hash = "sha256-i4XdCRedZIzMBbZL305enz8OAso3X14pdzNIITqK5hE="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/kn/knxd/package.nix b/third_party/nixpkgs/pkgs/by-name/kn/knxd/package.nix index bcbe85fcef..742c787241 100644 --- a/third_party/nixpkgs/pkgs/by-name/kn/knxd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/kn/knxd/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "knxd"; - version = "0.14.61"; + version = "0.14.63"; src = fetchFromGitHub { owner = "knxd"; repo = "knxd"; rev = finalAttrs.version; - hash = "sha256-b8svjGaxW8YqonhXewebDUitezKoMcZxcUFGd2EKZQ4="; + hash = "sha256-Ka4ATC20PS/yqHj+dbcIXxeqFYHDMKu6DvJWGd4rUMI="; }; postPatch = '' 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 4d1a69a3b0..5d9e6f1b21 100644 --- a/third_party/nixpkgs/pkgs/by-name/ko/koboldcpp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ko/koboldcpp/package.nix @@ -53,13 +53,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "koboldcpp"; - version = "1.75.2"; + version = "1.76"; src = fetchFromGitHub { owner = "LostRuins"; repo = "koboldcpp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-olMlYzde97RSx0OmDULSOFlM3imUq3AVxQdXyYBPd3Q="; + hash = "sha256-0zV9aZIfNnbV/K6xYUp+ucdJvdEfuGdKgE/Q7vcBopQ="; }; enableParallelBuilding = true; @@ -166,6 +166,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { meta = { changelog = "https://github.com/LostRuins/koboldcpp/releases/tag/v${finalAttrs.version}"; description = "Way to run various GGML and GGUF models"; + homepage = "https://github.com/LostRuins/koboldcpp"; license = lib.licenses.agpl3Only; mainProgram = "koboldcpp"; maintainers = with lib.maintainers; [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix b/third_party/nixpkgs/pkgs/by-name/le/legcord/package.nix similarity index 62% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix rename to third_party/nixpkgs/pkgs/by-name/le/legcord/package.nix index 1c0ad5aa36..30d3aea41e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/le/legcord/package.nix @@ -3,27 +3,27 @@ , fetchFromGitHub , pnpm , nodejs -, electron_31 +, electron_32 , makeWrapper , copyDesktopItems , makeDesktopItem }: stdenv.mkDerivation rec { - pname = "armcord"; - version = "3.3.1"; + pname = "legcord"; + version = "1.0.1"; src = fetchFromGitHub { - owner = "ArmCord"; - repo = "ArmCord"; + owner = "Legcord"; + repo = "Legcord"; rev = "v${version}"; - hash = "sha256-rCcjanmr4s9Nc5QB3Rb5ptKF/Ge8PSZt0WvgIul3RGs="; + hash = "sha256-R2mtE3L2cJgmbWT0aMoDbnM5tiyPk+dnPBedq8ro1lY="; }; nativeBuildInputs = [ pnpm.configHook nodejs makeWrapper copyDesktopItems ]; pnpmDeps = pnpm.fetchDeps { inherit pname version src; - hash = "sha256-ZfErOj03NdkviNXV4bvZC8uPOk29RhgmSez/Qvw1sGo="; + hash = "sha256-UCErcNNGAVOe1CvbYc1OSwPQzXVM5tpUUtBpLXoaQdY="; }; ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { npm exec electron-builder -- \ --dir \ - -c.electronDist="${electron_31.dist}" \ - -c.electronVersion="${electron_31.version}" + -c.electronDist="${electron_32.dist}" \ + -c.electronVersion="${electron_32.version}" runHook postBuild ''; @@ -44,13 +44,13 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p "$out/share/lib/armcord" - cp -r ./dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/armcord" + mkdir -p "$out/share/lib/legcord" + cp -r ./dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/legcord" - install -Dm644 "build/icon.png" "$out/share/icons/hicolor/256x256/apps/armcord.png" + install -Dm644 "build/icon.png" "$out/share/icons/hicolor/256x256/apps/legcord.png" - makeShellWrapper "${lib.getExe electron_31}" "$out/bin/armcord" \ - --add-flags "$out/share/lib/armcord/resources/app.asar" \ + makeShellWrapper "${lib.getExe electron_32}" "$out/bin/legcord" \ + --add-flags "$out/share/lib/legcord/resources/app.asar" \ "''${gappsWrapperArgs[@]}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --set-default ELECTRON_IS_DEV 0 \ @@ -61,24 +61,24 @@ stdenv.mkDerivation rec { desktopItems = [ (makeDesktopItem { - name = "armcord"; - desktopName = "ArmCord"; - exec = "armcord %U"; - icon = "armcord"; + name = "legcord"; + desktopName = "Legcord"; + exec = "legcord %U"; + icon = "legcord"; comment = meta.description; categories = [ "Network" ]; - startupWMClass = "ArmCord"; + startupWMClass = "Legcord"; terminal = false; }) ]; meta = with lib; { description = "Lightweight, alternative desktop client for Discord"; - homepage = "https://armcord.app"; - downloadPage = "https://github.com/ArmCord/ArmCord"; + homepage = "https://legcord.app"; + downloadPage = "https://github.com/Legcord/Legcord"; license = licenses.osl3; maintainers = with maintainers; [ wrmilling water-sucks ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; - mainProgram = "armcord"; + mainProgram = "legcord"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/li/lib3270/package.nix b/third_party/nixpkgs/pkgs/by-name/li/lib3270/package.nix index bdb74eceb2..119f7a1d6e 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/lib3270/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/lib3270/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { NOCONFIGURE=1 sh autogen.sh ''; - enableParallelBuilds = true; + enableParallelBuilding = true; meta = with lib; { description = "TN3270 client Library"; diff --git a/third_party/nixpkgs/pkgs/by-name/li/libarchive/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libarchive/package.nix index 402514a647..793c27dae9 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libarchive/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libarchive/package.nix @@ -123,6 +123,7 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd3; maintainers = with maintainers; [ jcumming AndersonTorres ]; platforms = platforms.all; + inherit (acl.meta) badPlatforms; }; passthru.tests = { diff --git a/third_party/nixpkgs/pkgs/by-name/li/libblake3/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libblake3/package.nix new file mode 100644 index 0000000000..bd03de8f49 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/li/libblake3/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + cmake, + fetchFromGitHub, + fetchpatch, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libblake3"; + version = "1.5.4"; + + src = fetchFromGitHub { + owner = "BLAKE3-team"; + repo = "BLAKE3"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-WatbhExS0j2neYsrfbNhYxrckLiXHwQBjctuowtQW+U="; + }; + + sourceRoot = finalAttrs.src.name + "/c"; + + patches = [ + # Fix pkg-config for absolute CMAKE_INSTALL_*DIR + (fetchpatch { + url = "https://github.com/BLAKE3-team/BLAKE3/commit/aa3e8ec32a389461babde3789d6ac50ee3c38662.patch"; + hash = "sha256-V8o85EnRoqYvatqYwdr7h2TBwSOSlKrqfJWPPkQhU+c="; + stripLen = 1; + }) + ]; + + nativeBuildInputs = [ + cmake + ]; + + meta = { + description = "Official C implementation of BLAKE3"; + homepage = "https://github.com/BLAKE3-team/BLAKE3/tree/master/c"; + license = with lib.licenses; [ + asl20 + cc0 + ]; + maintainers = with lib.maintainers; [ fgaz ]; + platforms = lib.platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/li/libcpr/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libcpr/package.nix new file mode 100644 index 0000000000..abbf0dcb6e --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/li/libcpr/package.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + curl, + staticOnly ? stdenv.hostPlatform.isStatic, +}: + +let + version = "1.11.0"; +in +stdenv.mkDerivation { + pname = "libcpr"; + inherit version; + + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "libcpr"; + repo = "cpr"; + rev = version; + hash = "sha256-jWyss0krj8MVFqU1LAig+4UbXO5pdcWIT+hCs9DxemM="; + }; + + nativeBuildInputs = [ cmake ]; + + propagatedBuildInputs = [ curl ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=${if staticOnly then "OFF" else "ON"}" + "-DCPR_USE_SYSTEM_CURL=ON" + ]; + + postPatch = '' + # Linking with stdc++fs is no longer necessary. + sed -i '/stdc++fs/d' include/CMakeLists.txt + ''; + + postInstall = '' + substituteInPlace "$out/lib/cmake/cpr/cprTargets.cmake" \ + --replace "_IMPORT_PREFIX \"$out\"" \ + "_IMPORT_PREFIX \"$dev\"" + ''; + + meta = with lib; { + description = "C++ wrapper around libcurl"; + homepage = "https://docs.libcpr.org/"; + license = licenses.mit; + maintainers = with maintainers; [ rycee ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcpr/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libcpr_1_10_5/package.nix similarity index 83% rename from third_party/nixpkgs/pkgs/development/libraries/libcpr/default.nix rename to third_party/nixpkgs/pkgs/by-name/li/libcpr_1_10_5/package.nix index 8a4025cf70..2164dcce33 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcpr/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libcpr_1_10_5/package.nix @@ -1,11 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, cmake, curl }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + curl, +}: -let version = "1.10.5"; in +let + version = "1.10.5"; +in stdenv.mkDerivation { pname = "libcpr"; inherit version; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; src = fetchFromGitHub { owner = "libcpr"; @@ -18,9 +29,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [ curl ]; - cmakeFlags = [ - "-DCPR_USE_SYSTEM_CURL=ON" - ]; + cmakeFlags = [ "-DCPR_USE_SYSTEM_CURL=ON" ]; postPatch = '' # Linking with stdc++fs is no longer necessary. diff --git a/third_party/nixpkgs/pkgs/by-name/li/liboqs/fix-openssl-detection.patch b/third_party/nixpkgs/pkgs/by-name/li/liboqs/fix-openssl-detection.patch index 33be718837..ea90a5d986 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/liboqs/fix-openssl-detection.patch +++ b/third_party/nixpkgs/pkgs/by-name/li/liboqs/fix-openssl-detection.patch @@ -6,14 +6,14 @@ Subject: [PATCH] Do not forcibly set OPENSSL_ROOT_DIR. CMake can already find OpenSSL via pkg-config. Setting OPENSSL_ROOT_DIR forcibly to "/usr" breaks this. --- - CMakeLists.txt | 11 ----------- - 1 file changed, 11 deletions(-) + CMakeLists.txt | 9 --------- + 1 file changed, 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 288bcbe8..9750fae6 100644 +index 0564bc8e..7b4c7f47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -119,17 +119,6 @@ include(.CMake/compiler_opts.cmake) +@@ -144,15 +144,6 @@ include(.CMake/compiler_opts.cmake) include(.CMake/alg_support.cmake) if(${OQS_USE_OPENSSL}) @@ -24,13 +24,12 @@ index 288bcbe8..9750fae6 100644 - elseif(EXISTS "/opt/homebrew/opt/openssl@1.1") - set(OPENSSL_ROOT_DIR "/opt/homebrew/opt/openssl@1.1") - endif() -- elseif(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux") -- set(OPENSSL_ROOT_DIR "/usr") - endif() - endif() find_package(OpenSSL 1.1.1 REQUIRED) - endif() + if(OQS_DLOPEN_OPENSSL) + -- 2.42.0 diff --git a/third_party/nixpkgs/pkgs/by-name/li/liboqs/package.nix b/third_party/nixpkgs/pkgs/by-name/li/liboqs/package.nix index 36d9d042ca..5da88f1816 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/liboqs/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/liboqs/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "liboqs"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "open-quantum-safe"; repo = "liboqs"; rev = finalAttrs.version; - hash = "sha256-zsSKFUs75K0Byxh3KVCZ8lIOf/vpbyMJXfk6fa2u+aE="; + hash = "sha256-+Gx1JPrJoeMix9DIF0rJQTivxN1lgaCIYFvJ1pnYZzM="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/by-name/li/libphidget22/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libphidget22/package.nix new file mode 100644 index 0000000000..8dd3d5e2f4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/li/libphidget22/package.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenv, + fetchurl, + automake, + libusb1, +}: + +stdenv.mkDerivation { + pname = "libphidget22"; + version = "0-unstable-2024-04-11"; + + src = fetchurl { + url = "https://cdn.phidgets.com/downloads/phidget22/libraries/linux/libphidget22.tar.gz"; + hash = "sha256-mDoYVs0LhBb3+vzKjzYr9EmcrztmA4cy9xh5ONxHaxI="; + }; + + nativeBuildInputs = [ automake ]; + + buildInputs = [ libusb1 ]; + + strictDeps = true; + + meta = { + description = "Phidget Inc sensor boards and electronics Library"; + homepage = "https://www.phidgets.com/docs/OS_-_Linux"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ mksafavi ]; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/li/libphidget22extra/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libphidget22extra/package.nix new file mode 100644 index 0000000000..b67d2026b6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/li/libphidget22extra/package.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenv, + fetchurl, + automake, + libusb1, + libphidget22, +}: + +stdenv.mkDerivation { + pname = "libphidget22extra"; + version = "0-unstable-2024-04-11"; + + src = fetchurl { + url = "https://cdn.phidgets.com/downloads/phidget22/libraries/linux/libphidget22extra.tar.gz"; + hash = "sha256-UD6Crr1dl7c3NOAVNi3xrXJI3OYPLZBJX1MXVvbyEUE="; + }; + + nativeBuildInputs = [ automake ]; + + buildInputs = [ + libphidget22 + libusb1 + ]; + + strictDeps = true; + + meta = { + description = "Phidget Inc sensor boards and electronics extras library"; + homepage = "https://www.phidgets.com/docs/OS_-_Linux"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ mksafavi ]; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/li/librewolf-bin/package.nix b/third_party/nixpkgs/pkgs/by-name/li/librewolf-bin/package.nix index 80c0875fa6..d6b0960df7 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/librewolf-bin/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/librewolf-bin/package.nix @@ -6,11 +6,11 @@ let pname = "librewolf-bin"; - upstreamVersion = "129.0.2-1"; + upstreamVersion = "131.0.2-1"; version = lib.replaceStrings [ "-" ] [ "." ] upstreamVersion; src = fetchurl { url = "https://gitlab.com/api/v4/projects/24386000/packages/generic/librewolf/${upstreamVersion}/LibreWolf.x86_64.AppImage"; - hash = "sha256-h4SZnI2BwCSsLADYIxTXu82Jyst1hqYGHt54MnluLss="; + hash = "sha256-Sj3WkY3t8UHsh2v3xPaDb0IGp66YQIw9MKmmFFQCGvk="; }; appimageContents = appimageTools.extract { inherit pname version src; }; in diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtiff/headers.patch b/third_party/nixpkgs/pkgs/by-name/li/libtiff/headers.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/libtiff/headers.patch rename to third_party/nixpkgs/pkgs/by-name/li/libtiff/headers.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtiff/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libtiff/package.nix similarity index 78% rename from third_party/nixpkgs/pkgs/development/libraries/libtiff/default.nix rename to third_party/nixpkgs/pkgs/by-name/li/libtiff/package.nix index b66c8c288b..6622acf533 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libtiff/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libtiff/package.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libtiff"; - version = "4.6.0"; + version = "4.7.0"; src = fetchFromGitLab { owner = "libtiff"; repo = "libtiff"; rev = "v${finalAttrs.version}"; - hash = "sha256-qCg5qjsPPynCHIg0JsPJldwVdcYkI68zYmyNAKUCoyw="; + hash = "sha256-SuK9/a6OUAumEe1kz1itFJGKxJzbmHkBVLMnyXhIwmQ="; }; patches = [ @@ -44,15 +44,6 @@ stdenv.mkDerivation (finalAttrs: { # libc++abi 11 has an `#include `, this picks up files name # `version` in the project's include paths ./rename-version.patch - # Fix static linking of `libtiff` via `pkg-config` not working - # because `libtiff` does not declare `Lerc` dependency. - # nixpkgs has `lerc` >= 4 which provides a `.pc` file. - # TODO: Close when https://gitlab.com/libtiff/libtiff/-/merge_requests/633 is merged and available - (fetchpatch { - name = "libtiff-4.pc-Fix-Requires.private-missing-Lerc.patch"; - url = "https://gitlab.com/libtiff/libtiff/-/commit/ea882c3c240c14a897b9be38d815cc1893aafa59.patch"; - hash = "sha256-C0xA3k1sgKmGJjEnyG9UxhXqYBYShKUDQsyjhbEDJbQ="; - }) ]; postPatch = '' @@ -92,6 +83,9 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; doCheck = true; + # Avoid flakiness like https://gitlab.com/libtiff/libtiff/-/commit/94f6f7315b1 + # - except that we have many x86_64-linux binaries depending on this already + enableParallelChecking = stdenv.system == "x86_64-linux"; passthru = { tests = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtiff/rename-version.patch b/third_party/nixpkgs/pkgs/by-name/li/libtiff/rename-version.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/libtiff/rename-version.patch rename to third_party/nixpkgs/pkgs/by-name/li/libtiff/rename-version.patch diff --git a/third_party/nixpkgs/pkgs/by-name/li/libusbp/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libusbp/package.nix index 01d061fe0d..d1f1a2cc3b 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libusbp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libusbp/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation(finalAttrs: { pname = "libusbp"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "pololu"; repo = "libusbp"; rev = finalAttrs.version; - hash = "sha256-60xpJ97GlqEcy2+pxGNGPfWDnbIFGoPXJijaErOBXQs="; + hash = "sha256-hFvQceUapzlD021KIOJbSXX7qv1IQMuEudRHYeCkbS8="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/li/libv3270/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libv3270/package.nix index 4f053f2795..3e87f868ec 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libv3270/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libv3270/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { NOCONFIGURE=1 sh ./autogen.sh ''; - enableParallelBuilds = true; + enableParallelBuilding = true; meta = with lib; { description = "3270 Virtual Terminal for GTK"; diff --git a/third_party/nixpkgs/pkgs/by-name/li/libvpl/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libvpl/package.nix index e4fb7e0180..c0ae60f2bb 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libvpl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libvpl/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libvpl"; - version = "2.10.1"; + version = "2.13.0"; src = fetchFromGitHub { owner = "intel"; repo = "libvpl"; rev = "v${finalAttrs.version}"; - hash = "sha256-2yfJo4iwI/h0CJ+mJJ3cAyG5S7KksUibwJHebF3MR+E="; + hash = "sha256-H+pRdpk1B/QgsXaTxhQfm3JW5Plgz4esrUV1kKfjY1s="; }; nativeBuildInputs = [ @@ -24,13 +24,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DENABLE_DRI3=ON" - "-DENABLE_DRM=ON" - "-DENABLE_VA=ON" - "-DENABLE_WAYLAND=ON" - "-DENABLE_X11=ON" - "-DINSTALL_EXAMPLE_CODE=OFF" - "-DBUILD_TOOLS=OFF" + (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck) ]; patches = [ @@ -40,6 +34,8 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + doCheck = true; + meta = with lib; { description = "Intel Video Processing Library"; homepage = "https://intel.github.io/libvpl/"; diff --git a/third_party/nixpkgs/pkgs/by-name/li/libwacom/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libwacom/package.nix index e8bf5c74f7..50d2451e94 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libwacom/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libwacom/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libwacom"; - version = "2.12.2"; + version = "2.13.0"; outputs = [ "out" @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${finalAttrs.version}"; - hash = "sha256-dxnXh+O/8q8ShsPbpqvaBPNQR6lJBphBolYTmcJEF/0="; + hash = "sha256-OJQe0GdndgpvW4aJdgSKWw+u3ng1pn3FgdcA81jfmkQ="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/by-name/li/lilipod/package.nix b/third_party/nixpkgs/pkgs/by-name/li/lilipod/package.nix index 0185a25c8a..9d26c94d7b 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/lilipod/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/lilipod/package.nix @@ -1,8 +1,11 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, installShellFiles -, stdenv +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + stdenv, + shadow, + util-linux, }: buildGoModule rec { @@ -18,8 +21,6 @@ buildGoModule rec { vendorHash = null; - nativeBuildInputs = [ installShellFiles ]; - buildPhase = '' runHook preBuild @@ -44,13 +45,6 @@ buildGoModule rec { runHook postInstall ''; - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd lilipod \ - --bash <($out/bin/lilipod completion bash) \ - --fish <($out/bin/lilipod completion fish) \ - --zsh <($out/bin/lilipod completion zsh) - ''; - meta = { description = "Very simple (as in few features) container and image manager"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/by-name/lm/lmstudio/darwin.nix b/third_party/nixpkgs/pkgs/by-name/lm/lmstudio/darwin.nix index bd2fd80824..8df1035f48 100644 --- a/third_party/nixpkgs/pkgs/by-name/lm/lmstudio/darwin.nix +++ b/third_party/nixpkgs/pkgs/by-name/lm/lmstudio/darwin.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation { inherit meta pname version; src = fetchurl { - url = "https://releases.lmstudio.ai/darwin/arm64/${version}/LM-Studio-${version}-arm64.dmg"; - hash = "sha256-PmXekM7rHY8EIp6l2XiLQlxyIB00MJS5C0gzFfe1i70="; + url = "https://releases.lmstudio.ai/darwin/arm64/${version}/3/LM-Studio-${version}-arm64.dmg"; + hash = "sha256-b9QJMZl42D3TL8nzoQ+Dtxhit8uzGp9gByeCCHyu6gw="; }; nativeBuildInputs = [ undmg ]; diff --git a/third_party/nixpkgs/pkgs/by-name/lm/lmstudio/linux.nix b/third_party/nixpkgs/pkgs/by-name/lm/lmstudio/linux.nix index 6058350f8d..acc49ee038 100644 --- a/third_party/nixpkgs/pkgs/by-name/lm/lmstudio/linux.nix +++ b/third_party/nixpkgs/pkgs/by-name/lm/lmstudio/linux.nix @@ -6,8 +6,8 @@ }: let src = fetchurl { - url = "https://releases.lmstudio.ai/linux/x86/${version}/1/LM_Studio-${version}.AppImage"; - hash = "sha256-B+V0MOn/07IEzUXiubO2TG/XvfDZDgttnK/buL/nHQY="; + url = "https://releases.lmstudio.ai/linux/x86/${version}/3/LM_Studio-${version}.AppImage"; + hash = "sha256-5yArraRyNY1TLmgGSe/1Zsirm093w+6tvXJr4+xiVtY="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/third_party/nixpkgs/pkgs/by-name/lm/lmstudio/package.nix b/third_party/nixpkgs/pkgs/by-name/lm/lmstudio/package.nix index d69b44d284..31a6adcbde 100644 --- a/third_party/nixpkgs/pkgs/by-name/lm/lmstudio/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lm/lmstudio/package.nix @@ -5,7 +5,7 @@ }: let pname = "lmstudio"; - version = "0.3.3"; + version = "0.3.4"; meta = { description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)"; homepage = "https://lmstudio.ai/"; diff --git a/third_party/nixpkgs/pkgs/by-name/lo/local-ai/package.nix b/third_party/nixpkgs/pkgs/by-name/lo/local-ai/package.nix index 8a1b4394d7..766720dfd6 100644 --- a/third_party/nixpkgs/pkgs/by-name/lo/local-ai/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lo/local-ai/package.nix @@ -15,7 +15,7 @@ ffmpeg, cmake, pkg-config, - buildGoModule, + buildGo123Module, makeWrapper, ncurses, which, @@ -147,8 +147,8 @@ let src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; - rev = "fc54ef0d1c138133a01933296d50a36a1ab64735"; - hash = "sha256-o87EhrA2Oa98pwyb6GSUgwERY0/GWJiX7kvlxDv4zb4="; + rev = "96776405a17034dcfd53d3ddf5d142d34bdbb657"; + hash = "sha256-V5Z+8cpllhDR0s4InoXyEU59a/qo2b5Xj8oeZd0rtGk="; fetchSubmodules = true; }; postPatch = @@ -299,8 +299,8 @@ let src = fetchFromGitHub { owner = "ggerganov"; repo = "whisper.cpp"; - rev = "9e3c5345cd46ea718209db53464e426c3fe7a25e"; - hash = "sha256-JOptyveuaKRLzeZ6GuB3A70IM7dk4we95g5o25XVXJI="; + rev = "fdbfb460ed546452a5d53611bba66d10d842e719"; + hash = "sha256-ZLSVPQUw1sp7sETk2w38qKq8ut7XNGuof2TUvFzjdPk="; }; nativeBuildInputs = [ @@ -431,12 +431,12 @@ let stdenv; pname = "local-ai"; - version = "2.20.1"; + version = "2.22.0"; src = fetchFromGitHub { owner = "go-skynet"; repo = "LocalAI"; rev = "v${version}"; - hash = "sha256-FeZZC0Tg9JT9Yj0e27GOLSdHEtWl17AHK3j7epwPyY8="; + hash = "sha256-EwBgw0WXnK3E3ZyA1+Xk/o7Te7OCJWi7njefA4PDUJ0="; }; prepare-sources = @@ -457,10 +457,10 @@ let ${cp} ${if with_tinydream then go-tiny-dream else go-tiny-dream.src} sources/go-tiny-dream ''; - self = buildGoModule.override { stdenv = effectiveStdenv; } { + self = buildGo123Module.override { stdenv = effectiveStdenv; } { inherit pname version src; - vendorHash = "sha256-mDxp5frUIECSHKjxaJVqIP7mnIusvdT45Xlxc9+P5tE="; + vendorHash = "sha256-tb2nVUCUdaOWHpJz4zMqgfJ4PYUqGwV/0lj76n36sUg="; env.NIX_CFLAGS_COMPILE = lib.optionalString with_stablediffusion " -isystem ${opencv}/include/opencv4"; diff --git a/third_party/nixpkgs/pkgs/by-name/lo/localsend/package.nix b/third_party/nixpkgs/pkgs/by-name/lo/localsend/package.nix index 46715ac5e8..2c282b62b6 100644 --- a/third_party/nixpkgs/pkgs/by-name/lo/localsend/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lo/localsend/package.nix @@ -5,6 +5,7 @@ fetchFromGitHub, flutter324, makeDesktopItem, + copyDesktopItems, nixosTests, pkg-config, libayatana-appindicator, @@ -35,30 +36,37 @@ let "permission_handler_windows" = "sha256-+TP3neqlQRZnW6BxHaXr2EbmdITIx1Yo7AEn5iwAhwM="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + copyDesktopItems + ]; buildInputs = [ libayatana-appindicator ]; + postUnpack = '' + substituteInPlace $sourceRoot/linux/my_application.cc \ + --replace-fail "gtk_widget_realize(GTK_WIDGET(window))" "gtk_widget_show(GTK_WIDGET(window))" + ''; + postInstall = '' for s in 32 128 256 512; do d=$out/share/icons/hicolor/''${s}x''${s}/apps mkdir -p $d ln -s $out/app/data/flutter_assets/assets/img/logo-''${s}.png $d/localsend.png done - mkdir -p $out/share/applications - cp $desktopItem/share/applications/*.desktop $out/share/applications - substituteInPlace $out/share/applications/*.desktop --subst-var out ''; - desktopItem = makeDesktopItem { - name = "LocalSend"; - exec = "@out@/bin/localsend_app"; - icon = "localsend"; - desktopName = "LocalSend"; - startupWMClass = "localsend_app"; - genericName = "An open source cross-platform alternative to AirDrop"; - categories = [ "Network" ]; - }; + desktopItems = [ + (makeDesktopItem { + name = "LocalSend"; + exec = "localsend_app"; + icon = "localsend"; + desktopName = "LocalSend"; + startupWMClass = "localsend_app"; + genericName = "An open source cross-platform alternative to AirDrop"; + categories = [ "Network" ]; + }) + ]; passthru = { updateScript = ./update.sh; diff --git a/third_party/nixpkgs/pkgs/by-name/lr/lrcget/package.nix b/third_party/nixpkgs/pkgs/by-name/lr/lrcget/package.nix index 0d77c2d09f..8ec4bfc21e 100644 --- a/third_party/nixpkgs/pkgs/by-name/lr/lrcget/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lr/lrcget/package.nix @@ -2,7 +2,7 @@ dbus, openssl, gtk3, - webkitgtk, + webkitgtk_4_0, pkg-config, wrapGAppsHook3, fetchFromGitHub, @@ -70,7 +70,7 @@ rustPlatform.buildRustPackage rec { gtk3 ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - webkitgtk + webkitgtk_4_0 alsa-lib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/luakit/default.nix b/third_party/nixpkgs/pkgs/by-name/lu/luakit/package.nix similarity index 55% rename from third_party/nixpkgs/pkgs/applications/networking/browsers/luakit/default.nix rename to third_party/nixpkgs/pkgs/by-name/lu/luakit/package.nix index 6011755e38..d9f46d3b79 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/luakit/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/lu/luakit/package.nix @@ -1,50 +1,58 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, wrapGAppsHook3 -, help2man -, glib-networking -, gst_all_1 -, gtk3 -, luafilesystem -, luajit -, sqlite -, webkitgtk +{ + lib, + fetchFromGitHub, + glib-networking, + gst_all_1, + gtk3, + help2man, + luajit, + luajitPackages, + pkg-config, + sqlite, + stdenv, + webkitgtk_4_0, + wrapGAppsHook3, }: -stdenv.mkDerivation rec { +let + inherit (luajitPackages) luafilesystem; +in +stdenv.mkDerivation (finalAttrs: { pname = "luakit"; version = "2.3.3"; src = fetchFromGitHub { owner = "luakit"; - repo = pname; - rev = version; + repo = "luakit"; + rev = finalAttrs.version; hash = "sha256-DtoixcLq+ddbacTAo+Qq6q4k1i6thirACw1zqUeOxXo="; }; nativeBuildInputs = [ + luajit pkg-config help2man wrapGAppsHook3 ]; - buildInputs = [ - gtk3 - glib-networking # TLS support - luafilesystem - luajit - sqlite - webkitgtk - ] ++ ( with gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-good - gst-plugins-bad - gst-plugins-ugly - gst-libav - ]); + buildInputs = + [ + glib-networking # TLS support + gtk3 + luafilesystem + sqlite + webkitgtk_4_0 + ] + ++ (with gst_all_1; [ + gst-libav + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gstreamer + ]); + + strictDeps = true; # build-utils/docgen/gen.lua:2: module 'lib.lousy.util' not found # TODO: why is not this the default? The test runner adds @@ -63,20 +71,21 @@ stdenv.mkDerivation rec { "XDGPREFIX=${placeholder "out"}/etc/xdg" ]; - preFixup = let - luaKitPath = "$out/share/luakit/lib/?/init.lua;$out/share/luakit/lib/?.lua"; - in '' - gappsWrapperArgs+=( - --prefix XDG_CONFIG_DIRS : "$out/etc/xdg" - --prefix LUA_PATH ';' "${luaKitPath};$LUA_PATH" - --prefix LUA_CPATH ';' "$LUA_CPATH" - ) - ''; + preFixup = + let + luaKitPath = "$out/share/luakit/lib/?/init.lua;$out/share/luakit/lib/?.lua"; + in + '' + gappsWrapperArgs+=( + --prefix XDG_CONFIG_DIRS : "$out/etc/xdg" + --prefix LUA_PATH ';' "${luaKitPath};$LUA_PATH" + --prefix LUA_CPATH ';' "$LUA_CPATH" + ) + ''; - meta = with lib; { + meta = { homepage = "https://luakit.github.io/"; description = "Fast, small, webkit-based browser framework extensible in Lua"; - mainProgram = "luakit"; longDescription = '' Luakit is a highly configurable browser framework based on the WebKit web content engine and the GTK+ toolkit. It is very fast, extensible with Lua, @@ -84,8 +93,9 @@ stdenv.mkDerivation rec { power users, developers and anyone who wants to have fine-grained control over their web browser’s behaviour and interface. ''; - license = licenses.gpl3Only; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Only; + mainProgram = "luakit"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/lu/lutgen/package.nix b/third_party/nixpkgs/pkgs/by-name/lu/lutgen/package.nix index 5c1cd965ef..151b01cb7b 100644 --- a/third_party/nixpkgs/pkgs/by-name/lu/lutgen/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lu/lutgen/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "lutgen"; - version = "0.11.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "ozwaldorf"; repo = "lutgen-rs"; rev = "v${version}"; - hash = "sha256-ybaapL9OUUQ+sO8P0JH1MuxCFmTihKp9gXJpM7KLY7U="; + hash = "sha256-jmMVeDDVb/TuxulDYj+8y4Kl42EJTAWb3tAsanfWduE="; }; - cargoHash = "sha256-Fxecnq7QKcDe6aAsKj9uye3sFdfkgFEKYmdqnvQDiAQ="; + cargoHash = "sha256-cT999TukdiKmmNUpK7SE1uiuNoLhmjdtz/2cYXFC6dk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/by-name/lx/lxgw-wenkai-screen/package.nix b/third_party/nixpkgs/pkgs/by-name/lx/lxgw-wenkai-screen/package.nix index 8719113c42..d241185c5f 100644 --- a/third_party/nixpkgs/pkgs/by-name/lx/lxgw-wenkai-screen/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lx/lxgw-wenkai-screen/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "lxgw-wenkai-screen"; - version = "1.330"; + version = "1.501"; src = fetchurl { url = "https://github.com/lxgw/LxgwWenKai-Screen/releases/download/v${finalAttrs.version}/LXGWWenKaiScreen.ttf"; - hash = "sha256-3C6gZmL5Bn6+26TfI2UdCCnGI8Vw4UTFJRc8n6qlP5o="; + hash = "sha256-em3uh53neN8v1ueiw1rWVtC0bteD7IG3X1g9tkjBRJA="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/data/fonts/lxgw-wenkai/default.nix b/third_party/nixpkgs/pkgs/by-name/lx/lxgw-wenkai/package.nix similarity index 76% rename from third_party/nixpkgs/pkgs/data/fonts/lxgw-wenkai/default.nix rename to third_party/nixpkgs/pkgs/by-name/lx/lxgw-wenkai/package.nix index 8c18f3ed1b..38fea5286a 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/lxgw-wenkai/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/lx/lxgw-wenkai/package.nix @@ -1,12 +1,16 @@ -{ lib, stdenvNoCC, fetchurl }: +{ + lib, + stdenvNoCC, + fetchurl, +}: stdenvNoCC.mkDerivation rec { pname = "lxgw-wenkai"; - version = "1.330"; + version = "1.500"; src = fetchurl { url = "https://github.com/lxgw/LxgwWenKai/releases/download/v${version}/${pname}-v${version}.tar.gz"; - hash = "sha256-CscUUcyLsk/S70tT2uGRqLiF8fa4KxC9pVrOziWJ/fI="; + hash = "sha256-5cQSHrL/kllmsrOSEHDhsiIa3PXpDh5ELrCnVh/9pxI="; }; installPhase = '' @@ -23,6 +27,6 @@ stdenvNoCC.mkDerivation rec { description = "Open-source Chinese font derived from Fontworks' Klee One"; license = licenses.ofl; platforms = platforms.all; - maintainers = with maintainers; [ elliot ]; + maintainers = with maintainers; [ ryanccn ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ma/magic-vlsi/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/magic-vlsi/package.nix index 28b1b91ae1..04ec3c0802 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/magic-vlsi/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/magic-vlsi/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "magic-vlsi"; - version = "8.3.486"; + version = "8.3.497"; src = fetchurl { url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz"; - sha256 = "sha256-RLAA97roY41imjxehEFzF+peLmrS+rTQkVua+8dxKDY="; + sha256 = "sha256-toLywrRtaoA8m2YCgwsKRGif4c5nLOt5eFRDp+ZX8/M="; }; nativeBuildInputs = [ python3 ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ma/maltego/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/maltego/package.nix index 3af5602ca8..b14e975dab 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/maltego/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/maltego/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "maltego"; - version = "4.7.0"; + version = "4.8.0"; src = fetchzip { url = "https://downloads.maltego.com/maltego-v4/linux/Maltego.v${finalAttrs.version}.linux.zip"; - hash = "sha256-dPpkIoWK/mzC9wD+3QTNv3tYG27QVgCxtAymkwjIwUY="; + hash = "sha256-BWLdgaAO905lhFiRbpCJUa/7JyfCiRjHwq2qZw2GjgQ="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/by-name/ma/marwaita-icons/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/marwaita-icons/package.nix index 022e56b834..73c40ae4b2 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/marwaita-icons/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/marwaita-icons/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "marwaita-icons"; - version = "5.0"; + version = "5.1"; src = fetchFromGitHub { owner = "darkomarko42"; repo = "marwaita-icons"; rev = version; - hash = "sha256-6NFCXj80VAoFX+i4By5IpbtJC4qL+sAzlLHUJjTQ/sI="; + hash = "sha256-UehujziT13kA9ltjyCvbSDTEpR8ISxoBpoLj22Zih8k="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/mattermost/matterircd.nix b/third_party/nixpkgs/pkgs/by-name/ma/matterircd/package.nix similarity index 91% rename from third_party/nixpkgs/pkgs/servers/mattermost/matterircd.nix rename to third_party/nixpkgs/pkgs/by-name/ma/matterircd/package.nix index 3aba439aff..11fc0080a9 100644 --- a/third_party/nixpkgs/pkgs/servers/mattermost/matterircd.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/matterircd/package.nix @@ -20,6 +20,6 @@ buildGoModule rec { mainProgram = "matterircd"; homepage = "https://github.com/42wim/matterircd"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ numinit ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/mattermost/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mattermost/package.nix similarity index 92% rename from third_party/nixpkgs/pkgs/servers/mattermost/default.nix rename to third_party/nixpkgs/pkgs/by-name/ma/mattermost/package.nix index fd66967da0..d1d1a278ff 100644 --- a/third_party/nixpkgs/pkgs/servers/mattermost/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/mattermost/package.nix @@ -12,13 +12,13 @@ buildGoModule rec { # See https://docs.mattermost.com/upgrade/extended-support-release.html # When a new ESR version is available (e.g. 8.1.x -> 9.5.x), update # the version regex in passthru.updateScript as well. - version = "9.5.9"; + version = "9.5.11"; src = fetchFromGitHub { owner = "mattermost"; repo = "mattermost"; rev = "v${version}"; - hash = "sha256-mGTLn1aV6pB/ubqtYYF1zNRAaLj5IsdQTLhf1LzcNho="; + hash = "sha256-kPsBQjBMHxh5EGTFPNceE51nSEKSu6ieifIAV8PjpAc="; }; # Needed because buildGoModule does not support go workspaces yet. @@ -34,14 +34,14 @@ buildGoModule rec { webapp = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - hash = "sha256-TgaRDIxGBoow1//99bGpp91HNYgdWRnoS09EDAFcHDs="; + hash = "sha256-dRB0CqUoEIkCDlH/vcn/S1TLlhz9iWp61WM2kk+ToZk="; }; # Makes nix-update-script pick up the fetchurl for the webapp. # https://github.com/Mic92/nix-update/blob/1.3.1/nix_update/eval.py#L179 offlineCache = webapp; - vendorHash = "sha256-TJCtgNf56A1U0EbV5gXjTro+YudVBRWiSZoBC3nJxnE="; + vendorHash = "sha256-3IiW5ZAMX0bbN65iFgD2CH3BmXd1Uv2HgcCqY8VQgrA="; modRoot = "./server"; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/by-name/ma/maven/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/maven/package.nix index aa6ba47901..d48e0448ea 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/maven/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/maven/package.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "maven"; - version = "3.9.8"; + version = "3.9.9"; src = fetchurl { url = "mirror://apache/maven/maven-3/${finalAttrs.version}/binaries/apache-maven-${finalAttrs.version}-bin.tar.gz"; - hash = "sha256-BnZyYpB1t0Dj0Kko4hAh3WFaUyh6821MzKROh+CB0QI="; + hash = "sha256-epzfZ0/BcD1jgvXzMLPREOobUStR8WUoRtnk6KWI12Y="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/by-name/mc/mcpp/package.nix b/third_party/nixpkgs/pkgs/by-name/mc/mcpp/package.nix index 9db55e29cc..b1785a3e05 100644 --- a/third_party/nixpkgs/pkgs/by-name/mc/mcpp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mc/mcpp/package.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation (finalAttrs: { hash= "sha256-T4feegblOeG+NU+c+PAobf8HT8KDSfcINkRAa1hNpkY="; }; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + }; + patches = [ ./readlink.patch ]; diff --git a/third_party/nixpkgs/pkgs/servers/mediamtx/default.nix b/third_party/nixpkgs/pkgs/by-name/me/mediamtx/package.nix similarity index 79% rename from third_party/nixpkgs/pkgs/servers/mediamtx/default.nix rename to third_party/nixpkgs/pkgs/by-name/me/mediamtx/package.nix index 58c3bab2b1..b0cc36acef 100644 --- a/third_party/nixpkgs/pkgs/servers/mediamtx/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/me/mediamtx/package.nix @@ -15,26 +15,27 @@ in buildGoModule rec { pname = "mediamtx"; # check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "bluenviron"; repo = pname; rev = "v${version}"; - hash = "sha256-DCt0P0DHlWFAQ5i4+7U5+Q2XcCPlSZrlj+Ljcyg/Wj0="; + hash = "sha256-aHVSGyrLuLX/RYf1I1dDackmOeU3m24QcwBus4Uly0I="; }; - vendorHash = "sha256-YKNNQPEdO8K7Lpm/S86GKD3QcNcyvwZSrBspZJMJ78Y="; + vendorHash = "sha256-YpwbFCfI2kfmX3nI1G9OGUv5qpZ/JMis5VyUkqsESZA="; postPatch = '' cp ${hlsJs} internal/servers/hls/hls.min.js + echo "v${version}" > internal/core/VERSION ''; + subPackages = [ "." ]; + # Tests need docker doCheck = false; - ldflags = [ "-X github.com/bluenviron/mediamtx/internal/core.version=v${version}" ]; - passthru.tests = { inherit (nixosTests) mediamtx; }; diff --git a/third_party/nixpkgs/pkgs/by-name/me/megatools/package.nix b/third_party/nixpkgs/pkgs/by-name/me/megatools/package.nix index 6e744f5d4b..aaf0549e8f 100644 --- a/third_party/nixpkgs/pkgs/by-name/me/megatools/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/me/megatools/package.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { pname = "megatools"; - version = "1.11.0"; + version = "1.11.1"; src = fetchgit { url = "https://megous.com/git/megatools"; rev = version; - sha256 = "sha256-Q9hMJBQBenufubbmeAw8Q8w+Oo+UcZLWathKNDwTv3s="; + sha256 = "sha256-AdvQqaRTsKTqdfNfFiWtA9mIPVGuui+Ru9TUARVG0+Q="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/me/memorado/package.nix b/third_party/nixpkgs/pkgs/by-name/me/memorado/package.nix index e7282d01d9..924c906a5e 100644 --- a/third_party/nixpkgs/pkgs/by-name/me/memorado/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/me/memorado/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "memorado"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "wbernard"; repo = "Memorado"; rev = "refs/tags/${version}"; - hash = "sha256-bArcYUHSfpjYsySGZco4fmb6bKRFtG6efhzNSqUROX0="; + hash = "sha256-yWu2+VAa5FkpLs/KLI0lcNzFLGN/kiq6frtW8SHN+W4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/me/meson/006-disable-bitcode.patch b/third_party/nixpkgs/pkgs/by-name/me/meson/006-disable-bitcode.patch index a72997c104..d4aa6a271a 100644 --- a/third_party/nixpkgs/pkgs/by-name/me/meson/006-disable-bitcode.patch +++ b/third_party/nixpkgs/pkgs/by-name/me/meson/006-disable-bitcode.patch @@ -1,6 +1,8 @@ +diff --git a/mesonbuild/compilers/mixins/clang.py b/mesonbuild/compilers/mixins/clang.py +index d99dc3abf..6b8f75165 100644 --- a/mesonbuild/compilers/mixins/clang.py +++ b/mesonbuild/compilers/mixins/clang.py -@@ -56,10 +56,6 @@ class ClangCompiler(GnuLikeCompiler): +@@ -54,11 +54,7 @@ class ClangCompiler(GnuLikeCompiler): {OptionKey('b_colorout'), OptionKey('b_lto_threads'), OptionKey('b_lto_mode'), OptionKey('b_thinlto_cache'), OptionKey('b_thinlto_cache_dir')}) @@ -8,12 +10,16 @@ - # linkers don't have base_options. - if isinstance(self.linker, AppleDynamicLinker): - self.base_options.add(OptionKey('b_bitcode')) +- elif isinstance(self.linker, MSVCDynamicLinker): ++ if isinstance(self.linker, MSVCDynamicLinker): + self.base_options.add(OptionKey('b_vscrt')) # All Clang backends can also do LLVM IR self.can_compile_suffixes.add('ll') - +diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py +index 4eec82edd..6db5c6af0 100644 --- a/mesonbuild/linkers/linkers.py +++ b/mesonbuild/linkers/linkers.py -@@ -785,7 +785,7 @@ class AppleDynamicLinker(PosixDynamicLinkerMixin, DynamicLinker): +@@ -796,7 +796,7 @@ class AppleDynamicLinker(PosixDynamicLinkerMixin, DynamicLinker): return self._apply_prefix('-headerpad_max_install_names') def bitcode_args(self) -> T.List[str]: diff --git a/third_party/nixpkgs/pkgs/by-name/me/meson/package.nix b/third_party/nixpkgs/pkgs/by-name/me/meson/package.nix index db59daf3a6..d463190fec 100644 --- a/third_party/nixpkgs/pkgs/by-name/me/meson/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/me/meson/package.nix @@ -21,13 +21,13 @@ let in python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "mesonbuild"; repo = "meson"; rev = "refs/tags/${version}"; - hash = "sha256-BqsEO1a93a8d7/UH232buSPBt+WSNJbw1DGYA2nm9rs="; + hash = "sha256-cesMepnD3fHX2CwnSQ3c5TE9kPSa0FkCVVVZDgXwo8M="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/by-name/me/metacubexd/package.nix b/third_party/nixpkgs/pkgs/by-name/me/metacubexd/package.nix index 6b5b6c7e8f..5986155ee0 100644 --- a/third_party/nixpkgs/pkgs/by-name/me/metacubexd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/me/metacubexd/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "metacubexd"; - version = "1.150.0"; + version = "1.151.0"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "metacubexd"; rev = "v${finalAttrs.version}"; - hash = "sha256-UItmZmrcCSO7705TzEO80IVGSsCrDjm9Apw17XAQ9jY="; + hash = "sha256-H6zMEicE9RT84NJmmcihw46TDOSE0HhUoIRIrpNxM+c="; }; nativeBuildInputs = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-jIotwZmFzzv3jN4iXV4aonxnVDuIGzxNH8RGD0r7t0c="; + hash = "sha256-XwIcwvTcB4vO5tqJ/jdqgkTrkmN3H0e3q5eDNOvUrcA="; }; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/me/metadata/package.nix b/third_party/nixpkgs/pkgs/by-name/me/metadata/package.nix index 23f20f5345..03e8666009 100644 --- a/third_party/nixpkgs/pkgs/by-name/me/metadata/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/me/metadata/package.nix @@ -1,7 +1,7 @@ { lib , fetchFromGitHub , pkg-config -, ffmpeg_7 +, ffmpeg , rustPlatform , glib , installShellFiles @@ -35,11 +35,11 @@ rustPlatform.buildRustPackage rec { ''; buildInputs = [ - ffmpeg_7 + ffmpeg glib ]; - env.FFMPEG_DIR = ffmpeg_7.dev; + env.FFMPEG_DIR = ffmpeg.dev; meta = { description = "Media metadata parser and formatter designed for human consumption, powered by FFmpeg"; diff --git a/third_party/nixpkgs/pkgs/by-name/mi/microsoft-identity-broker/package.nix b/third_party/nixpkgs/pkgs/by-name/mi/microsoft-identity-broker/package.nix index 2866d38da4..3d467d2155 100644 --- a/third_party/nixpkgs/pkgs/by-name/mi/microsoft-identity-broker/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mi/microsoft-identity-broker/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/m/microsoft-identity-broker/microsoft-identity-broker_${version}_amd64.deb"; - hash = "sha256-O9zbImSWMrRsaOozj5PsCRvQ3UsaJzLfoTohmLZvLkM="; + hash = "sha256-I4Q6ucT6ps8/QGiQTNbMXcKxq6UMcuwJ0Prcqvov56M="; }; nativeBuildInputs = [ dpkg makeWrapper openjdk11 zip ]; diff --git a/third_party/nixpkgs/pkgs/by-name/mi/microsoft-identity-broker/update.sh b/third_party/nixpkgs/pkgs/by-name/mi/microsoft-identity-broker/update.sh index f91583a761..ecd363cfc4 100755 --- a/third_party/nixpkgs/pkgs/by-name/mi/microsoft-identity-broker/update.sh +++ b/third_party/nixpkgs/pkgs/by-name/mi/microsoft-identity-broker/update.sh @@ -12,15 +12,19 @@ echo "$index_file" | while read -r line; do if [[ "$line" =~ ^Version:[[:space:]]*(.*) ]]; then Version="${BASH_REMATCH[1]}" fi + if [[ "$line" =~ ^SHA256:[[:space:]]*(.*) ]]; then + SHA256="${BASH_REMATCH[1]}" + fi if ! [[ "$line" ]] && [[ "${Package}" == "microsoft-identity-broker" ]]; then if ( dpkg --compare-versions ${Version} gt ${latest_version} ); then latest_version="${Version}" + sri_hash=$(nix-hash --to-sri --type sha256 "$SHA256") - echo $latest_version + echo $latest_version $sri_hash fi Package="" Version="" fi -done | tail -n 1 | (read version; update-source-version microsoft-identity-broker $version) +done | tail -n 1 | (read version hash; update-source-version microsoft-identity-broker $version $hash) diff --git a/third_party/nixpkgs/pkgs/by-name/mi/mihomo-party/package.nix b/third_party/nixpkgs/pkgs/by-name/mi/mihomo-party/package.nix new file mode 100644 index 0000000000..80df07cd6c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/mi/mihomo-party/package.nix @@ -0,0 +1,79 @@ +{ + lib, + stdenv, + fetchurl, + dpkg, + wrapGAppsHook3, + autoPatchelfHook, + nss, + nspr, + alsa-lib, + openssl, + webkitgtk_4_0, + udev, + libayatana-appindicator, + libGL, +}: +let + pname = "mihomo-party"; + version = "1.4.5"; + src = fetchurl { + url = "https://github.com/mihomo-party-org/mihomo-party/releases/download/v${version}/mihomo-party-linux-${version}-amd64.deb"; + hash = "sha256-O332nt2kgpDGY84S78Tx2PGUw1Pyj80ab2ZE3woYm4Y="; + }; +in +stdenv.mkDerivation { + inherit pname version src; + + nativeBuildInputs = [ + dpkg + wrapGAppsHook3 + autoPatchelfHook + ]; + + buildInputs = [ + nss + nspr + alsa-lib + openssl + webkitgtk_4_0 + stdenv.cc.cc.lib + ]; + + runtimeDependencies = map lib.getLib [ + udev + libayatana-appindicator + ]; + + installPhase = '' + runHook preInstall + + mkdir $out + cp -r opt/mihomo-party usr/share $out + substituteInPlace $out/share/applications/mihomo-party.desktop \ + --replace-fail "/opt/mihomo-party/mihomo-party" "mihomo-party" + + runHook postInstall + ''; + + preFixup = '' + mkdir $out/bin + makeWrapper $out/mihomo-party/mihomo-party $out/bin/mihomo-party \ + --prefix LD_LIBRARY_PATH : "${ + lib.makeLibraryPath [ + libGL + ] + }" + ''; + + meta = { + description = "Another Mihomo GUI"; + homepage = "https://github.com/mihomo-party-org/mihomo-party"; + mainProgram = "mihomo-party"; + platforms = with lib.platforms; linux ++ darwin; + broken = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64); + license = lib.licenses.gpl3Plus; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ aucub ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/mi/mingtest/package.nix b/third_party/nixpkgs/pkgs/by-name/mi/mingtest/package.nix index 78ea3d7b99..af847cd2f7 100644 --- a/third_party/nixpkgs/pkgs/by-name/mi/mingtest/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mi/mingtest/package.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "mingtest"; - version = "0.1.9"; + version = "0.2.1"; src = fetchFromGitHub { owner = "craflin"; repo = "mingtest"; rev = "refs/tags/${version}"; - hash = "sha256-Iy2KvFCFk+uoztTVxTY7HMdc5GI4gSGqGmbJePJ5CO8="; + hash = "sha256-buFr5w+3YJ2gJeQ8YTsFrUMU9hWq/iAJ6cW6ykvETfM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/by-name/mi/misskey/package.nix b/third_party/nixpkgs/pkgs/by-name/mi/misskey/package.nix index b655159815..bc63c78924 100644 --- a/third_party/nixpkgs/pkgs/by-name/mi/misskey/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mi/misskey/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "misskey"; - version = "2024.5.0"; + version = "2024.10.0"; src = fetchFromGitHub { owner = "misskey-dev"; repo = finalAttrs.pname; rev = finalAttrs.version; - hash = "sha256-nKf+SfuF6MQtNO53E6vN9CMDvQzKMv3PrD6gs9Qa86w="; + hash = "sha256-cQ8JQnnaS6aX2wZdnimTznHj20hJe0CJ4NESybCk9CU="; fetchSubmodules = true; }; @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { # https://nixos.org/manual/nixpkgs/unstable/#javascript-pnpm pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-A1JBLa6lIw5tXFuD2L3vvkH6pHS5rlwt8vU2+UUQYdg="; + hash = "sha256-ZEBrYqLc0+yKbroSWk01UZwA97CyOVPhqgqFArM2U8g="; }; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/mj/mjmap/package.nix b/third_party/nixpkgs/pkgs/by-name/mj/mjmap/package.nix new file mode 100644 index 0000000000..8751757fb5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/mj/mjmap/package.nix @@ -0,0 +1,42 @@ +{ + lib, + buildGoModule, + fetchFromSourcehut, + unstableGitUpdater, +}: + +buildGoModule { + pname = "mjmap"; + version = "0.1.0-unstable-2023-11-13"; + + src = fetchFromSourcehut { + owner = "~rockorager"; + repo = "mjmap"; + rev = "d54badae8152b4db6eec8b03a7bd7c5ff1724aa7"; + hash = "sha256-yFYYnklNNOHTfoT54kOIVoM4t282/0Ir4l72GmqlGSY="; + }; + + vendorHash = "sha256-fJuPrzjRH0FpYj2D9CsFdsdzYT0C3/D2PhmJIZTsgfQ="; + + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/mjmap --version >/dev/null + + runHook postInstallCheck + ''; + + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v."; + }; + + meta = { + description = "Sendmail‐compatible JMAP client"; + homepage = "https://git.sr.ht/~rockorager/mjmap"; + license = lib.licenses.mpl20; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + maintainers = [ lib.maintainers.emily ]; + mainProgram = "mjmap"; + platforms = lib.platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/mk/mkuimage/package.nix b/third_party/nixpkgs/pkgs/by-name/mk/mkuimage/package.nix new file mode 100644 index 0000000000..355b69a372 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/mk/mkuimage/package.nix @@ -0,0 +1,57 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + coreutils, + bash, + stdenv, +}: + +buildGoModule { + pname = "mkuimage"; + version = "0-unstable-2024-02-28"; + + src = fetchFromGitHub { + owner = "u-root"; + repo = "mkuimage"; + rev = "899a47eaaa318bd2327dc94d964ccda40a784037"; + hash = "sha256-sb/LtwAN7RN8jWG/x6pomz2Q+vKekA/teC7U5NVb2qY="; + }; + + vendorHash = "sha256-KX9uv5m4N4+7gOgjhotRac9sz8tWSJ1krq98RWdsbzg="; + + subPackages = [ + "cmd/gentpldeps" + "cmd/mkuimage" + ]; + + CGO_ENABLED = "0"; + + ldflags = [ "-s" ]; + + # Tests are failing on darwin as they try to compile u-root binaries + # that only work on linux. + # + # Notice that due to some legacy/bug in buildGoModule, the build isn't + # failing even the tests are, as we get a false-positive the output + # filtering: https://github.com/NixOS/nixpkgs/issues/349468 + doCheck = stdenv.isLinux; + + # The tests want to copy /bin/bash and /bin/ls, but we don't have those. + # As these are interesting e2e tests to check if things work, we substitute + # them with the actual paths instead of just skipping the tests. + preCheck = '' + substituteInPlace ./cmd/mkuimage/main_test.go \ + --replace-fail '-files=/bin/bash"' '-files=${bash}/bin/bash:bin/bash"' \ + --replace-fail '-files=/bin/ls"' '-files=${coreutils}/bin/ls:bin/ls"' \ + --replace-fail '-files=/bin/bash' '-files=${bash}/bin/bash' + ''; + + meta = { + description = "Create small Go-based root file systems -- with support for CPIOs and (TBD) Docker images"; + homepage = "https://github.com/u-root/mkuimage"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ katexochen ]; + mainProgram = "mkuimage"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ml/mlx42/package.nix b/third_party/nixpkgs/pkgs/by-name/ml/mlx42/package.nix index c5537d5f2c..72b9f9cc3d 100644 --- a/third_party/nixpkgs/pkgs/by-name/ml/mlx42/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ml/mlx42/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mlx42"; - version = "2.3.4"; + version = "2.4.0"; src = fetchFromGitHub { owner = "codam-coding-college"; repo = "MLX42"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-c4LoTePHhQeZTx33V1K3ZyXmT7vjB6NdkGVAiSuJKfI="; + hash = "sha256-jYcBvvx0Xfc/wDWSUROfQeRvn+tWvSS0ymKO1iuzg8w="; }; postPatch = diff --git a/third_party/nixpkgs/pkgs/by-name/mo/modprobed-db/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/modprobed-db/package.nix index 84edaa3f63..c321aa6199 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/modprobed-db/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/modprobed-db/package.nix @@ -9,7 +9,7 @@ }: let pname = "modprobed-db"; - version = "2.47"; + version = "2.48"; in stdenv.mkDerivation { inherit pname version; @@ -18,7 +18,7 @@ stdenv.mkDerivation { owner = "graysky2"; repo = "modprobed-db"; rev = "v${version}"; - hash = "sha256-r/2ZENricRE03eyFnWDnfPNAz2863/9HKlF6a2xOkc0="; + hash = "sha256-rMkPBRg0QluMmSCAWSvET7rS/A2aUL6H31KKoZ6NTEs="; }; strictDeps = true; 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 c53296c3b0..3d43797b9b 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 @@ -19,7 +19,7 @@ nodejs, openssl, pkg-config, - webkitgtk, + webkitgtk_4_0, }: rustPlatform.buildRustPackage { pname = "modrinth-app-unwrapped"; @@ -87,7 +87,7 @@ rustPlatform.buildRustPackage { [ openssl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libsoup - webkitgtk + webkitgtk_4_0 ] ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; 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 b96a53f974..cb23072648 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.34.0"; + version = "2.34.1"; src = fetchFromGitHub { owner = "rui314"; repo = "mold"; rev = "v${version}"; - hash = "sha256-QH9mtigVqt9ZrVBUyQcgUMW/8jtXHSYDWz6pprt6Hlk="; + hash = "sha256-x5fQ+dJFcxwENyTpZpQsMqTLtYQ8uuhUHV8jDpmltWg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/mo/monado/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/monado/package.nix index 6f420f497e..84719a4fa8 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/monado/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/monado/package.nix @@ -5,6 +5,7 @@ , bluez , cjson , cmake +, config , dbus , doxygen , eigen @@ -51,6 +52,8 @@ , zlib , zstd , nixosTests +, cudaPackages +, enableCuda ? config.cudaSupport # Set as 'false' to build monado without service support, i.e. allow VR # applications linking against libopenxr_monado.so to use OpenXR standalone # instead of via the monado-service program. For more information see: @@ -84,6 +87,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "XRT_HAVE_TRACY" true) (lib.cmakeBool "XRT_FEATURE_TRACING" true) (lib.cmakeBool "XRT_HAVE_STEAM" true) + (lib.optionals enableCuda "-DCUDA_TOOLKIT_ROOT_DIR=${cudaPackages.cudatoolkit}") ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/mo/mongosh/package-lock.json b/third_party/nixpkgs/pkgs/by-name/mo/mongosh/package-lock.json index c8e9e7e051..67c8f25377 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/mongosh/package-lock.json +++ b/third_party/nixpkgs/pkgs/by-name/mo/mongosh/package-lock.json @@ -1,15 +1,15 @@ { "name": "mongosh", - "version": "2.3.1", + "version": "2.3.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mongosh", - "version": "2.3.1", + "version": "2.3.2", "license": "Apache-2.0", "dependencies": { - "@mongosh/cli-repl": "2.3.1" + "@mongosh/cli-repl": "2.3.2" }, "bin": { "mongosh": "bin/mongosh.js" @@ -157,47 +157,47 @@ } }, "node_modules/@aws-sdk/client-cognito-identity": { - "version": "3.665.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.665.0.tgz", - "integrity": "sha512-dHi749JNI85zHnhHDgEFyiXI6ju39i7y7ufT2Kt2oDZg/UgsNs9I3pPqPJzDdRmn86vQi984iwS+y967CtoNqA==", + "version": "3.670.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.670.0.tgz", + "integrity": "sha512-4q/yYdtO/RisGdQ3a2E912YekIpQYvS4TYPYS/onCbTXW/7C8/Ha7yUEncE7Woou0MDXyoVh50UATcJEmUt0+Q==", "license": "Apache-2.0", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/client-sso-oidc": "3.665.0", - "@aws-sdk/client-sts": "3.665.0", - "@aws-sdk/core": "3.665.0", - "@aws-sdk/credential-provider-node": "3.665.0", - "@aws-sdk/middleware-host-header": "3.664.0", - "@aws-sdk/middleware-logger": "3.664.0", - "@aws-sdk/middleware-recursion-detection": "3.664.0", - "@aws-sdk/middleware-user-agent": "3.664.0", - "@aws-sdk/region-config-resolver": "3.664.0", - "@aws-sdk/types": "3.664.0", - "@aws-sdk/util-endpoints": "3.664.0", - "@aws-sdk/util-user-agent-browser": "3.664.0", - "@aws-sdk/util-user-agent-node": "3.664.0", + "@aws-sdk/client-sso-oidc": "3.670.0", + "@aws-sdk/client-sts": "3.670.0", + "@aws-sdk/core": "3.667.0", + "@aws-sdk/credential-provider-node": "3.670.0", + "@aws-sdk/middleware-host-header": "3.667.0", + "@aws-sdk/middleware-logger": "3.667.0", + "@aws-sdk/middleware-recursion-detection": "3.667.0", + "@aws-sdk/middleware-user-agent": "3.669.0", + "@aws-sdk/region-config-resolver": "3.667.0", + "@aws-sdk/types": "3.667.0", + "@aws-sdk/util-endpoints": "3.667.0", + "@aws-sdk/util-user-agent-browser": "3.670.0", + "@aws-sdk/util-user-agent-node": "3.669.0", "@smithy/config-resolver": "^3.0.9", - "@smithy/core": "^2.4.7", + "@smithy/core": "^2.4.8", "@smithy/fetch-http-handler": "^3.2.9", "@smithy/hash-node": "^3.0.7", "@smithy/invalid-dependency": "^3.0.7", "@smithy/middleware-content-length": "^3.0.9", "@smithy/middleware-endpoint": "^3.1.4", - "@smithy/middleware-retry": "^3.0.22", + "@smithy/middleware-retry": "^3.0.23", "@smithy/middleware-serde": "^3.0.7", "@smithy/middleware-stack": "^3.0.7", "@smithy/node-config-provider": "^3.1.8", "@smithy/node-http-handler": "^3.2.4", "@smithy/protocol-http": "^4.1.4", - "@smithy/smithy-client": "^3.3.6", + "@smithy/smithy-client": "^3.4.0", "@smithy/types": "^3.5.0", "@smithy/url-parser": "^3.0.7", "@smithy/util-base64": "^3.0.0", "@smithy/util-body-length-browser": "^3.0.0", "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.22", - "@smithy/util-defaults-mode-node": "^3.0.22", + "@smithy/util-defaults-mode-browser": "^3.0.23", + "@smithy/util-defaults-mode-node": "^3.0.23", "@smithy/util-endpoints": "^2.1.3", "@smithy/util-middleware": "^3.0.7", "@smithy/util-retry": "^3.0.7", @@ -209,44 +209,44 @@ } }, "node_modules/@aws-sdk/client-sso": { - "version": "3.665.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.665.0.tgz", - "integrity": "sha512-zje+oaIiyviDv5dmBWhGHifPTb0Idq/HatNPy+VEiwo2dxcQBexibD5CQE5e8CWZK123Br/9DHft+iNKdiY5bA==", + "version": "3.670.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.670.0.tgz", + "integrity": "sha512-J+oz6uSsDvk4pimMDnKJb1wsV216zTrejvMTIL4RhUD1QPIVVOpteTdUShcjZUIZnkcJZGI+cym/SFK0kuzTpg==", "license": "Apache-2.0", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/core": "3.665.0", - "@aws-sdk/middleware-host-header": "3.664.0", - "@aws-sdk/middleware-logger": "3.664.0", - "@aws-sdk/middleware-recursion-detection": "3.664.0", - "@aws-sdk/middleware-user-agent": "3.664.0", - "@aws-sdk/region-config-resolver": "3.664.0", - "@aws-sdk/types": "3.664.0", - "@aws-sdk/util-endpoints": "3.664.0", - "@aws-sdk/util-user-agent-browser": "3.664.0", - "@aws-sdk/util-user-agent-node": "3.664.0", + "@aws-sdk/core": "3.667.0", + "@aws-sdk/middleware-host-header": "3.667.0", + "@aws-sdk/middleware-logger": "3.667.0", + "@aws-sdk/middleware-recursion-detection": "3.667.0", + "@aws-sdk/middleware-user-agent": "3.669.0", + "@aws-sdk/region-config-resolver": "3.667.0", + "@aws-sdk/types": "3.667.0", + "@aws-sdk/util-endpoints": "3.667.0", + "@aws-sdk/util-user-agent-browser": "3.670.0", + "@aws-sdk/util-user-agent-node": "3.669.0", "@smithy/config-resolver": "^3.0.9", - "@smithy/core": "^2.4.7", + "@smithy/core": "^2.4.8", "@smithy/fetch-http-handler": "^3.2.9", "@smithy/hash-node": "^3.0.7", "@smithy/invalid-dependency": "^3.0.7", "@smithy/middleware-content-length": "^3.0.9", "@smithy/middleware-endpoint": "^3.1.4", - "@smithy/middleware-retry": "^3.0.22", + "@smithy/middleware-retry": "^3.0.23", "@smithy/middleware-serde": "^3.0.7", "@smithy/middleware-stack": "^3.0.7", "@smithy/node-config-provider": "^3.1.8", "@smithy/node-http-handler": "^3.2.4", "@smithy/protocol-http": "^4.1.4", - "@smithy/smithy-client": "^3.3.6", + "@smithy/smithy-client": "^3.4.0", "@smithy/types": "^3.5.0", "@smithy/url-parser": "^3.0.7", "@smithy/util-base64": "^3.0.0", "@smithy/util-body-length-browser": "^3.0.0", "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.22", - "@smithy/util-defaults-mode-node": "^3.0.22", + "@smithy/util-defaults-mode-browser": "^3.0.23", + "@smithy/util-defaults-mode-node": "^3.0.23", "@smithy/util-endpoints": "^2.1.3", "@smithy/util-middleware": "^3.0.7", "@smithy/util-retry": "^3.0.7", @@ -258,45 +258,45 @@ } }, "node_modules/@aws-sdk/client-sso-oidc": { - "version": "3.665.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.665.0.tgz", - "integrity": "sha512-FQ2YyM9/6y3clWkf3d60/W4c/HZy61hbfIsR4KIh8aGOifwfIx/UpZQ61pCr/TXTNqbaAVU2/sK+J1zFkGEoLw==", + "version": "3.670.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.670.0.tgz", + "integrity": "sha512-4qDK2L36Q4J1lfemaHHd9ZxqKRaos3STp44qPAHf/8QyX6Uk5sXgZNVO2yWM7SIEtVKwwBh/fZAsdBkGPBfZcw==", "license": "Apache-2.0", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/core": "3.665.0", - "@aws-sdk/credential-provider-node": "3.665.0", - "@aws-sdk/middleware-host-header": "3.664.0", - "@aws-sdk/middleware-logger": "3.664.0", - "@aws-sdk/middleware-recursion-detection": "3.664.0", - "@aws-sdk/middleware-user-agent": "3.664.0", - "@aws-sdk/region-config-resolver": "3.664.0", - "@aws-sdk/types": "3.664.0", - "@aws-sdk/util-endpoints": "3.664.0", - "@aws-sdk/util-user-agent-browser": "3.664.0", - "@aws-sdk/util-user-agent-node": "3.664.0", + "@aws-sdk/core": "3.667.0", + "@aws-sdk/credential-provider-node": "3.670.0", + "@aws-sdk/middleware-host-header": "3.667.0", + "@aws-sdk/middleware-logger": "3.667.0", + "@aws-sdk/middleware-recursion-detection": "3.667.0", + "@aws-sdk/middleware-user-agent": "3.669.0", + "@aws-sdk/region-config-resolver": "3.667.0", + "@aws-sdk/types": "3.667.0", + "@aws-sdk/util-endpoints": "3.667.0", + "@aws-sdk/util-user-agent-browser": "3.670.0", + "@aws-sdk/util-user-agent-node": "3.669.0", "@smithy/config-resolver": "^3.0.9", - "@smithy/core": "^2.4.7", + "@smithy/core": "^2.4.8", "@smithy/fetch-http-handler": "^3.2.9", "@smithy/hash-node": "^3.0.7", "@smithy/invalid-dependency": "^3.0.7", "@smithy/middleware-content-length": "^3.0.9", "@smithy/middleware-endpoint": "^3.1.4", - "@smithy/middleware-retry": "^3.0.22", + "@smithy/middleware-retry": "^3.0.23", "@smithy/middleware-serde": "^3.0.7", "@smithy/middleware-stack": "^3.0.7", "@smithy/node-config-provider": "^3.1.8", "@smithy/node-http-handler": "^3.2.4", "@smithy/protocol-http": "^4.1.4", - "@smithy/smithy-client": "^3.3.6", + "@smithy/smithy-client": "^3.4.0", "@smithy/types": "^3.5.0", "@smithy/url-parser": "^3.0.7", "@smithy/util-base64": "^3.0.0", "@smithy/util-body-length-browser": "^3.0.0", "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.22", - "@smithy/util-defaults-mode-node": "^3.0.22", + "@smithy/util-defaults-mode-browser": "^3.0.23", + "@smithy/util-defaults-mode-node": "^3.0.23", "@smithy/util-endpoints": "^2.1.3", "@smithy/util-middleware": "^3.0.7", "@smithy/util-retry": "^3.0.7", @@ -307,50 +307,50 @@ "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sts": "^3.665.0" + "@aws-sdk/client-sts": "^3.670.0" } }, "node_modules/@aws-sdk/client-sts": { - "version": "3.665.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.665.0.tgz", - "integrity": "sha512-/OQEaWB1euXhZ/hV+wetDw1tynlrkNKzirzoiFuJ1EQsiIb9Ih/qjUF9KLdF1+/bXbnGu5YvIaAx80YReUchjg==", + "version": "3.670.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.670.0.tgz", + "integrity": "sha512-bExrNo8ZVWorS3cjMZKQnA2HWqDmAzcZoSN/cPVoPFNkHwdl1lzPxvcLzmhpIr48JHgKfybBjrbluDZfIYeEog==", "license": "Apache-2.0", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/client-sso-oidc": "3.665.0", - "@aws-sdk/core": "3.665.0", - "@aws-sdk/credential-provider-node": "3.665.0", - "@aws-sdk/middleware-host-header": "3.664.0", - "@aws-sdk/middleware-logger": "3.664.0", - "@aws-sdk/middleware-recursion-detection": "3.664.0", - "@aws-sdk/middleware-user-agent": "3.664.0", - "@aws-sdk/region-config-resolver": "3.664.0", - "@aws-sdk/types": "3.664.0", - "@aws-sdk/util-endpoints": "3.664.0", - "@aws-sdk/util-user-agent-browser": "3.664.0", - "@aws-sdk/util-user-agent-node": "3.664.0", + "@aws-sdk/client-sso-oidc": "3.670.0", + "@aws-sdk/core": "3.667.0", + "@aws-sdk/credential-provider-node": "3.670.0", + "@aws-sdk/middleware-host-header": "3.667.0", + "@aws-sdk/middleware-logger": "3.667.0", + "@aws-sdk/middleware-recursion-detection": "3.667.0", + "@aws-sdk/middleware-user-agent": "3.669.0", + "@aws-sdk/region-config-resolver": "3.667.0", + "@aws-sdk/types": "3.667.0", + "@aws-sdk/util-endpoints": "3.667.0", + "@aws-sdk/util-user-agent-browser": "3.670.0", + "@aws-sdk/util-user-agent-node": "3.669.0", "@smithy/config-resolver": "^3.0.9", - "@smithy/core": "^2.4.7", + "@smithy/core": "^2.4.8", "@smithy/fetch-http-handler": "^3.2.9", "@smithy/hash-node": "^3.0.7", "@smithy/invalid-dependency": "^3.0.7", "@smithy/middleware-content-length": "^3.0.9", "@smithy/middleware-endpoint": "^3.1.4", - "@smithy/middleware-retry": "^3.0.22", + "@smithy/middleware-retry": "^3.0.23", "@smithy/middleware-serde": "^3.0.7", "@smithy/middleware-stack": "^3.0.7", "@smithy/node-config-provider": "^3.1.8", "@smithy/node-http-handler": "^3.2.4", "@smithy/protocol-http": "^4.1.4", - "@smithy/smithy-client": "^3.3.6", + "@smithy/smithy-client": "^3.4.0", "@smithy/types": "^3.5.0", "@smithy/url-parser": "^3.0.7", "@smithy/util-base64": "^3.0.0", "@smithy/util-body-length-browser": "^3.0.0", "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.22", - "@smithy/util-defaults-mode-node": "^3.0.22", + "@smithy/util-defaults-mode-browser": "^3.0.23", + "@smithy/util-defaults-mode-node": "^3.0.23", "@smithy/util-endpoints": "^2.1.3", "@smithy/util-middleware": "^3.0.7", "@smithy/util-retry": "^3.0.7", @@ -362,18 +362,18 @@ } }, "node_modules/@aws-sdk/core": { - "version": "3.665.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.665.0.tgz", - "integrity": "sha512-nqmNNf7Ml7qDXTIisDv+OYe/rl3nAW4cmR+HxrOCWdhTHe8xRdR5c45VPoh8nv1KIry5xtd+iqPrzzjydes+Og==", + "version": "3.667.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.667.0.tgz", + "integrity": "sha512-pMcDVI7Tmdsc8R3sDv0Omj/4iRParGY+uJtAfF669WnZfDfaBQaix2Mq7+Mu08vdjqO9K3gicFvjk9S1VLmOKA==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.664.0", - "@smithy/core": "^2.4.7", + "@aws-sdk/types": "3.667.0", + "@smithy/core": "^2.4.8", "@smithy/node-config-provider": "^3.1.8", "@smithy/property-provider": "^3.1.7", "@smithy/protocol-http": "^4.1.4", "@smithy/signature-v4": "^4.2.0", - "@smithy/smithy-client": "^3.3.6", + "@smithy/smithy-client": "^3.4.0", "@smithy/types": "^3.5.0", "@smithy/util-middleware": "^3.0.7", "fast-xml-parser": "4.4.1", @@ -384,13 +384,13 @@ } }, "node_modules/@aws-sdk/credential-provider-cognito-identity": { - "version": "3.665.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.665.0.tgz", - "integrity": "sha512-CeoUhCv6tb/xV+fiww+DGzlq04rTgA1S9GP9Bqtkhjjy8B9Gai7DaTAwPB+qcjPAhqCgC/JRZVljWLEt6NEeuA==", + "version": "3.670.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.670.0.tgz", + "integrity": "sha512-l41x9lZtZnzyQ6+8D3i7BwqwG1u7JTfHwJDZmsh+sIbrccLlJm7TfxkegOwUbzJ6JdzdigCIM1cKBc52O8EG9w==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/client-cognito-identity": "3.665.0", - "@aws-sdk/types": "3.664.0", + "@aws-sdk/client-cognito-identity": "3.670.0", + "@aws-sdk/types": "3.667.0", "@smithy/property-provider": "^3.1.7", "@smithy/types": "^3.5.0", "tslib": "^2.6.2" @@ -400,12 +400,13 @@ } }, "node_modules/@aws-sdk/credential-provider-env": { - "version": "3.664.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.664.0.tgz", - "integrity": "sha512-95rE+9Voaco0nmKJrXqfJAxSSkSWqlBy76zomiZrUrv7YuijQtHCW8jte6v6UHAFAaBzgFsY7QqBxs15u9SM7g==", + "version": "3.667.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.667.0.tgz", + "integrity": "sha512-zZbrkkaPc54WXm+QAnpuv0LPNfsts0HPPd+oCECGs7IQRaFsGj187cwvPg9RMWDFZqpm64MdBDoA8OQHsqzYCw==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.664.0", + "@aws-sdk/core": "3.667.0", + "@aws-sdk/types": "3.667.0", "@smithy/property-provider": "^3.1.7", "@smithy/types": "^3.5.0", "tslib": "^2.6.2" @@ -415,17 +416,18 @@ } }, "node_modules/@aws-sdk/credential-provider-http": { - "version": "3.664.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.664.0.tgz", - "integrity": "sha512-svaPwVfWV3g/qjd4cYHTUyBtkdOwcVjC+tSj6EjoMrpZwGUXcCbYe04iU0ARZ6tuH/u3vySbTLOGjSa7g8o9Qw==", + "version": "3.667.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.667.0.tgz", + "integrity": "sha512-sjtybFfERZWiqTY7fswBxKQLvUkiCucOWyqh3IaPo/4nE1PXRnaZCVG0+kRBPrYIxWqiVwytvZzMJy8sVZcG0A==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.664.0", + "@aws-sdk/core": "3.667.0", + "@aws-sdk/types": "3.667.0", "@smithy/fetch-http-handler": "^3.2.9", "@smithy/node-http-handler": "^3.2.4", "@smithy/property-provider": "^3.1.7", "@smithy/protocol-http": "^4.1.4", - "@smithy/smithy-client": "^3.3.6", + "@smithy/smithy-client": "^3.4.0", "@smithy/types": "^3.5.0", "@smithy/util-stream": "^3.1.9", "tslib": "^2.6.2" @@ -435,17 +437,18 @@ } }, "node_modules/@aws-sdk/credential-provider-ini": { - "version": "3.665.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.665.0.tgz", - "integrity": "sha512-CSWBV5GqCkK78TTXq6qx40MWCt90t8rS/O7FIR4nbmoUhG/DysaC1G0om1fSx6k+GWcvIIIsSvD4hdbh8FRWKA==", + "version": "3.670.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.670.0.tgz", + "integrity": "sha512-TB1gacUj75leaTt2JsCTzygDSIk4ksv9uZoR7VenlgFPRktyOeT+fapwIVBeB2Qg7b9uxAY2K5XkKstDZyBEEw==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/credential-provider-env": "3.664.0", - "@aws-sdk/credential-provider-http": "3.664.0", - "@aws-sdk/credential-provider-process": "3.664.0", - "@aws-sdk/credential-provider-sso": "3.665.0", - "@aws-sdk/credential-provider-web-identity": "3.664.0", - "@aws-sdk/types": "3.664.0", + "@aws-sdk/core": "3.667.0", + "@aws-sdk/credential-provider-env": "3.667.0", + "@aws-sdk/credential-provider-http": "3.667.0", + "@aws-sdk/credential-provider-process": "3.667.0", + "@aws-sdk/credential-provider-sso": "3.670.0", + "@aws-sdk/credential-provider-web-identity": "3.667.0", + "@aws-sdk/types": "3.667.0", "@smithy/credential-provider-imds": "^3.2.4", "@smithy/property-provider": "^3.1.7", "@smithy/shared-ini-file-loader": "^3.1.8", @@ -456,22 +459,22 @@ "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sts": "^3.665.0" + "@aws-sdk/client-sts": "^3.670.0" } }, "node_modules/@aws-sdk/credential-provider-node": { - "version": "3.665.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.665.0.tgz", - "integrity": "sha512-cmJfVi4IM0WaKMQvPXhiS5mdIZyCoa04I3D+IEKpD2GAuVZa6tgwqfPyaApFDLjyedGGNFkC4MRgAjCcCl4WFg==", + "version": "3.670.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.670.0.tgz", + "integrity": "sha512-zwNrRYzubk4CaZ7zebeDhxsm8QtNWkbGKopZPOaZSnd5uqUGRcmx4ccVRngWUK68XDP44aEUWC8iU5Pc7btpHQ==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/credential-provider-env": "3.664.0", - "@aws-sdk/credential-provider-http": "3.664.0", - "@aws-sdk/credential-provider-ini": "3.665.0", - "@aws-sdk/credential-provider-process": "3.664.0", - "@aws-sdk/credential-provider-sso": "3.665.0", - "@aws-sdk/credential-provider-web-identity": "3.664.0", - "@aws-sdk/types": "3.664.0", + "@aws-sdk/credential-provider-env": "3.667.0", + "@aws-sdk/credential-provider-http": "3.667.0", + "@aws-sdk/credential-provider-ini": "3.670.0", + "@aws-sdk/credential-provider-process": "3.667.0", + "@aws-sdk/credential-provider-sso": "3.670.0", + "@aws-sdk/credential-provider-web-identity": "3.667.0", + "@aws-sdk/types": "3.667.0", "@smithy/credential-provider-imds": "^3.2.4", "@smithy/property-provider": "^3.1.7", "@smithy/shared-ini-file-loader": "^3.1.8", @@ -483,12 +486,13 @@ } }, "node_modules/@aws-sdk/credential-provider-process": { - "version": "3.664.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.664.0.tgz", - "integrity": "sha512-sQicIw/qWTsmMw8EUQNJXdrWV5SXaZc2zGdCQsQxhR6wwNO2/rZ5JmzdcwUADmleBVyPYk3KGLhcofF/qXT2Ng==", + "version": "3.667.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.667.0.tgz", + "integrity": "sha512-HZHnvop32fKgsNHkdhVaul7UzQ25sEc0j9yqA4bjhtbk0ECl42kj3f1pJ+ZU/YD9ut8lMJs/vVqiOdNThVdeBw==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.664.0", + "@aws-sdk/core": "3.667.0", + "@aws-sdk/types": "3.667.0", "@smithy/property-provider": "^3.1.7", "@smithy/shared-ini-file-loader": "^3.1.8", "@smithy/types": "^3.5.0", @@ -499,14 +503,15 @@ } }, "node_modules/@aws-sdk/credential-provider-sso": { - "version": "3.665.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.665.0.tgz", - "integrity": "sha512-Xe8WW4r70bsetGQG3azFeK/gd+Q4OmNiidtRrG64y/V9TIvIqc7Y/yUZNhEgFkpG19o188VmXg/ulnG3E+MvLg==", + "version": "3.670.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.670.0.tgz", + "integrity": "sha512-5PkA8BOy4q57Vhe9AESoHKZ7vjRbElNPKjXA4qC01xY+DitClRFz4O3B9sMzFp0PHlz9nDVSXXKgq0yzF/nAag==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/client-sso": "3.665.0", - "@aws-sdk/token-providers": "3.664.0", - "@aws-sdk/types": "3.664.0", + "@aws-sdk/client-sso": "3.670.0", + "@aws-sdk/core": "3.667.0", + "@aws-sdk/token-providers": "3.667.0", + "@aws-sdk/types": "3.667.0", "@smithy/property-provider": "^3.1.7", "@smithy/shared-ini-file-loader": "^3.1.8", "@smithy/types": "^3.5.0", @@ -517,12 +522,13 @@ } }, "node_modules/@aws-sdk/credential-provider-web-identity": { - "version": "3.664.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.664.0.tgz", - "integrity": "sha512-10ltP1BfSKRJVXd8Yr5oLbo+VSDskWbps0X3szSsxTk0Dju1xvkz7hoIjylWLvtGbvQ+yb2pmsJYKCudW/4DJg==", + "version": "3.667.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.667.0.tgz", + "integrity": "sha512-t8CFlZMD/1p/8Cli3rvRiTJpjr/8BO64gw166AHgFZYSN2h95L2l1tcW0jpsc3PprA32nLg1iQVKYt4WGM4ugw==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.664.0", + "@aws-sdk/core": "3.667.0", + "@aws-sdk/types": "3.667.0", "@smithy/property-provider": "^3.1.7", "@smithy/types": "^3.5.0", "tslib": "^2.6.2" @@ -531,27 +537,28 @@ "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sts": "^3.664.0" + "@aws-sdk/client-sts": "^3.667.0" } }, "node_modules/@aws-sdk/credential-providers": { - "version": "3.665.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.665.0.tgz", - "integrity": "sha512-NmIvufyx5GiyynZmLmd6s1DKFTAlOlyB2e7wBMqRmsrQo5/+WKWDwWwn7T/QvuyjDJFp35ruucET7YIqePWcHg==", + "version": "3.670.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.670.0.tgz", + "integrity": "sha512-2O7Ditryao7/8pCS4GPP2pba/Ia/rruejKoI8STiSmdgccssHcaHtiJ3mYNkKtRUEdi19ulspfz1nU+Ew4x4fA==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/client-cognito-identity": "3.665.0", - "@aws-sdk/client-sso": "3.665.0", - "@aws-sdk/client-sts": "3.665.0", - "@aws-sdk/credential-provider-cognito-identity": "3.665.0", - "@aws-sdk/credential-provider-env": "3.664.0", - "@aws-sdk/credential-provider-http": "3.664.0", - "@aws-sdk/credential-provider-ini": "3.665.0", - "@aws-sdk/credential-provider-node": "3.665.0", - "@aws-sdk/credential-provider-process": "3.664.0", - "@aws-sdk/credential-provider-sso": "3.665.0", - "@aws-sdk/credential-provider-web-identity": "3.664.0", - "@aws-sdk/types": "3.664.0", + "@aws-sdk/client-cognito-identity": "3.670.0", + "@aws-sdk/client-sso": "3.670.0", + "@aws-sdk/client-sts": "3.670.0", + "@aws-sdk/core": "3.667.0", + "@aws-sdk/credential-provider-cognito-identity": "3.670.0", + "@aws-sdk/credential-provider-env": "3.667.0", + "@aws-sdk/credential-provider-http": "3.667.0", + "@aws-sdk/credential-provider-ini": "3.670.0", + "@aws-sdk/credential-provider-node": "3.670.0", + "@aws-sdk/credential-provider-process": "3.667.0", + "@aws-sdk/credential-provider-sso": "3.670.0", + "@aws-sdk/credential-provider-web-identity": "3.667.0", + "@aws-sdk/types": "3.667.0", "@smithy/credential-provider-imds": "^3.2.4", "@smithy/property-provider": "^3.1.7", "@smithy/types": "^3.5.0", @@ -562,12 +569,12 @@ } }, "node_modules/@aws-sdk/middleware-host-header": { - "version": "3.664.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.664.0.tgz", - "integrity": "sha512-4tCXJ+DZWTq38eLmFgnEmO8X4jfWpgPbWoCyVYpRHCPHq6xbrU65gfwS9jGx25L4YdEce641ChI9TKLryuUgRA==", + "version": "3.667.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.667.0.tgz", + "integrity": "sha512-Z7fIAMQnPegs7JjAQvlOeWXwpMRfegh5eCoIP6VLJIeR6DLfYKbP35JBtt98R6DXslrN2RsbTogjbxPEDQfw1w==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.664.0", + "@aws-sdk/types": "3.667.0", "@smithy/protocol-http": "^4.1.4", "@smithy/types": "^3.5.0", "tslib": "^2.6.2" @@ -577,12 +584,12 @@ } }, "node_modules/@aws-sdk/middleware-logger": { - "version": "3.664.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.664.0.tgz", - "integrity": "sha512-eNykMqQuv7eg9pAcaLro44fscIe1VkFfhm+gYnlxd+PH6xqapRki1E68VHehnIptnVBdqnWfEqLUSLGm9suqhg==", + "version": "3.667.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.667.0.tgz", + "integrity": "sha512-PtTRNpNm/5c746jRgZCNg4X9xEJIwggkGJrF0GP9AB1ANg4pc/sF2Fvn1NtqPe9wtQ2stunJprnm5WkCHN7QiA==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.664.0", + "@aws-sdk/types": "3.667.0", "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, @@ -591,12 +598,12 @@ } }, "node_modules/@aws-sdk/middleware-recursion-detection": { - "version": "3.664.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.664.0.tgz", - "integrity": "sha512-jq27WMZhm+dY8BWZ9Ipy3eXtZj0lJzpaKQE3A3tH5AOIlUV/gqrmnJ9CdqVVef4EJsq9Yil4ZzQjKKmPsxveQg==", + "version": "3.667.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.667.0.tgz", + "integrity": "sha512-U5glWD3ehFohzpUpopLtmqAlDurGWo2wRGPNgi4SwhWU7UDt6LS7E/UvJjqC0CUrjlzOw+my2A+Ncf+fisMhxQ==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.664.0", + "@aws-sdk/types": "3.667.0", "@smithy/protocol-http": "^4.1.4", "@smithy/types": "^3.5.0", "tslib": "^2.6.2" @@ -606,14 +613,15 @@ } }, "node_modules/@aws-sdk/middleware-user-agent": { - "version": "3.664.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.664.0.tgz", - "integrity": "sha512-Kp5UwXwayO6d472nntiwgrxqay2KS9ozXNmKjQfDrUWbEzvgKI+jgKNMia8MMnjSxYoBGpQ1B8NGh8a6KMEJJg==", + "version": "3.669.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.669.0.tgz", + "integrity": "sha512-K8ScPi45zjJrj5Y2gRqVsvKKQCQbvQBfYGcBw9ZOx9TTavH80bOCBjWg/GFnvs4f37tqVc1wMN2oGvcTF6HveQ==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.664.0", - "@aws-sdk/util-endpoints": "3.664.0", - "@smithy/core": "^2.4.7", + "@aws-sdk/core": "3.667.0", + "@aws-sdk/types": "3.667.0", + "@aws-sdk/util-endpoints": "3.667.0", + "@smithy/core": "^2.4.8", "@smithy/protocol-http": "^4.1.4", "@smithy/types": "^3.5.0", "tslib": "^2.6.2" @@ -623,12 +631,12 @@ } }, "node_modules/@aws-sdk/region-config-resolver": { - "version": "3.664.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.664.0.tgz", - "integrity": "sha512-o/B8dg8K+9714RGYPgMxZgAChPe/MTSMkf/eHXTUFHNik5i1HgVKfac22njV2iictGy/6GhpFsKa1OWNYAkcUg==", + "version": "3.667.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.667.0.tgz", + "integrity": "sha512-iNr+JhhA902JMKHG9IwT9YdaEx6KGl6vjAL5BRNeOjfj4cZYMog6Lz/IlfOAltMtT0w88DAHDEFrBd2uO0l2eg==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.664.0", + "@aws-sdk/types": "3.667.0", "@smithy/node-config-provider": "^3.1.8", "@smithy/types": "^3.5.0", "@smithy/util-config-provider": "^3.0.0", @@ -640,12 +648,12 @@ } }, "node_modules/@aws-sdk/token-providers": { - "version": "3.664.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.664.0.tgz", - "integrity": "sha512-dBAvXW2/6bAxidvKARFxyCY2uCynYBKRFN00NhS1T5ggxm3sUnuTpWw1DTjl02CVPkacBOocZf10h8pQbHSK8w==", + "version": "3.667.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.667.0.tgz", + "integrity": "sha512-ZecJlG8p6D4UTYlBHwOWX6nknVtw/OBJ3yPXTSajBjhUlj9lE2xvejI8gl4rqkyLXk7z3bki+KR4tATbMaM9yg==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.664.0", + "@aws-sdk/types": "3.667.0", "@smithy/property-provider": "^3.1.7", "@smithy/shared-ini-file-loader": "^3.1.8", "@smithy/types": "^3.5.0", @@ -655,13 +663,13 @@ "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sso-oidc": "^3.664.0" + "@aws-sdk/client-sso-oidc": "^3.667.0" } }, "node_modules/@aws-sdk/types": { - "version": "3.664.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.664.0.tgz", - "integrity": "sha512-+GtXktvVgpreM2b+NJL9OqZGsOzHwlCUrO8jgQUvH/yA6Kd8QO2YFhQCp0C9sSzTteZJVqGBu8E0CQurxJHPbw==", + "version": "3.667.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.667.0.tgz", + "integrity": "sha512-gYq0xCsqFfQaSL/yT1Gl1vIUjtsg7d7RhnUfsXaHt8xTxOKRTdH9GjbesBjXOzgOvB0W0vfssfreSNGFlOOMJg==", "license": "Apache-2.0", "dependencies": { "@smithy/types": "^3.5.0", @@ -672,12 +680,12 @@ } }, "node_modules/@aws-sdk/util-endpoints": { - "version": "3.664.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.664.0.tgz", - "integrity": "sha512-KrXoHz6zmAahVHkyWMRT+P6xJaxItgmklxEDrT+npsUB4d5C/lhw16Crcp9TDi828fiZK3GYKRAmmNhvmzvBNg==", + "version": "3.667.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.667.0.tgz", + "integrity": "sha512-X22SYDAuQJWnkF1/q17pkX3nGw5XMD9YEUbmt87vUnRq7iyJ3JOpl6UKOBeUBaL838wA5yzdbinmCITJ/VZ1QA==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.664.0", + "@aws-sdk/types": "3.667.0", "@smithy/types": "^3.5.0", "@smithy/util-endpoints": "^2.1.3", "tslib": "^2.6.2" @@ -699,25 +707,25 @@ } }, "node_modules/@aws-sdk/util-user-agent-browser": { - "version": "3.664.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.664.0.tgz", - "integrity": "sha512-c/PV3+f1ss4PpskHbcOxTZ6fntV2oXy/xcDR9nW+kVaz5cM1G702gF0rvGLKPqoBwkj2rWGe6KZvEBeLzynTUQ==", + "version": "3.670.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.670.0.tgz", + "integrity": "sha512-iRynWWazqEcCKwGMcQcywKTDLdLvqts1Yx474U64I9OKQXXwhOwhXbF5CAPSRta86lkVNAVYJa/0Bsv45pNn1A==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.664.0", + "@aws-sdk/types": "3.667.0", "@smithy/types": "^3.5.0", "bowser": "^2.11.0", "tslib": "^2.6.2" } }, "node_modules/@aws-sdk/util-user-agent-node": { - "version": "3.664.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.664.0.tgz", - "integrity": "sha512-l/m6KkgrTw1p/VTJTk0IoP9I2OnpWp3WbBgzxoNeh9cUcxTufIn++sBxKj5hhDql57LKWsckScG/MhFuH0vZZA==", + "version": "3.669.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.669.0.tgz", + "integrity": "sha512-9jxCYrgggy2xd44ZASqI7AMiRVaSiFp+06Kg8BQSU0ijKpBJlwcsqIS8pDT/n6LxuOw2eV5ipvM2C0r1iKzrGA==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/middleware-user-agent": "3.664.0", - "@aws-sdk/types": "3.664.0", + "@aws-sdk/middleware-user-agent": "3.669.0", + "@aws-sdk/types": "3.667.0", "@smithy/node-config-provider": "^3.1.8", "@smithy/types": "^3.5.0", "tslib": "^2.6.2" @@ -748,18 +756,18 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.7.tgz", - "integrity": "sha512-9ickoLz+hcXCeh7jrcin+/SLWm+GkxE2kTvoYyp38p4WkdFXfQJxDFGWp/YHjiKLPx06z2A7W8XKuqbReXDzsw==", + "version": "7.25.8", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.8.tgz", + "integrity": "sha512-ZsysZyXY4Tlx+Q53XdnOFmqwfB9QDTHYxaZYajWRoBLuLEAwI2UIbtxOjWh/cFaa9IKUlcB+DDuoskLuKu56JA==", "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.7.tgz", - "integrity": "sha512-yJ474Zv3cwiSOO9nXJuqzvwEeM+chDuQ8GJirw+pZ91sCGCyOZ3dJkVE09fTV0VEVzXyLWhh3G/AolYTPX7Mow==", + "version": "7.25.8", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.8.tgz", + "integrity": "sha512-Oixnb+DzmRT30qu9d3tJSQkxuygWm32DFykT4bRoORPa9hZ/L4KhVB/XiRm6KG+roIEM7DBQlmg27kw2HZkdZg==", "license": "MIT", "dependencies": { "@ampproject/remapping": "^2.2.0", @@ -768,10 +776,10 @@ "@babel/helper-compilation-targets": "^7.25.7", "@babel/helper-module-transforms": "^7.25.7", "@babel/helpers": "^7.25.7", - "@babel/parser": "^7.25.7", + "@babel/parser": "^7.25.8", "@babel/template": "^7.25.7", "@babel/traverse": "^7.25.7", - "@babel/types": "^7.25.7", + "@babel/types": "^7.25.8", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -959,12 +967,12 @@ } }, "node_modules/@babel/parser": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.7.tgz", - "integrity": "sha512-aZn7ETtQsjjGG5HruveUK06cU3Hljuhd9Iojm4M8WWv3wLE6OkE5PWbDUkItmMgegmccaITudyuW5RPYrYlgWw==", + "version": "7.25.8", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.8.tgz", + "integrity": "sha512-HcttkxzdPucv3nNFmfOOMfFf64KgdJVqm1KaCm25dPGMLElo9nsLvXeJECQg8UzPuBGLyTSA0ZzqCtDSzKTEoQ==", "license": "MIT", "dependencies": { - "@babel/types": "^7.25.7" + "@babel/types": "^7.25.8" }, "bin": { "parser": "bin/babel-parser.js" @@ -1051,9 +1059,9 @@ } }, "node_modules/@babel/types": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.7.tgz", - "integrity": "sha512-vwIVdXG+j+FOpkwqHRcBgHLYNL7XMkufrlaFvL9o6Ai9sJn9+PdyIL5qa0XzTZw084c+u9LOls53eoZWP/W5WQ==", + "version": "7.25.8", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.8.tgz", + "integrity": "sha512-JWtuCu8VQsMladxVz/P4HzHUGCAwpuqacmowgXFs5XjxIgKuNjnLokQzuVjlTvIzODaDmpjT3oxcC48vyk9EWg==", "license": "MIT", "dependencies": { "@babel/helper-string-parser": "^7.25.7", @@ -1193,12 +1201,12 @@ } }, "node_modules/@mongodb-js/devtools-connect": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-3.3.0.tgz", - "integrity": "sha512-stjduqOZwN51E+Rl8WmZamIM/1UT1ZLt3LxnPazJXnBzycMXEge6kvQQCeYrHk8fokYggLhRxL5xL7IgXaBdbw==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-3.3.1.tgz", + "integrity": "sha512-z9TJtUbDakYBKEB+/7fmBjFRcMCtiK/fIi04BKBs8cv71KmbS+PU76y6/7rE/TQucQ7/mPEhWs7+Z9TuKHR20A==", "license": "Apache-2.0", "dependencies": { - "@mongodb-js/devtools-proxy-support": "^0.4.0", + "@mongodb-js/devtools-proxy-support": "^0.4.1", "@mongodb-js/oidc-http-server-pages": "1.1.3", "lodash.merge": "^4.6.2", "mongodb-connection-string-url": "^3.0.0", @@ -1216,10 +1224,10 @@ "mongodb-log-writer": "^1.4.2" } }, - "node_modules/@mongodb-js/devtools-connect/node_modules/@mongodb-js/devtools-proxy-support": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-proxy-support/-/devtools-proxy-support-0.4.0.tgz", - "integrity": "sha512-NSHo+jE1tjH0XOFoDfOrCW7IAt+5l3TOpzgvWSbmNfVO4FqT/lE/mpQKIwsFOlMeGVI6ku2GOV7Obg6664OfTw==", + "node_modules/@mongodb-js/devtools-proxy-support": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-proxy-support/-/devtools-proxy-support-0.4.1.tgz", + "integrity": "sha512-BGr8dxCeik5LLmPJUcT7c1Sj8I/u0+14+GwS5OPgVy5KlsTJRcGtANjrC7b8IZewpKVLqyJkK+XcdYpa5+b3KQ==", "license": "Apache-2.0", "dependencies": { "@mongodb-js/socksv5": "^0.0.10", @@ -1235,25 +1243,6 @@ "system-ca": "^2.0.1" } }, - "node_modules/@mongodb-js/devtools-proxy-support": { - "version": "0.3.10", - "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-proxy-support/-/devtools-proxy-support-0.3.10.tgz", - "integrity": "sha512-HComoStLokruxsPLR5m3mC+A167n9THKj3jCj6lQSh7szXotJI5zm500BFEI5IpcY/lVovbK4QlRYQP6WWS+5w==", - "license": "Apache-2.0", - "dependencies": { - "@mongodb-js/socksv5": "^0.0.10", - "agent-base": "^7.1.1", - "debug": "^4.3.6", - "http-proxy-agent": "^7.0.2", - "https-proxy-agent": "^7.0.5", - "lru-cache": "^11.0.0", - "node-fetch": "^3.3.2", - "pac-proxy-agent": "^7.0.2", - "socks-proxy-agent": "^8.0.4", - "ssh2": "^1.15.0", - "system-ca": "^2.0.0" - } - }, "node_modules/@mongodb-js/mongodb-constants": { "version": "0.10.3", "resolved": "https://registry.npmjs.org/@mongodb-js/mongodb-constants/-/mongodb-constants-0.10.3.tgz", @@ -1305,13 +1294,13 @@ } }, "node_modules/@mongosh/arg-parser": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@mongosh/arg-parser/-/arg-parser-2.3.1.tgz", - "integrity": "sha512-s0tzK+vPhJRsZZnb1r4V8lv97gpUFOXudHgJ+O3orCkkAUN0JR3IDWPSRY3eECNTlW96ZErGMqRhyPsCFW733g==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@mongosh/arg-parser/-/arg-parser-2.3.2.tgz", + "integrity": "sha512-izy830Jvg1HxP7LnE68dhKvrhIALOCBf/GDI8egJZNfRcvR1VuzaquFhHyFtvhGeoqo+j9ujbaM/24v12+LLFg==", "license": "Apache-2.0", "dependencies": { - "@mongosh/errors": "2.3.1", - "@mongosh/i18n": "2.3.1", + "@mongosh/errors": "2.3.2", + "@mongosh/i18n": "2.3.2", "mongodb-connection-string-url": "^3.0.1" }, "engines": { @@ -1319,9 +1308,9 @@ } }, "node_modules/@mongosh/async-rewriter2": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@mongosh/async-rewriter2/-/async-rewriter2-2.3.1.tgz", - "integrity": "sha512-4tCMYMmhlet4/TYowsGPaoXhXQd5C6jykPnSOMZZrluZeDqRqWJfozW7161m+8Xe7IMZf4KyFzk8CAVewJfzLw==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@mongosh/async-rewriter2/-/async-rewriter2-2.3.2.tgz", + "integrity": "sha512-VhqTUpv3q+Q/2kyOY37RrHaLyOnxTFyBqGz+wmaS9kADorsVTa6DuIO9GF+JLomVzdyFuIW3uaoNYbwq+mnPCA==", "license": "Apache-2.0", "dependencies": { "@babel/core": "^7.22.8", @@ -1338,13 +1327,13 @@ } }, "node_modules/@mongosh/autocomplete": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@mongosh/autocomplete/-/autocomplete-2.3.1.tgz", - "integrity": "sha512-rTZ1pKOKahs62NLTiSnWKp4/34VWnVsSG+rvpup2Xf/XC8/uFuFZo5Moj6eIgEF49PSyfICA+agmg47ldeQelw==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@mongosh/autocomplete/-/autocomplete-2.3.2.tgz", + "integrity": "sha512-bpqG9A/O9ILP0vdwEZwV0Wc0T+LzcyqnWx1RWrC3XvUqMz1kfj5IJNK6RI1D7WuueWfi+HF+GAkz4kLNfFkgrg==", "license": "Apache-2.0", "dependencies": { "@mongodb-js/mongodb-constants": "^0.10.1", - "@mongosh/shell-api": "2.3.1", + "@mongosh/shell-api": "2.3.2", "semver": "^7.5.4" }, "engines": { @@ -1352,26 +1341,26 @@ } }, "node_modules/@mongosh/cli-repl": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@mongosh/cli-repl/-/cli-repl-2.3.1.tgz", - "integrity": "sha512-nHC4Awn+Fiw7sp8sWMn76u+WXigD8DEAdZxYGFxI5/looyWf+Wjm3Y8IS2bzIaMACzguhZq5CCHL9sucK7uFgA==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@mongosh/cli-repl/-/cli-repl-2.3.2.tgz", + "integrity": "sha512-uiadUiZebVKYMuUPbtw8JiD2CiSuht28+Fk9DMD+ktYBKfoA8fF4pjqVvO0HVkEWIJaDZXCMiQXwgOc3L65BTw==", "license": "Apache-2.0", "dependencies": { - "@mongodb-js/devtools-proxy-support": "^0.3.9", - "@mongosh/arg-parser": "2.3.1", - "@mongosh/autocomplete": "2.3.1", - "@mongosh/editor": "2.3.1", - "@mongosh/errors": "2.3.1", - "@mongosh/history": "2.3.1", - "@mongosh/i18n": "2.3.1", - "@mongosh/js-multiline-to-singleline": "2.3.1", - "@mongosh/logging": "2.3.1", - "@mongosh/service-provider-core": "2.3.1", - "@mongosh/service-provider-server": "2.3.1", - "@mongosh/shell-api": "2.3.1", - "@mongosh/shell-evaluator": "2.3.1", - "@mongosh/snippet-manager": "2.3.1", - "@mongosh/types": "2.3.1", + "@mongodb-js/devtools-proxy-support": "^0.4.1", + "@mongosh/arg-parser": "2.3.2", + "@mongosh/autocomplete": "2.3.2", + "@mongosh/editor": "2.3.2", + "@mongosh/errors": "2.3.2", + "@mongosh/history": "2.3.2", + "@mongosh/i18n": "2.3.2", + "@mongosh/js-multiline-to-singleline": "2.3.2", + "@mongosh/logging": "2.3.2", + "@mongosh/service-provider-core": "2.3.2", + "@mongosh/service-provider-server": "2.3.2", + "@mongosh/shell-api": "2.3.2", + "@mongosh/shell-evaluator": "2.3.2", + "@mongosh/snippet-manager": "2.3.2", + "@mongosh/types": "2.3.2", "@segment/analytics-node": "^1.3.0", "ansi-escape-sequences": "^5.1.2", "askcharacter": "^2.0.4", @@ -1403,16 +1392,16 @@ } }, "node_modules/@mongosh/editor": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@mongosh/editor/-/editor-2.3.1.tgz", - "integrity": "sha512-bYd+VfP7dV4Avdr0HcGFcWA7zAE7O/pZWIIuri6u/Vkb07XQtPnLzIxv3zHejJGsqWBLkBtSmj7jmS1TnIG6rg==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@mongosh/editor/-/editor-2.3.2.tgz", + "integrity": "sha512-J3c6mxE5SigMb1mz8qvNVbB+OZyom+r0NoqG5ZON45h+ZFl8ookYMQhXSh4qD0qZZbxdT0Ogm/87AaGfExF6EQ==", "license": "Apache-2.0", "dependencies": { - "@mongosh/js-multiline-to-singleline": "2.3.1", - "@mongosh/service-provider-core": "2.3.1", - "@mongosh/shell-api": "2.3.1", - "@mongosh/shell-evaluator": "2.3.1", - "@mongosh/types": "2.3.1", + "@mongosh/js-multiline-to-singleline": "2.3.2", + "@mongosh/service-provider-core": "2.3.2", + "@mongosh/shell-api": "2.3.2", + "@mongosh/shell-evaluator": "2.3.2", + "@mongosh/types": "2.3.2", "js-beautify": "^1.15.1" }, "engines": { @@ -1420,18 +1409,18 @@ } }, "node_modules/@mongosh/errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-2.3.1.tgz", - "integrity": "sha512-opMEluGMEABO4v72nOwJTPeaP2adNduzh7oFGLBtfencOw0em38g93XnzL5iwH/Bjp2BVAEiMtcHYZeMRus7FQ==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-2.3.2.tgz", + "integrity": "sha512-TKjWgKmxVW16+3+IcQNgv7RxSE3XinRKapxhs9E5nM5FDAXEMRMQnrhhb4KR9Wtp6phAywPSfNjWhuAeI91efQ==", "license": "Apache-2.0", "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/history": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-2.3.1.tgz", - "integrity": "sha512-hjKcqQy0PtYHSl5ZxkiCKi4OltHm0ZQdpJ05a5R26fEvNue+0tcv1TfnXbVxAk9K9Q2vB06SIRI0rnJrTtG+yQ==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-2.3.2.tgz", + "integrity": "sha512-+XLO1kbTwJ1XJ5PKpyU4vn+gqwGtTXQcF4zZIXwxZPN7a0MnBF2DaoMOvEkUYalG0/rkLdVdhILh17HM0mNLsA==", "license": "Apache-2.0", "dependencies": { "mongodb-connection-string-url": "^3.0.1", @@ -1442,21 +1431,21 @@ } }, "node_modules/@mongosh/i18n": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@mongosh/i18n/-/i18n-2.3.1.tgz", - "integrity": "sha512-qwYjGJKV8mQl/dqL21aIo3z1wdoE80JBiGGhJgyc2ofhLTvdktoav0FXKWOPrpvSR3K29L98D0H8V7uhisfdRQ==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@mongosh/i18n/-/i18n-2.3.2.tgz", + "integrity": "sha512-n/h/305TRPUAbBunhULKiqf9QyNHfgpj8WQjPI/2nZdfCKw29cdkiYjBNEMKl1j3jIGD51/wYgIUT4e51vZUwg==", "license": "Apache-2.0", "dependencies": { - "@mongosh/errors": "2.3.1" + "@mongosh/errors": "2.3.2" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/js-multiline-to-singleline": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.3.1.tgz", - "integrity": "sha512-R7qyDOvACVtUBECotwe5d1VkewDNQdRfmNiuA7hdtoTujG9pOk0pfruAfCC+E7LGoVJaf6Cy1/rsaKHUlxlUzg==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.3.2.tgz", + "integrity": "sha512-Bvt7JSAUdODW94HOqjZ6C3LapAq0agDYVu9MXQJPuv+s+2x0K+rlZqiSLVUtus5m4GayTogY+LXvYZmoK+8CFQ==", "license": "Apache-2.0", "dependencies": { "@babel/core": "^7.16.12", @@ -1467,15 +1456,15 @@ } }, "node_modules/@mongosh/logging": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@mongosh/logging/-/logging-2.3.1.tgz", - "integrity": "sha512-DDe4YNZJfKI9guyzCTdcvEpn0E20v94wnRpfiDfp9y05WUvJsDPBWWmhyGLYj4c1qrDctj8BiGt9mbb/7tY6Yw==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@mongosh/logging/-/logging-2.3.2.tgz", + "integrity": "sha512-gwFWHFTEddEFNyBb3e/vhYkkhkkNtwySDeXLPc2Ngf51zDYavFLUIsH07wz9CDdZ4Vo/MtwT/f09T1Yhg0XFsA==", "license": "Apache-2.0", "dependencies": { - "@mongodb-js/devtools-connect": "^3.2.10", - "@mongosh/errors": "2.3.1", - "@mongosh/history": "2.3.1", - "@mongosh/types": "2.3.1", + "@mongodb-js/devtools-connect": "^3.3.0", + "@mongosh/errors": "2.3.2", + "@mongosh/history": "2.3.2", + "@mongosh/types": "2.3.2", "mongodb-log-writer": "^1.4.2", "mongodb-redact": "^1.1.2" }, @@ -1484,15 +1473,15 @@ } }, "node_modules/@mongosh/service-provider-core": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-2.3.1.tgz", - "integrity": "sha512-+UusnZjXqM2JWdva+11IX4fRW0+sqJS5FhpQ7UHreQyGzdDcgIIqFe1fB4CMfzaMdjQ7RvUqIMM5bV81xDZ9vA==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-2.3.2.tgz", + "integrity": "sha512-lQqLuFojElKADTueYIE6gUPud31zrNwsFNk23mgH/PKDDYHGtYt5ZKQ7aAFe57HSMUZXk13SiANFukdoTcfvtA==", "license": "Apache-2.0", "dependencies": { "@aws-sdk/credential-providers": "^3.525.0", - "@mongosh/errors": "2.3.1", - "bson": "^6.7.0", - "mongodb": "^6.8.0", + "@mongosh/errors": "2.3.2", + "bson": "^6.8.0", + "mongodb": "^6.9.0", "mongodb-build-info": "^1.7.2", "mongodb-connection-string-url": "^3.0.1" }, @@ -1504,18 +1493,18 @@ } }, "node_modules/@mongosh/service-provider-server": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@mongosh/service-provider-server/-/service-provider-server-2.3.1.tgz", - "integrity": "sha512-ekwV81R7+RNAcZ1ewCY38PvkdRbx8Jajv5U3DhbdGG8MXwT437jiDi9ONlEeonP+QI1WBQRRnFFUMukn9+ydmw==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@mongosh/service-provider-server/-/service-provider-server-2.3.2.tgz", + "integrity": "sha512-nDrgmmA/JWyUEW551/m2O4btibc8E+kpOcTvp4LNNZwFO4flqKozMv4NKBMxnYrqTjxIEp+A4WzFEND7yesVHg==", "license": "Apache-2.0", "dependencies": { - "@mongodb-js/devtools-connect": "^3.2.10", + "@mongodb-js/devtools-connect": "^3.3.0", "@mongodb-js/oidc-plugin": "^1.1.1", - "@mongosh/errors": "2.3.1", - "@mongosh/service-provider-core": "2.3.1", - "@mongosh/types": "2.3.1", + "@mongosh/errors": "2.3.2", + "@mongosh/service-provider-core": "2.3.2", + "@mongosh/types": "2.3.2", "aws4": "^1.12.0", - "mongodb": "^6.8.0", + "mongodb": "^6.9.0", "mongodb-connection-string-url": "^3.0.1", "socks": "^2.8.3" }, @@ -1523,21 +1512,71 @@ "node": ">=14.15.1" }, "optionalDependencies": { - "kerberos": "^2.1.0", + "kerberos": "2.1.0", "mongodb-client-encryption": "^6.1.0" } }, + "node_modules/@mongosh/service-provider-server/node_modules/kerberos": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/kerberos/-/kerberos-2.1.0.tgz", + "integrity": "sha512-HvOl6O6cyEN/8Z4CAocHe/sekJtvt5UrxUdCuu7bXDZ2Hnsy6OpsQbISW+lpm03vrbO2ir+1QQ5Sx/vMEhHnog==", + "hasInstallScript": true, + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "bindings": "^1.5.0", + "node-addon-api": "^6.1.0", + "prebuild-install": "7.1.1" + }, + "engines": { + "node": ">=12.9.0" + } + }, + "node_modules/@mongosh/service-provider-server/node_modules/node-addon-api": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz", + "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==", + "license": "MIT", + "optional": true + }, + "node_modules/@mongosh/service-provider-server/node_modules/prebuild-install": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz", + "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==", + "license": "MIT", + "optional": true, + "dependencies": { + "detect-libc": "^2.0.0", + "expand-template": "^2.0.3", + "github-from-package": "0.0.0", + "minimist": "^1.2.3", + "mkdirp-classic": "^0.5.3", + "napi-build-utils": "^1.0.1", + "node-abi": "^3.3.0", + "pump": "^3.0.0", + "rc": "^1.2.7", + "simple-get": "^4.0.0", + "tar-fs": "^2.0.0", + "tunnel-agent": "^0.6.0" + }, + "bin": { + "prebuild-install": "bin.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/@mongosh/shell-api": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-2.3.1.tgz", - "integrity": "sha512-ou6LIbpqlzsKVFiBQJ9Aqt5OxS5NuLb5y2cKuTPvv0wEKrPjg/XAHVyo+Bw09fa4ZYPDk705RehgtfdTpKnLfQ==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-2.3.2.tgz", + "integrity": "sha512-VDj6XVn7m6qHWphJAxPAnQ4HknJ2VZWwQFfQHm9u/6HFDnpAdnN/bubY9nawc55qdZTadpvg5m9YvmOZ3541rA==", "license": "Apache-2.0", "dependencies": { - "@mongosh/arg-parser": "2.3.1", - "@mongosh/errors": "2.3.1", - "@mongosh/history": "2.3.1", - "@mongosh/i18n": "2.3.1", - "@mongosh/service-provider-core": "2.3.1", + "@mongosh/arg-parser": "2.3.2", + "@mongosh/errors": "2.3.2", + "@mongosh/history": "2.3.2", + "@mongosh/i18n": "2.3.2", + "@mongosh/service-provider-core": "2.3.2", "mongodb-redact": "^1.1.2" }, "engines": { @@ -1545,30 +1584,30 @@ } }, "node_modules/@mongosh/shell-evaluator": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@mongosh/shell-evaluator/-/shell-evaluator-2.3.1.tgz", - "integrity": "sha512-MWGL8600o4d1/ngBOQXrorEmYBZebDJeF3g7CM0QmZAuHzJ9HY/67bm/xDKUn/9H0K3tVJSFAWYOXk99tQqTHQ==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@mongosh/shell-evaluator/-/shell-evaluator-2.3.2.tgz", + "integrity": "sha512-dQPRrsi60SFrn/p0vHkcsR+i7hUSQagdwkj0JarqDtGFuowWn6f2t4crSklOjM0wie4Bi/bsXwtFyGEUl+YN2g==", "license": "Apache-2.0", "dependencies": { - "@mongosh/async-rewriter2": "2.3.1", - "@mongosh/history": "2.3.1", - "@mongosh/shell-api": "2.3.1" + "@mongosh/async-rewriter2": "2.3.2", + "@mongosh/history": "2.3.2", + "@mongosh/shell-api": "2.3.2" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/snippet-manager": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@mongosh/snippet-manager/-/snippet-manager-2.3.1.tgz", - "integrity": "sha512-JpOnE/0ILzudWuAWua2PbdyFKwlq/gN0Qc9LfaADLhp1Kn199fpSMeuGbbPzG6oCgS4ruHgKhiQJ0EX30rF3jQ==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@mongosh/snippet-manager/-/snippet-manager-2.3.2.tgz", + "integrity": "sha512-h7fU2uEBPulvJdXinvz3Y17XSEIbw3ibRHabNaA/T6hM31GzxOQ2QHSawGJK+LNf0VyzwQ2L8bzFtJetoJq1OQ==", "license": "Apache-2.0", "dependencies": { - "@mongodb-js/devtools-proxy-support": "^0.3.9", - "@mongosh/errors": "2.3.1", - "@mongosh/shell-api": "2.3.1", - "@mongosh/types": "2.3.1", - "bson": "^6.7.0", + "@mongodb-js/devtools-proxy-support": "^0.4.1", + "@mongosh/errors": "2.3.2", + "@mongosh/shell-api": "2.3.2", + "@mongosh/types": "2.3.2", + "bson": "^6.8.0", "cross-spawn": "^7.0.3", "escape-string-regexp": "^4.0.0", "joi": "^17.4.0", @@ -1579,12 +1618,12 @@ } }, "node_modules/@mongosh/types": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-2.3.1.tgz", - "integrity": "sha512-fpMJ4yHhilTIWe3jgWoE+Eq0q9ij40HMGRfCJoZE+aOCslBkggqsia5Fh13G8JCFKangkWnZ5UMMAxSg6VBJgQ==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-2.3.2.tgz", + "integrity": "sha512-QXKsjEVsz1X2WyvWNyGsI+8Zs3/Z+vbCiBOC3t95JrGJlbkz5uPjGbAwcXSZTheehdCd01spgedSNn3r5yQDtQ==", "license": "Apache-2.0", "dependencies": { - "@mongodb-js/devtools-connect": "^3.2.10" + "@mongodb-js/devtools-connect": "^3.3.0" }, "engines": { "node": ">=14.15.1" @@ -2781,9 +2820,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001667", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001667.tgz", - "integrity": "sha512-7LTwJjcRkzKFmtqGsibMeuXmvFDfZq/nzIjnmgCGzKKRVzjD72selLDK1oPF/Oxzmt4fNcPvTDvGqSDG4tCALw==", + "version": "1.0.30001668", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001668.tgz", + "integrity": "sha512-nWLrdxqCdblixUO+27JtGJJE/txpJlyUy5YN1u53wLZkP0emYCo5zgS6QYft7VUYR42LGgi/S5hdLZTrnyIddw==", "funding": [ { "type": "opencollective", @@ -2894,9 +2933,9 @@ "license": "MIT" }, "node_modules/cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", "license": "MIT", "engines": { "node": ">= 0.6" @@ -3134,9 +3173,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.32", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.32.tgz", - "integrity": "sha512-M+7ph0VGBQqqpTT2YrabjNKSQ2fEl9PVx6AK3N558gDH9NO8O6XN9SXXFWRo9u9PbEg/bWq+tjXQr+eXmxubCw==", + "version": "1.5.36", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.36.tgz", + "integrity": "sha512-HYTX8tKge/VNp6FGO+f/uVDmUkq+cEfcxYhKf15Akc4M5yxt5YmorwlAitKWjWhWQnKcDRBAQKXkhqqXMqcrjw==", "license": "ISC" }, "node_modules/emoji-regex": { @@ -3398,9 +3437,9 @@ } }, "node_modules/express": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", - "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", + "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", "license": "MIT", "dependencies": { "accepts": "~1.3.8", @@ -3408,7 +3447,7 @@ "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.6.0", + "cookie": "0.7.1", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", @@ -3762,9 +3801,9 @@ } }, "node_modules/glibc-version/node_modules/node-addon-api": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.1.0.tgz", - "integrity": "sha512-yBY+qqWSv3dWKGODD6OGE6GnTX7Q2r+4+DfpqxHSHh8x0B4EKP9+wVGLS6U/AM1vxSNNmUEuIV5EGhYwPpfOwQ==", + "version": "8.2.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.2.1.tgz", + "integrity": "sha512-vmEOvxwiH8tlOcv4SyE8RH34rI5/nWVaigUeAUPawC6f0+HoDthwI0vkMu4tbtsZrXq6QXFfrkhjofzKEs5tpA==", "license": "MIT", "optional": true, "engines": { @@ -4330,9 +4369,9 @@ } }, "node_modules/macos-export-certificate-and-key": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/macos-export-certificate-and-key/-/macos-export-certificate-and-key-1.2.2.tgz", - "integrity": "sha512-+LwU/wG3wawI3yZ/CMf9C6jSSugJ823EuNJeV8J+FTbmYDJ8G3sF9Fha/0BLEbRZU28+oVvBD3a4mYxLQzDvLA==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/macos-export-certificate-and-key/-/macos-export-certificate-and-key-1.2.3.tgz", + "integrity": "sha512-O7+9e2JSctV1ylyzx8nwHDaA/H5Tpoudtd8q/YfRp26hAjE32caMPAS2jPQ2azRRSuRqx8gD24Vnf9bo7hH5Dw==", "hasInstallScript": true, "license": "Apache-2.0", "optional": true, @@ -4641,9 +4680,9 @@ "license": "MIT" }, "node_modules/nan": { - "version": "2.20.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz", - "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==", + "version": "2.22.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz", + "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==", "license": "MIT", "optional": true }, diff --git a/third_party/nixpkgs/pkgs/by-name/mo/mongosh/source.json b/third_party/nixpkgs/pkgs/by-name/mo/mongosh/source.json index 12518025cb..29ff15911b 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/mongosh/source.json +++ b/third_party/nixpkgs/pkgs/by-name/mo/mongosh/source.json @@ -1,6 +1,6 @@ { - "version": "2.3.1", - "integrity": "sha512-Xl6HYKgrdKtmwMB7oa04cowOQmUf/kjMUfdCh/IJaF+2NKPaXPw7bPlEcxHOXSc/7jAZe9gtAbkurqkHqE39hg==", - "filename": "mongosh-2.3.1.tgz", - "deps": "sha256-ets4hJ1+BtL0BQFTzNSvfvbpbHc1dIIOviOi4PTA65U=" + "version": "2.3.2", + "integrity": "sha512-KobngQr6A3kS7DJhXBc+sAnk3GujTI/WxVz+NfOVl0i/DDd6v+dI95xwhxggcu6wUtvj40AyTH20gvvvdkeGHg==", + "filename": "mongosh-2.3.2.tgz", + "deps": "sha256-t6HsvxXLutSjGfYTVX/15b+WCbT5+2NO2epW0aNttAI=" } diff --git a/third_party/nixpkgs/pkgs/by-name/mo/mouse-actions-gui/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mouse-actions-gui/package.nix index 01478b8015..5fcb4126cf 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/mouse-actions-gui/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/mouse-actions-gui/package.nix @@ -18,7 +18,7 @@ libevdev, gtk3, libsoup, - webkitgtk, + webkitgtk_4_0, }: stdenv.mkDerivation (finalAttrs: { @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { # Tauri deps gtk3 libsoup - webkitgtk + webkitgtk_4_0 ]; npmDeps = fetchNpmDeps { diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/mtdutils/default.nix b/third_party/nixpkgs/pkgs/by-name/mt/mtdutils/package.nix similarity index 56% rename from third_party/nixpkgs/pkgs/tools/filesystems/mtdutils/default.nix rename to third_party/nixpkgs/pkgs/by-name/mt/mtdutils/package.nix index 3214694e52..15359970cf 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/mtdutils/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/mt/mtdutils/package.nix @@ -1,17 +1,45 @@ -{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, cmocka, acl, libuuid, lzo, zlib, zstd }: +{ + lib, + stdenv, + fetchgit, + autoreconfHook, + pkg-config, + cmocka, + acl, + libuuid, + lzo, + util-linux, + zlib, + zstd, +}: stdenv.mkDerivation rec { pname = "mtd-utils"; - version = "2.2.0"; + version = "2.2.1"; src = fetchgit { url = "git://git.infradead.org/mtd-utils.git"; rev = "v${version}"; - hash = "sha256-uYXzZnVL5PkyDAntH8YsocwmQ8tf1f0Vl78SdE2B+Oc="; + hash = "sha256-vGgBOKu+ClmyRZHQkAS8r/YJtZihr/oD/yj8V7DeAQ8="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ] ++ lib.optional doCheck cmocka; - buildInputs = [ acl libuuid lzo zlib zstd ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ] ++ lib.optional doCheck cmocka; + buildInputs = [ + acl + libuuid + lzo + util-linux + zlib + zstd + ]; + + postPatch = '' + substituteInPlace ubifs-utils/mount.ubifs \ + --replace-fail "/bin/mount" "${util-linux}/bin/mount" + ''; enableParallelBuilding = true; @@ -20,13 +48,14 @@ stdenv.mkDerivation rec { (lib.enableFeature doCheck "tests") ]; - makeFlags = [ - "AR:=$(AR)" - ]; + makeFlags = [ "AR:=$(AR)" ]; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; postInstall = '' mkdir -p $dev/lib diff --git a/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix b/third_party/nixpkgs/pkgs/by-name/mt/mtxclient/package.nix similarity index 83% rename from third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix rename to third_party/nixpkgs/pkgs/by-name/mt/mtxclient/package.nix index dff005d9eb..2d47a07b26 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/mt/mtxclient/package.nix @@ -1,16 +1,17 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, coeurl -, curl -, libevent -, nlohmann_json -, olm -, openssl -, re2 -, spdlog +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + coeurl, + curl, + libevent, + nlohmann_json, + olm, + openssl, + re2, + spdlog, }: stdenv.mkDerivation rec { @@ -56,7 +57,11 @@ stdenv.mkDerivation rec { description = "Client API library for the Matrix protocol"; homepage = "https://github.com/Nheko-Reborn/mtxclient"; license = licenses.mit; - maintainers = with maintainers; [ fpletz pstn ]; + maintainers = with maintainers; [ + fpletz + pstn + rnhmjoj + ]; platforms = platforms.all; # Should be fixable if a higher clang version is used, see: # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177 diff --git a/third_party/nixpkgs/pkgs/by-name/mu/muffon/package.nix b/third_party/nixpkgs/pkgs/by-name/mu/muffon/package.nix index 6184aa0ac3..f7c33bc22b 100644 --- a/third_party/nixpkgs/pkgs/by-name/mu/muffon/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mu/muffon/package.nix @@ -7,10 +7,10 @@ let pname = "muffon"; - version = "2.0.3"; + version = "2.1.0"; src = fetchurl { url = "https://github.com/staniel359/muffon/releases/download/v${version}/muffon-${version}-linux-x86_64.AppImage"; - hash = "sha256-2eLe/xvdWcOcUSE0D+pMOcOYCfFVEyKO13LiaJiZgX0="; + hash = "sha256-GT91MLjBWsbk9P5fsIxlYUNziAPsdvMSPq9bLL3rKDw="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; in diff --git a/third_party/nixpkgs/pkgs/by-name/mu/mujoco/package.nix b/third_party/nixpkgs/pkgs/by-name/mu/mujoco/package.nix index 291fe8e546..84d07356b5 100644 --- a/third_party/nixpkgs/pkgs/by-name/mu/mujoco/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mu/mujoco/package.nix @@ -35,8 +35,8 @@ let eigen3 = fetchFromGitLab { owner = "libeigen"; repo = "eigen"; - rev = "f33af052e0e60d4aa367328e7d9dffc9dedca6d8"; - hash = "sha256-93I6MFIZ8tvdwTmiMihOaVVCdkWOTvXWZ5vYXzsMP+Q="; + rev = "b396a6fbb2e173f52edb3360485dedf3389ef830"; + hash = "sha256-UroGjERR5TW9KbyLwR/NBpytXrW1tHfu6ZvQPngROq4="; }; googletest = fetchFromGitHub { owner = "google"; @@ -131,7 +131,7 @@ let in stdenv.mkDerivation rec { pname = "mujoco"; - version = "3.2.3"; + version = "3.2.4"; # Bumping version? Make sure to look though the MuJoCo's commit # history for bumped dependency pins! @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { owner = "google-deepmind"; repo = "mujoco"; rev = "refs/tags/${version}"; - hash = "sha256-WMh96sJK9A5QcVmIjy4STN+vMrxLxcDPHMfEnTmSXSU="; + hash = "sha256-AWRrPs4G+hLwOz6UT/oWNT1arQP2ppyi+LC4Dy+njG0="; }; patches = [ ./mujoco-system-deps-dont-fetch.patch ]; diff --git a/third_party/nixpkgs/pkgs/by-name/mu/mullvad-browser/package.nix b/third_party/nixpkgs/pkgs/by-name/mu/mullvad-browser/package.nix index 8c847f3c36..2dd6f04638 100644 --- a/third_party/nixpkgs/pkgs/by-name/mu/mullvad-browser/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mu/mullvad-browser/package.nix @@ -90,7 +90,7 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.5.6"; + version = "13.5.7"; sources = { x86_64-linux = fetchurl { @@ -102,7 +102,7 @@ let "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-AayGWFfsdAK9Ku4J4nDolJxnQn0HhGeZeEf//9OspWA="; + hash = "sha256-Te6Cw3fUs4XGz07lL54bKUU9HYC5soaKFlbWGujd/oU="; }; }; diff --git a/third_party/nixpkgs/pkgs/by-name/mu/museum/package.nix b/third_party/nixpkgs/pkgs/by-name/mu/museum/package.nix index f3e00cf209..0ef76ad53e 100644 --- a/third_party/nixpkgs/pkgs/by-name/mu/museum/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mu/museum/package.nix @@ -7,7 +7,7 @@ buildGoModule rec { - version = "photos-v0.9.35"; + version = "photos-v0.9.46"; pname = "museum"; src = fetchFromGitHub { @@ -15,7 +15,7 @@ buildGoModule rec { repo = "ente"; sparseCheckout = [ "server" ]; rev = version; - hash = "sha256-A/M2OhDzzOMGXnaqFFV9Z8bn/3HeZc50p2mIv++Q0uE="; + hash = "sha256-dJCZxQLnKb+mFG0iaYNrXyDSaslqKdPTXMK4KwvqBd8="; }; sourceRoot = "${src.name}/server"; diff --git a/third_party/nixpkgs/pkgs/by-name/mu/music-assistant/package.nix b/third_party/nixpkgs/pkgs/by-name/mu/music-assistant/package.nix index 654fdfedaf..65f46c184a 100644 --- a/third_party/nixpkgs/pkgs/by-name/mu/music-assistant/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mu/music-assistant/package.nix @@ -24,14 +24,14 @@ in python.pkgs.buildPythonApplication rec { pname = "music-assistant"; - version = "2.2.6"; + version = "2.2.7"; pyproject = true; src = fetchFromGitHub { owner = "music-assistant"; repo = "server"; rev = "refs/tags/${version}"; - hash = "sha256-BEbcIq+qtJ1OffT2we6qajzvDYDu09rMcmJF1F06xZQ="; + hash = "sha256-GMjeNX8C027F+Wl/HfluWap9pDOeQwlM9qOs0Sp5tTI="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/by-name/mu/musly/package.nix b/third_party/nixpkgs/pkgs/by-name/mu/musly/package.nix index 25938c2059..07cb806a21 100644 --- a/third_party/nixpkgs/pkgs/by-name/mu/musly/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mu/musly/package.nix @@ -6,7 +6,7 @@ ninja, pkg-config, eigen, - ffmpeg_7, + ffmpeg, libresample, kissfft, }: @@ -47,7 +47,7 @@ stdenv.mkDerivation { buildInputs = [ eigen - ffmpeg_7 + ffmpeg libresample kissfft ]; diff --git a/third_party/nixpkgs/pkgs/by-name/na/naja/package.nix b/third_party/nixpkgs/pkgs/by-name/na/naja/package.nix index a342c091f7..261de178ff 100644 --- a/third_party/nixpkgs/pkgs/by-name/na/naja/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/na/naja/package.nix @@ -66,9 +66,7 @@ stdenv.mkDerivation { description = "Structural Netlist API (and more) for EDA post synthesis flow development"; homepage = "https://github.com/najaeda/naja"; license = lib.licenses.asl20; - maintainers = [ - # maintained by the team working on NGI-supported software, no group for this yet - ]; + maintainers = lib.teams.ngi.members; mainProgram = "naja_edit"; platforms = lib.platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/by-name/na/nanopb/package.nix b/third_party/nixpkgs/pkgs/by-name/na/nanopb/package.nix index bfd72b7214..bd8c4356e8 100644 --- a/third_party/nixpkgs/pkgs/by-name/na/nanopb/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/na/nanopb/package.nix @@ -58,13 +58,13 @@ let in { pname = "nanopb"; - version = "0.4.8"; + version = "0.4.9"; src = fetchFromGitHub { owner = "nanopb"; repo = "nanopb"; rev = self.version; - hash = "sha256-LfARVItT+7dczg2u08RlXZLrLR7ScvC44tgmcy/Zv48="; + hash = "sha256-zXhUEajCZ24VA/S0pSFewz096s8rmhKARSWbSC5TdAg="; }; dontPatch = true; diff --git a/third_party/nixpkgs/pkgs/by-name/nc/ncspot/package.nix b/third_party/nixpkgs/pkgs/by-name/nc/ncspot/package.nix new file mode 100644 index 0000000000..08bc03048e --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/nc/ncspot/package.nix @@ -0,0 +1,103 @@ +{ + lib, + stdenv, + alsa-lib, + config, + darwin, + dbus, + fetchFromGitHub, + libpulseaudio, + libxcb, + ncspot, + ncurses, + nix-update-script, + openssl, + pkg-config, + portaudio, + python3, + rustPlatform, + testers, + ueberzug, + withALSA ? stdenv.hostPlatform.isLinux, + withClipboard ? true, + withCover ? false, + withCrossterm ? true, + withMPRIS ? stdenv.hostPlatform.isLinux, + withNcurses ? false, + withNotify ? true, + withPancurses ? false, + withPortAudio ? stdenv.hostPlatform.isDarwin, + withPulseAudio ? config.pulseaudio or stdenv.hostPlatform.isLinux, + withRodio ? false, + withShareSelection ? false, + withTermion ? false, +}: + +rustPlatform.buildRustPackage rec { + pname = "ncspot"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "hrkfdn"; + repo = "ncspot"; + rev = "refs/tags/v${version}"; + hash = "sha256-FI/MZRxTyYWh+CWq3roO6d48xlPsyL58+euGmCZ8p4Y="; + }; + + cargoHash = "sha256-Jg/P6aaMlgpunYd30eoBt1leL0vgEBn2wNRGZsP4abc="; + + nativeBuildInputs = [ pkg-config ] ++ lib.optional withClipboard python3; + + buildInputs = + [ ncurses ] + ++ lib.optional stdenv.hostPlatform.isLinux openssl + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Cocoa + ++ lib.optional (withALSA || withRodio) alsa-lib + ++ lib.optional withClipboard libxcb + ++ lib.optional withCover ueberzug + ++ lib.optional (withMPRIS || withNotify) dbus + ++ lib.optional withNcurses ncurses + ++ lib.optional withPortAudio portaudio + ++ lib.optional withPulseAudio libpulseaudio; + + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DNCURSES_UNCTRL_H_incl"; + + buildNoDefaultFeatures = true; + + buildFeatures = + lib.optional withALSA "alsa_backend" + ++ lib.optional withClipboard "share_clipboard" + ++ lib.optional withCover "cover" + ++ lib.optional withCrossterm "crossterm_backend" + ++ lib.optional withMPRIS "mpris" + ++ lib.optional withNcurses "ncurses_backend" + ++ lib.optional withNotify "notify" + ++ lib.optional withPancurses "pancurses_backend" + ++ lib.optional withPortAudio "portaudio_backend" + ++ lib.optional withPulseAudio "pulseaudio_backend" + ++ lib.optional withRodio "rodio_backend" + ++ lib.optional withShareSelection "share_selection" + ++ lib.optional withTermion "termion_backend"; + + postInstall = '' + install -D --mode=444 $src/misc/ncspot.desktop $out/share/applications/nscpot.desktop + install -D --mode=444 $src/images/logo.svg $out/share/icons/hicolor/scalable/apps/nscpot.png + ''; + + passthru = { + tests.version = testers.testVersion { package = ncspot; }; + updateScript = nix-update-script { }; + }; + + meta = { + description = "Cross-platform ncurses Spotify client written in Rust, inspired by ncmpc and the likes"; + homepage = "https://github.com/hrkfdn/ncspot"; + changelog = "https://github.com/hrkfdn/ncspot/releases/tag/v${version}"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ + liff + getchoo + ]; + mainProgram = "ncspot"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ne/nemu/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/nemu/package.nix index c57b4dca6e..5f543e13cf 100644 --- a/third_party/nixpkgs/pkgs/by-name/ne/nemu/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ne/nemu/package.nix @@ -50,7 +50,6 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - busybox # for start-stop-daemon coreutils dbus gettext diff --git a/third_party/nixpkgs/pkgs/by-name/ne/neovim-qt/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/neovim-qt/package.nix index 6251559eba..c94c477201 100644 --- a/third_party/nixpkgs/pkgs/by-name/ne/neovim-qt/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ne/neovim-qt/package.nix @@ -1,12 +1,12 @@ -{ stdenv, libsForQt5, makeWrapper, neovim, neovim-qt-unwrapped }: +{ stdenvNoCC, makeWrapper, neovim, neovim-qt-unwrapped }: let unwrapped = neovim-qt-unwrapped; in -libsForQt5.mkDerivation { +stdenvNoCC.mkDerivation { pname = "neovim-qt"; version = unwrapped.version; - buildCommand = if stdenv.hostPlatform.isDarwin then '' + buildCommand = if stdenvNoCC.hostPlatform.isDarwin then '' mkdir -p $out/Applications cp -r ${unwrapped}/bin/nvim-qt.app $out/Applications diff --git a/third_party/nixpkgs/pkgs/by-name/ne/netscanner/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/netscanner/package.nix index 8bca173735..77b242ec90 100644 --- a/third_party/nixpkgs/pkgs/by-name/ne/netscanner/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ne/netscanner/package.nix @@ -6,7 +6,7 @@ }: let pname = "netscanner"; - version = "0.5.3"; + version = "0.6.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage { owner = "Chleba"; repo = "netscanner"; rev = "refs/tags/v${version}"; - hash = "sha256-rqUGi7UF9y3VZ0KoctCesQVgJbR1WfqhFA6aYFFimNk="; + hash = "sha256-p7ajWY/eGWHPosxFXOKs2YeMAny+/PJ68IAU2NNgm0w="; }; - cargoHash = "sha256-VP6L3lXDXadimSWC2L4yfzTRfTcUilJtZ7TeHARAKAY="; + cargoHash = "sha256-F6titbFM0zsbbwZKcSx3U4cknea83TCITiGm7rPXmFE="; postFixup = '' wrapProgram $out/bin/netscanner \ diff --git a/third_party/nixpkgs/pkgs/by-name/ne/newcomputermodern/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/newcomputermodern/package.nix index 6f20905a30..660230e403 100644 --- a/third_party/nixpkgs/pkgs/by-name/ne/newcomputermodern/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ne/newcomputermodern/package.nix @@ -6,12 +6,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "newcomputermodern"; - version = "5.1"; + version = "6.0.0"; src = fetchgit { url = "https://git.gnu.org.ua/newcm.git"; rev = finalAttrs.version; - hash = "sha256-a6paSdF754jCp4DePbx2in9316H9EjyrAKOQpyc3hEo="; + hash = "sha256-AMzEytBn9PbyYFNJ2CMPg8ejsL3eFhY+eZHXShaLG9E="; }; nativeBuildInputs = [ fontforge ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ne/nextjs-ollama-llm-ui/0001-update-nextjs.patch b/third_party/nixpkgs/pkgs/by-name/ne/nextjs-ollama-llm-ui/0001-update-nextjs.patch deleted file mode 100644 index d904f04f73..0000000000 --- a/third_party/nixpkgs/pkgs/by-name/ne/nextjs-ollama-llm-ui/0001-update-nextjs.patch +++ /dev/null @@ -1,879 +0,0 @@ -diff --git a/package-lock.json b/package-lock.json -index 11dfbf6..b9470d0 100644 ---- a/package-lock.json -+++ b/package-lock.json -@@ -30,7 +30,7 @@ - "framer-motion": "^11.0.3", - "langchain": "^0.1.13", - "lucide-react": "^0.322.0", -- "next": "14.1.0", -+ "next": "^14.2.3", - "next-themes": "^0.2.1", - "react": "^18", - "react-code-blocks": "^0.1.6", -@@ -40,6 +40,7 @@ - "react-resizable-panels": "^2.0.3", - "react-textarea-autosize": "^8.5.3", - "remark-gfm": "^4.0.0", -+ "sharp": "^0.33.4", - "sonner": "^1.4.0", - "tailwind-merge": "^2.2.1", - "tailwindcss-animate": "^1.0.7", -@@ -139,6 +140,15 @@ - "node": ">=6.9.0" - } - }, -+ "node_modules/@emnapi/runtime": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.1.1.tgz", -+ "integrity": "sha512-3bfqkzuR1KLx57nZfjr2NLnFOobvyS0aTszaEGCGqmYMVDRaGvgIZbjGSV/MHSSmLgQ/b9JFHQ5xm5WRZYd+XQ==", -+ "optional": true, -+ "dependencies": { -+ "tslib": "^2.4.0" -+ } -+ }, - "node_modules/@emoji-mart/data": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@emoji-mart/data/-/data-1.1.2.tgz", -@@ -304,6 +314,437 @@ - "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==", - "dev": true - }, -+ "node_modules/@img/sharp-darwin-arm64": { -+ "version": "0.33.4", -+ "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.33.4.tgz", -+ "integrity": "sha512-p0suNqXufJs9t3RqLBO6vvrgr5OhgbWp76s5gTRvdmxmuv9E1rcaqGUsl3l4mKVmXPkTkTErXediAui4x+8PSA==", -+ "cpu": [ -+ "arm64" -+ ], -+ "optional": true, -+ "os": [ -+ "darwin" -+ ], -+ "engines": { -+ "glibc": ">=2.26", -+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ }, -+ "optionalDependencies": { -+ "@img/sharp-libvips-darwin-arm64": "1.0.2" -+ } -+ }, -+ "node_modules/@img/sharp-darwin-x64": { -+ "version": "0.33.4", -+ "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.33.4.tgz", -+ "integrity": "sha512-0l7yRObwtTi82Z6ebVI2PnHT8EB2NxBgpK2MiKJZJ7cz32R4lxd001ecMhzzsZig3Yv9oclvqqdV93jo9hy+Dw==", -+ "cpu": [ -+ "x64" -+ ], -+ "optional": true, -+ "os": [ -+ "darwin" -+ ], -+ "engines": { -+ "glibc": ">=2.26", -+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ }, -+ "optionalDependencies": { -+ "@img/sharp-libvips-darwin-x64": "1.0.2" -+ } -+ }, -+ "node_modules/@img/sharp-libvips-darwin-arm64": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.0.2.tgz", -+ "integrity": "sha512-tcK/41Rq8IKlSaKRCCAuuY3lDJjQnYIW1UXU1kxcEKrfL8WR7N6+rzNoOxoQRJWTAECuKwgAHnPvqXGN8XfkHA==", -+ "cpu": [ -+ "arm64" -+ ], -+ "optional": true, -+ "os": [ -+ "darwin" -+ ], -+ "engines": { -+ "macos": ">=11", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ } -+ }, -+ "node_modules/@img/sharp-libvips-darwin-x64": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.0.2.tgz", -+ "integrity": "sha512-Ofw+7oaWa0HiiMiKWqqaZbaYV3/UGL2wAPeLuJTx+9cXpCRdvQhCLG0IH8YGwM0yGWGLpsF4Su9vM1o6aer+Fw==", -+ "cpu": [ -+ "x64" -+ ], -+ "optional": true, -+ "os": [ -+ "darwin" -+ ], -+ "engines": { -+ "macos": ">=10.13", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ } -+ }, -+ "node_modules/@img/sharp-libvips-linux-arm": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.0.2.tgz", -+ "integrity": "sha512-iLWCvrKgeFoglQxdEwzu1eQV04o8YeYGFXtfWU26Zr2wWT3q3MTzC+QTCO3ZQfWd3doKHT4Pm2kRmLbupT+sZw==", -+ "cpu": [ -+ "arm" -+ ], -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "glibc": ">=2.28", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ } -+ }, -+ "node_modules/@img/sharp-libvips-linux-arm64": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.0.2.tgz", -+ "integrity": "sha512-x7kCt3N00ofFmmkkdshwj3vGPCnmiDh7Gwnd4nUwZln2YjqPxV1NlTyZOvoDWdKQVDL911487HOueBvrpflagw==", -+ "cpu": [ -+ "arm64" -+ ], -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "glibc": ">=2.26", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ } -+ }, -+ "node_modules/@img/sharp-libvips-linux-s390x": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.0.2.tgz", -+ "integrity": "sha512-cmhQ1J4qVhfmS6szYW7RT+gLJq9dH2i4maq+qyXayUSn9/3iY2ZeWpbAgSpSVbV2E1JUL2Gg7pwnYQ1h8rQIog==", -+ "cpu": [ -+ "s390x" -+ ], -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "glibc": ">=2.28", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ } -+ }, -+ "node_modules/@img/sharp-libvips-linux-x64": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.2.tgz", -+ "integrity": "sha512-E441q4Qdb+7yuyiADVi5J+44x8ctlrqn8XgkDTwr4qPJzWkaHwD489iZ4nGDgcuya4iMN3ULV6NwbhRZJ9Z7SQ==", -+ "cpu": [ -+ "x64" -+ ], -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "glibc": ">=2.26", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ } -+ }, -+ "node_modules/@img/sharp-libvips-linuxmusl-arm64": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.0.2.tgz", -+ "integrity": "sha512-3CAkndNpYUrlDqkCM5qhksfE+qSIREVpyoeHIU6jd48SJZViAmznoQQLAv4hVXF7xyUB9zf+G++e2v1ABjCbEQ==", -+ "cpu": [ -+ "arm64" -+ ], -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "musl": ">=1.2.2", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ } -+ }, -+ "node_modules/@img/sharp-libvips-linuxmusl-x64": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.0.2.tgz", -+ "integrity": "sha512-VI94Q6khIHqHWNOh6LLdm9s2Ry4zdjWJwH56WoiJU7NTeDwyApdZZ8c+SADC8OH98KWNQXnE01UdJ9CSfZvwZw==", -+ "cpu": [ -+ "x64" -+ ], -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "musl": ">=1.2.2", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ } -+ }, -+ "node_modules/@img/sharp-linux-arm": { -+ "version": "0.33.4", -+ "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.33.4.tgz", -+ "integrity": "sha512-RUgBD1c0+gCYZGCCe6mMdTiOFS0Zc/XrN0fYd6hISIKcDUbAW5NtSQW9g/powkrXYm6Vzwd6y+fqmExDuCdHNQ==", -+ "cpu": [ -+ "arm" -+ ], -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "glibc": ">=2.28", -+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ }, -+ "optionalDependencies": { -+ "@img/sharp-libvips-linux-arm": "1.0.2" -+ } -+ }, -+ "node_modules/@img/sharp-linux-arm64": { -+ "version": "0.33.4", -+ "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.33.4.tgz", -+ "integrity": "sha512-2800clwVg1ZQtxwSoTlHvtm9ObgAax7V6MTAB/hDT945Tfyy3hVkmiHpeLPCKYqYR1Gcmv1uDZ3a4OFwkdBL7Q==", -+ "cpu": [ -+ "arm64" -+ ], -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "glibc": ">=2.26", -+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ }, -+ "optionalDependencies": { -+ "@img/sharp-libvips-linux-arm64": "1.0.2" -+ } -+ }, -+ "node_modules/@img/sharp-linux-s390x": { -+ "version": "0.33.4", -+ "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.33.4.tgz", -+ "integrity": "sha512-h3RAL3siQoyzSoH36tUeS0PDmb5wINKGYzcLB5C6DIiAn2F3udeFAum+gj8IbA/82+8RGCTn7XW8WTFnqag4tQ==", -+ "cpu": [ -+ "s390x" -+ ], -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "glibc": ">=2.31", -+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ }, -+ "optionalDependencies": { -+ "@img/sharp-libvips-linux-s390x": "1.0.2" -+ } -+ }, -+ "node_modules/@img/sharp-linux-x64": { -+ "version": "0.33.4", -+ "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.4.tgz", -+ "integrity": "sha512-GoR++s0XW9DGVi8SUGQ/U4AeIzLdNjHka6jidVwapQ/JebGVQIpi52OdyxCNVRE++n1FCLzjDovJNozif7w/Aw==", -+ "cpu": [ -+ "x64" -+ ], -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "glibc": ">=2.26", -+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ }, -+ "optionalDependencies": { -+ "@img/sharp-libvips-linux-x64": "1.0.2" -+ } -+ }, -+ "node_modules/@img/sharp-linuxmusl-arm64": { -+ "version": "0.33.4", -+ "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.33.4.tgz", -+ "integrity": "sha512-nhr1yC3BlVrKDTl6cO12gTpXMl4ITBUZieehFvMntlCXFzH2bvKG76tBL2Y/OqhupZt81pR7R+Q5YhJxW0rGgQ==", -+ "cpu": [ -+ "arm64" -+ ], -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "musl": ">=1.2.2", -+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ }, -+ "optionalDependencies": { -+ "@img/sharp-libvips-linuxmusl-arm64": "1.0.2" -+ } -+ }, -+ "node_modules/@img/sharp-linuxmusl-x64": { -+ "version": "0.33.4", -+ "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.33.4.tgz", -+ "integrity": "sha512-uCPTku0zwqDmZEOi4ILyGdmW76tH7dm8kKlOIV1XC5cLyJ71ENAAqarOHQh0RLfpIpbV5KOpXzdU6XkJtS0daw==", -+ "cpu": [ -+ "x64" -+ ], -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "musl": ">=1.2.2", -+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ }, -+ "optionalDependencies": { -+ "@img/sharp-libvips-linuxmusl-x64": "1.0.2" -+ } -+ }, -+ "node_modules/@img/sharp-wasm32": { -+ "version": "0.33.4", -+ "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.33.4.tgz", -+ "integrity": "sha512-Bmmauh4sXUsUqkleQahpdNXKvo+wa1V9KhT2pDA4VJGKwnKMJXiSTGphn0gnJrlooda0QxCtXc6RX1XAU6hMnQ==", -+ "cpu": [ -+ "wasm32" -+ ], -+ "optional": true, -+ "dependencies": { -+ "@emnapi/runtime": "^1.1.1" -+ }, -+ "engines": { -+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ } -+ }, -+ "node_modules/@img/sharp-win32-ia32": { -+ "version": "0.33.4", -+ "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.33.4.tgz", -+ "integrity": "sha512-99SJ91XzUhYHbx7uhK3+9Lf7+LjwMGQZMDlO/E/YVJ7Nc3lyDFZPGhjwiYdctoH2BOzW9+TnfqcaMKt0jHLdqw==", -+ "cpu": [ -+ "ia32" -+ ], -+ "optional": true, -+ "os": [ -+ "win32" -+ ], -+ "engines": { -+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ } -+ }, -+ "node_modules/@img/sharp-win32-x64": { -+ "version": "0.33.4", -+ "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.4.tgz", -+ "integrity": "sha512-3QLocdTRVIrFNye5YocZl+KKpYKP+fksi1QhmOArgx7GyhIbQp/WrJRu176jm8IxromS7RIkzMiMINVdBtC8Aw==", -+ "cpu": [ -+ "x64" -+ ], -+ "optional": true, -+ "os": [ -+ "win32" -+ ], -+ "engines": { -+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ } -+ }, - "node_modules/@isaacs/cliui": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", -@@ -800,9 +1241,9 @@ - } - }, - "node_modules/@next/env": { -- "version": "14.1.0", -- "resolved": "https://registry.npmjs.org/@next/env/-/env-14.1.0.tgz", -- "integrity": "sha512-Py8zIo+02ht82brwwhTg36iogzFqGLPXlRGKQw5s+qP/kMNc4MAyDeEwBKDijk6zTIbegEgu8Qy7C1LboslQAw==" -+ "version": "14.2.3", -+ "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.3.tgz", -+ "integrity": "sha512-W7fd7IbkfmeeY2gXrzJYDx8D2lWKbVoTIj1o1ScPHNzvp30s1AuoEFSdr39bC5sjxJaxTtq3OTCZboNp0lNWHA==" - }, - "node_modules/@next/eslint-plugin-next": { - "version": "14.1.0", -@@ -814,9 +1255,9 @@ - } - }, - "node_modules/@next/swc-darwin-arm64": { -- "version": "14.1.0", -- "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.1.0.tgz", -- "integrity": "sha512-nUDn7TOGcIeyQni6lZHfzNoo9S0euXnu0jhsbMOmMJUBfgsnESdjN97kM7cBqQxZa8L/bM9om/S5/1dzCrW6wQ==", -+ "version": "14.2.3", -+ "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.3.tgz", -+ "integrity": "sha512-3pEYo/RaGqPP0YzwnlmPN2puaF2WMLM3apt5jLW2fFdXD9+pqcoTzRk+iZsf8ta7+quAe4Q6Ms0nR0SFGFdS1A==", - "cpu": [ - "arm64" - ], -@@ -829,9 +1270,9 @@ - } - }, - "node_modules/@next/swc-darwin-x64": { -- "version": "14.1.0", -- "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.1.0.tgz", -- "integrity": "sha512-1jgudN5haWxiAl3O1ljUS2GfupPmcftu2RYJqZiMJmmbBT5M1XDffjUtRUzP4W3cBHsrvkfOFdQ71hAreNQP6g==", -+ "version": "14.2.3", -+ "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.3.tgz", -+ "integrity": "sha512-6adp7waE6P1TYFSXpY366xwsOnEXM+y1kgRpjSRVI2CBDOcbRjsJ67Z6EgKIqWIue52d2q/Mx8g9MszARj8IEA==", - "cpu": [ - "x64" - ], -@@ -844,9 +1285,9 @@ - } - }, - "node_modules/@next/swc-linux-arm64-gnu": { -- "version": "14.1.0", -- "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.1.0.tgz", -- "integrity": "sha512-RHo7Tcj+jllXUbK7xk2NyIDod3YcCPDZxj1WLIYxd709BQ7WuRYl3OWUNG+WUfqeQBds6kvZYlc42NJJTNi4tQ==", -+ "version": "14.2.3", -+ "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.3.tgz", -+ "integrity": "sha512-cuzCE/1G0ZSnTAHJPUT1rPgQx1w5tzSX7POXSLaS7w2nIUJUD+e25QoXD/hMfxbsT9rslEXugWypJMILBj/QsA==", - "cpu": [ - "arm64" - ], -@@ -859,9 +1300,9 @@ - } - }, - "node_modules/@next/swc-linux-arm64-musl": { -- "version": "14.1.0", -- "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.1.0.tgz", -- "integrity": "sha512-v6kP8sHYxjO8RwHmWMJSq7VZP2nYCkRVQ0qolh2l6xroe9QjbgV8siTbduED4u0hlk0+tjS6/Tuy4n5XCp+l6g==", -+ "version": "14.2.3", -+ "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.3.tgz", -+ "integrity": "sha512-0D4/oMM2Y9Ta3nGuCcQN8jjJjmDPYpHX9OJzqk42NZGJocU2MqhBq5tWkJrUQOQY9N+In9xOdymzapM09GeiZw==", - "cpu": [ - "arm64" - ], -@@ -874,9 +1315,9 @@ - } - }, - "node_modules/@next/swc-linux-x64-gnu": { -- "version": "14.1.0", -- "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.1.0.tgz", -- "integrity": "sha512-zJ2pnoFYB1F4vmEVlb/eSe+VH679zT1VdXlZKX+pE66grOgjmKJHKacf82g/sWE4MQ4Rk2FMBCRnX+l6/TVYzQ==", -+ "version": "14.2.3", -+ "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.3.tgz", -+ "integrity": "sha512-ENPiNnBNDInBLyUU5ii8PMQh+4XLr4pG51tOp6aJ9xqFQ2iRI6IH0Ds2yJkAzNV1CfyagcyzPfROMViS2wOZ9w==", - "cpu": [ - "x64" - ], -@@ -889,9 +1330,9 @@ - } - }, - "node_modules/@next/swc-linux-x64-musl": { -- "version": "14.1.0", -- "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.1.0.tgz", -- "integrity": "sha512-rbaIYFt2X9YZBSbH/CwGAjbBG2/MrACCVu2X0+kSykHzHnYH5FjHxwXLkcoJ10cX0aWCEynpu+rP76x0914atg==", -+ "version": "14.2.3", -+ "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.3.tgz", -+ "integrity": "sha512-BTAbq0LnCbF5MtoM7I/9UeUu/8ZBY0i8SFjUMCbPDOLv+un67e2JgyN4pmgfXBwy/I+RHu8q+k+MCkDN6P9ViQ==", - "cpu": [ - "x64" - ], -@@ -904,9 +1345,9 @@ - } - }, - "node_modules/@next/swc-win32-arm64-msvc": { -- "version": "14.1.0", -- "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.1.0.tgz", -- "integrity": "sha512-o1N5TsYc8f/HpGt39OUQpQ9AKIGApd3QLueu7hXk//2xq5Z9OxmV6sQfNp8C7qYmiOlHYODOGqNNa0e9jvchGQ==", -+ "version": "14.2.3", -+ "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.3.tgz", -+ "integrity": "sha512-AEHIw/dhAMLNFJFJIJIyOFDzrzI5bAjI9J26gbO5xhAKHYTZ9Or04BesFPXiAYXDNdrwTP2dQceYA4dL1geu8A==", - "cpu": [ - "arm64" - ], -@@ -919,9 +1360,9 @@ - } - }, - "node_modules/@next/swc-win32-ia32-msvc": { -- "version": "14.1.0", -- "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.1.0.tgz", -- "integrity": "sha512-XXIuB1DBRCFwNO6EEzCTMHT5pauwaSj4SWs7CYnME57eaReAKBXCnkUE80p/pAZcewm7hs+vGvNqDPacEXHVkw==", -+ "version": "14.2.3", -+ "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.3.tgz", -+ "integrity": "sha512-vga40n1q6aYb0CLrM+eEmisfKCR45ixQYXuBXxOOmmoV8sYST9k7E3US32FsY+CkkF7NtzdcebiFT4CHuMSyZw==", - "cpu": [ - "ia32" - ], -@@ -934,9 +1375,9 @@ - } - }, - "node_modules/@next/swc-win32-x64-msvc": { -- "version": "14.1.0", -- "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.1.0.tgz", -- "integrity": "sha512-9WEbVRRAqJ3YFVqEZIxUqkiO8l1nool1LmNxygr5HWF8AcSYsEpneUDhmjUVJEzO2A04+oPtZdombzzPPkTtgg==", -+ "version": "14.2.3", -+ "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.3.tgz", -+ "integrity": "sha512-Q1/zm43RWynxrO7lW4ehciQVj+5ePBhOK+/K2P7pLFX3JaJ/IZVC69SHidrmZSOkqz7ECIOhhy7XhAFG4JYyHA==", - "cpu": [ - "x64" - ], -@@ -1810,11 +2251,17 @@ - "integrity": "sha512-RbhOOTCNoCrbfkRyoXODZp75MlpiHMgbE5MEBZAnnnLyQNgrigEj4p0lzsMDyc1zVsJDLrivB58tgg3emX0eEA==", - "dev": true - }, -+ "node_modules/@swc/counter": { -+ "version": "0.1.3", -+ "resolved": "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz", -+ "integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==" -+ }, - "node_modules/@swc/helpers": { -- "version": "0.5.2", -- "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.2.tgz", -- "integrity": "sha512-E4KcWTpoLHqwPHLxidpOqQbcrZVgi0rsmmZXUle1jXmJfuIf/UWpczUJ7MZZ5tlxytgJXyp0w4PGkkeLiuIdZw==", -+ "version": "0.5.5", -+ "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.5.tgz", -+ "integrity": "sha512-KGYxvIOXcceOAbEk4bi/dVLEK9z8sZ0uBB3Il5b1rhfClSpcX0yfRO0KmTkqR2cnQDymwLB+25ZyMzICg/cm/A==", - "dependencies": { -+ "@swc/counter": "^0.1.3", - "tslib": "^2.4.0" - } - }, -@@ -2930,6 +3377,18 @@ - "periscopic": "^3.1.0" - } - }, -+ "node_modules/color": { -+ "version": "4.2.3", -+ "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz", -+ "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==", -+ "dependencies": { -+ "color-convert": "^2.0.1", -+ "color-string": "^1.9.0" -+ }, -+ "engines": { -+ "node": ">=12.5.0" -+ } -+ }, - "node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", -@@ -2946,6 +3405,15 @@ - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, -+ "node_modules/color-string": { -+ "version": "1.9.1", -+ "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz", -+ "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==", -+ "dependencies": { -+ "color-name": "^1.0.0", -+ "simple-swizzle": "^0.2.2" -+ } -+ }, - "node_modules/combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", -@@ -3152,6 +3620,14 @@ - "node": ">=6" - } - }, -+ "node_modules/detect-libc": { -+ "version": "2.0.3", -+ "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz", -+ "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, - "node_modules/detect-node-es": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz", -@@ -4677,6 +5153,11 @@ - "url": "https://github.com/sponsors/ljharb" - } - }, -+ "node_modules/is-arrayish": { -+ "version": "0.3.2", -+ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", -+ "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==" -+ }, - "node_modules/is-async-function": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz", -@@ -6676,12 +7157,12 @@ - "dev": true - }, - "node_modules/next": { -- "version": "14.1.0", -- "resolved": "https://registry.npmjs.org/next/-/next-14.1.0.tgz", -- "integrity": "sha512-wlzrsbfeSU48YQBjZhDzOwhWhGsy+uQycR8bHAOt1LY1bn3zZEcDyHQOEoN3aWzQ8LHCAJ1nqrWCc9XF2+O45Q==", -+ "version": "14.2.3", -+ "resolved": "https://registry.npmjs.org/next/-/next-14.2.3.tgz", -+ "integrity": "sha512-dowFkFTR8v79NPJO4QsBUtxv0g9BrS/phluVpMAt2ku7H+cbcBJlopXjkWlwxrk/xGqMemr7JkGPGemPrLLX7A==", - "dependencies": { -- "@next/env": "14.1.0", -- "@swc/helpers": "0.5.2", -+ "@next/env": "14.2.3", -+ "@swc/helpers": "0.5.5", - "busboy": "1.6.0", - "caniuse-lite": "^1.0.30001579", - "graceful-fs": "^4.2.11", -@@ -6695,18 +7176,19 @@ - "node": ">=18.17.0" - }, - "optionalDependencies": { -- "@next/swc-darwin-arm64": "14.1.0", -- "@next/swc-darwin-x64": "14.1.0", -- "@next/swc-linux-arm64-gnu": "14.1.0", -- "@next/swc-linux-arm64-musl": "14.1.0", -- "@next/swc-linux-x64-gnu": "14.1.0", -- "@next/swc-linux-x64-musl": "14.1.0", -- "@next/swc-win32-arm64-msvc": "14.1.0", -- "@next/swc-win32-ia32-msvc": "14.1.0", -- "@next/swc-win32-x64-msvc": "14.1.0" -+ "@next/swc-darwin-arm64": "14.2.3", -+ "@next/swc-darwin-x64": "14.2.3", -+ "@next/swc-linux-arm64-gnu": "14.2.3", -+ "@next/swc-linux-arm64-musl": "14.2.3", -+ "@next/swc-linux-x64-gnu": "14.2.3", -+ "@next/swc-linux-x64-musl": "14.2.3", -+ "@next/swc-win32-arm64-msvc": "14.2.3", -+ "@next/swc-win32-ia32-msvc": "14.2.3", -+ "@next/swc-win32-x64-msvc": "14.2.3" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.1.0", -+ "@playwright/test": "^1.41.2", - "react": "^18.2.0", - "react-dom": "^18.2.0", - "sass": "^1.3.0" -@@ -6715,6 +7197,9 @@ - "@opentelemetry/api": { - "optional": true - }, -+ "@playwright/test": { -+ "optional": true -+ }, - "sass": { - "optional": true - } -@@ -7928,13 +8413,9 @@ - } - }, - "node_modules/semver": { -- "version": "7.5.4", -- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", -- "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", -- "dev": true, -- "dependencies": { -- "lru-cache": "^6.0.0" -- }, -+ "version": "7.6.2", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", -+ "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", - "bin": { - "semver": "bin/semver.js" - }, -@@ -7942,18 +8423,6 @@ - "node": ">=10" - } - }, -- "node_modules/semver/node_modules/lru-cache": { -- "version": "6.0.0", -- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", -- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", -- "dev": true, -- "dependencies": { -- "yallist": "^4.0.0" -- }, -- "engines": { -- "node": ">=10" -- } -- }, - "node_modules/seroval": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/seroval/-/seroval-1.0.4.tgz", -@@ -8010,6 +8479,45 @@ - "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz", - "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==" - }, -+ "node_modules/sharp": { -+ "version": "0.33.4", -+ "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.33.4.tgz", -+ "integrity": "sha512-7i/dt5kGl7qR4gwPRD2biwD2/SvBn3O04J77XKFgL2OnZtQw+AG9wnuS/csmu80nPRHLYE9E41fyEiG8nhH6/Q==", -+ "hasInstallScript": true, -+ "dependencies": { -+ "color": "^4.2.3", -+ "detect-libc": "^2.0.3", -+ "semver": "^7.6.0" -+ }, -+ "engines": { -+ "libvips": ">=8.15.2", -+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ }, -+ "optionalDependencies": { -+ "@img/sharp-darwin-arm64": "0.33.4", -+ "@img/sharp-darwin-x64": "0.33.4", -+ "@img/sharp-libvips-darwin-arm64": "1.0.2", -+ "@img/sharp-libvips-darwin-x64": "1.0.2", -+ "@img/sharp-libvips-linux-arm": "1.0.2", -+ "@img/sharp-libvips-linux-arm64": "1.0.2", -+ "@img/sharp-libvips-linux-s390x": "1.0.2", -+ "@img/sharp-libvips-linux-x64": "1.0.2", -+ "@img/sharp-libvips-linuxmusl-arm64": "1.0.2", -+ "@img/sharp-libvips-linuxmusl-x64": "1.0.2", -+ "@img/sharp-linux-arm": "0.33.4", -+ "@img/sharp-linux-arm64": "0.33.4", -+ "@img/sharp-linux-s390x": "0.33.4", -+ "@img/sharp-linux-x64": "0.33.4", -+ "@img/sharp-linuxmusl-arm64": "0.33.4", -+ "@img/sharp-linuxmusl-x64": "0.33.4", -+ "@img/sharp-wasm32": "0.33.4", -+ "@img/sharp-win32-ia32": "0.33.4", -+ "@img/sharp-win32-x64": "0.33.4" -+ } -+ }, - "node_modules/shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", -@@ -8054,6 +8562,14 @@ - "url": "https://github.com/sponsors/isaacs" - } - }, -+ "node_modules/simple-swizzle": { -+ "version": "0.2.2", -+ "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", -+ "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==", -+ "dependencies": { -+ "is-arrayish": "^0.3.1" -+ } -+ }, - "node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", -@@ -9369,12 +9885,6 @@ - "node": ">=0.4" - } - }, -- "node_modules/yallist": { -- "version": "4.0.0", -- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", -- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", -- "dev": true -- }, - "node_modules/yaml": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz", -diff --git a/package.json b/package.json -index 4185096..4ab1c58 100644 ---- a/package.json -+++ b/package.json -@@ -31,7 +31,7 @@ - "framer-motion": "^11.0.3", - "langchain": "^0.1.13", - "lucide-react": "^0.322.0", -- "next": "14.1.0", -+ "next": "^14.2.3", - "next-themes": "^0.2.1", - "react": "^18", - "react-code-blocks": "^0.1.6", -@@ -41,6 +41,7 @@ - "react-resizable-panels": "^2.0.3", - "react-textarea-autosize": "^8.5.3", - "remark-gfm": "^4.0.0", -+ "sharp": "^0.33.4", - "sonner": "^1.4.0", - "tailwind-merge": "^2.2.1", - "tailwindcss-animate": "^1.0.7", --- -2.42.0 - diff --git a/third_party/nixpkgs/pkgs/by-name/ne/nextjs-ollama-llm-ui/0003-add-standalone-output.patch b/third_party/nixpkgs/pkgs/by-name/ne/nextjs-ollama-llm-ui/0003-add-standalone-output.patch deleted file mode 100644 index 50d1611148..0000000000 --- a/third_party/nixpkgs/pkgs/by-name/ne/nextjs-ollama-llm-ui/0003-add-standalone-output.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/next.config.mjs b/next.config.mjs -index dc34f1a..f6f90c4 100644 ---- a/next.config.mjs -+++ b/next.config.mjs -@@ -1,6 +1,7 @@ - /** @type {import('next').NextConfig} */ - const nextConfig = { -- webpack: (config, { isServer }) => { -+ output: 'standalone', -+ webpack: (config, { isServer }) => { - // Fixes npm packages that depend on `fs` module - if (!isServer) { - config.resolve.fallback = { --- -2.42.0 - diff --git a/third_party/nixpkgs/pkgs/by-name/ne/nextjs-ollama-llm-ui/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/nextjs-ollama-llm-ui/package.nix index aad1420f8b..866f9b5bab 100644 --- a/third_party/nixpkgs/pkgs/by-name/ne/nextjs-ollama-llm-ui/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ne/nextjs-ollama-llm-ui/package.nix @@ -14,7 +14,7 @@ }: let - version = "1.0.1"; + version = "1.1.0"; in buildNpmPackage { pname = "nextjs-ollama-llm-ui"; @@ -24,20 +24,14 @@ buildNpmPackage { owner = "jakobhoeg"; repo = "nextjs-ollama-llm-ui"; rev = "v${version}"; - hash = "sha256-pZJgiopm0VGwaZxsNcyRawevvzEcK1j5WhngX1Pn6YE="; + hash = "sha256-IA7g96u5QY8cOuTbJEWw7+U+hSFBzIQVk4Kv3qHKAdM="; }; - npmDepsHash = "sha256-wtHOW0CyEOszgiZwDkF2/cSxbw6WFRLbhDnd2FlY70E="; + npmDepsHash = "sha256-3M0BZ9KZZ0ONwvTLycfMR8skMQf8mzjeqYCwJY4l040="; patches = [ - # Update to a newer nextjs version that buildNpmPackage is able to build. - # Remove at nextjs update. - ./0001-update-nextjs.patch # nextjs tries to download google fonts from the internet during buildPhase and fails in Nix sandbox. # We patch the code to expect a local font from src/app/Inter.ttf that we load from Nixpkgs in preBuild phase. ./0002-use-local-google-fonts.patch - # Modify next.config.js to produce a production "standalone" output at .next/standalone. - # This output is easy to package with Nix and run with "node .next/standalone/server.js" later. - ./0003-add-standalone-output.patch ]; # Adjust buildNpmPackage phases with nextjs quirk workarounds. @@ -70,6 +64,9 @@ buildNpmPackage { mkdir -p $out/share/homepage/.next cp -r .next/static $out/share/homepage/.next/static + # https://github.com/vercel/next.js/discussions/58864 + ln -s /var/cache/nextjs-ollama-llm-ui $out/share/homepage/.next/cache + chmod +x $out/share/homepage/server.js # we set a default port to support "nix run ..." diff --git a/third_party/nixpkgs/pkgs/by-name/ne/nexusmods-app/deps.nix b/third_party/nixpkgs/pkgs/by-name/ne/nexusmods-app/deps.nix index 98af9a96d3..3a534d9305 100644 --- a/third_party/nixpkgs/pkgs/by-name/ne/nexusmods-app/deps.nix +++ b/third_party/nixpkgs/pkgs/by-name/ne/nexusmods-app/deps.nix @@ -4,10 +4,10 @@ { fetchNuGet }: [ (fetchNuGet { pname = "Argon"; version = "0.11.0"; hash = "sha256-bE5aMJ8QyRUhGwpiZAKhe9TTjdW2kVlh8Q7SiBFZx14="; }) (fetchNuGet { pname = "Argon"; version = "0.17.0"; hash = "sha256-jrJWZAGrx970RAQlWOuCbFaxcnaE3UA1TNIZHdCz7gg="; }) + (fetchNuGet { pname = "Argon"; version = "0.21.0"; hash = "sha256-gy/lXMenEjseR4fBbhgU0KItqY3viVhXDsEUi6PdKc4="; }) (fetchNuGet { pname = "AutoFixture"; version = "4.18.1"; hash = "sha256-reP+aoYiPcIj4GbCIhjd5/OhuWVLCtD4hKuLPHe2EXI="; }) (fetchNuGet { pname = "AutoFixture.Xunit2"; version = "4.18.1"; hash = "sha256-5hZm1Rx4n0e2JNsJ6lketE3c8z6AFdquTgKCQORqRfc="; }) (fetchNuGet { pname = "Avalonia"; version = "11.0.0"; hash = "sha256-7QE0MtD1QDiG3gRx5xW33E33BXyEtASQSw+Wi3Lmy3E="; }) - (fetchNuGet { pname = "Avalonia"; version = "11.1.0"; hash = "sha256-HVcwSKc+f69vuRHJ9CT0QL46WFM/gggnY6Wn8IUQq+U="; }) (fetchNuGet { pname = "Avalonia"; version = "11.1.3"; hash = "sha256-kz+k/vkuWoL0XBvRT8SadMOmmRCFk9W/J4k/IM6oYX0="; }) (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.22045.20230930"; hash = "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc="; }) (fetchNuGet { pname = "Avalonia.AvaloniaEdit"; version = "11.1.0"; hash = "sha256-K9+hK+4aK93dyuGytYvVU25daz605+KN54hmwQYXFF8="; }) @@ -24,12 +24,11 @@ (fetchNuGet { pname = "Avalonia.Native"; version = "11.1.3"; hash = "sha256-byAVGW7XgkyzDj1TnqaCeDU/xTD9z8ACGrSJgwJ+XXs="; }) (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.1.3"; hash = "sha256-1VCFAJPKpLx9KyM5AK/8XbGtxNpGriQEFqidgN9eCtE="; }) (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.0"; hash = "sha256-gkVpdbk/0RDM7Hhq0jwZwltDpTsGRmbX+ZFTjWYYoKw="; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.1.0"; hash = "sha256-MAguJ8qTdwvgtEq5SYxyzFNsC90gcBfZxXPkFBEWx5E="; }) (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.1.3"; hash = "sha256-CKF+62zCbK1Rd/HiC6MGrags3ylXrVQ1lni3Um0Muqk="; }) (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.0"; hash = "sha256-A01nrs3Ij1eTo6tPmu7++T1K+Wo/H/9LvpeuOUGbQeU="; }) (fetchNuGet { pname = "Avalonia.Skia"; version = "11.1.0"; hash = "sha256-w4ozV8lIs5vxoYP5D5Lut2iTMiJKVPbjdtqDB1sb0MI="; }) (fetchNuGet { pname = "Avalonia.Skia"; version = "11.1.3"; hash = "sha256-EtB86g+nz6i8wL6xytMkYl2Ehgt3GFMMNPzQfhbfopM="; }) - (fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "11.1.0"; hash = "sha256-6TvmqslBd3l2Fd+HFCyY381EUkCNUGAqzNKEYwQf9qg="; }) + (fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "11.1.0.1"; hash = "sha256-WRU0C4cdCiL9+vkop8avI65cQLKZC86KaVxTjMN5gmA="; }) (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.1.3"; hash = "sha256-qfmRK2gLGSgHx4dNIeVesWxLUjcook9ET2xru/Xyiw8="; }) (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.1.3"; hash = "sha256-Q6jL5J/6aBtOY85I641RVp8RpuqJbPy6C6LxnRkFtMM="; }) (fetchNuGet { pname = "Avalonia.Win32"; version = "11.1.3"; hash = "sha256-zcxTpEnpLf50p8Yaiylk5/CS9MNDe7lK1uX1CPaJBUc="; }) @@ -38,6 +37,7 @@ (fetchNuGet { pname = "BenchmarkDotNet"; version = "0.13.12"; hash = "sha256-Xq7hnNeO1BbJVIlkDKEysJFgxn46eCvpujhQKZrIbt0="; }) (fetchNuGet { pname = "BenchmarkDotNet.Annotations"; version = "0.13.12"; hash = "sha256-v3DRb2y0fbp9v8UGl9sou2HKx78SemK0UKh+rdsuv2s="; }) (fetchNuGet { pname = "BitFaster.Caching"; version = "2.5.0"; hash = "sha256-HUGbbOYdGnWS2XYpgmDsWaAWCZzQFkdPCqfl9OBd5eA="; }) + (fetchNuGet { pname = "BsDiff"; version = "1.1.0"; hash = "sha256-JWmzAE+5k8BeGicl4rQNK3Q5F9+VnBpTtUwlKs72pmI="; }) (fetchNuGet { pname = "Castle.Core"; version = "5.1.1"; hash = "sha256-oVkQB+ON7S6Q27OhXrTLaxTL0kWB58HZaFFuiw4iTrE="; }) (fetchNuGet { pname = "CliWrap"; version = "3.6.6"; hash = "sha256-2fdVlcdgA5Phl/DKas/CKF828GwiJ9L8lB1c1zXU9Qo="; }) (fetchNuGet { pname = "ColorDocument.Avalonia"; version = "11.0.3-a1"; hash = "sha256-Pkh5FX+4pBzep5oCCyhIiR559QyFCEb1vrfEgG0wREw="; }) @@ -46,16 +46,16 @@ (fetchNuGet { pname = "coverlet.collector"; version = "6.0.2"; hash = "sha256-LdSQUrOmjFug47LjtqgtN2MM6BcfG0HR5iL+prVHlDo="; }) (fetchNuGet { pname = "DiffEngine"; version = "12.3.0"; hash = "sha256-vIrZz9dlY+jvQnBoIrI0PCFwnVOfJbJ+GX6v4PqHaR0="; }) (fetchNuGet { pname = "DiffEngine"; version = "15.4.0"; hash = "sha256-ZzsgNMLghDPQcTJytqBgcJQ6MwL7/MavgCGislckC/0="; }) - (fetchNuGet { pname = "DiffPlex"; version = "1.5.0"; hash = "sha256-6HwA6ZyCn++NAXy6ep9ywSF/Ss+e/nmMhjyeIft9fQw="; }) + (fetchNuGet { pname = "DiffEngine"; version = "15.5.1"; hash = "sha256-yf87PBbj3l2xmWj0bnupPxMRWSTIHZD3idvFI1i56P4="; }) + (fetchNuGet { pname = "DiffPlex"; version = "1.7.2"; hash = "sha256-Vsn81duAmPIPkR40h5bEz7hgtF5Kt5nAAGhQZrQbqxE="; }) (fetchNuGet { pname = "DynamicData"; version = "8.3.27"; hash = "sha256-iPZfL1x36PLf5Lq96zRFvR5OLcoRn7OdJIao98X8wac="; }) (fetchNuGet { pname = "DynamicData"; version = "8.4.1"; hash = "sha256-r+haH5VlmZFJTEJ3UedsYybw+oddn/CSvfm6x7PrrQ4="; }) (fetchNuGet { pname = "DynamicData"; version = "9.0.4"; hash = "sha256-3pyiJeWRwfaT7p1ArsoR13aI78Jo13aHOEw3BelTS9g="; }) (fetchNuGet { pname = "EmptyFiles"; version = "4.5.1"; hash = "sha256-7mJ1PfPFeQEE35e+KKKp/QiGbO70gK/xOMFQEv2lPBY="; }) (fetchNuGet { pname = "EmptyFiles"; version = "8.2.0"; hash = "sha256-8jC8injDZyxginjBLvhAeyta3TTZ6AJXs/buF5h34oE="; }) + (fetchNuGet { pname = "EmptyFiles"; version = "8.4.0"; hash = "sha256-b0ZTW0x9ctT19ooGdlFPlrtk52iFuaoxVkt1nRdGqp4="; }) (fetchNuGet { pname = "ExCSS"; version = "4.2.3"; hash = "sha256-M/H6P5p7qqdFz/fgAI2MMBWQ7neN/GIieYSSxxjsM9I="; }) (fetchNuGet { pname = "Fare"; version = "2.1.1"; hash = "sha256-n9X3GE2qsT2wpmDymD1AyCYcOoY/c0+t+aIWLiaST70="; }) - (fetchNuGet { pname = "FlatSharp.Compiler"; version = "7.6.0"; hash = "sha256-bYRnKdem5I/0YAHupyIzpHfndPFNH22QU3MAxlKQ5uQ="; }) - (fetchNuGet { pname = "FlatSharp.Runtime"; version = "7.6.0"; hash = "sha256-rLiWZ8hmDSq5qawXc00zcMxrH/Zi/IlZOrXRx4e6SdQ="; }) (fetchNuGet { pname = "FluentAssertions"; version = "6.12.0"; hash = "sha256-LGlPe+G7lBwj5u3ttQZiKX2+C195ddRAHPuDkY6x0BE="; }) (fetchNuGet { pname = "FluentAssertions.Analyzers"; version = "0.31.0"; hash = "sha256-eQCPS/c+zyRMLgAVggdelLAHVSlqdgDGKIICQxRUdcw="; }) (fetchNuGet { pname = "FluentAssertions.OneOf"; version = "0.0.5"; hash = "sha256-T/yzpRPwEKh0r6JUPgH2GYkSt36PqOZYr9Qi0grGczo="; }) @@ -65,16 +65,17 @@ (fetchNuGet { pname = "FomodInstaller.Scripting"; version = "1.0.0"; hash = "sha256-GNqbLS+lU6aNThUUCfJpmZgP+rd4lF0fKyfMn2Y7Ckg="; }) (fetchNuGet { pname = "FomodInstaller.Scripting.XmlScript"; version = "1.0.0"; hash = "sha256-fbekooynf0jQD0k0zbYueDvOTxPa3FIZUKjCcVMPeeY="; }) (fetchNuGet { pname = "FomodInstaller.Utils"; version = "1.0.0"; hash = "sha256-H0Fc79msO6GhYstzqtZk9ttRcqxtXuDT9v0zQBwDRHI="; }) - (fetchNuGet { pname = "GameFinder"; version = "4.2.4"; hash = "sha256-weK14/DduSymh7G5SaxQH3PsJsvAe9sDdRrrQOsX0aM="; }) - (fetchNuGet { pname = "GameFinder.Common"; version = "4.2.4"; hash = "sha256-YPVBPHoBDreQlITXIff/jbQpDczZPQ4mKNrcz3xKzyQ="; }) - (fetchNuGet { pname = "GameFinder.RegistryUtils"; version = "4.2.4"; hash = "sha256-xqr6HK6smT2JHUL2+vV8qj1pfywjJbhIwEGxK0PJV0s="; }) - (fetchNuGet { pname = "GameFinder.StoreHandlers.EADesktop"; version = "4.2.4"; hash = "sha256-kRuw1sYg+9Zv92prYhFKdihD/IazeAFb9GO3oeHxF+I="; }) - (fetchNuGet { pname = "GameFinder.StoreHandlers.EGS"; version = "4.2.4"; hash = "sha256-cJNt7RJ/Zeo+9ECPWKxaseomm9alkrkYMl8uHuy6B6I="; }) - (fetchNuGet { pname = "GameFinder.StoreHandlers.GOG"; version = "4.2.4"; hash = "sha256-YwqM2j0FVB+afVkkcw1jOTiRkqehaJM3fvw66f3zz8U="; }) - (fetchNuGet { pname = "GameFinder.StoreHandlers.Origin"; version = "4.2.4"; hash = "sha256-npSZ4VieuOSe5BnunF6aDoKuH+4gX2RZtnKhUZVF1Cc="; }) - (fetchNuGet { pname = "GameFinder.StoreHandlers.Steam"; version = "4.2.4"; hash = "sha256-GFQe3JszsCaq7WBX6+DDXyQEubnV6uoGmBGVMgGj+bA="; }) - (fetchNuGet { pname = "GameFinder.StoreHandlers.Xbox"; version = "4.2.4"; hash = "sha256-TuUqhl4RDz40x6iYqiaAZT0yfP+N801h+7k22bXWIMs="; }) - (fetchNuGet { pname = "GameFinder.Wine"; version = "4.2.4"; hash = "sha256-wdZ4ulm7jbEpWXWtmErQ73Mj7Pbe9GFugjWdQID8YYg="; }) + (fetchNuGet { pname = "GameFinder"; version = "4.3.2"; hash = "sha256-1a3X8dfh/HinqqNTGj7qV9/zAia1JxrCOVOJjX1CBD4="; }) + (fetchNuGet { pname = "GameFinder.Common"; version = "4.3.2"; hash = "sha256-TVQut7hVy4wSCqapvbHlbuKo7ayvzSXQP0TWCvatNLg="; }) + (fetchNuGet { pname = "GameFinder.Launcher.Heroic"; version = "4.3.2"; hash = "sha256-aVK4fp1/qjtzTjDlcpKAjQcrWHS2LSYvMU/lkZ6SpQI="; }) + (fetchNuGet { pname = "GameFinder.RegistryUtils"; version = "4.3.2"; hash = "sha256-q0Ib8QTgER5c1ppVAYxnGo84JTRqYWBJ+SxB+b8dBEE="; }) + (fetchNuGet { pname = "GameFinder.StoreHandlers.EADesktop"; version = "4.3.2"; hash = "sha256-qVtzfgx4+UZPMTpCNK5mzeRCaQcABi9katbUPqB02Gc="; }) + (fetchNuGet { pname = "GameFinder.StoreHandlers.EGS"; version = "4.3.2"; hash = "sha256-6I+bUHMT+nwy22OxRdPgCTj0SbTbiES/AJKJe6iG/FI="; }) + (fetchNuGet { pname = "GameFinder.StoreHandlers.GOG"; version = "4.3.2"; hash = "sha256-pVixtrIHUqB8JKmt+gXuP5i58Ys23ZTVUfNWyJtG5eM="; }) + (fetchNuGet { pname = "GameFinder.StoreHandlers.Origin"; version = "4.3.2"; hash = "sha256-LXVFlO2Z/Y7BDh0+nCg3d21IX+e3jT09EPTqqoArs2M="; }) + (fetchNuGet { pname = "GameFinder.StoreHandlers.Steam"; version = "4.3.2"; hash = "sha256-shVLSqiQZ0GYd4a8jGq+CpJ5AlXcZEGkDBA5xCSZQqk="; }) + (fetchNuGet { pname = "GameFinder.StoreHandlers.Xbox"; version = "4.3.2"; hash = "sha256-zRwljOwIcTdMD2IVeWg5yY9m6ax+HI5FRB7K/YhQAFc="; }) + (fetchNuGet { pname = "GameFinder.Wine"; version = "4.3.2"; hash = "sha256-Qm/y6ZgZYJES33WHowYPrhPhdVpMhtvAVkKyK9fpqGU="; }) (fetchNuGet { pname = "Gee.External.Capstone"; version = "2.3.0"; hash = "sha256-wdYT/F8SLL72OIVv/Q/hfLMfhlWMnhDNCTWx+wWlPoU="; }) (fetchNuGet { pname = "GitHubActionsTestLogger"; version = "2.3.3"; hash = "sha256-/TxZ7f3AvArXXe6isyom6ZHLFZR2hi1ejaQuY/6KN4s="; }) (fetchNuGet { pname = "Google.Protobuf"; version = "3.22.5"; hash = "sha256-KuPCqobX6vE9RYElAN9vw+FPonFipms7kE/cRDCLmSQ="; }) @@ -168,14 +169,15 @@ (fetchNuGet { pname = "MemoryPack.Streaming"; version = "1.21.1"; hash = "sha256-eOttUpzWeMD0s+49p0sxFc1h+FM7wkU/n2Q4e0S8d2s="; }) (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; hash = "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="; }) (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.9"; hash = "sha256-CCytWp0v8C6NZa+o4cRXvA2u/ZOEA3TiG9+luszAwes="; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.WebUtilities"; version = "8.0.7"; hash = "sha256-s6p/nbnuzbLDtZgICsLTXah9wFVSBMwoW7BV7UhB2LQ="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.WebUtilities"; version = "8.0.8"; hash = "sha256-9jbe61IgPsBx0EOFZRArRj+J1yInWYr/smM8fFhvekg="; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.0"; hash = "sha256-QYVojfqSZKbF8P6D/aacfxfumMaRUD9SEEQbzw73Bbc="; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; hash = "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig="; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; hash = "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "7.0.0"; hash = "sha256-1e031E26iraIqun84ad0fCIR4MJZ1hcQo4yFN+B7UfE="; }) (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "8.0.0"; hash = "sha256-vX6/kPij8vNAu8f7rrvHHhPrNph20IcufmrBgZNxpQA="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzer.Testing"; version = "1.1.1"; hash = "sha256-3w7g0KhG16ZH8rYK9FxP15qbd+hTgwRDpDJEKpDMHu8="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.2"; hash = "sha256-pDeaMqX7a01Hp1Qd9P/y/B2rEGAv2eIY0Ld/klBZW5g="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzer.Testing"; version = "1.1.2"; hash = "sha256-NeOzfN/9WiX/GsZicQ+oDUuPrZgrxTcP8w7kszAKaaY="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "1.0.0"; hash = "sha256-40uYDx51I8gbyvIaCgo8HIsCoe1NjzQ1sCPb96gpeOs="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; hash = "sha256-KDbCfsBWSJ5ohEXUKp1s1LX9xA2NPvXE/xVzj68EdC0="; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; hash = "sha256-pkZiggwLw8k+CVSXKTzsVGsT+K49LxXUS3VH5PNlpCY="; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.4"; hash = "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE="; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "1.0.1"; hash = "sha256-jjWtdrHSISgBF1m94P0DsVbQa4YxKnf2CWRWYHQLTG8="; }) @@ -187,25 +189,24 @@ (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.1.0"; hash = "sha256-pM9WXvxZI3SS89CGVjxqtAyZyfyiZQzW0UnNCDiQrQA="; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.7.0"; hash = "sha256-0FoP+zHqbhLhyjTPx8I7MCfHqCbmhwE8aRCVe4eC49M="; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.8.0"; hash = "sha256-MmOnXJvd/ezs5UPcqyGLnbZz5m+VedpRfB+kFZeeqkU="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing"; version = "1.1.1"; hash = "sha256-nX4GSfovb8K4cD9xFEKXcRXVDNmXyWOaAAVQ/XfvAFk="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit"; version = "1.1.1"; hash = "sha256-QAQ87pM9sr+8uqwDSXR39x3wtx82jVGcdTJPmwDSB2Y="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing"; version = "1.1.2"; hash = "sha256-WkdcHsqrFQnXEkcuyWPIPybY25QDzpMEem9KflPwFn0="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit"; version = "1.1.2"; hash = "sha256-wYCDZopLucktDQpzACb/BTj+t4arpFuqUEAKxfjLk7U="; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "3.8.0"; hash = "sha256-i6PTXkHepgTXseFFg57iRh5thKtKYc9CH11y/qzDy8k="; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.8.0"; hash = "sha256-WNzc+6mKqzPviOI0WMdhKyrWs8u32bfGj2XwmfL7bwE="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.SourceGenerators.Testing"; version = "1.1.1"; hash = "sha256-d4zoBTjX9DAwIZfGAa9as5vE/BIshKIov4GepT9l1vg="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Testing.Verifiers.XUnit"; version = "1.1.1"; hash = "sha256-WOo0pITkG6CZwJ9MiLaCMSbjbBOxn7+tlpjJGn//gnc="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.SourceGenerators.Testing"; version = "1.1.2"; hash = "sha256-5npL4J8jxcBTmNBT9k3CNeGT0lIWfmWBVXwzEiqRypg="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Testing.Verifiers.XUnit"; version = "1.1.2"; hash = "sha256-lwRXcej7nA6sa/Ss4HwDBgiMG3NTBx9peiLxn4l0Wrk="; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "1.0.1"; hash = "sha256-/SYPkq5LhOoEWi+rcBZDyQL2U0cQk2YrykNJODrRLVs="; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "3.8.0"; hash = "sha256-3D7xV3V1WsUU9OMMEOj+z9GouCDKXSBC4Z/Szs/OcWE="; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.8.0"; hash = "sha256-X8R4SpWVO/gpip5erVZf5jCCx8EX3VzIRtNrQiLDIoM="; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.10.0"; hash = "sha256-yQFwqVChRtIRpbtkJr92JH2i+O7xn91NGbYgnKs8G2g="; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.11.1"; hash = "sha256-1dLlK3NGh88PuFYZiYpT+izA96etxhU3BSgixDgdtGA="; }) (fetchNuGet { pname = "Microsoft.Composition"; version = "1.0.27"; hash = "sha256-G/3p3zxOWC8HqLt7Ll5cqN7507F6N/G6G/HzKazQRdE="; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; hash = "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; hash = "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="; }) (fetchNuGet { pname = "Microsoft.Diagnostics.NETCore.Client"; version = "0.2.251802"; hash = "sha256-9ZH4rrfACzJP5oiarDW4cD2nczv1SNgZr4GW1J9hlUA="; }) (fetchNuGet { pname = "Microsoft.Diagnostics.Runtime"; version = "2.2.332302"; hash = "sha256-5R9xK0owZEhXsucqPKnPaTiwhXBnLo92L2AY7IjyxNg="; }) (fetchNuGet { pname = "Microsoft.Diagnostics.Tracing.TraceEvent"; version = "3.0.2"; hash = "sha256-BHuiTEkA76/9QIR9MG8SBhdExgKFFGd//2RjX8V3XJM="; }) (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; hash = "sha256-RfM2qXiqdiamPkXr4IDkNc0IZSF9iTZv4uou/E7zNS0="; }) - (fetchNuGet { pname = "Microsoft.Extensions.AmbientMetadata.Application"; version = "8.8.0"; hash = "sha256-NpjB1NRrxvP9jxKE7PIkZX8NqV0ezvqUpIf6zdAseOY="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Compliance.Abstractions"; version = "8.8.0"; hash = "sha256-1rTxblh/CF/Zj9UZEFXzGNdVTIxJk6XLaI7DUJtf4sY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.AmbientMetadata.Application"; version = "8.9.1"; hash = "sha256-BtBmKX01A5ye8tlpbII7vajsP3bEXEqBh5ipzR6mEtY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Compliance.Abstractions"; version = "8.9.1"; hash = "sha256-mOPKILicnuf3FVF0G2K0cEcOQ3605wHu8qAb9J2FBIA="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.1.1"; hash = "sha256-pnO6GdmnPJ8D4pmMpkxwgM4GggwGd2Uk+5s6OfJnhAg="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; hash = "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.1.1"; hash = "sha256-3DdHcNmy+JKWB4Q8ixzE4N/hUAvx2o4YlYal4Riwiyw="; }) @@ -224,18 +225,18 @@ (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.1.1"; hash = "sha256-BMU00QmmhtH3jP5cepJnoTrxrPESWeDU0i5UrIpIwGY="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; hash = "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.1"; hash = "sha256-lzTYLpRDAi3wW9uRrkTNJtMmaYdtGJJHdBLbUKu60PM="; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.AutoActivation"; version = "8.8.0"; hash = "sha256-uTm4lum+ZW3pE3gk6MAsMWfOflSW053krTKB89l6rHU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.AutoActivation"; version = "8.9.1"; hash = "sha256-hyQhv2w+AbTHms4pRIayMdzjsQHaUTzg3Xn2XE/oQXE="; }) (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics"; version = "8.0.0"; hash = "sha256-fBLlb9xAfTgZb1cpBxFs/9eA+BlBvF8Xg0DMkBqdHD4="; }) (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.Abstractions"; version = "8.0.0"; hash = "sha256-USD5uZOaahMqi6u7owNWx/LR4EDrOwqPrAAim7iRpJY="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.ExceptionSummarization"; version = "8.8.0"; hash = "sha256-Z5jSViqaNyhKWeco9TG0vfpQjLSo9DQVPaPUFUM9rKE="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.ExceptionSummarization"; version = "8.9.1"; hash = "sha256-veY5VVnDt23crTrfMteWrvShMr2pw5V0VCdjElblrgo="; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "8.0.0"; hash = "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU="; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "8.0.0"; hash = "sha256-29y5ZRQ1ZgzVOxHktYxyiH40kVgm5un2yTGdvuSWnRc="; }) (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "8.0.0"; hash = "sha256-+Oz41JR5jdcJlCJOSpQIL5OMBNi+1Hl2d0JUHfES7sU="; }) (fetchNuGet { pname = "Microsoft.Extensions.Hosting"; version = "8.0.0"; hash = "sha256-sKHa+w4/pMeQb5RRFqLtMTUJy5H6hSIGWchbH2pxSrg="; }) (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "8.0.0"; hash = "sha256-0JBx+wwt5p1SPfO4m49KxNOXPAzAU0A+8tEc/itvpQE="; }) (fetchNuGet { pname = "Microsoft.Extensions.Http"; version = "8.0.0"; hash = "sha256-UgljypOLld1lL7k7h1noazNzvyEHIJw+r+6uGzucFSY="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Http.Diagnostics"; version = "8.8.0"; hash = "sha256-EmAaQp4kZoqRtNFyNJRi7NRNtBtG9QgphbURD6N2XMg="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Http.Resilience"; version = "8.8.0"; hash = "sha256-jb3xaCWOq2398OBNVJW5fN6vI6Lrh/LrReFqLajmQAM="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Http.Diagnostics"; version = "8.9.1"; hash = "sha256-8Lvmx0fquKkq18T8qMQXK1yC2pO3bMDyU5DnPJdVx68="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Http.Resilience"; version = "8.9.1"; hash = "sha256-/nBpINrO7OWj1jJnOAhoVYrelSfXl4eDh6mmel48yYU="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.0.0"; hash = "sha256-Bg3bFJPjQRJnPvlEc5v7lzwRaUTzKwXDtz81GjCTfMo="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.1.1"; hash = "sha256-HnEBmAhweBalCAeX+KZ4kEL3GXEVDBg6Uq4H4LJ56oo="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; hash = "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o="; }) @@ -251,7 +252,6 @@ (fetchNuGet { pname = "Microsoft.Extensions.Logging.EventSource"; version = "8.0.0"; hash = "sha256-kaR7YOlq5s8W9nZDtH/lKtnfGbrgOuQY4DUPcA2lcj0="; }) (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "8.0.0"; hash = "sha256-FxFr5GC0y6vnp5YD2A2vISXYizAz3k/QyrH7sBXP5kg="; }) (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "8.0.6"; hash = "sha256-GnQgqdQTsoLj09avT9k7ypbbTHKoD61J2Pma4Jm/Pq8="; }) - (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "8.0.7"; hash = "sha256-/EEXpvNddZkw4gbPXIFnAtk8XynR4Q9Mjt+LUHFUOfk="; }) (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "8.0.8"; hash = "sha256-9AZmxZ4YcUgHOxxdmklJdIlQSGg7C9BLVz9cvaDdu5c="; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; hash = "sha256-EMvaXxGzueI8lT97bYJQr0kAj1IK0pjnAcWN82hTnzw="; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.1.1"; hash = "sha256-dCPA56Wv9cLuz720PmVbk2oXda1t9ZSAlP8/clDU93E="; }) @@ -261,12 +261,12 @@ (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; hash = "sha256-q44LtMvyNEKSvgERvA+BrasKapP92Sc91QR4u2TJ9/Y="; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.1.1"; hash = "sha256-nbu2OeQGWeG8QKpoAOxIQ8aPzDbWHgbzLXh55xqeeQw="; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; hash = "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Resilience"; version = "8.8.0"; hash = "sha256-DC50kxl/0uLUvgj/HkTroWijAG44NF73Mj4KB5xzOEU="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Telemetry"; version = "8.8.0"; hash = "sha256-IFc6yDT5sQdNku6CQ2+KgVOpo9XREXzKyeDCf8m0gtg="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Telemetry.Abstractions"; version = "8.8.0"; hash = "sha256-cqLl/v1oxP1mHhZ1lC3zcYK+C1YAif38vKyfs8ls2FU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Resilience"; version = "8.9.1"; hash = "sha256-j1GSkggNhVOLLZufJK8zWRfuNkZmV7TcHeOnDLGVkJs="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Telemetry"; version = "8.9.1"; hash = "sha256-QZDuSYnlGDKhGe3VQ+gHbMzq7QlmNd88jRPUPBF1VN0="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Telemetry.Abstractions"; version = "8.9.1"; hash = "sha256-E8XhPlDZIqi2DpIOYhQgLnoEceDOlz34ZzMRN6bL1lk="; }) (fetchNuGet { pname = "Microsoft.IO.RecyclableMemoryStream"; version = "3.0.0"; hash = "sha256-WBXkqxC5g4tJ481sa1uft39LqA/5hx5yOfiTfMRMg/4="; }) - (fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "8.0.7"; hash = "sha256-mCj/NsgRdeMx+PS7sFUzLMUQfi4rEbwcpJ0mJUlddWM="; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.10.0"; hash = "sha256-rkHIqB2mquNXF89XBTFpUL2z5msjTBsOcyjSBCh36I0="; }) + (fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "8.0.8"; hash = "sha256-CHoURIMKGMbEvvQnO6f/+dETIOBklViNcq8rnDuAVpE="; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.11.1"; hash = "sha256-0JUEucQ2lzaPgkrjm/NFLBTbqU1dfhvhN3Tl3moE6mI="; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; hash = "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="; }) @@ -276,10 +276,9 @@ (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) (fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "8.0.0"; hash = "sha256-AfUqleVEqWuHE7z2hNiwOLnquBJ3tuYtbkdGMppHOXc="; }) (fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "8.0.0"; hash = "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0="; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.10.0"; hash = "sha256-3YjVGK2zEObksBGYg8b/CqoJgLQ1jUv4GCWNjDhLRh4="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.11.1"; hash = "sha256-5vX+vCzFY3S7xfMVIv8OlMMFtdedW9UIJzc0WEc+vm4="; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.7.1"; hash = "sha256-KfqM1E0jhAg07QfpjfEcjQ+HX13XZfdvveT5qxm89Sk="; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.10.0"; hash = "sha256-+yzP3FY6WoOosSpYnB7duZLhOPUZMQYy8zJ1d3Q4hK4="; }) - (fetchNuGet { pname = "Microsoft.VisualBasic"; version = "10.0.1"; hash = "sha256-7HHzZcWLVTTQ1K1rCIyoB+UxLHMvOIz+O5av6XDa22A="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.11.1"; hash = "sha256-wSkY0H1fQAq0H3LcKT4u7Y5RzhAAPa6yueVN84g8HxU="; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Composition"; version = "16.1.8"; hash = "sha256-yFT4t3Uk31R5EPdAxxsTAmRuiv58MlYoYL4JT1ywlHQ="; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Composition.NetFxAttributes"; version = "16.1.8"; hash = "sha256-FFemIG+m8RWUPo5W+kCHPh5Yn4fGS+tpjGiQTcT0sAE="; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.10.48"; hash = "sha256-WL8c7TjDBHGjsVLMMPf9cin8rirzOdxusEBQlkUfiVU="; }) @@ -288,7 +287,6 @@ (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.8.8"; hash = "sha256-sB8GLRiJHX3Py7qeBUnUANiDWhyPtISon6HQs+8wKms="; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; hash = "sha256-B4t5El/ViBdxALMcpZulewc4j/3SIXf71HhJWhm4Ctk="; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; hash = "sha256-50XwFbyRfZkTD/bBn76WV/NIpOy/mzXD3MMEVFX/vr8="; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="; }) (fetchNuGet { pname = "Nerdbank.FullDuplexStream"; version = "1.1.12"; hash = "sha256-PZwy+qQ8nOdH5gRRQ24go2yh+YmZQhziwbyWC+1qoJc="; }) (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.11.74"; hash = "sha256-asIdaqCIjZspTA+hhtjKNajpCo+ZQi3erZLCpBQ5No4="; }) @@ -298,33 +296,32 @@ (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; hash = "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; hash = "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="; }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.1"; hash = "sha256-qofIFqViDsdBOE/X0IvzfGUklSrULaH8MoZQ+YrcMOQ="; }) (fetchNuGet { pname = "NexusMods.Archives.Nx"; version = "0.5.0"; hash = "sha256-wt5kkxSotShfW8W+hgxVx/OaWLH006WfGknDFc9TbIU="; }) - (fetchNuGet { pname = "NexusMods.Hashing.xxHash64"; version = "2.0.1"; hash = "sha256-LSSle8oclFougCUt3dS4syTa856WOWfSZmlBcl7QYhc="; }) - (fetchNuGet { pname = "NexusMods.MnemonicDB"; version = "0.9.81"; hash = "sha256-THWqUE2Vy1slRlivaJ54Cy9klippTkae7QeF5hIGnAA="; }) - (fetchNuGet { pname = "NexusMods.MnemonicDB.Abstractions"; version = "0.9.81"; hash = "sha256-kRSCLCG4FUBsMtu+DOap1CzsNZ1wgZ3ioa6w1vH4Zmc="; }) - (fetchNuGet { pname = "NexusMods.MnemonicDB.SourceGenerator"; version = "0.9.81"; hash = "sha256-+GfWUx/Og2bdvriOyNULh+kOX6di6KgLW3azLSkTRDo="; }) + (fetchNuGet { pname = "NexusMods.Hashing.xxHash64"; version = "2.0.2"; hash = "sha256-MEVouiZrdsYzkgadcICAmAZ7P1tFpJ/UOlt8mlUAzW4="; }) + (fetchNuGet { pname = "NexusMods.MnemonicDB"; version = "0.9.89"; hash = "sha256-bb+CG0nCH5Nha24RPaQA1z2X3zN6ZSGwMGnqgrwLbRE="; }) + (fetchNuGet { pname = "NexusMods.MnemonicDB.Abstractions"; version = "0.9.86"; hash = "sha256-IXZ/5VEf6YeRQsxTLdH8bpAdYJJ4gyzIkNoLVBKzEY0="; }) + (fetchNuGet { pname = "NexusMods.MnemonicDB.Abstractions"; version = "0.9.89"; hash = "sha256-RFYZ9tk1uZ4+emE8bipopW/pMGYVKMWtRW083eB5ZyI="; }) + (fetchNuGet { pname = "NexusMods.MnemonicDB.SourceGenerator"; version = "0.9.89"; hash = "sha256-5j/GgFiSV9OFghGADBIk7GOI+63tJPSAsD1BnCLRPmE="; }) (fetchNuGet { pname = "NexusMods.Paths"; version = "0.10.0"; hash = "sha256-tzUKPBrGNyZvVgScDAP0qvVF5nV6635v3NlBvzpnz1M="; }) - (fetchNuGet { pname = "NexusMods.Paths"; version = "0.9.4"; hash = "sha256-W8dIcHvJjhTX2AqjrPBCDpGhDBrJLZ9IewSVo7ffwog="; }) (fetchNuGet { pname = "NexusMods.Paths"; version = "0.9.5"; hash = "sha256-30IlPuu35i0VrUJSaLy86wSYwVCIDgdZc2HctnKuo6o="; }) (fetchNuGet { pname = "NexusMods.Paths.Extensions.Nx"; version = "0.10.0"; hash = "sha256-DktYpARh+UwtrjSYck5dtuQ3YyroZqTJysAZ6jxneEU="; }) - (fetchNuGet { pname = "NexusMods.Paths.TestingHelpers"; version = "0.9.5"; hash = "sha256-X8NtP1fqlmywOFk036zE0pDu88NOHzO3zKPzZSd2Aew="; }) + (fetchNuGet { pname = "NexusMods.Paths.TestingHelpers"; version = "0.10.0"; hash = "sha256-U0hBPyVLyNU4j3qWkVnwETIPirZfkXiHZxgvKiLUYZU="; }) (fetchNuGet { pname = "NLog"; version = "5.3.2"; hash = "sha256-b/y/IFUSe7qsSeJ8JVB0VFmJlkviFb8h934ktnn9Fgc="; }) (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.11"; hash = "sha256-DP3R51h+9kk06N63U+1C4/JCZTFiADeYTROToAA2R0g="; }) (fetchNuGet { pname = "Noggog.CSharpExt"; version = "2.64.0"; hash = "sha256-t1V6l01P299yJCQiMtCsUp6tW61vfLZBeAUEAqYuLRg="; }) (fetchNuGet { pname = "NSubstitute"; version = "5.1.0"; hash = "sha256-ORpubFd6VoRjA9ZeyZdJPY/xnQXM90O6McMswt8VVG4="; }) (fetchNuGet { pname = "NSubstitute.Analyzers.CSharp"; version = "1.0.17"; hash = "sha256-HyMhNJMze3ALJbl71pprjuLCqS+KLA/bOeX4Sng/eb4="; }) - (fetchNuGet { pname = "NuGet.Common"; version = "5.6.0"; hash = "sha256-uc/gCpcfugMjulqDVpS0ryfcaVBtmKyho07g3M8o//g="; }) - (fetchNuGet { pname = "NuGet.Configuration"; version = "5.6.0"; hash = "sha256-K5A66u9WPz8PZYIl+DDyCAodYGUJfLdNNix6f5F7adI="; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.6.0"; hash = "sha256-iMacMTcuvemRQ4p3gv/3MioC/OEDOju8rnmZioWq9bc="; }) + (fetchNuGet { pname = "NuGet.Common"; version = "6.3.4"; hash = "sha256-GDzEyx9/wdVOUAri94uoDjChmfDnBhI90nBfzoHarts="; }) + (fetchNuGet { pname = "NuGet.Configuration"; version = "6.3.4"; hash = "sha256-qXIONIKcCIXJUmNJQs7MINQ18qIEUByTtW5xsORoZoc="; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.3.4"; hash = "sha256-zqogus3HXQYSiqfnhVH2jd2VZXa+uTsmaw/uwD8dlgY="; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; hash = "sha256-ElqfN4CcKxT3hP2qvxxObb4mnBlYG89IMxO0Sm5oZ2g="; }) - (fetchNuGet { pname = "NuGet.Packaging"; version = "5.6.0"; hash = "sha256-bl/A1QbIJAu/GpzKOKjGwe7NrTXlYH5s3ppJ6mYAoQk="; }) - (fetchNuGet { pname = "NuGet.Protocol"; version = "5.6.0"; hash = "sha256-faY3xEk4g9xQFRT7DspGmlVLRGH1r4Vvr5VLT9sLUf8="; }) - (fetchNuGet { pname = "NuGet.Resolver"; version = "5.6.0"; hash = "sha256-wAiARlBJtCjP482a0jnZKpZBbHRl3voXYMTz3WEox04="; }) - (fetchNuGet { pname = "NuGet.Versioning"; version = "5.6.0"; hash = "sha256-3HKwW3hhTuwkZM5n02VFe8yDZbCLgqNE8gI+pqFTToI="; }) - (fetchNuGet { pname = "ObservableCollections"; version = "3.0.1"; hash = "sha256-68fxRcRCABrtaXdRIPJfYLf0N3t9Ef/39x1PYACmhhc="; }) - (fetchNuGet { pname = "ObservableCollections.R3"; version = "3.0.1"; hash = "sha256-/bVupneAnYJw3v7ZIcmBmCHSK0bnEMPHxkjqLNqBrf0="; }) + (fetchNuGet { pname = "NuGet.Packaging"; version = "6.3.4"; hash = "sha256-1LKM5vgfNKn8v2LcqialwmcynACISR57q13n7I2lQbU="; }) + (fetchNuGet { pname = "NuGet.Protocol"; version = "6.3.4"; hash = "sha256-j3L4bDzM+0/U4dm9q914DNpOzPpOPWhaolfOFKosdAQ="; }) + (fetchNuGet { pname = "NuGet.Resolver"; version = "6.3.4"; hash = "sha256-rXYXgdJMtwne3skk4jMgqyZlwh3QCTX9hIHvvXafxUM="; }) + (fetchNuGet { pname = "NuGet.Versioning"; version = "6.3.4"; hash = "sha256-6CMYVQeGfXu+xner3T3mgl/iQfXiYixoHizmrNA6bvQ="; }) + (fetchNuGet { pname = "ObservableCollections"; version = "3.1.0"; hash = "sha256-Tt49jiDU8rVMTZNpjZK96r1cJ1BBJpG2fbg8GyQ6zOE="; }) + (fetchNuGet { pname = "ObservableCollections.R3"; version = "3.1.0"; hash = "sha256-XUvkmnMDJKN0VLLawp0lr8aMQjrXD1qJbvpSjbFTYFc="; }) (fetchNuGet { pname = "OneOf"; version = "2.1.125"; hash = "sha256-3XkBNSEMwlNyNpY/H2gtJ47Mc7905p/CJH9d/VJyO3s="; }) (fetchNuGet { pname = "OneOf"; version = "3.0.271"; hash = "sha256-tFWy8Jg/XVJfVOddjXeCAizq/AUljJrq6J8PF6ArYSU="; }) (fetchNuGet { pname = "OneOf.Extended"; version = "2.1.125"; hash = "sha256-wJaz49zNFzZwSpMTeabEoJR65Kvk7NCrAqyTKxjfFkg="; }) @@ -335,18 +332,21 @@ (fetchNuGet { pname = "OpenTelemetry.Extensions.Hosting"; version = "1.8.1"; hash = "sha256-uA8Lfof/cvQknxBoSDBxTdljAA+oMCOSiUVIsbBOcQc="; }) (fetchNuGet { pname = "Pathoschild.Http.FluentClient"; version = "4.3.0"; hash = "sha256-F8895rKyjJ0XGo21IjR+qp5BpLaYn9LxMMQ3TRDY7JQ="; }) (fetchNuGet { pname = "Perfolizer"; version = "0.2.1"; hash = "sha256-nllshKuHU+1jSBfcTz8BTJTGr1TeCFvxjM4OPyLGSgQ="; }) - (fetchNuGet { pname = "Polly"; version = "8.4.1"; hash = "sha256-CPFw0j6f2P5LfcoFAHo1RRDnCx6SXnp8gzHnwYDnYhY="; }) + (fetchNuGet { pname = "Polly"; version = "8.4.2"; hash = "sha256-cuaH3SdTEdwLA1VddtY6CsmHTiDuYk0dVJ79r/6jSpQ="; }) (fetchNuGet { pname = "Polly.Core"; version = "8.4.1"; hash = "sha256-EksA3U5cmsri2joM+SMtbdwOUMUVxIXT8DnH4DSAIpA="; }) + (fetchNuGet { pname = "Polly.Core"; version = "8.4.2"; hash = "sha256-4fn5n6Bu29uqWg8ciii3MDsi9bO2/moPa9B3cJ9Ihe8="; }) (fetchNuGet { pname = "Polly.Extensions"; version = "8.4.1"; hash = "sha256-uLBo6enk9L+S1bPtazfZ/GmUKjDNQOnX3lsqJj7wyrE="; }) (fetchNuGet { pname = "Polly.RateLimiting"; version = "8.4.1"; hash = "sha256-J6wvD0bVk9+KRb80LkCe9qWRjSd5O2rH/dMDVTKL53A="; }) - (fetchNuGet { pname = "Projektanker.Icons.Avalonia"; version = "9.3.0"; hash = "sha256-rg5XoaMV88f66i4wl7Pe0AMWrPHUwu9QJfPVYnFOgsI="; }) - (fetchNuGet { pname = "Projektanker.Icons.Avalonia.MaterialDesign"; version = "9.3.0"; hash = "sha256-VZR5fR28aLGFKiThbZriPQxbwRFk2Pfrggff8aCO/bs="; }) + (fetchNuGet { pname = "Projektanker.Icons.Avalonia"; version = "9.4.0"; hash = "sha256-SVzkayPUk/7WXQW2Wn3ri4ia92WvJoXTrPmcT8C+J8U="; }) + (fetchNuGet { pname = "Projektanker.Icons.Avalonia.MaterialDesign"; version = "9.4.0"; hash = "sha256-OTXZAbTsIWjJ7CduyuW57RoExC0eHYIwk9yq3TEGEXE="; }) + (fetchNuGet { pname = "QoiSharp"; version = "1.0.0"; hash = "sha256-iN/yCXVN0M5+T/Ye9KJ+EGoLsaBxFU/uCIXvX17EhkM="; }) (fetchNuGet { pname = "R3"; version = "1.0.0"; hash = "sha256-CikGDRUi/EDN2j32cBRl0g+QtdCVYPUizBt41oSVlUA="; }) (fetchNuGet { pname = "R3"; version = "1.2.8"; hash = "sha256-XUKt8G668ZhjGVuiyaCtqrrVWj8EBL5CqbOiI5fADz4="; }) - (fetchNuGet { pname = "R3Extensions.Avalonia"; version = "1.2.8"; hash = "sha256-zZ/woG2RkecT60/0167Tk0MC4K1sc+/BdR8owW+Vg9Q="; }) + (fetchNuGet { pname = "R3"; version = "1.2.9"; hash = "sha256-Wb3ELPbVhxEMqkrQq5vIjGC36VAzIuMdiYqSAEnVXpY="; }) + (fetchNuGet { pname = "R3Extensions.Avalonia"; version = "1.2.9"; hash = "sha256-ZNah6u4+a13E93rYGtZIyYPIb3mkopIjjCzYUgmjCxQ="; }) (fetchNuGet { pname = "ReactiveUI"; version = "18.3.1"; hash = "sha256-1rf4icGRKTR3XIWJpkQJCG7ObRM+72ITB5K+ND1is9M="; }) (fetchNuGet { pname = "ReactiveUI"; version = "19.5.41"; hash = "sha256-FsdD1lBZyegqOVzJhZHAz1owCLh7GbVUYXiORbo5euk="; }) - (fetchNuGet { pname = "ReactiveUI"; version = "20.1.1"; hash = "sha256-p9l2GMzBRchKb4gW9pQ3DIKhs2O9fX3t/V7jDDztBqE="; }) + (fetchNuGet { pname = "ReactiveUI"; version = "20.1.63"; hash = "sha256-fcLBYRz5WFlPYtIiLA1k/6xxxWhlclVMj7li8z04g68="; }) (fetchNuGet { pname = "ReactiveUI.Fody"; version = "19.5.41"; hash = "sha256-LfKELxAfApQLL0fDd7UJCsZML5C4MFN+Gc5ECaBXmUM="; }) (fetchNuGet { pname = "Reloaded.Memory"; version = "9.4.1"; hash = "sha256-bXaTAUx+/SiiMLmxuPumV9z5w1HcHpzEoNuR+xNhafs="; }) (fetchNuGet { pname = "RocksDB"; version = "8.11.3.46984"; hash = "sha256-kCSgenerSMTh5h/hHoueV45uuAARRsJi94c62L2mVEQ="; }) @@ -396,10 +396,12 @@ (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; }) (fetchNuGet { pname = "SHA3.Net"; version = "2.0.0"; hash = "sha256-rNwk9ry52bN95FeNqNC29FokNRRzKw3XnojO/UzHlYc="; }) + (fetchNuGet { pname = "SharpZipLib"; version = "1.4.2"; hash = "sha256-/giVqikworG2XKqfN9uLyjUSXr35zBuZ2FX2r8X/WUY="; }) (fetchNuGet { pname = "SharpZstd.Interop"; version = "1.5.6"; hash = "sha256-Y1sCo7RTRtXjkTG2ZAPFx/qXzX4yW8BEaot7Ngfbg8g="; }) - (fetchNuGet { pname = "ShimSkiaSharp"; version = "2.0.0"; hash = "sha256-xW0amMDf1ExXs9SBP9S3Slgl4SiGjSkCiLErZ1hlGNM="; }) + (fetchNuGet { pname = "ShimSkiaSharp"; version = "2.0.0.1"; hash = "sha256-nnuebZfFeOHcyRsGKsqM1wmmN6sI1VXr7mbIep02AcA="; }) (fetchNuGet { pname = "SimpleInfoName"; version = "2.1.1"; hash = "sha256-7yBNIivLnST0MeMTKdZeo5ZG57c4J7PdasFSVabdKyM="; }) (fetchNuGet { pname = "SimpleInfoName"; version = "2.2.0"; hash = "sha256-oCOH+xj8aBF4H2fCi2e8kCkYUAjmoy/RDSh+jONCpjU="; }) + (fetchNuGet { pname = "SimpleInfoName"; version = "2.3.0"; hash = "sha256-xGVpfnNOqo8Ep3E2LnGyclsccu5/MUfpoYIzNMqJJ/U="; }) (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; hash = "sha256-WyMAjnQt8ZsuWpGLI89l/f4bHvv+cg7FdTAL7CtJBvs="; }) (fetchNuGet { pname = "SkiaSharp"; version = "2.88.6"; hash = "sha256-y0wzgwdQXtgl5boCz/EgLWbK3SwC0cFVRUbBxOUPQXc="; }) (fetchNuGet { pname = "SkiaSharp"; version = "2.88.8"; hash = "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="; }) @@ -420,17 +422,17 @@ (fetchNuGet { pname = "Spectre.Console.Testing"; version = "0.49.1"; hash = "sha256-NFZE0ubRmjeOOnkf8EXCp8lya0XK1tclMmtodxJPt1I="; }) (fetchNuGet { pname = "Splat"; version = "14.4.1"; hash = "sha256-i1yzIVpKdFjZMI4J8H970nZCxszklgDitYTEKKz0zA8="; }) (fetchNuGet { pname = "Splat"; version = "14.8.12"; hash = "sha256-9KTsYPHVN/wiL8/Yy1KQafrFRy7x8VCEHdzgB+9+8SU="; }) - (fetchNuGet { pname = "Splat"; version = "15.0.1"; hash = "sha256-IDI88gPTOHrBBp4fIwT85K7CkK1AK1FJwgQkCHrgZg0="; }) (fetchNuGet { pname = "Splat"; version = "15.1.1"; hash = "sha256-WipAVaUx2HrYNQ9LcYm496LndmSpVbuzJxzP9FA6Ohg="; }) - (fetchNuGet { pname = "Splat.Microsoft.Extensions.Logging"; version = "15.0.1"; hash = "sha256-Nk+ktdAIuXfSOj2dBcC0TbCe4ghEW1yOOhp5gcBOpb8="; }) + (fetchNuGet { pname = "Splat"; version = "15.2.22"; hash = "sha256-GSD6XrFYlYj6jkmI7Z4bYCcRIQCRAyzcuVWHmAll5K4="; }) + (fetchNuGet { pname = "Splat.Microsoft.Extensions.Logging"; version = "15.2.22"; hash = "sha256-4QO7NAcOqTDxwsheB2wyXRdH626JylEbahQaKWKZpIc="; }) (fetchNuGet { pname = "StrawberryShake.Core"; version = "13.9.12"; hash = "sha256-f5BirgBloRc4b0CQxwO7qIOCOXmVbrfdayLaZMou17A="; }) (fetchNuGet { pname = "StrawberryShake.Resources"; version = "13.9.12"; hash = "sha256-6eaWUu5996Sj/Fc+gZorYfM5jzrN7/R1rUURk5ni2ec="; }) (fetchNuGet { pname = "StrawberryShake.Server"; version = "13.9.12"; hash = "sha256-Pq9c3RABhk+UKpVxgmU2RfD8wB+20VKNeURnPkWrlTI="; }) (fetchNuGet { pname = "StrawberryShake.Transport.Http"; version = "13.9.12"; hash = "sha256-GLC9ETwAKF/gyO2IidlzDHu6F3b1HwPT1tT5gGlXvtk="; }) (fetchNuGet { pname = "StrawberryShake.Transport.WebSockets"; version = "13.9.12"; hash = "sha256-J3qCENJfcBdk5yNgbE8mAHuQcWH97CZ1NWZa0I3cAIA="; }) - (fetchNuGet { pname = "Svg.Custom"; version = "2.0.0"; hash = "sha256-/iy8eithVIqzSA9p5zj1igiu47mX0KhMQiM0l6gRFFY="; }) - (fetchNuGet { pname = "Svg.Model"; version = "2.0.0"; hash = "sha256-ThGAwPyEv/ZLfRu9LRU91RO13T+MPED/i+ojOOZkCYM="; }) - (fetchNuGet { pname = "Svg.Skia"; version = "2.0.0"; hash = "sha256-wjVvUQTZD1f5TGk4ytJCJTXzkwKp04kXxN/OXxhrLB4="; }) + (fetchNuGet { pname = "Svg.Custom"; version = "2.0.0.1"; hash = "sha256-ljkiz8xEaIMatjiGe49/LKBaPWR5D2/EY8CCNHZO4j4="; }) + (fetchNuGet { pname = "Svg.Model"; version = "2.0.0.1"; hash = "sha256-ICYIWmoBMM+nuUPQQSbwM2xggPDL+VZUG2UsnotU8Qw="; }) + (fetchNuGet { pname = "Svg.Skia"; version = "2.0.0.1"; hash = "sha256-3kGK9hc9BjaQu6u5mQ9heGKCDLpBDblgQ4VxRFLMa0Q="; }) (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; hash = "sha256-v6YfyfrKmhww+EYHUq6cwYUMj00MQ6SOfJtcGVRlYzs="; }) (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; hash = "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="; }) (fetchNuGet { pname = "System.Buffers"; version = "4.0.0"; hash = "sha256-+YUymoyS0O+xVyF2+LiAdZlMww8nofPN4ja9ylYqRo8="; }) @@ -477,14 +479,13 @@ (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "8.0.0"; hash = "sha256-+aODaDEQMqla5RYZeq0Lh66j+xkPYxykrVvSCmJQ+Vs="; }) (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "6.0.0"; hash = "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM="; }) (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "8.0.0"; hash = "sha256-rt8xc3kddpQY4HEdghlBeOK4gdw5yIj4mcZhAVtk2/Y="; }) - (fetchNuGet { pname = "System.Diagnostics.Process"; version = "4.3.0"; hash = "sha256-Rzo24qXhuJDDgrGNHr2eQRHhwLmsYmWDqAg/P5fOlzw="; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.0"; hash = "sha256-TYGBFoRvTXG8HpuuJMhDXS2O9fVlFpwhgH54nyG7Nss="; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; hash = "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U="; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; hash = "sha256-JA0jJcLbU3zh52ub3zweob2EVHvxOqiC6SCYHrY5WbQ="; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; }) (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; hash = "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; hash = "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="; }) + (fetchNuGet { pname = "System.Formats.Asn1"; version = "5.0.0"; hash = "sha256-9nL3dN4w/dZ49W1pCkTjRqZm6Dh0mMVExNungcBHrKs="; }) (fetchNuGet { pname = "System.Globalization"; version = "4.0.0"; hash = "sha256-H/5dMWOOuPh7n/tw8fhysuRh/yPL1AMq3dJhojHNQwk="; }) (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; hash = "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) @@ -580,7 +581,6 @@ (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; hash = "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="; }) (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.0.1"; hash = "sha256-1pJt5ZGxLPTX1mjOi8qZPXyyOMkYV0NstoUCv91HYPg="; }) (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; hash = "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA="; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.5.0"; hash = "sha256-AFsKPb/nTk2/mqH/PYpaoI8PLsiKKimaXf+7Mb5VfPM="; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="; }) (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; hash = "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks="; }) @@ -588,15 +588,16 @@ (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="; }) (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.2.0"; hash = "sha256-7F+m3HnmBsgE4xWF8FeCGlaEgQM3drqA6HEaQr6MEoU="; }) (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; hash = "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "5.0.0"; hash = "sha256-nOJP3vdmQaYA07TI373OvZX6uWshETipvi5KpL7oExo="; }) (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.0.0"; hash = "sha256-WHyR6vVK3zaT4De7jgQFUar1P5fiX9ECwiVkJDFFm7M="; }) (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; hash = "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="; }) (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.0.0"; hash = "sha256-ZO7ha39J5uHkIF2RoEKv/bW/bLbVvYMO4+rWyYsKHik="; }) (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="; }) (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.0.0"; hash = "sha256-mLijAozynzjiOMyh2P5BHcfVq3Ovd0T/phG08SIbXZs="; }) (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "5.0.0"; hash = "sha256-kq/tvYQSa24mKSvikFK2fKUAnexSL4PO4LkPppqtYkE="; }) (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.0.0"; hash = "sha256-sEdPftfTxQd/8DpdpqUZC2XWC0SjVCPqAkEleLl17EQ="; }) (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.3.0"; hash = "sha256-CbfRZFmnJZCAsx9cx9UehCtzsbnVo+ce+n4pXDsx4s0="; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.4.0"; hash = "sha256-Ri53QmFX8I8UH0x4PikQ1ZA07ZSnBUXStd5rBfGWFOE="; }) (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.1.0"; hash = "sha256-sBUUhJP+yYDXvcjNMKqNpn8yzGUpVABwK9vVUvYKjzI="; }) (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; }) @@ -628,11 +629,9 @@ (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; hash = "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE="; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; hash = "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; }) - (fetchNuGet { pname = "System.Threading.Thread"; version = "4.3.0"; hash = "sha256-pMs6RNFC3nQOGz9EqIcyWmO8YLaqay+q/Qde5hqPXXg="; }) (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; hash = "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="; }) (fetchNuGet { pname = "System.Threading.Timer"; version = "4.0.1"; hash = "sha256-5lU6zt1O9JDSPr2KAHw4BYgysHnt0yyZrMNa5IIjxZY="; }) (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; hash = "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="; }) - (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; hash = "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="; }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; hash = "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA="; }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; hash = "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg="; }) @@ -648,29 +647,31 @@ (fetchNuGet { pname = "ValveKeyValue"; version = "0.10.0.360"; hash = "sha256-LPQ6isUsA3cQKiO6ADijrCQ2ucx4TD01+kGzei3jIGY="; }) (fetchNuGet { pname = "Verify"; version = "21.3.0"; hash = "sha256-6KO3r+oLH8s3kk/HDDh51OuAmwPpd7hhxaAF9Q4MhuE="; }) (fetchNuGet { pname = "Verify"; version = "24.2.0"; hash = "sha256-wYm+h4wNoljNb3TZ+m25l6m0bGztZUkvygQektZrezA="; }) + (fetchNuGet { pname = "Verify"; version = "26.6.0"; hash = "sha256-kwPXrg+MLhp25lphCKfeS7f6NRwojfM1ichJUV4Ssy0="; }) (fetchNuGet { pname = "Verify.ImageMagick"; version = "3.4.2"; hash = "sha256-FOS9yiV90VSb1QD5bEM3aorLc/MDqXZtfJGp8H3qsDw="; }) (fetchNuGet { pname = "Verify.SourceGenerators"; version = "2.2.0"; hash = "sha256-GOI0iRFa1qekkERAPc/FZlEbEDlw3CyoAF/k8w/LwmU="; }) - (fetchNuGet { pname = "Verify.Xunit"; version = "24.2.0"; hash = "sha256-6ZlWbfAbWUq9UX8dFN7FVYaocfOR/nMuKu3s3QU7i74="; }) - (fetchNuGet { pname = "Vogen"; version = "3.0.20"; hash = "sha256-KY7T9ekbqGDUoLYvF6y4iYiMsFFebUoAwpo4FJ6Yg3w="; }) - (fetchNuGet { pname = "Vogen"; version = "3.0.24"; hash = "sha256-erz/30Og8+p6niM/FftOUlGEICfDjNo9MX86ybaKYZQ="; }) - (fetchNuGet { pname = "xunit"; version = "2.8.0"; hash = "sha256-drOe69C30RlLfictLW7Cf8rf+vmdemCjSM5VsUwWsfQ="; }) + (fetchNuGet { pname = "Verify.Xunit"; version = "26.6.0"; hash = "sha256-cPFPTa1not6565QD5k4PRr/EdFtDl0Hbh2Qu/qyCybM="; }) + (fetchNuGet { pname = "xunit"; version = "2.9.2"; hash = "sha256-h5+yTTfCmokCPy4lqdEw8RGzQlrlsQAW3Am0Jh0q7oo="; }) (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.1"; hash = "sha256-v5iPVeoUFsZp9zQMt3rg6xgw6UwF4VMIgzVYFIeb/zA="; }) (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.2"; hash = "sha256-w5APCW7suBdoDOmQqm/8Gq6+Sk88JcTR09zjmj9s17E="; }) (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; hash = "sha256-0D1y/C34iARI96gb3bAOG8tcGPMjx+fMabTPpydGlAM="; }) - (fetchNuGet { pname = "xunit.analyzers"; version = "1.13.0"; hash = "sha256-K8cGR9+MdJknNPjlPbxQ1GhzXG+fK466jCfYxMwCK10="; }) + (fetchNuGet { pname = "xunit.analyzers"; version = "1.16.0"; hash = "sha256-P5Bvl9hvHvF8KY1YWLg4tKiYxlfRnmHyL14jfSACDaU="; }) (fetchNuGet { pname = "xunit.assert"; version = "2.3.0"; hash = "sha256-lN+NiUEQoHWmoamUjvsNt2PVhHXYeHJHjHRk1BTs6R8="; }) - (fetchNuGet { pname = "xunit.assert"; version = "2.8.0"; hash = "sha256-y1maXa/fi+xt8EoViDQreLW70xiWfL+Ka2S7TO9BXU0="; }) - (fetchNuGet { pname = "xunit.core"; version = "2.8.0"; hash = "sha256-nzHNl/fnEGsTSpkCrfGqEaqw4fUV+JZEmQ3B7g5I394="; }) - (fetchNuGet { pname = "Xunit.DependencyInjection"; version = "9.3.0"; hash = "sha256-AEiF6OffWTAx+mQv4cNWwGOvLn5O++pmgOZSTbr355o="; }) + (fetchNuGet { pname = "xunit.assert"; version = "2.9.2"; hash = "sha256-EE6r526Q4cHn0Ourf1ENpXZ37Lj/P2uNvonHgpdcnq4="; }) + (fetchNuGet { pname = "xunit.core"; version = "2.9.2"; hash = "sha256-zhjV1I5xh0RFckgTEK72tIkLxVl4CPmter2UB++oye8="; }) + (fetchNuGet { pname = "Xunit.DependencyInjection"; version = "9.4.0"; hash = "sha256-wK569FbONK5cXoKT0hQEiNA46gRAv00hBmsWIaeYoGs="; }) (fetchNuGet { pname = "Xunit.DependencyInjection.Logging"; version = "9.0.0"; hash = "sha256-9MerQYIgsByxcZmczyp/fW6ZWgzo4ql6j9Iv/Y47E4A="; }) (fetchNuGet { pname = "Xunit.DependencyInjection.SkippableFact"; version = "9.0.0"; hash = "sha256-Ub6eSd9/bIhgbqQO+yWtiGfuLIkxSgl6TWfUL4ABkFI="; }) (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.2.0"; hash = "sha256-et3Se7paKJlg8Ha4Xr9+He40M6vblxyOwS2BQxOgLlE="; }) (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.4.0"; hash = "sha256-LbuXEcEJjGn3L6FCbC119+MY/QLvfLlGkCeAsCsZqGE="; }) (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.4.2"; hash = "sha256-wlTMUOQg5NaAPEsWkNSr8QSPbbCNSicpFajp1rowCsA="; }) - (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.8.0"; hash = "sha256-0p5ywaDIlfoD2xf9irimlgpHPtY9fr+vJWptwHePqPY="; }) + (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.9.0"; hash = "sha256-dYulj4Y+kEs2dpjGvKPuIhk3gszlVo+yN1XSfjrjPxw="; }) + (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.9.2"; hash = "sha256-MQAC/4d67Nssu3R+pHPh6vHitBXQYxEEZkVVMGW720c="; }) (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.4.0"; hash = "sha256-chRJEazwq93yhVONlbtTI1znqYy0gdAoQajPRnhM/i4="; }) (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.4.2"; hash = "sha256-l5Q60IBYWE5tYJCdFEEQnO5rIlXcNEM5S4Ut8vFnL2U="; }) - (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.8.0"; hash = "sha256-I/duyJVsnXwR+ILpT+cvj/kjqlngAqvtZP/Hjie8OF0="; }) - (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.8.0"; hash = "sha256-pZzKEO3zMO/kgPQ6UuWcBJZUzccs/sTnFp8ClQDad2c="; }) + (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.9.0"; hash = "sha256-1wRMsC+ZGdP4U/turB4mRfO0yh6uN47Vn1DJHyN/N3s="; }) + (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.9.2"; hash = "sha256-f+9UfoPyK3JIDhQSW0Yu9c4PGqUqZC96DMINCYi2i80="; }) + (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.8.2"; hash = "sha256-UlfK348r8kJuraywfdCtpJJxHkv04wPNzpUaz4UM/60="; }) (fetchNuGet { pname = "Xunit.SkippableFact"; version = "1.4.13"; hash = "sha256-pLtx0/2oTKYO1Y1Vg3k/Eli2OWHT5uorGdBp2uXvFfw="; }) + (fetchNuGet { pname = "ZstdSharp.Port"; version = "0.8.1"; hash = "sha256-PeQvyz3lUrK+t+n1dFtNXCLztQtAfkqUuM6mOqBZHLg="; }) ] diff --git a/third_party/nixpkgs/pkgs/by-name/ne/nexusmods-app/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/nexusmods-app/package.nix index 3c311548ba..0f0fc9f52d 100644 --- a/third_party/nixpkgs/pkgs/by-name/ne/nexusmods-app/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ne/nexusmods-app/package.nix @@ -24,14 +24,14 @@ let in buildDotnetModule (finalAttrs: { inherit pname; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "Nexus-Mods"; repo = "NexusMods.App"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-OmWDJVsXtUOYBeUXLx6EkQ1/RuH/3wIe40R5KgpmEC4="; + hash = "sha256-0uZdN24TvK4QoBEC0BSAYNALQv9swYZ8SgVJ03m2dzQ="; }; enableParallelBuilding = false; @@ -103,7 +103,7 @@ buildDotnetModule (finalAttrs: { executables = [ "NexusMods.App" ]; dotnetBuildFlags = [ - # From https://github.com/Nexus-Mods/NexusMods.App/blob/v0.6.1/src/NexusMods.App/app.pupnet.conf#L38 + # From https://github.com/Nexus-Mods/NexusMods.App/blob/v0.6.2/src/NexusMods.App/app.pupnet.conf#L38 "--property:Version=${finalAttrs.version}" "--property:TieredCompilation=true" "--property:PublishReadyToRun=true" @@ -127,6 +127,9 @@ buildDotnetModule (finalAttrs: { [ "NexusMods.UI.Tests.ImageCacheTests.Test_LoadAndCache_RemoteImage" "NexusMods.UI.Tests.ImageCacheTests.Test_LoadAndCache_ImageStoredFile" + + # Fails with: Expected a to be thrown, but no exception was thrown. + "NexusMods.Networking.ModUpdates.Tests.PerFeedCacheUpdaterTests.Constructor_WithItemsFromDifferentGames_ShouldThrowArgumentException_InDebug" ] ++ lib.optionals (!_7zz.meta.unfree) [ "NexusMods.Games.FOMOD.Tests.FomodXmlInstallerTests.InstallsFilesSimple_UsingRar" diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix b/third_party/nixpkgs/pkgs/by-name/nh/nheko/package.nix similarity index 51% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix rename to third_party/nixpkgs/pkgs/by-name/nh/nheko/package.nix index 041a3949d9..2e1bf3126d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/nh/nheko/package.nix @@ -1,32 +1,27 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, asciidoc -, pkg-config -, boost179 -, cmark -, coeurl -, curl -, kdsingleapplication -, libevent -, libsecret -, lmdb -, lmdbxx -, mtxclient -, nlohmann_json -, olm -, qtbase -, qtimageformats -, qtkeychain -, qtmultimedia -, qttools -, qtwayland -, re2 -, spdlog -, wrapQtAppsHook -, gst_all_1 -, libnice +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + asciidoc, + pkg-config, + boost179, + cmark, + coeurl, + curl, + kdsingleapplication, + libevent, + libsecret, + lmdb, + lmdbxx, + mtxclient, + nlohmann_json, + olm, + re2, + spdlog, + gst_all_1, + libnice, + qt6Packages, }: stdenv.mkDerivation rec { @@ -45,37 +40,38 @@ stdenv.mkDerivation rec { cmake lmdbxx pkg-config - wrapQtAppsHook + qt6Packages.wrapQtAppsHook ]; - buildInputs = [ - boost179 - cmark - coeurl - curl - kdsingleapplication - libevent - libsecret - lmdb - mtxclient - nlohmann_json - olm - qtbase - qtimageformats - qtkeychain - qtmultimedia - qttools - qtwayland - re2 - spdlog - ] - ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - (gst-plugins-good.override { qt6Support = true; }) - gst-plugins-bad - libnice - ]); + buildInputs = + [ + boost179 + cmark + coeurl + curl + kdsingleapplication + libevent + libsecret + lmdb + mtxclient + nlohmann_json + olm + qt6Packages.qtbase + qt6Packages.qtimageformats + qt6Packages.qtkeychain + qt6Packages.qtmultimedia + qt6Packages.qttools + qt6Packages.qtwayland + re2 + spdlog + ] + ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + (gst-plugins-good.override { qt6Support = true; }) + gst-plugins-bad + libnice + ]); cmakeFlags = [ "-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389 @@ -91,7 +87,11 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Nheko-Reborn/nheko"; license = licenses.gpl3Plus; mainProgram = "nheko"; - maintainers = with maintainers; [ ekleog fpletz ]; + maintainers = with maintainers; [ + ekleog + fpletz + rnhmjoj + ]; platforms = platforms.all; # Should be fixable if a higher clang version is used, see: # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177 diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nimdow/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nimdow/package.nix index d35436b184..f6b9d5bb9b 100644 --- a/third_party/nixpkgs/pkgs/by-name/ni/nimdow/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ni/nimdow/package.nix @@ -3,13 +3,13 @@ buildNimPackage (finalAttrs: { pname = "nimdow"; - version = "0.7.38"; + version = "0.7.39"; src = fetchFromGitHub { owner = "avahe-kellenberger"; repo = "nimdow"; rev = "v${finalAttrs.version}"; - hash = "sha256-GPu3Z63rFBgCCV7bdBg9cJh5thv2xrv/nSMa5Q/zp48="; + hash = "sha256-9gYlVuKDHCs6yaY1b6dJgwQUJdko6npjom4ab7nKZ7w="; }; lockFile = ./lock.json; 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 3748f3dbf8..e854c1a4fc 100644 --- a/third_party/nixpkgs/pkgs/by-name/ni/niri/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ni/niri/package.nix @@ -1,22 +1,26 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, nix-update-script -, pkg-config -, libdisplay-info -, libxkbcommon -, pango -, pipewire -, seatd -, stdenv -, wayland -, systemd -, libinput -, mesa -, fontconfig -, libglvnd -, autoPatchelfHook -, clang +{ + lib, + clang, + dbus, + eudev, + fetchFromGitHub, + libdisplay-info, + libglvnd, + libinput, + libxkbcommon, + mesa, + nix-update-script, + pango, + pipewire, + pkg-config, + rustPlatform, + seatd, + systemd, + wayland, + withDbus ? true, + withDinit ? false, + withScreencastSupport ? true, + withSystemd ? true, }: rustPlatform.buildRustPackage rec { @@ -26,10 +30,16 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "YaLTeR"; repo = "niri"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-4YDrKMwXGVOBkeaISbxqf24rLuHvO98TnqxWYfgiSeg="; }; + postPatch = '' + patchShebangs resources/niri-session + substituteInPlace resources/niri.service \ + --replace-fail '/usr/bin' "$out/bin" + ''; + cargoLock = { lockFile = ./Cargo.lock; outputHashes = { @@ -38,56 +48,79 @@ rustPlatform.buildRustPackage rec { }; }; + strictDeps = true; + nativeBuildInputs = [ + clang pkg-config rustPlatform.bindgenHook - autoPatchelfHook - clang ]; - buildInputs = [ - wayland - systemd # For libudev - seatd # For libseat - libdisplay-info - libxkbcommon - libinput - mesa # For libgbm - fontconfig - stdenv.cc.cc.lib - pipewire - pango - ]; + buildInputs = + [ + libdisplay-info + libglvnd # For libEGL + libinput + libxkbcommon + mesa # For libgbm + pango + seatd + wayland # For libwayland-client + ] + ++ lib.optional (withDbus || withScreencastSupport || withSystemd) dbus + ++ lib.optional withScreencastSupport pipewire + ++ lib.optional withSystemd systemd # Includes libudev + ++ lib.optional (!withSystemd) eudev; # Use an alternative libudev implementation when building w/o systemd - runtimeDependencies = [ - wayland - mesa - libglvnd # For libEGL - ]; + buildFeatures = + lib.optional withDbus "dbus" + ++ lib.optional withDinit "dinit" + ++ lib.optional withScreencastSupport "xdp-gnome-screencast" + ++ lib.optional withSystemd "systemd"; + buildNoDefaultFeatures = true; - passthru.providedSessions = [ "niri" ]; + postInstall = + '' + install -Dm0644 resources/niri.desktop -t $out/share/wayland-sessions + '' + + lib.optionalString withDbus '' + install -Dm0644 resources/niri-portals.conf -t $out/share/xdg-desktop-portal + '' + + lib.optionalString withSystemd '' + install -Dm0755 resources/niri-session -t $out/bin + install -Dm0644 resources/niri{-shutdown.target,.service} -t $out/lib/systemd/user + ''; - postPatch = '' - patchShebangs ./resources/niri-session - substituteInPlace ./resources/niri.service \ - --replace-fail '/usr/bin' "$out/bin" - ''; + env = { + # Force linking with libEGL and libwayland-client + # so they can be discovered by `dlopen()` + RUSTFLAGS = toString ( + map (arg: "-C link-arg=" + arg) [ + "-Wl,--push-state,--no-as-needed" + "-lEGL" + "-lwayland-client" + "-Wl,--pop-state" + ] + ); + }; - postInstall = '' - install -Dm0755 ./resources/niri-session -t $out/bin - install -Dm0644 resources/niri.desktop -t $out/share/wayland-sessions - install -Dm0644 resources/niri-portals.conf -t $out/share/xdg-desktop-portal - install -Dm0644 resources/niri{-shutdown.target,.service} -t $out/share/systemd/user - ''; + passthru = { + providedSessions = [ "niri" ]; + updateScript = nix-update-script { }; + }; - passthru.updateScript = nix-update-script { }; - - meta = with lib; { + meta = { description = "Scrollable-tiling Wayland compositor"; homepage = "https://github.com/YaLTeR/niri"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ iogamaster foo-dogsquared sodiboo ]; + changelog = "https://github.com/YaLTeR/niri/releases/tag/v${version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + iogamaster + foo-dogsquared + sodiboo + getchoo + ]; mainProgram = "niri"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nitrokey-storage-firmware/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nitrokey-storage-firmware/package.nix new file mode 100644 index 0000000000..51d448ee80 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ni/nitrokey-storage-firmware/package.nix @@ -0,0 +1,84 @@ +{ + lib, + stdenv, + fetchzip, + fetchFromGitHub, +}: +let + pname = "nitrokey-storage-firmware"; + version = "0.57"; + + src = fetchFromGitHub { + owner = "Nitrokey"; + repo = "nitrokey-storage-firmware"; + rev = "V${version}"; + hash = "sha256-u8IK57NVS/IOPIE3Ah/O8WuOIr0EY6AF1bEaeDgIBuk="; + }; + + toolchain = stdenv.mkDerivation (finalAttrs: { + pname = "avr32-toolchain"; + version = "3.0.0.201009140852"; + + src = fetchzip { + url = "https://ww1.microchip.com/downloads/archive/avr32studio-ide-2.6.0.753-linux.gtk.x86_64.zip"; + hash = "sha256-MwsaGyNqbO0lBy1rcczuvKOaGbO3f0V+j84sUCkRlxc="; + }; + + postPatch = '' + cp ${src}/pm_240.h plugins/com.atmel.avr.toolchains.linux.x86_64_${finalAttrs.version}/os/linux/x86_64/avr32/include/avr32/pm_231.h + ''; + + installPhase = '' + runHook preInstall + cp -r plugins/com.atmel.avr.toolchains.linux.x86_64_${finalAttrs.version}/os/linux/x86_64 $out + rm -r $out/avr $out/bin/avr-* + runHook postInstall + ''; + + meta = { + description = "AVR32 toolchain"; + homepage = "https://web.archive.org/web/20210419192039/https://www.microchip.com/mplab/avr-support/avr-and-sam-downloads-archive"; + # The zip does not explicitly say this, + # it only mentions the license(s) of AVR32 Studio. + # Because it is very clearly a fork of GCC 4.3.3, + # it should be licensed under GPLv2+ + license = lib.licenses.gpl2Plus; + platforms = [ "x86_64-linux" ]; + }; + }); +in +stdenv.mkDerivation { + inherit pname version src; + + sourceRoot = "source/src"; + + postPatch = '' + substituteInPlace Makefile \ + --replace-fail '$(shell git describe)' "V${version}" + ''; + + makeFlags = [ + "CC=${toolchain}/bin/avr32-gcc" + "nitrokey-storage-V${version}-reproducible.hex" + ]; + + enableParallelBuilding = true; + + installPhase = '' + runHook preInstall + install -D nitrokey-storage-V${version}-reproducible.hex $out/nitrokey-storage-V${version}-reproducible.hex + runHook postInstall + ''; + + meta = { + description = "Firmware for the Nitrokey Storage device"; + homepage = "https://github.com/Nitrokey/nitrokey-storage-firmware"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + imadnyc + kiike + amerino + ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nix-ld/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-ld/package.nix index 94c4068cb7..8f2c147797 100644 --- a/third_party/nixpkgs/pkgs/by-name/ni/nix-ld/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ni/nix-ld/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "nix-ld"; - version = "2.0.0"; + version = "2.0.3"; src = fetchFromGitHub { owner = "mic92"; repo = "nix-ld"; rev = version; - hash = "sha256-rmSXQ4MYQe/OFDBRlqqw5kyp9b/aeEg0Fg9c167xofg="; + hash = "sha256-NRkLjdMtVfC6dD1gEbYZWFEtbmC2xfD6ft1IP7l76Vw="; }; - cargoHash = "sha256-BVulfs4zm3Iruq00H49QcxR3V+iZvePtLBTytdXfLP4="; + cargoHash = "sha256-GOngDGRzWVuzGTX5xNb/nv5dJ6is6cH8K6kHTX3OoXE="; hardeningDisable = [ "stackprotector" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nix-plugin-pijul/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-plugin-pijul/package.nix index 0b78c43ba6..b9b7f62f01 100644 --- a/third_party/nixpkgs/pkgs/by-name/ni/nix-plugin-pijul/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ni/nix-plugin-pijul/package.nix @@ -6,15 +6,16 @@ pkg-config, boost, howard-hinnant-date, - nix, # for tests runCommand, pijul, nixVersions, + nixOverride ? null, nix-plugin-pijul, }: -stdenv.mkDerivation (finalAttrs: { +let nix = if nixOverride != null then nixOverride else nixVersions.nix_2_18; +in stdenv.mkDerivation (finalAttrs: { pname = "nix-plugin-pijul"; version = "0.1.4"; @@ -35,8 +36,8 @@ stdenv.mkDerivation (finalAttrs: { ]; passthru.tests = let - localRepoCheck = nix: - runCommand "localRepoCheck-${nix.name}" + localRepoCheck = nixOverride: + runCommand "localRepoCheck-${nixOverride.name}" { nativeBuildInputs = [ pijul @@ -57,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { output=$( nix \ - --option plugin-files ${nix-plugin-pijul.override {inherit nix;}}/lib/nix/plugins/pijul.so \ + --option plugin-files ${nix-plugin-pijul.override {inherit nixOverride;}}/lib/nix/plugins/pijul.so \ --extra-experimental-features 'nix-command flakes' \ eval --impure --raw --expr "builtins.readFile ((builtins.fetchTree \"pijul+file://$PWD\") + \"/foo\")" ) diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nix-search-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-search-cli/package.nix index daf80cf9a7..e5198fb28a 100644 --- a/third_party/nixpkgs/pkgs/by-name/ni/nix-search-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ni/nix-search-cli/package.nix @@ -1,34 +1,31 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, unstableGitUpdater +{ + lib, + buildGoModule, + fetchFromGitHub, + unstableGitUpdater, }: buildGoModule { pname = "nix-search-cli"; - version = "0-unstable-2023-09-12"; + version = "0.2-unstable-2024-09-24"; src = fetchFromGitHub { owner = "peterldowns"; repo = "nix-search-cli"; - rev = "f3f1c53c72dadac06472a7112aeb486ab5dda695"; - hash = "sha256-YM1Lf7py79rU8aJE0PfQaMr5JWx5J1covUf1aCjRkc8="; + rev = "7d6b4c501ee448dc2e5c123aa4c6d9db44a6dd12"; + hash = "sha256-0Zms/QVCUKxILLLJYsaodSW64DJrVr/yB13SnNL8+Wg="; }; - vendorHash = "sha256-JDOu7YdX9ztMZt0EFAMz++gD7n+Mn1VOe5g6XwrgS5M="; + vendorHash = "sha256-RZuB0aRiMSccPhX30cGKBBEMCSvmC6r53dWaqDYbmyA="; - passthru.updateScript = unstableGitUpdater { - # Almost every commit is tagged as "release--", software doesn't keep track of its version - # Using 0 feels closer to what the tagging is trying to express - hardcodeZeroVersion = true; - }; + passthru.updateScript = unstableGitUpdater { }; - meta = with lib; { + meta = { description = "CLI for searching packages on search.nixos.org"; homepage = "https://github.com/peterldowns/nix-search-cli"; - license = licenses.mit; - maintainers = with maintainers; [ donovanglover ]; - platforms = platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ donovanglover ]; + platforms = lib.platforms.all; mainProgram = "nix-search"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/no/node-red/package-lock.json b/third_party/nixpkgs/pkgs/by-name/no/node-red/package-lock.json index ac83b8e21b..9dc012ff7f 100644 --- a/third_party/nixpkgs/pkgs/by-name/no/node-red/package-lock.json +++ b/third_party/nixpkgs/pkgs/by-name/no/node-red/package-lock.json @@ -1,12 +1,12 @@ { "name": "node-red", - "version": "4.0.3", + "version": "4.0.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "node-red", - "version": "4.0.3", + "version": "4.0.4", "license": "Apache-2.0", "dependencies": { "acorn": "8.12.1", @@ -19,16 +19,16 @@ "cheerio": "1.0.0-rc.10", "clone": "2.1.2", "content-type": "1.0.5", - "cookie": "0.6.0", - "cookie-parser": "1.4.6", + "cookie": "0.7.2", + "cookie-parser": "1.4.7", "cors": "2.8.5", "cronosjs": "1.7.1", "denque": "2.1.0", - "express": "4.21.0", - "express-session": "1.18.0", + "express": "4.21.1", + "express-session": "1.18.1", "form-data": "4.0.0", "fs-extra": "11.2.0", - "got": "12.6.0", + "got": "12.6.1", "hash-sum": "2.0.0", "hpagent": "1.2.0", "https-proxy-agent": "5.0.1", @@ -43,7 +43,7 @@ "memorystore": "1.6.7", "mime": "3.0.0", "moment": "2.30.1", - "moment-timezone": "0.5.45", + "moment-timezone": "0.5.46", "mqtt": "5.7.0", "multer": "1.4.5-lts.1", "mustache": "4.2.0", @@ -55,10 +55,10 @@ "passport": "0.7.0", "passport-http-bearer": "1.0.1", "passport-oauth2-client-password": "0.1.2", - "raw-body": "2.5.2", + "raw-body": "3.0.0", "rfdc": "^1.3.1", - "semver": "7.5.4", - "tar": "7.2.0", + "semver": "7.6.3", + "tar": "7.4.3", "tough-cookie": "^5.0.0", "uglify-js": "3.17.4", "uuid": "9.0.1", @@ -66,10 +66,10 @@ "xml2js": "0.6.2" }, "devDependencies": { - "dompurify": "2.4.1", + "dompurify": "2.5.7", "grunt": "1.6.1", "grunt-chmod": "~1.1.1", - "grunt-cli": "~1.4.3", + "grunt-cli": "~1.5.0", "grunt-concurrent": "3.0.0", "grunt-contrib-clean": "2.0.1", "grunt-contrib-compress": "2.0.0", @@ -80,7 +80,7 @@ "grunt-contrib-watch": "1.1.0", "grunt-jsdoc": "2.4.1", "grunt-jsdoc-to-markdown": "6.0.0", - "grunt-jsonlint": "2.1.3", + "grunt-jsonlint": "3.0.0", "grunt-mkdir": "~1.1.0", "grunt-npm-command": "~0.1.2", "grunt-sass": "~3.1.0", @@ -90,11 +90,11 @@ "jquery-i18next": "1.2.1", "jsdoc-nr-template": "github:node-red/jsdoc-nr-template", "marked": "4.3.0", - "mermaid": "^10.4.0", + "mermaid": "11.3.0", "minami": "1.2.3", "mocha": "9.2.2", "node-red-node-test-helper": "^0.3.3", - "nodemon": "2.0.20", + "nodemon": "3.1.7", "proxy": "^1.0.2", "sass": "1.62.1", "should": "13.2.3", @@ -109,6 +109,30 @@ "@node-rs/bcrypt": "1.10.4" } }, + "node_modules/@antfu/install-pkg": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@antfu/install-pkg/-/install-pkg-0.4.1.tgz", + "integrity": "sha512-T7yB5QNG29afhWVkVq7XeIMBa5U/vs9mX69YqayXypPRmYzUmzwnYltplHmPtZ4HPCn+sQKeXW8I47wCbuBOjw==", + "dev": true, + "license": "MIT", + "dependencies": { + "package-manager-detector": "^0.2.0", + "tinyexec": "^0.3.0" + }, + "funding": { + "url": "https://github.com/sponsors/antfu" + } + }, + "node_modules/@antfu/utils": { + "version": "0.7.10", + "resolved": "https://registry.npmjs.org/@antfu/utils/-/utils-0.7.10.tgz", + "integrity": "sha512-+562v9k4aI80m1+VuMHehNJWLOFjBnXn3tdOitzD0il5b7smkSBal4+a3oKiQTbrwMmN/TBUMDvbdoWDehgOww==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/antfu" + } + }, "node_modules/@babel/code-frame": { "version": "7.25.7", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.25.7.tgz", @@ -356,12 +380,56 @@ } }, "node_modules/@braintree/sanitize-url": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-6.0.4.tgz", - "integrity": "sha512-s3jaWicZd0pkP0jf5ysyHUI/RE7MHos6qlToFcGWXVp+ykHOy77OUMrfbgJ9it2C5bow7OIQwYYaHjk9XlBQ2A==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-7.1.0.tgz", + "integrity": "sha512-o+UlMLt49RvtCASlOMW0AkHnabN9wR9rwCCherxO0yG4Npy34GkvrAqdXQvrhNs+jh+gkK8gB8Lf05qL/O7KWg==", "dev": true, "license": "MIT" }, + "node_modules/@chevrotain/cst-dts-gen": { + "version": "11.0.3", + "resolved": "https://registry.npmjs.org/@chevrotain/cst-dts-gen/-/cst-dts-gen-11.0.3.tgz", + "integrity": "sha512-BvIKpRLeS/8UbfxXxgC33xOumsacaeCKAjAeLyOn7Pcp95HiRbrpl14S+9vaZLolnbssPIUuiUd8IvgkRyt6NQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@chevrotain/gast": "11.0.3", + "@chevrotain/types": "11.0.3", + "lodash-es": "4.17.21" + } + }, + "node_modules/@chevrotain/gast": { + "version": "11.0.3", + "resolved": "https://registry.npmjs.org/@chevrotain/gast/-/gast-11.0.3.tgz", + "integrity": "sha512-+qNfcoNk70PyS/uxmj3li5NiECO+2YKZZQMbmjTqRI3Qchu8Hig/Q9vgkHpI3alNjr7M+a2St5pw5w5F6NL5/Q==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@chevrotain/types": "11.0.3", + "lodash-es": "4.17.21" + } + }, + "node_modules/@chevrotain/regexp-to-ast": { + "version": "11.0.3", + "resolved": "https://registry.npmjs.org/@chevrotain/regexp-to-ast/-/regexp-to-ast-11.0.3.tgz", + "integrity": "sha512-1fMHaBZxLFvWI067AVbGJav1eRY7N8DDvYCTwGBiE/ytKBgP8azTdgyrKyWZ9Mfh09eHWb5PgTSO8wi7U824RA==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/@chevrotain/types": { + "version": "11.0.3", + "resolved": "https://registry.npmjs.org/@chevrotain/types/-/types-11.0.3.tgz", + "integrity": "sha512-gsiM3G8b58kZC2HaWR50gu6Y1440cHiJ+i3JUvcp/35JchYejb2+5MVeJK0iKThYpAa/P2PYFV4hoi44HD+aHQ==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/@chevrotain/utils": { + "version": "11.0.3", + "resolved": "https://registry.npmjs.org/@chevrotain/utils/-/utils-11.0.3.tgz", + "integrity": "sha512-YslZMgtJUyuMbZ+aKvfF3x1f5liK4mWNxghFRv7jqRR9C3R3fAOGTTKvxXDa2Y1s9zSbcpuO0cAxDYsc9SrXoQ==", + "dev": true, + "license": "Apache-2.0" + }, "node_modules/@emnapi/core": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.3.0.tgz", @@ -393,6 +461,54 @@ "tslib": "^2.4.0" } }, + "node_modules/@iconify/types": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@iconify/types/-/types-2.0.0.tgz", + "integrity": "sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==", + "dev": true, + "license": "MIT" + }, + "node_modules/@iconify/utils": { + "version": "2.1.33", + "resolved": "https://registry.npmjs.org/@iconify/utils/-/utils-2.1.33.tgz", + "integrity": "sha512-jP9h6v/g0BIZx0p7XGJJVtkVnydtbgTgt9mVNcGDYwaa7UhdHdI9dvoq+gKj9sijMSJKxUPEG2JyjsgXjxL7Kw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@antfu/install-pkg": "^0.4.0", + "@antfu/utils": "^0.7.10", + "@iconify/types": "^2.0.0", + "debug": "^4.3.6", + "kolorist": "^1.8.0", + "local-pkg": "^0.5.0", + "mlly": "^1.7.1" + } + }, + "node_modules/@iconify/utils/node_modules/debug": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/@iconify/utils/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true, + "license": "MIT" + }, "node_modules/@isaacs/cliui": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", @@ -567,6 +683,16 @@ "node": ">=v12.0.0" } }, + "node_modules/@mermaid-js/parser": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@mermaid-js/parser/-/parser-0.3.0.tgz", + "integrity": "sha512-HsvL6zgE5sUPGgkIDlmAWR1HTNHz2Iy11BAWPTa4Jjabkpguy4Ze2gzfLrg6pdRuBvFwgUYyxiaNqZwrEEXepA==", + "dev": true, + "license": "MIT", + "dependencies": { + "langium": "3.0.0" + } + }, "node_modules/@napi-rs/wasm-runtime": { "version": "0.2.5", "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.5.tgz", @@ -833,6 +959,44 @@ "node": ">= 10" } }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", @@ -844,49 +1008,25 @@ } }, "node_modules/@prantlf/jsonlint": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/@prantlf/jsonlint/-/jsonlint-10.2.0.tgz", - "integrity": "sha512-KMFfds0peWLLfCu3bhClTiEN0tdj/Z86QJvn1awKHws6r+Sx6T3a44Eadz6OvqN6ZpsRkqaRpZxqddvvDAdDZQ==", + "version": "14.1.0", + "resolved": "https://registry.npmjs.org/@prantlf/jsonlint/-/jsonlint-14.1.0.tgz", + "integrity": "sha512-4OBJHQmFbvL+VWeI0dzN2ugXD+L0ZAKSfLn5kpsNjhCo39eEId/ftiJXWwVifKVYwATbqaLaXhQBhHwvAOaanw==", "dev": true, "license": "MIT", "dependencies": { - "ajv": "6.10.2", - "commander": "4.0.1" + "ajv": "8.17.1", + "ajv-draft-04": "1.0.0", + "cosmiconfig": "9.0.0", + "diff": "5.2.0", + "fast-glob": "3.3.2" }, "bin": { "jsonlint": "lib/cli.js" }, "engines": { - "node": ">= 6" + "node": ">= 14" } }, - "node_modules/@prantlf/jsonlint/node_modules/ajv": { - "version": "6.10.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", - "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "node_modules/@prantlf/jsonlint/node_modules/fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha512-bCK/2Z4zLidyB4ReuIsvALH6w31YfAQDmXMqMx6FyfHqvBxtjC0eRumeSu4Bs3XtXwpyIywtSTrVT99BxY1f9w==", - "dev": true, - "license": "MIT" - }, - "node_modules/@prantlf/jsonlint/node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true, - "license": "MIT" - }, "node_modules/@sindresorhus/is": { "version": "5.6.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.6.0.tgz", @@ -960,40 +1100,6 @@ "tslib": "^2.4.0" } }, - "node_modules/@types/d3-scale": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.8.tgz", - "integrity": "sha512-gkK1VVTr5iNiYJ7vWDI+yUFFlszhNMtVeneJ6lUTKPjprsvLLI9/tgEGiXJOnlINJA8FyA88gfnQsHbybVZrYQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/d3-time": "*" - } - }, - "node_modules/@types/d3-scale-chromatic": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.0.3.tgz", - "integrity": "sha512-laXM4+1o5ImZv3RpFAsTRn3TEkzqkytiOY0Dz0sq5cnd1dtNlk6sHLon4OvqaiJb28T0S/TdsBI3Sjsy+keJrw==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/d3-time": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.3.tgz", - "integrity": "sha512-2p6olUZ4w3s+07q3Tm2dbiMZy5pCDfYwtLXXHUnVzXgQlZ/OyPtUz6OL382BkOuGlLXqfT+wqv8Fw2v8/0geBw==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/debug": { - "version": "4.1.12", - "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz", - "integrity": "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/ms": "*" - } - }, "node_modules/@types/http-cache-semantics": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz", @@ -1018,16 +1124,6 @@ "@types/mdurl": "*" } }, - "node_modules/@types/mdast": { - "version": "3.0.15", - "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.15.tgz", - "integrity": "sha512-LnwD+mUEfxWMa1QpDraczIn6k0Ee3SMicuYSSzS6ZYl2gKS09EClnJYGd8Du6rfc5r/GZEk5o1mRb8TaTj03sQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/unist": "^2" - } - }, "node_modules/@types/mdurl": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz", @@ -1035,17 +1131,10 @@ "dev": true, "license": "MIT" }, - "node_modules/@types/ms": { - "version": "0.7.34", - "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.34.tgz", - "integrity": "sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==", - "dev": true, - "license": "MIT" - }, "node_modules/@types/node": { - "version": "22.7.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.4.tgz", - "integrity": "sha512-y+NPi1rFzDs1NdQHHToqeiX2TIS79SWEAw9GYhkkx8bD0ChpfqC+n2j5OXOCpzfojBEBt6DnEnnG9MY0zk1XLg==", + "version": "22.7.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz", + "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==", "license": "MIT", "dependencies": { "undici-types": "~6.19.2" @@ -1061,13 +1150,6 @@ "safe-buffer": "~5.1.1" } }, - "node_modules/@types/unist": { - "version": "2.0.11", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.11.tgz", - "integrity": "sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==", - "dev": true, - "license": "MIT" - }, "node_modules/@types/ws": { "version": "8.5.12", "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.12.tgz", @@ -1200,6 +1282,21 @@ "url": "https://github.com/sponsors/epoberezkin" } }, + "node_modules/ajv-draft-04": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/ajv-draft-04/-/ajv-draft-04-1.0.0.tgz", + "integrity": "sha512-mv00Te6nmYbRp5DCwclxtt7yV/joXJPGS7nM+97GdxvuttCOfgI3K4U25zboyeX0O+myI8ERluxQe5wljMmVIw==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "ajv": "^8.5.0" + }, + "peerDependenciesMeta": { + "ajv": { + "optional": true + } + } + }, "node_modules/ansi-colors": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", @@ -1695,6 +1792,21 @@ "node": ">=0.10.0" } }, + "node_modules/body-parser/node_modules/raw-body": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", + "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", + "license": "MIT", + "dependencies": { + "bytes": "3.1.2", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/body/node_modules/bytes": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz", @@ -1906,6 +2018,16 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/camelcase": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz", @@ -1946,17 +2068,6 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/character-entities": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-2.0.2.tgz", - "integrity": "sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==", - "dev": true, - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, "node_modules/cheerio": { "version": "1.0.0-rc.10", "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.10.tgz", @@ -1994,6 +2105,34 @@ "url": "https://github.com/sponsors/fb55" } }, + "node_modules/chevrotain": { + "version": "11.0.3", + "resolved": "https://registry.npmjs.org/chevrotain/-/chevrotain-11.0.3.tgz", + "integrity": "sha512-ci2iJH6LeIkvP9eJW6gpueU8cnZhv85ELY8w8WiFtNjMHA5ad6pQLaJo9mEly/9qUyCpvqX8/POVUTf18/HFdw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@chevrotain/cst-dts-gen": "11.0.3", + "@chevrotain/gast": "11.0.3", + "@chevrotain/regexp-to-ast": "11.0.3", + "@chevrotain/types": "11.0.3", + "@chevrotain/utils": "11.0.3", + "lodash-es": "4.17.21" + } + }, + "node_modules/chevrotain-allstar": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/chevrotain-allstar/-/chevrotain-allstar-0.3.1.tgz", + "integrity": "sha512-b7g+y9A0v4mxCW1qUhf3BSVPg+/NvGErk/dOkrDaHA0nQIQGAtrOjlX//9OQtRlSCy+x9rfB5N8yC71lH1nvMw==", + "dev": true, + "license": "MIT", + "dependencies": { + "lodash-es": "^4.17.21" + }, + "peerDependencies": { + "chevrotain": "^11.0.0" + } + }, "node_modules/chokidar": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", @@ -2236,13 +2375,13 @@ } }, "node_modules/commander": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-4.0.1.tgz", - "integrity": "sha512-IPF4ouhCP+qdlcmCedhxX4xiGBPyigb8v5NeUp+0LyhwLgxMqyp3S0vl7TAPfS/hiP7FC3caI/PB9lTmP8r1NA==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", "dev": true, "license": "MIT", "engines": { - "node": ">= 6" + "node": ">= 10" } }, "node_modules/commist": { @@ -2316,6 +2455,13 @@ "typedarray": "^0.0.6" } }, + "node_modules/confbox": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.8.tgz", + "integrity": "sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==", + "dev": true, + "license": "MIT" + }, "node_modules/config-master": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/config-master/-/config-master-3.1.0.tgz", @@ -2400,36 +2546,27 @@ "license": "MIT" }, "node_modules/cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/cookie-parser": { - "version": "1.4.6", - "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.6.tgz", - "integrity": "sha512-z3IzaNjdwUC2olLIB5/ITd0/setiaFMLYiZJle7xg5Fe9KWAceil7xszYfHHBtDFYLSgJduS2Ty0P1uJdPDJeA==", + "version": "1.4.7", + "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.7.tgz", + "integrity": "sha512-nGUvgXnotP3BsjiLX2ypbQnWoGUPIIfHQNZkkC668ntrzGWEZVW70HDEB1qnNGMicPje6EttlIgzo51YSwNQGw==", "license": "MIT", "dependencies": { - "cookie": "0.4.1", + "cookie": "0.7.2", "cookie-signature": "1.0.6" }, "engines": { "node": ">= 0.8.0" } }, - "node_modules/cookie-parser/node_modules/cookie": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz", - "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==", - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, "node_modules/cookie-signature": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", @@ -2472,6 +2609,33 @@ "layout-base": "^1.0.0" } }, + "node_modules/cosmiconfig": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz", + "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==", + "dev": true, + "license": "MIT", + "dependencies": { + "env-paths": "^2.2.1", + "import-fresh": "^3.3.0", + "js-yaml": "^4.1.0", + "parse-json": "^5.2.0" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/d-fischer" + }, + "peerDependencies": { + "typescript": ">=4.9.5" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, "node_modules/cp-file": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/cp-file/-/cp-file-6.2.0.tgz", @@ -2600,6 +2764,36 @@ "cytoscape": "^3.2.0" } }, + "node_modules/cytoscape-fcose": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/cytoscape-fcose/-/cytoscape-fcose-2.2.0.tgz", + "integrity": "sha512-ki1/VuRIHFCzxWNrsshHYPs6L7TvLu3DL+TyIGEsRcvVERmxokbf5Gdk7mFxZnTdiGtnA4cfSmjZJMviqSuZrQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "cose-base": "^2.2.0" + }, + "peerDependencies": { + "cytoscape": "^3.2.0" + } + }, + "node_modules/cytoscape-fcose/node_modules/cose-base": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/cose-base/-/cose-base-2.2.0.tgz", + "integrity": "sha512-AzlgcsCbUMymkADOJtQm3wO9S3ltPfYOFD5033keQn9NJzIbtnZj+UdBJe7DYml/8TdbtHJW3j58SOnKhWY/5g==", + "dev": true, + "license": "MIT", + "dependencies": { + "layout-base": "^2.0.0" + } + }, + "node_modules/cytoscape-fcose/node_modules/layout-base": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/layout-base/-/layout-base-2.0.1.tgz", + "integrity": "sha512-dp3s92+uNI1hWIpPGH3jK2kxE2lMjdXdr+DH8ynZHpd6PUlH6x6cbuXnoMmiNumznqaNO31xu9e79F0uuZ0JFg==", + "dev": true, + "license": "MIT" + }, "node_modules/d3": { "version": "7.9.0", "resolved": "https://registry.npmjs.org/d3/-/d3-7.9.0.tgz", @@ -2781,16 +2975,6 @@ "node": ">=12" } }, - "node_modules/d3-dsv/node_modules/commander": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", - "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10" - } - }, "node_modules/d3-ease": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz", @@ -3143,20 +3327,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/decode-named-character-reference": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/decode-named-character-reference/-/decode-named-character-reference-1.0.2.tgz", - "integrity": "sha512-O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg==", - "dev": true, - "license": "MIT", - "dependencies": { - "character-entities": "^2.0.0" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, "node_modules/decompress-response": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", @@ -3270,16 +3440,6 @@ "node": ">= 0.8" } }, - "node_modules/dequal": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", - "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/destroy": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", @@ -3312,9 +3472,9 @@ } }, "node_modules/diff": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", - "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", + "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", "dev": true, "license": "BSD-3-Clause", "engines": { @@ -3387,9 +3547,9 @@ } }, "node_modules/dompurify": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.4.1.tgz", - "integrity": "sha512-ewwFzHzrrneRjxzmK6oVz/rZn9VWspGFRDb4/rRtIsM1n36t9AKma/ye8syCpcw+XJ25kOK/hOG7t1j2I2yBqA==", + "version": "2.5.7", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.5.7.tgz", + "integrity": "sha512-2q4bEI+coQM8f5ez7kt2xclg1XsecaV9ASJk/54vwlfRRNQfDqJz2pzQ8t0Ix/ToBpXlVjrRIx7pFC/o8itG2Q==", "dev": true, "license": "(MPL-2.0 OR Apache-2.0)" }, @@ -3465,13 +3625,6 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", "license": "MIT" }, - "node_modules/elkjs": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/elkjs/-/elkjs-0.9.3.tgz", - "integrity": "sha512-f/ZeWvW/BCXbhGEf1Ujp29EASo/lk1FDnETgNKwJrsVvGZhUWCZyg3xLJjAsxfOmt8KjswHmI5EwCQcPMpOYhQ==", - "dev": true, - "license": "EPL-2.0" - }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -3519,6 +3672,16 @@ "url": "https://github.com/fb55/entities?sponsor=1" } }, + "node_modules/env-paths": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/error": { "version": "7.2.1", "resolved": "https://registry.npmjs.org/error/-/error-7.2.1.tgz", @@ -3663,9 +3826,9 @@ } }, "node_modules/express": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", - "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", + "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", "license": "MIT", "dependencies": { "accepts": "~1.3.8", @@ -3673,7 +3836,7 @@ "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.6.0", + "cookie": "0.7.1", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", @@ -3705,12 +3868,12 @@ } }, "node_modules/express-session": { - "version": "1.18.0", - "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.18.0.tgz", - "integrity": "sha512-m93QLWr0ju+rOwApSsyso838LQwgfs44QtOP/WBiwtAgPIo/SAh1a5c6nn2BR6mFNZehTpqKDESzP+fRHVbxwQ==", + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.18.1.tgz", + "integrity": "sha512-a5mtTqEaZvBCL9A9aqkrtfz+3SMDhOVUnjafjo+s7A9Txkq+SVX2DLvSp1Zrv4uCXa3lMSK3viWnh9Gg07PBUA==", "license": "MIT", "dependencies": { - "cookie": "0.6.0", + "cookie": "0.7.2", "cookie-signature": "1.0.7", "debug": "2.6.9", "depd": "~2.0.0", @@ -3749,6 +3912,15 @@ ], "license": "MIT" }, + "node_modules/express/node_modules/cookie": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/express/node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -3782,12 +3954,22 @@ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", "license": "MIT" }, - "node_modules/fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "node_modules/fast-glob": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", + "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", "dev": true, - "license": "MIT" + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" + }, + "engines": { + "node": ">=8.6.0" + } }, "node_modules/fast-safe-stringify": { "version": "2.1.1", @@ -3815,6 +3997,16 @@ "integrity": "sha512-GR6f0hD7XXyNJa25Tb9BuIdN0tdr+0BMi6/CJPH3wJO1JjNG3n/VsSw38AwRdKZABm8lGbPfakLRkYzx2V9row==", "license": "MIT" }, + "node_modules/fastq": { + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", + "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", + "dev": true, + "license": "ISC", + "dependencies": { + "reusify": "^1.0.4" + } + }, "node_modules/faye-websocket": { "version": "0.10.0", "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz", @@ -4402,9 +4594,9 @@ } }, "node_modules/got": { - "version": "12.6.0", - "resolved": "https://registry.npmjs.org/got/-/got-12.6.0.tgz", - "integrity": "sha512-WTcaQ963xV97MN3x0/CbAriXFZcXCfgxVp91I+Ze6pawQOa7SgzwSx2zIJJsX+kTajMnVs0xcFD1TxZKFqhdnQ==", + "version": "12.6.1", + "resolved": "https://registry.npmjs.org/got/-/got-12.6.1.tgz", + "integrity": "sha512-mThBblvlAF1d4O5oqyvN+ZxLAYwIJK7bpMxgYqPD9okW0C3qm5FFn7k811QrcuEBwaogR3ngOFoCfs6mRv7teQ==", "license": "MIT", "dependencies": { "@sindresorhus/is": "^5.2.0", @@ -4483,17 +4675,17 @@ } }, "node_modules/grunt-cli": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.4.3.tgz", - "integrity": "sha512-9Dtx/AhVeB4LYzsViCjUQkd0Kw0McN2gYpdmGYKtE2a5Yt7v1Q+HYZVWhqXc/kGnxlMtqKDxSwotiGeFmkrCoQ==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.5.0.tgz", + "integrity": "sha512-rILKAFoU0dzlf22SUfDtq2R1fosChXXlJM5j7wI6uoW8gwmXDXzbUvirlKZSYCdXl3LXFbR+8xyS+WFo+b6vlA==", "dev": true, "license": "MIT", "dependencies": { "grunt-known-options": "~2.0.0", "interpret": "~1.1.0", "liftup": "~3.0.1", - "nopt": "~4.0.1", - "v8flags": "~3.2.0" + "nopt": "~5.0.0", + "v8flags": "^4.0.1" }, "bin": { "grunt": "bin/grunt" @@ -4502,20 +4694,6 @@ "node": ">=10" } }, - "node_modules/grunt-cli/node_modules/nopt": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz", - "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==", - "dev": true, - "license": "ISC", - "dependencies": { - "abbrev": "1", - "osenv": "^0.1.4" - }, - "bin": { - "nopt": "bin/nopt.js" - } - }, "node_modules/grunt-concurrent": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/grunt-concurrent/-/grunt-concurrent-3.0.0.tgz", @@ -4762,16 +4940,16 @@ } }, "node_modules/grunt-jsonlint": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/grunt-jsonlint/-/grunt-jsonlint-2.1.3.tgz", - "integrity": "sha512-h04qC969LIyhsJaASeJ/hDnnKnsnSNZKqjYHra6cc/WQzrfMZinQPdr11FhU4T8OzAq6ecMX5QauYiJkbjUV/Q==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/grunt-jsonlint/-/grunt-jsonlint-3.0.0.tgz", + "integrity": "sha512-IvEm98y8esduXHj8gtMd+HygnoHLWj2F1tP77ki6K7fRd1YXIN13Y+WqtfHyeCYg8s+bPDZPy4IXJhZhIbCIhQ==", "dev": true, "license": "MIT", "dependencies": { - "@prantlf/jsonlint": "10.2.0" + "@prantlf/jsonlint": "^14.0.3" }, "engines": { - "node": ">=6" + "node": ">=18" } }, "node_modules/grunt-known-options": { @@ -4905,6 +5083,40 @@ "sprintf-js": "~1.0.2" } }, + "node_modules/grunt/node_modules/grunt-cli": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.4.3.tgz", + "integrity": "sha512-9Dtx/AhVeB4LYzsViCjUQkd0Kw0McN2gYpdmGYKtE2a5Yt7v1Q+HYZVWhqXc/kGnxlMtqKDxSwotiGeFmkrCoQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "grunt-known-options": "~2.0.0", + "interpret": "~1.1.0", + "liftup": "~3.0.1", + "nopt": "~4.0.1", + "v8flags": "~3.2.0" + }, + "bin": { + "grunt": "bin/grunt" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/grunt/node_modules/grunt-cli/node_modules/nopt": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz", + "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==", + "dev": true, + "license": "ISC", + "dependencies": { + "abbrev": "1", + "osenv": "^0.1.4" + }, + "bin": { + "nopt": "bin/nopt.js" + } + }, "node_modules/grunt/node_modules/js-yaml": { "version": "3.14.1", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", @@ -4939,6 +5151,19 @@ "dev": true, "license": "BSD-3-Clause" }, + "node_modules/grunt/node_modules/v8flags": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz", + "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==", + "dev": true, + "license": "MIT", + "dependencies": { + "homedir-polyfill": "^1.0.1" + }, + "engines": { + "node": ">= 0.10" + } + }, "node_modules/gzip-size": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz", @@ -4953,6 +5178,13 @@ "node": ">=6" } }, + "node_modules/hachure-fill": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/hachure-fill/-/hachure-fill-0.5.2.tgz", + "integrity": "sha512-3GKBOn+m2LX9iq+JC1064cSFprJY4jL1jCXTcpnfER5HYE2l/4EfWSGzkPa/ZDBmYI0ZOEj5VHV/eKnPGkHuOg==", + "dev": true, + "license": "MIT" + }, "node_modules/handlebars": { "version": "4.7.8", "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz", @@ -5332,6 +5564,23 @@ "dev": true, "license": "MIT" }, + "node_modules/import-fresh": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "dev": true, + "license": "MIT", + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", @@ -6195,6 +6444,13 @@ "dev": true, "license": "MIT" }, + "node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "dev": true, + "license": "MIT" + }, "node_modules/json-schema-traverse": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", @@ -6304,14 +6560,28 @@ "graceful-fs": "^4.1.9" } }, - "node_modules/kleur": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz", - "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==", + "node_modules/kolorist": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/kolorist/-/kolorist-1.8.0.tgz", + "integrity": "sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/langium": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/langium/-/langium-3.0.0.tgz", + "integrity": "sha512-+Ez9EoiByeoTu/2BXmEaZ06iPNXM6thWJp02KfBO/raSMyCJ4jw7AkWWa+zBCTm0+Tw1Fj9FOxdqSskyN5nAwg==", "dev": true, "license": "MIT", + "dependencies": { + "chevrotain": "~11.0.3", + "chevrotain-allstar": "~0.3.0", + "vscode-languageserver": "~9.0.1", + "vscode-languageserver-textdocument": "~1.0.11", + "vscode-uri": "~3.0.8" + }, "engines": { - "node": ">=6" + "node": ">=16.0.0" } }, "node_modules/layout-base": { @@ -6406,6 +6676,13 @@ "node": ">= 8" } }, + "node_modules/lines-and-columns": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "dev": true, + "license": "MIT" + }, "node_modules/linkify-it": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz", @@ -6439,6 +6716,20 @@ "node": ">=4" } }, + "node_modules/load-json-file/node_modules/parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==", + "dev": true, + "license": "MIT", + "dependencies": { + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/load-json-file/node_modules/pify": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", @@ -6449,6 +6740,23 @@ "node": ">=4" } }, + "node_modules/local-pkg": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.5.0.tgz", + "integrity": "sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==", + "dev": true, + "license": "MIT", + "dependencies": { + "mlly": "^1.4.2", + "pkg-types": "^1.0.3" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/antfu" + } + }, "node_modules/locate-path": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", @@ -6711,45 +7019,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/mdast-util-from-markdown": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-1.3.1.tgz", - "integrity": "sha512-4xTO/M8c82qBcnQc1tgpNtubGUW/Y1tBQ1B0i5CtSoelOLKFYlElIr3bvgREYYO5iRqbMY1YuqZng0GVOI8Qww==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/mdast": "^3.0.0", - "@types/unist": "^2.0.0", - "decode-named-character-reference": "^1.0.0", - "mdast-util-to-string": "^3.1.0", - "micromark": "^3.0.0", - "micromark-util-decode-numeric-character-reference": "^1.0.0", - "micromark-util-decode-string": "^1.0.0", - "micromark-util-normalize-identifier": "^1.0.0", - "micromark-util-symbol": "^1.0.0", - "micromark-util-types": "^1.0.0", - "unist-util-stringify-position": "^3.0.0", - "uvu": "^0.5.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/mdast-util-to-string": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.2.0.tgz", - "integrity": "sha512-V4Zn/ncyN1QNSqSBxTrMOLpjr+IKdHl2v3KVLoWmDPscP4r9GcCi71gjgvUV1SFSKh92AjAG4peFuBl2/YgCJg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/mdast": "^3.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, "node_modules/mdurl": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", @@ -6831,33 +7100,42 @@ "node": ">=0.10.0" } }, + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, "node_modules/mermaid": { - "version": "10.9.2", - "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-10.9.2.tgz", - "integrity": "sha512-UkZyMSuIYcI1Q0H+2pv/5CiY84sOwQ2XlKoDZMl9Y/MtrLEtxQtyA6LWGkMxnZxj0dJqI+7nw51bYjNnrbdFsQ==", + "version": "11.3.0", + "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-11.3.0.tgz", + "integrity": "sha512-fFmf2gRXLtlGzug4wpIGN+rQdZ30M8IZEB1D3eZkXNqC7puhqeURBcD/9tbwXsqBO+A6Nzzo3MSSepmnw5xSeg==", "dev": true, "license": "MIT", "dependencies": { - "@braintree/sanitize-url": "^6.0.1", - "@types/d3-scale": "^4.0.3", - "@types/d3-scale-chromatic": "^3.0.0", - "cytoscape": "^3.28.1", + "@braintree/sanitize-url": "^7.0.1", + "@iconify/utils": "^2.1.32", + "@mermaid-js/parser": "^0.3.0", + "cytoscape": "^3.29.2", "cytoscape-cose-bilkent": "^4.1.0", - "d3": "^7.4.0", + "cytoscape-fcose": "^2.2.0", + "d3": "^7.9.0", "d3-sankey": "^0.12.3", "dagre-d3-es": "7.0.10", - "dayjs": "^1.11.7", - "dompurify": "^3.0.5 <3.1.7", - "elkjs": "^0.9.0", + "dayjs": "^1.11.10", + "dompurify": "^3.0.11 <3.1.7", "katex": "^0.16.9", - "khroma": "^2.0.0", + "khroma": "^2.1.0", "lodash-es": "^4.17.21", - "mdast-util-from-markdown": "^1.3.0", - "non-layered-tidy-tree-layout": "^2.0.2", - "stylis": "^4.1.3", + "marked": "^13.0.2", + "roughjs": "^4.6.6", + "stylis": "^4.3.1", "ts-dedent": "^2.2.0", - "uuid": "^9.0.0", - "web-worker": "^1.2.0" + "uuid": "^9.0.1" } }, "node_modules/mermaid/node_modules/dompurify": { @@ -6867,6 +7145,19 @@ "dev": true, "license": "(MPL-2.0 OR Apache-2.0)" }, + "node_modules/mermaid/node_modules/marked": { + "version": "13.0.3", + "resolved": "https://registry.npmjs.org/marked/-/marked-13.0.3.tgz", + "integrity": "sha512-rqRix3/TWzE9rIoFGIn8JmsVfhiuC8VIQ8IdX5TfzmeBucdY05/0UlzKaw0eVtpcN/OdVFpBk7CjKGo9iHJ/zA==", + "dev": true, + "license": "MIT", + "bin": { + "marked": "bin/marked.js" + }, + "engines": { + "node": ">= 18" + } + }, "node_modules/methods": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", @@ -6876,494 +7167,6 @@ "node": ">= 0.6" } }, - "node_modules/micromark": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/micromark/-/micromark-3.2.0.tgz", - "integrity": "sha512-uD66tJj54JLYq0De10AhWycZWGQNUvDI55xPgk2sQM5kn1JYlhbCMTtEeT27+vAhW2FBQxLlOmS3pmA7/2z4aA==", - "dev": true, - "funding": [ - { - "type": "GitHub Sponsors", - "url": "https://github.com/sponsors/unifiedjs" - }, - { - "type": "OpenCollective", - "url": "https://opencollective.com/unified" - } - ], - "license": "MIT", - "dependencies": { - "@types/debug": "^4.0.0", - "debug": "^4.0.0", - "decode-named-character-reference": "^1.0.0", - "micromark-core-commonmark": "^1.0.1", - "micromark-factory-space": "^1.0.0", - "micromark-util-character": "^1.0.0", - "micromark-util-chunked": "^1.0.0", - "micromark-util-combine-extensions": "^1.0.0", - "micromark-util-decode-numeric-character-reference": "^1.0.0", - "micromark-util-encode": "^1.0.0", - "micromark-util-normalize-identifier": "^1.0.0", - "micromark-util-resolve-all": "^1.0.0", - "micromark-util-sanitize-uri": "^1.0.0", - "micromark-util-subtokenize": "^1.0.0", - "micromark-util-symbol": "^1.0.0", - "micromark-util-types": "^1.0.1", - "uvu": "^0.5.0" - } - }, - "node_modules/micromark-core-commonmark": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-core-commonmark/-/micromark-core-commonmark-1.1.0.tgz", - "integrity": "sha512-BgHO1aRbolh2hcrzL2d1La37V0Aoz73ymF8rAcKnohLy93titmv62E0gP8Hrx9PKcKrqCZ1BbLGbP3bEhoXYlw==", - "dev": true, - "funding": [ - { - "type": "GitHub Sponsors", - "url": "https://github.com/sponsors/unifiedjs" - }, - { - "type": "OpenCollective", - "url": "https://opencollective.com/unified" - } - ], - "license": "MIT", - "dependencies": { - "decode-named-character-reference": "^1.0.0", - "micromark-factory-destination": "^1.0.0", - "micromark-factory-label": "^1.0.0", - "micromark-factory-space": "^1.0.0", - "micromark-factory-title": "^1.0.0", - "micromark-factory-whitespace": "^1.0.0", - "micromark-util-character": "^1.0.0", - "micromark-util-chunked": "^1.0.0", - "micromark-util-classify-character": "^1.0.0", - "micromark-util-html-tag-name": "^1.0.0", - "micromark-util-normalize-identifier": "^1.0.0", - "micromark-util-resolve-all": "^1.0.0", - "micromark-util-subtokenize": "^1.0.0", - "micromark-util-symbol": "^1.0.0", - "micromark-util-types": "^1.0.1", - "uvu": "^0.5.0" - } - }, - "node_modules/micromark-factory-destination": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-factory-destination/-/micromark-factory-destination-1.1.0.tgz", - "integrity": "sha512-XaNDROBgx9SgSChd69pjiGKbV+nfHGDPVYFs5dOoDd7ZnMAE+Cuu91BCpsY8RT2NP9vo/B8pds2VQNCLiu0zhg==", - "dev": true, - "funding": [ - { - "type": "GitHub Sponsors", - "url": "https://github.com/sponsors/unifiedjs" - }, - { - "type": "OpenCollective", - "url": "https://opencollective.com/unified" - } - ], - "license": "MIT", - "dependencies": { - "micromark-util-character": "^1.0.0", - "micromark-util-symbol": "^1.0.0", - "micromark-util-types": "^1.0.0" - } - }, - "node_modules/micromark-factory-label": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-factory-label/-/micromark-factory-label-1.1.0.tgz", - "integrity": "sha512-OLtyez4vZo/1NjxGhcpDSbHQ+m0IIGnT8BoPamh+7jVlzLJBH98zzuCoUeMxvM6WsNeh8wx8cKvqLiPHEACn0w==", - "dev": true, - "funding": [ - { - "type": "GitHub Sponsors", - "url": "https://github.com/sponsors/unifiedjs" - }, - { - "type": "OpenCollective", - "url": "https://opencollective.com/unified" - } - ], - "license": "MIT", - "dependencies": { - "micromark-util-character": "^1.0.0", - "micromark-util-symbol": "^1.0.0", - "micromark-util-types": "^1.0.0", - "uvu": "^0.5.0" - } - }, - "node_modules/micromark-factory-space": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-1.1.0.tgz", - "integrity": "sha512-cRzEj7c0OL4Mw2v6nwzttyOZe8XY/Z8G0rzmWQZTBi/jjwyw/U4uqKtUORXQrR5bAZZnbTI/feRV/R7hc4jQYQ==", - "dev": true, - "funding": [ - { - "type": "GitHub Sponsors", - "url": "https://github.com/sponsors/unifiedjs" - }, - { - "type": "OpenCollective", - "url": "https://opencollective.com/unified" - } - ], - "license": "MIT", - "dependencies": { - "micromark-util-character": "^1.0.0", - "micromark-util-types": "^1.0.0" - } - }, - "node_modules/micromark-factory-title": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-factory-title/-/micromark-factory-title-1.1.0.tgz", - "integrity": "sha512-J7n9R3vMmgjDOCY8NPw55jiyaQnH5kBdV2/UXCtZIpnHH3P6nHUKaH7XXEYuWwx/xUJcawa8plLBEjMPU24HzQ==", - "dev": true, - "funding": [ - { - "type": "GitHub Sponsors", - "url": "https://github.com/sponsors/unifiedjs" - }, - { - "type": "OpenCollective", - "url": "https://opencollective.com/unified" - } - ], - "license": "MIT", - "dependencies": { - "micromark-factory-space": "^1.0.0", - "micromark-util-character": "^1.0.0", - "micromark-util-symbol": "^1.0.0", - "micromark-util-types": "^1.0.0" - } - }, - "node_modules/micromark-factory-whitespace": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-factory-whitespace/-/micromark-factory-whitespace-1.1.0.tgz", - "integrity": "sha512-v2WlmiymVSp5oMg+1Q0N1Lxmt6pMhIHD457whWM7/GUlEks1hI9xj5w3zbc4uuMKXGisksZk8DzP2UyGbGqNsQ==", - "dev": true, - "funding": [ - { - "type": "GitHub Sponsors", - "url": "https://github.com/sponsors/unifiedjs" - }, - { - "type": "OpenCollective", - "url": "https://opencollective.com/unified" - } - ], - "license": "MIT", - "dependencies": { - "micromark-factory-space": "^1.0.0", - "micromark-util-character": "^1.0.0", - "micromark-util-symbol": "^1.0.0", - "micromark-util-types": "^1.0.0" - } - }, - "node_modules/micromark-util-character": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-1.2.0.tgz", - "integrity": "sha512-lXraTwcX3yH/vMDaFWCQJP1uIszLVebzUa3ZHdrgxr7KEU/9mL4mVgCpGbyhvNLNlauROiNUq7WN5u7ndbY6xg==", - "dev": true, - "funding": [ - { - "type": "GitHub Sponsors", - "url": "https://github.com/sponsors/unifiedjs" - }, - { - "type": "OpenCollective", - "url": "https://opencollective.com/unified" - } - ], - "license": "MIT", - "dependencies": { - "micromark-util-symbol": "^1.0.0", - "micromark-util-types": "^1.0.0" - } - }, - "node_modules/micromark-util-chunked": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-util-chunked/-/micromark-util-chunked-1.1.0.tgz", - "integrity": "sha512-Ye01HXpkZPNcV6FiyoW2fGZDUw4Yc7vT0E9Sad83+bEDiCJ1uXu0S3mr8WLpsz3HaG3x2q0HM6CTuPdcZcluFQ==", - "dev": true, - "funding": [ - { - "type": "GitHub Sponsors", - "url": "https://github.com/sponsors/unifiedjs" - }, - { - "type": "OpenCollective", - "url": "https://opencollective.com/unified" - } - ], - "license": "MIT", - "dependencies": { - "micromark-util-symbol": "^1.0.0" - } - }, - "node_modules/micromark-util-classify-character": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-util-classify-character/-/micromark-util-classify-character-1.1.0.tgz", - "integrity": "sha512-SL0wLxtKSnklKSUplok1WQFoGhUdWYKggKUiqhX+Swala+BtptGCu5iPRc+xvzJ4PXE/hwM3FNXsfEVgoZsWbw==", - "dev": true, - "funding": [ - { - "type": "GitHub Sponsors", - "url": "https://github.com/sponsors/unifiedjs" - }, - { - "type": "OpenCollective", - "url": "https://opencollective.com/unified" - } - ], - "license": "MIT", - "dependencies": { - "micromark-util-character": "^1.0.0", - "micromark-util-symbol": "^1.0.0", - "micromark-util-types": "^1.0.0" - } - }, - "node_modules/micromark-util-combine-extensions": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-util-combine-extensions/-/micromark-util-combine-extensions-1.1.0.tgz", - "integrity": "sha512-Q20sp4mfNf9yEqDL50WwuWZHUrCO4fEyeDCnMGmG5Pr0Cz15Uo7KBs6jq+dq0EgX4DPwwrh9m0X+zPV1ypFvUA==", - "dev": true, - "funding": [ - { - "type": "GitHub Sponsors", - "url": "https://github.com/sponsors/unifiedjs" - }, - { - "type": "OpenCollective", - "url": "https://opencollective.com/unified" - } - ], - "license": "MIT", - "dependencies": { - "micromark-util-chunked": "^1.0.0", - "micromark-util-types": "^1.0.0" - } - }, - "node_modules/micromark-util-decode-numeric-character-reference": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-1.1.0.tgz", - "integrity": "sha512-m9V0ExGv0jB1OT21mrWcuf4QhP46pH1KkfWy9ZEezqHKAxkj4mPCy3nIH1rkbdMlChLHX531eOrymlwyZIf2iw==", - "dev": true, - "funding": [ - { - "type": "GitHub Sponsors", - "url": "https://github.com/sponsors/unifiedjs" - }, - { - "type": "OpenCollective", - "url": "https://opencollective.com/unified" - } - ], - "license": "MIT", - "dependencies": { - "micromark-util-symbol": "^1.0.0" - } - }, - "node_modules/micromark-util-decode-string": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-util-decode-string/-/micromark-util-decode-string-1.1.0.tgz", - "integrity": "sha512-YphLGCK8gM1tG1bd54azwyrQRjCFcmgj2S2GoJDNnh4vYtnL38JS8M4gpxzOPNyHdNEpheyWXCTnnTDY3N+NVQ==", - "dev": true, - "funding": [ - { - "type": "GitHub Sponsors", - "url": "https://github.com/sponsors/unifiedjs" - }, - { - "type": "OpenCollective", - "url": "https://opencollective.com/unified" - } - ], - "license": "MIT", - "dependencies": { - "decode-named-character-reference": "^1.0.0", - "micromark-util-character": "^1.0.0", - "micromark-util-decode-numeric-character-reference": "^1.0.0", - "micromark-util-symbol": "^1.0.0" - } - }, - "node_modules/micromark-util-encode": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-1.1.0.tgz", - "integrity": "sha512-EuEzTWSTAj9PA5GOAs992GzNh2dGQO52UvAbtSOMvXTxv3Criqb6IOzJUBCmEqrrXSblJIJBbFFv6zPxpreiJw==", - "dev": true, - "funding": [ - { - "type": "GitHub Sponsors", - "url": "https://github.com/sponsors/unifiedjs" - }, - { - "type": "OpenCollective", - "url": "https://opencollective.com/unified" - } - ], - "license": "MIT" - }, - "node_modules/micromark-util-html-tag-name": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/micromark-util-html-tag-name/-/micromark-util-html-tag-name-1.2.0.tgz", - "integrity": "sha512-VTQzcuQgFUD7yYztuQFKXT49KghjtETQ+Wv/zUjGSGBioZnkA4P1XXZPT1FHeJA6RwRXSF47yvJ1tsJdoxwO+Q==", - "dev": true, - "funding": [ - { - "type": "GitHub Sponsors", - "url": "https://github.com/sponsors/unifiedjs" - }, - { - "type": "OpenCollective", - "url": "https://opencollective.com/unified" - } - ], - "license": "MIT" - }, - "node_modules/micromark-util-normalize-identifier": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-1.1.0.tgz", - "integrity": "sha512-N+w5vhqrBihhjdpM8+5Xsxy71QWqGn7HYNUvch71iV2PM7+E3uWGox1Qp90loa1ephtCxG2ftRV/Conitc6P2Q==", - "dev": true, - "funding": [ - { - "type": "GitHub Sponsors", - "url": "https://github.com/sponsors/unifiedjs" - }, - { - "type": "OpenCollective", - "url": "https://opencollective.com/unified" - } - ], - "license": "MIT", - "dependencies": { - "micromark-util-symbol": "^1.0.0" - } - }, - "node_modules/micromark-util-resolve-all": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-util-resolve-all/-/micromark-util-resolve-all-1.1.0.tgz", - "integrity": "sha512-b/G6BTMSg+bX+xVCshPTPyAu2tmA0E4X98NSR7eIbeC6ycCqCeE7wjfDIgzEbkzdEVJXRtOG4FbEm/uGbCRouA==", - "dev": true, - "funding": [ - { - "type": "GitHub Sponsors", - "url": "https://github.com/sponsors/unifiedjs" - }, - { - "type": "OpenCollective", - "url": "https://opencollective.com/unified" - } - ], - "license": "MIT", - "dependencies": { - "micromark-util-types": "^1.0.0" - } - }, - "node_modules/micromark-util-sanitize-uri": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.2.0.tgz", - "integrity": "sha512-QO4GXv0XZfWey4pYFndLUKEAktKkG5kZTdUNaTAkzbuJxn2tNBOr+QtxR2XpWaMhbImT2dPzyLrPXLlPhph34A==", - "dev": true, - "funding": [ - { - "type": "GitHub Sponsors", - "url": "https://github.com/sponsors/unifiedjs" - }, - { - "type": "OpenCollective", - "url": "https://opencollective.com/unified" - } - ], - "license": "MIT", - "dependencies": { - "micromark-util-character": "^1.0.0", - "micromark-util-encode": "^1.0.0", - "micromark-util-symbol": "^1.0.0" - } - }, - "node_modules/micromark-util-subtokenize": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-util-subtokenize/-/micromark-util-subtokenize-1.1.0.tgz", - "integrity": "sha512-kUQHyzRoxvZO2PuLzMt2P/dwVsTiivCK8icYTeR+3WgbuPqfHgPPy7nFKbeqRivBvn/3N3GBiNC+JRTMSxEC7A==", - "dev": true, - "funding": [ - { - "type": "GitHub Sponsors", - "url": "https://github.com/sponsors/unifiedjs" - }, - { - "type": "OpenCollective", - "url": "https://opencollective.com/unified" - } - ], - "license": "MIT", - "dependencies": { - "micromark-util-chunked": "^1.0.0", - "micromark-util-symbol": "^1.0.0", - "micromark-util-types": "^1.0.0", - "uvu": "^0.5.0" - } - }, - "node_modules/micromark-util-symbol": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-1.1.0.tgz", - "integrity": "sha512-uEjpEYY6KMs1g7QfJ2eX1SQEV+ZT4rUD3UcF6l57acZvLNK7PBZL+ty82Z1qhK1/yXIY4bdx04FKMgR0g4IAag==", - "dev": true, - "funding": [ - { - "type": "GitHub Sponsors", - "url": "https://github.com/sponsors/unifiedjs" - }, - { - "type": "OpenCollective", - "url": "https://opencollective.com/unified" - } - ], - "license": "MIT" - }, - "node_modules/micromark-util-types": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-1.1.0.tgz", - "integrity": "sha512-ukRBgie8TIAcacscVHSiddHjO4k/q3pnedmzMQ4iwDcK0FtFCohKOlFbaOL/mPgfnPsL3C1ZyxJa4sbWrBl3jg==", - "dev": true, - "funding": [ - { - "type": "GitHub Sponsors", - "url": "https://github.com/sponsors/unifiedjs" - }, - { - "type": "OpenCollective", - "url": "https://opencollective.com/unified" - } - ], - "license": "MIT" - }, - "node_modules/micromark/node_modules/debug": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", - "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/micromark/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, - "license": "MIT" - }, "node_modules/micromatch": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", @@ -7580,6 +7383,19 @@ "dev": true, "license": "MIT" }, + "node_modules/mlly": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.2.tgz", + "integrity": "sha512-tN3dvVHYVz4DhSXinXIk7u9syPYaJvio118uomkovAtWBT+RdbP6Lfh/5Lvo519YMmwBafwlh20IPTXIStscpA==", + "dev": true, + "license": "MIT", + "dependencies": { + "acorn": "^8.12.1", + "pathe": "^1.1.2", + "pkg-types": "^1.2.0", + "ufo": "^1.5.4" + } + }, "node_modules/mocha": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.2.tgz", @@ -7649,6 +7465,16 @@ "dev": true, "license": "MIT" }, + "node_modules/mocha/node_modules/diff": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", + "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, "node_modules/mocha/node_modules/escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", @@ -7743,9 +7569,9 @@ } }, "node_modules/moment-timezone": { - "version": "0.5.45", - "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.45.tgz", - "integrity": "sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==", + "version": "0.5.46", + "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.46.tgz", + "integrity": "sha512-ZXm9b36esbe7OmdABqIWJuBBiLLwAjrN7CE+7sYdCCx82Nabt1wHDj8TVseS59QIlfFPbOoiBPm6ca9BioG4hw==", "license": "MIT", "dependencies": { "moment": "^2.29.4" @@ -8240,19 +8066,19 @@ } }, "node_modules/nodemon": { - "version": "2.0.20", - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.20.tgz", - "integrity": "sha512-Km2mWHKKY5GzRg6i1j5OxOHQtuvVsgskLfigG25yTtbyfRGn/GNvIbRyOf1PSCKJ2aT/58TiuUsuOU5UToVViw==", + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.7.tgz", + "integrity": "sha512-hLj7fuMow6f0lbB0cD14Lz2xNjwsyruH251Pk4t/yIitCFJbmY1myuLlHm/q06aST4jg6EgAh74PIBBrRqpVAQ==", "dev": true, "license": "MIT", "dependencies": { "chokidar": "^3.5.2", - "debug": "^3.2.7", + "debug": "^4", "ignore-by-default": "^1.0.1", "minimatch": "^3.1.2", "pstree.remy": "^1.1.8", - "semver": "^5.7.1", - "simple-update-notifier": "^1.0.7", + "semver": "^7.5.3", + "simple-update-notifier": "^2.0.0", "supports-color": "^5.5.0", "touch": "^3.1.0", "undefsafe": "^2.0.5" @@ -8261,7 +8087,7 @@ "nodemon": "bin/nodemon.js" }, "engines": { - "node": ">=8.10.0" + "node": ">=10" }, "funding": { "type": "opencollective", @@ -8269,13 +8095,21 @@ } }, "node_modules/nodemon/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", "dev": true, "license": "MIT", "dependencies": { - "ms": "^2.1.1" + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } } }, "node_modules/nodemon/node_modules/has-flag": { @@ -8308,16 +8142,6 @@ "dev": true, "license": "MIT" }, - "node_modules/nodemon/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver" - } - }, "node_modules/nodemon/node_modules/supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -8331,13 +8155,6 @@ "node": ">=4" } }, - "node_modules/non-layered-tidy-tree-layout": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/non-layered-tidy-tree-layout/-/non-layered-tidy-tree-layout-2.0.2.tgz", - "integrity": "sha512-gkXMxRzUH+PB0ax9dUN0yYF0S25BqeAYqhgMaLUFmpXLEk7Fcu8f4emJuOAY0V8kjDICxROIKsTAKsV/v355xw==", - "dev": true, - "license": "MIT" - }, "node_modules/nopt": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", @@ -8998,6 +8815,13 @@ "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", "license": "BlueOak-1.0.0" }, + "node_modules/package-manager-detector": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-0.2.2.tgz", + "integrity": "sha512-VgXbyrSNsml4eHWIvxxG/nTL4wgybMTXCV2Un/+yEc3aDKKU6nQBZjbeP3Pl3qm9Qg92X/1ng4ffvCeD/zwHgg==", + "dev": true, + "license": "MIT" + }, "node_modules/pad-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/pad-stream/-/pad-stream-2.0.0.tgz", @@ -9023,6 +8847,19 @@ "through2": "^2.0.2" } }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "license": "MIT", + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/parse-filepath": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz", @@ -9039,17 +8876,22 @@ } }, "node_modules/parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", "dev": true, "license": "MIT", "dependencies": { + "@babel/code-frame": "^7.0.0", "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" }, "engines": { - "node": ">=4" + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/parse-passwd": { @@ -9134,6 +8976,13 @@ "node": ">= 0.4.0" } }, + "node_modules/path-data-parser": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/path-data-parser/-/path-data-parser-0.1.0.tgz", + "integrity": "sha512-NOnmBpt5Y2RWbuv0LMzsayp3lVylAHLPUTut412ZA3l+C4uw4ZVkQbjShYCQ8TCpUMdPapr4YjUqLYD6v68j+w==", + "dev": true, + "license": "MIT" + }, "node_modules/path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -9244,6 +9093,13 @@ "node": ">=4" } }, + "node_modules/pathe": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz", + "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==", + "dev": true, + "license": "MIT" + }, "node_modules/pause": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz", @@ -9358,6 +9214,36 @@ "node": ">=4" } }, + "node_modules/pkg-types": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.2.1.tgz", + "integrity": "sha512-sQoqa8alT3nHjGuTjuKgOnvjo4cljkufdtLMnO2LBP/wRwuDlo1tkaEdMxCRhyGRPacv/ztlZgDPm2b7FAmEvw==", + "dev": true, + "license": "MIT", + "dependencies": { + "confbox": "^0.1.8", + "mlly": "^1.7.2", + "pathe": "^1.1.2" + } + }, + "node_modules/points-on-curve": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/points-on-curve/-/points-on-curve-0.2.0.tgz", + "integrity": "sha512-0mYKnYYe9ZcqMCWhUjItv/oHjvgEsfKvnUTg8sAtnHr3GVy7rGkXCb6d5cSyqrWqL4k81b9CPg3urd+T7aop3A==", + "dev": true, + "license": "MIT" + }, + "node_modules/points-on-path": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/points-on-path/-/points-on-path-0.2.1.tgz", + "integrity": "sha512-25ClnWWuw7JbWZcgqY/gJ4FQWadKxGWk+3kR/7kD0tCaDtPPMj7oHu2ToLaVhfpnHrZzYby2w6tUA0eOIuUg8g==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-data-parser": "0.1.0", + "points-on-curve": "0.2.0" + } + }, "node_modules/pretty-bytes": { "version": "5.6.0", "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz", @@ -9481,16 +9367,6 @@ "pump": "^2.0.0" } }, - "node_modules/punycode": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", - "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/punycode.js": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz", @@ -9516,6 +9392,27 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, "node_modules/quick-lru": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", @@ -9557,32 +9454,20 @@ } }, "node_modules/raw-body": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", - "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.0.tgz", + "integrity": "sha512-RmkhL8CAyCRPXCE28MMH0z2PNWQBNk2Q09ZdxM9IOOXwxwZbN+qbWaatPkdkWIKL2ZVDImrN/pK5HTRz2PcS4g==", "license": "MIT", "dependencies": { "bytes": "3.1.2", "http-errors": "2.0.0", - "iconv-lite": "0.4.24", + "iconv-lite": "0.6.3", "unpipe": "1.0.0" }, "engines": { "node": ">= 0.8" } }, - "node_modules/raw-body/node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "license": "MIT", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/read": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/read/-/read-3.0.1.tgz", @@ -9947,6 +9832,17 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true, + "license": "MIT", + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, "node_modules/rfdc": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz", @@ -9974,6 +9870,43 @@ "dev": true, "license": "Unlicense" }, + "node_modules/roughjs": { + "version": "4.6.6", + "resolved": "https://registry.npmjs.org/roughjs/-/roughjs-4.6.6.tgz", + "integrity": "sha512-ZUz/69+SYpFN/g/lUlo2FXcIjRkSu3nDarreVdGGndHEBJ6cXPdKguS8JGxwj5HA5xIbVKSmLgr5b3AWxtRfvQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "hachure-fill": "^0.5.2", + "path-data-parser": "^0.1.0", + "points-on-curve": "^0.2.0", + "points-on-path": "^0.2.1" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, "node_modules/rw": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz", @@ -9981,19 +9914,6 @@ "dev": true, "license": "BSD-3-Clause" }, - "node_modules/sade": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/sade/-/sade-1.8.1.tgz", - "integrity": "sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==", - "dev": true, - "license": "MIT", - "dependencies": { - "mri": "^1.1.0" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -10037,13 +9957,10 @@ "license": "ISC" }, "node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "license": "ISC", - "dependencies": { - "lru-cache": "^6.0.0" - }, "bin": { "semver": "bin/semver.js" }, @@ -10051,24 +9968,6 @@ "node": ">=10" } }, - "node_modules/semver/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/semver/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "license": "ISC" - }, "node_modules/send": { "version": "0.19.0", "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", @@ -10398,26 +10297,16 @@ } }, "node_modules/simple-update-notifier": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz", - "integrity": "sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz", + "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==", "dev": true, "license": "MIT", "dependencies": { - "semver": "~7.0.0" + "semver": "^7.5.3" }, "engines": { - "node": ">=8.10.0" - } - }, - "node_modules/simple-update-notifier/node_modules/semver": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz", - "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" + "node": ">=10" } }, "node_modules/sinon": { @@ -10924,14 +10813,14 @@ "dev": true }, "node_modules/tar": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/tar/-/tar-7.2.0.tgz", - "integrity": "sha512-hctwP0Nb4AB60bj8WQgRYaMOuJYRAPMGiQUAotms5igN8ppfQM+IvjQ5HcKu1MaZh2Wy2KWVTe563Yj8dfc14w==", + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz", + "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==", "license": "ISC", "dependencies": { "@isaacs/fs-minipass": "^4.0.0", "chownr": "^3.0.0", - "minipass": "^7.1.0", + "minipass": "^7.1.2", "minizlib": "^3.0.1", "mkdirp": "^3.0.1", "yallist": "^5.0.0" @@ -11137,6 +11026,13 @@ "dev": true, "license": "MIT" }, + "node_modules/tinyexec": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.0.tgz", + "integrity": "sha512-tVGE0mVJPGb0chKhqmsoosjsS+qUnJVGJpZgsHYQcGoPlG3B51R3PouqTgEGH2Dc9jjFyOqOpix6ZHNMXp1FZg==", + "dev": true, + "license": "MIT" + }, "node_modules/tldts": { "version": "6.1.50", "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.50.tgz", @@ -11284,6 +11180,13 @@ "dev": true, "license": "MIT" }, + "node_modules/ufo": { + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.5.4.tgz", + "integrity": "sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==", + "dev": true, + "license": "MIT" + }, "node_modules/uglify-js": { "version": "3.17.4", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz", @@ -11358,20 +11261,6 @@ "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", "license": "MIT" }, - "node_modules/unist-util-stringify-position": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz", - "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/unist": "^2.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, "node_modules/universalify": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", @@ -11390,16 +11279,6 @@ "node": ">= 0.8" } }, - "node_modules/uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "punycode": "^2.1.0" - } - }, "node_modules/uri-path": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/uri-path/-/uri-path-1.0.0.tgz", @@ -11438,36 +11317,14 @@ "uuid": "dist/bin/uuid" } }, - "node_modules/uvu": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/uvu/-/uvu-0.5.6.tgz", - "integrity": "sha512-+g8ENReyr8YsOc6fv/NVJs2vFdHBnBNdfE49rshrTzDWOlUx4Gq7KOS2GD8eqhy2j+Ejq29+SbKH8yjkAqXqoA==", - "dev": true, - "license": "MIT", - "dependencies": { - "dequal": "^2.0.0", - "diff": "^5.0.0", - "kleur": "^4.0.3", - "sade": "^1.7.3" - }, - "bin": { - "uvu": "bin.js" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/v8flags": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz", - "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-4.0.1.tgz", + "integrity": "sha512-fcRLaS4H/hrZk9hYwbdRM35D0U8IYMfEClhXxCivOojl+yTRAZH3Zy2sSy6qVCiGbV9YAtPssP6jaChqC9vPCg==", "dev": true, "license": "MIT", - "dependencies": { - "homedir-polyfill": "^1.0.1" - }, "engines": { - "node": ">= 0.10" + "node": ">= 10.13.0" } }, "node_modules/validate-npm-package-license": { @@ -11490,6 +11347,61 @@ "node": ">= 0.8" } }, + "node_modules/vscode-jsonrpc": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz", + "integrity": "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/vscode-languageserver": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-9.0.1.tgz", + "integrity": "sha512-woByF3PDpkHFUreUa7Hos7+pUWdeWMXRd26+ZX2A8cFx6v/JPTtd4/uN0/jB6XQHYaOlHbio03NTHCqrgG5n7g==", + "dev": true, + "license": "MIT", + "dependencies": { + "vscode-languageserver-protocol": "3.17.5" + }, + "bin": { + "installServerIntoExtension": "bin/installServerIntoExtension" + } + }, + "node_modules/vscode-languageserver-protocol": { + "version": "3.17.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz", + "integrity": "sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==", + "dev": true, + "license": "MIT", + "dependencies": { + "vscode-jsonrpc": "8.2.0", + "vscode-languageserver-types": "3.17.5" + } + }, + "node_modules/vscode-languageserver-textdocument": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz", + "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==", + "dev": true, + "license": "MIT" + }, + "node_modules/vscode-languageserver-types": { + "version": "3.17.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz", + "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==", + "dev": true, + "license": "MIT" + }, + "node_modules/vscode-uri": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz", + "integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==", + "dev": true, + "license": "MIT" + }, "node_modules/walk-back": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/walk-back/-/walk-back-5.1.1.tgz", @@ -11500,13 +11412,6 @@ "node": ">=12.17" } }, - "node_modules/web-worker": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/web-worker/-/web-worker-1.3.0.tgz", - "integrity": "sha512-BSR9wyRsy/KOValMgd5kMyr3JzpdeoR9KVId8u5GVlTTAtNChlsE4yTxeY7zMdNSyOmoKBv8NH2qeRY9Tg+IaA==", - "dev": true, - "license": "Apache-2.0" - }, "node_modules/webidl-conversions": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", diff --git a/third_party/nixpkgs/pkgs/by-name/no/node-red/package.nix b/third_party/nixpkgs/pkgs/by-name/no/node-red/package.nix index d419e1b407..91df4684ba 100644 --- a/third_party/nixpkgs/pkgs/by-name/no/node-red/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/no/node-red/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "node-red"; - version = "4.0.3"; + version = "4.0.4"; src = fetchFromGitHub { owner = "node-red"; repo = "node-red"; rev = "refs/tags/${version}"; - hash = "sha256-AiLGqpEUqvWpI+7cL7ZygT2mSCVt7zCUwEJXvRaiGT8="; + hash = "sha256-s+3OrTj/VwjnK6Ml+4aSlLo/GcpC6BWmGmxAaj1SsMI="; }; - npmDepsHash = "sha256-ipUhco5Z+x2FYqLPdgMYJk4eXrIqn1BHidaYXXgujis="; + npmDepsHash = "sha256-y3agiGh5qApyjFUkxjgEG+Ztx1FL4IOMaJsS4WwZY/c="; postPatch = let diff --git a/third_party/nixpkgs/pkgs/by-name/no/nomacs/package.nix b/third_party/nixpkgs/pkgs/by-name/no/nomacs/package.nix index 45333177d0..7387297b45 100644 --- a/third_party/nixpkgs/pkgs/by-name/no/nomacs/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/no/nomacs/package.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "nomacs"; - version = "3.19.0"; + version = "3.19.1"; src = fetchFromGitHub { owner = "nomacs"; repo = "nomacs"; rev = finalAttrs.version; fetchSubmodules = false; # We'll use our own - hash = "sha256-lpmM2GfMDlIp1vnbHMaOdicFcKH6LwEoKSETMt7C1NY="; + hash = "sha256-NRwZ/ShJaLCMFv7QdfRoJY5zQFo18cAVWGRpS3ap3Rw="; }; outputs = [ "out" ] diff --git a/third_party/nixpkgs/pkgs/by-name/no/normaliz/package.nix b/third_party/nixpkgs/pkgs/by-name/no/normaliz/package.nix index bb090ef755..e7cca5184c 100644 --- a/third_party/nixpkgs/pkgs/by-name/no/normaliz/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/no/normaliz/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "normaliz"; - version = "3.10.3"; + version = "3.10.4"; src = fetchFromGitHub { owner = "normaliz"; repo = "normaliz"; rev = "v${finalAttrs.version}"; - hash = "sha256-9jN3EbYfWmir+pa4XuJpeT7CnQdhVU9pP8G11npIG00="; + hash = "sha256-qmbLgjAkLrW8rqFthK3H4n63zLVJ33Pe82V7yU1StOo="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix b/third_party/nixpkgs/pkgs/by-name/no/notmuch-mailmover/package.nix similarity index 53% rename from third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix rename to third_party/nixpkgs/pkgs/by-name/no/notmuch-mailmover/package.nix index 3b6d2ee928..6d7c1120cd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix +++ b/third_party/nixpkgs/pkgs/by-name/no/notmuch-mailmover/package.nix @@ -1,40 +1,59 @@ -{ notmuch -, lib -, fetchFromGitHub -, rustPlatform -, installShellFiles +{ + notmuch, + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + lua5_4, + installShellFiles, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "notmuch-mailmover"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "michaeladler"; repo = pname; rev = "v${version}"; - hash = "sha256-b+6vQ7m49+9RQ+GA75VgOAJej/2zeu5JAje/OazsEsk="; + hash = "sha256-MqDmojVkSPNhpls+O5CrFuo2b7lfFfg1cLDg5PjCF7U="; }; - cargoHash = "sha256-qHSmfR5iUBXq8OQJkGCVA4JnExXisN2OIAVKiVMUaZo="; + cargoHash = "sha256-xFnA6f0X5BAmZEDwR4/hKwIKTr5yNK+CJbo3/o5MmoI="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + pkg-config + ]; - buildInputs = [ notmuch ]; + buildInputs = [ + notmuch + lua5_4 + ]; postInstall = '' installManPage share/notmuch-mailmover.1.gz + + mkdir -p $out/share/notmuch-mailmover + cp -dR example $out/share/notmuch-mailmover/ + installShellCompletion --cmd notmuch-mailmover \ --bash share/notmuch-mailmover.bash \ --fish share/notmuch-mailmover.fish \ --zsh share/_notmuch-mailmover ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Application to assign notmuch tagged mails to IMAP folders"; mainProgram = "notmuch-mailmover"; homepage = "https://github.com/michaeladler/notmuch-mailmover/"; license = licenses.asl20; - maintainers = with maintainers; [ michaeladler archer-65 ]; + maintainers = with maintainers; [ + michaeladler + archer-65 + ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/no/noto-fonts-color-emoji/package.nix b/third_party/nixpkgs/pkgs/by-name/no/noto-fonts-color-emoji/package.nix index c365f2db19..925b0ff68e 100644 --- a/third_party/nixpkgs/pkgs/by-name/no/noto-fonts-color-emoji/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/no/noto-fonts-color-emoji/package.nix @@ -16,13 +16,13 @@ let in stdenvNoCC.mkDerivation rec { pname = "noto-fonts-color-emoji"; - version = "2.042"; + version = "2.047"; src = fetchFromGitHub { owner = "googlefonts"; repo = "noto-emoji"; rev = "v${version}"; - hash = "sha256-otJQMXrBIPrxD1vCdgcrZ2h1a9XAMbqEBFumjz1XJ54="; + hash = "sha256-v1vLXs8peNF6S7iBLViAWQSW042lwIDqAjB270pRPF0="; }; depsBuildBuild = [ diff --git a/third_party/nixpkgs/pkgs/by-name/nt/ntpstat/package.nix b/third_party/nixpkgs/pkgs/by-name/nt/ntpstat/package.nix new file mode 100644 index 0000000000..7293cf6925 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/nt/ntpstat/package.nix @@ -0,0 +1,32 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "ntpstat"; + version = "0.6"; + + src = fetchFromGitHub { + owner = "mlichvar"; + repo = "ntpstat"; + rev = "${finalAttrs.version}"; + hash = "sha256-dw6Pi+aB7uK65H0HL7q1vYnM5Dp0D+kG+ZIaiv8VH5I="; + }; + + postPatch = '' + patchShebangs ntpstat + ''; + + makeFlags = [ "prefix=${placeholder "out"}" ]; + + meta = { + description = "Print the ntpd or chronyd synchronisation status"; + homepage = "https://github.com/mlichvar/ntpstat"; + license = lib.licenses.mit; + mainProgram = "nptstat"; + maintainers = with lib.maintainers; [ hzeller ]; + platforms = lib.platforms.all; + }; +}) 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 196abb001f..c630d8ae1f 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 = "10.0.1"; + version = "10.0.2"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei-templates"; rev = "refs/tags/v${version}"; - hash = "sha256-unQ/c3S1uJGSE7DoDsKnnI0n7YGe7s8F0g+yUNB4xH4="; + hash = "sha256-mFuY1i+AqksAvaMAJkP227eZZE+sauRxOIqV5DO8MFE="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/nu/nufmt/package.nix b/third_party/nixpkgs/pkgs/by-name/nu/nufmt/package.nix new file mode 100644 index 0000000000..28f16ade66 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/nu/nufmt/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + darwin, + llvmPackages, + nix-update-script, + ... +}: +rustPlatform.buildRustPackage rec { + pname = "nufmt"; + version = "0-unstable-2024-10-15"; + + src = fetchFromGitHub { + owner = "nushell"; + repo = "nufmt"; + rev = "37b473be178fd752b5bf421f8b20f48209e9c2ec"; + hash = "sha256-BrVWw6oklG70UomKDv5IBvoFIjtpajHKV37fh4fnK3E="; + }; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + IOKit + ] + ); + + env.LIBCLANG_PATH = lib.optionalString stdenv.cc.isClang "${llvmPackages.libclang.lib}/lib"; + + cargoHash = "sha256-eKQJanQ9ax5thc2DuO0yIgovor+i5Soylw58I2Y5cHw="; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + + meta = { + description = "Nushell formatter"; + homepage = "https://github.com/nushell/nufmt"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + iogamaster + khaneliman + ]; + mainProgram = "nufmt"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/nu/numbat/package.nix b/third_party/nixpkgs/pkgs/by-name/nu/numbat/package.nix index ce3c954b88..075701e298 100644 --- a/third_party/nixpkgs/pkgs/by-name/nu/numbat/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/nu/numbat/package.nix @@ -2,23 +2,33 @@ , stdenv , testers , fetchFromGitHub +, fetchpatch , rustPlatform , darwin , numbat +, tzdata }: rustPlatform.buildRustPackage rec { pname = "numbat"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "numbat"; rev = "v${version}"; - hash = "sha256-MYoNziQiyppftLPNM8cqEuNwUA4KCmtotQqDhgyef1E="; + hash = "sha256-o3EYhMFBgs/Ni+YCM3+RdUYlwRt+nMaEP/cAkDXMVHc="; }; - cargoHash = "sha256-t6vxJ0UIQJILCGv4PO5V4/QF5de/wtMQDkb8gPtE70E="; + cargoHash = "sha256-rK9RPd/hww2F87l/dd14pB4izE58NuqaewYaqMimV1M="; + + patches = [ + # https://github.com/sharkdp/numbat/pull/562 + (fetchpatch { + url = "https://github.com/sharkdp/numbat/commit/4756a1989ecdab35fd05ca18c721ed15d8cde2b1.patch"; + hash = "sha256-22+yePjy+MxJQ60EdvgaTw/IVV0d/wS2Iqza1p1xmfk="; + }) + ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security @@ -31,6 +41,13 @@ rustPlatform.buildRustPackage rec { cp -r $src/numbat/modules $out/share/numbat/ ''; + preCheck = '' + # The datetime library used by Numbat, "jiff", always attempts to use the + # system TZDIR on Unix and doesn't fall back to the embedded tzdb when not + # present. + export TZDIR=${tzdata}/share/zoneinfo + ''; + passthru.tests.version = testers.testVersion { package = numbat; }; @@ -46,5 +63,7 @@ rustPlatform.buildRustPackage rec { license = with licenses; [ asl20 mit ]; mainProgram = "numbat"; maintainers = with maintainers; [ giomf atemu ]; + # Failing tests on Darwin. + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/nu/nunicode/package.nix b/third_party/nixpkgs/pkgs/by-name/nu/nunicode/package.nix new file mode 100644 index 0000000000..0025372fb2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/nu/nunicode/package.nix @@ -0,0 +1,76 @@ +{ + lib, + stdenv, + fetchFromBitbucket, + cmake, + sqlite, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "nunicode"; + version = "1.11"; + + outputs = [ + "out" + "sqlite" + ]; + + src = fetchFromBitbucket { + owner = "alekseyt"; + repo = "nunicode"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-6255YdX7eYSAj0EAE4RgX1m4XDNIF/Nc4ZCvXzTxpag="; + }; + + postPatch = '' + # load correct SQLite extension on all platforms + substituteInPlace sqlite3/testsuite --replace-fail \ + "NU='./libnusqlite3.so'" \ + "NU='./libnusqlite3'" + + # fix expressions using like .. escape (https://sqlite.org/lang_expr.html#like) + substituteInPlace sqlite3/tests.sql --replace-fail '\\' '\' + + # install SQLite extension in a separate output + echo >>sqlite3/CMakeLists.txt \ + 'install(TARGETS nusqlite3 DESTINATION "${placeholder "sqlite"}/lib")' + ''; + + nativeBuildInputs = [ + cmake + sqlite + ]; + + # avoid name-clash on case-insensitive filesystems + cmakeBuildDir = "build-dir"; + + doCheck = true; + + checkPhase = '' + runHook preCheck + + ( + echo running SQLite testsuite + + cd sqlite3 + RESULT=$(../../sqlite3/testsuite < ../../sqlite3/tests.sql | sqlite3) + grep <<<$RESULT FAILED && echo SQLite testsuite failed && false + + echo SQLite testsuite succeeded + ) + + runHook postCheck + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Fast, small and portable Unicode library with SQLite extension"; + homepage = "https://bitbucket.org/alekseyt/nunicode"; + changelog = "https://bitbucket.org/alekseyt/nunicode/src/${finalAttrs.version}/CHANGELOG"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.mjoerg ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/nv/nvrh/package.nix b/third_party/nixpkgs/pkgs/by-name/nv/nvrh/package.nix new file mode 100644 index 0000000000..8faaeec11a --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/nv/nvrh/package.nix @@ -0,0 +1,58 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +buildGoModule rec { + pname = "nvrh"; + version = "0.1.13"; + + src = fetchFromGitHub { + owner = "mikew"; + repo = "nvrh"; + rev = "refs/tags/v${version}"; + hash = "sha256-fVoyxq2iCUANEsq+mCaQnBV9kQ59PZsGi9r7bSwStwQ="; + }; + + postPatch = '' + substituteInPlace go.mod \ + --replace-fail "go 1.23.1" "go 1.22.7" + ''; + + preBuild = '' + cp manifest.json src/ + ''; + + vendorHash = "sha256-BioDzQMZWtTiM08aBQTPT4IGxK4f2JNx7dzNbcCgELQ="; + + ldflags = [ + "-s" + "-w" + ]; + + postInstall = '' + mv $out/bin/src $out/bin/nvrh + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Aims to be similar to VSCode Remote, but for Neovim"; + homepage = "https://github.com/mikew/nvrh"; + changelog = "https://github.com/mikew/nvrh/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + mainProgram = "nvrh"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/nz/nzbget/package.nix b/third_party/nixpkgs/pkgs/by-name/nz/nzbget/package.nix index 165ee6dfc8..f0b8069c30 100644 --- a/third_party/nixpkgs/pkgs/by-name/nz/nzbget/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/nz/nzbget/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch2 , cmake , boost , pkg-config @@ -20,23 +19,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "nzbget"; - version = "24.2"; + version = "24.3"; src = fetchFromGitHub { owner = "nzbgetcom"; repo = "nzbget"; rev = "v${finalAttrs.version}"; - hash = "sha256-+iJ5n/meBrMxKHSLxL5QJ7+TI0RMfAM5n/8dwYupGoU="; + hash = "sha256-Gci9bVjmewoEii6OiOuRpLgEBEKApmMmlA5v3OedCo4="; }; - patches = [ - (fetchpatch2 { - # status page buffer overflow fix: https://github.com/nzbgetcom/nzbget/pull/346 -- remove when version > 24.2 - url = "https://github.com/nzbgetcom/nzbget/commit/f89978f7479cbb0ff2f96c8632d9d2f31834e6c8.patch"; - hash = "sha256-9K7PGzmoZ8cvEKBm5htfw5fr1GBSddNkDC/Vi4ngRto="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/ob/obsidian/package.nix b/third_party/nixpkgs/pkgs/by-name/ob/obsidian/package.nix index e8ffe9f3b8..1060c148ea 100644 --- a/third_party/nixpkgs/pkgs/by-name/ob/obsidian/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ob/obsidian/package.nix @@ -12,7 +12,7 @@ }: let pname = "obsidian"; - version = "1.6.7"; + version = "1.7.4"; appname = "Obsidian"; meta = with lib; { description = "Powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -26,7 +26,7 @@ let filename = if stdenv.hostPlatform.isDarwin then "Obsidian-${version}.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - hash = if stdenv.hostPlatform.isDarwin then "sha256-rFXmhlxXlVz5nCrXMmfYGaxe4/wnBRdFxsfiwiIDHgw=" else "sha256-ok1fedN8+OXBisFpVXbKRW2OhE4o9MC9lJmtMMST6V8="; + hash = if stdenv.hostPlatform.isDarwin then "sha256-r3dSHx3y7BzjbWYJwXwyWCeTRya2jLMVhzV7NWpRDb4=" else "sha256-NRL8WHi+4ne48z7b9G6trJZiTt/lhwcF2CZjgyYmOug="; }; icon = fetchurl { diff --git a/third_party/nixpkgs/pkgs/by-name/oi/oidc-agent/package.nix b/third_party/nixpkgs/pkgs/by-name/oi/oidc-agent/package.nix index bfcc2accc9..60d0c2b972 100644 --- a/third_party/nixpkgs/pkgs/by-name/oi/oidc-agent/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/oi/oidc-agent/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, curl, - webkitgtk, + webkitgtk_4_0, libmicrohttpd, libsecret, qrencode, @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl - webkitgtk + webkitgtk_4_0 libmicrohttpd libsecret qrencode diff --git a/third_party/nixpkgs/pkgs/by-name/oi/oink/package.nix b/third_party/nixpkgs/pkgs/by-name/oi/oink/package.nix index 405e807e4c..fb39bf8024 100644 --- a/third_party/nixpkgs/pkgs/by-name/oi/oink/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/oi/oink/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "oink"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "rlado"; repo = "oink"; rev = "v${version}"; - hash = "sha256-nA1M+TIj2mWhaftS5y4D2zIs7HAI4eDRjSdmLUifGKg="; + hash = "sha256-MBNEMIrpJdXzMjmNwmKXTIzPNNGalElhIxmMU4y6zXo="; }; vendorHash = null; @@ -25,6 +25,6 @@ buildGoModule rec { homepage = "https://github.com/rlado/oink"; license = lib.licenses.mit; mainProgram = "oink"; - maintainers = with lib.maintainers; [ jtbx ]; + maintainers = with lib.maintainers; [ jtbx pmw ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/om/omnom/package.nix b/third_party/nixpkgs/pkgs/by-name/om/omnom/package.nix index 20660906a7..6d89e3005b 100644 --- a/third_party/nixpkgs/pkgs/by-name/om/omnom/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/om/omnom/package.nix @@ -52,9 +52,7 @@ buildGoModule { description = "A webpage bookmarking and snapshotting service"; homepage = "https://github.com/asciimoo/omnom"; license = lib.licenses.agpl3Only; - maintainers = [ - # maintained by the team working on NGI-supported software, no group for this yet - ]; + maintainers = lib.teams.ngi.members; mainProgram = "omnom"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/op/open-vm-tools/package.nix b/third_party/nixpkgs/pkgs/by-name/op/open-vm-tools/package.nix index d660cd64bb..ac340b7a87 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/open-vm-tools/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/open-vm-tools/package.nix @@ -42,13 +42,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "open-vm-tools"; - version = "12.4.5"; + version = "12.5.0"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${finalAttrs.version}"; - hash = "sha256-VMnxWKGBgwnkP9eSVm///d6THzzWgUe5kNj/lGVBVlc="; + hash = "sha256-pjMXhVN4xdmPCk1Aeb83VZjDJ1t1mb9wryC6h3O+Qvc="; }; sourceRoot = "${finalAttrs.src.name}/open-vm-tools"; 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 f7ad046330..e401e72d0f 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 @@ -89,6 +89,7 @@ python3.pkgs.buildPythonApplication rec { fpdf2 ftfy google-generativeai + googleapis-common-protos langchain langchain-chroma langchain-community diff --git a/third_party/nixpkgs/pkgs/by-name/op/open62541/package.nix b/third_party/nixpkgs/pkgs/by-name/op/open62541/package.nix index dd32cfbe84..62afb6eef9 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/open62541/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/open62541/package.nix @@ -30,13 +30,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "open62541"; - version = "1.4.4"; + version = "1.4.6"; src = fetchFromGitHub { owner = "open62541"; repo = "open62541"; rev = "v${finalAttrs.version}"; - hash = "sha256-S0hMxP+jIosI6siw0vt2KO84AQuL7JIPLPTBBXZPwpQ="; + hash = "sha256-9fbTOJWnjiOy7Ge5n9jfwHDzUicTAXN8VqelPr8mMDI="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/by-name/op/openapi-changes/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openapi-changes/package.nix index 8fe3904e74..97d58a58bb 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/openapi-changes/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/openapi-changes/package.nix @@ -1,19 +1,19 @@ { lib -, buildGoModule +, buildGo123Module , fetchFromGitHub , git , makeWrapper }: -buildGoModule rec { +buildGo123Module rec { pname = "openapi-changes"; - version = "0.0.67"; + version = "0.0.68"; src = fetchFromGitHub { owner = "pb33f"; repo = pname; rev = "v${version}"; - hash = "sha256-SNH11z/0DeaYfGwBKW3iIeCVdlpcoZ1elIlgl+quWIY="; + hash = "sha256-v+THD4ZWnpeuxLfxaA4LUGdYV3X5rUKeCWq9HIub59Y="; }; # this test requires the `.git` of the project to be present @@ -27,7 +27,7 @@ buildGoModule rec { wrapProgram $out/bin/openapi-changes --prefix PATH : ${lib.makeBinPath [ git ]} ''; - vendorHash = "sha256-VtwIAP2+FZ6Vpexcb9O68WfJdsTMrJn5bDjkxDe69e4="; + vendorHash = "sha256-IiI+mSbJNEpM6rryGtAnGSOcY2RXnvqXTZmZ82L1HPc="; meta = with lib; { description = "World's sexiest OpenAPI breaking changes detector"; diff --git a/third_party/nixpkgs/pkgs/by-name/op/openctm/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openctm/package.nix index 4d38054385..d89640ca82 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/openctm/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/openctm/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { version = "1.0.3"; src = fetchurl { - url = "https://downloads.sourceforge.net/project/openctm/OpenCTM-${finalAttrs.version}/OpenCTM-${finalAttrs.version}-src.tar.bz2"; + url = "mirror://sourceforge/project/openctm/OpenCTM-${finalAttrs.version}/OpenCTM-${finalAttrs.version}-src.tar.bz2"; hash = "sha256-So0mCNlzZPfuxWt8Y3xWuTCK6YKGs+kNu3QTyQ6UPx0="; }; diff --git a/third_party/nixpkgs/pkgs/by-name/op/openpgl/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openpgl/package.nix index db0ba62beb..556d9170df 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/openpgl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/openpgl/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openpgl"; - version = "0.5.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "OpenPathGuidingLibrary"; repo = "openpgl"; rev = "v${finalAttrs.version}"; - hash = "sha256-dbHmGGiHQkU0KPpQYpY/o0uCWdb3L5namETdOcOREgs="; + hash = "sha256-HX3X1dmOazUUiYCqa6irpNm37YthB2YHb8u1P1qDHco="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/oq/oqs-provider/package.nix b/third_party/nixpkgs/pkgs/by-name/oq/oqs-provider/package.nix index 84ffce3f8f..105ce97a06 100644 --- a/third_party/nixpkgs/pkgs/by-name/oq/oqs-provider/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/oq/oqs-provider/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { name = "oqs-provider"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "open-quantum-safe"; repo = "oqs-provider"; rev = finalAttrs.version; - hash = "sha256-AW0rOszXm9Hy55b2fQ2mpZulhXjYwvztwL6DIFgIzjA="; + hash = "sha256-v7YIE5uzBvQHfi2hqkkRrW0F3K4haZyuoKHxAtRqQDA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/or/ord/package.nix b/third_party/nixpkgs/pkgs/by-name/or/ord/package.nix index cc5257d618..96e6dc775a 100644 --- a/third_party/nixpkgs/pkgs/by-name/or/ord/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/or/ord/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "ord"; - version = "0.20.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "ordinals"; repo = "ord"; rev = version; - hash = "sha256-qTTAViVZEw4XgYADoonsVZPulp43lFFkX2xE5OFbL3s="; + hash = "sha256-gnwlNDgYEcqbwflQAvPb92pJ8kOpiPHB1co7QyMJ/xA="; }; - cargoHash = "sha256-QSeAAaT1LbcWLmML8i2sgRtTnimZfKgLq6qhnpQr8cc="; + cargoHash = "sha256-6Phq3buWE+jHWrYsIhV9u5RTGtKqYkkyb/RjrdX1ETw="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/by-name/os/osc-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/os/osc-cli/package.nix index fc9db543b1..0af589f1e8 100644 --- a/third_party/nixpkgs/pkgs/by-name/os/osc-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/os/osc-cli/package.nix @@ -16,11 +16,15 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-7WXy+1NHwFvYmyi5xGfWpq/mbVGJ3WkgP5WQd5pvcC0="; }; - nativeBuildInputs = [ + build-system = [ python3.pkgs.setuptools ]; - propagatedBuildInputs = with python3.pkgs; [ + pythonRelaxDeps = [ + "defusedxml" + ]; + + dependencies = with python3.pkgs; [ defusedxml fire requests diff --git a/third_party/nixpkgs/pkgs/by-name/os/oscar/package.nix b/third_party/nixpkgs/pkgs/by-name/os/oscar/package.nix index 1af7233bb2..cdc9c26732 100644 --- a/third_party/nixpkgs/pkgs/by-name/os/oscar/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/os/oscar/package.nix @@ -5,7 +5,7 @@ fetchFromGitLab, libGLU, }: -qt5.mkDerivation rec { +stdenv.mkDerivation rec { pname = "oscar"; version = "1.5.1"; @@ -22,7 +22,10 @@ qt5.mkDerivation rec { qt5.qtserialport libGLU ]; - nativeBuildInputs = [ qt5.qmake ]; + nativeBuildInputs = [ + qt5.wrapQtAppsHook + qt5.qmake + ]; postPatch = '' substituteInPlace oscar/oscar.pro --replace "/bin/bash" "${stdenv.shell}" ''; diff --git a/third_party/nixpkgs/pkgs/by-name/os/osu-lazer-bin/package.nix b/third_party/nixpkgs/pkgs/by-name/os/osu-lazer-bin/package.nix new file mode 100644 index 0000000000..3cecd70c66 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/os/osu-lazer-bin/package.nix @@ -0,0 +1,100 @@ +{ + lib, + stdenv, + fetchurl, + fetchzip, + appimageTools, + makeWrapper, +}: + +let + pname = "osu-lazer-bin"; + version = "2024.1009.1"; + + src = + { + aarch64-darwin = fetchzip { + url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; + hash = "sha256-fH7cuk879nS8FDIZ8p29pg2aXLJUT+j6Emb39Y6FXq4="; + stripRoot = false; + }; + x86_64-darwin = fetchzip { + url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; + hash = "sha256-kIH+zlNaqMVbr8FVDiLUh19gfrFUDPGBvMOrZqkMZAE="; + stripRoot = false; + }; + x86_64-linux = fetchurl { + url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; + hash = "sha256-2H2SPcUm/H/0D9BqBiTFvaCwd0c14/r+oWhyeZdNpoU="; + }; + } + .${stdenv.system} or (throw "osu-lazer-bin: ${stdenv.system} is unsupported."); + + meta = { + description = "Rhythm is just a *click* away (AppImage version for score submission and multiplayer, and binary distribution for Darwin systems)"; + homepage = "https://osu.ppy.sh"; + license = with lib.licenses; [ + mit + cc-by-nc-40 + unfreeRedistributable # osu-framework contains libbass.so in repository + ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ + gepbird + stepbrobd + ]; + mainProgram = "osu!"; + platforms = [ + "aarch64-darwin" + "x86_64-darwin" + "x86_64-linux" + ]; + }; + + passthru.updateScript = ./update.sh; +in +if stdenv.hostPlatform.isDarwin then + stdenv.mkDerivation { + inherit + pname + version + src + meta + passthru + ; + + installPhase = '' + runHook preInstall + APP_DIR="$out/Applications" + mkdir -p "$APP_DIR" + cp -r . "$APP_DIR" + runHook postInstall + ''; + } +else + appimageTools.wrapType2 { + inherit + pname + version + src + meta + passthru + ; + + extraPkgs = pkgs: with pkgs; [ icu ]; + + extraInstallCommands = + let + contents = appimageTools.extract { inherit pname version src; }; + in + '' + . ${makeWrapper}/nix-support/setup-hook + mv -v $out/bin/${pname} $out/bin/osu! + wrapProgram $out/bin/osu! \ + --set OSU_EXTERNAL_UPDATE_PROVIDER 1 + install -m 444 -D ${contents}/osu!.desktop -t $out/share/applications + for i in 16 32 48 64 96 128 256 512 1024; do + install -D ${contents}/osu!.png $out/share/icons/hicolor/''${i}x$i/apps/osu!.png + done + ''; + } diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/update-bin.sh b/third_party/nixpkgs/pkgs/by-name/os/osu-lazer-bin/update.sh similarity index 91% rename from third_party/nixpkgs/pkgs/games/osu-lazer/update-bin.sh rename to third_party/nixpkgs/pkgs/by-name/os/osu-lazer-bin/update.sh index 182875a427..0b06950762 100755 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/update-bin.sh +++ b/third_party/nixpkgs/pkgs/by-name/os/osu-lazer-bin/update.sh @@ -3,16 +3,16 @@ set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" -bin_file="$(realpath ./bin.nix)" +bin_file="$(realpath ./package.nix)" new_version="$(curl -s "https://api.github.com/repos/ppy/osu/releases?per_page=1" | jq -r '.[0].name')" -old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./bin.nix)" +old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./package.nix)" if [[ "$new_version" == "$old_version" ]]; then echo "Already up to date." exit 0 fi -cd ../../.. +cd ../../../.. echo "Updating osu-lazer-bin from $old_version to $new_version..." sed -Ei.bak '/ *version = "/s/".+"/"'"$new_version"'"/' "$bin_file" diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix b/third_party/nixpkgs/pkgs/by-name/os/osu-lazer/deps.nix similarity index 98% rename from third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix rename to third_party/nixpkgs/pkgs/by-name/os/osu-lazer/deps.nix index bd57355c79..0e3bee1048 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix +++ b/third_party/nixpkgs/pkgs/by-name/os/osu-lazer/deps.nix @@ -138,13 +138,13 @@ (fetchNuGet { pname = "ppy.ManagedBass.Fx"; version = "2022.1216.0"; hash = "sha256-VfIbFhCDsCRZW5bCbt8MSmE2kAlcKxxx6vdFOus4he8="; }) (fetchNuGet { pname = "ppy.ManagedBass.Mix"; version = "2022.1216.0"; hash = "sha256-qUEGJHoYfDvHrpuXdVaiSoV2iVVh9X0yEB41u96+q6A="; }) (fetchNuGet { pname = "ppy.ManagedBass.Wasapi"; version = "2022.1216.0"; hash = "sha256-HzhypEVJA+6h3aBB95zNeGbmzEIRc5435Eh9nYpjVkA="; }) - (fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.907.1"; hash = "sha256-h9wQPX7EP4b6+a7D/qU3qvSi05yp2rOj52nBmko1Y2o="; }) + (fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.1009.0"; hash = "sha256-aLZcnVYyrLMeaoz/Jt49m5Po5i814MvtcGcVOVu18ls="; }) (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2024.809.1-nativelibs"; hash = "sha256-F7xd66bCEDgEjYgqmx21lYde+ebCsX/E2fuqWXH4xyU="; }) (fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2023.720.0"; hash = "sha256-XXV/qBJ9vEVF15fcOlDyoJ8j47azuSJaXHEgsn3fOwA="; }) - (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2024.904.0"; hash = "sha256-x3et2Rnr90bdlFzR852Pt1EkW69/eQxlXciPNtFrN44="; }) + (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2024.1003.0"; hash = "sha256-aeY9jfvyC+GFovHs0b5SSGZHMOO5tMMplZQWIRxo9DA="; }) (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.211"; hash = "sha256-Xu4uiYs1pqIXcBWeTBIc8OIqbLmH6MvaY6Dim4ZNikg="; }) (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.741-alpha"; hash = "sha256-sdX+MoMlIPUyi4yEUVHtqxKWF/VK04e2VaUavmgBEJU="; }) - (fetchNuGet { pname = "ppy.SDL3-CS"; version = "2024.807.1"; hash = "sha256-9ppVYCkc43NIsfe9iKWlxd8elgECZqP+pRPT9ybxiAU="; }) + (fetchNuGet { pname = "ppy.SDL3-CS"; version = "2024.916.0"; hash = "sha256-ioILyAlyMiaVVGYxoLzNH78Mlp1Dfbv5xKjDWtwCP8M="; }) (fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.62-gca0239da6b"; hash = "sha256-mGlMQbp2/ewA7PzamEeMA1pbboC73iAIARhK4MPrwO4="; }) (fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.62-gca0239da6b"; hash = "sha256-8jkbU2QV4HV8RU1vnSNtP8kNEhDWbTb3Dr2cl8w/T6A="; }) (fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.62-gca0239da6b"; hash = "sha256-I81to2x5D4LlIJN80d5DbqcU0jPTVSPoc0tvL15YG6I="; }) @@ -237,7 +237,7 @@ (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; hash = "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="; }) (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; }) - (fetchNuGet { pname = "System.IO.Packaging"; version = "8.0.0"; hash = "sha256-kBOaG1Y3te708l81mIig7YKl6wPbEIAQ9J8mzHUdO/A="; }) + (fetchNuGet { pname = "System.IO.Packaging"; version = "8.0.1"; hash = "sha256-xf0BAfqQvITompBsvfpxiLts/6sRQEzdjNA3f/q/vY4="; }) (fetchNuGet { pname = "System.IO.Pipelines"; version = "7.0.0"; hash = "sha256-W2181khfJUTxLqhuAVRhCa52xZ3+ePGOLIPwEN8WisY="; }) (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; hash = "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="; }) (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; }) @@ -321,7 +321,7 @@ (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; }) (fetchNuGet { pname = "TagLibSharp"; version = "2.3.0"; hash = "sha256-PD9bVZiPaeC8hNx2D+uDUf701cCaMi2IRi5oPTNN+/w="; }) - (fetchNuGet { pname = "Velopack"; version = "0.0.598-g933b2ab"; hash = "sha256-i1VR1tZ+rNl8F4EL8x5OAdnqfIRuHmviTp19uPFi14A="; }) + (fetchNuGet { pname = "Velopack"; version = "0.0.630-g9c52e40"; hash = "sha256-6dSuIl1HpqOaIPiCziQSgkDGiPf04q253ADYAo0rghA="; }) (fetchNuGet { pname = "Vortice.D3DCompiler"; version = "2.4.2"; hash = "sha256-LXdgts8lKbTU67c1W001XRbq5nenzf8XcYCRxc75jR8="; }) (fetchNuGet { pname = "Vortice.Direct3D11"; version = "2.4.2"; hash = "sha256-hU4qzLKhv4QxiP2c9s4IZUGgeQxsOjRhgurrlXXq/qM="; }) (fetchNuGet { pname = "Vortice.DirectX"; version = "2.4.2"; hash = "sha256-LOIxdET0ynaJz70fakVwDYU0qm+1P0SfD1+I9P320oc="; }) diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/osu.runtimeconfig.json b/third_party/nixpkgs/pkgs/by-name/os/osu-lazer/osu.runtimeconfig.json similarity index 100% rename from third_party/nixpkgs/pkgs/games/osu-lazer/osu.runtimeconfig.json rename to third_party/nixpkgs/pkgs/by-name/os/osu-lazer/osu.runtimeconfig.json diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix b/third_party/nixpkgs/pkgs/by-name/os/osu-lazer/package.nix similarity index 71% rename from third_party/nixpkgs/pkgs/games/osu-lazer/default.nix rename to third_party/nixpkgs/pkgs/by-name/os/osu-lazer/package.nix index d2826e295e..a2523df785 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/os/osu-lazer/package.nix @@ -1,30 +1,31 @@ -{ lib -, stdenvNoCC -, buildDotnetModule -, fetchFromGitHub -, dotnetCorePackages -, makeDesktopItem -, copyDesktopItems -, makeWrapper -, ffmpeg -, alsa-lib -, SDL2 -, lttng-ust -, numactl -, libglvnd -, xorg -, udev +{ + lib, + stdenvNoCC, + buildDotnetModule, + fetchFromGitHub, + dotnetCorePackages, + makeDesktopItem, + copyDesktopItems, + makeWrapper, + ffmpeg, + alsa-lib, + SDL2, + lttng-ust, + numactl, + libglvnd, + xorg, + udev, }: buildDotnetModule rec { pname = "osu-lazer"; - version = "2024.906.2"; + version = "2024.1009.1"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - hash = "sha256-ykCO+q28IUJumt3nra1BUlwuXqLS1FYOqcDe2LPPGVY="; + hash = "sha256-odWTLvx41miFgn4O/EDzwm2pfWKxj4B1ieSfNS0hrW8="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; @@ -76,27 +77,32 @@ buildDotnetModule rec { runHook postFixup ''; - desktopItems = [(makeDesktopItem { - desktopName = "osu!"; - name = "osu"; - exec = "osu!"; - icon = "osu!"; - comment = "Rhythm is just a *click* away (no score submission or multiplayer, see osu-lazer-bin)"; - type = "Application"; - categories = [ "Game" ]; - })]; + desktopItems = [ + (makeDesktopItem { + desktopName = "osu!"; + name = "osu"; + exec = "osu!"; + icon = "osu!"; + comment = "Rhythm is just a *click* away (no score submission or multiplayer, see osu-lazer-bin)"; + type = "Application"; + categories = [ "Game" ]; + }) + ]; passthru.updateScript = ./update.sh; - meta = with lib; { + meta = { description = "Rhythm is just a *click* away (no score submission or multiplayer, see osu-lazer-bin)"; homepage = "https://osu.ppy.sh"; - license = with licenses; [ + license = with lib.licenses; [ mit cc-by-nc-40 unfreeRedistributable # osu-framework contains libbass.so in repository ]; - maintainers = with maintainers; [ gepbird thiagokokada ]; + maintainers = with lib.maintainers; [ + gepbird + thiagokokada + ]; platforms = [ "x86_64-linux" ]; mainProgram = "osu!"; }; diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/update.sh b/third_party/nixpkgs/pkgs/by-name/os/osu-lazer/update.sh similarity index 86% rename from third_party/nixpkgs/pkgs/games/osu-lazer/update.sh rename to third_party/nixpkgs/pkgs/by-name/os/osu-lazer/update.sh index 7ef726621a..194b644e77 100755 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/update.sh +++ b/third_party/nixpkgs/pkgs/by-name/os/osu-lazer/update.sh @@ -4,13 +4,13 @@ set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" new_version="$(curl -s "https://api.github.com/repos/ppy/osu/releases?per_page=1" | jq -r '.[0].name')" -old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" +old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./package.nix)" if [[ "$new_version" == "$old_version" ]]; then echo "Up to date" exit 0 fi -cd ../../.. +cd ../../../.. if [[ "$1" != "--deps-only" ]]; then update-source-version osu-lazer "$new_version" diff --git a/third_party/nixpkgs/pkgs/by-name/ov/overlayed/package.nix b/third_party/nixpkgs/pkgs/by-name/ov/overlayed/package.nix index 19452d768d..215b205d78 100644 --- a/third_party/nixpkgs/pkgs/by-name/ov/overlayed/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ov/overlayed/package.nix @@ -5,7 +5,7 @@ pkg-config, openssl, libsoup, - webkitgtk, + webkitgtk_4_0, fetchFromGitHub, libayatana-appindicator, }: @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - webkitgtk + webkitgtk_4_0 libsoup ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ov/overskride/package.nix b/third_party/nixpkgs/pkgs/by-name/ov/overskride/package.nix index bade7387f4..f99244a8bd 100644 --- a/third_party/nixpkgs/pkgs/by-name/ov/overskride/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ov/overskride/package.nix @@ -4,7 +4,7 @@ owner = "kaii-lb"; name = "overskride"; -version = "0.6.0"; +version = "0.6.1"; in rustPlatform.buildRustPackage { @@ -15,10 +15,10 @@ in rustPlatform.buildRustPackage { inherit owner; repo = name; rev = "v${version}"; - hash = "sha256-TbakYKYbVe8wEFOrfj97m2bdAb1BJ7zoi/lyYLobw/k="; + hash = "sha256-SqaPhub/HwZz7uBg/kevH8LvPDVLgRd/Rvi03ivNrRc="; }; - cargoHash = "sha256-p2PmcLoHfeRUEG2v33vVyiKBkOjpNDbVteSmH5R3RmI="; + cargoHash = "sha256-jSTCCPNPKPNVr3h8uZ21dP8Z7shbX+QmoWM/jk1qjfg="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/by-name/pd/pdfarranger/package.nix b/third_party/nixpkgs/pkgs/by-name/pd/pdfarranger/package.nix index bcbad7a32d..8050e5af67 100644 --- a/third_party/nixpkgs/pkgs/by-name/pd/pdfarranger/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pd/pdfarranger/package.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "pdfarranger"; - version = "1.11.0"; + version = "1.11.1"; pyproject = true; src = fetchFromGitHub { owner = "pdfarranger"; repo = "pdfarranger"; rev = "refs/tags/${version}"; - hash = "sha256-bHV6EluA7xp+HyejnSWJwfRBDcTuZq5Gzz0KWIs0qhA="; + hash = "sha256-94qziqJaKW8/L/6+U1yojxdG8BmeAStn+qbfGemTrVA="; }; nativeBuildInputs = [ wrapGAppsHook3 ]; diff --git a/third_party/nixpkgs/pkgs/by-name/pd/pdftitle/package.nix b/third_party/nixpkgs/pkgs/by-name/pd/pdftitle/package.nix index e3267a58ab..29bd775f66 100644 --- a/third_party/nixpkgs/pkgs/by-name/pd/pdftitle/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pd/pdftitle/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "pdftitle"; - version = "0.11"; + version = "0.14"; pyproject = true; src = fetchFromGitHub { owner = "metebalci"; repo = "pdftitle"; rev = "v${version}"; - hash = "sha256-kj1pJpyWRgEaAADF6YqzdD8QnJ6iu0eXFMR4NGM4/+Y="; + hash = "sha256-7tIvvRlaKRC3/eRUS8F3d3qiJnCU0Z14Pj9E4v0X4+o="; }; build-system = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/by-name/pd/pdpmake/package.nix b/third_party/nixpkgs/pkgs/by-name/pd/pdpmake/package.nix index af6960be9e..dcb9794ded 100644 --- a/third_party/nixpkgs/pkgs/by-name/pd/pdpmake/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pd/pdpmake/package.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "pdpmake"; - version = "1.4.3"; + version = "2.0.1"; src = fetchFromGitHub { owner = "rmyorston"; repo = "pdpmake"; rev = version; - hash = "sha256-drHo8IUC3xQ/O6T4xCMQSK9m+O/6hTOJSw0OMl1W9WA="; + hash = "sha256-E9AcWwMfPp2sn4k/gv2gjBuqQ6k8J0TSfncMKuXh/Cc="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/pe/persistent-cache-cpp/package.nix b/third_party/nixpkgs/pkgs/by-name/pe/persistent-cache-cpp/package.nix index 7c6ef4e04c..b6acb32dda 100644 --- a/third_party/nixpkgs/pkgs/by-name/pe/persistent-cache-cpp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pe/persistent-cache-cpp/package.nix @@ -59,6 +59,9 @@ stdenv.mkDerivation (finalAttrs: { # Runs in parallel to other tests, limit to 1 thread substituteInPlace tests/headers/compile_headers.py \ --replace 'multiprocessing.cpu_count()' '1' + + sed '1i#include ' \ + -i tests/core/persistent_string_cache/speed_test.cpp '' + lib.optionalString finalAttrs.finalPackage.doCheck '' patchShebangs tests/{headers,whitespace}/*.py ''; diff --git a/third_party/nixpkgs/pkgs/by-name/pe/pest/composer.lock b/third_party/nixpkgs/pkgs/by-name/pe/pest/composer.lock index 9a82b13ea2..30211a96ea 100644 --- a/third_party/nixpkgs/pkgs/by-name/pe/pest/composer.lock +++ b/third_party/nixpkgs/pkgs/by-name/pe/pest/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a5966cfeff59a5290fd936057af38991", + "content-hash": "6dd92b3c214eb219f574a74eea1d06b4", "packages": [ { "name": "brianium/paratest", - "version": "v7.4.3", + "version": "v7.5.7", "source": { "type": "git", "url": "https://github.com/paratestphp/paratest.git", - "reference": "64fcfd0e28a6b8078a19dbf9127be2ee645b92ec" + "reference": "4890b17f569efea5e034e519dc883da53a67448d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paratestphp/paratest/zipball/64fcfd0e28a6b8078a19dbf9127be2ee645b92ec", - "reference": "64fcfd0e28a6b8078a19dbf9127be2ee645b92ec", + "url": "https://api.github.com/repos/paratestphp/paratest/zipball/4890b17f569efea5e034e519dc883da53a67448d", + "reference": "4890b17f569efea5e034e519dc883da53a67448d", "shasum": "" }, "require": { @@ -25,31 +25,31 @@ "ext-pcre": "*", "ext-reflection": "*", "ext-simplexml": "*", - "fidry/cpu-core-counter": "^1.1.0", - "jean85/pretty-package-versions": "^2.0.5", + "fidry/cpu-core-counter": "^1.2.0", + "jean85/pretty-package-versions": "^2.0.6", "php": "~8.2.0 || ~8.3.0", - "phpunit/php-code-coverage": "^10.1.11 || ^11.0.0", - "phpunit/php-file-iterator": "^4.1.0 || ^5.0.0", - "phpunit/php-timer": "^6.0.0 || ^7.0.0", - "phpunit/phpunit": "^10.5.9 || ^11.0.3", - "sebastian/environment": "^6.0.1 || ^7.0.0", - "symfony/console": "^6.4.3 || ^7.0.3", - "symfony/process": "^6.4.3 || ^7.0.3" + "phpunit/php-code-coverage": "^11.0.6", + "phpunit/php-file-iterator": "^5.1.0", + "phpunit/php-timer": "^7.0.1", + "phpunit/phpunit": "^11.4.0", + "sebastian/environment": "^7.2.0", + "symfony/console": "^6.4.11 || ^7.1.5", + "symfony/process": "^6.4.8 || ^7.1.5" }, "require-dev": { "doctrine/coding-standard": "^12.0.0", "ext-pcov": "*", "ext-posix": "*", - "phpstan/phpstan": "^1.10.58", - "phpstan/phpstan-deprecation-rules": "^1.1.4", - "phpstan/phpstan-phpunit": "^1.3.15", - "phpstan/phpstan-strict-rules": "^1.5.2", - "squizlabs/php_codesniffer": "^3.9.0", - "symfony/filesystem": "^6.4.3 || ^7.0.3" + "infection/infection": "^0.29.7", + "phpstan/phpstan": "^1.12.6", + "phpstan/phpstan-deprecation-rules": "^1.2.1", + "phpstan/phpstan-phpunit": "^1.4.0", + "phpstan/phpstan-strict-rules": "^1.6.1", + "squizlabs/php_codesniffer": "^3.10.3", + "symfony/filesystem": "^6.4.9 || ^7.1.5" }, "bin": [ "bin/paratest", - "bin/paratest.bat", "bin/paratest_for_phpstorm" ], "type": "library", @@ -86,7 +86,7 @@ ], "support": { "issues": "https://github.com/paratestphp/paratest/issues", - "source": "https://github.com/paratestphp/paratest/tree/v7.4.3" + "source": "https://github.com/paratestphp/paratest/tree/v7.5.7" }, "funding": [ { @@ -98,7 +98,7 @@ "type": "paypal" } ], - "time": "2024-02-20T07:24:02+00:00" + "time": "2024-10-07T06:27:54+00:00" }, { "name": "doctrine/deprecations", @@ -149,16 +149,16 @@ }, { "name": "fidry/cpu-core-counter", - "version": "1.1.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/theofidry/cpu-core-counter.git", - "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42" + "reference": "8520451a140d3f46ac33042715115e290cf5785f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/f92996c4d5c1a696a6a970e20f7c4216200fcc42", - "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42", + "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/8520451a140d3f46ac33042715115e290cf5785f", + "reference": "8520451a140d3f46ac33042715115e290cf5785f", "shasum": "" }, "require": { @@ -198,7 +198,7 @@ ], "support": { "issues": "https://github.com/theofidry/cpu-core-counter/issues", - "source": "https://github.com/theofidry/cpu-core-counter/tree/1.1.0" + "source": "https://github.com/theofidry/cpu-core-counter/tree/1.2.0" }, "funding": [ { @@ -206,30 +206,30 @@ "type": "github" } ], - "time": "2024-02-07T09:43:46+00:00" + "time": "2024-08-06T10:04:20+00:00" }, { "name": "filp/whoops", - "version": "2.15.4", + "version": "2.16.0", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546" + "reference": "befcdc0e5dce67252aa6322d82424be928214fa2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/a139776fa3f5985a50b509f2a02ff0f709d2a546", - "reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546", + "url": "https://api.github.com/repos/filp/whoops/zipball/befcdc0e5dce67252aa6322d82424be928214fa2", + "reference": "befcdc0e5dce67252aa6322d82424be928214fa2", "shasum": "" }, "require": { - "php": "^5.5.9 || ^7.0 || ^8.0", + "php": "^7.1 || ^8.0", "psr/log": "^1.0.1 || ^2.0 || ^3.0" }, "require-dev": { - "mockery/mockery": "^0.9 || ^1.0", - "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.3", - "symfony/var-dumper": "^2.6 || ^3.0 || ^4.0 || ^5.0" + "mockery/mockery": "^1.0", + "phpunit/phpunit": "^7.5.20 || ^8.5.8 || ^9.3.3", + "symfony/var-dumper": "^4.0 || ^5.0" }, "suggest": { "symfony/var-dumper": "Pretty print complex values better with var-dumper available", @@ -269,7 +269,7 @@ ], "support": { "issues": "https://github.com/filp/whoops/issues", - "source": "https://github.com/filp/whoops/tree/2.15.4" + "source": "https://github.com/filp/whoops/tree/2.16.0" }, "funding": [ { @@ -277,7 +277,7 @@ "type": "github" } ], - "time": "2023-11-03T12:00:00+00:00" + "time": "2024-09-25T12:00:00+00:00" }, { "name": "jean85/pretty-package-versions", @@ -340,16 +340,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.11.1", + "version": "1.12.0", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" + "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", + "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", "shasum": "" }, "require": { @@ -357,11 +357,12 @@ }, "conflict": { "doctrine/collections": "<1.6.8", - "doctrine/common": "<2.13.3 || >=3,<3.2.2" + "doctrine/common": "<2.13.3 || >=3 <3.2.2" }, "require-dev": { "doctrine/collections": "^1.6.8", "doctrine/common": "^2.13.3 || ^3.2.2", + "phpspec/prophecy": "^1.10", "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" }, "type": "library", @@ -387,7 +388,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1" + "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0" }, "funding": [ { @@ -395,20 +396,20 @@ "type": "tidelift" } ], - "time": "2023-03-08T13:26:56+00:00" + "time": "2024-06-12T14:39:25+00:00" }, { "name": "nikic/php-parser", - "version": "v5.0.2", + "version": "v5.3.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13" + "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/139676794dc1e9231bf7bcd123cfc0c99182cb13", - "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b", + "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b", "shasum": "" }, "require": { @@ -419,7 +420,7 @@ }, "require-dev": { "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" + "phpunit/phpunit": "^9.0" }, "bin": [ "bin/php-parse" @@ -451,44 +452,44 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.2" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1" }, - "time": "2024-03-05T20:51:40+00:00" + "time": "2024-10-08T18:51:32+00:00" }, { "name": "nunomaduro/collision", - "version": "v8.1.1", + "version": "v8.4.0", "source": { "type": "git", "url": "https://github.com/nunomaduro/collision.git", - "reference": "13e5d538b95a744d85f447a321ce10adb28e9af9" + "reference": "e7d1aa8ed753f63fa816932bbc89678238843b4a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/collision/zipball/13e5d538b95a744d85f447a321ce10adb28e9af9", - "reference": "13e5d538b95a744d85f447a321ce10adb28e9af9", + "url": "https://api.github.com/repos/nunomaduro/collision/zipball/e7d1aa8ed753f63fa816932bbc89678238843b4a", + "reference": "e7d1aa8ed753f63fa816932bbc89678238843b4a", "shasum": "" }, "require": { "filp/whoops": "^2.15.4", "nunomaduro/termwind": "^2.0.1", "php": "^8.2.0", - "symfony/console": "^7.0.4" + "symfony/console": "^7.1.3" }, "conflict": { "laravel/framework": "<11.0.0 || >=12.0.0", "phpunit/phpunit": "<10.5.1 || >=12.0.0" }, "require-dev": { - "larastan/larastan": "^2.9.2", - "laravel/framework": "^11.0.0", - "laravel/pint": "^1.14.0", - "laravel/sail": "^1.28.2", - "laravel/sanctum": "^4.0.0", + "larastan/larastan": "^2.9.8", + "laravel/framework": "^11.19.0", + "laravel/pint": "^1.17.1", + "laravel/sail": "^1.31.0", + "laravel/sanctum": "^4.0.2", "laravel/tinker": "^2.9.0", - "orchestra/testbench-core": "^9.0.0", - "pestphp/pest": "^2.34.1 || ^3.0.0", - "sebastian/environment": "^6.0.1 || ^7.0.0" + "orchestra/testbench-core": "^9.2.3", + "pestphp/pest": "^2.35.0 || ^3.0.0", + "sebastian/environment": "^6.1.0 || ^7.0.0" }, "type": "library", "extra": { @@ -550,20 +551,20 @@ "type": "patreon" } ], - "time": "2024-03-06T16:20:09+00:00" + "time": "2024-08-03T15:32:23+00:00" }, { "name": "nunomaduro/termwind", - "version": "v2.0.1", + "version": "v2.1.0", "source": { "type": "git", "url": "https://github.com/nunomaduro/termwind.git", - "reference": "58c4c58cf23df7f498daeb97092e34f5259feb6a" + "reference": "e5f21eade88689536c0cdad4c3cd75f3ed26e01a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/58c4c58cf23df7f498daeb97092e34f5259feb6a", - "reference": "58c4c58cf23df7f498daeb97092e34f5259feb6a", + "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/e5f21eade88689536c0cdad4c3cd75f3ed26e01a", + "reference": "e5f21eade88689536c0cdad4c3cd75f3ed26e01a", "shasum": "" }, "require": { @@ -573,11 +574,11 @@ }, "require-dev": { "ergebnis/phpstan-rules": "^2.2.0", - "illuminate/console": "^11.0.0", - "laravel/pint": "^1.14.0", - "mockery/mockery": "^1.6.7", - "pestphp/pest": "^2.34.1", - "phpstan/phpstan": "^1.10.59", + "illuminate/console": "^11.1.1", + "laravel/pint": "^1.15.0", + "mockery/mockery": "^1.6.11", + "pestphp/pest": "^2.34.6", + "phpstan/phpstan": "^1.10.66", "phpstan/phpstan-strict-rules": "^1.5.2", "symfony/var-dumper": "^7.0.4", "thecodingmachine/phpstan-strict-rules": "^1.0.0" @@ -622,7 +623,7 @@ ], "support": { "issues": "https://github.com/nunomaduro/termwind/issues", - "source": "https://github.com/nunomaduro/termwind/tree/v2.0.1" + "source": "https://github.com/nunomaduro/termwind/tree/v2.1.0" }, "funding": [ { @@ -638,34 +639,34 @@ "type": "github" } ], - "time": "2024-03-06T16:17:14+00:00" + "time": "2024-09-05T15:25:50+00:00" }, { "name": "pestphp/pest-plugin", - "version": "v2.1.1", + "version": "v3.0.0", "source": { "type": "git", "url": "https://github.com/pestphp/pest-plugin.git", - "reference": "e05d2859e08c2567ee38ce8b005d044e72648c0b" + "reference": "e79b26c65bc11c41093b10150c1341cc5cdbea83" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pestphp/pest-plugin/zipball/e05d2859e08c2567ee38ce8b005d044e72648c0b", - "reference": "e05d2859e08c2567ee38ce8b005d044e72648c0b", + "url": "https://api.github.com/repos/pestphp/pest-plugin/zipball/e79b26c65bc11c41093b10150c1341cc5cdbea83", + "reference": "e79b26c65bc11c41093b10150c1341cc5cdbea83", "shasum": "" }, "require": { "composer-plugin-api": "^2.0.0", "composer-runtime-api": "^2.2.2", - "php": "^8.1" + "php": "^8.2" }, "conflict": { - "pestphp/pest": "<2.2.3" + "pestphp/pest": "<3.0.0" }, "require-dev": { - "composer/composer": "^2.5.8", - "pestphp/pest": "^2.16.0", - "pestphp/pest-dev-tools": "^2.16.0" + "composer/composer": "^2.7.9", + "pestphp/pest": "^3.0.0", + "pestphp/pest-dev-tools": "^3.0.0" }, "type": "composer-plugin", "extra": { @@ -692,7 +693,7 @@ "unit" ], "support": { - "source": "https://github.com/pestphp/pest-plugin/tree/v2.1.1" + "source": "https://github.com/pestphp/pest-plugin/tree/v3.0.0" }, "funding": [ { @@ -708,31 +709,30 @@ "type": "patreon" } ], - "time": "2023-08-22T08:40:06+00:00" + "time": "2024-09-08T23:21:41+00:00" }, { "name": "pestphp/pest-plugin-arch", - "version": "v2.7.0", + "version": "v3.0.0", "source": { "type": "git", "url": "https://github.com/pestphp/pest-plugin-arch.git", - "reference": "d23b2d7498475354522c3818c42ef355dca3fcda" + "reference": "0a27e55a270cfe73d8cb70551b91002ee2cb64b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pestphp/pest-plugin-arch/zipball/d23b2d7498475354522c3818c42ef355dca3fcda", - "reference": "d23b2d7498475354522c3818c42ef355dca3fcda", + "url": "https://api.github.com/repos/pestphp/pest-plugin-arch/zipball/0a27e55a270cfe73d8cb70551b91002ee2cb64b0", + "reference": "0a27e55a270cfe73d8cb70551b91002ee2cb64b0", "shasum": "" }, "require": { - "nunomaduro/collision": "^7.10.0|^8.1.0", - "pestphp/pest-plugin": "^2.1.1", - "php": "^8.1", + "pestphp/pest-plugin": "^3.0.0", + "php": "^8.2", "ta-tikoma/phpunit-architecture-test": "^0.8.4" }, "require-dev": { - "pestphp/pest": "^2.33.0", - "pestphp/pest-dev-tools": "^2.16.0" + "pestphp/pest": "^3.0.0", + "pestphp/pest-dev-tools": "^3.0.0" }, "type": "library", "extra": { @@ -767,7 +767,7 @@ "unit" ], "support": { - "source": "https://github.com/pestphp/pest-plugin-arch/tree/v2.7.0" + "source": "https://github.com/pestphp/pest-plugin-arch/tree/v3.0.0" }, "funding": [ { @@ -779,7 +779,79 @@ "type": "github" } ], - "time": "2024-01-26T09:46:42+00:00" + "time": "2024-09-08T23:23:55+00:00" + }, + { + "name": "pestphp/pest-plugin-mutate", + "version": "v3.0.5", + "source": { + "type": "git", + "url": "https://github.com/pestphp/pest-plugin-mutate.git", + "reference": "e10dbdc98c9e2f3890095b4fe2144f63a5717e08" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pestphp/pest-plugin-mutate/zipball/e10dbdc98c9e2f3890095b4fe2144f63a5717e08", + "reference": "e10dbdc98c9e2f3890095b4fe2144f63a5717e08", + "shasum": "" + }, + "require": { + "nikic/php-parser": "^5.2.0", + "pestphp/pest-plugin": "^3.0.0", + "php": "^8.2", + "psr/simple-cache": "^3.0.0" + }, + "require-dev": { + "pestphp/pest": "^3.0.8", + "pestphp/pest-dev-tools": "^3.0.0", + "pestphp/pest-plugin-type-coverage": "^3.0.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Pest\\Mutate\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Sandro Gehri", + "email": "sandrogehri@gmail.com" + } + ], + "description": "Mutates your code to find untested cases", + "keywords": [ + "framework", + "mutate", + "mutation", + "pest", + "php", + "plugin", + "test", + "testing", + "unit" + ], + "support": { + "source": "https://github.com/pestphp/pest-plugin-mutate/tree/v3.0.5" + }, + "funding": [ + { + "url": "https://www.paypal.com/paypalme/enunomaduro", + "type": "custom" + }, + { + "url": "https://github.com/gehrisandro", + "type": "github" + }, + { + "url": "https://github.com/nunomaduro", + "type": "github" + } + ], + "time": "2024-09-22T07:54:40+00:00" }, { "name": "phar-io/manifest", @@ -954,28 +1026,35 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.3.0", + "version": "5.4.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170" + "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c", + "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c", "shasum": "" }, "require": { + "doctrine/deprecations": "^1.1", "ext-filter": "*", - "php": "^7.2 || ^8.0", + "php": "^7.4 || ^8.0", "phpdocumentor/reflection-common": "^2.2", - "phpdocumentor/type-resolver": "^1.3", + "phpdocumentor/type-resolver": "^1.7", + "phpstan/phpdoc-parser": "^1.7", "webmozart/assert": "^1.9.1" }, "require-dev": { - "mockery/mockery": "~1.3.2", - "psalm/phar": "^4.8" + "mockery/mockery": "~1.3.5", + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-mockery": "^1.1", + "phpstan/phpstan-webmozart-assert": "^1.2", + "phpunit/phpunit": "^9.5", + "vimeo/psalm": "^5.13" }, "type": "library", "extra": { @@ -999,15 +1078,15 @@ }, { "name": "Jaap van Otterdijk", - "email": "account@ijaap.nl" + "email": "opensource@ijaap.nl" } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.1" }, - "time": "2021-10-19T17:43:47+00:00" + "time": "2024-05-21T05:55:05+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -1069,16 +1148,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.28.0", + "version": "1.32.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb" + "reference": "6ca22b154efdd9e3c68c56f5d94670920a1c19a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb", - "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/6ca22b154efdd9e3c68c56f5d94670920a1c19a4", + "reference": "6ca22b154efdd9e3c68c56f5d94670920a1c19a4", "shasum": "" }, "require": { @@ -1110,41 +1189,41 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.28.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.32.0" }, - "time": "2024-04-03T18:51:33+00:00" + "time": "2024-09-26T07:23:32+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "10.1.14", + "version": "11.0.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b" + "reference": "f7f08030e8811582cc459871d28d6f5a1a4d35ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/e3f51450ebffe8e0efdf7346ae966a656f7d5e5b", - "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f7f08030e8811582cc459871d28d6f5a1a4d35ca", + "reference": "f7f08030e8811582cc459871d28d6f5a1a4d35ca", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.18 || ^5.0", - "php": ">=8.1", - "phpunit/php-file-iterator": "^4.0", - "phpunit/php-text-template": "^3.0", - "sebastian/code-unit-reverse-lookup": "^3.0", - "sebastian/complexity": "^3.0", - "sebastian/environment": "^6.0", - "sebastian/lines-of-code": "^2.0", - "sebastian/version": "^4.0", - "theseer/tokenizer": "^1.2.0" + "nikic/php-parser": "^5.3.1", + "php": ">=8.2", + "phpunit/php-file-iterator": "^5.1.0", + "phpunit/php-text-template": "^4.0.1", + "sebastian/code-unit-reverse-lookup": "^4.0.1", + "sebastian/complexity": "^4.0.1", + "sebastian/environment": "^7.2.0", + "sebastian/lines-of-code": "^3.0.1", + "sebastian/version": "^5.0.2", + "theseer/tokenizer": "^1.2.3" }, "require-dev": { - "phpunit/phpunit": "^10.1" + "phpunit/phpunit": "^11.4.1" }, "suggest": { "ext-pcov": "PHP extension that provides line coverage", @@ -1153,7 +1232,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "10.1-dev" + "dev-main": "11.0.x-dev" } }, "autoload": { @@ -1182,7 +1261,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.14" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/11.0.7" }, "funding": [ { @@ -1190,32 +1269,32 @@ "type": "github" } ], - "time": "2024-03-12T15:33:41+00:00" + "time": "2024-10-09T06:21:38+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "4.1.0", + "version": "5.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c" + "reference": "118cfaaa8bc5aef3287bf315b6060b1174754af6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a95037b6d9e608ba092da1b23931e537cadc3c3c", - "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/118cfaaa8bc5aef3287bf315b6060b1174754af6", + "reference": "118cfaaa8bc5aef3287bf315b6060b1174754af6", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^11.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "4.0-dev" + "dev-main": "5.0-dev" } }, "autoload": { @@ -1243,7 +1322,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/4.1.0" + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/5.1.0" }, "funding": [ { @@ -1251,28 +1330,28 @@ "type": "github" } ], - "time": "2023-08-31T06:24:48+00:00" + "time": "2024-08-27T05:02:59+00:00" }, { "name": "phpunit/php-invoker", - "version": "4.0.0", + "version": "5.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-invoker.git", - "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7" + "reference": "c1ca3814734c07492b3d4c5f794f4b0995333da2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7", - "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7", + "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/c1ca3814734c07492b3d4c5f794f4b0995333da2", + "reference": "c1ca3814734c07492b3d4c5f794f4b0995333da2", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "require-dev": { "ext-pcntl": "*", - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^11.0" }, "suggest": { "ext-pcntl": "*" @@ -1280,7 +1359,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "4.0-dev" + "dev-main": "5.0-dev" } }, "autoload": { @@ -1306,7 +1385,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-invoker/issues", - "source": "https://github.com/sebastianbergmann/php-invoker/tree/4.0.0" + "security": "https://github.com/sebastianbergmann/php-invoker/security/policy", + "source": "https://github.com/sebastianbergmann/php-invoker/tree/5.0.1" }, "funding": [ { @@ -1314,32 +1394,32 @@ "type": "github" } ], - "time": "2023-02-03T06:56:09+00:00" + "time": "2024-07-03T05:07:44+00:00" }, { "name": "phpunit/php-text-template", - "version": "3.0.1", + "version": "4.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748" + "reference": "3e0404dc6b300e6bf56415467ebcb3fe4f33e964" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/0c7b06ff49e3d5072f057eb1fa59258bf287a748", - "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/3e0404dc6b300e6bf56415467ebcb3fe4f33e964", + "reference": "3e0404dc6b300e6bf56415467ebcb3fe4f33e964", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^11.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "3.0-dev" + "dev-main": "4.0-dev" } }, "autoload": { @@ -1366,7 +1446,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-text-template/issues", "security": "https://github.com/sebastianbergmann/php-text-template/security/policy", - "source": "https://github.com/sebastianbergmann/php-text-template/tree/3.0.1" + "source": "https://github.com/sebastianbergmann/php-text-template/tree/4.0.1" }, "funding": [ { @@ -1374,32 +1454,32 @@ "type": "github" } ], - "time": "2023-08-31T14:07:24+00:00" + "time": "2024-07-03T05:08:43+00:00" }, { "name": "phpunit/php-timer", - "version": "6.0.0", + "version": "7.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d" + "reference": "3b415def83fbcb41f991d9ebf16ae4ad8b7837b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/e2a2d67966e740530f4a3343fe2e030ffdc1161d", - "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3b415def83fbcb41f991d9ebf16ae4ad8b7837b3", + "reference": "3b415def83fbcb41f991d9ebf16ae4ad8b7837b3", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^11.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "6.0-dev" + "dev-main": "7.0-dev" } }, "autoload": { @@ -1425,7 +1505,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-timer/issues", - "source": "https://github.com/sebastianbergmann/php-timer/tree/6.0.0" + "security": "https://github.com/sebastianbergmann/php-timer/security/policy", + "source": "https://github.com/sebastianbergmann/php-timer/tree/7.0.1" }, "funding": [ { @@ -1433,20 +1514,20 @@ "type": "github" } ], - "time": "2023-02-03T06:57:52+00:00" + "time": "2024-07-03T05:09:35+00:00" }, { "name": "phpunit/phpunit", - "version": "10.5.15", + "version": "11.4.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "86376e05e8745ed81d88232ff92fee868247b07b" + "reference": "7875627f15f4da7e7f0823d1f323f7295a77334e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/86376e05e8745ed81d88232ff92fee868247b07b", - "reference": "86376e05e8745ed81d88232ff92fee868247b07b", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/7875627f15f4da7e7f0823d1f323f7295a77334e", + "reference": "7875627f15f4da7e7f0823d1f323f7295a77334e", "shasum": "" }, "require": { @@ -1456,26 +1537,25 @@ "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.10.1", - "phar-io/manifest": "^2.0.3", - "phar-io/version": "^3.0.2", - "php": ">=8.1", - "phpunit/php-code-coverage": "^10.1.5", - "phpunit/php-file-iterator": "^4.0", - "phpunit/php-invoker": "^4.0", - "phpunit/php-text-template": "^3.0", - "phpunit/php-timer": "^6.0", - "sebastian/cli-parser": "^2.0", - "sebastian/code-unit": "^2.0", - "sebastian/comparator": "^5.0", - "sebastian/diff": "^5.0", - "sebastian/environment": "^6.0", - "sebastian/exporter": "^5.1", - "sebastian/global-state": "^6.0.1", - "sebastian/object-enumerator": "^5.0", - "sebastian/recursion-context": "^5.0", - "sebastian/type": "^4.0", - "sebastian/version": "^4.0" + "myclabs/deep-copy": "^1.12.0", + "phar-io/manifest": "^2.0.4", + "phar-io/version": "^3.2.1", + "php": ">=8.2", + "phpunit/php-code-coverage": "^11.0.6", + "phpunit/php-file-iterator": "^5.1.0", + "phpunit/php-invoker": "^5.0.1", + "phpunit/php-text-template": "^4.0.1", + "phpunit/php-timer": "^7.0.1", + "sebastian/cli-parser": "^3.0.2", + "sebastian/code-unit": "^3.0.1", + "sebastian/comparator": "^6.1.0", + "sebastian/diff": "^6.0.2", + "sebastian/environment": "^7.2.0", + "sebastian/exporter": "^6.1.3", + "sebastian/global-state": "^7.0.2", + "sebastian/object-enumerator": "^6.0.1", + "sebastian/type": "^5.1.0", + "sebastian/version": "^5.0.1" }, "suggest": { "ext-soap": "To be able to generate mocks based on WSDL files" @@ -1486,7 +1566,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "10.5-dev" + "dev-main": "11.4-dev" } }, "autoload": { @@ -1518,7 +1598,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.15" + "source": "https://github.com/sebastianbergmann/phpunit/tree/11.4.1" }, "funding": [ { @@ -1534,7 +1614,7 @@ "type": "tidelift" } ], - "time": "2024-03-22T04:17:47+00:00" + "time": "2024-10-08T15:38:37+00:00" }, { "name": "psr/container", @@ -1591,16 +1671,16 @@ }, { "name": "psr/log", - "version": "3.0.0", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001" + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001", + "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", "shasum": "" }, "require": { @@ -1635,34 +1715,85 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/3.0.0" + "source": "https://github.com/php-fig/log/tree/3.0.2" }, - "time": "2021-07-14T16:46:02+00:00" + "time": "2024-09-11T13:17:53+00:00" }, { - "name": "sebastian/cli-parser", - "version": "2.0.1", + "name": "psr/simple-cache", + "version": "3.0.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/cli-parser.git", - "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084" + "url": "https://github.com/php-fig/simple-cache.git", + "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/c34583b87e7b7a8055bf6c450c2c77ce32a24084", - "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084", + "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/764e0b3939f5ca87cb904f570ef9be2d78a07865", + "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865", "shasum": "" }, "require": { - "php": ">=8.1" - }, - "require-dev": { - "phpunit/phpunit": "^10.0" + "php": ">=8.0.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "2.0-dev" + "dev-master": "3.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\SimpleCache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interfaces for simple caching", + "keywords": [ + "cache", + "caching", + "psr", + "psr-16", + "simple-cache" + ], + "support": { + "source": "https://github.com/php-fig/simple-cache/tree/3.0.0" + }, + "time": "2021-10-29T13:26:27+00:00" + }, + { + "name": "sebastian/cli-parser", + "version": "3.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/cli-parser.git", + "reference": "15c5dd40dc4f38794d383bb95465193f5e0ae180" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/15c5dd40dc4f38794d383bb95465193f5e0ae180", + "reference": "15c5dd40dc4f38794d383bb95465193f5e0ae180", + "shasum": "" + }, + "require": { + "php": ">=8.2" + }, + "require-dev": { + "phpunit/phpunit": "^11.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.0-dev" } }, "autoload": { @@ -1686,7 +1817,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/cli-parser/issues", "security": "https://github.com/sebastianbergmann/cli-parser/security/policy", - "source": "https://github.com/sebastianbergmann/cli-parser/tree/2.0.1" + "source": "https://github.com/sebastianbergmann/cli-parser/tree/3.0.2" }, "funding": [ { @@ -1694,32 +1825,32 @@ "type": "github" } ], - "time": "2024-03-02T07:12:49+00:00" + "time": "2024-07-03T04:41:36+00:00" }, { "name": "sebastian/code-unit", - "version": "2.0.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/code-unit.git", - "reference": "a81fee9eef0b7a76af11d121767abc44c104e503" + "reference": "6bb7d09d6623567178cf54126afa9c2310114268" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/a81fee9eef0b7a76af11d121767abc44c104e503", - "reference": "a81fee9eef0b7a76af11d121767abc44c104e503", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/6bb7d09d6623567178cf54126afa9c2310114268", + "reference": "6bb7d09d6623567178cf54126afa9c2310114268", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^11.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "2.0-dev" + "dev-main": "3.0-dev" } }, "autoload": { @@ -1742,7 +1873,8 @@ "homepage": "https://github.com/sebastianbergmann/code-unit", "support": { "issues": "https://github.com/sebastianbergmann/code-unit/issues", - "source": "https://github.com/sebastianbergmann/code-unit/tree/2.0.0" + "security": "https://github.com/sebastianbergmann/code-unit/security/policy", + "source": "https://github.com/sebastianbergmann/code-unit/tree/3.0.1" }, "funding": [ { @@ -1750,32 +1882,32 @@ "type": "github" } ], - "time": "2023-02-03T06:58:43+00:00" + "time": "2024-07-03T04:44:28+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", - "version": "3.0.0", + "version": "4.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "5e3a687f7d8ae33fb362c5c0743794bbb2420a1d" + "reference": "183a9b2632194febd219bb9246eee421dad8d45e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/5e3a687f7d8ae33fb362c5c0743794bbb2420a1d", - "reference": "5e3a687f7d8ae33fb362c5c0743794bbb2420a1d", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/183a9b2632194febd219bb9246eee421dad8d45e", + "reference": "183a9b2632194febd219bb9246eee421dad8d45e", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^11.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "3.0-dev" + "dev-main": "4.0-dev" } }, "autoload": { @@ -1797,7 +1929,8 @@ "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", "support": { "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", - "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/3.0.0" + "security": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/security/policy", + "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/4.0.1" }, "funding": [ { @@ -1805,36 +1938,36 @@ "type": "github" } ], - "time": "2023-02-03T06:59:15+00:00" + "time": "2024-07-03T04:45:54+00:00" }, { "name": "sebastian/comparator", - "version": "5.0.1", + "version": "6.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "2db5010a484d53ebf536087a70b4a5423c102372" + "reference": "fa37b9e2ca618cb051d71b60120952ee8ca8b03d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2db5010a484d53ebf536087a70b4a5423c102372", - "reference": "2db5010a484d53ebf536087a70b4a5423c102372", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa37b9e2ca618cb051d71b60120952ee8ca8b03d", + "reference": "fa37b9e2ca618cb051d71b60120952ee8ca8b03d", "shasum": "" }, "require": { "ext-dom": "*", "ext-mbstring": "*", - "php": ">=8.1", - "sebastian/diff": "^5.0", - "sebastian/exporter": "^5.0" + "php": ">=8.2", + "sebastian/diff": "^6.0", + "sebastian/exporter": "^6.0" }, "require-dev": { - "phpunit/phpunit": "^10.3" + "phpunit/phpunit": "^11.3" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "5.0-dev" + "dev-main": "6.1-dev" } }, "autoload": { @@ -1874,7 +2007,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", "security": "https://github.com/sebastianbergmann/comparator/security/policy", - "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.1" + "source": "https://github.com/sebastianbergmann/comparator/tree/6.1.0" }, "funding": [ { @@ -1882,33 +2015,33 @@ "type": "github" } ], - "time": "2023-08-14T13:18:12+00:00" + "time": "2024-09-11T15:42:56+00:00" }, { "name": "sebastian/complexity", - "version": "3.2.0", + "version": "4.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/complexity.git", - "reference": "68ff824baeae169ec9f2137158ee529584553799" + "reference": "ee41d384ab1906c68852636b6de493846e13e5a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68ff824baeae169ec9f2137158ee529584553799", - "reference": "68ff824baeae169ec9f2137158ee529584553799", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/ee41d384ab1906c68852636b6de493846e13e5a0", + "reference": "ee41d384ab1906c68852636b6de493846e13e5a0", "shasum": "" }, "require": { - "nikic/php-parser": "^4.18 || ^5.0", - "php": ">=8.1" + "nikic/php-parser": "^5.0", + "php": ">=8.2" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^11.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "3.2-dev" + "dev-main": "4.0-dev" } }, "autoload": { @@ -1932,7 +2065,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/complexity/issues", "security": "https://github.com/sebastianbergmann/complexity/security/policy", - "source": "https://github.com/sebastianbergmann/complexity/tree/3.2.0" + "source": "https://github.com/sebastianbergmann/complexity/tree/4.0.1" }, "funding": [ { @@ -1940,33 +2073,33 @@ "type": "github" } ], - "time": "2023-12-21T08:37:17+00:00" + "time": "2024-07-03T04:49:50+00:00" }, { "name": "sebastian/diff", - "version": "5.1.1", + "version": "6.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e" + "reference": "b4ccd857127db5d41a5b676f24b51371d76d8544" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/c41e007b4b62af48218231d6c2275e4c9b975b2e", - "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/b4ccd857127db5d41a5b676f24b51371d76d8544", + "reference": "b4ccd857127db5d41a5b676f24b51371d76d8544", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "require-dev": { - "phpunit/phpunit": "^10.0", - "symfony/process": "^6.4" + "phpunit/phpunit": "^11.0", + "symfony/process": "^4.2 || ^5" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "5.1-dev" + "dev-main": "6.0-dev" } }, "autoload": { @@ -1999,7 +2132,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", "security": "https://github.com/sebastianbergmann/diff/security/policy", - "source": "https://github.com/sebastianbergmann/diff/tree/5.1.1" + "source": "https://github.com/sebastianbergmann/diff/tree/6.0.2" }, "funding": [ { @@ -2007,27 +2140,27 @@ "type": "github" } ], - "time": "2024-03-02T07:15:17+00:00" + "time": "2024-07-03T04:53:05+00:00" }, { "name": "sebastian/environment", - "version": "6.1.0", + "version": "7.2.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "8074dbcd93529b357029f5cc5058fd3e43666984" + "reference": "855f3ae0ab316bbafe1ba4e16e9f3c078d24a0c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/8074dbcd93529b357029f5cc5058fd3e43666984", - "reference": "8074dbcd93529b357029f5cc5058fd3e43666984", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/855f3ae0ab316bbafe1ba4e16e9f3c078d24a0c5", + "reference": "855f3ae0ab316bbafe1ba4e16e9f3c078d24a0c5", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^11.0" }, "suggest": { "ext-posix": "*" @@ -2035,7 +2168,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "6.1-dev" + "dev-main": "7.2-dev" } }, "autoload": { @@ -2063,7 +2196,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/environment/issues", "security": "https://github.com/sebastianbergmann/environment/security/policy", - "source": "https://github.com/sebastianbergmann/environment/tree/6.1.0" + "source": "https://github.com/sebastianbergmann/environment/tree/7.2.0" }, "funding": [ { @@ -2071,34 +2204,34 @@ "type": "github" } ], - "time": "2024-03-23T08:47:14+00:00" + "time": "2024-07-03T04:54:44+00:00" }, { "name": "sebastian/exporter", - "version": "5.1.2", + "version": "6.1.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "955288482d97c19a372d3f31006ab3f37da47adf" + "reference": "c414673eee9a8f9d51bbf8d61fc9e3ef1e85b20e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/955288482d97c19a372d3f31006ab3f37da47adf", - "reference": "955288482d97c19a372d3f31006ab3f37da47adf", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/c414673eee9a8f9d51bbf8d61fc9e3ef1e85b20e", + "reference": "c414673eee9a8f9d51bbf8d61fc9e3ef1e85b20e", "shasum": "" }, "require": { "ext-mbstring": "*", - "php": ">=8.1", - "sebastian/recursion-context": "^5.0" + "php": ">=8.2", + "sebastian/recursion-context": "^6.0" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^11.2" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "5.1-dev" + "dev-main": "6.1-dev" } }, "autoload": { @@ -2141,7 +2274,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", "security": "https://github.com/sebastianbergmann/exporter/security/policy", - "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.2" + "source": "https://github.com/sebastianbergmann/exporter/tree/6.1.3" }, "funding": [ { @@ -2149,35 +2282,35 @@ "type": "github" } ], - "time": "2024-03-02T07:17:12+00:00" + "time": "2024-07-03T04:56:19+00:00" }, { "name": "sebastian/global-state", - "version": "6.0.2", + "version": "7.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9" + "reference": "3be331570a721f9a4b5917f4209773de17f747d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/987bafff24ecc4c9ac418cab1145b96dd6e9cbd9", - "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/3be331570a721f9a4b5917f4209773de17f747d7", + "reference": "3be331570a721f9a4b5917f4209773de17f747d7", "shasum": "" }, "require": { - "php": ">=8.1", - "sebastian/object-reflector": "^3.0", - "sebastian/recursion-context": "^5.0" + "php": ">=8.2", + "sebastian/object-reflector": "^4.0", + "sebastian/recursion-context": "^6.0" }, "require-dev": { "ext-dom": "*", - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^11.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "6.0-dev" + "dev-main": "7.0-dev" } }, "autoload": { @@ -2203,7 +2336,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", "security": "https://github.com/sebastianbergmann/global-state/security/policy", - "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.2" + "source": "https://github.com/sebastianbergmann/global-state/tree/7.0.2" }, "funding": [ { @@ -2211,33 +2344,33 @@ "type": "github" } ], - "time": "2024-03-02T07:19:19+00:00" + "time": "2024-07-03T04:57:36+00:00" }, { "name": "sebastian/lines-of-code", - "version": "2.0.2", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/lines-of-code.git", - "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0" + "reference": "d36ad0d782e5756913e42ad87cb2890f4ffe467a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/856e7f6a75a84e339195d48c556f23be2ebf75d0", - "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/d36ad0d782e5756913e42ad87cb2890f4ffe467a", + "reference": "d36ad0d782e5756913e42ad87cb2890f4ffe467a", "shasum": "" }, "require": { - "nikic/php-parser": "^4.18 || ^5.0", - "php": ">=8.1" + "nikic/php-parser": "^5.0", + "php": ">=8.2" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^11.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "2.0-dev" + "dev-main": "3.0-dev" } }, "autoload": { @@ -2261,7 +2394,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", "security": "https://github.com/sebastianbergmann/lines-of-code/security/policy", - "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.2" + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/3.0.1" }, "funding": [ { @@ -2269,34 +2402,34 @@ "type": "github" } ], - "time": "2023-12-21T08:38:20+00:00" + "time": "2024-07-03T04:58:38+00:00" }, { "name": "sebastian/object-enumerator", - "version": "5.0.0", + "version": "6.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "202d0e344a580d7f7d04b3fafce6933e59dae906" + "reference": "f5b498e631a74204185071eb41f33f38d64608aa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/202d0e344a580d7f7d04b3fafce6933e59dae906", - "reference": "202d0e344a580d7f7d04b3fafce6933e59dae906", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/f5b498e631a74204185071eb41f33f38d64608aa", + "reference": "f5b498e631a74204185071eb41f33f38d64608aa", "shasum": "" }, "require": { - "php": ">=8.1", - "sebastian/object-reflector": "^3.0", - "sebastian/recursion-context": "^5.0" + "php": ">=8.2", + "sebastian/object-reflector": "^4.0", + "sebastian/recursion-context": "^6.0" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^11.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "5.0-dev" + "dev-main": "6.0-dev" } }, "autoload": { @@ -2318,7 +2451,8 @@ "homepage": "https://github.com/sebastianbergmann/object-enumerator/", "support": { "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", - "source": "https://github.com/sebastianbergmann/object-enumerator/tree/5.0.0" + "security": "https://github.com/sebastianbergmann/object-enumerator/security/policy", + "source": "https://github.com/sebastianbergmann/object-enumerator/tree/6.0.1" }, "funding": [ { @@ -2326,32 +2460,32 @@ "type": "github" } ], - "time": "2023-02-03T07:08:32+00:00" + "time": "2024-07-03T05:00:13+00:00" }, { "name": "sebastian/object-reflector", - "version": "3.0.0", + "version": "4.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-reflector.git", - "reference": "24ed13d98130f0e7122df55d06c5c4942a577957" + "reference": "6e1a43b411b2ad34146dee7524cb13a068bb35f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/24ed13d98130f0e7122df55d06c5c4942a577957", - "reference": "24ed13d98130f0e7122df55d06c5c4942a577957", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/6e1a43b411b2ad34146dee7524cb13a068bb35f9", + "reference": "6e1a43b411b2ad34146dee7524cb13a068bb35f9", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^11.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "3.0-dev" + "dev-main": "4.0-dev" } }, "autoload": { @@ -2373,7 +2507,8 @@ "homepage": "https://github.com/sebastianbergmann/object-reflector/", "support": { "issues": "https://github.com/sebastianbergmann/object-reflector/issues", - "source": "https://github.com/sebastianbergmann/object-reflector/tree/3.0.0" + "security": "https://github.com/sebastianbergmann/object-reflector/security/policy", + "source": "https://github.com/sebastianbergmann/object-reflector/tree/4.0.1" }, "funding": [ { @@ -2381,32 +2516,32 @@ "type": "github" } ], - "time": "2023-02-03T07:06:18+00:00" + "time": "2024-07-03T05:01:32+00:00" }, { "name": "sebastian/recursion-context", - "version": "5.0.0", + "version": "6.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "05909fb5bc7df4c52992396d0116aed689f93712" + "reference": "694d156164372abbd149a4b85ccda2e4670c0e16" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/05909fb5bc7df4c52992396d0116aed689f93712", - "reference": "05909fb5bc7df4c52992396d0116aed689f93712", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/694d156164372abbd149a4b85ccda2e4670c0e16", + "reference": "694d156164372abbd149a4b85ccda2e4670c0e16", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^11.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "5.0-dev" + "dev-main": "6.0-dev" } }, "autoload": { @@ -2436,7 +2571,8 @@ "homepage": "https://github.com/sebastianbergmann/recursion-context", "support": { "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/5.0.0" + "security": "https://github.com/sebastianbergmann/recursion-context/security/policy", + "source": "https://github.com/sebastianbergmann/recursion-context/tree/6.0.2" }, "funding": [ { @@ -2444,32 +2580,32 @@ "type": "github" } ], - "time": "2023-02-03T07:05:40+00:00" + "time": "2024-07-03T05:10:34+00:00" }, { "name": "sebastian/type", - "version": "4.0.0", + "version": "5.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "462699a16464c3944eefc02ebdd77882bd3925bf" + "reference": "461b9c5da241511a2a0e8f240814fb23ce5c0aac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/462699a16464c3944eefc02ebdd77882bd3925bf", - "reference": "462699a16464c3944eefc02ebdd77882bd3925bf", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/461b9c5da241511a2a0e8f240814fb23ce5c0aac", + "reference": "461b9c5da241511a2a0e8f240814fb23ce5c0aac", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^11.3" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "4.0-dev" + "dev-main": "5.1-dev" } }, "autoload": { @@ -2492,7 +2628,8 @@ "homepage": "https://github.com/sebastianbergmann/type", "support": { "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/4.0.0" + "security": "https://github.com/sebastianbergmann/type/security/policy", + "source": "https://github.com/sebastianbergmann/type/tree/5.1.0" }, "funding": [ { @@ -2500,29 +2637,29 @@ "type": "github" } ], - "time": "2023-02-03T07:10:45+00:00" + "time": "2024-09-17T13:12:04+00:00" }, { "name": "sebastian/version", - "version": "4.0.1", + "version": "5.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/version.git", - "reference": "c51fa83a5d8f43f1402e3f32a005e6262244ef17" + "reference": "c687e3387b99f5b03b6caa64c74b63e2936ff874" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c51fa83a5d8f43f1402e3f32a005e6262244ef17", - "reference": "c51fa83a5d8f43f1402e3f32a005e6262244ef17", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c687e3387b99f5b03b6caa64c74b63e2936ff874", + "reference": "c687e3387b99f5b03b6caa64c74b63e2936ff874", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "4.0-dev" + "dev-main": "5.0-dev" } }, "autoload": { @@ -2545,7 +2682,8 @@ "homepage": "https://github.com/sebastianbergmann/version", "support": { "issues": "https://github.com/sebastianbergmann/version/issues", - "source": "https://github.com/sebastianbergmann/version/tree/4.0.1" + "security": "https://github.com/sebastianbergmann/version/security/policy", + "source": "https://github.com/sebastianbergmann/version/tree/5.0.2" }, "funding": [ { @@ -2553,20 +2691,20 @@ "type": "github" } ], - "time": "2023-02-07T11:34:05+00:00" + "time": "2024-10-09T05:16:32+00:00" }, { "name": "symfony/console", - "version": "v7.0.6", + "version": "v7.1.5", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "fde915cd8e7eb99b3d531d3d5c09531429c3f9e5" + "reference": "0fa539d12b3ccf068a722bbbffa07ca7079af9ee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/fde915cd8e7eb99b3d531d3d5c09531429c3f9e5", - "reference": "fde915cd8e7eb99b3d531d3d5c09531429c3f9e5", + "url": "https://api.github.com/repos/symfony/console/zipball/0fa539d12b3ccf068a722bbbffa07ca7079af9ee", + "reference": "0fa539d12b3ccf068a722bbbffa07ca7079af9ee", "shasum": "" }, "require": { @@ -2630,7 +2768,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v7.0.6" + "source": "https://github.com/symfony/console/tree/v7.1.5" }, "funding": [ { @@ -2646,20 +2784,87 @@ "type": "tidelift" } ], - "time": "2024-04-01T11:04:53+00:00" + "time": "2024-09-20T08:28:38+00:00" }, { - "name": "symfony/finder", - "version": "v7.0.0", + "name": "symfony/deprecation-contracts", + "version": "v3.5.0", "source": { "type": "git", - "url": "https://github.com/symfony/finder.git", - "reference": "6e5688d69f7cfc4ed4a511e96007e06c2d34ce56" + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/6e5688d69f7cfc4ed4a511e96007e06c2d34ce56", - "reference": "6e5688d69f7cfc4ed4a511e96007e06c2d34ce56", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", + "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "files": [ + "function.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "A generic function and convention to trigger deprecation notices", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-04-18T09:32:20+00:00" + }, + { + "name": "symfony/finder", + "version": "v7.1.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/finder.git", + "reference": "d95bbf319f7d052082fb7af147e0f835a695e823" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/finder/zipball/d95bbf319f7d052082fb7af147e0f835a695e823", + "reference": "d95bbf319f7d052082fb7af147e0f835a695e823", "shasum": "" }, "require": { @@ -2694,7 +2899,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v7.0.0" + "source": "https://github.com/symfony/finder/tree/v7.1.4" }, "funding": [ { @@ -2710,24 +2915,24 @@ "type": "tidelift" } ], - "time": "2023-10-31T17:59:56+00:00" + "time": "2024-08-13T14:28:19+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", - "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638", + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-ctype": "*" @@ -2773,7 +2978,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0" }, "funding": [ { @@ -2789,24 +2994,24 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f" + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f", - "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "suggest": { "ext-intl": "For best performance" @@ -2851,7 +3056,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0" }, "funding": [ { @@ -2867,24 +3072,24 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "bc45c394692b948b4d383a08d7753968bed9a83d" + "reference": "3833d7255cc303546435cb650316bff708a1c75c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d", - "reference": "bc45c394692b948b4d383a08d7753968bed9a83d", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c", + "reference": "3833d7255cc303546435cb650316bff708a1c75c", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "suggest": { "ext-intl": "For best performance" @@ -2932,7 +3137,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0" }, "funding": [ { @@ -2948,24 +3153,24 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", - "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341", + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-mbstring": "*" @@ -3012,7 +3217,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0" }, "funding": [ { @@ -3028,20 +3233,20 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/process", - "version": "v7.0.4", + "version": "v7.1.5", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "0e7727191c3b71ebec6d529fa0e50a01ca5679e9" + "reference": "5c03ee6369281177f07f7c68252a280beccba847" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/0e7727191c3b71ebec6d529fa0e50a01ca5679e9", - "reference": "0e7727191c3b71ebec6d529fa0e50a01ca5679e9", + "url": "https://api.github.com/repos/symfony/process/zipball/5c03ee6369281177f07f7c68252a280beccba847", + "reference": "5c03ee6369281177f07f7c68252a280beccba847", "shasum": "" }, "require": { @@ -3073,7 +3278,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v7.0.4" + "source": "https://github.com/symfony/process/tree/v7.1.5" }, "funding": [ { @@ -3089,25 +3294,26 @@ "type": "tidelift" } ], - "time": "2024-02-22T20:27:20+00:00" + "time": "2024-09-19T21:48:23+00:00" }, { "name": "symfony/service-contracts", - "version": "v3.4.2", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "11bbf19a0fb7b36345861e85c5768844c552906e" + "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/11bbf19a0fb7b36345861e85c5768844c552906e", - "reference": "11bbf19a0fb7b36345861e85c5768844c552906e", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", + "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", "shasum": "" }, "require": { "php": ">=8.1", - "psr/container": "^1.1|^2.0" + "psr/container": "^1.1|^2.0", + "symfony/deprecation-contracts": "^2.5|^3" }, "conflict": { "ext-psr": "<1.1|>=2" @@ -3115,7 +3321,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.4-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -3155,7 +3361,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.4.2" + "source": "https://github.com/symfony/service-contracts/tree/v3.5.0" }, "funding": [ { @@ -3171,20 +3377,20 @@ "type": "tidelift" } ], - "time": "2023-12-19T21:51:00+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/string", - "version": "v7.0.4", + "version": "v7.1.5", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "f5832521b998b0bec40bee688ad5de98d4cf111b" + "reference": "d66f9c343fa894ec2037cc928381df90a7ad4306" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/f5832521b998b0bec40bee688ad5de98d4cf111b", - "reference": "f5832521b998b0bec40bee688ad5de98d4cf111b", + "url": "https://api.github.com/repos/symfony/string/zipball/d66f9c343fa894ec2037cc928381df90a7ad4306", + "reference": "d66f9c343fa894ec2037cc928381df90a7ad4306", "shasum": "" }, "require": { @@ -3198,6 +3404,7 @@ "symfony/translation-contracts": "<2.5" }, "require-dev": { + "symfony/emoji": "^7.1", "symfony/error-handler": "^6.4|^7.0", "symfony/http-client": "^6.4|^7.0", "symfony/intl": "^6.4|^7.0", @@ -3241,7 +3448,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v7.0.4" + "source": "https://github.com/symfony/string/tree/v7.1.5" }, "funding": [ { @@ -3257,7 +3464,7 @@ "type": "tidelift" } ], - "time": "2024-02-01T13:17:36+00:00" + "time": "2024-09-20T08:28:38+00:00" }, { "name": "ta-tikoma/phpunit-architecture-test", @@ -3502,16 +3709,16 @@ }, { "name": "laravel/pint", - "version": "v1.15.1", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/laravel/pint.git", - "reference": "5f288b5e79938cc72f5c298d384e639de87507c6" + "reference": "35c00c05ec43e6b46d295efc0f4386ceb30d50d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/pint/zipball/5f288b5e79938cc72f5c298d384e639de87507c6", - "reference": "5f288b5e79938cc72f5c298d384e639de87507c6", + "url": "https://api.github.com/repos/laravel/pint/zipball/35c00c05ec43e6b46d295efc0f4386ceb30d50d9", + "reference": "35c00c05ec43e6b46d295efc0f4386ceb30d50d9", "shasum": "" }, "require": { @@ -3522,13 +3729,13 @@ "php": "^8.1.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^3.52.1", - "illuminate/view": "^10.48.4", - "larastan/larastan": "^2.9.2", - "laravel-zero/framework": "^10.3.0", - "mockery/mockery": "^1.6.11", + "friendsofphp/php-cs-fixer": "^3.64.0", + "illuminate/view": "^10.48.20", + "larastan/larastan": "^2.9.8", + "laravel-zero/framework": "^10.4.0", + "mockery/mockery": "^1.6.12", "nunomaduro/termwind": "^1.15.1", - "pestphp/pest": "^2.34.5" + "pestphp/pest": "^2.35.1" }, "bin": [ "builds/pint" @@ -3564,24 +3771,24 @@ "issues": "https://github.com/laravel/pint/issues", "source": "https://github.com/laravel/pint" }, - "time": "2024-04-02T14:28:47+00:00" + "time": "2024-09-24T17:22:50+00:00" }, { "name": "nette/utils", - "version": "v4.0.4", + "version": "v4.0.5", "source": { "type": "git", "url": "https://github.com/nette/utils.git", - "reference": "d3ad0aa3b9f934602cb3e3902ebccf10be34d218" + "reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/utils/zipball/d3ad0aa3b9f934602cb3e3902ebccf10be34d218", - "reference": "d3ad0aa3b9f934602cb3e3902ebccf10be34d218", + "url": "https://api.github.com/repos/nette/utils/zipball/736c567e257dbe0fcf6ce81b4d6dbe05c6899f96", + "reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96", "shasum": "" }, "require": { - "php": ">=8.0 <8.4" + "php": "8.0 - 8.4" }, "conflict": { "nette/finder": "<3", @@ -3648,33 +3855,34 @@ ], "support": { "issues": "https://github.com/nette/utils/issues", - "source": "https://github.com/nette/utils/tree/v4.0.4" + "source": "https://github.com/nette/utils/tree/v4.0.5" }, - "time": "2024-01-17T16:50:36+00:00" + "time": "2024-08-07T15:39:19+00:00" }, { "name": "pestphp/pest-dev-tools", - "version": "v2.16.0", + "version": "v3.0.0", "source": { "type": "git", "url": "https://github.com/pestphp/pest-dev-tools.git", - "reference": "f196d0ac2f26bd6869dd51f7504752ea916f660b" + "reference": "1b3cf988b8065db4a05d5ed29a19e76d775fd3ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pestphp/pest-dev-tools/zipball/f196d0ac2f26bd6869dd51f7504752ea916f660b", - "reference": "f196d0ac2f26bd6869dd51f7504752ea916f660b", + "url": "https://api.github.com/repos/pestphp/pest-dev-tools/zipball/1b3cf988b8065db4a05d5ed29a19e76d775fd3ec", + "reference": "1b3cf988b8065db4a05d5ed29a19e76d775fd3ec", "shasum": "" }, "require": { - "ergebnis/phpstan-rules": "^2.1.0", - "laravel/pint": "^1.11.0", - "php": "^8.1", - "phpstan/phpstan": "^1.10.29", - "phpstan/phpstan-strict-rules": "^1.5.1", - "rector/rector": "^0.16.0", - "symfony/var-dumper": "^6.3.3", - "symplify/phpstan-rules": "^12.1.4.72", + "ergebnis/phpstan-rules": "^2.2.0", + "laravel/pint": "^1.17.3", + "php": "^8.2.0", + "phpstan/phpstan": "^1.12.2", + "phpstan/phpstan-strict-rules": "^1.6.0", + "phpunit/phpunit": "^11.3.3", + "rector/rector": "^1.2.5", + "symfony/var-dumper": "^7.1.4", + "symplify/phpstan-rules": "^12.7.0", "thecodingmachine/phpstan-strict-rules": "^1.0.0" }, "type": "library", @@ -3698,7 +3906,7 @@ "unit" ], "support": { - "source": "https://github.com/pestphp/pest-dev-tools/tree/v2.16.0" + "source": "https://github.com/pestphp/pest-dev-tools/tree/v3.0.0" }, "funding": [ { @@ -3710,31 +3918,31 @@ "type": "github" } ], - "time": "2023-08-21T07:47:54+00:00" + "time": "2024-09-08T23:27:14+00:00" }, { "name": "pestphp/pest-plugin-type-coverage", - "version": "v2.8.1", + "version": "v3.1.0", "source": { "type": "git", "url": "https://github.com/pestphp/pest-plugin-type-coverage.git", - "reference": "4be0cf0faca7d207c5d97af8ab68a450ebf8da24" + "reference": "45f265f37f9b3e27f1a0982aedeb0c6ee156ba27" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pestphp/pest-plugin-type-coverage/zipball/4be0cf0faca7d207c5d97af8ab68a450ebf8da24", - "reference": "4be0cf0faca7d207c5d97af8ab68a450ebf8da24", + "url": "https://api.github.com/repos/pestphp/pest-plugin-type-coverage/zipball/45f265f37f9b3e27f1a0982aedeb0c6ee156ba27", + "reference": "45f265f37f9b3e27f1a0982aedeb0c6ee156ba27", "shasum": "" }, "require": { - "pestphp/pest-plugin": "^2.1.1", - "php": "^8.1", - "phpstan/phpstan": "^1.10.60", - "tomasvotruba/type-coverage": "^0.2.1" + "pestphp/pest-plugin": "^3.0.0", + "php": "^8.2", + "phpstan/phpstan": "^1.12.6", + "tomasvotruba/type-coverage": "^1.0.0" }, "require-dev": { - "pestphp/pest": "^2.30.0", - "pestphp/pest-dev-tools": "^2.16.0" + "pestphp/pest": "^3.2.5", + "pestphp/pest-dev-tools": "^3.0.0" }, "type": "library", "extra": { @@ -3766,8 +3974,7 @@ "unit" ], "support": { - "issues": "https://github.com/pestphp/pest-plugin-type-coverage/issues", - "source": "https://github.com/pestphp/pest-plugin-type-coverage/tree/v2.8.1" + "source": "https://github.com/pestphp/pest-plugin-type-coverage/tree/v3.1.0" }, "funding": [ { @@ -3783,20 +3990,20 @@ "type": "patreon" } ], - "time": "2024-03-08T09:48:04+00:00" + "time": "2024-10-06T18:14:06+00:00" }, { "name": "phpstan/phpstan", - "version": "1.10.66", + "version": "1.12.6", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "94779c987e4ebd620025d9e5fdd23323903950bd" + "reference": "dc4d2f145a88ea7141ae698effd64d9df46527ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/94779c987e4ebd620025d9e5fdd23323903950bd", - "reference": "94779c987e4ebd620025d9e5fdd23323903950bd", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/dc4d2f145a88ea7141ae698effd64d9df46527ae", + "reference": "dc4d2f145a88ea7141ae698effd64d9df46527ae", "shasum": "" }, "require": { @@ -3839,31 +4046,27 @@ { "url": "https://github.com/phpstan", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan", - "type": "tidelift" } ], - "time": "2024-03-28T16:17:31+00:00" + "time": "2024-10-06T15:03:59+00:00" }, { "name": "phpstan/phpstan-strict-rules", - "version": "1.5.2", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-strict-rules.git", - "reference": "7a50e9662ee9f3942e4aaaf3d603653f60282542" + "reference": "daeec748b53de80a97498462513066834ec28f8b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/7a50e9662ee9f3942e4aaaf3d603653f60282542", - "reference": "7a50e9662ee9f3942e4aaaf3d603653f60282542", + "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/daeec748b53de80a97498462513066834ec28f8b", + "reference": "daeec748b53de80a97498462513066834ec28f8b", "shasum": "" }, "require": { "php": "^7.2 || ^8.0", - "phpstan/phpstan": "^1.10.34" + "phpstan/phpstan": "^1.12.4" }, "require-dev": { "nikic/php-parser": "^4.13.0", @@ -3892,27 +4095,27 @@ "description": "Extra strict and opinionated rules for PHPStan", "support": { "issues": "https://github.com/phpstan/phpstan-strict-rules/issues", - "source": "https://github.com/phpstan/phpstan-strict-rules/tree/1.5.2" + "source": "https://github.com/phpstan/phpstan-strict-rules/tree/1.6.1" }, - "time": "2023-10-30T14:35:06+00:00" + "time": "2024-09-20T14:04:44+00:00" }, { "name": "rector/rector", - "version": "0.16.0", + "version": "1.2.6", "source": { "type": "git", "url": "https://github.com/rectorphp/rector.git", - "reference": "2125ff71ea05b079562a8f59ca48a97eb78dc07f" + "reference": "6ca85da28159dbd3bb36211c5104b7bc91278e99" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rectorphp/rector/zipball/2125ff71ea05b079562a8f59ca48a97eb78dc07f", - "reference": "2125ff71ea05b079562a8f59ca48a97eb78dc07f", + "url": "https://api.github.com/repos/rectorphp/rector/zipball/6ca85da28159dbd3bb36211c5104b7bc91278e99", + "reference": "6ca85da28159dbd3bb36211c5104b7bc91278e99", "shasum": "" }, "require": { "php": "^7.2|^8.0", - "phpstan/phpstan": "^1.10.14" + "phpstan/phpstan": "^1.12.5" }, "conflict": { "rector/rector-doctrine": "*", @@ -3920,15 +4123,13 @@ "rector/rector-phpunit": "*", "rector/rector-symfony": "*" }, + "suggest": { + "ext-dom": "To manipulate phpunit.xml via the custom-rule command" + }, "bin": [ "bin/rector" ], "type": "library", - "extra": { - "branch-alias": { - "dev-main": "0.15-dev" - } - }, "autoload": { "files": [ "bootstrap.php" @@ -3947,7 +4148,7 @@ ], "support": { "issues": "https://github.com/rectorphp/rector/issues", - "source": "https://github.com/rectorphp/rector/tree/0.16.0" + "source": "https://github.com/rectorphp/rector/tree/1.2.6" }, "funding": [ { @@ -3955,105 +4156,36 @@ "type": "github" } ], - "time": "2023-05-05T12:12:17+00:00" - }, - { - "name": "symfony/deprecation-contracts", - "version": "v3.4.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf", - "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf", - "shasum": "" - }, - "require": { - "php": ">=8.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "3.4-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } - }, - "autoload": { - "files": [ - "function.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "A generic function and convention to trigger deprecation notices", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2023-05-23T14:45:45+00:00" + "time": "2024-10-03T08:56:44+00:00" }, { "name": "symfony/var-dumper", - "version": "v6.4.6", + "version": "v7.1.5", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "95bd2706a97fb875185b51ecaa6112ec184233d4" + "reference": "e20e03889539fd4e4211e14d2179226c513c010d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/95bd2706a97fb875185b51ecaa6112ec184233d4", - "reference": "95bd2706a97fb875185b51ecaa6112ec184233d4", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e20e03889539fd4e4211e14d2179226c513c010d", + "reference": "e20e03889539fd4e4211e14d2179226c513c010d", "shasum": "" }, "require": { - "php": ">=8.1", - "symfony/deprecation-contracts": "^2.5|^3", + "php": ">=8.2", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/console": "<5.4" + "symfony/console": "<6.4" }, "require-dev": { "ext-iconv": "*", - "symfony/console": "^5.4|^6.0|^7.0", - "symfony/error-handler": "^6.3|^7.0", - "symfony/http-kernel": "^5.4|^6.0|^7.0", - "symfony/process": "^5.4|^6.0|^7.0", - "symfony/uid": "^5.4|^6.0|^7.0", - "twig/twig": "^2.13|^3.0.4" + "symfony/console": "^6.4|^7.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/process": "^6.4|^7.0", + "symfony/uid": "^6.4|^7.0", + "twig/twig": "^3.0.4" }, "bin": [ "Resources/bin/var-dump-server" @@ -4091,7 +4223,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.4.6" + "source": "https://github.com/symfony/var-dumper/tree/v7.1.5" }, "funding": [ { @@ -4107,20 +4239,20 @@ "type": "tidelift" } ], - "time": "2024-03-19T11:56:30+00:00" + "time": "2024-09-16T10:07:02+00:00" }, { "name": "symplify/phpstan-rules", - "version": "12.4.9", + "version": "12.7.0", "source": { "type": "git", "url": "https://github.com/symplify/phpstan-rules.git", - "reference": "14b2f776414109648ddc1680a6bab0c0641e4d3a" + "reference": "14f506143ae7d6548da88326331cc536686e224f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symplify/phpstan-rules/zipball/14b2f776414109648ddc1680a6bab0c0641e4d3a", - "reference": "14b2f776414109648ddc1680a6bab0c0641e4d3a", + "url": "https://api.github.com/repos/symplify/phpstan-rules/zipball/14f506143ae7d6548da88326331cc536686e224f", + "reference": "14f506143ae7d6548da88326331cc536686e224f", "shasum": "" }, "require": { @@ -4149,7 +4281,7 @@ "description": "Set of Symplify rules for PHPStan", "support": { "issues": "https://github.com/symplify/phpstan-rules/issues", - "source": "https://github.com/symplify/phpstan-rules/tree/12.4.9" + "source": "https://github.com/symplify/phpstan-rules/tree/12.7.0" }, "funding": [ { @@ -4161,7 +4293,7 @@ "type": "github" } ], - "time": "2024-03-05T15:24:56+00:00" + "time": "2024-05-25T15:32:40+00:00" }, { "name": "thecodingmachine/phpstan-strict-rules", @@ -4220,16 +4352,16 @@ }, { "name": "tomasvotruba/type-coverage", - "version": "0.2.5", + "version": "1.0.0", "source": { "type": "git", "url": "https://github.com/TomasVotruba/type-coverage.git", - "reference": "3d463bc8a894d425eab837cb0f49d2c605068740" + "reference": "01498b5cef67fa433e2f9f38b696d0ecd5131dca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TomasVotruba/type-coverage/zipball/3d463bc8a894d425eab837cb0f49d2c605068740", - "reference": "3d463bc8a894d425eab837cb0f49d2c605068740", + "url": "https://api.github.com/repos/TomasVotruba/type-coverage/zipball/01498b5cef67fa433e2f9f38b696d0ecd5131dca", + "reference": "01498b5cef67fa433e2f9f38b696d0ecd5131dca", "shasum": "" }, "require": { @@ -4261,7 +4393,7 @@ ], "support": { "issues": "https://github.com/TomasVotruba/type-coverage/issues", - "source": "https://github.com/TomasVotruba/type-coverage/tree/0.2.5" + "source": "https://github.com/TomasVotruba/type-coverage/tree/1.0.0" }, "funding": [ { @@ -4273,7 +4405,7 @@ "type": "github" } ], - "time": "2024-03-16T10:07:54+00:00" + "time": "2024-10-01T15:41:12+00:00" } ], "aliases": [], @@ -4282,7 +4414,7 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": "^8.1.0" + "php": "^8.2.0" }, "platform-dev": [], "plugin-api-version": "2.6.0" diff --git a/third_party/nixpkgs/pkgs/by-name/pe/pest/package.nix b/third_party/nixpkgs/pkgs/by-name/pe/pest/package.nix index 7431914a48..1951b9d6df 100644 --- a/third_party/nixpkgs/pkgs/by-name/pe/pest/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pe/pest/package.nix @@ -1,19 +1,19 @@ { lib, fetchFromGitHub, php }: -php.buildComposerProject (finalAttrs: { +php.buildComposerProject2 (finalAttrs: { pname = "pest"; - version = "2.34.7"; + version = "3.3.1"; src = fetchFromGitHub { owner = "pestphp"; repo = "pest"; rev = "v${finalAttrs.version}"; - hash = "sha256-rRXRtcjQUCx8R5sGRBUwlKtog6jQ1WaOu225npM6Ct8="; + hash = "sha256-HLUzXL05hcTLcBhKvf/PPJoCmEYdFqNkBbiRAQfR9ik="; }; composerLock = ./composer.lock; - vendorHash = "sha256-+FKNGjwq+KFPw8agdwsgnwb2ENgFAWK5EngmS4hMcSA="; + vendorHash = "sha256-rd15W3aHot1MtLGZeU2QREnIE5wtNw28OSpli3Nye5Y="; meta = { changelog = "https://github.com/pestphp/pest/releases/tag/v${finalAttrs.version}"; diff --git a/third_party/nixpkgs/pkgs/by-name/pg/pgroll/package.nix b/third_party/nixpkgs/pkgs/by-name/pg/pgroll/package.nix index bc28bfb74a..7c05b3150d 100644 --- a/third_party/nixpkgs/pkgs/by-name/pg/pgroll/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pg/pgroll/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "pgroll"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "xataio"; repo = "pgroll"; rev = "v${version}"; - hash = "sha256-XZrgJZR6CWdQWgGMXlEyZ5De6bu/u7+YvYvq6id9YzM="; + hash = "sha256-7hIdm/qdcwlXC+vrEbjmBunORfEyItsr+Hia5u4ZBZk="; }; - vendorHash = "sha256-+6HpxqQxGpIAyfn+38UeW2ksv5WyX67AT5e9JgQBI+k="; + vendorHash = "sha256-jP4tTV/4kgT86d46L47Jcr/7ZtP2rL8boZiwqLvYo40="; # Tests require a running docker daemon doCheck = false; diff --git a/third_party/nixpkgs/pkgs/by-name/pi/picom/package.nix b/third_party/nixpkgs/pkgs/by-name/pi/picom/package.nix index 200ad56d1e..4af6c85efb 100644 --- a/third_party/nixpkgs/pkgs/by-name/pi/picom/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pi/picom/package.nix @@ -33,13 +33,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "picom"; - version = "12.1"; + version = "12.3"; src = fetchFromGitHub { owner = "yshui"; repo = "picom"; rev = "v${finalAttrs.version}"; - hash = "sha256-XBFSPSrG6C4n5oQUQbWXyy9iCuEdrdaxU0CPR73juzk="; + hash = "sha256-FwjMlHP8xNJikkPpz+8BORrqqKYvRpkqm9GbExCoLAU="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/by-name/pl/plex-desktop/package.nix b/third_party/nixpkgs/pkgs/by-name/pl/plex-desktop/package.nix index ba793768d6..aa79d6040d 100644 --- a/third_party/nixpkgs/pkgs/by-name/pl/plex-desktop/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pl/plex-desktop/package.nix @@ -130,10 +130,7 @@ buildFHSEnv { substituteInPlace $out/share/applications/plex-desktop.desktop \ --replace-fail \ 'Icon=''${SNAP}/meta/gui/icon.png' \ - 'Icon=${plex-desktop}/meta/gui/icon.png' \ - --replace-fail \ - 'Exec=plex-desktop' \ - 'Exec=plex-desktop-${version}' + 'Icon=${plex-desktop}/meta/gui/icon.png' ''; runScript = writeShellScript "plex-desktop.sh" '' diff --git a/third_party/nixpkgs/pkgs/by-name/po/portfolio/package.nix b/third_party/nixpkgs/pkgs/by-name/po/portfolio/package.nix index 468d56e8d4..c73b6985f3 100644 --- a/third_party/nixpkgs/pkgs/by-name/po/portfolio/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/po/portfolio/package.nix @@ -10,7 +10,7 @@ openjdk17, stdenvNoCC, swt, - webkitgtk, + webkitgtk_4_0, wrapGAppsHook3, gitUpdater, }: @@ -30,7 +30,7 @@ let gtk3 libsecret swt - webkitgtk + webkitgtk_4_0 ]; in stdenvNoCC.mkDerivation (finalAttrs: { diff --git a/third_party/nixpkgs/pkgs/by-name/po/pot/package.nix b/third_party/nixpkgs/pkgs/by-name/po/pot/package.nix index 72f6dd5e28..bd1c7c4974 100644 --- a/third_party/nixpkgs/pkgs/by-name/po/pot/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/po/pot/package.nix @@ -14,7 +14,7 @@ buildGoModule, libayatana-appindicator, gtk3, - webkitgtk, + webkitgtk_4_0, libsoup, openssl, xdotool, @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { libsoup libayatana-appindicator openssl - webkitgtk + webkitgtk_4_0 xdotool ]; diff --git a/third_party/nixpkgs/pkgs/by-name/pr/prisma/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/prisma/package.nix index c03e192525..ce95eb2469 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/prisma/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/prisma/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "prisma"; - version = "5.18.0"; + version = "5.21.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma"; rev = finalAttrs.version; - hash = "sha256-BLD2nKryigXr03BCgGwb3PnCcBLMyDfSFb9Snj0VPKI="; + hash = "sha256-i37Hiawmu/06Mv56FtYkvFGOtqW3x4Q2H1C0JW6/0pI="; }; nativeBuildInputs = [ @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_8.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-lgdJk7HCfX3cAvdEI8xG/IVBiLWezdUN0q+e/0LtVUQ="; + hash = "sha256-o6m9Lxg+oqq15CtdA9RQRukdJWPPGtw/SwRyHDUf91A="; }; patchPhase = '' 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 be85c54ffc..5545ab8a94 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.23.0"; + version = "1.23.1"; src = fetchurl { url = "https://proton.me/download/pass/linux/x64/proton-pass_${finalAttrs.version}_amd64.deb"; - hash = "sha256-ewrPk3v1jgF87uY+7P8oQdWARcuFKdfiM1BzulMPBpg="; + hash = "sha256-D4OFHL9AS8oAwMZHoXaDpHKfMBQEaOd18eWAwVW4EJA="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/by-name/pr/proton-vpn-local-agent/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/proton-vpn-local-agent/package.nix new file mode 100644 index 0000000000..e3b310d744 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/pr/proton-vpn-local-agent/package.nix @@ -0,0 +1,36 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + python3, +}: + +rustPlatform.buildRustPackage rec { + pname = "proton-vpn-local-agent"; + version = "0-unstable-2024-10-10"; + cargoHash = "sha256-yAeqx9zo4xz4g/klo10vMEcecc8npIUY8tkV/nq11WA="; + + src = fetchFromGitHub { + owner = "ProtonVPN"; + repo = "python-proton-vpn-local-agent"; + rev = "01332194d217d91a514ecaebcdfbfa3d21ccd1ed"; + hash = "sha256-I+tbVQzD4xJUsoRF8TU/2EMldVqtfxY3E7PQN3ks0mA="; + }; + + sourceRoot = "${src.name}/python-proton-vpn-local-agent"; + + installPhase = '' + # manually install the python binding + mkdir -p $out/${python3.sitePackages}/proton/vpn/ + cp ./target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/libpython_proton_vpn_local_agent.so $out/${python3.sitePackages}/proton/vpn/local_agent.so + ''; + + meta = { + description = "Proton VPN local agent written in Rust with Python bindings"; + homepage = "https://github.com/ProtonVPN/python-proton-vpn-local-agent"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ sebtm ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/pr/protonplus/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/protonplus/package.nix index b6754c63a4..a6f442e055 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/protonplus/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/protonplus/package.nix @@ -20,13 +20,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "protonplus"; - version = "0.4.13"; + version = "0.4.20"; src = fetchFromGitHub { owner = "Vysp3r"; repo = "protonplus"; rev = "v${finalAttrs.version}"; - hash = "sha256-eIW30Tl/vOLXlUXiN3lAcww7Ipkfshzilb9ntxjF8C0="; + hash = "sha256-nnobk1N+r1tLekc8CLiAULsEQFjgzoQQvRz3F8vVjzU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/pr/prowler/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/prowler/package.nix index 98c1ddfd34..de0cfe6a26 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/prowler/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/prowler/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "prowler"; - version = "3.16.11"; + version = "4.4.1"; pyproject = true; src = fetchFromGitHub { owner = "prowler-cloud"; repo = "prowler"; rev = "refs/tags/${version}"; - hash = "sha256-cBqPD5lOhaMXh4OKo7+mERU3YjRU1NiRzSbnKFR6+1I="; + hash = "sha256-9pqp9DJKvzOzApWuSXNn7uQ4bxdPmQ9QtOEAlbrT9Eg="; }; pythonRelaxDeps = true; @@ -28,6 +28,7 @@ python3.pkgs.buildPythonApplication rec { azure-mgmt-applicationinsights azure-mgmt-authorization azure-mgmt-compute + azure-mgmt-containerregistry azure-mgmt-containerservice azure-mgmt-cosmosdb azure-mgmt-keyvault @@ -44,13 +45,19 @@ python3.pkgs.buildPythonApplication rec { boto3 botocore colorama + dash + dash-bootstrap-components detect-secrets google-api-python-client google-auth-httplib2 jsonschema + kubernetes msgraph-sdk msrestazure - pydantic_1 + numpy + pandas + py-ocsf-models + pydantic pytz schema shodan diff --git a/third_party/nixpkgs/pkgs/by-name/pv/pv/package.nix b/third_party/nixpkgs/pkgs/by-name/pv/pv/package.nix index 2b52759c3b..f6b600f3ec 100644 --- a/third_party/nixpkgs/pkgs/by-name/pv/pv/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pv/pv/package.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "pv"; - version = "1.8.12"; + version = "1.8.14"; src = fetchurl { url = "https://www.ivarch.com/programs/sources/pv-${finalAttrs.version}.tar.gz"; - hash = "sha256-lof53u2wnQ3ADYDDBpHwyRKCwNXY+n1qKghch0LCzXw="; + hash = "sha256-DMGIEaSAmlh9SxHUdpG7wK2DpdldLCYGr3Tqe0pnR1Y="; }; meta = { diff --git a/third_party/nixpkgs/pkgs/by-name/pw/pw3270/package.nix b/third_party/nixpkgs/pkgs/by-name/pw/pw3270/package.nix index b46d30355a..d344b4e2dd 100644 --- a/third_party/nixpkgs/pkgs/by-name/pw/pw3270/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pw/pw3270/package.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { rm -rf $out/share/gsettings-schemas ''; - enableParallelBuilds = true; + enableParallelBuilding = true; meta = with lib; { description = "3270 Emulator for gtk"; diff --git a/third_party/nixpkgs/pkgs/by-name/py/pyflyby/package.nix b/third_party/nixpkgs/pkgs/by-name/py/pyflyby/package.nix new file mode 100644 index 0000000000..271402c1a4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/py/pyflyby/package.nix @@ -0,0 +1,43 @@ +{ + lib, + python3, + fetchFromGitHub, +}: +let + version = "1.9.6"; +in +python3.pkgs.buildPythonApplication rec { + inherit version; + pname = "pyflyby"; + pyproject = true; + + src = fetchFromGitHub { + owner = "deshaw"; + repo = "pyflyby"; + rev = version; + hash = "sha256-QkoFr9tFtZ+ZEWlxe9csrzoYFl9/V2l4hKYfUWsXUdc="; + }; + + build-system = with python3.pkgs; [ + setuptools + wheel + ]; + + dependencies = with python3.pkgs; [ + six + toml + isort + black + ipython + ]; + + pythonImportsCheck = [ "pyflyby" ]; + + meta = { + description = "Set of productivity tools for Python"; + homepage = "https://github.com/deshaw/pyflyby"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jfvillablanca ]; + mainProgram = "py"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/py/pylyzer/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/py/pylyzer/Cargo.lock index 8ca4202e4b..9b0a4ca417 100644 --- a/third_party/nixpkgs/pkgs/by-name/py/pylyzer/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/py/pylyzer/Cargo.lock @@ -99,9 +99,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.1.27" +version = "1.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677207f6eaec43fcfd092a718c847fc38aa261d0e19b8ef6797e0ccbe789e738" +checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945" dependencies = [ "shlex", ] @@ -145,23 +145,25 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "els" -version = "0.1.58-nightly.4" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82ca64c7e007a801f3c026026d4f7c65193ca2ccfab19018cf47b0946ed1de86" +checksum = "ab76dea4883a3e75fab38a6cd6c761346fec5909850c557fcbd683f7bd30b54e" dependencies = [ "erg_common", "erg_compiler", + "libc", "lsp-types", "molc", "serde", "serde_json", + "windows", ] [[package]] name = "erg_common" -version = "0.6.46-nightly.4" +version = "0.6.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c91d7308be743f27d0bcb6778d85d76bfad86fc54ae53ae5fab06b37bd54fd74" +checksum = "9cef7281a06474cd12e7eb653d164777023440b13a28c8834124770c4b8f65fa" dependencies = [ "backtrace-on-stack-overflow", "erg_proc_macros", @@ -172,9 +174,9 @@ dependencies = [ [[package]] name = "erg_compiler" -version = "0.6.46-nightly.4" +version = "0.6.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ca9d5eb0b29b60d7ac8d7d639add33a4b331b35e4739775f0bd0f1e94be764" +checksum = "0bf1c1e83a364fafbcec194a27affd02bf4538740c34c1617c45d960d4a3e33c" dependencies = [ "erg_common", "erg_parser", @@ -182,9 +184,9 @@ dependencies = [ [[package]] name = "erg_parser" -version = "0.6.46-nightly.4" +version = "0.6.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0d0f70495239bd721afb1be7ba33c9146cbd7d4d578bd65fcb86e52561224e0" +checksum = "9c65037a0c9b890d8f810f7a827b897fba6ae950b34258b1450c9ab1e310813c" dependencies = [ "erg_common", "erg_proc_macros", @@ -193,9 +195,9 @@ dependencies = [ [[package]] name = "erg_proc_macros" -version = "0.6.46-nightly.4" +version = "0.6.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61073a06b84b2e9c36b3645494102780936b560ba80f8c466cf2cdc374740f3e" +checksum = "29d7235082b39bf55cdec52da8c010c2d2d9ff7d41dde051158b7815f560f321" dependencies = [ "quote", "syn 1.0.109", @@ -552,16 +554,16 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" dependencies = [ "unicode-ident", ] [[package]] name = "py2erg" -version = "0.0.65" +version = "0.0.66" dependencies = [ "erg_common", "erg_compiler", @@ -571,7 +573,7 @@ dependencies = [ [[package]] name = "pylyzer" -version = "0.0.65" +version = "0.0.66" dependencies = [ "els", "erg_common", @@ -581,7 +583,7 @@ dependencies = [ [[package]] name = "pylyzer_core" -version = "0.0.65" +version = "0.0.66" dependencies = [ "erg_common", "erg_compiler", @@ -592,7 +594,7 @@ dependencies = [ [[package]] name = "pylyzer_wasm" -version = "0.0.65" +version = "0.0.66" dependencies = [ "erg_common", "erg_compiler", @@ -1005,9 +1007,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", "once_cell", @@ -1016,9 +1018,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", @@ -1031,9 +1033,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1041,9 +1043,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", @@ -1054,9 +1056,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "windows" diff --git a/third_party/nixpkgs/pkgs/by-name/py/pylyzer/package.nix b/third_party/nixpkgs/pkgs/by-name/py/pylyzer/package.nix index 585907407a..4e3b59a59c 100644 --- a/third_party/nixpkgs/pkgs/by-name/py/pylyzer/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/py/pylyzer/package.nix @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage rec { pname = "pylyzer"; - version = "0.0.65"; + version = "0.0.66"; src = fetchFromGitHub { owner = "mtshiba"; repo = "pylyzer"; rev = "refs/tags/v${version}"; - hash = "sha256-pHFsrC5SefXEnxgIk/OkRdOOAuYZLhZYVYu41MYtxJs="; + hash = "sha256-vDeQ7IuECykBtcu4qvKKhcr/3vCXjN1JyL3/D4kwnng="; }; cargoLock = { diff --git a/third_party/nixpkgs/pkgs/by-name/qd/qdirstat/package.nix b/third_party/nixpkgs/pkgs/by-name/qd/qdirstat/package.nix index e933cafc2e..04e6ae824f 100644 --- a/third_party/nixpkgs/pkgs/by-name/qd/qdirstat/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/qd/qdirstat/package.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + stdenv, libsForQt5, coreutils, xdg-utils, @@ -9,7 +10,7 @@ perlPackages, }: -libsForQt5.mkDerivation rec { +stdenv.mkDerivation rec { pname = "qdirstat"; version = "1.9"; @@ -20,7 +21,12 @@ libsForQt5.mkDerivation rec { hash = "sha256-pwdmltHDNwUMx1FNOoiXl5Pna0zlKqahmicBCN6UVSU="; }; - nativeBuildInputs = [ makeWrapper ] ++ (with libsForQt5; [ qmake ]); + nativeBuildInputs = + [ makeWrapper ] + ++ (with libsForQt5; [ + qmake + wrapQtAppsHook + ]); buildInputs = [ perlPackages.perl ]; diff --git a/third_party/nixpkgs/pkgs/by-name/qd/qdiskinfo/package.nix b/third_party/nixpkgs/pkgs/by-name/qd/qdiskinfo/package.nix index 736a6e09c1..6a3c238692 100644 --- a/third_party/nixpkgs/pkgs/by-name/qd/qdiskinfo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/qd/qdiskinfo/package.nix @@ -3,10 +3,36 @@ stdenv, smartmontools, fetchFromGitHub, + fetchzip, cmake, qt6, + qdiskinfo, + themeBundle ? null, }: +let + isThemed = themeBundle != null && themeBundle != { }; + themeBundle' = + if isThemed then + { + rightCharacter = false; + } + // themeBundle + else + { rightCharacter = false; }; +in + +# check theme bundle +assert + isThemed + -> ( + themeBundle' ? src + && themeBundle' ? paths.bgDark + && themeBundle' ? paths.bgLight + && themeBundle' ? paths.status + && themeBundle' ? rightCharacter + ); + stdenv.mkDerivation (finalAttrs: { pname = "qdiskinfo"; version = "0.3"; @@ -31,15 +57,54 @@ stdenv.mkDerivation (finalAttrs: { cmakeBuildType = "MinSizeRel"; - cmakeFlags = [ - "-DQT_VERSION_MAJOR=6" - ]; + cmakeFlags = + [ + "-DQT_VERSION_MAJOR=6" + ] + ++ lib.optionals isThemed [ "-DINCLUDE_OPTIONAL_RESOURCES=ON" ] + ++ ( + if themeBundle'.rightCharacter then + [ "-DCHARACTER_IS_RIGHT=ON" ] + else + [ "-DCHARACTER_IS_RIGHT=OFF" ] + ); + postUnpack = '' + cp -r $sourceRoot $TMPDIR/src + sourceRoot=$TMPDIR/src + ''; + patchPhase = lib.optionalString isThemed '' + export SRCPATH=${themeBundle'.src}/CdiResource/themes/ + export DESTPATH=$sourceRoot/dist/theme/ + mkdir -p $DESTPATH + if [ -n "${themeBundle'.paths.bgDark}" ]; then + cp $SRCPATH/${themeBundle'.paths.bgDark} $DESTPATH/bg_dark.png + fi + if [ -n "${themeBundle'.paths.bgLight}" ]; then + cp $SRCPATH/${themeBundle'.paths.bgLight} $DESTPATH/bg_light.png + fi + cp $SRCPATH/${themeBundle'.paths.status}/SDdiskStatusBad-300.png $DESTPATH/bad.png + cp $SRCPATH/${themeBundle'.paths.status}/SDdiskStatusCaution-300.png $DESTPATH/caution.png + cp $SRCPATH/${themeBundle'.paths.status}/SDdiskStatusGood-300.png $DESTPATH/good.png + cp $SRCPATH/${themeBundle'.paths.status}/SDdiskStatusUnknown-300.png $DESTPATH/unknown.png + ''; postInstall = '' wrapProgram $out/bin/QDiskInfo \ --suffix PATH : ${smartmontools}/bin ''; + passthru = + let + themeSources = import ./sources.nix { inherit fetchzip; }; + in + rec { + themeBundles = import ./themes.nix { inherit themeSources; }; + tests = lib.flip lib.mapAttrs themeBundles ( + themeName: themeBundle: + (qdiskinfo.override { inherit themeBundle; }).overrideAttrs { pname = "qdiskinfo-${themeName}"; } + ); + }; + meta = { description = "CrystalDiskInfo alternative for Linux"; homepage = "https://github.com/edisionnano/QDiskInfo"; diff --git a/third_party/nixpkgs/pkgs/by-name/qd/qdiskinfo/sources.nix b/third_party/nixpkgs/pkgs/by-name/qd/qdiskinfo/sources.nix new file mode 100644 index 0000000000..aa28afcf75 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/qd/qdiskinfo/sources.nix @@ -0,0 +1,18 @@ +{ fetchzip }: +{ + aoi = fetchzip { + url = "https://pilotfiber.dl.sourceforge.net/project/crystaldiskinfo/9.3.2/CrystalDiskInfo9_3_2Aoi.zip?viasf=1#cdi.zip"; + hash = "sha256-yldOX/aQYK1Fsd+BpD0SdcyfnHxtwB5rmZHU1nY7Ov8="; + stripRoot = false; + }; + kureikei = fetchzip { + url = "https://pilotfiber.dl.sourceforge.net/project/crystaldiskinfo/9.3.2/CrystalDiskInfo9_3_2KureiKei.zip?viasf=1#cdi.zip"; + hash = "sha256-mzV3wHKczsh5NOsUxA3kGYSBZyVNJZUWkZdjiJA8+Po="; + stripRoot = false; + }; + shizuku = fetchzip { + url = "https://pilotfiber.dl.sourceforge.net/project/crystaldiskinfo/9.3.2/CrystalDiskInfo9_3_2Shizuku.zip?viasf=1#cdi.zip"; + hash = "sha256-4dVeOHXWUVjfSssJKpcSBQ7OTMaYmgF15M4ROD3SBDA="; + stripRoot = false; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/qd/qdiskinfo/themes.nix b/third_party/nixpkgs/pkgs/by-name/qd/qdiskinfo/themes.nix new file mode 100644 index 0000000000..f02f4ce288 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/qd/qdiskinfo/themes.nix @@ -0,0 +1,390 @@ +{ themeSources }: + +{ + aoi = { + src = themeSources.aoi; + paths = { + bgDark = "AoiNight/AoiBackground-300.png"; + bgLight = "Aoi/AoiBackground-300.png"; + status = "Aoi"; + }; + rightCharacter = true; + }; + kureikei = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKei/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiBikini = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKeiBikini/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiHomebuiltComputer = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKeiHomebuiltComputer~Kronotokage/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiPresent = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKeiPresent/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiRecoding = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKeiRecoding/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiRecodingKimiya = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKeiRecoding~KIMIYA/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiSummerKimono = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKeiSummerKimono/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiUniform = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKeiUniform/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiAsyuihira = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKei~AsYuihira/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiHasumikaoru = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKei~hasumikaoru/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiKohakumuro = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKei~kohakumuro/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiKosake = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKei~kosake/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiKunimi = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKei~kunimi/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiMaru = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKei~maru/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiMugya = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKei~mugya/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiNanatunatu = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKei~nanatunatu/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiNekopan = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKei~nekopan/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiNyamco = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKei~nyamco/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiPoyoyonchihiro = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKei~poyoyonchihiro/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiShitimiNanami = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKei~ShitimiNanami/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiTakiOuno = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKei~TakiOuno/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiTori = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKei~tori/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiYoite = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKei~yoite/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + shizuku = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "Shizuku/ShizukuBackground-300.png"; + status = "Shizuku"; + }; + }; + shizuku5thAnniversary = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "Shizuku5thAnniversary/ShizukuBackground-300.png"; + status = "Shizuku5thAnniversary"; + }; + }; + shizuku7thAnniversary = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "Shizuku7thAnniversary/ShizukuBackground-300.png"; + status = "Shizuku"; + }; + }; + shizukuDate = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuDate/ShizukuBackground-300.png"; + status = "ShizukuDate"; + }; + }; + shizukuHanabi = { + src = themeSources.shizuku; + paths = { + bgDark = "ShizukuHanabi/ShizukuBackground-300.png"; + bgLight = ""; + status = "ShizukuHanabi"; + }; + }; + shizukuHaregi = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuHaregi/ShizukuBackground-300.png"; + status = "ShizukuHaregi"; + }; + }; + shizukuHeianKomachi = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuHeianKomachi/ShizukuBackground-300.png"; + status = "ShizukuHeianKomachi"; + }; + }; + shizukuHotaru = { + src = themeSources.shizuku; + paths = { + bgDark = "ShizukuHotaru/ShizukuBackground-300.png"; + bgLight = ""; + status = "Shizuku"; + }; + }; + shizukuIdol = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuIdol/ShizukuBackground-300.png"; + status = "ShizukuIdol"; + }; + }; + shizukuKotatsu = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuKotatsu/ShizukuBackground-300.png"; + status = "ShizukuKotatsu"; + }; + }; + shizukuKotatsuNight = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuKotatsuNight/ShizukuBackground-300.png"; + status = "ShizukuKotatsu"; + }; + }; + shizukuLiteratureGirl = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuLiteratureGirl/ShizukuBackground-300.png"; + status = "ShizukuLiteratureGirl"; + }; + }; + shizukuLiteratureGirlWithGlasses = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuLiteratureGirlwithGlasses/ShizukuBackground-300.png"; + status = "ShizukuLiteratureGirlwithGlasses"; + }; + }; + shizukuMaidCool = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuMaidCool/ShizukuBackground-300.png"; + status = "ShizukuMaidCool"; + }; + }; + shizukuMaidCute = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuMaidCute/ShizukuBackground-300.png"; + status = "ShizukuMaidCute"; + }; + }; + shizukuMeijiMizugi = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuMeijiMizugi/ShizukuBackground-300.png"; + status = "ShizukuMeijiMizugi"; + }; + }; + shizukuMermaid = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuMermaid/ShizukuBackground-300.png"; + status = "ShizukuMermaid"; + }; + }; + shizukuMiko = { + src = themeSources.shizuku; + paths = { + bgDark = "ShizukuMikoNight/ShizukuBackground-300.png"; + bgLight = "ShizukuMiko/ShizukuBackground-300.png"; + status = "ShizukuMiko"; + }; + }; + shizukuOffice = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuOffice/ShizukuBackground-300.png"; + status = "Shizuku"; + }; + }; + shizukuSakura = { + src = themeSources.shizuku; + paths = { + bgDark = "ShizukuSakuraNight/ShizukuBackground-300.png"; + bgLight = "ShizukuSakura/ShizukuBackground-300.png"; + status = "ShizukuSakura"; + }; + }; + shizukuTaishoRoman = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuTaishoRoman/ShizukuBackground-300.png"; + status = "ShizukuTaishoRoman"; + }; + }; + shizukuTeaBreak = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuTeaBreak/ShizukuBackground-300.png"; + status = "Shizuku"; + }; + rightCharacter = true; + }; + shizukuWebRadio = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuWebRadio/ShizukuBackground-300.png"; + status = "ShizukuWebRadio"; + }; + }; + shizukuWinterLamp = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuWinterLamp/ShizukuBackground-300.png"; + status = "ShizukuWinterLamp"; + }; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ra/radicale/package.nix b/third_party/nixpkgs/pkgs/by-name/ra/radicale/package.nix index 1946ffab2f..9cdcd7ab41 100644 --- a/third_party/nixpkgs/pkgs/by-name/ra/radicale/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ra/radicale/package.nix @@ -6,20 +6,16 @@ python3.pkgs.buildPythonApplication rec { pname = "radicale"; - version = "3.2.3"; + version = "3.3.0"; pyproject = true; src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; rev = "refs/tags/v${version}"; - hash = "sha256-1IlnXVetQQuKBt6+QVKNeMM6qBQAiUhqc+4x3xOnSdE="; + hash = "sha256-S9/bPgItbr6rRr4WX+hmyU1RvKn5gz9FdZjYlr0hnd0="; }; - postPatch = '' - sed -i '/addopts/d' setup.cfg - ''; - build-system = with python3.pkgs; [ setuptools ]; @@ -36,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { __darwinAllowLocalNetworking = true; nativeCheckInputs = with python3.pkgs; [ - pytest7CheckHook + pytestCheckHook waitress ]; 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 6f0a98d159..9ed933cf5e 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.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "DanielChappuis"; repo = "reactphysics3d"; rev = "v${finalAttrs.version}"; - hash = "sha256-j57wzqAmBV/pK7PPUDXV6ciOCQVs2gX+BaGHk4kLuUI="; + hash = "sha256-ZwV3mh/onlHPHeT6tky2CpawLZxEikY6hq4FVn6i5hI="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/by-name/re/redocly/package.nix b/third_party/nixpkgs/pkgs/by-name/re/redocly/package.nix index 198d502702..fe53529c18 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/redocly/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/re/redocly/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "redocly"; - version = "1.18.1"; + version = "1.25.5"; src = fetchFromGitHub { owner = "Redocly"; repo = "redocly-cli"; rev = "@redocly/cli@${version}"; - hash = "sha256-Y09tGm3Sje8gd+6tUyBTCt7HjL2CQ/vo/ExLDnywvcQ="; + hash = "sha256-pVSmrORa6KcAwllYepwra8QpnlfFoB9+noevLSmoWzY="; }; - npmDepsHash = "sha256-WzMFKMW/YyAH3ZoOeIcXIum15cJmPGp96xSYb9QCaWI="; + npmDepsHash = "sha256-nFRKC3xM+vq9SDeIelUqE/ZSSCSke0G0Qm629/s6WO8="; npmBuildScript = "prepare"; 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 dcc5606ea4..489493862d 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-09-27"; + version = "0-unstable-2024-10-06"; src = fetchFromGitHub { owner = "roddhjav"; repo = "apparmor.d"; - rev = "a8c18f9b9418ac42922eee1e31b1e3c9f791c1dc"; - hash = "sha256-LUHU6Buh+91b99pF7d8jqmAoYD1EmkKzsAOxiP7w3So="; + rev = "03b777340d4b17957c7533d20bc3f8fca5a6dff8"; + hash = "sha256-qytv7haQj+xuRm5ks4rnyY0eu7i3Kv4X4gAsFLDvLSk="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/by-name/ru/ruff-lsp/package.nix b/third_party/nixpkgs/pkgs/by-name/ru/ruff-lsp/package.nix index 344dce7755..b2a3a9285a 100644 --- a/third_party/nixpkgs/pkgs/by-name/ru/ruff-lsp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ru/ruff-lsp/package.nix @@ -1,28 +1,28 @@ { lib, - stdenv, - python3, + python3Packages, fetchFromGitHub, # nativeCheckInputs ruff, + # tests + versionCheckHook, + # passthru nix-update-script, - testers, - ruff-lsp, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "ruff-lsp"; - version = "0.0.57"; + version = "0.0.58"; pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff-lsp"; rev = "refs/tags/v${version}"; - hash = "sha256-w9NNdsDD+YLrCw8DHDhVx62MdwLhcN8QSmb/2rqlb5g="; + hash = "sha256-TB4OcKkaUGYAmiGNJRnfRmiXTyTQL4sFoBrzxT6DWec="; }; postPatch = '' @@ -30,24 +30,23 @@ python3.pkgs.buildPythonApplication rec { sed -i '/"ruff>=/d' pyproject.toml ''; - build-system = with python3.pkgs; [ hatchling ]; + build-system = with python3Packages; [ hatchling ]; - dependencies = with python3.pkgs; [ + dependencies = with python3Packages; [ packaging pygls lsprotocol typing-extensions ]; - # fails in linux sandbox - doCheck = stdenv.hostPlatform.isDarwin; - - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook pytest-asyncio python-lsp-jsonrpc ruff + versionCheckHook ]; + versionCheckProgramArg = [ "--version" ]; makeWrapperArgs = [ # prefer ruff from user's PATH, that's usually desired behavior @@ -61,7 +60,6 @@ python3.pkgs.buildPythonApplication rec { passthru = { updateScript = nix-update-script { }; - tests.version = testers.testVersion { package = ruff-lsp; }; }; meta = { diff --git a/third_party/nixpkgs/pkgs/by-name/ru/ruff/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ru/ruff/Cargo.lock index dadfc5b6b4..9fd3cb9b62 100644 --- a/third_party/nixpkgs/pkgs/by-name/ru/ruff/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/ru/ruff/Cargo.lock @@ -36,12 +36,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "allocator-api2" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - [[package]] name = "android-tzdata" version = "0.1.1" @@ -353,9 +347,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.18" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3" +checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" dependencies = [ "clap_builder", "clap_derive", @@ -363,9 +357,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.18" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b" +checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" dependencies = [ "anstream", "anstyle", @@ -714,7 +708,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core", @@ -728,7 +722,7 @@ checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" dependencies = [ "cfg-if", "crossbeam-utils", - "hashbrown", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core", @@ -1026,16 +1020,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", - "allocator-api2", ] +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" + [[package]] name = "hashlink" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" dependencies = [ - "hashbrown", + "hashbrown 0.14.5", ] [[package]] @@ -1127,7 +1126,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc9da1a252bd44cd341657203722352efc9bc0c847d06ea6d2dc1cd1135e0a01" dependencies = [ "ahash", - "hashbrown", + "hashbrown 0.14.5", ] [[package]] @@ -1147,7 +1146,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.14.5", "serde", ] @@ -1312,9 +1311,9 @@ checksum = "8b23360e99b8717f20aaa4598f5a6541efbe30630039fbc7706cf954a87947ae" [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] @@ -1353,9 +1352,9 @@ checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libcst" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10293a04a48e8b0cb2cc825a93b83090e527bffd3c897a0255ad7bc96079e920" +checksum = "1586dd7a857d8a61a577afde1a24cc9573ff549eff092d5ce968b1ec93cc61b6" dependencies = [ "chic", "libcst_derive", @@ -1626,9 +1625,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "oorandom" @@ -1691,9 +1690,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "path-absolutize" @@ -1721,15 +1720,15 @@ checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42" [[package]] name = "pathdiff" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" +checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361" [[package]] name = "peg" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "400bcab7d219c38abf8bd7cc2054eb9bbbd4312d66f6a5557d572a203f646f61" +checksum = "295283b02df346d1ef66052a757869b2876ac29a6bb0ac3f5f7cd44aebe40e8f" dependencies = [ "peg-macros", "peg-runtime", @@ -1737,9 +1736,9 @@ dependencies = [ [[package]] name = "peg-macros" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46e61cce859b76d19090f62da50a9fe92bab7c2a5f09e183763559a2ac392c90" +checksum = "bdad6a1d9cf116a059582ce415d5f5566aabcd4008646779dab7fdc2a9a9d426" dependencies = [ "peg-runtime", "proc-macro2", @@ -1748,9 +1747,9 @@ dependencies = [ [[package]] name = "peg-runtime" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36bae92c60fa2398ce4678b98b2c4b5a7c61099961ca1fa305aec04a9ad28922" +checksum = "e3aeb8f54c078314c2065ee649a7241f46b9d8e418e1a9581ba0546657d7aa3a" [[package]] name = "pep440_rs" @@ -1944,9 +1943,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" dependencies = [ "unicode-ident", ] @@ -2081,10 +2080,14 @@ dependencies = [ "camino", "compact_str", "countme", - "hashbrown", + "hashbrown 0.15.0", "insta", + "itertools 0.13.0", + "memchr", "ordermap", + "red_knot_test", "red_knot_vendored", + "rstest", "ruff_db", "ruff_index", "ruff_python_ast", @@ -2127,6 +2130,26 @@ dependencies = [ "tracing-subscriber", ] +[[package]] +name = "red_knot_test" +version = "0.0.0" +dependencies = [ + "anyhow", + "colored", + "once_cell", + "red_knot_python_semantic", + "red_knot_vendored", + "regex", + "ruff_db", + "ruff_index", + "ruff_python_trivia", + "ruff_source_file", + "ruff_text_size", + "rustc-hash 2.0.0", + "salsa", + "smallvec", +] + [[package]] name = "red_knot_vendored" version = "0.0.0" @@ -2247,6 +2270,12 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" +[[package]] +name = "relative-path" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" + [[package]] name = "ring" version = "0.17.8" @@ -2262,9 +2291,36 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "rstest" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b423f0e62bdd61734b67cd21ff50871dfaeb9cc74f869dcd6af974fbcb19936" +dependencies = [ + "rstest_macros", + "rustc_version", +] + +[[package]] +name = "rstest_macros" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5e1711e7d14f74b12a58411c542185ef7fb7f2e7f8ee6e2940a883628522b42" +dependencies = [ + "cfg-if", + "glob", + "proc-macro2", + "quote", + "regex", + "relative-path", + "rustc_version", + "syn", + "unicode-ident", +] + [[package]] name = "ruff" -version = "0.6.9" +version = "0.7.0" dependencies = [ "anyhow", "argfile", @@ -2412,7 +2468,6 @@ dependencies = [ "ruff_python_codegen", "ruff_python_formatter", "ruff_python_parser", - "ruff_python_stdlib", "ruff_python_trivia", "ruff_workspace", "schemars", @@ -2484,7 +2539,7 @@ dependencies = [ [[package]] name = "ruff_linter" -version = "0.6.9" +version = "0.7.0" dependencies = [ "aho-corasick", "annotate-snippets 0.9.2", @@ -2804,7 +2859,7 @@ dependencies = [ [[package]] name = "ruff_wasm" -version = "0.6.9" +version = "0.7.0" dependencies = [ "console_error_panic_hook", "console_log", @@ -2885,6 +2940,15 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] + [[package]] name = "rustix" version = "0.38.37" @@ -2945,7 +3009,7 @@ checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "salsa" version = "0.18.0" -source = "git+https://github.com/salsa-rs/salsa.git?rev=4a7c955255e707e64e43f3ce5eabb771ae067768#4a7c955255e707e64e43f3ce5eabb771ae067768" +source = "git+https://github.com/salsa-rs/salsa.git?rev=b14be5c0392f4c55eca60b92e457a35549372382#b14be5c0392f4c55eca60b92e457a35549372382" dependencies = [ "append-only-vec", "arc-swap", @@ -2965,12 +3029,12 @@ dependencies = [ [[package]] name = "salsa-macro-rules" version = "0.1.0" -source = "git+https://github.com/salsa-rs/salsa.git?rev=4a7c955255e707e64e43f3ce5eabb771ae067768#4a7c955255e707e64e43f3ce5eabb771ae067768" +source = "git+https://github.com/salsa-rs/salsa.git?rev=b14be5c0392f4c55eca60b92e457a35549372382#b14be5c0392f4c55eca60b92e457a35549372382" [[package]] name = "salsa-macros" version = "0.18.0" -source = "git+https://github.com/salsa-rs/salsa.git?rev=4a7c955255e707e64e43f3ce5eabb771ae067768#4a7c955255e707e64e43f3ce5eabb771ae067768" +source = "git+https://github.com/salsa-rs/salsa.git?rev=b14be5c0392f4c55eca60b92e457a35549372382#b14be5c0392f4c55eca60b92e457a35549372382" dependencies = [ "heck", "proc-macro2", @@ -3030,6 +3094,12 @@ version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" + [[package]] name = "serde" version = "1.0.210" @@ -3115,9 +3185,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.9.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" +checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817" dependencies = [ "serde", "serde_derive", @@ -3126,9 +3196,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.9.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" +checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d" dependencies = [ "darling", "proc-macro2", @@ -3281,12 +3351,12 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" +checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef" dependencies = [ "rustix", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -3788,9 +3858,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", "once_cell", @@ -3799,9 +3869,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", @@ -3814,9 +3884,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.43" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ "cfg-if", "js-sys", @@ -3826,9 +3896,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3836,9 +3906,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", @@ -3849,15 +3919,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "wasm-bindgen-test" -version = "0.3.43" +version = "0.3.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68497a05fb21143a08a7d24fc81763384a3072ee43c44e86aad1744d6adef9d9" +checksum = "d381749acb0943d357dcbd8f0b100640679883fcdeeef04def49daf8d33a5426" dependencies = [ "console_error_panic_hook", "js-sys", @@ -3870,9 +3940,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.43" +version = "0.3.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8220be1fa9e4c889b30fd207d4906657e7e90b12e0e6b0c8b8d8709f5de021" +checksum = "c97b2ef2c8d627381e51c071c2ab328eac606d3f69dd82bcbca20a9e389d95f0" dependencies = [ "proc-macro2", "quote", diff --git a/third_party/nixpkgs/pkgs/by-name/ru/ruff/package.nix b/third_party/nixpkgs/pkgs/by-name/ru/ruff/package.nix index c760ebd8f3..4e31b05110 100644 --- a/third_party/nixpkgs/pkgs/by-name/ru/ruff/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ru/ruff/package.nix @@ -13,20 +13,20 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.6.9"; + version = "0.7.0"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; rev = "refs/tags/${version}"; - hash = "sha256-O8iRCVxHrchBSf9kLdkdT0+oMi+5fLCAF9CMEsPrHqw="; + hash = "sha256-//ayB5ayYM5FqiSXDDns2tIL+PJ0Osvkp8+MEEL0L+8="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "lsp-types-0.95.1" = "sha256-8Oh299exWXVi6A39pALOISNfp8XBya8z+KT/Z7suRxQ="; - "salsa-0.18.0" = "sha256-zHXLNK6SCiJ3MmT0PMIauA1eolyJ4wfVWxN6wcvmhts="; + "salsa-0.18.0" = "sha256-vuLgeaqIL8U+5PUHJaGdovHFapAMGGQ9nPAMJJnxz/o="; }; }; diff --git a/third_party/nixpkgs/pkgs/by-name/sa/saunafs/package.nix b/third_party/nixpkgs/pkgs/by-name/sa/saunafs/package.nix index 587df043f0..054a26f9e3 100644 --- a/third_party/nixpkgs/pkgs/by-name/sa/saunafs/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sa/saunafs/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + nixosTests, fetchFromGitHub, cmake, asciidoc, @@ -60,8 +61,12 @@ stdenv.mkDerivation (finalAttrs: { postInstall = lib.optionalString (!stdenv.hostPlatform.isStatic) '' rm $out/lib/*.a + + ln -s $out/bin/sfsmount $out/bin/mount.saunafs ''; + passthru.tests = nixosTests.saunafs; + meta = with lib; { description = "Distributed POSIX file system"; homepage = "https://saunafs.com"; diff --git a/third_party/nixpkgs/pkgs/by-name/sc/schemamap/package.nix b/third_party/nixpkgs/pkgs/by-name/sc/schemamap/package.nix index 081cee9a23..f8f0e962b0 100644 --- a/third_party/nixpkgs/pkgs/by-name/sc/schemamap/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sc/schemamap/package.nix @@ -9,7 +9,7 @@ }: let - version = "0.3.0"; + version = "0.4.0"; in rustPlatform.buildRustPackage rec { pname = "schemamap"; @@ -19,12 +19,12 @@ rustPlatform.buildRustPackage rec { owner = "schemamap"; repo = "schemamap"; rev = "v${version}"; - hash = "sha256-49i2zyOy/yngSgvKd66RsOhF6OlYfgDnEtPEbmhEcIo="; + hash = "sha256-L5p7Kh5sQAlDHrXgWUuiYZb3sV0Mp2ODEOMQsaB0iMs="; }; sourceRoot = "${src.name}/rust"; - cargoHash = "sha256-ILgvS96D6yF4Teaa5on6jHZlVoxRLSk8A523PzH1b5Y="; + cargoHash = "sha256-rwAujQC/zV5nH5YQdjPRyf1L7SYSbdS3FJ5SAVMlhRE="; buildInputs = [ openssl ] diff --git a/third_party/nixpkgs/pkgs/by-name/sc/screego/package.nix b/third_party/nixpkgs/pkgs/by-name/sc/screego/package.nix index 4b1b21f382..ad3335f6b8 100644 --- a/third_party/nixpkgs/pkgs/by-name/sc/screego/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sc/screego/package.nix @@ -10,13 +10,13 @@ }: let - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "screego"; repo = "server"; rev = "v${version}"; - hash = "sha256-PTGIcv+jgX8t37otBypuZG6DaGIeo92+w6YlRynIkZE="; + hash = "sha256-P8O3E7mNAqUid42XFaJBQm3ApxykYLCuHXDOFHrG9Fs="; }; ui = stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/by-name/sd/SDL_image/package.nix b/third_party/nixpkgs/pkgs/by-name/sd/SDL_image/package.nix index fdd0b5f373..61943b2896 100644 --- a/third_party/nixpkgs/pkgs/by-name/sd/SDL_image/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sd/SDL_image/package.nix @@ -59,6 +59,10 @@ stdenv.mkDerivation (finalAttrs: { libwebp ]; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + }; + outputs = [ "out" "dev" diff --git a/third_party/nixpkgs/pkgs/by-name/se/seabios/package.nix b/third_party/nixpkgs/pkgs/by-name/se/seabios/package.nix index 713f587021..ac647e93b1 100644 --- a/third_party/nixpkgs/pkgs/by-name/se/seabios/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/se/seabios/package.nix @@ -1,11 +1,37 @@ -{ lib -, stdenv -, fetchgit -, acpica-tools -, python3 -, writeText +{ + lib, + acpica-tools, + fetchgit, + python3, + stdenv, + writeText, + # Configurable options + ___build-type ? "csm", }: +assert lib.elem (___build-type) [ + "coreboot" + # SeaBIOS with CSM (Compatible Support Module) support; learn more at + # https://www.electronicshub.org/what-is-csm-bios/ + "csm" + "qemu" +]; +let + biosfile = + { + "coreboot" = "bios.bin.elf"; + "csm" = "Csm16.bin"; + "qemu" = "bios.bin"; + } + .${___build-type}; + configuration-string = + { + "coreboot" = "CONFIG_COREBOOT"; + "csm" = "CONFIG_CSM"; + "qemu" = "CONFIG_QEMU"; + } + .${___build-type}; +in stdenv.mkDerivation (finalAttrs: { pname = "seabios"; version = "1.16.3"; @@ -16,7 +42,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-hWemj83cxdY8p+Jhkh5GcPvI0Sy5aKYZJCsKDjHTUUk="; }; - outputs = [ "out" "doc" ]; + outputs = [ + "out" + "doc" + ]; nativeBuildInputs = [ python3 ]; @@ -29,31 +58,42 @@ stdenv.mkDerivation (finalAttrs: { "EXTRAVERSION=\"-nixpkgs\"" ]; - hardeningDisable = [ "pic" "stackprotector" "fortify" ]; + hardeningDisable = [ + "fortify" + "pic" + "stackprotector" + ]; - postConfigure = let - config = writeText "config.txt" (lib.generators.toKeyValue { } { - # SeaBIOS with CSM (Compatible Support Module) support; learn more at - # https://www.electronicshub.org/what-is-csm-bios/ - "CONFIG_CSM" = "y"; - "CONFIG_PERMIT_UNALIGNED_PCIROM" = "y"; - "CONFIG_QEMU_HARDWARE" = "y"; - }); - in '' - cp ${config} .config - make olddefconfig - ''; + postConfigure = + let + config = writeText "config.txt" ( + lib.generators.toKeyValue { } { + "${configuration-string}" = "y"; + "CONFIG_PERMIT_UNALIGNED_PCIROM" = "y"; + "CONFIG_QEMU_HARDWARE" = "y"; + } + ); + in + '' + cp ${config} .config + make olddefconfig + ''; installPhase = '' runHook preInstall - mkdir -pv $doc/share/doc/seabios-${finalAttrs.version}/ - cp -v docs/* $doc/share/doc/seabios-${finalAttrs.version}/ - install -Dm644 out/Csm16.bin -t $out/share/seabios/ + mkdir -pv ''${!outputDoc}/share/doc/seabios-${finalAttrs.version}/ + cp -v docs/* ''${!outputDoc}/share/doc/seabios-${finalAttrs.version}/ + install -Dm644 out/${biosfile} -t $out/share/seabios/ runHook postInstall ''; + passthru = { + build-type = ___build-type; + firmware = "${finalAttrs.finalPackage}/share/seabios/${biosfile}"; + }; + meta = { homepage = "https://www.seabios.org"; description = "Open source implementation of a 16bit x86 BIOS"; @@ -64,9 +104,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = with lib.licenses; [ lgpl3Plus ]; maintainers = with lib.maintainers; [ AndersonTorres ]; - platforms = lib.systems.inspect.patternLogicalAnd - lib.systems.inspect.patterns.isUnix - lib.systems.inspect.patterns.isx86; + platforms = lib.systems.inspect.patternLogicalAnd lib.systems.inspect.patterns.isUnix lib.systems.inspect.patterns.isx86; badPlatforms = [ lib.systems.inspect.patterns.isDarwin ]; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/se/seahorse/package.nix b/third_party/nixpkgs/pkgs/by-name/se/seahorse/package.nix index 127dcf23a7..65b3cf855a 100644 --- a/third_party/nixpkgs/pkgs/by-name/se/seahorse/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/se/seahorse/package.nix @@ -81,6 +81,14 @@ stdenv.mkDerivation rec { patchShebangs build-aux/gpg_check_version.py ''; + env = lib.optionalAttrs (stdenv.cc.isGNU && (lib.versionAtLeast (lib.getVersion stdenv.cc.cc) "14")) { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=int-conversion" + "-Wno-error=return-mismatch" + ]; + }; + preCheck = '' # Add “org.gnome.crypto.pgp” GSettings schema to path # to make it available for “gpgme-backend” test. diff --git a/third_party/nixpkgs/pkgs/by-name/se/selenium-manager/package.nix b/third_party/nixpkgs/pkgs/by-name/se/selenium-manager/package.nix index 4877804ef8..250dea11f0 100644 --- a/third_party/nixpkgs/pkgs/by-name/se/selenium-manager/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/se/selenium-manager/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "selenium-manager"; - version = "4.22.0"; + version = "4.24.0"; src = fetchFromGitHub { owner = "SeleniumHQ"; repo = "selenium"; rev = "selenium-${version}"; - hash = "sha256-qBuZgI5SSBwxbSBrAT0W/HzzV2JmPL00hPJ6s57QTeg="; + hash = "sha256-AsQr9kGv2dxkiFzptDA0D27OXZjYj7oDKz2oEQ2qW7s="; }; sourceRoot = "${src.name}/rust"; - cargoHash = "sha256-1CPUOAfBfUeZt5S8t5SM3oyrNwXKHplhHG5idVy4YrE="; + cargoHash = "sha256-mirEeOi6CfKjb8ZuqardJeYy9EGnpsw5fkUw7umhkro="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/by-name/se/setconf/package.nix b/third_party/nixpkgs/pkgs/by-name/se/setconf/package.nix new file mode 100644 index 0000000000..fb6aeefd84 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/se/setconf/package.nix @@ -0,0 +1,32 @@ +{ + lib, + fetchFromGitHub, + python3Packages, +}: + +let + self = python3Packages.buildPythonApplication { + pname = "setconf"; + version = "0.7.7"; + + src = fetchFromGitHub { + owner = "xyproto"; + repo = "setconf"; + rev = self.version; + hash = "sha256-HYZdDtDlGrT3zssDdMW3559hhC+cPy8qkmM8d9zEa1A="; + }; + + build-system = with python3Packages; [ setuptools ]; + + pyproject = true; + + meta = { + homepage = "https://github.com/xyproto/setconf"; + description = "Small utility for changing settings in configuration textfiles"; + changelog = "https://github.com/xyproto/setconf/releases/tag/${self.src.rev}"; + mainProgram = "setconf"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + }; + }; +in +self diff --git a/third_party/nixpkgs/pkgs/by-name/sf/sfcgal/package.nix b/third_party/nixpkgs/pkgs/by-name/sf/sfcgal/package.nix index 50efa9ac74..c5f107b71f 100644 --- a/third_party/nixpkgs/pkgs/by-name/sf/sfcgal/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sf/sfcgal/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sfcgal"; - version = "1.5.2"; + version = "2.0.0"; src = fetchFromGitLab { owner = "sfcgal"; repo = "SFCGAL"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-fK1PfLm6n05PhH/sT6N/hQtH5Z6+Xc1nUCS1NYpLDcY="; + hash = "sha256-cx0QJCtAPR/WkWPpH+mZvq2803eDT7b+qlI5ma+CveE="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/sh/shadps4/0001-Disable-update-checking.patch b/third_party/nixpkgs/pkgs/by-name/sh/shadps4/0001-Disable-update-checking.patch new file mode 100644 index 0000000000..874f20ef49 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sh/shadps4/0001-Disable-update-checking.patch @@ -0,0 +1,30 @@ +From 266a090882133e30df20899bbf8a5b66b28e02cd Mon Sep 17 00:00:00 2001 +From: OPNA2608 +Date: Mon, 14 Oct 2024 00:31:01 +0200 +Subject: [PATCH] Disable update checking + +Downloading an AppImage and trying to run it just won't work. +--- + src/qt_gui/check_update.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/qt_gui/check_update.cpp b/src/qt_gui/check_update.cpp +index ca6009ca..e3b14d5d 100644 +--- a/src/qt_gui/check_update.cpp ++++ b/src/qt_gui/check_update.cpp +@@ -201,6 +201,12 @@ void CheckUpdate::setupUI(const QString& downloadUrl, const QString& latestDate, + noButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred); + bottomLayout->addWidget(autoUpdateCheckBox); + ++ yesButton->setVisible(false); ++ yesButton->setEnabled(false); ++ QString updateDisabledText = QStringLiteral("[Nix] Auto-updating has been disabled in this package."); ++ QLabel* updateDisabledLabel = new QLabel(updateDisabledText, this); ++ layout->addWidget(updateDisabledLabel); ++ + QSpacerItem* spacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + bottomLayout->addItem(spacer); + +-- +2.44.1 + diff --git a/third_party/nixpkgs/pkgs/by-name/sh/shadps4/bloodborne.patch b/third_party/nixpkgs/pkgs/by-name/sh/shadps4/bloodborne.patch new file mode 100644 index 0000000000..63eb722eb4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sh/shadps4/bloodborne.patch @@ -0,0 +1,19 @@ +--- a/src/core/libraries/kernel/thread_management.cpp ++++ b/src/core/libraries/kernel/thread_management.cpp +@@ -1065,7 +1065,16 @@ ScePthread PThreadPool::Create() { + } + } + ++#ifdef _WIN64 + auto* ret = new PthreadInternal{}; ++#else ++ // TODO: Linux specific hack ++ static u8* hint_address = reinterpret_cast(0x7FFFFC000ULL); ++ auto* ret = reinterpret_cast( ++ mmap(hint_address, sizeof(PthreadInternal), PROT_READ | PROT_WRITE, ++ MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0)); ++ hint_address += Common::AlignUp(sizeof(PthreadInternal), 4_KB); ++#endif + ret->is_free = false; + ret->is_detached = false; + ret->is_almost_done = false; diff --git a/third_party/nixpkgs/pkgs/by-name/sh/shadps4/laptop-controls.patch b/third_party/nixpkgs/pkgs/by-name/sh/shadps4/laptop-controls.patch new file mode 100644 index 0000000000..e221cc71dd --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sh/shadps4/laptop-controls.patch @@ -0,0 +1,24 @@ +diff --git a/src/sdl_window.cpp b/src/sdl_window.cpp +index bd2cc39d..13438149 100644 +--- a/src/sdl_window.cpp ++++ b/src/sdl_window.cpp +@@ -127,19 +127,12 @@ void WindowSDL::onResize() { + void WindowSDL::onKeyPress(const SDL_Event* event) { + using Libraries::Pad::OrbisPadButtonDataOffset; + +-#ifdef __APPLE__ + // Use keys that are more friendly for keyboards without a keypad. + // Once there are key binding options this won't be necessary. + constexpr SDL_Keycode CrossKey = SDLK_N; + constexpr SDL_Keycode CircleKey = SDLK_B; + constexpr SDL_Keycode SquareKey = SDLK_V; + constexpr SDL_Keycode TriangleKey = SDLK_C; +-#else +- constexpr SDL_Keycode CrossKey = SDLK_KP_2; +- constexpr SDL_Keycode CircleKey = SDLK_KP_6; +- constexpr SDL_Keycode SquareKey = SDLK_KP_4; +- constexpr SDL_Keycode TriangleKey = SDLK_KP_8; +-#endif + + u32 button = 0; + Input::Axis axis = Input::Axis::AxisMax; diff --git a/third_party/nixpkgs/pkgs/by-name/sh/shadps4/package.nix b/third_party/nixpkgs/pkgs/by-name/sh/shadps4/package.nix new file mode 100644 index 0000000000..9c751d2673 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sh/shadps4/package.nix @@ -0,0 +1,140 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + alsa-lib, + boost184, + cmake, + cryptopp, + glslang, + ffmpeg, + fmt, + jack2, + libdecor, + libpulseaudio, + libunwind, + libusb1, + magic-enum, + mesa, + pkg-config, + pugixml, + qt6, + rapidjson, + renderdoc, + sndio, + toml11, + vulkan-headers, + vulkan-loader, + vulkan-memory-allocator, + xorg, + xxHash, + zlib-ng, + unstableGitUpdater, +}: + +stdenv.mkDerivation { + pname = "shadps4"; + version = "0.3.0-unstable-2024-10-14"; + + src = fetchFromGitHub { + owner = "shadps4-emu"; + repo = "shadPS4"; + rev = "09725bd921088b73746605e672abf6ff40171880"; + hash = "sha256-NtIiqmiZ1iCciMjT1cL7ONWxNHRO/0bci/thLrcORjo="; + fetchSubmodules = true; + }; + + patches = [ + # https://github.com/shadps4-emu/shadPS4/issues/758 + ./bloodborne.patch + # Fix controls without a numpad + ./laptop-controls.patch + + # Disable auto-updating, as + # downloading an AppImage and trying to run it just won't work. + # https://github.com/shadps4-emu/shadPS4/issues/1368 + ./0001-Disable-update-checking.patch + ]; + + buildInputs = [ + alsa-lib + boost184 + cryptopp + glslang + ffmpeg + fmt + jack2 + libdecor + libpulseaudio + libunwind + libusb1 + xorg.libX11 + xorg.libXext + magic-enum + mesa + pugixml + qt6.qtbase + qt6.qtdeclarative + qt6.qtmultimedia + qt6.qttools + qt6.qtwayland + rapidjson + renderdoc + sndio + toml11 + vulkan-headers + vulkan-loader + vulkan-memory-allocator + xxHash + zlib-ng + ]; + + nativeBuildInputs = [ + cmake + pkg-config + qt6.wrapQtAppsHook + ]; + + cmakeFlags = [ + (lib.cmakeBool "ENABLE_QT_GUI" true) + ]; + + # Still in development, help with debugging + cmakeBuildType = "RelWithDebugInfo"; + dontStrip = true; + + installPhase = '' + runHook preInstall + + install -D -t $out/bin shadps4 + install -Dm644 -t $out/share/icons/hicolor/512x512/apps $src/.github/shadps4.png + install -Dm644 -t $out/share/applications $src/.github/shadps4.desktop + + runHook postInstall + ''; + + fixupPhase = '' + patchelf --add-rpath ${ + lib.makeLibraryPath [ + vulkan-loader + xorg.libXi + ] + } \ + $out/bin/shadps4 + ''; + + passthru.updateScript = unstableGitUpdater { + tagFormat = "v.*"; + tagPrefix = "v."; + }; + + meta = { + description = "Early in development PS4 emulator"; + homepage = "https://github.com/shadps4-emu/shadPS4"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ ryand56 ]; + mainProgram = "shadps4"; + platforms = lib.intersectLists lib.platforms.linux lib.platforms.x86_64; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/sn/snakemake/package.nix b/third_party/nixpkgs/pkgs/by-name/sn/snakemake/package.nix new file mode 100644 index 0000000000..5fa93c5930 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sn/snakemake/package.nix @@ -0,0 +1,170 @@ +{ + lib, + stdenv, + fetchPypi, + python3Packages, + stress, + versionCheckHook, +}: + +python3Packages.buildPythonApplication rec { + pname = "snakemake"; + version = "8.23.0"; + + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-XENI9VJW62KyrxDGSwQiygggYZOu9yW2QSNyp4BO9Us="; + }; + + postPatch = '' + patchShebangs --build tests/ + substituteInPlace tests/common.py \ + --replace-fail 'os.environ["PYTHONPATH"] = os.getcwd()' "pass" \ + --replace-fail 'del os.environ["PYTHONPATH"]' "pass" + substituteInPlace snakemake/unit_tests/__init__.py \ + --replace-fail '"unit_tests/templates"' '"'"$PWD"'/snakemake/unit_tests/templates"' + ''; + + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ + appdirs + conda-inject + configargparse + connection-pool + datrie + docutils + gitpython + humanfriendly + immutables + jinja2 + jsonschema + nbformat + psutil + pulp + pygments + pyyaml + requests + reretry + smart-open + snakemake-interface-executor-plugins + snakemake-interface-common + snakemake-interface-storage-plugins + snakemake-interface-report-plugins + stopit + tabulate + throttler + toposort + wrapt + yte + ]; + + # See + # https://github.com/snakemake/snakemake/blob/main/.github/workflows/main.yml#L99 + # for the current basic test suite. Slurm, Tibanna and Tes require extra + # setup. + + nativeCheckInputs = with python3Packages; [ + numpy + pandas + pytestCheckHook + pytest-mock + requests-mock + snakemake-executor-plugin-cluster-generic + snakemake-storage-plugin-fs + stress + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + + pytestFlagsArray = [ + "tests/tests.py" + "tests/test_expand.py" + "tests/test_io.py" + "tests/test_schema.py" + "tests/test_executor_test_suite.py" + "tests/test_api.py" + ]; + + disabledTests = + [ + # FAILED tests/tests.py::test_env_modules - AssertionError: expected successful execution + "test_ancient" + "test_conda_create_envs_only" + "test_env_modules" + "test_generate_unit_tests" + "test_modules_prefix" + "test_strict_mode" + # Requires perl + "test_shadow" + # Require peppy and eido + "test_peppy" + "test_modules_peppy" + "test_pep_pathlib" + + # CalledProcessError + "test_filegraph" # requires graphviz + "test_github_issue1384" + + # AssertionError: assert 127 == 1 + "test_issue1256" + "test_issue2574" + + # Require `snakemake-storage-plugin-fs` (circular dependency) + "test_default_storage" + "test_default_storage_local_job" + "test_deploy_sources" + "test_output_file_cache_storage" + "test_storage" + ] + ++ lib.optionals stdenv.isDarwin [ + # Unclear failure: + # AssertionError: expected successful execution + # `__darwinAllowLocalNetworking` doesn't help + "test_excluded_resources_not_submitted_to_cluster" + "test_group_job_resources_with_pipe" + "test_group_jobs_resources" + "test_group_jobs_resources_with_limited_resources" + "test_group_jobs_resources_with_max_threads" + "test_issue850" + "test_issue860" + "test_multicomp_group_jobs" + "test_queue_input" + "test_queue_input_dryrun" + "test_queue_input_forceall" + "test_resources_submitted_to_cluster" + "test_scopes_submitted_to_cluster" + ]; + + pythonImportsCheck = [ + "snakemake" + ]; + + preCheck = '' + export HOME="$(mktemp -d)" + ''; + + meta = { + homepage = "https://snakemake.github.io"; + license = lib.licenses.mit; + description = "Python-based execution environment for make-like workflows"; + changelog = "https://github.com/snakemake/snakemake/blob/v${version}/CHANGELOG.md"; + mainProgram = "snakemake"; + longDescription = '' + Snakemake is a workflow management system that aims to reduce the complexity of + creating workflows by providing a fast and comfortable execution environment, + together with a clean and readable specification language in Python style. Snakemake + workflows are essentially Python scripts extended by declarative code to define + rules. Rules describe how to create output files from input files. + ''; + maintainers = with lib.maintainers; [ + helkafen + renatoGarcia + veprbl + ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/sn/snapweb/package.nix b/third_party/nixpkgs/pkgs/by-name/sn/snapweb/package.nix new file mode 100644 index 0000000000..e3b1673a91 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sn/snapweb/package.nix @@ -0,0 +1,40 @@ +{ + buildNpmPackage, + lib, + fetchFromGitHub, + pkg-config, + vips, +}: + +buildNpmPackage rec { + pname = "snapweb"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "badaix"; + repo = "snapweb"; + rev = "v${version}"; + hash = "sha256-rrJmuTFk2dC+GqYmBZ+hu5hx1iknAgSWjr22S7bfmEE="; + }; + + npmDepsHash = "sha256-n1MmU9zHyuEqtQSfYpQ+0hDM0z6ongcFsGyikPMyNSU="; + + # For 'sharp' dependency, otherwise it will try to build it + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ vips ]; + + installPhase = '' + runHook preInstall + + cp -r dist $out/ + + runHook postInstall + ''; + + meta = with lib; { + description = "Web client for Snapcast"; + homepage = "https://github.com/badaix/snapweb"; + maintainers = with maintainers; [ ettom ]; + license = licenses.gpl3Plus; + }; +} 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 da38ec7f58..db98a77777 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 @@ -6,18 +6,18 @@ , php }: -php.buildComposerProject (finalAttrs: { +php.buildComposerProject2 (finalAttrs: { pname = "snipe-it"; - version = "7.0.12"; + version = "7.0.13"; src = fetchFromGitHub { owner = "snipe"; repo = "snipe-it"; rev = "v${finalAttrs.version}"; - hash = "sha256-CTOhnGDmvxcQrS7VPsMeap6aD9YajSZ/C25RcRbL65w="; + hash = "sha256-LfE45ConH8/NPOhD+uDwJP3nNf040QEGZDdHAg1qwXg="; }; - vendorHash = "sha256-8YZD6Q1Mb5VUGL/KQnYTtXKL3aziPfAmwvVthDdyBYY="; + vendorHash = "sha256-4csHTqhkTJBzoe0Vfc7Gu1qaDG3ixj6vPMYoVLIWUV0="; postInstall = '' snipe_it_out="$out/share/php/snipe-it" @@ -36,7 +36,7 @@ php.buildComposerProject (finalAttrs: { chmod +x $snipe_it_out/artisan - substituteInPlace $snipe_it_out/config/database.php --replace "env('DB_DUMP_PATH', '/usr/local/bin')" "env('DB_DUMP_PATH', '${mariadb}/bin')" + substituteInPlace $snipe_it_out/config/database.php --replace-fail "env('DB_DUMP_PATH', '/usr/local/bin')" "env('DB_DUMP_PATH', '${mariadb}/bin')" ''; passthru = { diff --git a/third_party/nixpkgs/pkgs/by-name/sn/snippetexpandergui/package.nix b/third_party/nixpkgs/pkgs/by-name/sn/snippetexpandergui/package.nix index 8434f86723..5e5e6a60cd 100644 --- a/third_party/nixpkgs/pkgs/by-name/sn/snippetexpandergui/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sn/snippetexpandergui/package.nix @@ -6,7 +6,7 @@ , installShellFiles , xorg , gtk3 -, webkitgtk +, webkitgtk_4_0 , snippetexpanderd , snippetexpanderx }: @@ -32,7 +32,7 @@ buildGoModule rec { buildInputs = [ xorg.libX11 gtk3 - webkitgtk + webkitgtk_4_0 snippetexpanderd snippetexpanderx ]; diff --git a/third_party/nixpkgs/pkgs/by-name/sn/snips-sh/package.nix b/third_party/nixpkgs/pkgs/by-name/sn/snips-sh/package.nix index 9d3ee7d588..93931e2bc4 100644 --- a/third_party/nixpkgs/pkgs/by-name/sn/snips-sh/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sn/snips-sh/package.nix @@ -8,14 +8,14 @@ }: buildGoModule rec { pname = "snips-sh"; - version = "0.4.0"; - vendorHash = "sha256-u2f9aHUrfuM4ZsTWA955sCkgcGBFlNhEU2Qlq2C2Kso="; + version = "0.4.1"; + vendorHash = "sha256-weqlhnhUG2gn9SFS63q1LYmPa7liGYYcJN5qorj6x2E="; src = fetchFromGitHub { owner = "robherley"; repo = "snips.sh"; rev = "v${version}"; - hash = "sha256-gfZFLlTFofYQ72rQjgB8g012vbxFjk8bLYTVJwZNgMs="; + hash = "sha256-FEo2/TPwes8/Iwfp7OIo1HbLWF9xmVS9ZMC9HysyK/k="; }; tags = (lib.optional (!withTensorflow) "noguesser"); diff --git a/third_party/nixpkgs/pkgs/by-name/so/soju/package.nix b/third_party/nixpkgs/pkgs/by-name/so/soju/package.nix index 7dcf633ecd..313c4d0436 100644 --- a/third_party/nixpkgs/pkgs/by-name/so/soju/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/so/soju/package.nix @@ -9,17 +9,17 @@ buildGoModule rec { pname = "soju"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "emersion"; repo = "soju"; rev = "v${version}"; - hash = "sha256-Zhqmek7dvuyMb35XkAHXUaSiQZaGgGWtM09Dj84DDIM="; + hash = "sha256-zJj9y3llJOijmx7+C5NOzEpIG/SEeg+ZhWtLPQ/iabY="; }; - vendorHash = "sha256-t3jupiEuxWDFMfBiQ07il7lnmqG6zrV68lRNH1Gts4k="; + vendorHash = "sha256-E/9a8GCEb/0Xto6cgH9R4WWdaoo/nwb6kcFdoEeMUps="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/by-name/so/solo5/package.nix b/third_party/nixpkgs/pkgs/by-name/so/solo5/package.nix index 15344f6805..667141fe3c 100644 --- a/third_party/nixpkgs/pkgs/by-name/so/solo5/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/so/solo5/package.nix @@ -2,7 +2,7 @@ , pkg-config, qemu_test, syslinux, util-linux }: let - version = "0.8.1"; + version = "0.9.0"; # list of all theoretically available targets targets = [ "genode" @@ -21,7 +21,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://github.com/Solo5/solo5/releases/download/v${version}/solo5-v${version}.tar.gz"; - hash = "sha256-J1xcL/AdcLQ7Ph3TFwEaS9l4cWjDQsTaXTdBDcT7p6E="; + hash = "sha256-w5ZEPxjplBTkedPN4yJN1A55HtItYjuwZA8UPFQBOw8="; }; hardeningEnable = [ "pie" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/soundwireserver/default.nix b/third_party/nixpkgs/pkgs/by-name/so/soundwireserver/package.nix similarity index 88% rename from third_party/nixpkgs/pkgs/applications/audio/soundwireserver/default.nix rename to third_party/nixpkgs/pkgs/by-name/so/soundwireserver/package.nix index b296ebdad6..06a93d90af 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/soundwireserver/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/so/soundwireserver/package.nix @@ -1,12 +1,13 @@ -{ lib -, qt5 -, autoPatchelfHook -, unzip -, fetchzip -, portaudio +{ + lib, + stdenvNoCC, + qt5, + autoPatchelfHook, + fetchzip, + portaudio, }: -qt5.mkDerivation { +stdenvNoCC.mkDerivation { pname = "soundwire"; version = "3.0"; @@ -16,8 +17,8 @@ qt5.mkDerivation { }; nativeBuildInputs = [ - unzip autoPatchelfHook + qt5.wrapQtAppsHook ]; buildInputs = [ 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 bdadcf424e..3a06aab247 100644 --- a/third_party/nixpkgs/pkgs/by-name/sp/spotube/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sp/spotube/package.nix @@ -22,7 +22,7 @@ let pname = "spotube"; - version = "3.8.2"; + version = "3.8.3"; meta = { description = "Open source, cross-platform Spotify client compatible across multiple platforms"; @@ -56,7 +56,7 @@ let src = fetchArtifact { filename = "Spotube-macos-universal.dmg"; - hash = "sha256-2nqWHQDxJ0PcwTiLAa8YZffqwsdnepMpXvpqRPX5JxM="; + hash = "sha256-N1H/Vy5QQi8zAqiqAi5aTnUQcKC/EgL3GUhEfnCkaAQ="; }; sourceRoot = "."; @@ -80,7 +80,7 @@ let src = fetchArtifact { filename = "Spotube-linux-x86_64.deb"; - hash = "sha256-kDPNWbspmORClVMH91Lt3dLVsRwGxiBtB49CHSHxQxI="; + hash = "sha256-x75ie9FXunClMT+YZVFlvl2VSDl933QYMRpEYjJ8YhY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/sq/sql-formatter/package.nix b/third_party/nixpkgs/pkgs/by-name/sq/sql-formatter/package.nix new file mode 100644 index 0000000000..aff70b2e08 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sq/sql-formatter/package.nix @@ -0,0 +1,44 @@ +{ + lib, + stdenv, + fetchYarnDeps, + fetchFromGitHub, + yarnBuildHook, + yarnConfigHook, + yarnInstallHook, + nodejs, + nix-update-script, +}: +stdenv.mkDerivation rec { + pname = "sql-formatter"; + version = "15.4.3"; + + src = fetchFromGitHub { + owner = "sql-formatter-org"; + repo = "sql-formatter"; + rev = "v${version}"; + hash = "sha256-FMzNf++PXV136yetXlYJIXkP/i2iWLrcmar5/6NrXJk="; + }; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-R3PDDWxNtPK18adtHB4Jjp451Mp2p+5Fw6A1xkC58oY="; + }; + + nativeBuildInputs = [ + yarnBuildHook + yarnConfigHook + yarnInstallHook + nodejs + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Whitespace formatter for different query languages"; + homepage = "https://sql-formatter-org.github.io/sql-formatter"; + license = lib.licenses.mit; + mainProgram = "sql-formatter"; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/sq/sqruff/package.nix b/third_party/nixpkgs/pkgs/by-name/sq/sqruff/package.nix new file mode 100644 index 0000000000..d1c9343296 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sq/sqruff/package.nix @@ -0,0 +1,58 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + installShellFiles, + stdenv, + darwin, + rust-jemalloc-sys, + nix-update-script, + versionCheckHook, +}: +rustPlatform.buildRustPackage rec { + pname = "sqruff"; + version = "0.17.0"; + + src = fetchFromGitHub { + owner = "quarylabs"; + repo = "sqruff"; + rev = "refs/tags/v${version}"; + hash = "sha256-uUtbVf4U59jne5uORXpyzpqhFQoviKi2O9KQ5s1CfhU="; + }; + + cargoHash = "sha256-kIBjPh+rL4vzIAqGNYMpw39A0vADbHxi/PkhoG+QL6c="; + + # Requires nightly features (feature(let_chains) and feature(trait_upcasting)) + RUSTC_BOOTSTRAP = true; + + nativeBuildInputs = [ installShellFiles ]; + + buildInputs = [ + rust-jemalloc-sys + ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; + + # Patch the tests to find the binary + postPatch = '' + substituteInPlace crates/cli/tests/ui.rs \ + --replace-fail \ + 'config.program.program = format!("../../target/{profile}/sqruff").into();' \ + 'config.program.program = "../../target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/sqruff".into();' + ''; + + nativeCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Fast SQL formatter/linter"; + homepage = "https://github.com/quarylabs/sqruff"; + changelog = "https://github.com/quarylabs/sqruff/releases/tag/${version}"; + license = lib.licenses.asl20; + mainProgram = "sqruff"; + maintainers = with lib.maintainers; [ hasnep ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/sq/squirreldisk/package.nix b/third_party/nixpkgs/pkgs/by-name/sq/squirreldisk/package.nix index f394cce79a..4ed9647730 100644 --- a/third_party/nixpkgs/pkgs/by-name/sq/squirreldisk/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sq/squirreldisk/package.nix @@ -4,7 +4,7 @@ freetype, libsoup, gtk3, - webkitgtk, + webkitgtk_4_0, pkg-config, wrapGAppsHook3, parallel-disk-usage, @@ -66,7 +66,7 @@ in ''; nativeBuildInputs = [pkg-config wrapGAppsHook3 copyDesktopItems]; - buildInputs = [dbus openssl freetype libsoup gtk3 webkitgtk]; + buildInputs = [dbus openssl freetype libsoup gtk3 webkitgtk_4_0]; # Disable checkPhase, since the project doesn't contain tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix b/third_party/nixpkgs/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix index b50cfbd38a..cc4a5b7462 100644 --- a/third_party/nixpkgs/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "ssm-session-manager-plugin"; - version = "1.2.650.0"; + version = "1.2.677.0"; src = fetchFromGitHub { owner = "aws"; repo = "session-manager-plugin"; rev = version; - hash = "sha256-IcDVt/iE/EYV9Blvl7Gj0UFJcdsUCFdaSQkIto0CKRI="; + hash = "sha256-bfj3LFUYgtrspFsLb46TuIOC3bj/WEamMUa47Q7kATI="; }; patches = [ 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 f37e4dfdb7..46a148ea56 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.11.11"; + version = "2.11.14"; src = fetchurl { url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg"; - hash = "sha256-6USopfRy+ffxXYNAp14RcO/uKZa1yfnz2S3RP8HmCWw="; + hash = "sha256-JljFHlMcc8kfjGTdGAOP4ot+FqVy0yAJ1kxVO0TawHU="; }; sourceRoot = "."; @@ -22,8 +22,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir -p $out/Applications - cp -r *.app $out/Applications + mkdir -p "$out/Applications" + cp -r *.app "$out/Applications" runHook postInstall ''; @@ -34,7 +34,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "macOS system monitor in your menu bar"; homepage = "https://github.com/exelban/stats"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ donteatoreo emilytrau ]; + maintainers = with lib.maintainers; [ + donteatoreo + emilytrau + ]; platforms = lib.platforms.darwin; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; diff --git a/third_party/nixpkgs/pkgs/games/steam/steam.nix b/third_party/nixpkgs/pkgs/by-name/st/steam-unwrapped/package.nix similarity index 71% rename from third_party/nixpkgs/pkgs/games/steam/steam.nix rename to third_party/nixpkgs/pkgs/by-name/st/steam-unwrapped/package.nix index bbdb946a6b..aff83ec2ef 100644 --- a/third_party/nixpkgs/pkgs/games/steam/steam.nix +++ b/third_party/nixpkgs/pkgs/by-name/st/steam-unwrapped/package.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchurl, runtimeShell, traceDeps ? false, bash }: +{ lib, stdenv, fetchurl, bash }: stdenv.mkDerivation (finalAttrs: { - pname = "steam-original"; + pname = "steam-unwrapped"; version = "1.0.0.81"; src = fetchurl { @@ -12,20 +12,8 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; - postInstall = - let - traceLog = "/tmp/steam-trace-dependencies.log"; - in '' + postInstall = '' rm $out/bin/steamdeps - ${lib.optionalString traceDeps '' - cat > $out/bin/steamdeps <> ${traceLog} - cat \$1 >> ${traceLog} - echo >> ${traceLog} - EOF - chmod +x $out/bin/steamdeps - ''} # install udev rules mkdir -p $out/etc/udev/rules.d/ @@ -38,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { sed -e 's,/usr/bin/steam,steam,g' steam.desktop > $out/share/applications/steam.desktop ''; - passthru.updateScript = ./update-bootstrap.py; + passthru.updateScript = ./update.py; meta = with lib; { description = "Digital distribution platform"; @@ -49,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://store.steampowered.com/"; license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ jagajaga ]; + maintainers = lib.teams.steam.members ++ [ lib.maintainers.jagajaga ]; mainProgram = "steam"; }; }) diff --git a/third_party/nixpkgs/pkgs/games/steam/update-bootstrap.py b/third_party/nixpkgs/pkgs/by-name/st/steam-unwrapped/update.py similarity index 97% rename from third_party/nixpkgs/pkgs/games/steam/update-bootstrap.py rename to third_party/nixpkgs/pkgs/by-name/st/steam-unwrapped/update.py index 7720a08f4f..e49014fee8 100755 --- a/third_party/nixpkgs/pkgs/games/steam/update-bootstrap.py +++ b/third_party/nixpkgs/pkgs/by-name/st/steam-unwrapped/update.py @@ -27,5 +27,5 @@ if len(found_versions) == 0: sys.exit(1) found_versions.sort() -subprocess.run(["nix-update", "--version", found_versions[-1], "steamPackages.steam"]) +subprocess.run(["nix-update", "--version", found_versions[-1], "steam-unwrapped"]) found_versions[0] diff --git a/third_party/nixpkgs/pkgs/by-name/st/steam/package.nix b/third_party/nixpkgs/pkgs/by-name/st/steam/package.nix new file mode 100644 index 0000000000..bc727e0ebf --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/st/steam/package.nix @@ -0,0 +1,141 @@ +{ + lib, + steam-unwrapped, + buildFHSEnv, + writeShellScript, + extraPkgs ? pkgs: [ ], # extra packages to add to targetPkgs + extraLibraries ? pkgs: [ ], # extra packages to add to multiPkgs + extraProfile ? "", # string to append to profile + extraPreBwrapCmds ? "", # extra commands to run before calling bubblewrap + extraBwrapArgs ? [ ], # extra arguments to pass to bubblewrap (real default is at usage site) + extraArgs ? "", # arguments to always pass to steam + extraEnv ? { }, # Environment variables to pass to Steam +}: +let + steamEnv = { name, runScript, passthru ? {}, meta ? {} }: + buildFHSEnv { + inherit name runScript passthru meta; + + multiArch = true; + includeClosures = true; + + # https://gitlab.steamos.cloud/steamrt/steam-runtime-tools/-/blob/main/docs/distro-assumptions.md#command-line-tools + targetPkgs = pkgs: with pkgs; [ + steam-unwrapped + + bash + coreutils + file + lsb-release # not documented, called from Big Picture + pciutils # not documented, complains about lspci on startup + glibc_multi.bin + xz + zenity + + # Steam expects it to be /sbin specifically + (pkgs.runCommand "sbin-ldconfig" {} '' + mkdir -p $out/sbin + ln -s /bin/ldconfig $out/sbin/ldconfig + '') + + # crashes on startup if it can't find libX11 locale files + (pkgs.runCommand "xorg-locale" {} '' + mkdir -p $out + ln -s ${xorg.libX11}/share $out/share + '') + ] ++ extraPkgs pkgs; + + # https://gitlab.steamos.cloud/steamrt/steam-runtime-tools/-/blob/main/docs/distro-assumptions.md#shared-libraries + multiPkgs = pkgs: with pkgs; [ + glibc + libxcrypt + libGL + + libdrm + mesa # for libgbm + udev + libudev0-shim + libva + vulkan-loader + + networkmanager # not documented, used for network status things in Big Picture + # FIXME: figure out how to only build libnm? + libcap # not documented, required by srt-bwrap + ] ++ extraLibraries pkgs; + + extraInstallCommands = lib.optionalString (steam-unwrapped != null) '' + ln -s ${steam-unwrapped}/share $out/share + ''; + + profile = '' + # prevents log spam from SteamRT GTK trying to load host GIO modules + unset GIO_EXTRA_MODULES + + # udev event notifications don't work reliably inside containers. + # SDL2 already tries to automatically detect flatpak and pressure-vessel + # and falls back to inotify-based discovery [1]. We make SDL2 do the + # same by telling it explicitly. + # + # [1] + export SDL_JOYSTICK_DISABLE_UDEV=1 + + # This is needed for IME (e.g. iBus, fcitx5) to function correctly on non-CJK locales + # https://github.com/ValveSoftware/steam-for-linux/issues/781#issuecomment-2004757379 + export GTK_IM_MODULE='xim' + + # See https://gitlab.steamos.cloud/steamrt/steam-runtime-tools/-/blob/main/docs/distro-assumptions.md#graphics-driver + export LIBGL_DRIVERS_PATH=/run/opengl-driver/lib/dri:/run/opengl-driver-32/lib/dri + export __EGL_VENDOR_LIBRARY_DIRS=/run/opengl-driver/share/glvnd/egl_vendor.d:/run/opengl-driver-32/share/glvnd/egl_vendor.d + export LIBVA_DRIVERS_PATH=/run/opengl-driver/lib/dri:/run/opengl-driver-32/lib/dri + export VDPAU_DRIVER_PATH=/run/opengl-driver/lib/vdpau:/run/opengl-driver-32/lib/vdpau + + set -a + ${lib.toShellVars extraEnv} + set +a + + ${extraProfile} + ''; + + privateTmp = true; + + inherit extraPreBwrapCmds; + + extraBwrapArgs = [ + # Steam will dump crash reports here, make those more accessible + "--bind-try /tmp/dumps /tmp/dumps" + ] ++ extraBwrapArgs; + }; +in steamEnv { + name = "steam"; + + runScript = writeShellScript "steam-wrapped" '' + exec steam ${extraArgs} "$@" + ''; + + passthru.run = steamEnv { + name = "steam-run"; + + runScript = writeShellScript "steam-run" '' + if [ $# -eq 0 ]; then + echo "Usage: steam-run command-to-run args..." >&2 + exit 1 + fi + + exec "$@" + ''; + + meta = (steam-unwrapped.meta or {}) // { + description = "Run commands in the same FHS environment that is used for Steam"; + mainProgram = "steam-run"; + name = "steam-run"; + # steam-run itself is just a script that lives in nixpkgs (which is licensed under MIT). + # steam is a dependency and already unfree, so normal steam-run will not install without + # allowing unfree packages or appropriate `allowUnfreePredicate` rules. + license = lib.licenses.mit; + }; + }; + + meta = (steam-unwrapped.meta or {}) // { + description = "Steam dependencies (dummy package, do not use)"; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/steam/steamcmd.nix b/third_party/nixpkgs/pkgs/by-name/st/steamcmd/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/games/steam/steamcmd.nix rename to third_party/nixpkgs/pkgs/by-name/st/steamcmd/package.nix diff --git a/third_party/nixpkgs/pkgs/games/steam/steamcmd.sh b/third_party/nixpkgs/pkgs/by-name/st/steamcmd/steamcmd.sh similarity index 100% rename from third_party/nixpkgs/pkgs/games/steam/steamcmd.sh rename to third_party/nixpkgs/pkgs/by-name/st/steamcmd/steamcmd.sh diff --git a/third_party/nixpkgs/pkgs/applications/graphics/write_stylus/default.nix b/third_party/nixpkgs/pkgs/by-name/st/styluslabs-write-bin/package.nix similarity index 83% rename from third_party/nixpkgs/pkgs/applications/graphics/write_stylus/default.nix rename to third_party/nixpkgs/pkgs/by-name/st/styluslabs-write-bin/package.nix index be20635c50..4e5ca2af49 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/write_stylus/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/st/styluslabs-write-bin/package.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, lib, qtbase, qtsvg, libglvnd, libX11, libXi, fetchurl, makeDesktopItem }: +{ stdenv, lib, libsForQt5, libglvnd, libX11, libXi, fetchurl, makeDesktopItem }: let desktopItem = makeDesktopItem { name = "Write"; @@ -10,8 +10,8 @@ let categories = [ "Office" "Graphics" ]; }; in -mkDerivation rec { - pname = "write_stylus"; +stdenv.mkDerivation rec { + pname = "styluslabs-write-bin"; version = "300"; src = fetchurl { @@ -37,8 +37,8 @@ mkDerivation rec { ''; preFixup = let libPath = lib.makeLibraryPath [ - qtbase # libQt5PrintSupport.so.5 - qtsvg # libQt5Svg.so.5 + libsForQt5.qtbase # libQt5PrintSupport.so.5 + libsForQt5.qtsvg # libQt5Svg.so.5 stdenv.cc.cc.lib # libstdc++.so.6 libglvnd # libGL.so.1 libX11 # libX11.so.6 @@ -57,6 +57,6 @@ mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; license = lib.licenses.unfree; - maintainers = with maintainers; [ oyren ]; + maintainers = with maintainers; [ oyren lukts30 atemu ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/st/styluslabs-write/package.nix b/third_party/nixpkgs/pkgs/by-name/st/styluslabs-write/package.nix new file mode 100644 index 0000000000..6efc8c2465 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/st/styluslabs-write/package.nix @@ -0,0 +1,108 @@ +{ + lib, + fetchFromGitHub, + stdenv, + pkg-config, + SDL2, + xorg, + libGL, + roboto, + imagemagick, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "styluslabs-write"; + version = "2024-10-12"; + + src = fetchFromGitHub { + owner = "styluslabs"; + repo = "Write"; + rev = "b13572e2dd6a87af35cd3edde92c9144a6dd8a2b"; + hash = "sha256-cL6jU54LTkYu0mLNOgSDgChkDdg7eQaM00hTMas6cTg="; + fetchSubmodules = true; + leaveDotGit = true; + # Delete .git folder for better reproducibility + # TODO: fix GITCOUNT is always 1 but is not used in Linux Build anyway + postFetch = '' + cd $out + git rev-parse --short HEAD > $out/GITREV + git rev-list --count HEAD > $out/GITCOUNT + rm -rf $out/.git + ''; + }; + + hardeningDisable = [ "format" ]; + makeFlags = [ + "DEBUG=0" + "USE_SYSTEM_SDL=1" + ]; + preBuild = '' + makeFlagsArray+=( + "GITREV=$(cat ./GITREV)" + "GITCOUNT=$(cat ./GITCOUNT)" + ) + pushd syncscribble + ''; + + postBuild = '' + popd + ''; + + strictDeps = true; + + nativeBuildInputs = [ + imagemagick # magick + pkg-config + ]; + + buildInputs = [ + SDL2 + xorg.libX11 + xorg.libXi + xorg.libXcursor + libGL + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,opt} + install -m555 -D syncscribble/Release/Write $out/opt/ + install -m444 -D scribbleres/Intro.svg $out/opt/ + install -m444 -D scribbleres/fonts/DroidSansFallback.ttf $out/opt/ + ln -s ${roboto}/share/fonts/truetype/Roboto-Regular.ttf $out/opt/Roboto-Regular.ttf + + ln -s ../opt/Write $out/bin/Write + + for i in 16 24 48 64 96 128 256 512; do + mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps + magick scribbleres/write_512.png -resize ''${i}x''${i} $out/share/icons/hicolor/''${i}x''${i}/apps/${finalAttrs.pname}.png + done + + install -Dm444 scribbleres/linux/Write.desktop -t $out/share/applications + substituteInPlace $out/share/applications/Write.desktop \ + --replace-fail 'Exec=/opt/Write/Write' 'Exec=Write' \ + --replace-fail 'Icon=Write144x144' 'Icon=${finalAttrs.pname}' + ''; + + enableParallelBuilding = true; + + meta = { + homepage = "https://styluslabs.com/"; + description = "Cross-platform (Windows, Mac, Linux, iOS, Android) application for handwritten notes"; + license = with lib.licenses; [ + # miniz, pugixml, stb, ugui, ulib, usvg + mit + # nanovgXC + zlib + # styluslabs-write itself + agpl3Only + ]; + maintainers = with lib.maintainers; [ + lukts30 + atemu + ]; + platforms = with lib.platforms; linux ++ darwin ++ windows; + broken = !stdenv.isLinux; + mainProgram = "Write"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/su/supermariowar/package.nix b/third_party/nixpkgs/pkgs/by-name/su/supermariowar/package.nix index 4199d48469..cac5427054 100644 --- a/third_party/nixpkgs/pkgs/by-name/su/supermariowar/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/su/supermariowar/package.nix @@ -11,6 +11,7 @@ SDL2_mixer, zlib, unstableGitUpdater, + makeWrapper, }: stdenv.mkDerivation (finalAttrs: { @@ -28,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config + makeWrapper ]; buildInputs = [ @@ -45,17 +47,15 @@ stdenv.mkDerivation (finalAttrs: { 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 + makeWrapper $out/games/$app $out/bin/$app \ + --add-flags "--datadir $out/share/games/smw" 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"; diff --git a/third_party/nixpkgs/pkgs/by-name/sv/svt-av1-psy/package.nix b/third_party/nixpkgs/pkgs/by-name/sv/svt-av1-psy/package.nix index df45ea1734..be73ec0bde 100644 --- a/third_party/nixpkgs/pkgs/by-name/sv/svt-av1-psy/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sv/svt-av1-psy/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "svt-av1-psy"; - version = "2.2.1"; + version = "2.2.1-B"; src = fetchFromGitHub { owner = "gianni-rosato"; repo = "svt-av1-psy"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-4ds7yrUMp0O5/aWOkdnrANR1D3djajU/0ZeY6xJnpHI="; + hash = "sha256-3GF60XMKglpU82S5XNyW1DBYtU0KVrfghRVYokZTGoI="; }; cmakeBuildType = "Release"; diff --git a/third_party/nixpkgs/pkgs/by-name/sw/sway-assign-cgroups/package.nix b/third_party/nixpkgs/pkgs/by-name/sw/sway-assign-cgroups/package.nix index e92dc058ea..5b879c783c 100644 --- a/third_party/nixpkgs/pkgs/by-name/sw/sway-assign-cgroups/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sw/sway-assign-cgroups/package.nix @@ -5,12 +5,12 @@ python3Packages.buildPythonApplication rec { pname = "sway-assign-cgroups"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "alebastr"; repo = "sway-systemd"; - rev = "v${version}"; - hash = "sha256-wznYE1/lVJtvf5Nq96gbPYisxc2gWLahVydwcH1vwoQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-AJ87/sPy8IVJgb5YehfUfNTOFEDithLfiTxgZfZf238="; }; format = "other"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/system76-power/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/system76-power/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/linux/system76-power/default.nix rename to third_party/nixpkgs/pkgs/by-name/sy/system76-power/package.nix diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/system76-scheduler/01-fix-pipewire-paths.kdl b/third_party/nixpkgs/pkgs/by-name/sy/system76-scheduler/01-fix-pipewire-paths.kdl similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/linux/system76-scheduler/01-fix-pipewire-paths.kdl rename to third_party/nixpkgs/pkgs/by-name/sy/system76-scheduler/01-fix-pipewire-paths.kdl diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/system76-scheduler/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/system76-scheduler/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/linux/system76-scheduler/default.nix rename to third_party/nixpkgs/pkgs/by-name/sy/system76-scheduler/package.nix diff --git a/third_party/nixpkgs/pkgs/by-name/ta/taler-depolymerization/package.nix b/third_party/nixpkgs/pkgs/by-name/ta/taler-depolymerization/package.nix index d61478b325..1189a6eebc 100644 --- a/third_party/nixpkgs/pkgs/by-name/ta/taler-depolymerization/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ta/taler-depolymerization/package.nix @@ -48,8 +48,6 @@ rustPlatform.buildRustPackage { description = "Wire gateway for Bitcoin/Ethereum"; homepage = "https://git.taler.net/depolymerization.git/"; license = lib.licenses.agpl3Only; - maintainers = [ - # maintained by the team working on NGI-supported software, no group for this yet - ]; + maintainers = lib.teams.ngi.members; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ta/taler-wallet-core/package.nix b/third_party/nixpkgs/pkgs/by-name/ta/taler-wallet-core/package.nix index 944c0afc17..fac4947858 100644 --- a/third_party/nixpkgs/pkgs/by-name/ta/taler-wallet-core/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ta/taler-wallet-core/package.nix @@ -101,9 +101,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://git.taler.net/wallet-core.git/"; description = "CLI wallet for GNU Taler written in TypeScript and Anastasis Web UI"; license = lib.licenses.gpl3Plus; - maintainers = [ - # maintained by the team working on NGI-supported software, no group for this yet - ]; + maintainers = lib.teams.ngi.members; platforms = lib.platforms.linux; mainProgram = "taler-wallet-cli"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/taskflow/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/taskflow/package.nix similarity index 66% rename from third_party/nixpkgs/pkgs/development/libraries/taskflow/default.nix rename to third_party/nixpkgs/pkgs/by-name/ta/taskflow/package.nix index cdb5303f1a..1a110fe088 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/taskflow/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ta/taskflow/package.nix @@ -1,25 +1,25 @@ -{ lib -, stdenv -, fetchFromGitHub -, substituteAll -, doctest -, cmake +{ + cmake, + doctest, + fetchFromGitHub, + lib, + replaceVars, + stdenv, }: stdenv.mkDerivation rec { pname = "taskflow"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "taskflow"; repo = "taskflow"; rev = "v${version}"; - hash = "sha256-q2IYhG84hPIZhuogWf6ojDG9S9ZyuJz9s14kQyIc6t0="; + hash = "sha256-gim1QQKtzMXz8BmNg5YeN4mcveiid5MrS8IrTaTtZ1Y="; }; patches = [ - (substituteAll { - src = ./unvendor-doctest.patch; + (replaceVars ./unvendor-doctest.patch { inherit doctest; }) ]; @@ -40,9 +40,11 @@ stdenv.mkDerivation rec { meta = { description = "General-purpose Parallel and Heterogeneous Task Programming System"; homepage = "https://taskflow.github.io/"; - changelog = let - release = lib.replaceStrings ["."] ["-"] version; - in "https://taskflow.github.io/taskflow/release-${release}.html"; + changelog = + let + release = lib.replaceStrings [ "." ] [ "-" ] version; + in + "https://taskflow.github.io/taskflow/release-${release}.html"; license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ dotlambda ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/taskflow/unvendor-doctest.patch b/third_party/nixpkgs/pkgs/by-name/ta/taskflow/unvendor-doctest.patch similarity index 77% rename from third_party/nixpkgs/pkgs/development/libraries/taskflow/unvendor-doctest.patch rename to third_party/nixpkgs/pkgs/by-name/ta/taskflow/unvendor-doctest.patch index 85f2e1fcff..2caea7fe46 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/taskflow/unvendor-doctest.patch +++ b/third_party/nixpkgs/pkgs/by-name/ta/taskflow/unvendor-doctest.patch @@ -1,5 +1,5 @@ diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt -index 3397d798..8277191e 100644 +index c1fef333..eaf387ea 100644 --- a/unittests/CMakeLists.txt +++ b/unittests/CMakeLists.txt @@ -1,6 +1,6 @@ @@ -9,11 +9,11 @@ index 3397d798..8277191e 100644 +include(@doctest@/lib/cmake/doctest/doctest.cmake) list(APPEND TF_UNITTESTS - utility -@@ -24,7 +24,7 @@ list(APPEND TF_UNITTESTS + test_utility +@@ -44,7 +44,7 @@ endif() foreach(unittest IN LISTS TF_UNITTESTS) add_executable(${unittest} ${unittest}.cpp) - target_link_libraries(${unittest} ${PROJECT_NAME} tf::default_settings) + target_link_libraries(${unittest} ${PROJECT_NAME} ${ATOMIC_LIBRARY} tf::default_settings) - target_include_directories(${unittest} PRIVATE ${TF_3RD_PARTY_DIR}/doctest) + target_include_directories(${unittest} PRIVATE @doctest@/include/doctest) doctest_discover_tests(${unittest}) 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 a0749f2a00..745f6af0ee 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.8"; + version = "3.5.9"; src = fetchFromGitHub { owner = "vmware"; repo = "tdnf"; rev = "v${finalAttrs.version}"; - hash = "sha256-rs6NMIwpJCBsO7Ca+za8pVJXQwpcgFvpd15ayS01mQM="; + hash = "sha256-p9g+b7Fqq8V6QSaikEQMMHWqBf4UtRA9a/VtH+s5JUM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/td/tdom/package.nix b/third_party/nixpkgs/pkgs/by-name/td/tdom/package.nix index 3cd36bde2e..a9b96c8d94 100644 --- a/third_party/nixpkgs/pkgs/by-name/td/tdom/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/td/tdom/package.nix @@ -9,11 +9,11 @@ tcl.mkTclDerivation rec { pname = "tdom"; - version = "0.9.4"; + version = "0.9.5"; src = fetchzip { url = "http://tdom.org/downloads/tdom-${version}-src.tgz"; - hash = "sha256-7RvHzb4ae1HbJGkXCd68B23q/zhEK6ysYOnT6yeTLU8="; + hash = "sha256-WjXIVnz+1Z59fQHMHXzQaIRRwfiBHMTBq/p2alGF+Po="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/te/telegraf/package.nix b/third_party/nixpkgs/pkgs/by-name/te/telegraf/package.nix index cb98c85bf4..d2fac70039 100644 --- a/third_party/nixpkgs/pkgs/by-name/te/telegraf/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/te/telegraf/package.nix @@ -9,7 +9,7 @@ buildGo123Module rec { pname = "telegraf"; - version = "1.32.0"; + version = "1.32.1"; subPackages = [ "cmd/telegraf" ]; @@ -17,10 +17,10 @@ buildGo123Module rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - hash = "sha256-ITTlHsoWPXHbGtmNOE0x1sCbeADWi4liOEqXXKQUeGU="; + hash = "sha256-CtfPREsU2LU7Ptn3FzEDlPeWVWP/OdtIITdUL7qKbgI="; }; - vendorHash = "sha256-wKl6Rutt2QrF4nLxB5Ic6QlekrPUfHwdFZyTTdbK0HU="; + vendorHash = "sha256-WQbgGsGfyUGcgjXWjuyyCapeKgujoZD6HpKoFiIA//M="; proxyVendor = true; ldflags = [ diff --git a/third_party/nixpkgs/pkgs/by-name/te/terraform-docs/package.nix b/third_party/nixpkgs/pkgs/by-name/te/terraform-docs/package.nix index df4457de8e..6a39510942 100644 --- a/third_party/nixpkgs/pkgs/by-name/te/terraform-docs/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/te/terraform-docs/package.nix @@ -1,7 +1,9 @@ { + stdenv, lib, buildGoModule, fetchFromGitHub, + installShellFiles, }: buildGoModule rec { pname = "terraform-docs"; @@ -16,6 +18,17 @@ buildGoModule rec { vendorHash = "sha256-aweKTHQBYYqSp8CymwhnVv1WNQ7cZ1/bJNz7DSo7PKc="; + excludedPackages = [ "scripts" ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + $out/bin/terraform-docs completion bash >terraform-docs.bash + $out/bin/terraform-docs completion fish >terraform-docs.fish + $out/bin/terraform-docs completion zsh >terraform-docs.zsh + installShellCompletion terraform-docs.{bash,fish,zsh} + ''; + meta = with lib; { description = "Utility to generate documentation from Terraform modules in various output formats"; mainProgram = "terraform-docs"; diff --git a/third_party/nixpkgs/pkgs/by-name/ti/tiny-dfr/package.nix b/third_party/nixpkgs/pkgs/by-name/ti/tiny-dfr/package.nix index ec737de3e5..b521311f6c 100644 --- a/third_party/nixpkgs/pkgs/by-name/ti/tiny-dfr/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ti/tiny-dfr/package.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "tiny-dfr"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "WhatAmISupposedToPutHere"; repo = "tiny-dfr"; rev = "v${version}"; - hash = "sha256-0nopB2gCa80hwXoEaVuGhPOncLFA/u5XydCSPiCDUlg="; + hash = "sha256-5u5jyoDEt7aMs8/8QrhrUrUzFJJCNayqbN2WrMhUCV4="; }; - cargoHash = "sha256-w3trbTbRfHNekQ+mKHsq8O29S33QsdTdBawxDm3+Szs="; + cargoHash = "sha256-repPyeIVM2ufG5NhJHGbZUaxOItiTZTxiCZ21Fpt0wM="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo gdk-pixbuf glib libinput libxml2 pango udev ]; 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 1a6ee19b40..27b544bcf0 100644 --- a/third_party/nixpkgs/pkgs/by-name/ti/tinymist/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/ti/tinymist/Cargo.lock @@ -3679,7 +3679,7 @@ dependencies = [ [[package]] name = "sync-lsp" -version = "0.11.28" +version = "0.11.32" dependencies = [ "anyhow", "clap", @@ -3819,7 +3819,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.11.28" +version = "0.11.32" dependencies = [ "insta", "lsp-server", @@ -3916,7 +3916,7 @@ dependencies = [ [[package]] name = "tinymist" -version = "0.11.28" +version = "0.11.32" dependencies = [ "anyhow", "async-trait", @@ -3956,7 +3956,7 @@ dependencies = [ "serde_json", "serde_yaml", "sync-lsp", - "tinymist-assets 0.11.28 (registry+https://github.com/rust-lang/crates.io-index)", + "tinymist-assets 0.11.32 (registry+https://github.com/rust-lang/crates.io-index)", "tinymist-query", "tinymist-render", "tinymist-world", @@ -3982,7 +3982,7 @@ dependencies = [ [[package]] name = "tinymist-analysis" -version = "0.11.28" +version = "0.11.32" dependencies = [ "base64 0.22.1", "comemo 0.4.0", @@ -3999,17 +3999,17 @@ dependencies = [ [[package]] name = "tinymist-assets" -version = "0.11.28" +version = "0.11.32" [[package]] name = "tinymist-assets" -version = "0.11.28" +version = "0.11.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08ac1383bf5177ca572a0f88fb2175373ebe591d0c1bde0b85d6e0fa25d2f6b" +checksum = "ea141357280a85cdacb962dc64b07ae6fa4381df468f6aba1d3dd93483afdc38" [[package]] name = "tinymist-query" -version = "0.11.28" +version = "0.11.32" dependencies = [ "anyhow", "base64 0.22.1", @@ -4060,7 +4060,7 @@ dependencies = [ [[package]] name = "tinymist-render" -version = "0.11.28" +version = "0.11.32" dependencies = [ "base64 0.22.1", "log", @@ -4071,7 +4071,7 @@ dependencies = [ [[package]] name = "tinymist-world" -version = "0.11.28" +version = "0.11.32" dependencies = [ "anyhow", "chrono", @@ -4086,7 +4086,7 @@ dependencies = [ "serde", "serde_json", "tar", - "tinymist-assets 0.11.28 (registry+https://github.com/rust-lang/crates.io-index)", + "tinymist-assets 0.11.32 (registry+https://github.com/rust-lang/crates.io-index)", "typst-assets", ] @@ -4348,7 +4348,7 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typlite" -version = "0.11.28" +version = "0.11.32" dependencies = [ "base64 0.22.1", "comemo 0.4.0", @@ -4492,7 +4492,7 @@ dependencies = [ [[package]] name = "typst-preview" -version = "0.11.28" +version = "0.11.32" dependencies = [ "clap", "comemo 0.4.0", @@ -4505,7 +4505,7 @@ dependencies = [ "reflexo-vec2svg", "serde", "serde_json", - "tinymist-assets 0.11.28 (registry+https://github.com/rust-lang/crates.io-index)", + "tinymist-assets 0.11.32 (registry+https://github.com/rust-lang/crates.io-index)", "tokio", "typst", "typst-assets", @@ -4533,7 +4533,7 @@ dependencies = [ [[package]] name = "typst-shim" -version = "0.11.28" +version = "0.11.32" dependencies = [ "cfg-if", "typst", 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 16d8ba5951..0de208f818 100644 --- a/third_party/nixpkgs/pkgs/by-name/ti/tinymist/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ti/tinymist/package.nix @@ -17,13 +17,13 @@ rustPlatform.buildRustPackage rec { pname = "tinymist"; # Please update the corresponding vscode extension when updating # this derivation. - version = "0.11.28"; + version = "0.11.32"; src = fetchFromGitHub { owner = "Myriad-Dreamin"; repo = "tinymist"; rev = "refs/tags/v${version}"; - hash = "sha256-Wiuf53HlTMJeYJG815e9PgOtJBRxYRPllus7mmxdvM4="; + hash = "sha256-xXrE4LOzcR4TCoBD7jbS1Ba7kBLBPiF3GI0wjq5GXWA="; }; cargoLock = { diff --git a/third_party/nixpkgs/pkgs/by-name/to/tomato-c/package.nix b/third_party/nixpkgs/pkgs/by-name/to/tomato-c/package.nix index 243b21b574..613dcfec4b 100644 --- a/third_party/nixpkgs/pkgs/by-name/to/tomato-c/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/to/tomato-c/package.nix @@ -1,39 +1,29 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, libnotify -, makeWrapper -, mpv -, ncurses -, pkg-config +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + libnotify, + makeWrapper, + mpv, + ncurses, + pkg-config, }: stdenv.mkDerivation (finalAttrs: { pname = "tomato-c"; - version = "unstable-2023-08-21"; + version = "0-unstable-2024-04-19"; src = fetchFromGitHub { owner = "gabrielzschmitz"; repo = "Tomato.C"; - rev = "6e43e85aa15f3d96811311a3950eba8ce9715634"; - hash = "sha256-RpKkQ7xhM2XqfZdXra0ju0cTBL3Al9NMVQ/oleFydDs="; + rev = "b3b85764362a7c120f3312f5b618102a4eac9f01"; + hash = "sha256-7i+vn1dAK+bAGpBlKTnSBUpyJyRiPc7AiUF/tz+RyTI="; }; - patches = [ - # Adds missing function declarations required by newer versions of clang. - (fetchpatch { - url = "https://github.com/gabrielzschmitz/Tomato.C/commit/ad6d4c385ae39d655a716850653cd92431c1f31e.patch"; - hash = "sha256-3ormv59Ce4rOmeyL30QET3CCUIOrRYMquub+eIQsMW8="; - }) - ]; - postPatch = '' substituteInPlace Makefile \ --replace-fail "sudo " "" - # Need to define _ISOC99_SOURCE to use `snprintf` on Darwin - substituteInPlace config.mk \ - --replace-fail -D_POSIX_C_SOURCE -D_ISOC99_SOURCE substituteInPlace notify.c \ --replace-fail "/usr/local" "${placeholder "out"}" substituteInPlace util.c \ @@ -65,7 +55,12 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' for file in $out/bin/*; do wrapProgram $file \ - --prefix PATH : ${lib.makeBinPath [ libnotify mpv ]} + --prefix PATH : ${ + lib.makeBinPath [ + libnotify + mpv + ] + } done ''; diff --git a/third_party/nixpkgs/pkgs/by-name/to/tor-browser/package.nix b/third_party/nixpkgs/pkgs/by-name/to/tor-browser/package.nix index 43293874dd..f84198772e 100644 --- a/third_party/nixpkgs/pkgs/by-name/to/tor-browser/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/to/tor-browser/package.nix @@ -101,7 +101,7 @@ lib.warnIf (useHardenedMalloc != null) ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.5.6"; + version = "13.5.7"; sources = { x86_64-linux = fetchurl { @@ -111,7 +111,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-dEairGoBMsXF4gtnnqa2KsA8PpW9VwF8woUrInVWuKM="; + hash = "sha256-w+W3J07+7/DERDsX0EubHKZfCr9Bc3dKmnS33UA3sdU="; }; i686-linux = fetchurl { @@ -121,7 +121,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" ]; - hash = "sha256-9WRN+iU7vvt9KvVudsS7qe0hoJwDP/J+yOTHW7nmrxs="; + hash = "sha256-GZ6tBxnX3Y4Ot71phDYkpiWDecr3AltuAVFWSNhX3CY="; }; }; diff --git a/third_party/nixpkgs/pkgs/by-name/tr/treedome/package.nix b/third_party/nixpkgs/pkgs/by-name/tr/treedome/package.nix index 045823a583..67023591b2 100644 --- a/third_party/nixpkgs/pkgs/by-name/tr/treedome/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/tr/treedome/package.nix @@ -15,7 +15,7 @@ , openssl , pkg-config , rustPlatform -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 , sqlite }: @@ -97,7 +97,7 @@ rustPlatform.buildRustPackage { freetype libsoup gtk3 - webkitgtk + webkitgtk_4_0 gsettings-desktop-schemas sqlite ]; diff --git a/third_party/nixpkgs/pkgs/by-name/tr/triton-llvm/package.nix b/third_party/nixpkgs/pkgs/by-name/tr/triton-llvm/package.nix index d45aa2fafe..829f0c912a 100644 --- a/third_party/nixpkgs/pkgs/by-name/tr/triton-llvm/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/tr/triton-llvm/package.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , pkgsBuildBuild , pkg-config , cmake @@ -11,6 +12,7 @@ , libedit , libffi , libpfm +, lit , mpfr , zlib , ncurses @@ -45,7 +47,7 @@ let isNative = stdenv.hostPlatform == stdenv.buildPlatform; in stdenv.mkDerivation (finalAttrs: { pname = "triton-llvm"; - version = "17.0.0-c5dede880d17"; + version = "19.1.0-rc1"; # One of the tags at https://github.com/llvm/llvm-project/commit/10dc3a8e916d73291269e5e2b82dd22681489aa1 outputs = [ "out" @@ -60,9 +62,18 @@ in stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "llvm"; repo = "llvm-project"; - rev = "c5dede880d175f7229c9b2923f4753e12702305d"; - hash = "sha256-v4r3+7XVFK+Dzxt/rErZNJ9REqFO3JmGN4X4vZ+77ew="; + rev = "10dc3a8e916d73291269e5e2b82dd22681489aa1"; + hash = "sha256-9DPvcFmhzw6MipQeCQnr35LktW0uxtEL8axMMPXIfWw="; }; + patches = [ + # glibc-2.40 support + # [llvm-exegesis] Use correct rseq struct size #100804 + # https://github.com/llvm/llvm-project/issues/100791 + (fetchpatch { + url = "https://github.com/llvm/llvm-project//commit/84837e3cc1cf17ed71580e3ea38299ed2bfaa5f6.patch"; + hash = "sha256-QKa+kyXjjGXwTQTEpmKZx5yYjOyBX8A8NQoIYUaGcIw="; + }) + ]; nativeBuildInputs = [ pkg-config @@ -74,6 +85,7 @@ in stdenv.mkDerivation (finalAttrs: { doxygen sphinx python3Packages.recommonmark + python3Packages.myst-parser ]; buildInputs = [ @@ -90,7 +102,9 @@ in stdenv.mkDerivation (finalAttrs: { ncurses ]; - sourceRoot = "${finalAttrs.src.name}/llvm"; + preConfigure = '' + cd llvm + ''; cmakeFlags = [ (lib.cmakeFeature "LLVM_TARGETS_TO_BUILD" (lib.concatStringsSep ";" llvmTargetsToBuild')) @@ -140,23 +154,25 @@ in stdenv.mkDerivation (finalAttrs: { postPatch = '' # `CMake Error: cannot write to file "/build/source/llvm/build/lib/cmake/mlir/MLIRTargets.cmake": Permission denied` - chmod +w -R ../mlir - patchShebangs ../mlir/test/mlir-reduce + chmod +w -R ./mlir + patchShebangs ./mlir/test/mlir-reduce # FileSystem permissions tests fail with various special bits - rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test - rm unittests/Support/Path.cpp + rm llvm/test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test + rm llvm/unittests/Support/Path.cpp - substituteInPlace unittests/Support/CMakeLists.txt \ + substituteInPlace llvm/unittests/Support/CMakeLists.txt \ --replace "Path.cpp" "" '' + lib.optionalString stdenv.hostPlatform.isAarch64 '' # Not sure why this fails - rm test/tools/llvm-exegesis/AArch64/latency-by-opcode-name.s + rm llvm/test/tools/llvm-exegesis/AArch64/latency-by-opcode-name.s ''; - postInstall = lib.optionalString (!isNative) '' + postInstall = '' + cp ${lib.getExe lit} $out/bin/llvm-lit + '' + (lib.optionalString (!isNative) '' cp -a NATIVE/bin/llvm-config $out/bin/llvm-config-native - ''; + ''); doCheck = buildTests; diff --git a/third_party/nixpkgs/pkgs/by-name/tt/ttop/lock.json b/third_party/nixpkgs/pkgs/by-name/tt/ttop/lock.json index 16c54d52f9..0b93ea7b4e 100644 --- a/third_party/nixpkgs/pkgs/by-name/tt/ttop/lock.json +++ b/third_party/nixpkgs/pkgs/by-name/tt/ttop/lock.json @@ -10,19 +10,19 @@ "rev": "9f51fc4e94d0960ab63fa6ea274518159720aa69", "sha256": "1n8cx5vl26ppjsn889zmfpa37yhlxahy2va4bqp6q4v4r1dl1h14", "srcDir": "src", - "url": "https://github.com/Yardanico/asciigraph/archive/9f51fc4e94d0960ab63fa6ea274518159720aa69.tar.gz" + "url": "https://github.com/nimbackup/asciigraph/archive/9f51fc4e94d0960ab63fa6ea274518159720aa69.tar.gz" }, { "method": "fetchzip", "packages": [ "illwill" ], - "path": "/nix/store/3lmm3z36qn4gz7bfa209zv0pqrpm3di9-source", - "ref": "v0.3.2", - "rev": "1d12cb36ab7b76c31d2d25fa421013ecb382e625", - "sha256": "0f9yncl5gbdja18mrqf5ixrdgrh95k0khda923dm1jd1x1b7ar8z", + "path": "/nix/store/k3sxzm7qnkgnwkrfd8hc3gkwzbayb1h1-source", + "ref": "v0.4.1", + "rev": "2736d9e0eb6b2bf32cd2fdb8226407a388362cd1", + "sha256": "0hiic5yjsaw6sgl1jzmfpm5g6a5ckzmd29c3pzg30glchn2g94sk", "srcDir": "", - "url": "https://github.com/johnnovak/illwill/archive/1d12cb36ab7b76c31d2d25fa421013ecb382e625.tar.gz" + "url": "https://github.com/johnnovak/illwill/archive/99a120f7f69868b94f5d35ce7e21dd12535de70c.tar.gz" }, { "method": "fetchzip", @@ -52,12 +52,12 @@ "packages": [ "zippy" ], - "path": "/nix/store/dj520pi1q9xh5gplcjs0jsn5wgnaa0cr-source", - "ref": "0.10.11", - "rev": "9560f3d20479fb390c97f731ef8d100f1ed54e6c", - "sha256": "140r42kgynwsnrga4x2mildx9pflwniyhjjzmid2jvnl4i6jrsr4", + "path": "/nix/store/zcd2hmjxlkp1bpb7c9xrpg153ssj3w0b-source", + "ref": "0.10.16", + "rev": "a99f6a7d8a8e3e0213b3cad0daf0ea974bf58e3f", + "sha256": "16qdnyql8d7nm7nwwpq0maflm3p6cpbb2jfaqx6xkld9xkc9lsbv", "srcDir": "src", - "url": "https://github.com/guzba/zippy/archive/9560f3d20479fb390c97f731ef8d100f1ed54e6c.tar.gz" + "url": "https://github.com/guzba/zippy/archive/a99f6a7d8a8e3e0213b3cad0daf0ea974bf58e3f.tar.gz" } ] } diff --git a/third_party/nixpkgs/pkgs/by-name/tt/ttop/package.nix b/third_party/nixpkgs/pkgs/by-name/tt/ttop/package.nix index 013bac08fe..549ba705b9 100644 --- a/third_party/nixpkgs/pkgs/by-name/tt/ttop/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/tt/ttop/package.nix @@ -1,14 +1,19 @@ -{ lib, buildNimPackage, fetchFromGitHub, testers }: +{ + lib, + buildNimPackage, + fetchFromGitHub, + testers, +}: buildNimPackage (finalAttrs: { pname = "ttop"; - version = "1.2.8"; + version = "1.5.3"; src = fetchFromGitHub { owner = "inv2004"; repo = "ttop"; rev = "v${finalAttrs.version}"; - hash = "sha256-QMUrA3OjxlDa1OxptJL7T3SPDTzSwVz6zz+ueh9eovM="; + hash = "sha256-KfPlO0RmahavA3dsxNDozuNOXIRAwDTtT+zFaF6hYd0="; }; lockFile = ./lock.json; @@ -29,7 +34,10 @@ buildNimPackage (finalAttrs: { changelog = "https://github.com/inv2004/ttop/releases/tag/${finalAttrs.src.rev}"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ figsoda sikmir ]; + maintainers = with maintainers; [ + figsoda + sikmir + ]; mainProgram = "ttop"; }; }) 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 dfa532e494..6748b8ee34 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 = "295"; + version = "296"; src = fetchurl { url = "https://www.kylheku.com/cgit/txr/snapshot/txr-${finalAttrs.version}.tar.bz2"; - hash = "sha256-0HLrbO4v4gfk95w5SIXeQ/oNQMCMKBDkhtVJiVQtCYU="; + hash = "sha256-dT50wfEcEJpSNYVrXlgAkSuCZ+CCV6GibxfnTv1cKRc="; }; buildInputs = [ libffi ]; diff --git a/third_party/nixpkgs/pkgs/by-name/u-/u-root-cmds/package.nix b/third_party/nixpkgs/pkgs/by-name/u-/u-root-cmds/package.nix new file mode 100644 index 0000000000..bb6ff312d8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/u-/u-root-cmds/package.nix @@ -0,0 +1,204 @@ +{ + lib, + u-root, + which, +}: + +u-root.overrideAttrs (prevAttrs: { + subPackages = [ + "cmds/boot/boot" + "cmds/boot/fitboot" + "cmds/boot/pxeboot" + "cmds/cluster/nodestats" + "cmds/contrib/fbptcat" + "cmds/core/backoff" + "cmds/core/base64" + "cmds/core/basename" + "cmds/core/blkid" + "cmds/core/brctl" + "cmds/core/cat" + "cmds/core/chmod" + "cmds/core/chroot" + "cmds/core/cmp" + "cmds/core/comm" + "cmds/core/cp" + "cmds/core/cpio" + "cmds/core/date" + "cmds/core/dd" + "cmds/core/df" + "cmds/core/dhclient" + "cmds/core/dirname" + "cmds/core/dmesg" + "cmds/core/du" + "cmds/core/echo" + "cmds/core/false" + "cmds/core/find" + "cmds/core/free" + "cmds/core/fusermount" + "cmds/core/gosh" + "cmds/core/gpgv" + "cmds/core/gpt" + "cmds/core/grep" + "cmds/core/gzip" + "cmds/core/head" + "cmds/core/hexdump" + "cmds/core/hostname" + "cmds/core/hwclock" + "cmds/core/id" + "cmds/core/init" + "cmds/core/insmod" + "cmds/core/io" + "cmds/core/ip" + "cmds/core/kexec" + "cmds/core/kill" + "cmds/core/lddfiles" + "cmds/core/ln" + "cmds/core/lockmsrs" + "cmds/core/losetup" + "cmds/core/ls" + "cmds/core/lsdrivers" + "cmds/core/lsmod" + "cmds/core/man" + "cmds/core/md5sum" + "cmds/core/mkdir" + "cmds/core/mkfifo" + "cmds/core/mknod" + "cmds/core/mktemp" + "cmds/core/more" + "cmds/core/mount" + "cmds/core/msr" + "cmds/core/mv" + "cmds/core/netcat" + "cmds/core/netstat" + "cmds/core/nohup" + "cmds/core/ntpdate" + "cmds/core/pci" + "cmds/core/ping" + "cmds/core/poweroff" + "cmds/core/printenv" + "cmds/core/ps" + "cmds/core/pwd" + "cmds/core/readlink" + "cmds/core/realpath" + "cmds/core/rm" + "cmds/core/rmmod" + "cmds/core/rsdp" + "cmds/core/scp" + "cmds/core/seq" + "cmds/core/shasum" + "cmds/core/shutdown" + "cmds/core/sleep" + "cmds/core/sluinit" + "cmds/core/sort" + "cmds/core/sshd" + "cmds/core/strace" + "cmds/core/strings" + "cmds/core/stty" + "cmds/core/switch_root" + "cmds/core/sync" + "cmds/core/tail" + "cmds/core/tar" + "cmds/core/tee" + "cmds/core/time" + "cmds/core/timeout" + "cmds/core/touch" + "cmds/core/tr" + "cmds/core/true" + "cmds/core/truncate" + "cmds/core/ts" + "cmds/core/tty" + "cmds/core/umount" + "cmds/core/uname" + "cmds/core/uniq" + "cmds/core/unmount" + "cmds/core/unshare" + "cmds/core/uptime" + "cmds/core/watchdog" + "cmds/core/watchdogd" + "cmds/core/wc" + "cmds/core/wget" + "cmds/core/which" + "cmds/core/xargs" + "cmds/core/yes" + "cmds/exp/acpicat" + "cmds/exp/acpigrep" + "cmds/exp/ansi" + "cmds/exp/bootvars" + "cmds/exp/bzimage" + "cmds/exp/cbmem" + "cmds/exp/console" + "cmds/exp/crc" + "cmds/exp/disk_unlock" + "cmds/exp/dmidecode" + "cmds/exp/dumpebda" + "cmds/exp/dumpmemmap" + "cmds/exp/ectool" + "cmds/exp/ed" + "cmds/exp/efivarfs" + "cmds/exp/esxiboot" + "cmds/exp/fbnetboot" + "cmds/exp/fbsplash" + "cmds/exp/fdtdump" + "cmds/exp/field" + "cmds/exp/fixrsdp" + "cmds/exp/forth" + "cmds/exp/freq" + "cmds/exp/getty" + "cmds/exp/hdparm" + "cmds/exp/ipmidump" + "cmds/exp/kconf" + "cmds/exp/localboot" + "cmds/exp/lsfabric" + "cmds/exp/madeye" + "cmds/exp/modprobe" + "cmds/exp/netbootxyz" + "cmds/exp/newsshd" + "cmds/exp/nvme_unlock" + "cmds/exp/page" + "cmds/exp/partprobe" + "cmds/exp/pflask" + "cmds/exp/pox" + "cmds/exp/pxeserver" + "cmds/exp/readelf" + "cmds/exp/readpe" + "cmds/exp/run" + "cmds/exp/rush" + "cmds/exp/smbios_transfer" + "cmds/exp/smn" + "cmds/exp/srvfiles" + "cmds/exp/ssh" + "cmds/exp/syscallfilter" + "cmds/exp/systemboot" + "cmds/exp/tac" + "cmds/exp/tc" + "cmds/exp/tcpdump" + "cmds/exp/tcz" + "cmds/exp/tftp" + "cmds/exp/traceroute" + "cmds/exp/uefiboot" + "cmds/exp/vboot" + "cmds/exp/vmboot" + "cmds/exp/watch" + "cmds/exp/zbi" + "cmds/exp/zimage" + "cmds/extra/tsort" + "cmds/fwtools/flash" + "cmds/fwtools/spidev" + ]; + + allowGoReference = false; + + nativeCheckInputs = [ which ]; + + preCheck = '' + rm cmds/core/brctl/*_test.go # Error: open /sys/class/net: no such file or directory + rm cmds/core/du/*_test.go # Error: expected 0 got 8 + rm cmds/core/mkdir/*_test.go # Error: Mode = 'drwxr-xr-x', want: 'dgrwxrwxrwx' + rm cmds/core/netcat/*_test.go # Error: parseRemoteAddr(tcp, ::1) = [::1 localhost], want a subset of [::1 ip6-localhost] + rm cmds/exp/bzimage/*_test.go # Error: compressed KernelCode too big: was 611116, now 611124 + ''; + + meta = (lib.removeAttrs prevAttrs.meta [ "mainProgram" ]) // { + longDescription = "All u-root commands compiles as standalone binaries"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/u-/u-root/package.nix b/third_party/nixpkgs/pkgs/by-name/u-/u-root/package.nix new file mode 100644 index 0000000000..f027050d8e --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/u-/u-root/package.nix @@ -0,0 +1,72 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + coreutils, + bash, + + linuxManualConfig, + fetchurl, + linux_latest, +}: + +buildGoModule rec { + pname = "u-root"; + version = "0.14.0-unstable-2024-09-26"; + + src = fetchFromGitHub { + owner = "u-root"; + repo = "u-root"; + rev = "a620c4fc0eeeaa71ea68c27d6ef96352ed814829"; + hash = "sha256-8B2H3AwGo9friveBk4bijOph9bSSNR7PPKJYEuywgm4="; + }; + + vendorHash = null; + + subPackages = [ "." ]; + + CGO_ENABLED = "0"; + + ldflags = [ "-s" ]; + + allowGoReference = true; + + # The tests want to copy /bin/bash and /bin/ls, but we don't have those. + # As these are interesting e2e tests to check if things work, we substitute + # them with the actual paths instead of just skipping the tests. + preCheck = '' + substituteInPlace ./uroot_test.go \ + --replace-fail '-files=/bin/bash"' '-files=${bash}/bin/bash:bin/bash"' \ + --replace-fail '-files=/bin/ls"' '-files=${coreutils}/bin/ls:bin/ls"' \ + --replace-fail '-files=/bin/bash' '-files=${bash}/bin/bash' + ''; + + passthru = { + # Somewhat minimal kernel config for Go/u-root, used by upstream for testing. + # This can be used to quickly run u-root locally with proper serial console output. + kernel-amd64 = linuxManualConfig { + inherit (linux_latest) version src; + configfile = fetchurl { + url = "https://raw.githubusercontent.com/hugelgupf/vmtest/5d9f3d34a58dc7b13bca786e8ac32d3e2ce4e95d/images/kernel-amd64/config_linux.txt"; + hash = "sha256-CjhWWK6YwSOXP10mpnJjG5nwLWs2cDtebvlDBLzN5fI="; + }; + allowImportFromDerivation = true; + }; + }; + + meta = { + description = "A fully Go userland with Linux bootloaders"; + longDescription = '' + u-root can create a one-binary root file system (initramfs) containing a busybox-like set of tools written in Go. + + The package exposes `u-root.kernel-amd64` passthru for a minimal and pre-configured kernel to be used locally with QEMU. + ''; + homepage = "https://u-root.org/"; + downloadPage = "https://github.com/u-root/u-root"; + changelog = "https://github.com/u-root/u-root/blob/${src.rev}/RELEASES"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ katexochen ]; + mainProgram = "u-root"; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/un/unrar-free/package.nix b/third_party/nixpkgs/pkgs/by-name/un/unrar-free/package.nix index 72ca626c89..de058108ef 100644 --- a/third_party/nixpkgs/pkgs/by-name/un/unrar-free/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/un/unrar-free/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "unrar-free"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitLab { owner = "bgermann"; repo = "unrar-free"; rev = finalAttrs.version; - hash = "sha256-hVUEvlaVx2Ai1lYXU6hwiLToEMhCPWlSIh1WrbYKmco="; + hash = "sha256-Dg+KGZcqbE1nBPaemZlWQPaUQQJmaSe0nyDQRXJzwuE="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/by-name/up/upbound/package.nix b/third_party/nixpkgs/pkgs/by-name/up/upbound/package.nix index 076761cf49..9bf2b100c9 100644 --- a/third_party/nixpkgs/pkgs/by-name/up/upbound/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/up/upbound/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "upbound"; - version = "0.33.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = pname; repo = "up"; rev = "v${version}"; - hash = "sha256-PJMOR/XpWqtSIb3x61o0iLwETCHA5e07etmEZYQtzXw="; + hash = "sha256-npWCGR0/iXAF7efreWhpwqboXJ24lqk5TPaB7glwEFI="; }; - vendorHash = "sha256-WLRXj4G49JEbQc2aFAjLLCpQrDhN94jazWxfM70hHqs="; + vendorHash = "sha256-f/RPyjrC5FsOjC5wnBtqEbLeVX7VeiVYFpRXcQ2lTc4="; subPackages = [ "cmd/docker-credential-up" "cmd/up" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/us/userborn/package.nix b/third_party/nixpkgs/pkgs/by-name/us/userborn/package.nix index 233a1ebb12..5290fd0543 100644 --- a/third_party/nixpkgs/pkgs/by-name/us/userborn/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/us/userborn/package.nix @@ -2,36 +2,29 @@ lib, rustPlatform, fetchFromGitHub, - makeBinaryWrapper, - mkpasswd, + libxcrypt, nixosTests, nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "userborn"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "nikstur"; repo = "userborn"; rev = version; - hash = "sha256-LEKdgmw1inBOi0sriG8laCrtx0ycqR5ftdnmszadx3U="; + hash = "sha256-ABePye1zuGDH74BL6AP05rR9eBOYu1SoVpd2TcZQMW8="; }; sourceRoot = "${src.name}/rust/userborn"; - cargoHash = "sha256-Pjzu6db2WomNsC+jNK1fr1u7koZwUvWPIY5JHMo1gkA="; + cargoHash = "sha256-/S2rkZyXHN5NiW9TFhKguqtf/udFcDOTfV2jYRMV14s="; - nativeBuildInputs = [ makeBinaryWrapper ]; + nativeBuildInputs = [ rustPlatform.bindgenHook ]; - buildInputs = [ mkpasswd ]; - - nativeCheckInputs = [ mkpasswd ]; - - postInstall = '' - wrapProgram $out/bin/userborn --prefix PATH : ${lib.makeBinPath [ mkpasswd ]} - ''; + buildInputs = [ libxcrypt ]; stripAllList = [ "bin" ]; @@ -51,8 +44,9 @@ rustPlatform.buildRustPackage rec { meta = with lib; { homepage = "https://github.com/nikstur/userborn"; description = "Declaratively bear (manage) Linux users and groups"; + changelog = "https://github.com/nikstur/userborn/blob/${version}/CHANGELOG.md"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with lib.maintainers; [ nikstur ]; mainProgram = "userborn"; }; 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 569ebca0c4..590eb84c8e 100644 --- a/third_party/nixpkgs/pkgs/by-name/uv/uv/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/uv/uv/Cargo.lock @@ -23,17 +23,6 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" -[[package]] -name = "ahash" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - [[package]] name = "aho-corasick" version = "1.1.3" @@ -104,12 +93,6 @@ version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" -[[package]] -name = "arc-swap" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" - [[package]] name = "arrayref" version = "0.3.9" @@ -177,9 +160,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" +checksum = "7e614738943d3f68c628ae3dbce7c3daffb196665f82f8c8ea6b65de73c79429" dependencies = [ "bzip2", "flate2", @@ -195,13 +178,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -337,15 +320,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "backtrace-ext" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "537beee3be4a18fb023b570f80e3ae28003db9167a751266b259926e25539d50" -dependencies = [ - "backtrace", -] - [[package]] name = "base64" version = "0.21.7" @@ -358,33 +332,6 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" -[[package]] -name = "bench" -version = "0.0.0" -dependencies = [ - "anyhow", - "codspeed-criterion-compat", - "criterion", - "distribution-filename", - "distribution-types", - "install-wheel-rs", - "jiff", - "pep440_rs", - "pep508_rs", - "platform-tags", - "pypi-types", - "tokio", - "uv-cache", - "uv-client", - "uv-configuration", - "uv-dispatch", - "uv-distribution", - "uv-git", - "uv-python", - "uv-resolver", - "uv-types", -] - [[package]] name = "bisection" version = "0.1.0" @@ -403,18 +350,6 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" -[[package]] -name = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - [[package]] name = "block-buffer" version = "0.10.4" @@ -426,9 +361,9 @@ dependencies = [ [[package]] name = "boxcar" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "510a90332002c1af3317ef6b712f0dab697f30bbe809b86965eac2923c0bca8e" +checksum = "fba19c552ee63cb6646b75e1166d1bdb8a6d34a6d19e319dec88c8adadff2db3" [[package]] name = "bstr" @@ -437,7 +372,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", - "regex-automata 0.4.7", + "regex-automata 0.4.8", "serde", ] @@ -449,24 +384,25 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytecheck" -version = "0.6.12" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" +checksum = "50c8f430744b23b54ad15161fcbc22d82a29b73eacbe425fea23ec822600bc6f" dependencies = [ "bytecheck_derive", "ptr_meta", + "rancor", "simdutf8", ] [[package]] name = "bytecheck_derive" -version = "0.6.12" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" +checksum = "523363cbe1df49b68215efdf500b103ac3b0fb4836aed6d15689a076eadb8fff" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] @@ -514,15 +450,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "cache-key" -version = "0.0.1" -dependencies = [ - "hex", - "seahash", - "url", -] - [[package]] name = "cachedir" version = "0.3.1" @@ -632,9 +559,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.17" +version = "4.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" +checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615" dependencies = [ "clap_builder", "clap_derive", @@ -642,15 +569,15 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.17" +version = "4.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" +checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b" dependencies = [ "anstream", "anstyle", "clap_lex", "strsim", - "terminal_size", + "terminal_size 0.4.0", ] [[package]] @@ -685,14 +612,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.13" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -1011,49 +938,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "distribution-filename" -version = "0.0.1" -dependencies = [ - "insta", - "pep440_rs", - "platform-tags", - "rkyv", - "serde", - "thiserror", - "url", - "uv-normalize", -] - -[[package]] -name = "distribution-types" -version = "0.0.1" -dependencies = [ - "anyhow", - "cache-key", - "distribution-filename", - "fs-err", - "itertools 0.13.0", - "jiff", - "pep440_rs", - "pep508_rs", - "platform-tags", - "pypi-types", - "rkyv", - "rustc-hash", - "schemars", - "serde", - "serde_json", - "thiserror", - "tracing", - "url", - "urlencoding", - "uv-cache-info", - "uv-fs", - "uv-git", - "uv-normalize", -] - [[package]] name = "doc-comment" version = "0.3.3" @@ -1108,6 +992,16 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +[[package]] +name = "erased-serde" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d" +dependencies = [ + "serde", + "typeid", +] + [[package]] name = "errno" version = "0.3.9" @@ -1185,9 +1079,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "libz-ng-sys", @@ -1259,17 +1153,11 @@ dependencies = [ "winapi", ] -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -1282,9 +1170,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -1292,15 +1180,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -1309,9 +1197,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" @@ -1328,32 +1216,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -1421,8 +1309,8 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", ] [[package]] @@ -1476,15 +1364,6 @@ dependencies = [ "crunchy", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash", -] - [[package]] name = "hashbrown" version = "0.14.5" @@ -1492,10 +1371,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] -name = "heck" -version = "0.4.1" +name = "hashbrown" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" [[package]] name = "heck" @@ -1635,7 +1514,7 @@ dependencies = [ "hyper", "hyper-util", "rustls", - "rustls-native-certs 0.8.0", + "rustls-native-certs", "rustls-pki-types", "tokio", "tokio-rustls", @@ -1645,9 +1524,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" dependencies = [ "bytes", "futures-channel", @@ -1658,7 +1537,6 @@ dependencies = [ "pin-project-lite", "socket2", "tokio", - "tower", "tower-service", "tracing", ] @@ -1683,7 +1561,7 @@ dependencies = [ "globset", "log", "memchr", - "regex-automata 0.4.7", + "regex-automata 0.4.8", "same-file", "walkdir", "winapi-util", @@ -1708,12 +1586,12 @@ checksum = "b72ad49b554c1728b1e83254a1b1565aea4161e28dabbfa171fc15fe62299caf" [[package]] name = "indexmap" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown 0.15.0", "serde", ] @@ -1752,43 +1630,6 @@ dependencies = [ "similar", ] -[[package]] -name = "install-wheel-rs" -version = "0.0.1" -dependencies = [ - "anyhow", - "assert_fs", - "clap", - "configparser", - "csv", - "data-encoding", - "distribution-filename", - "fs-err", - "indoc", - "mailparse", - "pathdiff", - "pep440_rs", - "platform-info", - "platform-tags", - "pypi-types", - "reflink-copy", - "regex", - "rustc-hash", - "schemars", - "serde", - "serde_json", - "sha2", - "tempfile", - "thiserror", - "tracing", - "uv-cache-info", - "uv-fs", - "uv-normalize", - "uv-warnings", - "walkdir", - "zip", -] - [[package]] name = "instant" version = "0.1.13" @@ -2113,30 +1954,19 @@ dependencies = [ "autocfg", ] -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - [[package]] name = "miette" version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4edc8853320c2a0dab800fbda86253c8938f6ea88510dc92c5f1ed20e794afc1" dependencies = [ - "backtrace", - "backtrace-ext", "cfg-if", "miette-derive", "owo-colors", "supports-color", "supports-hyperlinks", "supports-unicode", - "terminal_size", + "terminal_size 0.3.0", "textwrap", "thiserror", "unicode-width", @@ -2150,7 +1980,7 @@ checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -2168,6 +1998,16 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + [[package]] name = "miniz_oxide" version = "0.7.4" @@ -2208,6 +2048,26 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "munge" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64142d38c84badf60abf06ff9bd80ad2174306a5b11bd4706535090a30a419df" +dependencies = [ + "munge_macro", +] + +[[package]] +name = "munge_macro" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bb5c1d8184f13f7d0ccbeeca0def2f9a181bce2624302793005f5ca8aa62e5e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "nanoid" version = "0.4.0" @@ -2226,7 +2086,7 @@ dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", - "memoffset 0.7.1", + "memoffset", "pin-utils", ] @@ -2301,15 +2161,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "once-map" -version = "0.0.1" -dependencies = [ - "dashmap", - "futures", - "tokio", -] - [[package]] name = "once_cell" version = "1.20.0" @@ -2418,48 +2269,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" -[[package]] -name = "pep440_rs" -version = "0.6.0" -dependencies = [ - "indoc", - "pyo3", - "rkyv", - "serde", - "tracing", - "unicode-width", - "unscanny", -] - -[[package]] -name = "pep508_rs" -version = "0.6.0" -dependencies = [ - "boxcar", - "indexmap", - "insta", - "itertools 0.13.0", - "log", - "pep440_rs", - "pubgrub", - "pyo3", - "pyo3-log", - "regex", - "rustc-hash", - "schemars", - "serde", - "serde_json", - "smallvec", - "testing_logger", - "thiserror", - "tracing", - "unicode-width", - "url", - "uv-fs", - "uv-normalize", - "uv-pubgrub", -] - [[package]] name = "percent-encoding" version = "2.3.1" @@ -2497,7 +2306,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -2544,7 +2353,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -2579,24 +2388,14 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" [[package]] name = "platform-info" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5ff316b9c4642feda973c18f0decd6c8b0919d4722566f6e4337cce0dd88217" +checksum = "91077ffd05d058d70d79eefcd7d7f6aac34980860a7519960f7913b6563a8c3a" dependencies = [ "libc", "winapi", ] -[[package]] -name = "platform-tags" -version = "0.0.1" -dependencies = [ - "insta", - "rustc-hash", - "serde", - "thiserror", -] - [[package]] name = "png" version = "0.17.13" @@ -2696,22 +2495,22 @@ dependencies = [ [[package]] name = "ptr_meta" -version = "0.1.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +checksum = "fe9e76f66d3f9606f44e45598d155cb13ecf09f4a28199e48daf8c8fc937ea90" dependencies = [ "ptr_meta_derive", ] [[package]] name = "ptr_meta_derive" -version = "0.1.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +checksum = "ca414edb151b4c8d125c12566ab0d74dc9cdba36fb80eb7b848c15f495fd32d1" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] @@ -2726,105 +2525,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "pyo3" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8" -dependencies = [ - "cfg-if", - "indoc", - "libc", - "memoffset 0.9.1", - "parking_lot 0.12.3", - "portable-atomic", - "pyo3-build-config", - "pyo3-ffi", - "pyo3-macros", - "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-log" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af49834b8d2ecd555177e63b273b708dea75150abc6f5341d0a6e1a9623976c" -dependencies = [ - "arc-swap", - "log", - "pyo3", -] - -[[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.77", -] - -[[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.77", -] - -[[package]] -name = "pypi-types" -version = "0.0.1" -dependencies = [ - "anyhow", - "distribution-filename", - "indexmap", - "itertools 0.13.0", - "jiff", - "mailparse", - "pep440_rs", - "pep508_rs", - "regex", - "rkyv", - "serde", - "thiserror", - "toml", - "toml_edit", - "tracing", - "url", - "uv-fs", - "uv-git", - "uv-normalize", -] - [[package]] name = "quinn" version = "0.11.5" @@ -2889,10 +2589,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "640c9bd8497b02465aeef5375144c26062e0dcd5939dfcbb0f5db76cb8c17c73" [[package]] -name = "radium" -version = "0.7.0" +name = "rancor" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" +checksum = "caf5f7161924b9d1cea0e4cabc97c372cea92b5f927fc13c6bca67157a0ad947" +dependencies = [ + "ptr_meta", +] [[package]] name = "rand" @@ -3001,14 +2704,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", ] [[package]] @@ -3022,13 +2725,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.4", + "regex-syntax 0.8.5", ] [[package]] @@ -3039,54 +2742,24 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "rend" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" +checksum = "a31c1f1959e4db12c985c0283656be0925f1539549db1e47c4bd0b8b599e1ef7" dependencies = [ "bytecheck", ] -[[package]] -name = "requirements-txt" -version = "0.0.1" -dependencies = [ - "anyhow", - "assert_fs", - "distribution-types", - "fs-err", - "indoc", - "insta", - "itertools 0.13.0", - "pep508_rs", - "pypi-types", - "regex", - "reqwest", - "reqwest-middleware", - "tempfile", - "test-case", - "thiserror", - "tokio", - "tracing", - "unscanny", - "url", - "uv-client", - "uv-configuration", - "uv-fs", - "uv-normalize", - "uv-warnings", -] - [[package]] name = "reqwest" -version = "0.12.7" +version = "0.12.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" +checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" dependencies = [ "async-compression", "base64 0.22.1", @@ -3104,12 +2777,13 @@ dependencies = [ "js-sys", "log", "mime", + "mime_guess", "once_cell", "percent-encoding", "pin-project-lite", "quinn", "rustls", - "rustls-native-certs 0.7.3", + "rustls-native-certs", "rustls-pemfile", "rustls-pki-types", "serde", @@ -3118,6 +2792,7 @@ dependencies = [ "sync_wrapper", "tokio", "tokio-rustls", + "tokio-socks", "tokio-util", "tower-service", "url", @@ -3218,31 +2893,32 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.45" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b" +checksum = "395027076c569819ea6035ee62e664f5e03d74e281744f55261dd1afd939212b" dependencies = [ - "bitvec", "bytecheck", "bytes", - "hashbrown 0.12.3", + "hashbrown 0.14.5", + "indexmap", + "munge", "ptr_meta", + "rancor", "rend", "rkyv_derive", - "seahash", "tinyvec", "uuid", ] [[package]] name = "rkyv_derive" -version = "0.7.45" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0" +checksum = "09cb82b74b4810f07e460852c32f522e979787691b0b7b7439fe473e49d49b2f" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] @@ -3343,19 +3019,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "rustls-native-certs" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "rustls-pki-types", - "schannel", - "security-framework", -] - [[package]] name = "rustls-native-certs" version = "0.8.0" @@ -3458,7 +3121,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.77", + "syn", ] [[package]] @@ -3484,7 +3147,7 @@ checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -3531,6 +3194,17 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "serde-untagged" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2676ba99bd82f75cae5cbd2c8eda6fa0b8760f18978ea840e980dd5567b5c5b6" +dependencies = [ + "erased-serde", + "serde", + "typeid", +] + [[package]] name = "serde_derive" version = "1.0.210" @@ -3539,7 +3213,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -3550,7 +3224,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -3691,6 +3365,15 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "spdx" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47317bbaf63785b53861e1ae2d11b80d6b624211d42cb20efcd210ee6f8a14bc" +dependencies = [ + "smallvec", +] + [[package]] name = "spin" version = "0.9.8" @@ -3777,20 +3460,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.109" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -3822,12 +3494,6 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eddb6b06d20fba9ed21fca3d696ee1b6e870bca0bcf9fa2971f6ae2436de576a" -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - [[package]] name = "target-lexicon" version = "0.12.16" @@ -3845,9 +3511,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", "fastrand", @@ -3866,6 +3532,16 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "terminal_size" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef" +dependencies = [ + "rustix", + "windows-sys 0.59.0", +] + [[package]] name = "termtree" version = "0.4.1" @@ -3890,7 +3566,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -3901,7 +3577,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", "test-case-core", ] @@ -3923,7 +3599,7 @@ checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -3948,22 +3624,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -4077,7 +3753,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -4091,6 +3767,18 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-socks" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f" +dependencies = [ + "either", + "futures-util", + "thiserror", + "tokio", +] + [[package]] name = "tokio-stream" version = "0.1.16" @@ -4140,9 +3828,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.21" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap", "serde", @@ -4151,27 +3839,6 @@ dependencies = [ "winnow", ] -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-layer" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" - [[package]] name = "tower-service" version = "0.3.3" @@ -4184,7 +3851,6 @@ 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", @@ -4198,7 +3864,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -4295,6 +3961,12 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" +[[package]] +name = "typeid" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e" + [[package]] name = "typenum" version = "1.17.0" @@ -4307,6 +3979,15 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + [[package]] name = "unicode-bidi" version = "0.3.15" @@ -4370,12 +4051,6 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" -[[package]] -name = "unindent" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" - [[package]] name = "unscanny" version = "0.1.0" @@ -4459,7 +4134,7 @@ checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" [[package]] name = "uv" -version = "0.4.11" +version = "0.4.20" dependencies = [ "anstream", "anyhow", @@ -4468,11 +4143,8 @@ dependencies = [ "axoupdater", "base64 0.22.1", "byteorder", - "cache-key", "clap", "ctrlc", - "distribution-filename", - "distribution-types", "etcetera", "filetime", "flate2", @@ -4484,17 +4156,11 @@ dependencies = [ "indicatif", "indoc", "insta", - "install-wheel-rs", "itertools 0.13.0", "jiff", "miette", - "mimalloc", "owo-colors", - "pep440_rs", - "pep508_rs", - "platform-tags", "predicates", - "pypi-types", "rayon", "regex", "reqwest", @@ -4505,7 +4171,6 @@ dependencies = [ "tempfile", "textwrap", "thiserror", - "tikv-jemallocator", "tokio", "toml", "tracing", @@ -4515,18 +4180,30 @@ dependencies = [ "unicode-width", "url", "uv-auth", + "uv-build-backend", "uv-cache", "uv-cache-info", + "uv-cache-key", "uv-cli", "uv-client", "uv-configuration", "uv-dispatch", "uv-distribution", + "uv-distribution-filename", + "uv-distribution-types", "uv-extract", "uv-fs", "uv-git", + "uv-install-wheel", "uv-installer", "uv-normalize", + "uv-pep440", + "uv-pep508", + "uv-performance-flate2-backend", + "uv-performance-memory-allocator", + "uv-platform-tags", + "uv-publish", + "uv-pypi-types", "uv-python", "uv-requirements", "uv-resolver", @@ -4552,7 +4229,6 @@ dependencies = [ "futures", "http", "insta", - "once-map", "reqwest", "reqwest-middleware", "rust-netrc", @@ -4563,23 +4239,78 @@ dependencies = [ "tracing", "url", "urlencoding", + "uv-once-map", "wiremock", ] [[package]] -name = "uv-build" +name = "uv-bench" +version = "0.0.0" +dependencies = [ + "anyhow", + "codspeed-criterion-compat", + "criterion", + "jiff", + "tokio", + "uv-cache", + "uv-client", + "uv-configuration", + "uv-dispatch", + "uv-distribution", + "uv-distribution-filename", + "uv-distribution-types", + "uv-git", + "uv-install-wheel", + "uv-pep440", + "uv-pep508", + "uv-platform-tags", + "uv-pypi-types", + "uv-python", + "uv-resolver", + "uv-types", +] + +[[package]] +name = "uv-build-backend" +version = "0.1.0" +dependencies = [ + "csv", + "fs-err", + "glob", + "indoc", + "insta", + "itertools 0.13.0", + "serde", + "sha2", + "spdx", + "tempfile", + "thiserror", + "toml", + "tracing", + "uv-distribution-filename", + "uv-fs", + "uv-normalize", + "uv-pep440", + "uv-pep508", + "uv-pubgrub", + "uv-pypi-types", + "uv-version", + "uv-warnings", + "walkdir", + "zip", +] + +[[package]] +name = "uv-build-frontend" version = "0.0.1" dependencies = [ "anstream", "anyhow", - "distribution-types", "fs-err", "indoc", "insta", "itertools 0.13.0", - "pep440_rs", - "pep508_rs", - "pypi-types", + "owo-colors", "regex", "rustc-hash", "serde", @@ -4590,7 +4321,11 @@ dependencies = [ "toml_edit", "tracing", "uv-configuration", + "uv-distribution-types", "uv-fs", + "uv-pep440", + "uv-pep508", + "uv-pypi-types", "uv-python", "uv-types", "uv-virtualenv", @@ -4600,14 +4335,11 @@ dependencies = [ name = "uv-cache" version = "0.0.1" dependencies = [ - "cache-key", "clap", "directories", - "distribution-types", "etcetera", "fs-err", "nanoid", - "pypi-types", "rmp-serde", "rustc-hash", "serde", @@ -4615,8 +4347,11 @@ dependencies = [ "tracing", "url", "uv-cache-info", + "uv-cache-key", + "uv-distribution-types", "uv-fs", "uv-normalize", + "uv-pypi-types", "walkdir", ] @@ -4633,6 +4368,15 @@ dependencies = [ "tracing", ] +[[package]] +name = "uv-cache-key" +version = "0.0.1" +dependencies = [ + "hex", + "seahash", + "url", +] + [[package]] name = "uv-cli" version = "0.0.1" @@ -4641,17 +4385,17 @@ dependencies = [ "anyhow", "clap", "clap_complete_command", - "distribution-types", "fs-err", "insta", - "install-wheel-rs", - "pep508_rs", - "pypi-types", "serde", "url", "uv-cache", "uv-configuration", + "uv-distribution-types", + "uv-install-wheel", "uv-normalize", + "uv-pep508", + "uv-pypi-types", "uv-python", "uv-resolver", "uv-settings", @@ -4667,9 +4411,7 @@ dependencies = [ "async-trait", "async_http_range_reader", "async_zip", - "cache-key", - "distribution-filename", - "distribution-types", + "bytecheck", "fs-err", "futures", "html-escape", @@ -4680,10 +4422,6 @@ dependencies = [ "insta", "itertools 0.13.0", "jiff", - "pep440_rs", - "pep508_rs", - "platform-tags", - "pypi-types", "reqwest", "reqwest-middleware", "reqwest-retry", @@ -4701,10 +4439,17 @@ dependencies = [ "urlencoding", "uv-auth", "uv-cache", + "uv-cache-key", "uv-configuration", + "uv-distribution-filename", + "uv-distribution-types", "uv-fs", "uv-metadata", "uv-normalize", + "uv-pep440", + "uv-pep508", + "uv-platform-tags", + "uv-pypi-types", "uv-version", "uv-warnings", ] @@ -4714,15 +4459,13 @@ name = "uv-configuration" version = "0.0.1" dependencies = [ "anyhow", - "cache-key", "clap", "either", - "pep508_rs", - "platform-tags", - "pypi-types", + "fs-err", "rustc-hash", "schemars", "serde", + "serde-untagged", "serde_json", "thiserror", "tracing", @@ -4730,7 +4473,20 @@ dependencies = [ "uv-auth", "uv-cache", "uv-cache-info", + "uv-cache-key", "uv-normalize", + "uv-pep508", + "uv-platform-tags", + "uv-pypi-types", + "which", +] + +[[package]] +name = "uv-console" +version = "0.0.1" +dependencies = [ + "console", + "ctrlc", ] [[package]] @@ -4740,24 +4496,18 @@ dependencies = [ "anstream", "anyhow", "clap", - "distribution-filename", - "distribution-types", "fs-err", "itertools 0.13.0", "markdown", - "mimalloc", "owo-colors", - "pep508_rs", "poloto", "pretty_assertions", - "pypi-types", "resvg", "schemars", "serde", "serde_json", "tagu", "textwrap", - "tikv-jemallocator", "tokio", "tracing", "tracing-durations-export", @@ -4765,9 +4515,14 @@ dependencies = [ "uv-cache", "uv-cli", "uv-client", + "uv-distribution-filename", + "uv-distribution-types", "uv-installer", "uv-macros", "uv-options-metadata", + "uv-pep508", + "uv-performance-memory-allocator", + "uv-pypi-types", "uv-python", "uv-settings", "uv-workspace", @@ -4779,20 +4534,20 @@ name = "uv-dispatch" version = "0.0.1" dependencies = [ "anyhow", - "distribution-types", "futures", - "install-wheel-rs", "itertools 0.13.0", - "pypi-types", "rustc-hash", "tracing", - "uv-build", + "uv-build-frontend", "uv-cache", "uv-client", "uv-configuration", "uv-distribution", + "uv-distribution-types", "uv-git", + "uv-install-wheel", "uv-installer", + "uv-pypi-types", "uv-python", "uv-resolver", "uv-types", @@ -4803,18 +4558,13 @@ name = "uv-distribution" version = "0.0.1" dependencies = [ "anyhow", - "cache-key", - "distribution-filename", - "distribution-types", + "either", "fs-err", "futures", "indoc", "insta", "nanoid", - "pep440_rs", - "pep508_rs", - "platform-tags", - "pypi-types", + "owo-colors", "reqwest", "reqwest-middleware", "rmp-serde", @@ -4828,13 +4578,20 @@ dependencies = [ "url", "uv-cache", "uv-cache-info", + "uv-cache-key", "uv-client", "uv-configuration", + "uv-distribution-filename", + "uv-distribution-types", "uv-extract", "uv-fs", "uv-git", "uv-metadata", "uv-normalize", + "uv-pep440", + "uv-pep508", + "uv-platform-tags", + "uv-pypi-types", "uv-types", "uv-warnings", "uv-workspace", @@ -4842,18 +4599,59 @@ dependencies = [ "zip", ] +[[package]] +name = "uv-distribution-filename" +version = "0.0.1" +dependencies = [ + "insta", + "rkyv", + "serde", + "thiserror", + "url", + "uv-normalize", + "uv-pep440", + "uv-platform-tags", +] + +[[package]] +name = "uv-distribution-types" +version = "0.0.1" +dependencies = [ + "anyhow", + "fs-err", + "itertools 0.13.0", + "jiff", + "rkyv", + "rustc-hash", + "schemars", + "serde", + "serde_json", + "thiserror", + "tracing", + "url", + "urlencoding", + "uv-cache-info", + "uv-cache-key", + "uv-distribution-filename", + "uv-fs", + "uv-git", + "uv-normalize", + "uv-pep440", + "uv-pep508", + "uv-platform-tags", + "uv-pypi-types", +] + [[package]] name = "uv-extract" version = "0.0.1" dependencies = [ "async-compression", "async_zip", - "distribution-filename", "fs-err", "futures", "krata-tokio-tar", "md-5", - "pypi-types", "rayon", "reqwest", "rustc-hash", @@ -4862,6 +4660,8 @@ dependencies = [ "tokio", "tokio-util", "tracing", + "uv-distribution-filename", + "uv-pypi-types", "xz2", "zip", ] @@ -4879,12 +4679,14 @@ dependencies = [ "fs2", "junction", "path-slash", + "rustix", + "schemars", "serde", "tempfile", "tokio", "tracing", "urlencoding", - "uv-warnings", + "winsafe 0.0.22", ] [[package]] @@ -4892,7 +4694,6 @@ name = "uv-git" version = "0.0.1" dependencies = [ "anyhow", - "cache-key", "cargo-util", "dashmap", "fs-err", @@ -4904,25 +4705,55 @@ dependencies = [ "tracing", "url", "uv-auth", + "uv-cache-key", "uv-fs", ] +[[package]] +name = "uv-install-wheel" +version = "0.0.1" +dependencies = [ + "anyhow", + "assert_fs", + "clap", + "configparser", + "csv", + "data-encoding", + "fs-err", + "indoc", + "mailparse", + "pathdiff", + "platform-info", + "reflink-copy", + "regex", + "rustc-hash", + "schemars", + "serde", + "serde_json", + "sha2", + "tempfile", + "thiserror", + "tracing", + "uv-cache-info", + "uv-distribution-filename", + "uv-fs", + "uv-normalize", + "uv-pep440", + "uv-platform-tags", + "uv-pypi-types", + "uv-warnings", + "walkdir", + "zip", +] + [[package]] name = "uv-installer" version = "0.0.1" dependencies = [ "anyhow", "async-channel", - "cache-key", - "distribution-filename", - "distribution-types", "fs-err", "futures", - "install-wheel-rs", - "pep440_rs", - "pep508_rs", - "platform-tags", - "pypi-types", "rayon", "rustc-hash", "same-file", @@ -4933,12 +4764,18 @@ dependencies = [ "url", "uv-cache", "uv-cache-info", + "uv-cache-key", "uv-configuration", "uv-distribution", + "uv-distribution-types", "uv-extract", "uv-fs", - "uv-git", + "uv-install-wheel", "uv-normalize", + "uv-pep440", + "uv-pep508", + "uv-platform-tags", + "uv-pypi-types", "uv-python", "uv-types", "uv-warnings", @@ -4951,7 +4788,7 @@ version = "0.0.1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", "textwrap", ] @@ -4960,14 +4797,14 @@ name = "uv-metadata" version = "0.1.0" dependencies = [ "async_zip", - "distribution-filename", "fs-err", "futures", - "pypi-types", "thiserror", "tokio", "tokio-util", + "uv-distribution-filename", "uv-normalize", + "uv-pypi-types", "zip", ] @@ -4980,6 +4817,15 @@ dependencies = [ "serde", ] +[[package]] +name = "uv-once-map" +version = "0.0.1" +dependencies = [ + "dashmap", + "futures", + "tokio", +] + [[package]] name = "uv-options-metadata" version = "0.0.1" @@ -4987,14 +4833,137 @@ dependencies = [ "serde", ] +[[package]] +name = "uv-pep440" +version = "0.7.0" +dependencies = [ + "indoc", + "rkyv", + "serde", + "tracing", + "unicode-width", + "unscanny", +] + +[[package]] +name = "uv-pep508" +version = "0.6.0" +dependencies = [ + "boxcar", + "indexmap", + "insta", + "itertools 0.13.0", + "log", + "pubgrub", + "regex", + "rustc-hash", + "schemars", + "serde", + "serde_json", + "smallvec", + "testing_logger", + "thiserror", + "tracing", + "unicode-width", + "url", + "uv-fs", + "uv-normalize", + "uv-pep440", + "uv-pubgrub", +] + +[[package]] +name = "uv-performance-flate2-backend" +version = "0.1.0" +dependencies = [ + "flate2", +] + +[[package]] +name = "uv-performance-memory-allocator" +version = "0.1.0" +dependencies = [ + "mimalloc", + "tikv-jemallocator", +] + +[[package]] +name = "uv-platform-tags" +version = "0.0.1" +dependencies = [ + "insta", + "rustc-hash", + "serde", + "thiserror", +] + [[package]] name = "uv-pubgrub" version = "0.0.1" dependencies = [ "itertools 0.13.0", - "pep440_rs", "pubgrub", "thiserror", + "uv-pep440", +] + +[[package]] +name = "uv-publish" +version = "0.1.0" +dependencies = [ + "async-compression", + "base64 0.22.1", + "fs-err", + "futures", + "glob", + "insta", + "itertools 0.13.0", + "krata-tokio-tar", + "reqwest", + "reqwest-middleware", + "reqwest-retry", + "rustc-hash", + "serde", + "serde_json", + "sha2", + "thiserror", + "tokio", + "tokio-util", + "tracing", + "url", + "uv-client", + "uv-configuration", + "uv-distribution-filename", + "uv-fs", + "uv-metadata", + "uv-pypi-types", + "uv-warnings", +] + +[[package]] +name = "uv-pypi-types" +version = "0.0.1" +dependencies = [ + "anyhow", + "indexmap", + "itertools 0.13.0", + "jiff", + "mailparse", + "regex", + "rkyv", + "serde", + "serde-untagged", + "thiserror", + "toml", + "toml_edit", + "tracing", + "url", + "uv-distribution-filename", + "uv-fs", + "uv-git", + "uv-normalize", + "uv-pep440", + "uv-pep508", ] [[package]] @@ -5003,26 +4972,18 @@ version = "0.0.1" dependencies = [ "anyhow", "assert_fs", - "cache-key", "clap", "configparser", - "distribution-filename", "fs-err", "futures", "goblin", "indoc", - "install-wheel-rs", "itertools 0.13.0", "owo-colors", - "pep440_rs", - "pep508_rs", - "platform-tags", - "pypi-types", "regex", "reqwest", "reqwest-middleware", "rmp-serde", - "rustix", "same-file", "schemars", "serde", @@ -5038,16 +4999,22 @@ dependencies = [ "url", "uv-cache", "uv-cache-info", + "uv-cache-key", "uv-client", + "uv-distribution-filename", "uv-extract", "uv-fs", + "uv-install-wheel", + "uv-pep440", + "uv-pep508", + "uv-platform-tags", + "uv-pypi-types", "uv-state", "uv-warnings", "which", "windows-registry", "windows-result 0.2.0", "windows-sys 0.59.0", - "winsafe 0.0.22", ] [[package]] @@ -5055,60 +5022,81 @@ name = "uv-requirements" version = "0.1.0" dependencies = [ "anyhow", - "cache-key", "configparser", "console", - "ctrlc", - "distribution-filename", - "distribution-types", "fs-err", "futures", - "pep508_rs", - "pypi-types", - "requirements-txt", "rustc-hash", "serde", "thiserror", "toml", "tracing", "url", + "uv-cache-key", "uv-client", "uv-configuration", + "uv-console", "uv-distribution", + "uv-distribution-filename", + "uv-distribution-types", "uv-fs", "uv-git", "uv-normalize", + "uv-pep508", + "uv-pypi-types", + "uv-requirements-txt", "uv-resolver", "uv-types", "uv-warnings", "uv-workspace", ] +[[package]] +name = "uv-requirements-txt" +version = "0.0.1" +dependencies = [ + "anyhow", + "assert_fs", + "fs-err", + "indoc", + "insta", + "itertools 0.13.0", + "regex", + "reqwest", + "reqwest-middleware", + "tempfile", + "test-case", + "thiserror", + "tokio", + "tracing", + "unscanny", + "url", + "uv-client", + "uv-configuration", + "uv-distribution-types", + "uv-fs", + "uv-normalize", + "uv-pep508", + "uv-pypi-types", + "uv-warnings", +] + [[package]] name = "uv-resolver" version = "0.0.1" dependencies = [ "anyhow", - "cache-key", "clap", "dashmap", - "distribution-filename", - "distribution-types", "either", "futures", "indexmap", "insta", "itertools 0.13.0", "jiff", - "once-map", "owo-colors", - "pep440_rs", - "pep508_rs", "petgraph", - "platform-tags", "pubgrub", - "pypi-types", - "requirements-txt", "rkyv", "rustc-hash", "same-file", @@ -5122,15 +5110,24 @@ dependencies = [ "toml_edit", "tracing", "url", + "uv-cache-key", "uv-client", "uv-configuration", "uv-distribution", + "uv-distribution-filename", + "uv-distribution-types", "uv-fs", "uv-git", "uv-metadata", "uv-normalize", + "uv-once-map", + "uv-pep440", + "uv-pep508", + "uv-platform-tags", "uv-pubgrub", + "uv-pypi-types", "uv-python", + "uv-requirements-txt", "uv-types", "uv-warnings", "uv-workspace", @@ -5143,12 +5140,12 @@ dependencies = [ "fs-err", "indoc", "memchr", - "pep440_rs", - "pep508_rs", - "pypi-types", "serde", "thiserror", "toml", + "uv-pep440", + "uv-pep508", + "uv-pypi-types", "uv-settings", "uv-workspace", ] @@ -5159,23 +5156,24 @@ version = "0.0.1" dependencies = [ "clap", "dirs-sys", - "distribution-types", "fs-err", - "install-wheel-rs", - "pep508_rs", - "pypi-types", "schemars", "serde", "textwrap", "thiserror", "toml", "tracing", + "url", "uv-cache-info", "uv-configuration", + "uv-distribution-types", "uv-fs", + "uv-install-wheel", "uv-macros", "uv-normalize", "uv-options-metadata", + "uv-pep508", + "uv-pypi-types", "uv-python", "uv-resolver", "uv-warnings", @@ -5209,11 +5207,7 @@ version = "0.0.1" dependencies = [ "dirs-sys", "fs-err", - "install-wheel-rs", "pathdiff", - "pep440_rs", - "pep508_rs", - "pypi-types", "serde", "thiserror", "toml", @@ -5221,7 +5215,11 @@ dependencies = [ "tracing", "uv-cache", "uv-fs", + "uv-install-wheel", "uv-installer", + "uv-pep440", + "uv-pep508", + "uv-pypi-types", "uv-python", "uv-settings", "uv-state", @@ -5233,24 +5231,24 @@ name = "uv-types" version = "0.0.1" dependencies = [ "anyhow", - "distribution-types", - "once-map", - "pep440_rs", - "pep508_rs", - "pypi-types", "rustc-hash", "thiserror", "url", "uv-cache", "uv-configuration", + "uv-distribution-types", "uv-git", "uv-normalize", + "uv-once-map", + "uv-pep440", + "uv-pep508", + "uv-pypi-types", "uv-python", ] [[package]] name = "uv-version" -version = "0.4.11" +version = "0.4.20" [[package]] name = "uv-virtualenv" @@ -5259,11 +5257,11 @@ dependencies = [ "fs-err", "itertools 0.13.0", "pathdiff", - "platform-tags", - "pypi-types", "thiserror", "tracing", "uv-fs", + "uv-platform-tags", + "uv-pypi-types", "uv-python", "uv-version", ] @@ -5288,14 +5286,13 @@ dependencies = [ "glob", "insta", "itertools 0.13.0", - "pep440_rs", - "pep508_rs", - "pypi-types", + "owo-colors", "regex", "rustc-hash", "same-file", "schemars", "serde", + "serde-untagged", "tempfile", "thiserror", "tokio", @@ -5308,6 +5305,9 @@ dependencies = [ "uv-macros", "uv-normalize", "uv-options-metadata", + "uv-pep440", + "uv-pep508", + "uv-pypi-types", "uv-warnings", ] @@ -5379,7 +5379,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn", "wasm-bindgen-shared", ] @@ -5413,7 +5413,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5518,7 +5518,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.48.0", ] [[package]] @@ -5580,7 +5580,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -5591,7 +5591,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -5602,7 +5602,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -5613,7 +5613,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -5858,15 +5858,6 @@ dependencies = [ "url", ] -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - [[package]] name = "xattr" version = "1.3.1" @@ -5917,7 +5908,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[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 7b507ceebd..9ac434f41c 100644 --- a/third_party/nixpkgs/pkgs/by-name/uv/uv/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/uv/uv/package.nix @@ -9,21 +9,20 @@ python3Packages, rustPlatform, stdenv, - testers, - uv, + versionCheckHook, nix-update-script, }: python3Packages.buildPythonApplication rec { pname = "uv"; - version = "0.4.11"; + version = "0.4.20"; pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; rev = "refs/tags/${version}"; - hash = "sha256-a8mN2wag26BSL+2b5i4P1XN34J8jt+lZm2poZQdsAzM="; + hash = "sha256-PfjYGCPPRZVm4H9oxkWdjW7kHu4CqdkenFgL61dOU5k="; }; cargoDeps = rustPlatform.importCargoLock { @@ -65,8 +64,12 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "uv" ]; + nativeCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + passthru = { - tests.version = testers.testVersion { package = uv; }; updateScript = nix-update-script { }; }; diff --git a/third_party/nixpkgs/pkgs/by-name/ux/uxplay/package.nix b/third_party/nixpkgs/pkgs/by-name/ux/uxplay/package.nix index 225475320e..e8430e5a95 100644 --- a/third_party/nixpkgs/pkgs/by-name/ux/uxplay/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ux/uxplay/package.nix @@ -3,37 +3,36 @@ stdenv, fetchFromGitHub, cmake, - openssl, - libplist, pkg-config, wrapGAppsHook3, avahi, avahi-compat, gst_all_1, + libplist, + openssl, nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "uxplay"; - version = "1.69"; + version = "1.70"; src = fetchFromGitHub { owner = "FDH2"; repo = "UxPlay"; rev = "v${finalAttrs.version}"; - hash = "sha256-4QNuM/yMb5wSTSjTbqrTgU+FHFMIyIH8pRBwuGhAJU4="; + hash = "sha256-5nKkQxoLe7g+fw65uVG0kiJHAEBB5B562bT3Smck1iA="; }; postPatch = '' substituteInPlace lib/CMakeLists.txt \ + --replace "APPLE" "FALSE" \ --replace ".a" "${stdenv.hostPlatform.extensions.sharedLibrary}" - sed -i '/PKG_CONFIG_EXECUTABLE/d' renderers/CMakeLists.txt + sed -i -e '/PKG_CONFIG_EXECUTABLE/d' -e '/PKG_CONFIG_PATH/d' renderers/CMakeLists.txt ''; nativeBuildInputs = [ cmake - openssl - libplist pkg-config wrapGAppsHook3 ]; @@ -47,6 +46,8 @@ stdenv.mkDerivation (finalAttrs: { gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav + libplist + openssl ]; passthru.updateScript = nix-update-script { }; diff --git a/third_party/nixpkgs/pkgs/by-name/va/vault-bin/package.nix b/third_party/nixpkgs/pkgs/by-name/va/vault-bin/package.nix index 896597eb57..c6622a32c8 100644 --- a/third_party/nixpkgs/pkgs/by-name/va/vault-bin/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/va/vault-bin/package.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "vault-bin"; - version = "1.17.6"; + version = "1.18.0"; src = let @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; hash = selectSystem { - x86_64-linux = "sha256-K9yNZ4M8u8FfisWi6Y6TsBJy6FQytr3htNCsKh2MlyA="; - aarch64-linux = "sha256-KLHkxUGvekHT/bPtoIlmylCubTWH+I7Q0wJM0UG0Hp8="; - i686-linux = "sha256-jBS/nGKP27weFw4u6Q10athYwCqWLzpb7ph39v+QAN8="; - x86_64-darwin = "sha256-5KfWqtJldk66dO5ImYKivDau4JzacUIXBfAzWkkPfoE="; - aarch64-darwin = "sha256-wjmNY1lunJDjpkWDXl0upAeNBqBx8momlY4a3j+hMd0="; + x86_64-linux = "sha256-fyVkSZ20tUcBv9/iT1h3o/2KkoCJ5op7DBoMc0US7SM="; + aarch64-linux = "sha256-Vsc0ra+OzrDBwmKke0ef4kfy5CWu5m34gC7u0BDL7uo="; + i686-linux = "sha256-3uAkBPOoMbdfS5EfII03JbVl1ekfRXm4yv1rL5A7x7c="; + x86_64-darwin = "sha256-fydYqDEihbGuZ9I1quJSJk+lJxnSkqF+t1mOP8EA2Ok="; + aarch64-darwin = "sha256-yJmNM9eQydbRdY6+JK28hhzXJ9Hj3CcwUJkhS60aCyA="; }; in fetchzip { diff --git a/third_party/nixpkgs/pkgs/by-name/va/vault-bin/update-bin.sh b/third_party/nixpkgs/pkgs/by-name/va/vault-bin/update-bin.sh index cd91fe4b60..f397f48c68 100755 --- a/third_party/nixpkgs/pkgs/by-name/va/vault-bin/update-bin.sh +++ b/third_party/nixpkgs/pkgs/by-name/va/vault-bin/update-bin.sh @@ -4,7 +4,7 @@ set -euo pipefail ROOT="$(dirname "$(readlink -f "$0")")" -NIX_DRV="$ROOT/vault-bin.nix" +NIX_DRV="$ROOT/package.nix" if [ ! -f "$NIX_DRV" ]; then echo "ERROR: cannot find vault-bin in $ROOT" exit 1 diff --git a/third_party/nixpkgs/pkgs/by-name/va/vault/package.nix b/third_party/nixpkgs/pkgs/by-name/va/vault/package.nix index f34203cf96..cdb465e980 100644 --- a/third_party/nixpkgs/pkgs/by-name/va/vault/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/va/vault/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "vault"; - version = "1.17.6"; + version = "1.18.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - hash = "sha256-sd4gNNJ/DVpl7ReymykNemWz4NNisofMIH6lLNl+iVw="; + hash = "sha256-5CqA2dZZdV1IiGSGwCA2eQIhp3lrsDIJt4rDK1vdvmE="; }; - vendorHash = "sha256-V7aMf03U2DTNg1murp4LBfuOioA+7iG6jX9o05rhM2U="; + vendorHash = "sha256-2txRuunh6x+iDKRpljGpSX6Q8q11a84CPVm6d299NNY="; proxyVendor = true; diff --git a/third_party/nixpkgs/pkgs/by-name/vl/vlc/package.nix b/third_party/nixpkgs/pkgs/by-name/vl/vlc/package.nix index 100d4661de..4272632009 100644 --- a/third_party/nixpkgs/pkgs/by-name/vl/vlc/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/vl/vlc/package.nix @@ -10,7 +10,8 @@ , faad2 , fetchpatch , fetchurl -, ffmpeg +# Please unpin FFmpeg on the next upstream release. +, ffmpeg_6 , flac , fluidsynth , freefont_ttf @@ -135,7 +136,7 @@ stdenv.mkDerivation (finalAttrs: { avahi dbus faad2 - ffmpeg + ffmpeg_6 flac fluidsynth fribidi @@ -212,6 +213,8 @@ stdenv.mkDerivation (finalAttrs: { # set the path to the compiler BUILDCC = "${pkgsBuildBuild.stdenv.cc}/bin/gcc"; PKG_CONFIG_WAYLAND_SCANNER_WAYLAND_SCANNER = "wayland-scanner"; + } // lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; } // lib.optionalAttrs (!stdenv.hostPlatform.isAarch) { LIVE555_PREFIX = live555; }; diff --git a/third_party/nixpkgs/pkgs/by-name/vp/vpl-gpu-rt/package.nix b/third_party/nixpkgs/pkgs/by-name/vp/vpl-gpu-rt/package.nix index 9dac995970..c5a9df335d 100644 --- a/third_party/nixpkgs/pkgs/by-name/vp/vpl-gpu-rt/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/vp/vpl-gpu-rt/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "vpl-gpu-rt"; - version = "24.2.5"; + version = "24.3.3"; outputs = [ "out" "dev" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "vpl-gpu-rt"; rev = "intel-onevpl-${version}"; - hash = "sha256-WYlA8+i8TTFHsU4+doLcv75F9MR2V/BEuNGGLgM4p1s="; + hash = "sha256-aTVSkkSQmcnRcx1J0zqdT6Z6f2GQVRTR8b2JFov6DFE="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/by-name/vp/vpp/package.nix b/third_party/nixpkgs/pkgs/by-name/vp/vpp/package.nix new file mode 100644 index 0000000000..fafcb1784b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/vp/vpp/package.nix @@ -0,0 +1,126 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, + cmake, + pkg-config, + check, + openssl, + python3, + subunit, + mbedtls_2, + libpcap, + libnl, + libmnl, + libelf, + dpdk, + jansson, + zlib, + rdma-core, + libbpf, + xdp-tools, + enableDpdk ? true, + enableRdma ? true, + # FIXME: broken: af_xdp plugins - no working libbpf found - af_xdp plugin disabled + enableAfXdp ? false, +}: + +let + dpdk' = dpdk.overrideAttrs (old: { + mesonFlags = old.mesonFlags ++ [ "-Denable_driver_sdk=true" ]; + }); + + rdma-core' = rdma-core.overrideAttrs (old: { + cmakeFlags = old.cmakeFlags ++ [ + "-DENABLE_STATIC=1" + "-DBUILD_SHARED_LIBS:BOOL=false" + ]; + }); + + xdp-tools' = xdp-tools.overrideAttrs (old: { + postInstall = ""; + dontDisableStatic = true; + }); +in +stdenv.mkDerivation rec { + pname = "vpp"; + version = "24.06"; + + src = fetchFromGitHub { + owner = "FDio"; + repo = "vpp"; + rev = "v${version}"; + hash = "sha256-AbdtH3ha/Bzj9tAkp4OhjRcUZilUEt+At0LukWN2LJU="; + }; + + postPatch = '' + patchShebangs scripts/ + substituteInPlace CMakeLists.txt \ + --replace "plugins tools/vppapigen tools/g2 tools/perftool cmake pkg" \ + "plugins tools/vppapigen tools/g2 tools/perftool cmake" + ''; + + preConfigure = '' + echo "${version}-nixos" > scripts/.version + scripts/version + ''; + + postConfigure = '' + patchShebangs ../tools/ + patchShebangs ../vpp-api/ + ''; + + sourceRoot = "source/src"; + + enableParallelBuilding = true; + env.NIX_CFLAGS_COMPILE = "-Wno-error -Wno-array-bounds -Wno-maybe-uninitialized"; + + cmakeFlags = [ + "-DVPP_PLATFORM=default" + "-DVPP_LIBRARY_DIR=lib" + ] ++ lib.optional enableDpdk "-DVPP_USE_SYSTEM_DPDK=ON"; + + nativeBuildInputs = [ + cmake + pkg-config + ] ++ lib.optional enableDpdk dpdk' ++ lib.optional enableRdma rdma-core'.dev; + + buildInputs = + [ + check + openssl + (python3.withPackages (ps: [ ps.ply ])) + + subunit # vapi tests + mbedtls_2 # tlsmbed plugin + libpcap # bpf_trace_filter plugin + + # linux-cp plugin + libnl + libmnl + ] + ++ lib.optionals enableDpdk [ + # dpdk plugin + libelf + jansson + zlib + ] + ++ lib.optionals enableAfXdp [ + # af_xdp plugin + libelf + libbpf + xdp-tools' + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Fast, scalable layer 2-4 multi-platform network stack running in user space"; + homepage = "https://s3-docs.fd.io/vpp/${version}/"; + license = [ lib.licenses.asl20 ]; + maintainers = with lib.maintainers; [ romner-set ]; + mainProgram = "vpp"; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/vu/vuls/package.nix b/third_party/nixpkgs/pkgs/by-name/vu/vuls/package.nix new file mode 100644 index 0000000000..25cc8b5b54 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/vu/vuls/package.nix @@ -0,0 +1,40 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "vuls"; + version = "0.27.0"; + + src = fetchFromGitHub { + owner = "future-architect"; + repo = "vuls"; + rev = "refs/tags/v${version}"; + hash = "sha256-+KEcK9GLx1QErRQlSVGeFnvYoWY3lVFr7S4Zb34Djzo="; + fetchSubmodules = true; + }; + + vendorHash = "sha256-XTKPsXCOzrji3qq+L4NR8FLBnXcafLj8w3K+UwowLQU="; + + ldflags = [ + "-s" + "-w" + "-X=github.com/future-architect/vuls/config.Version=${version}" + "-X=github.com/future-architect/vuls/config.Revision=${src.rev}-1970-01-01T00:00:00Z" + ]; + + postFixup = '' + mv $out/bin/cmd $out/bin/trivy-to-vuls + ''; + + meta = { + description = "Agent-less vulnerability scanner"; + homepage = "https://github.com/future-architect/vuls"; + changelog = "https://github.com/future-architect/vuls/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "vuls"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/wa/wakapi/package.nix b/third_party/nixpkgs/pkgs/by-name/wa/wakapi/package.nix index ace3fbb241..5ee8fee4f3 100644 --- a/third_party/nixpkgs/pkgs/by-name/wa/wakapi/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wa/wakapi/package.nix @@ -1,12 +1,12 @@ { lib, - buildGo123Module, + buildGoModule, fetchFromGitHub, }: let - version = "2.12.0"; + version = "2.12.1"; in -buildGo123Module { +buildGoModule { pname = "wakapi"; inherit version; @@ -14,7 +14,7 @@ buildGo123Module { owner = "muety"; repo = "wakapi"; rev = "refs/tags/${version}"; - hash = "sha256-/aacT/VLA5S4PeGcxEGaCpgAw++b3VFD7T0CldZWcQI="; + hash = "sha256-+JxTszBa6rURm0vPy8Oke5/hX9EmDphWEp2eglS+SFU="; }; vendorHash = "sha256-Q56Ud0MtkstB/dhn+QyAHTzIqHsmKvHEK+5PAt5lIMM="; diff --git a/third_party/nixpkgs/pkgs/applications/misc/wallust/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wallust/package.nix similarity index 87% rename from third_party/nixpkgs/pkgs/applications/misc/wallust/default.nix rename to third_party/nixpkgs/pkgs/by-name/wa/wallust/package.nix index e7db47b118..adb5c25302 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/wallust/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/wa/wallust/package.nix @@ -7,7 +7,7 @@ , installShellFiles }: let - version = "3.0.0"; + version = "3.1.0"; in rustPlatform.buildRustPackage { pname = "wallust"; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage { owner = "explosion-mental"; repo = "wallust"; rev = version; - hash = "sha256-vZTHlonepK1cyxHhGu3bVBuOmExPtRFrAnYp71Jfs8c="; + hash = "sha256-Tad+zyhmTr734GEW0A4SNrfWzqcL0gLFsM6MoMrV17k="; }; - cargoHash = "sha256-o6VRekazqbKTef6SLjHqs9/z/Q70auvunP+yFDkclpg="; + cargoHash = "sha256-SEaq0qeWuDeIeCqz9imb5nV4WK44CF5wIwG62nhyqlU="; nativeBuildInputs = [ makeWrapper installShellFiles ]; 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 73a360b88f..acd09406fe 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,14 +1,14 @@ { "darwin": { - "hash": "sha256-zbnOkld+6UnSeMfvc6P6qZ474KaHcx1Qzyr4HCWsv98=", - "version": "0.2024.09.24.08.02.stable_01" + "hash": "sha256-LPH9JbOXOBjT4vMWNGMvQYDVnTE6p2tFTlOe8HOFsk0=", + "version": "0.2024.10.08.08.02.stable_02" }, "linux_x86_64": { - "hash": "sha256-SeTzKFsY+p0oJFTmBEmj64tOPS7BlBLtYdoIJ9jmTD0=", - "version": "0.2024.09.24.08.02.stable_01" + "hash": "sha256-jwbwRgQ7WR04zCki7PQuuMZD7v2tFl3Gm1olZ28FAp8=", + "version": "0.2024.10.08.08.02.stable_02" }, "linux_aarch64": { - "hash": "sha256-lAiu20udBEJhu29vqiS8vYauuu0fcX1LlvqEqYN5WXU=", - "version": "0.2024.09.24.08.02.stable_01" + "hash": "sha256-Ticn8OMYHWQT88WQSpgcT/kBVnHyoDHNhTk0m4T45bQ=", + "version": "0.2024.10.08.08.02.stable_02" } } diff --git a/third_party/nixpkgs/pkgs/by-name/wa/waveterm/package.nix b/third_party/nixpkgs/pkgs/by-name/wa/waveterm/package.nix index cc1053d58f..9d13d24abd 100644 --- a/third_party/nixpkgs/pkgs/by-name/wa/waveterm/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wa/waveterm/package.nix @@ -32,32 +32,32 @@ }: let - inherit (stdenv.hostPlatform) system; - throwSystem = throw "Unsupported system: ${system}"; - pname = "waveterm"; - version = "0.8.8"; + version = "0.8.10"; - suffix = - { - x86_64-linux = "waveterm-linux-x64-${version}.zip"; - aarch64-linux = "waveterm-linux-arm64-${version}.zip"; - x86_64-darwin = "Wave-darwin-universal-${version}.zip "; - aarch64-darwin = "Wave-darwin-arm64-${version}.zip"; - } - .${system} or throwSystem; + src = + let + inherit (stdenv.hostPlatform) system; + selectSystem = attrs: attrs.${system} or (throw "Unsupported system: ${system}"); + suffix = selectSystem { + x86_64-linux = "waveterm-linux-x64-${version}.zip"; + aarch64-linux = "waveterm-linux-arm64-${version}.zip"; + x86_64-darwin = "Wave-darwin-universal-${version}.zip "; + aarch64-darwin = "Wave-darwin-arm64-${version}.zip"; + }; + hash = selectSystem { + x86_64-linux = "sha256-jhXHuzHMwo9U5B+FA2xAreOYRVroMCXqDo+9pjAyh0Q="; + aarch64-linux = "sha256-JnKkjG67uvYNod+uosJ+svTAm9bulJzTpza3jQie1yQ="; + x86_64-darwin = "sha256-Dk/pKZrqkjKc7WEGkrLdZdgUEaz8ndXjZuINyVNxEa8="; + aarch64-darwin = "sha256-FgBbUrp+Z9K4gmM4mew0NQ2yIjuC+cgYrrYkjv0Ohhg="; + }; + in + fetchurl { + url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/${suffix}"; + inherit hash; + }; - src = fetchurl { - url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/${suffix}"; - hash = - { - x86_64-linux = "sha256-hRpJTFVoBQZyJD06FTRbBPj/1DlYlDWPRjJ1IKeK7Cs="; - aarch64-linux = "sha256-T3VqsoHhPYYrAe/dEd0SUH+G4jpHjKpJTrFy8/AgoKI="; - x86_64-darwin = "sha256-UlyNl2Qu59L4hnK8rTeUV30YVD45L7ub5SP8f97aJrw="; - aarch64-darwin = "sha256-cP+z8DQsNBJc3p57xQdGqqq7jvYcRQRIa+P+6kD3eCc="; - } - .${system} or throwSystem; - }; + passthru.updateScript = ./update.sh; desktopItems = [ (makeDesktopItem { @@ -112,6 +112,8 @@ let src desktopItems unpackPhase + meta + passthru ; nativeBuildInputs = [ @@ -172,6 +174,7 @@ let src unpackPhase meta + passthru ; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/wa/waveterm/update.sh b/third_party/nixpkgs/pkgs/by-name/wa/waveterm/update.sh new file mode 100755 index 0000000000..7950a65e8d --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/wa/waveterm/update.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash curl coreutils jq common-updater-scripts + +latestTag=$(curl https://api.github.com/repos/wavetermdev/waveterm/releases/latest | jq -r ".tag_name") +latestVersion="$(expr "$latestTag" : 'v\(.*\)')" +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; waveterm.version" | tr -d '"') + +echo "latest version: $latestVersion" +echo "current version: $currentVersion" + +if [[ "$latestVersion" == "$currentVersion" ]]; then + echo "package is up-to-date" + exit 0 +fi +for i in \ + "x86_64-linux waveterm-linux-x64" \ + "aarch64-linux waveterm-linux-arm64" \ + "x86_64-darwin Wave-darwin-universal" \ + "aarch64-darwin Wave-darwin-arm64"; do + set -- $i + prefetch=$(nix-prefetch-url "https://github.com/wavetermdev/waveterm/releases/download/v$latestVersion/$2-$latestVersion.zip") + hash=$(nix-hash --type sha256 --to-sri $prefetch) + + update-source-version waveterm $latestVersion $hash --system=$1 --ignore-same-version +done diff --git a/third_party/nixpkgs/pkgs/by-name/wa/waydroid/package.nix b/third_party/nixpkgs/pkgs/by-name/wa/waydroid/package.nix new file mode 100644 index 0000000000..8ea14e4b7c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/wa/waydroid/package.nix @@ -0,0 +1,106 @@ +{ + lib, + fetchFromGitHub, + fetchpatch, + python3Packages, + dnsmasq, + gawk, + getent, + gobject-introspection, + gtk3, + kmod, + lxc, + iproute2, + iptables, + util-linux, + wrapGAppsHook3, + wl-clipboard, + runtimeShell, + nix-update-script, +}: + +python3Packages.buildPythonApplication rec { + pname = "waydroid"; + version = "1.4.3"; + format = "other"; + + src = fetchFromGitHub { + owner = "waydroid"; + repo = "waydroid"; + rev = "refs/tags/${version}"; + hash = "sha256-LejyuGYgW46++95XROuWc13Q+w0l+AzGAl9ekfmAIEk="; + }; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook3 + ]; + + buildInputs = [ + gtk3 + ]; + + propagatedBuildInputs = with python3Packages; [ + dbus-python + gbinder-python + pyclip + pygobject3 + ]; + + dontUseSetuptoolsBuild = true; + dontUsePipInstall = true; + dontUseSetuptoolsCheck = true; + dontWrapPythonPrograms = true; + dontWrapGApps = true; + + installFlags = [ + "PREFIX=$(out)" + "USE_SYSTEMD=0" + "SYSCONFDIR=$(out)/etc" + ]; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + + patchShebangs --host $out/lib/waydroid/data/scripts + wrapProgram $out/lib/waydroid/data/scripts/waydroid-net.sh \ + --prefix PATH ":" ${ + lib.makeBinPath [ + dnsmasq + getent + iproute2 + iptables + ] + } + + wrapPythonProgramsIn $out/lib/waydroid/ "${ + lib.concatStringsSep " " ( + [ + "$out" + ] + ++ propagatedBuildInputs + ++ [ + gawk + kmod + lxc + util-linux + wl-clipboard + ] + ) + }" + + substituteInPlace $out/lib/waydroid/tools/helpers/*.py \ + --replace '"sh"' '"${runtimeShell}"' + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Container-based approach to boot a full Android system on a regular GNU/Linux system"; + mainProgram = "waydroid"; + homepage = "https://github.com/waydroid/waydroid"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ mcaju ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/we/weblate/package.nix b/third_party/nixpkgs/pkgs/by-name/we/weblate/package.nix index 0993515eb1..690eba3a3b 100644 --- a/third_party/nixpkgs/pkgs/by-name/we/weblate/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/we/weblate/package.nix @@ -44,6 +44,9 @@ python.pkgs.buildPythonApplication rec { hash = "sha256-cIwCNYXbg7l6z9OAkMAGJ783QI/nCOyrhLPURDcDv+Y="; }; + # https://github.com/WeblateOrg/weblate/commit/1cf2a423b20fcd2dde18a43277311334e38208e7 + pythonRelaxDeps = [ "rapidfuzz" ]; + patches = [ # FIXME This shouldn't be necessary and probably has to do with some dependency mismatch. ./cache.lock.patch diff --git a/third_party/nixpkgs/pkgs/by-name/wg/wgpu/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/wg/wgpu-utils/Cargo.lock similarity index 100% rename from third_party/nixpkgs/pkgs/by-name/wg/wgpu/Cargo.lock rename to third_party/nixpkgs/pkgs/by-name/wg/wgpu-utils/Cargo.lock diff --git a/third_party/nixpkgs/pkgs/by-name/wg/wgpu/package.nix b/third_party/nixpkgs/pkgs/by-name/wg/wgpu-utils/package.nix similarity index 60% rename from third_party/nixpkgs/pkgs/by-name/wg/wgpu/package.nix rename to third_party/nixpkgs/pkgs/by-name/wg/wgpu-utils/package.nix index 6fd675b167..80b7f6d0e7 100644 --- a/third_party/nixpkgs/pkgs/by-name/wg/wgpu/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wg/wgpu-utils/package.nix @@ -1,23 +1,25 @@ { - rustPlatform, lib, - fetchFromGitHub, - nix-update-script, - cmake, - pkg-config, - fontconfig, stdenv, + rustPlatform, + fetchFromGitHub, + pkg-config, + cmake, + makeWrapper, + vulkan-loader, + freetype, + fontconfig, darwin, }: rustPlatform.buildRustPackage rec { - pname = "wgpu"; + pname = "wgpu-utils"; version = "22.1.0"; src = fetchFromGitHub { owner = "gfx-rs"; repo = "wgpu"; - rev = "refs/tags/wgpu-v${version}"; + rev = "v${version}"; hash = "sha256-Gtq0xYZoWNwW+BKVLqVVKGqc+4HjaD7NN1hlzyFP5g0="; }; @@ -30,12 +32,14 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ - cmake pkg-config + cmake + makeWrapper ]; buildInputs = [ + freetype fontconfig ] ++ lib.optionals stdenv.hostPlatform.isDarwin ( @@ -47,19 +51,22 @@ rustPlatform.buildRustPackage rec { ] ); - #requires GPU + # Tests fail, as the Nix sandbox doesn't provide an appropriate adapter (e.g. Vulkan). doCheck = false; - passthru.updateScript = nix-update-script { }; + postInstall = '' + wrapProgram $out/bin/wgpu-info \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]} + ''; - meta = { + meta = with lib; { + description = "Safe and portable GPU abstraction in Rust, implementing WebGPU API"; homepage = "https://wgpu.rs/"; - description = "Cross-platform, safe, pure-Rust graphics API."; - changelog = "https://github.com/gfx-rs/wgpu/releases/tag/v${version}"; - maintainers = with lib.maintainers; [ bot-wxt1221 ]; - license = with lib.licenses; [ + license = with licenses; [ + asl20 # or mit - apsl20 ]; + maintainers = with maintainers; [ erictapen ]; + mainProgram = "wgpu-info"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/wh/whatsie/package.nix b/third_party/nixpkgs/pkgs/by-name/wh/whatsie/package.nix index 4dd6616668..aad6ed2b40 100644 --- a/third_party/nixpkgs/pkgs/by-name/wh/whatsie/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wh/whatsie/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "whatsie"; - version = "4.15.5"; + version = "4.16.0"; src = fetchFromGitHub { owner = "keshavbhatt"; repo = "whatsie"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-6tczt9oPtcKvA59YqRHGOE2VFQLRNbyHpCJ6b4kzgks="; + hash = "sha256-+sbnpaR+pR5aKbGUIVM3yRpco7/jE9LkCbQKrgFDYwM="; }; sourceRoot = "${finalAttrs.src.name}/src"; diff --git a/third_party/nixpkgs/pkgs/by-name/wh/whoami/package.nix b/third_party/nixpkgs/pkgs/by-name/wh/whoami/package.nix new file mode 100644 index 0000000000..d47aaed3ed --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/wh/whoami/package.nix @@ -0,0 +1,34 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "whoami"; + version = "1.10.3"; + + src = fetchFromGitHub { + owner = "traefik"; + repo = "whoami"; + rev = "v${version}"; + hash = "sha256-wzxgmysqn4aWAZEaMjMwHdHLe4UZ4nwdNFJw5X7fuKQ="; + }; + + vendorHash = "sha256-qDfkYIAymkFUtbKka9OLoYjT+S9KhOra2UtOvhoz5Mw="; + + ldflags = [ "-s" ]; + + CGO_ENABLED = 0; + + doCheck = false; + + meta = { + description = "Tiny Go server that prints os information and HTTP request to output"; + mainProgram = "whoami"; + homepage = "https://github.com/traefik/whoami"; + changelog = "https://github.com/traefik/whoami/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dvcorreia ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/wr/wrangler/package.nix b/third_party/nixpkgs/pkgs/by-name/wr/wrangler/package.nix index 0ad2886cbb..c18ef2dd97 100644 --- a/third_party/nixpkgs/pkgs/by-name/wr/wrangler/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wr/wrangler/package.nix @@ -13,18 +13,18 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "wrangler"; - version = "3.72.1"; + version = "3.80.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "workers-sdk"; rev = "wrangler@${finalAttrs.version}"; - hash = "sha256-LidJr+sYXArsnHGjR0akFm557SIHP6gzErifYkZqsRk="; + hash = "sha256-9ClosoDIT+yP2dvNenHW2RSxLimOT3znXD+Pq+N6cQA="; }; pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-USMDUz+qId6aSoCNxmzPMi3YCiakZ9jyLjEhujhVD8I="; + hash = "sha256-ld2+WUVJ2DtiwWmsxkYsU3ft3knHJvjMwSwZlk7reG8="; }; buildInputs = [ @@ -45,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { # so I simply removed it postBuild = '' rm -fr packages/vitest-pool-workers + NODE_ENV="production" pnpm --filter workers-shared run build NODE_ENV="production" pnpm --filter miniflare run build NODE_ENV="production" pnpm --filter wrangler run build ''; @@ -62,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: { cp -r node_modules $out/lib cp -r packages/miniflare $out/lib/packages cp -r packages/workers-tsconfig $out/lib/packages + cp -r packages/workers-shared $out/lib/packages cp -r packages/wrangler/node_modules $out/lib/packages/wrangler cp -r packages/wrangler/templates $out/lib/packages/wrangler cp -r packages/wrangler/wrangler-dist $out/lib/packages/wrangler diff --git a/third_party/nixpkgs/pkgs/by-name/xd/xdg-desktop-portal-cosmic/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/xd/xdg-desktop-portal-cosmic/Cargo.lock index e74fbea4e1..6c927b5661 100644 --- a/third_party/nixpkgs/pkgs/by-name/xd/xdg-desktop-portal-cosmic/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/xd/xdg-desktop-portal-cosmic/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.27" +version = "0.2.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c3a1cbc201cc13ed06cf875efb781f2249b3677f5c74571b67d817877f9d697" +checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -91,9 +91,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" dependencies = [ "gimli", ] @@ -104,6 +104,23 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "aes" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + [[package]] name = "ahash" version = "0.8.11" @@ -204,9 +221,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", @@ -219,49 +236,43 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", ] -[[package]] -name = "any_ascii" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70033777eb8b5124a81a1889416543dddef2de240019b674c81285a2635a7e1e" - [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "apply" @@ -283,6 +294,9 @@ name = "arbitrary" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] [[package]] name = "arc-swap" @@ -298,14 +312,14 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" @@ -315,9 +329,9 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "as-raw-xcb-connection" @@ -342,6 +356,23 @@ checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" dependencies = [ "async-fs 2.1.2", "async-net", + "enumflags2", + "futures-channel", + "futures-util", + "rand", + "serde", + "serde_repr", + "tokio", + "url", + "zbus 4.4.0", +] + +[[package]] +name = "ashpd" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a" +dependencies = [ "enumflags2", "futures-channel", "futures-util", @@ -352,8 +383,8 @@ dependencies = [ "url", "wayland-backend", "wayland-client", - "wayland-protocols 0.31.2", - "zbus 4.3.1", + "wayland-protocols 0.32.4", + "zbus 4.4.0", ] [[package]] @@ -392,13 +423,13 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.12.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" +checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec" dependencies = [ "async-task", "concurrent-queue", - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-lite 2.3.0", "slab", ] @@ -448,9 +479,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.3" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" dependencies = [ "async-lock 3.4.0", "cfg-if", @@ -458,11 +489,11 @@ dependencies = [ "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.7.2", - "rustix 0.38.34", + "polling 3.7.3", + "rustix 0.38.37", "slab", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -491,7 +522,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" dependencies = [ - "async-io 2.3.3", + "async-io 2.3.4", "blocking", "futures-lite 2.3.0", ] @@ -509,18 +540,18 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.34", + "rustix 0.38.37", "windows-sys 0.48.0", ] [[package]] name = "async-process" -version = "2.2.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" +checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb" dependencies = [ "async-channel", - "async-io 2.3.3", + "async-io 2.3.4", "async-lock 3.4.0", "async-signal", "async-task", @@ -528,9 +559,8 @@ dependencies = [ "cfg-if", "event-listener 5.3.1", "futures-lite 2.3.0", - "rustix 0.38.34", + "rustix 0.38.37", "tracing", - "windows-sys 0.52.0", ] [[package]] @@ -541,25 +571,25 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] name = "async-signal" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" dependencies = [ - "async-io 2.3.3", + "async-io 2.3.4", "async-lock 3.4.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.34", + "rustix 0.38.37", "signal-hook-registry", "slab", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -570,13 +600,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] @@ -590,7 +620,7 @@ name = "atomicwrites" version = "0.4.2" source = "git+https://github.com/jackpot51/rust-atomicwrites#043ab4859d53ffd3d55334685303d8df39c9f768" dependencies = [ - "rustix 0.38.34", + "rustix 0.38.37", "tempfile", "windows-sys 0.48.0", ] @@ -656,7 +686,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf" dependencies = [ "anyhow", - "arrayvec 0.7.4", + "arrayvec 0.7.6", "log", "nom 7.1.3", "num-rational", @@ -669,22 +699,22 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", ] [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.8.0", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -693,6 +723,15 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "basic-toml" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "823388e228f614e9558c6804262db37960ec8821856535f5c3f59913140558f8" +dependencies = [ + "serde", +] + [[package]] name = "bindgen" version = "0.69.4" @@ -711,7 +750,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] @@ -752,9 +791,9 @@ dependencies = [ [[package]] name = "bitstream-io" -version = "2.4.2" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "415f8399438eb5e4b2f73ed3152a3448b98149dda642a957ee704e1daa5cf1d8" +checksum = "b81e1519b0d82120d2fd469d5bfb2919a9361c48b02d82d04befc1cdd2002452" [[package]] name = "block" @@ -824,9 +863,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", "serde", @@ -834,9 +873,9 @@ dependencies = [ [[package]] name = "built" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6a6c0b39c38fd754ac338b00a88066436389c0f029da5d37d1e01091d9b7c17" +checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4" [[package]] name = "bumpalo" @@ -852,22 +891,22 @@ checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06" [[package]] name = "bytemuck" -version = "1.16.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" +checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] @@ -884,9 +923,30 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.6.0" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" + +[[package]] +name = "bzip2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" +dependencies = [ + "bzip2-sys", + "libc", +] + +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] [[package]] name = "calloop" @@ -896,8 +956,8 @@ checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" dependencies = [ "bitflags 2.6.0", "log", - "polling 3.7.2", - "rustix 0.38.34", + "polling 3.7.3", + "rustix 0.38.37", "slab", "thiserror", ] @@ -910,25 +970,12 @@ checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" dependencies = [ "bitflags 2.6.0", "log", - "polling 3.7.2", - "rustix 0.38.34", + "polling 3.7.3", + "rustix 0.38.37", "slab", "thiserror", ] -[[package]] -name = "calloop" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58a38167d6fba8c67cce63c4a91f2a73ca42cbdaf6fb9ba164f1e07b43ecc10" -dependencies = [ - "bitflags 2.6.0", - "log", - "polling 3.7.2", - "rustix 0.38.34", - "slab", -] - [[package]] name = "calloop-wayland-source" version = "0.2.0" @@ -936,7 +983,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" dependencies = [ "calloop 0.12.4", - "rustix 0.38.34", + "rustix 0.38.37", "wayland-backend", "wayland-client", ] @@ -948,20 +995,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" dependencies = [ "calloop 0.13.0", - "rustix 0.38.34", + "rustix 0.38.37", "wayland-backend", "wayland-client", ] [[package]] name = "cc" -version = "1.0.104" +version = "1.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" +checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" dependencies = [ "jobserver", "libc", - "once_cell", + "shlex", ] [[package]] @@ -979,6 +1026,17 @@ dependencies = [ "nom 7.1.3", ] +[[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.15.8" @@ -989,6 +1047,16 @@ dependencies = [ "target-lexicon", ] +[[package]] +name = "cfg-expr" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0890061c4d3223e7267f3bad2ec40b997d64faac1c2815a4a9d95018e2b9e9c" +dependencies = [ + "smallvec", + "target-lexicon", +] + [[package]] name = "cfg-if" version = "1.0.0" @@ -1022,6 +1090,16 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + [[package]] name = "clang-sys" version = "1.8.1" @@ -1030,14 +1108,14 @@ checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", - "libloading 0.8.4", + "libloading 0.8.5", ] [[package]] name = "clap" -version = "4.5.9" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" +checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3" dependencies = [ "clap_builder", "clap_derive", @@ -1045,9 +1123,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.9" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" +checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b" dependencies = [ "anstream", "anstyle", @@ -1057,27 +1135,27 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.8" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] name = "clap_lex" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "clipboard-win" -version = "5.3.1" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" dependencies = [ "error-code", ] @@ -1159,9 +1237,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "colorgrad" @@ -1242,6 +1320,12 @@ dependencies = [ "tiny-keccak", ] +[[package]] +name = "constant_time_eq" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" + [[package]] name = "convert_case" version = "0.6.0" @@ -1272,9 +1356,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core-graphics" @@ -1303,12 +1387,12 @@ dependencies = [ [[package]] name = "cosmic-bg-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-bg#f83d9f4c8e4b47bea3ef16e4894982919fef6b9a" +source = "git+https://github.com/pop-os/cosmic-bg#584f6b3c0454396df25d36c6c2b59b018946e81e" dependencies = [ "colorgrad", "cosmic-config", "derive_setters", - "image 0.24.9", + "image 0.25.2", "ron", "serde", "tracing", @@ -1321,17 +1405,16 @@ source = "git+https://github.com/pop-os/cosmic-protocols?rev=c8d3a1c#c8d3a1c3d40 dependencies = [ "cosmic-protocols", "libc", - "smithay-client-toolkit 0.19.1", + "smithay-client-toolkit 0.19.2", "wayland-client", ] [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#4da66f8cc0407b5c928b560fb36e75ba5bc5b2d9" +source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "atomicwrites", - "calloop 0.14.0", "cosmic-config-derive", "cosmic-settings-daemon", "dirs 5.0.1", @@ -1345,13 +1428,13 @@ dependencies = [ "tokio", "tracing", "xdg", - "zbus 4.3.1", + "zbus 4.4.0", ] [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#4da66f8cc0407b5c928b560fb36e75ba5bc5b2d9" +source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "quote", "syn 1.0.109", @@ -1360,19 +1443,24 @@ dependencies = [ [[package]] name = "cosmic-files" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-files#66cef478ba76b00efe19232d4dc528e609a2115f" +source = "git+https://github.com/pop-os/cosmic-files#774ccf955f59f24cf9493f9249d20788ad394d48" dependencies = [ "chrono", "dirs 5.0.1", "env_logger", + "flate2", "fork", + "freedesktop_entry_parser", "fs_extra", + "gio", + "glib", "glob", "i18n-embed", "i18n-embed-fl 0.7.0", + "icu_collator", + "icu_provider", "ignore", "image 0.24.9", - "lexical-sort", "libc", "libcosmic", "log", @@ -1382,17 +1470,24 @@ dependencies = [ "open", "paste", "rayon", + "recently-used-xbel", "regex", "rust-embed", "serde", "shlex", "slotmap", "smol_str", + "tar", "tokio", "trash", + "unix_permissions_ext", "url", + "uzers", "vergen", + "walkdir", + "wayland-client", "xdg-mime", + "zip", ] [[package]] @@ -1412,8 +1507,8 @@ dependencies = [ "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols 0.32.1", - "wayland-protocols-wlr 0.3.1", + "wayland-protocols 0.32.4", + "wayland-protocols-wlr 0.3.4", "wayland-scanner", "wayland-server", ] @@ -1421,15 +1516,15 @@ dependencies = [ [[package]] name = "cosmic-settings-daemon" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#cd21ddcb1b5cbfc80ab84b34d3c8b1ff3d81179a" +source = "git+https://github.com/pop-os/dbus-settings-bindings#8059e6bdaa35fecd70d228a999ca342fb00d313b" dependencies = [ - "zbus 4.3.1", + "zbus 4.4.0", ] [[package]] name = "cosmic-text" -version = "0.12.0" -source = "git+https://github.com/pop-os/cosmic-text.git#a03ec6b75f0ea8fd6264d6cd05afcec3c2213f8f" +version = "0.12.1" +source = "git+https://github.com/pop-os/cosmic-text.git#4fe90bb6126c22f589b46768d7754d65ae300c5e" dependencies = [ "bitflags 2.6.0", "fontdb", @@ -1439,6 +1534,7 @@ dependencies = [ "rustc-hash", "rustybuzz 0.14.1", "self_cell 1.0.4", + "smol_str", "swash", "sys-locale", "ttf-parser 0.21.1", @@ -1451,7 +1547,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#4da66f8cc0407b5c928b560fb36e75ba5bc5b2d9" +source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "almost", "cosmic-config", @@ -1467,13 +1563,28 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] +[[package]] +name = "crc" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + [[package]] name = "crc32fast" version = "1.4.2" @@ -1567,15 +1678,15 @@ version = "0.19.0" source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" dependencies = [ "bitflags 2.6.0", - "libloading 0.8.4", + "libloading 0.8.5", "winapi", ] [[package]] name = "darling" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ "darling_core", "darling_macro", @@ -1583,27 +1694,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] name = "darling_macro" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] @@ -1625,6 +1736,12 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" +[[package]] +name = "deflate64" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b" + [[package]] name = "deranged" version = "0.3.11" @@ -1645,6 +1762,17 @@ dependencies = [ "syn 1.0.109", ] +[[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.77", +] + [[package]] name = "derive_setters" version = "0.1.6" @@ -1654,7 +1782,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] @@ -1665,6 +1793,7 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "crypto-common", + "subtle", ] [[package]] @@ -1743,7 +1872,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] @@ -1752,7 +1881,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.4", + "libloading 0.8.5", ] [[package]] @@ -1772,7 +1901,7 @@ dependencies = [ "bitflags 2.6.0", "mime 0.1.0", "raw-window-handle", - "smithay-client-toolkit 0.19.1", + "smithay-client-toolkit 0.19.2", "smithay-clipboard", ] @@ -1792,7 +1921,7 @@ dependencies = [ "bytemuck", "drm-ffi 0.7.1", "drm-fourcc", - "rustix 0.38.34", + "rustix 0.38.37", ] [[package]] @@ -1805,7 +1934,7 @@ dependencies = [ "bytemuck", "drm-ffi 0.8.0", "drm-fourcc", - "rustix 0.38.34", + "rustix 0.38.37", ] [[package]] @@ -1815,7 +1944,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" dependencies = [ "drm-sys 0.6.1", - "rustix 0.38.34", + "rustix 0.38.37", ] [[package]] @@ -1825,7 +1954,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97c98727e48b7ccb4f4aea8cfe881e5b07f702d17b7875991881b41af7278d53" dependencies = [ "drm-sys 0.7.0", - "rustix 0.38.34", + "rustix 0.38.37", ] [[package]] @@ -1841,7 +1970,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176" dependencies = [ "libc", - "linux-raw-sys 0.6.4", + "linux-raw-sys 0.6.5", ] [[package]] @@ -1851,7 +1980,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd39dde40b6e196c2e8763f23d119ddb1a8714534bf7d77fa97a65b0feda3986" dependencies = [ "libc", - "linux-raw-sys 0.6.4", + "linux-raw-sys 0.6.5", ] [[package]] @@ -1895,14 +2024,14 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] name = "env_filter" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" dependencies = [ "log", "regex", @@ -1910,9 +2039,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" dependencies = [ "anstream", "anstyle", @@ -1939,9 +2068,9 @@ dependencies = [ [[package]] name = "error-code" -version = "3.2.0" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" +checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f" [[package]] name = "etagere" @@ -1955,9 +2084,9 @@ dependencies = [ [[package]] name = "euclid" -version = "0.22.10" +version = "0.22.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f0eb73b934648cd7a4a61f1b15391cd95dab0b4da6e2e66c2a072c144b4a20" +checksum = "ad9cdb4b747e485a12abb0e6566612956c7a1bafa3bdb8d682c5b6d403589e48" dependencies = [ "num-traits", ] @@ -2010,7 +2139,7 @@ dependencies = [ "flume", "half", "lebe", - "miniz_oxide", + "miniz_oxide 0.7.4", "rayon-core", "smallvec", "zune-inflate", @@ -2033,9 +2162,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" @@ -2057,14 +2186,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", + "libredox 0.1.3", + "windows-sys 0.59.0", ] [[package]] @@ -2078,12 +2207,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -2162,20 +2291,20 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "font-types" -version = "0.5.5" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34fd7136aca682873d859ef34494ab1a7d3f57ecd485ed40eb6437ee8c85aa29" +checksum = "8f0189ccb084f77c5523e08288d418cbaa09c451a08515678a0aa265df9a8b60" dependencies = [ "bytemuck", ] [[package]] name = "fontconfig-parser" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" +checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7" dependencies = [ - "roxmltree", + "roxmltree 0.20.0", ] [[package]] @@ -2186,7 +2315,7 @@ checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" dependencies = [ "fontconfig-parser", "log", - "memmap2 0.9.4", + "memmap2 0.9.5", "slotmap", "tinyvec", "ttf-parser 0.20.0", @@ -2210,7 +2339,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] @@ -2239,9 +2368,9 @@ dependencies = [ [[package]] name = "fraction" -version = "0.14.0" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a78dd758a47a7305478e0e054f9fde4e983b9f9eccda162bf7ca03b79e9d40" +checksum = "0f158e3ff0a1b334408dc9fb811cd99b446986f4d8b741bb08f9df1604085ae7" dependencies = [ "lazy_static", "num", @@ -2290,10 +2419,19 @@ dependencies = [ ] [[package]] -name = "fs_extra" +name = "freedesktop_entry_parser" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" +checksum = "db9c27b72f19a99a895f8ca89e2d26e4ef31013376e56fdafef697627306c3e4" +dependencies = [ + "nom 7.1.3", + "thiserror", +] + +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "git+https://github.com/pop-os/fs_extra.git#7e7222eb2b7830d40b67cd02e6ebd156524ee866" [[package]] name = "fsevent-sys" @@ -2374,7 +2512,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-core", "futures-io", "parking", @@ -2389,7 +2527,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] @@ -2479,9 +2617,9 @@ dependencies = [ [[package]] name = "gettext-rs" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" +checksum = "4a6716b8a0db461a2720b850ba1623e5b69e4b1aa0224cf5e1fb23a0fe49e65c" dependencies = [ "gettext-sys", "locale_config", @@ -2489,9 +2627,9 @@ dependencies = [ [[package]] name = "gettext-sys" -version = "0.21.3" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" +checksum = "f7b8797f28f2dabfbe2caadb6db4f7fd739e251b5ede0a2ba49e506071edcf67" dependencies = [ "cc", "temp-dir", @@ -2519,20 +2657,37 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" + +[[package]] +name = "gio" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcacaa37401cad0a95aadd266bc39c72a131d454fc012f6dfd217f891d76cc52" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "gio-sys", + "glib", + "libc", + "pin-project-lite", + "smallvec", +] [[package]] name = "gio-sys" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4feb96b31c32730ea3e1e89aecd2e4e37ecb1c473ad8f685e3430a159419f63" +checksum = "5237611e97e9b86ab5768adc3eef853ae713ea797aa3835404acdfacffc9fb38" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 7.0.1", + "system-deps 7.0.3", "windows-sys 0.52.0", ] @@ -2555,9 +2710,9 @@ checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" [[package]] name = "glib" -version = "0.20.0" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fee90a615ce05be7a32932cfb8adf2c4bbb4700e80d37713c981fb24c0c56238" +checksum = "95648aac01b75503000bb3bcaa5ec7a7a2dd61e43636b8b1814854de94dd80e4" dependencies = [ "bitflags 2.6.0", "futures-channel", @@ -2572,30 +2727,29 @@ dependencies = [ "libc", "memchr", "smallvec", - "thiserror", ] [[package]] name = "glib-macros" -version = "0.20.0" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4da558d8177c0c8c54368818b508a4244e1286fce2858cef4e547023f0cfa5ef" +checksum = "302f1d633c9cdef4350330e7b68fd8016e2834bb106c93fdf9789fcde753c1ab" dependencies = [ "heck 0.5.0", - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] name = "glib-sys" -version = "0.20.0" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4958c26e5a01c9af00dea669a97369eccbec29a8e6d125c24ea2d85ee7467b60" +checksum = "92eee4531c1c9abba945d19378b205031b5890e1f99c319ba0503b6e0c06a163" dependencies = [ "libc", - "system-deps 7.0.1", + "system-deps 7.0.3", ] [[package]] @@ -2606,9 +2760,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19" dependencies = [ "aho-corasick", "bstr", @@ -2651,13 +2805,13 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6908864f5ffff15b56df7e90346863904f49b949337ed0456b9287af61903b8" +checksum = "fa3d1dcd8a1eb2e7c22be3d5e792b14b186f3524f79b25631730f9a8c169d49a" dependencies = [ "glib-sys", "libc", - "system-deps 7.0.1", + "system-deps 7.0.3", ] [[package]] @@ -2720,9 +2874,9 @@ checksum = "1df00eed8d1f0db937f6be10e46e8072b0671accb504cf0f959c5c52c679f5b9" [[package]] name = "gstreamer" -version = "0.23.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e95b1d1153239a621ec143501fdcca6c1ad3efb87d268597285f85c4136f73" +checksum = "683e15f8cc3a1a2646d9fe2181a58b7abb4c166256d8d15cce368e420c741140" dependencies = [ "cfg-if", "futures-channel", @@ -2752,7 +2906,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 7.0.1", + "system-deps 7.0.3", ] [[package]] @@ -2794,7 +2948,7 @@ dependencies = [ "bitflags 2.6.0", "com", "libc", - "libloading 0.8.4", + "libloading 0.8.5", "thiserror", "widestring", "winapi", @@ -2836,6 +2990,15 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + [[package]] name = "humantime" version = "2.1.0" @@ -2844,15 +3007,15 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "i18n-config" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9ce3c48cbc21fd5b22b9331f32b5b51f6ad85d969b99e793427332e76e7640" +checksum = "8e88074831c0be5b89181b05e6748c4915f77769ecc9a4c372f88b169a8509c9" dependencies = [ + "basic-toml", "log", "serde", "serde_derive", "thiserror", - "toml 0.8.14", "unic-langid", ] @@ -2895,7 +3058,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.68", + "syn 2.0.77", "unic-langid", ] @@ -2916,7 +3079,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.68", + "syn 2.0.77", "unic-langid", ] @@ -2930,14 +3093,14 @@ dependencies = [ "i18n-config", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -2959,7 +3122,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#4da66f8cc0407b5c928b560fb36e75ba5bc5b2d9" +source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "dnd", "iced_accessibility", @@ -2978,7 +3141,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#4da66f8cc0407b5c928b560fb36e75ba5bc5b2d9" +source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "accesskit", "accesskit_unix", @@ -2988,7 +3151,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#4da66f8cc0407b5c928b560fb36e75ba5bc5b2d9" +source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "bitflags 2.6.0", "dnd", @@ -2999,7 +3162,7 @@ dependencies = [ "palette", "raw-window-handle", "serde", - "smithay-client-toolkit 0.19.1", + "smithay-client-toolkit 0.19.2", "smol_str", "thiserror", "web-time", @@ -3010,7 +3173,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#4da66f8cc0407b5c928b560fb36e75ba5bc5b2d9" +source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "futures", "iced_core", @@ -3023,7 +3186,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#4da66f8cc0407b5c928b560fb36e75ba5bc5b2d9" +source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "bitflags 2.6.0", "bytemuck", @@ -3047,7 +3210,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#4da66f8cc0407b5c928b560fb36e75ba5bc5b2d9" +source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -3059,13 +3222,13 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#4da66f8cc0407b5c928b560fb36e75ba5bc5b2d9" +source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "dnd", "iced_accessibility", "iced_core", "iced_futures", - "smithay-client-toolkit 0.19.1", + "smithay-client-toolkit 0.19.2", "thiserror", "window_clipboard", ] @@ -3073,7 +3236,7 @@ dependencies = [ [[package]] name = "iced_sctk" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#4da66f8cc0407b5c928b560fb36e75ba5bc5b2d9" +source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "enum-repr", "float-cmp", @@ -3086,11 +3249,11 @@ dependencies = [ "itertools 0.12.1", "lazy_static", "raw-window-handle", - "smithay-client-toolkit 0.19.1", + "smithay-client-toolkit 0.19.2", "thiserror", "tracing", "wayland-backend", - "wayland-protocols 0.32.1", + "wayland-protocols 0.32.4", "window_clipboard", "xkbcommon", "xkbcommon-dl", @@ -3100,7 +3263,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#4da66f8cc0407b5c928b560fb36e75ba5bc5b2d9" +source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "iced_core", "once_cell", @@ -3110,7 +3273,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#4da66f8cc0407b5c928b560fb36e75ba5bc5b2d9" +source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "bytemuck", "cosmic-text", @@ -3127,8 +3290,9 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#4da66f8cc0407b5c928b560fb36e75ba5bc5b2d9" +source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ + "as-raw-xcb-connection", "bitflags 2.6.0", "bytemuck", "futures", @@ -3141,19 +3305,21 @@ dependencies = [ "once_cell", "raw-window-handle", "resvg", - "rustix 0.38.34", - "smithay-client-toolkit 0.19.1", + "rustix 0.38.37", + "smithay-client-toolkit 0.19.2", + "tiny-xlib", "wayland-backend", "wayland-client", - "wayland-protocols 0.32.1", + "wayland-protocols 0.32.4", "wayland-sys", "wgpu", + "x11rb", ] [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#4da66f8cc0407b5c928b560fb36e75ba5bc5b2d9" +source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "dnd", "iced_accessibility", @@ -3162,7 +3328,7 @@ dependencies = [ "iced_style", "num-traits", "ouroboros", - "smithay-client-toolkit 0.19.1", + "smithay-client-toolkit 0.19.2", "thiserror", "unicode-segmentation", "window_clipboard", @@ -3171,7 +3337,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#4da66f8cc0407b5c928b560fb36e75ba5bc5b2d9" +source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "dnd", "iced_accessibility", @@ -3208,6 +3374,149 @@ dependencies = [ "objc2 0.5.2", ] +[[package]] +name = "icu_collator" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d370371887d31d56f361c3eaa15743e54f13bc677059c9191c77e099ed6966b2" +dependencies = [ + "displaydoc", + "icu_collator_data", + "icu_collections", + "icu_locid_transform", + "icu_normalizer", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "zerovec", +] + +[[package]] +name = "icu_collator_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ee3f88741364b7d6269cce6827a3e6a8a2cf408a78f766c9224ab479d5e4ae5" + +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "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.77", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -3226,9 +3535,9 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" +checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b" dependencies = [ "crossbeam-deque", "globset", @@ -3260,12 +3569,12 @@ dependencies = [ [[package]] name = "image" -version = "0.25.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" dependencies = [ "bytemuck", - "byteorder", + "byteorder-lite", "color_quant", "exr", "gif 0.13.1", @@ -3283,12 +3592,12 @@ dependencies = [ [[package]] name = "image-webp" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d730b085583c4d789dfd07fdcf185be59501666a90c97c40162b37e4fdad272d" +checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" dependencies = [ "byteorder-lite", - "thiserror", + "quick-error", ] [[package]] @@ -3305,14 +3614,23 @@ checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" [[package]] name = "indexmap" -version = "2.2.6" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown", ] +[[package]] +name = "infer" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc150e5ce2330295b8616ce0e3f53250e53af31759a9dbedad1621ba29151847" +dependencies = [ + "cfb", +] + [[package]] name = "inotify" version = "0.9.6" @@ -3333,6 +3651,15 @@ dependencies = [ "libc", ] +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + [[package]] name = "instant" version = "0.1.13" @@ -3350,7 +3677,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] @@ -3410,9 +3737,9 @@ dependencies = [ [[package]] name = "is_terminal_polyfill" -version = "1.70.0" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" @@ -3462,9 +3789,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] @@ -3480,9 +3807,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -3503,7 +3830,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.8.4", + "libloading 0.8.5", "pkg-config", ] @@ -3515,11 +3842,11 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" [[package]] name = "known-folders" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4397c789f2709d23cfcb703b316e0766a8d4b17db2d47b0ab096ef6047cae1d8" +checksum = "b7d9a1740cc8b46e259a0eb787d79d855e79ff10b9855a5eba58868d5da7927c" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3548,7 +3875,7 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", ] [[package]] @@ -3582,28 +3909,19 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "lexical-sort" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c09e4591611e231daf4d4c685a66cb0410cc1e502027a20ae55f2bb9e997207a" -dependencies = [ - "any_ascii", -] - [[package]] name = "libc" -version = "0.2.155" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#4da66f8cc0407b5c928b560fb36e75ba5bc5b2d9" +source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "apply", - "ashpd", + "ashpd 0.9.1", "chrono", "cosmic-client-toolkit", "cosmic-config", @@ -3626,21 +3944,21 @@ dependencies = [ "iced_wgpu", "iced_widget", "lazy_static", + "libc", "mime 0.3.17", - "nix 0.27.1", "palette", "rfd", + "rustix 0.38.37", "serde", "shlex", "slotmap", "taffy", - "textdistance", "thiserror", "tokio", "tracing", "unicode-segmentation", "url", - "zbus 4.3.1", + "zbus 4.4.0", ] [[package]] @@ -3666,9 +3984,9 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", "windows-targets 0.52.6", @@ -3699,12 +4017,13 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", + "redox_syscall 0.5.4", ] [[package]] name = "libspa" version = "0.8.0" -source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs#2ad12181ffc02c71a1cbd0b1d49eecd04cdf8f26" +source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs#86df39190c0ab67444666a42908f7e8c1344e24a" dependencies = [ "bitflags 2.6.0", "cc", @@ -3720,7 +4039,7 @@ dependencies = [ [[package]] name = "libspa-sys" version = "0.8.0" -source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs#2ad12181ffc02c71a1cbd0b1d49eecd04cdf8f26" +source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs#86df39190c0ab67444666a42908f7e8c1344e24a" dependencies = [ "bindgen", "cc", @@ -3741,9 +4060,15 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "linux-raw-sys" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4" +checksum = "2a385b1be4e5c3e362ad2ffa73c392e53f031eaa5b7d648e64cd87f27f6063d7" + +[[package]] +name = "litemap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" [[package]] name = "locale_config" @@ -3768,6 +4093,12 @@ dependencies = [ "scopeguard", ] +[[package]] +name = "lockfree-object-pool" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" + [[package]] name = "log" version = "0.4.22" @@ -3785,9 +4116,9 @@ dependencies = [ [[package]] name = "lru" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" dependencies = [ "hashbrown", ] @@ -3818,7 +4149,7 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edecfb8d234a2b0be031ab02ebcdd9f3b9ee418fb35e265f7a540a48d197bff9" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", "euclid", "num-traits", ] @@ -3844,6 +4175,16 @@ dependencies = [ "num-traits", ] +[[package]] +name = "lzma-rs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" +dependencies = [ + "byteorder", + "crc", +] + [[package]] name = "malloc_buf" version = "0.0.6" @@ -3860,7 +4201,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" dependencies = [ "cfg-if", - "rayon", ] [[package]] @@ -3880,9 +4220,9 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" dependencies = [ "libc", ] @@ -3960,6 +4300,15 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + [[package]] name = "mio" version = "0.8.11" @@ -3972,6 +4321,18 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "wasi", + "windows-sys 0.52.0", +] + [[package]] name = "muldiv" version = "1.0.1" @@ -3989,7 +4350,7 @@ name = "naga" version = "0.19.0" source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", "bit-set", "bitflags 2.6.0", "codespan-reporting", @@ -4117,7 +4478,7 @@ dependencies = [ "kqueue", "libc", "log", - "mio", + "mio 0.8.11", "walkdir", "windows-sys 0.48.0", ] @@ -4183,7 +4544,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] @@ -4239,23 +4600,23 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] @@ -4358,9 +4719,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.1" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "memchr", ] @@ -4373,9 +4734,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "open" -version = "5.2.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d2c909a3fce3bd80efef4cd1c6c056bd9376a8fe06fcfdbebaf32cb485a7e37" +checksum = "61a877bf6abd716642a53ef1b89fb498923a4afca5c754f9050b4d081c05c4b3" dependencies = [ "is-wsl", "libc", @@ -4447,16 +4808,16 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] name = "owned_ttf_parser" -version = "0.21.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b41438d2fc63c46c74a2203bf5ccd82c41ba04347b2fcf5754f230b167067d5" +checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90" dependencies = [ - "ttf-parser 0.21.1", + "ttf-parser 0.24.1", ] [[package]] @@ -4481,14 +4842,14 @@ dependencies = [ "by_address", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] name = "parking" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" @@ -4533,7 +4894,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.2", + "redox_syscall 0.5.4", "smallvec", "windows-targets 0.52.6", ] @@ -4550,6 +4911,16 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" +[[package]] +name = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest", + "hmac", +] + [[package]] name = "percent-encoding" version = "2.3.1" @@ -4586,7 +4957,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] @@ -4618,19 +4989,19 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-io", ] [[package]] name = "pipewire" version = "0.8.0" -source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs#2ad12181ffc02c71a1cbd0b1d49eecd04cdf8f26" +source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs#86df39190c0ab67444666a42908f7e8c1344e24a" dependencies = [ "anyhow", "bitflags 2.6.0", @@ -4646,7 +5017,7 @@ dependencies = [ [[package]] name = "pipewire-sys" version = "0.8.0" -source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs#2ad12181ffc02c71a1cbd0b1d49eecd04cdf8f26" +source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs#86df39190c0ab67444666a42908f7e8c1344e24a" dependencies = [ "bindgen", "libspa-sys", @@ -4655,9 +5026,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "png" @@ -4669,7 +5040,7 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.7.4", ] [[package]] @@ -4690,17 +5061,17 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.2" +version = "3.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ "cfg-if", "concurrent-queue", "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.34", + "rustix 0.38.37", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4717,9 +5088,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "presser" @@ -4739,11 +5113,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit 0.22.21", ] [[package]] @@ -4795,7 +5169,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] @@ -4821,18 +5195,19 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quick-xml" -version = "0.31.0" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" dependencies = [ "memchr", + "serde", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -4887,7 +5262,7 @@ checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9" dependencies = [ "arbitrary", "arg_enum_proc_macro", - "arrayvec 0.7.4", + "arrayvec 0.7.6", "av1-grain", "bitstream-io", "built", @@ -4916,16 +5291,15 @@ dependencies = [ [[package]] name = "ravif" -version = "0.11.7" +version = "0.11.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67376f469e7e7840d0040bbf4b9b3334005bb167f814621326e4c7ab8cd6e944" +checksum = "a8f0bfd976333248de2078d350bfdf182ff96e168a24d23d2436cef320dd4bdd" dependencies = [ "avif-serialize", "imgref", "loop9", "quick-error", "rav1e", - "rayon", "rgb", ] @@ -4963,14 +5337,30 @@ checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" [[package]] name = "read-fonts" -version = "0.19.3" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8b8af39d1f23869711ad4cea5e7835a20daa987f80232f7f2a2374d648ca64d" +checksum = "8c141b9980e1150201b2a3a32879001c8f975fe313ec3df5471a9b5c79a880cd" dependencies = [ "bytemuck", "font-types", ] +[[package]] +name = "recently-used-xbel" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "079a81183e41e5cf17fd9ec55db30d6be6cddfad7fd619862efac27f1be28c9b" +dependencies = [ + "chrono", + "dirs 5.0.1", + "infer", + "mime_guess", + "quick-xml", + "serde", + "thiserror", + "url", +] + [[package]] name = "redox_syscall" version = "0.2.16" @@ -5000,18 +5390,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" dependencies = [ "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox 0.1.3", @@ -5020,9 +5410,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.5" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -5076,7 +5466,7 @@ version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25a73a7337fc24366edfca76ec521f51877b114e42dab584008209cca6719251" dependencies = [ - "ashpd", + "ashpd 0.8.1", "block", "dispatch", "js-sys", @@ -5095,9 +5485,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.40" +version = "0.8.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7439be6844e40133eda024efd85bf07f59d0dd2f59b10c00dd6cfb92cc5c741" +checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" dependencies = [ "bytemuck", ] @@ -5121,10 +5511,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" [[package]] -name = "rust-embed" -version = "8.4.0" +name = "roxmltree" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19549741604902eb99a7ed0ee177a0663ee1eda51a29f71401f166e47e77806a" +checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" + +[[package]] +name = "rust-embed" +version = "8.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa66af4a4fdd5e7ebc276f115e895611a34739a9c1c01028383d612d550953c0" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -5133,22 +5529,22 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "8.4.0" +version = "8.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb9f96e283ec64401f30d3df8ee2aaeb2561f34c824381efa24a35f79bf40ee4" +checksum = "6125dbc8867951125eec87294137f4e9c2c96566e61bf72c45095a7c77761478" dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.68", + "syn 2.0.77", "walkdir", ] [[package]] name = "rust-embed-utils" -version = "8.4.0" +version = "8.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38c74a686185620830701348de757fd36bef4aa9680fd23c49fc539ddcc1af32" +checksum = "2e5347777e9aacb56039b0e1f28785929a8a3b709e87482e7442c72e7c12529d" dependencies = [ "sha2", "walkdir", @@ -5192,9 +5588,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -5277,7 +5673,7 @@ checksum = "70b31447ca297092c5a9916fc3b955203157b37c19ca8edde4f52e9843e602c7" dependencies = [ "ab_glyph", "log", - "memmap2 0.9.4", + "memmap2 0.9.5", "smithay-client-toolkit 0.18.1", "tiny-skia", ] @@ -5299,32 +5695,33 @@ checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "indexmap", "itoa", + "memchr", "ryu", "serde", ] @@ -5337,14 +5734,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] name = "serde_spanned" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -5418,9 +5815,9 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "skrifa" -version = "0.19.3" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab45fb68b53576a43d4fc0e9ec8ea64e29a4d2cc7f44506964cb75f288222e9" +checksum = "abea4738067b1e628c6ce28b2c216c19e9ea95715cdb332680e821c3bec2ef23" dependencies = [ "bytemuck", "read-fonts", @@ -5462,8 +5859,8 @@ dependencies = [ "cursor-icon", "libc", "log", - "memmap2 0.9.4", - "rustix 0.38.34", + "memmap2 0.9.5", + "rustix 0.38.37", "thiserror", "wayland-backend", "wayland-client", @@ -5477,9 +5874,9 @@ dependencies = [ [[package]] name = "smithay-client-toolkit" -version = "0.19.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "837d3067369e24aeda699a5d9fc5aa14ca14a84dd70aeed7156bfa04a5605b32" +checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" dependencies = [ "bitflags 2.6.0", "bytemuck", @@ -5488,16 +5885,16 @@ dependencies = [ "cursor-icon", "libc", "log", - "memmap2 0.9.4", + "memmap2 0.9.5", "pkg-config", - "rustix 0.38.34", + "rustix 0.38.37", "thiserror", "wayland-backend", "wayland-client", "wayland-csd-frame", "wayland-cursor", - "wayland-protocols 0.32.1", - "wayland-protocols-wlr 0.3.1", + "wayland-protocols 0.32.4", + "wayland-protocols-wlr 0.3.4", "wayland-scanner", "xkbcommon", "xkeysym", @@ -5506,11 +5903,11 @@ dependencies = [ [[package]] name = "smithay-clipboard" version = "0.8.0" -source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-5#d099e82a4c1e7d3e88dc34b7333de21928b1b22c" +source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-5#5a3007def49eb678d1144850c9ee04b80707c56a" dependencies = [ "libc", "raw-window-handle", - "smithay-client-toolkit 0.19.1", + "smithay-client-toolkit 0.19.2", "wayland-backend", ] @@ -5554,15 +5951,15 @@ dependencies = [ "cocoa", "core-graphics", "drm 0.11.1", - "fastrand 2.1.0", + "fastrand 2.1.1", "foreign-types", "js-sys", "log", - "memmap2 0.9.4", + "memmap2 0.9.5", "objc", "raw-window-handle", "redox_syscall 0.4.1", - "rustix 0.38.34", + "rustix 0.38.37", "tiny-xlib", "wasm-bindgen", "wayland-backend", @@ -5591,6 +5988,12 @@ dependencies = [ "bitflags 2.6.0", ] +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "static_assertions" version = "1.1.0" @@ -5618,6 +6021,12 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + [[package]] name = "svg_fmt" version = "0.4.3" @@ -5636,9 +6045,9 @@ dependencies = [ [[package]] name = "swash" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d7773d67fe3373048cf840bfcc54ec3207cfc1e95c526b287ef2eb5eff9faf6" +checksum = "93cdc334a50fcc2aa3f04761af3b28196280a6aaadb1ef11215c478ae32615ac" dependencies = [ "skrifa", "yazi", @@ -5658,15 +6067,26 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.68" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + [[package]] name = "sys-locale" version = "0.3.1" @@ -5682,23 +6102,23 @@ version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ - "cfg-expr", + "cfg-expr 0.15.8", "heck 0.5.0", "pkg-config", - "toml 0.8.14", + "toml 0.8.19", "version-compare", ] [[package]] name = "system-deps" -version = "7.0.1" +version = "7.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c81f13d9a334a6c242465140bd262fae382b752ff2011c4f7419919a9c97922" +checksum = "66d23aaf9f331227789a99e8de4c91bf46703add012bdfd45fdecdfb2975a005" dependencies = [ - "cfg-expr", + "cfg-expr 0.17.0", "heck 0.5.0", "pkg-config", - "toml 0.8.14", + "toml 0.8.19", "version-compare", ] @@ -5707,17 +6127,28 @@ name = "taffy" version = "0.3.11" source = "git+https://github.com/DioxusLabs/taffy?rev=7781c70#7781c70241f7f572130c13106f2a869a9cf80885" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", "grid", "num-traits", "slotmap", ] [[package]] -name = "target-lexicon" -version = "0.12.14" +name = "tar" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "temp-dir" @@ -5727,14 +6158,15 @@ checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", - "fastrand 2.1.0", - "rustix 0.38.34", - "windows-sys 0.52.0", + "fastrand 2.1.1", + "once_cell", + "rustix 0.38.37", + "windows-sys 0.59.0", ] [[package]] @@ -5748,28 +6180,28 @@ dependencies = [ [[package]] name = "textdistance" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d321c8576c2b47e43953e9cce236550d4cd6af0a6ce518fe084340082ca6037b" +checksum = "7f1835c76a9d443834c04539860f3ce46b9d93ef8c260057f939e967ca81180a" [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] @@ -5832,7 +6264,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" dependencies = [ "arrayref", - "arrayvec 0.7.4", + "arrayvec 0.7.6", "bytemuck", "cfg-if", "log", @@ -5859,7 +6291,7 @@ checksum = "1d52f22673960ad13af14ff4025997312def1223bfa7c8e4949d099e6b3d5d1c" dependencies = [ "as-raw-xcb-connection", "ctor-lite", - "libloading 0.8.4", + "libloading 0.8.5", "pkg-config", "tracing", ] @@ -5871,13 +6303,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ "displaydoc", + "zerovec", ] [[package]] name = "tinyvec" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -5890,39 +6323,38 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.38.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", "libc", - "mio", - "num_cpus", + "mio 1.0.2", "pin-project-lite", "signal-hook-registry", "socket2 0.5.7", "tokio-macros", "tracing", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", @@ -5940,21 +6372,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.14" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.14", + "toml_edit 0.22.21", ] [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] @@ -5972,26 +6404,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.21.1" +version = "0.22.21" 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" +checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.13", + "winnow 0.6.18", ] [[package]] @@ -6013,7 +6434,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] @@ -6027,9 +6448,8 @@ dependencies = [ [[package]] name = "trash" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d8fbfb70b1fad5c0b788f9b2e1bf4d04e5ac6efa828f1ed9ee462c50ff9cf05" +version = "5.1.1" +source = "git+https://github.com/jackpot51/trash-rs.git?branch=cosmic#483f83908beef9166f30dfe7b57568ab01c4e140" dependencies = [ "chrono", "libc", @@ -6054,6 +6474,12 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" +[[package]] +name = "ttf-parser" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a" + [[package]] name = "type-map" version = "0.5.0" @@ -6140,9 +6566,9 @@ checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-linebreak" @@ -6152,30 +6578,30 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-properties" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" +checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524" [[package]] name = "unicode-script" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" +checksum = "9fb421b350c9aff471779e262955939f565ec18b86c15364e6bdf0d662ca7c1f" [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-vo" @@ -6185,15 +6611,21 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + +[[package]] +name = "unix_permissions_ext" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7497808a85e03f612f13e9c5061e4c81cdee86e6c00adfa1096690990ccd08e9" [[package]] name = "url" @@ -6239,7 +6671,7 @@ dependencies = [ "imagesize", "kurbo", "log", - "roxmltree", + "roxmltree 0.19.0", "simplecss", "siphasher", "svgtypes", @@ -6274,12 +6706,40 @@ dependencies = [ "tiny-skia-path", ] +[[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 = "uuid" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" + +[[package]] +name = "uzers" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4df81ff504e7d82ad53e95ed1ad5b72103c11253f39238bcc0235b90768a97dd" +dependencies = [ + "libc", + "log", +] + [[package]] name = "v_frame" version = "0.3.8" @@ -6293,9 +6753,9 @@ dependencies = [ [[package]] name = "vergen" -version = "8.3.1" +version = "8.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27d6bdd219887a9eadd19e1c34f32e47fa332301184935c6d9bca26f3cca525" +checksum = "2990d9ea5967266ea0ccf413a4aa5c42a93dbcfda9cb49a97de6931726b12566" dependencies = [ "anyhow", "cfg-if", @@ -6311,9 +6771,9 @@ checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "waker-fn" @@ -6339,34 +6799,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -6376,9 +6837,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6386,22 +6847,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-timer" @@ -6420,13 +6881,13 @@ dependencies = [ [[package]] name = "wayland-backend" -version = "0.3.4" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34e9e6b6d4a2bb4e7e69433e0b35c7923b95d4dc8503a84d25ec917a4bbfdf07" +checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6" dependencies = [ "cc", "downcast-rs", - "rustix 0.38.34", + "rustix 0.38.37", "scoped-tls", "smallvec", "wayland-sys", @@ -6434,12 +6895,12 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.3" +version = "0.31.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e63801c85358a431f986cffa74ba9599ff571fc5774ac113ed3b490c19a1133" +checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d" dependencies = [ "bitflags 2.6.0", - "rustix 0.38.34", + "rustix 0.38.37", "wayland-backend", "wayland-scanner", ] @@ -6457,11 +6918,11 @@ dependencies = [ [[package]] name = "wayland-cursor" -version = "0.31.3" +version = "0.31.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a206e8b2b53b1d3fcb9428fec72bc278ce539e2fa81fe2bfc1ab27703d5187b9" +checksum = "3a94697e66e76c85923b0d28a0c251e8f0666f58fc47d316c0f4da6da75d37cb" dependencies = [ - "rustix 0.38.34", + "rustix 0.38.37", "wayland-client", "xcursor", ] @@ -6480,9 +6941,9 @@ dependencies = [ [[package]] name = "wayland-protocols" -version = "0.32.1" +version = "0.32.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d0f1056570486e26a3773ec633885124d79ae03827de05ba6c85f79904026c" +checksum = "2b5755d77ae9040bb872a25026555ce4cb0ae75fd923e90d25fba07d81057de0" dependencies = [ "bitflags 2.6.0", "wayland-backend", @@ -6519,23 +6980,23 @@ dependencies = [ [[package]] name = "wayland-protocols-wlr" -version = "0.3.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7dab47671043d9f5397035975fe1cac639e5bca5cc0b3c32d09f01612e34d24" +checksum = "dad87b5fd1b1d3ca2f792df8f686a2a11e3fe1077b71096f7a175ab699f89109" dependencies = [ "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols 0.32.1", + "wayland-protocols 0.32.4", "wayland-scanner", "wayland-server", ] [[package]] name = "wayland-scanner" -version = "0.31.2" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67da50b9f80159dec0ea4c11c13e24ef9e7574bd6ce24b01860a175010cea565" +checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3" dependencies = [ "proc-macro2", "quick-xml", @@ -6544,23 +7005,23 @@ dependencies = [ [[package]] name = "wayland-server" -version = "0.31.2" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63e89118bd072ba6ce0f9c2c92fa41f72d1d78a138d2abc497a80a8264565559" +checksum = "0f18d47038c0b10479e695d99ed073e400ccd9bdbb60e6e503c96f62adcb12b6" dependencies = [ "bitflags 2.6.0", "downcast-rs", "io-lifetimes 2.0.3", - "rustix 0.38.34", + "rustix 0.38.37", "wayland-backend", "wayland-scanner", ] [[package]] name = "wayland-sys" -version = "0.31.2" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "105b1842da6554f91526c14a2a2172897b7f745a805d62af4ce698706be79c12" +checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09" dependencies = [ "dlib", "libc", @@ -6572,9 +7033,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -6601,7 +7062,7 @@ name = "wgpu" version = "0.19.0" source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", "cfg-if", "cfg_aliases 0.1.1", "js-sys", @@ -6625,7 +7086,7 @@ name = "wgpu-core" version = "0.19.0" source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", "bit-vec", "bitflags 2.6.0", "cfg_aliases 0.1.1", @@ -6651,7 +7112,7 @@ version = "0.19.0" source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" dependencies = [ "android_system_properties", - "arrayvec 0.7.4", + "arrayvec 0.7.6", "ash", "bit-set", "bitflags 2.6.0", @@ -6668,7 +7129,7 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.4", + "libloading 0.8.5", "log", "metal", "naga", @@ -6722,11 +7183,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6821,7 +7282,7 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] @@ -6843,7 +7304,7 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] @@ -6882,6 +7343,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-targets" version = "0.42.2" @@ -7079,7 +7549,7 @@ dependencies = [ "js-sys", "libc", "log", - "memmap2 0.9.4", + "memmap2 0.9.5", "ndk", "ndk-sys", "objc2 0.4.1", @@ -7088,7 +7558,7 @@ dependencies = [ "percent-encoding", "raw-window-handle", "redox_syscall 0.3.5", - "rustix 0.38.34", + "rustix 0.38.37", "sctk-adwaita", "smithay-client-toolkit 0.18.1", "smol_str", @@ -7118,13 +7588,25 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.13" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] +[[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" @@ -7145,9 +7627,9 @@ dependencies = [ "as-raw-xcb-connection", "gethostname", "libc", - "libloading 0.8.4", + "libloading 0.8.5", "once_cell", - "rustix 0.38.34", + "rustix 0.38.37", "x11rb-protocol", ] @@ -7158,10 +7640,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" [[package]] -name = "xcursor" -version = "0.3.5" +name = "xattr" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +dependencies = [ + "libc", + "linux-raw-sys 0.4.14", + "rustix 0.38.37", +] + +[[package]] +name = "xcursor" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61" [[package]] name = "xdg" @@ -7174,7 +7667,7 @@ name = "xdg-desktop-portal-cosmic" version = "0.1.0" dependencies = [ "anyhow", - "ashpd", + "ashpd 0.8.1", "clap", "cosmic-bg-config", "cosmic-client-toolkit", @@ -7190,34 +7683,34 @@ dependencies = [ "gstreamer", "i18n-embed", "i18n-embed-fl 0.8.0", - "image 0.25.1", + "image 0.25.2", "libcosmic", "libspa-sys", "log", - "memmap2 0.9.4", + "memmap2 0.9.5", "once_cell", "pipewire", "png", "rust-embed", - "rustix 0.38.34", + "rustix 0.38.37", "serde", "tempfile", "time", "tokio", "url", "wayland-client", - "wayland-protocols 0.32.1", - "zbus 4.3.1", + "wayland-protocols 0.32.4", + "zbus 4.4.0", ] [[package]] name = "xdg-home" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -7268,9 +7761,9 @@ dependencies = [ [[package]] name = "xml-rs" -version = "0.8.20" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" +checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26" [[package]] name = "xmlwriter" @@ -7280,9 +7773,9 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] name = "xxhash-rust" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63658493314859b4dfdf3fb8c1defd61587839def09582db50b8a4e93afca6bb" +checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984" [[package]] name = "yansi-term" @@ -7299,6 +7792,30 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" +[[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.77", + "synstructure", +] + [[package]] name = "zbus" version = "3.15.2" @@ -7343,16 +7860,16 @@ dependencies = [ [[package]] name = "zbus" -version = "4.3.1" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "851238c133804e0aa888edf4a0229481c753544ca12a60fd1c3230c8a500fe40" +checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" dependencies = [ "async-broadcast 0.7.1", "async-executor", "async-fs 2.1.2", - "async-io 2.3.3", + "async-io 2.3.4", "async-lock 3.4.0", - "async-process 2.2.3", + "async-process 2.3.0", "async-recursion", "async-task", "async-trait", @@ -7375,9 +7892,9 @@ dependencies = [ "uds_windows", "windows-sys 0.52.0", "xdg-home", - "zbus_macros 4.3.1", + "zbus_macros 4.4.0", "zbus_names 3.0.0", - "zvariant 4.1.2", + "zvariant 4.2.0", ] [[package]] @@ -7396,15 +7913,15 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "4.3.1" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d5a3f12c20bd473be3194af6b49d50d7bb804ef3192dc70eddedb26b85d9da7" +checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.68", - "zvariant_utils 2.0.0", + "syn 2.0.77", + "zvariant_utils 2.1.0", ] [[package]] @@ -7426,7 +7943,7 @@ checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" dependencies = [ "serde", "static_assertions", - "zvariant 4.1.2", + "zvariant 4.2.0", ] [[package]] @@ -7441,6 +7958,7 @@ version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] @@ -7452,7 +7970,141 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", +] + +[[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.77", + "synstructure", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "zip" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494" +dependencies = [ + "aes", + "arbitrary", + "bzip2", + "constant_time_eq", + "crc32fast", + "crossbeam-utils", + "deflate64", + "displaydoc", + "flate2", + "hmac", + "indexmap", + "lzma-rs", + "memchr", + "pbkdf2", + "rand", + "sha1", + "thiserror", + "time", + "zeroize", + "zopfli", + "zstd", +] + +[[package]] +name = "zopfli" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946" +dependencies = [ + "bumpalo", + "crc32fast", + "lockfree-object-pool", + "log", + "once_cell", + "simd-adler32", +] + +[[package]] +name = "zstd" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "7.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" +dependencies = [ + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.13+zstd.1.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" +dependencies = [ + "cc", + "pkg-config", ] [[package]] @@ -7472,9 +8124,9 @@ dependencies = [ [[package]] name = "zune-jpeg" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" +checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" dependencies = [ "zune-core", ] @@ -7495,16 +8147,16 @@ dependencies = [ [[package]] name = "zvariant" -version = "4.1.2" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1724a2b330760dc7d2a8402d841119dc869ef120b139d29862d6980e9c75bfc9" +checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" dependencies = [ "endi", "enumflags2", "serde", "static_assertions", "url", - "zvariant_derive 4.1.2", + "zvariant_derive 4.2.0", ] [[package]] @@ -7522,15 +8174,15 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "4.1.2" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55025a7a518ad14518fb243559c058a2e5b848b015e31f1d90414f36e3317859" +checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.68", - "zvariant_utils 2.0.0", + "syn 2.0.77", + "zvariant_utils 2.1.0", ] [[package]] @@ -7546,11 +8198,11 @@ dependencies = [ [[package]] name = "zvariant_utils" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" +checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] diff --git a/third_party/nixpkgs/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/third_party/nixpkgs/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix index 717facbc03..70524b3ce1 100644 --- a/third_party/nixpkgs/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "xdg-desktop-portal-cosmic"; - version = "1.0.0-alpha.1"; + version = "1.0.0-alpha.2"; src = fetchFromGitHub { owner = "pop-os"; repo = pname; rev = "epoch-${version}"; - hash = "sha256-HjQ8VttWjWcMfVBXyeiju27nyZziY/5V1csUEstqTtE="; + hash = "sha256-MbcktIXkiH3uxQLduXF76ZGn2aoTd/D6xKeUM4M/btM="; }; - env.VERGEN_GIT_COMMIT_DATE = "2024-08-02"; + env.VERGEN_GIT_COMMIT_DATE = "2024-09-24"; env.VERGEN_GIT_SHA = src.rev; cargoLock = { @@ -30,18 +30,20 @@ rustPlatform.buildRustPackage rec { "accesskit-0.12.2" = "sha256-1UwgRyUe0PQrZrpS7574oNLi13fg5HpgILtZGW6JNtQ="; "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA="; "clipboard_macos-0.1.0" = "sha256-cG5vnkiyDlQnbEfV2sPbmBYKv1hd3pjJrymfZb8ziKk="; - "cosmic-bg-config-0.1.0" = "sha256-e195Hp0LD0bvHRi3AQvtQ9vccgWBqYwna6g+4U8rWdI="; + "cosmic-bg-config-0.1.0" = "sha256-lAFAZBo5FnXgJV3MrZhaYmBxqtH1E7+Huj53ho/hPik="; "cosmic-client-toolkit-0.1.0" = "sha256-1XtyEvednEMN4MApxTQid4eed19dEN5ZBDt/XRjuda0="; - "cosmic-config-0.1.0" = "sha256-l4LKJ19/5UOMm8oWhhVFvoN4Kbar/EMwBKaiA8RZ7VU="; - "cosmic-files-0.1.0" = "sha256-ZEAWOvT8rlM5dke5pYeGu1MO8umPu0LQmUkNq4BGPsQ="; - "cosmic-settings-daemon-0.1.0" = "sha256-+1XB7r45Uc71fLnNR4U0DUF2EB8uzKeE4HIrdvKhFXo="; - "cosmic-text-0.12.0" = "sha256-x7UMzlzYkWySFgSQTO1rRn+pyPG9tXKpJ7gzx/wpm8U="; + "cosmic-config-0.1.0" = "sha256-gXrMEoAN+7nYAEcs4w6wROhQTjMCxkGn+muJutktLyk="; + "cosmic-files-0.1.0" = "sha256-rBR6IPpMgOltyaRPPZ5V8tYH/xtQphgrPWci/kvlgEg="; + "cosmic-settings-daemon-0.1.0" = "sha256-6cEgFfkBxEpIo8LsvKDR2khMdhEz/dp2oYJXXBiC9zg="; + "cosmic-text-0.12.1" = "sha256-u2Tw+XhpIKeFg8Wgru/sjGw6GUZ2m50ZDmRBJ1IM66w="; "d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4="; + "fs_extra-1.3.0" = "sha256-ftg5oanoqhipPnbUsqnA4aZcyHqn9XsINJdrStIPLoE="; "glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg="; - "libspa-0.8.0" = "sha256-iOT9y8hppY9hisHdbMRAhkRIAB/wzNnjWzAgT2Vf6eY="; - "smithay-clipboard-0.8.0" = "sha256-pBQZ+UXo9hZ907mfpcZk+a+8pKrIWdczVvPkjT3TS8U="; + "libspa-0.8.0" = "sha256-kp5x5QhmgEqCrt7xDRfMFGoTK5IXOuvW2yOW02B8Ftk="; + "smithay-clipboard-0.8.0" = "sha256-4InFXm0ahrqFrtNLeqIuE3yeOpxKZJZx+Bc0yQDtv34="; "softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg="; "taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI="; + "trash-5.1.1" = "sha256-So8rQ8gLF5o79Az396/CQY/veNo4ticxYpYZPfMJyjQ="; "winit-0.29.10" = "sha256-ScTII2AzK3SC8MVeASZ9jhVWsEaGrSQ2BnApTxgfxK4="; }; }; @@ -63,8 +65,10 @@ rustPlatform.buildRustPackage rec { ]; postInstall = '' - mkdir -p $out/share/{dbus-1/services,xdg-desktop-portal/portals} + mkdir -p $out/share/{dbus-1/services,icons,xdg-desktop-portal/portals} + cp -r data/icons $out/share/icons/hicolor cp data/*.service $out/share/dbus-1/services/ + cp data/cosmic-portals.conf $out/share/xdg-desktop-portal/ cp data/cosmic.portal $out/share/xdg-desktop-portal/portals/ ''; diff --git a/third_party/nixpkgs/pkgs/by-name/xi/xiphos/package.nix b/third_party/nixpkgs/pkgs/by-name/xi/xiphos/package.nix index d3aaa70fc9..b6b01ae077 100644 --- a/third_party/nixpkgs/pkgs/by-name/xi/xiphos/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/xi/xiphos/package.nix @@ -22,7 +22,7 @@ , minizip , pkg-config , sword -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 , yelp-tools , zip @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { libuuid minizip sword - webkitgtk + webkitgtk_4_0 ]; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/by-name/yo/yofi/package.nix b/third_party/nixpkgs/pkgs/by-name/yo/yofi/package.nix index 5fa38d280a..5494c8369d 100644 --- a/third_party/nixpkgs/pkgs/by-name/yo/yofi/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/yo/yofi/package.nix @@ -1,12 +1,14 @@ -{ lib -, fetchFromGitHub -, rustPlatform -, autoPatchelfHook -, fontconfig -, libxkbcommon -, pkg-config -, libgcc -, wayland +{ + lib, + fetchFromGitHub, + fetchpatch, + rustPlatform, + autoPatchelfHook, + fontconfig, + libxkbcommon, + pkg-config, + libgcc, + wayland, }: rustPlatform.buildRustPackage rec { pname = "yofi"; @@ -19,7 +21,16 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cepAZyA4RBgqeF20g6YOlZTM0aRqErw17yuQ3U24UEg="; }; - cargoHash = "sha256-iSy/y1iwhR8x3wDIfazMeROSrJ8uRyA10hoNo6y2OQc="; + cargoPatches = [ + (fetchpatch { + name = "bump-time-1.80.0.patch"; + url = "https://github.com/l4l/yofi/commit/438e180bf5132d29a6846e830d7227cb996ade3e.patch"; + hash = "sha256-o/kwQRIG6MASGYnepb96pL1qfI+/CNTqc5maDPjSZXk="; + }) + ]; + + cargoHash = "sha256-GA6rFet0GIYFR/8WsWteMDwVRz/KyyxlFQOz/lNX7Rk="; + nativeBuildInputs = [ autoPatchelfHook pkg-config @@ -31,7 +42,10 @@ rustPlatform.buildRustPackage rec { ]; appendRunpaths = [ - (lib.makeLibraryPath [ fontconfig wayland ]) + (lib.makeLibraryPath [ + fontconfig + wayland + ]) ]; checkFlags = [ diff --git a/third_party/nixpkgs/pkgs/by-name/yt/ytdownloader/package.nix b/third_party/nixpkgs/pkgs/by-name/yt/ytdownloader/package.nix index 190c8e9f96..43265c6bd3 100644 --- a/third_party/nixpkgs/pkgs/by-name/yt/ytdownloader/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/yt/ytdownloader/package.nix @@ -12,16 +12,16 @@ buildNpmPackage rec { pname = "ytDownloader"; - version = "3.18.2"; + version = "3.18.3"; src = fetchFromGitHub { owner = "aandrew-me"; repo = "ytDownloader"; rev = "refs/tags/v${version}"; - hash = "sha256-j6FeRqAeqXLofvI5R7nOwfg6wd17Xk85vryktGfnxyI="; + hash = "sha256-omq1krlHj0+SvyofQtJnVBiQzHPIC/v/WhXGClm0vzM="; }; - npmDepsHash = "sha256-LUlpyzHJDpjytZmMjjn899NKwvb80a0DXdMhVT2aRTY="; + npmDepsHash = "sha256-PE9RWdnUlHTCBqGN6xvq+B7gXke/KsKsGcg1SAy7bfs="; nativeBuildInputs = [ copyDesktopItems diff --git a/third_party/nixpkgs/pkgs/by-name/za/zabbix-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/za/zabbix-cli/package.nix new file mode 100644 index 0000000000..16fd8c84b6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/za/zabbix-cli/package.nix @@ -0,0 +1,74 @@ +{ + lib, + fetchFromGitHub, + python3Packages, + testers, + zabbix-cli, +}: + +python3Packages.buildPythonApplication rec { + pname = "zabbix-cli"; + version = "3.1.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "usit-gd"; + repo = "zabbix-cli"; + rev = "refs/tags/${version}"; + hash = "sha256-It0SVbGNIxf2i4gleqVRAZCIks/Tf/WYSAgipOC+HwE="; + }; + + pythonRelaxDeps = [ "click-repl" ]; + + build-system = with python3Packages; [ + hatchling + ]; + + dependencies = + with python3Packages; + [ + click-repl + httpx + httpx.optional-dependencies.socks + packaging + platformdirs + pydantic + requests + rich + strenum + tomli + tomli-w + typer + typing-extensions + ] + ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata + ]; + + nativeCheckInputs = with python3Packages; [ + freezegun + inline-snapshot + pytestCheckHook + ]; + + # Otherwise tests will fail to create directory + # Permission denied: '/homeless-shelter' + preCheck = '' + export HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ "zabbix_cli" ]; + + passthru.tests.version = testers.testVersion { + package = zabbix-cli; + command = "HOME=$(mktemp -d) zabbix-cli --version"; + }; + + meta = with lib; { + description = "Command-line interface for Zabbix"; + homepage = "https://github.com/unioslo/zabbix-cli"; + license = licenses.gpl3Plus; + mainProgram = "zabbix-cli"; + maintainers = [ maintainers.anthonyroussel ]; + }; +} 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 97ada31736..9a7a5be0dc 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 @@ -245,7 +245,6 @@ dependencies = [ "chrono", "futures 0.3.30", "http_client", - "isahc", "schemars", "serde", "serde_json", @@ -895,9 +894,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", @@ -2087,9 +2086,9 @@ dependencies = [ [[package]] name = "cargo_toml" -version = "0.20.4" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad639525b1c67b6a298f378417b060fbc04618bea559482a8484381cce27d965" +checksum = "88da5a13c620b4ca0078845707ea9c3faf11edbc3ffd8497d11d686211cd1ac0" dependencies = [ "serde", "toml 0.8.19", @@ -2283,9 +2282,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.17" +version = "4.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" +checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615" dependencies = [ "clap_builder", "clap_derive", @@ -2293,9 +2292,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.17" +version = "4.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" +checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b" dependencies = [ "anstream", "anstyle", @@ -2315,9 +2314,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.13" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -2850,7 +2849,6 @@ dependencies = [ "gpui", "http_client", "indoc", - "isahc", "language", "lsp", "menu", @@ -3731,6 +3729,7 @@ dependencies = [ "multi_buffer", "ordered-float 2.10.1", "parking_lot", + "pretty_assertions", "project", "rand 0.8.5", "release_channel", @@ -4128,7 +4127,6 @@ dependencies = [ "gpui", "http_client", "indexed_docs", - "isahc", "isahc_http_client", "language", "log", @@ -4147,6 +4145,7 @@ dependencies = [ "snippet_provider", "task", "theme", + "tokio", "toml 0.8.19", "ui", "url", @@ -4289,7 +4288,6 @@ dependencies = [ "gpui", "http_client", "human_bytes", - "isahc", "language", "log", "menu", @@ -5016,7 +5014,6 @@ dependencies = [ "anyhow", "futures 0.3.30", "http_client", - "isahc", "schemars", "serde", "serde_json", @@ -5151,9 +5148,9 @@ dependencies = [ [[package]] name = "grid" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d196ffc1627db18a531359249b2bf8416178d84b729f3cebeb278f285fb9b58c" +checksum = "be136d9dacc2a13cc70bb6c8f902b414fb2641f8db1314637c6b7933411a8f82" [[package]] name = "group" @@ -6288,7 +6285,6 @@ dependencies = [ "http_client", "image", "inline_completion_button", - "isahc", "language", "log", "menu", @@ -6306,6 +6302,7 @@ dependencies = [ "strum 0.25.0", "text", "theme", + "thiserror", "tiktoken-rs", "ui", "unindent", @@ -6372,7 +6369,6 @@ dependencies = [ "node_runtime", "paths", "project", - "protols-tree-sitter-proto", "regex", "rope", "rust-embed", @@ -6434,9 +6430,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.158" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libdbus-sys" @@ -6478,7 +6474,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -7523,7 +7519,6 @@ dependencies = [ "anyhow", "futures 0.3.30", "http_client", - "isahc", "schemars", "serde", "serde_json", @@ -7592,7 +7587,6 @@ dependencies = [ "anyhow", "futures 0.3.30", "http_client", - "isahc", "schemars", "serde", "serde_json", @@ -7848,9 +7842,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" @@ -8358,9 +8352,9 @@ dependencies = [ [[package]] name = "pretty_assertions" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" +checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d" dependencies = [ "diff", "yansi", @@ -8632,15 +8626,6 @@ version = "2.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" -[[package]] -name = "protols-tree-sitter-proto" -version = "0.2.0" -source = "git+https://github.com/zed-industries/tree-sitter-proto?rev=0848bd30a64be48772e15fbb9d5ba8c0cc5772ad#0848bd30a64be48772e15fbb9d5ba8c0cc5772ad" -dependencies = [ - "cc", - "tree-sitter-language", -] - [[package]] name = "psm" version = "0.1.21" @@ -8952,7 +8937,6 @@ dependencies = [ "gpui", "language", "log", - "markdown", "menu", "ordered-float 2.10.1", "picker", @@ -9106,6 +9090,7 @@ dependencies = [ "serde_json", "smol", "tempfile", + "thiserror", "util", ] @@ -9114,7 +9099,9 @@ name = "remote_server" version = "0.1.0" dependencies = [ "anyhow", + "backtrace", "cargo_toml", + "clap", "client", "clock", "env_logger", @@ -9123,6 +9110,7 @@ dependencies = [ "gpui", "http_client", "language", + "languages", "log", "lsp", "node_runtime", @@ -10067,9 +10055,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.127" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "indexmap 2.4.0", "itoa", @@ -10499,12 +10487,27 @@ dependencies = [ "futures 0.3.30", "gpui", "parking_lot", + "paths", "serde", "serde_json", "snippet", "util", ] +[[package]] +name = "snippets_ui" +version = "0.1.0" +dependencies = [ + "fuzzy", + "gpui", + "language", + "paths", + "picker", + "ui", + "util", + "workspace", +] + [[package]] name = "socket2" version = "0.4.10" @@ -10595,6 +10598,7 @@ dependencies = [ "libsqlite3-sys", "parking_lot", "smol", + "sqlformat", "thread_local", "util", "uuid", @@ -10611,9 +10615,9 @@ dependencies = [ [[package]] name = "sqlformat" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f895e3734318cc55f1fe66258926c9b910c124d47520339efecbb6c59cec7c1f" +checksum = "7bba3a93db0cc4f7bdece8bb09e77e2e785c20bfebf79eb8340ed80708048790" dependencies = [ "nom", "unicode_categories", @@ -10869,6 +10873,7 @@ dependencies = [ "fuzzy", "gpui", "indoc", + "isahc_http_client", "language", "log", "menu", @@ -11267,6 +11272,7 @@ dependencies = [ "project", "serde", "serde_json", + "settings", "theme", "ui", "util", @@ -11275,9 +11281,9 @@ dependencies = [ [[package]] name = "taffy" -version = "0.4.4" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ec17858c2d465b2f734b798b920818a974faf0babb15d7fef81818a4b2d16f1" +checksum = "9cb893bff0f80ae17d3a57e030622a967b8dbc90e38284d9b4b1442e23873c94" dependencies = [ "arrayvec", "grid", @@ -11351,6 +11357,7 @@ dependencies = [ name = "telemetry_events" version = "0.1.0" dependencies = [ + "language", "semantic_version", "serde", ] @@ -11416,12 +11423,12 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" +checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef" dependencies = [ "rustix 0.38.35", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -11500,7 +11507,6 @@ dependencies = [ "serde_json_lenient", "serde_repr", "settings", - "story", "util", "uuid", ] @@ -11547,18 +11553,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", @@ -11737,6 +11743,7 @@ dependencies = [ "pretty_assertions", "project", "recent_projects", + "remote", "rpc", "serde", "settings", @@ -13535,7 +13542,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -14109,6 +14116,7 @@ dependencies = [ "parking_lot", "postage", "project", + "release_channel", "remote", "schemars", "serde", @@ -14304,9 +14312,9 @@ dependencies = [ [[package]] name = "yansi" -version = "0.5.1" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" [[package]] name = "yazi" @@ -14389,7 +14397,7 @@ dependencies = [ [[package]] name = "zed" -version = "0.155.2" +version = "0.157.5" dependencies = [ "activity_indicator", "anyhow", @@ -14434,7 +14442,6 @@ dependencies = [ "image_viewer", "inline_completion_button", "install_cli", - "isahc", "isahc_http_client", "journal", "language", @@ -14474,6 +14481,7 @@ dependencies = [ "simplelog", "smol", "snippet_provider", + "snippets_ui", "supermaven", "sysinfo", "tab_switcher", @@ -14531,7 +14539,7 @@ dependencies = [ [[package]] name = "zed_dart" -version = "0.1.0" +version = "0.1.1" dependencies = [ "zed_extension_api 0.1.0", ] @@ -14636,7 +14644,7 @@ dependencies = [ [[package]] name = "zed_php" -version = "0.2.0" +version = "0.2.1" dependencies = [ "zed_extension_api 0.1.0", ] @@ -14648,6 +14656,13 @@ dependencies = [ "zed_extension_api 0.1.0", ] +[[package]] +name = "zed_proto" +version = "0.2.0" +dependencies = [ + "zed_extension_api 0.1.0", +] + [[package]] name = "zed_purescript" version = "0.0.1" @@ -14686,7 +14701,7 @@ dependencies = [ [[package]] name = "zed_terraform" -version = "0.1.0" +version = "0.1.1" dependencies = [ "zed_extension_api 0.1.0", ] 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 7df7e9f55e..d0845a4a70 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 @@ -29,7 +29,7 @@ envsubst, gitUpdater, cargo-about, - testers, + versionCheckHook, zed-editor, buildFHSEnv, @@ -86,13 +86,13 @@ let in rustPlatform.buildRustPackage rec { pname = "zed-editor"; - version = "0.155.2"; + version = "0.157.5"; src = fetchFromGitHub { owner = "zed-industries"; repo = "zed"; rev = "refs/tags/v${version}"; - hash = "sha256-QiZZsy96WoWBFFKzVt6k4ZhxhvdBsy2iaF5TnYyb4v8="; + hash = "sha256-xtSdlzj1AxhJN4aXLJ+Oy51LX4QduLwcuCfK42kthvE="; fetchSubmodules = true; }; @@ -112,7 +112,6 @@ rustPlatform.buildRustPackage rec { "font-kit-0.14.1" = "sha256-qUKvmi+RDoyhMrZ7T6SoVAyMc/aasQ9Y/okzre4SzXo="; "lsp-types-0.95.1" = "sha256-N4MKoU9j1p/Xeowki/+XiNQPwIcTm9DgmfM/Eieq4js="; "nvim-rs-0.8.0-pre" = "sha256-VA8zIynflul1YKBlSxGCXCwa2Hz0pT3mH6OPsfS7Izo="; - "protols-tree-sitter-proto-0.2.0" = "sha256-0pvHuwqtkHYLevQnaEFmfyDtILD7Wy0in2KSKFR2mKw="; "tree-sitter-gomod-1.0.2" = "sha256-FCb8ndKSFiLY7/nTX7tWF8c4KcSvoBU1QB5R4rdOgT0="; "tree-sitter-gowork-0.0.1" = "sha256-WRMgGjOlJ+bT/YnSBeSLRTLlltA5WwTvV0Ow/949+BE="; "tree-sitter-heex-0.0.1" = "sha256-SnjhL0WVsHOKuUp3dkTETnCgC/Z7WN0XmpQdJPBeBhw="; @@ -243,15 +242,18 @@ rustPlatform.buildRustPackage rec { runHook postInstall ''; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = "${placeholder "out"}/bin/zeditor"; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + passthru = { updateScript = gitUpdater { rev-prefix = "v"; ignoredVersions = "pre"; }; - tests.version = testers.testVersion { - inherit version; - package = zed-editor; - }; fhs = fhs { }; fhsWithPackages = f: fhs { additionalPkgs = f; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/zegrapher/default.nix b/third_party/nixpkgs/pkgs/by-name/ze/zegrapher/package.nix similarity index 51% rename from third_party/nixpkgs/pkgs/applications/science/math/zegrapher/default.nix rename to third_party/nixpkgs/pkgs/by-name/ze/zegrapher/package.nix index ffe337efd7..d4794550ed 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/zegrapher/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ze/zegrapher/package.nix @@ -1,37 +1,46 @@ -{ lib, stdenv -, fetchFromGitHub -, qmake -, wrapQtAppsHook -, boost }: +{ + lib, + boost, + fetchFromGitHub, + qt5, + stdenv, +}: -stdenv.mkDerivation rec { +let + inherit (qt5) qmake wrapQtAppsHook; +in +stdenv.mkDerivation (finalAttrs: { pname = "zegrapher"; version = "3.1.1"; src = fetchFromGitHub { owner = "AdelKS"; repo = "ZeGrapher"; - rev = "v${version}"; - sha256 = "sha256-OSQXm0gDI1zM2MBM4iiY43dthJcAZJkprklolsNMEvk="; + rev = "v${finalAttrs.version}"; + hash = "sha256-OSQXm0gDI1zM2MBM4iiY43dthJcAZJkprklolsNMEvk="; }; nativeBuildInputs = [ qmake wrapQtAppsHook ]; + buildInputs = [ boost ]; - meta = with lib; { - homepage = "https://zegrapher.com/"; + strictDeps = true; + + meta = { + homepage = "https://zegrapher.com/en/"; description = "Open source math plotter"; - mainProgram = "ZeGrapher"; longDescription = '' An open source, free and easy to use math plotter. It can plot functions, sequences, parametric equations and data on the plane. ''; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; + license = lib.licenses.gpl3Plus; + mainProgram = "ZeGrapher"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/zo/zoom-us/package.nix b/third_party/nixpkgs/pkgs/by-name/zo/zoom-us/package.nix index 14d853e30b..23f909a274 100644 --- a/third_party/nixpkgs/pkgs/by-name/zo/zoom-us/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/zo/zoom-us/package.nix @@ -115,7 +115,7 @@ let binPath = lib.makeBinPath ([ coreutils glib.dev pciutils procps util-linux ] ++ lib.optional pulseaudioSupport pulseaudio); in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "zoom"; version = versions.${system} or throwSystem; @@ -153,7 +153,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' makeWrapper $out/Applications/zoom.us.app/Contents/MacOS/zoom.us $out/bin/zoom '' + lib.optionalString stdenv.hostPlatform.isLinux '' # Desktop File @@ -161,7 +161,9 @@ stdenv.mkDerivation rec { --replace-fail "Exec=/usr/bin/zoom" "Exec=$out/bin/zoom" for i in aomhost zopen zoom ZoomLauncher ZoomWebviewHost; do - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/opt/zoom/$i + if [ -f $out/opt/zoom/$i ]; then + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/opt/zoom/$i + fi done # ZoomLauncher sets LD_LIBRARY_PATH before execing zoom @@ -183,11 +185,13 @@ stdenv.mkDerivation rec { --prefix PATH : ${binPath} \ --prefix LD_LIBRARY_PATH ":" ${libs} - wrapProgram $out/opt/zoom/ZoomWebviewHost \ - --unset QML2_IMPORT_PATH \ - --unset QT_PLUGIN_PATH \ - --unset QT_SCREEN_SCALE_FACTORS \ - --prefix LD_LIBRARY_PATH ":" ${libs} + if [ -f $out/opt/zoom/ZoomWebviewHost ]; then + wrapProgram $out/opt/zoom/ZoomWebviewHost \ + --unset QML2_IMPORT_PATH \ + --unset QT_PLUGIN_PATH \ + --unset QT_SCREEN_SCALE_FACTORS \ + --prefix LD_LIBRARY_PATH ":" ${libs} + fi # Backwards compatibility: we used to call it zoom-us ln -s $out/bin/{zoom,zoom-us} diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix index d0ccf32ce3..f06b46c306 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix @@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = "Iosevka${toString set}"; - version = "31.7.1"; + version = "31.8.0"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-yio+ZJ+hgybgEUfxXt/xk3ahM5lollKGJC0821vi9e0="; + hash = "sha256-GGtbW4Y/02ubdufTXmywGS4jyMfm8RfOMvmUNoUcLQg="; }; - npmDepsHash = "sha256-gtBQdeX7hkactPSq609DMoc8rY2AHfg2nkpj26ZV88A="; + npmDepsHash = "sha256-/zLWtIIPNOMrICKaj5SY1Bo3Pdso6a776fIYY/7X0U4="; nativeBuildInputs = [ remarshal diff --git a/third_party/nixpkgs/pkgs/data/fonts/junicode/default.nix b/third_party/nixpkgs/pkgs/data/fonts/junicode/default.nix index c3d5fffb5a..5d88b2c0ae 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/junicode/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/junicode/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "junicode"; - version = "2.208"; + version = "2.209"; src = fetchzip { url = "https://github.com/psb1558/Junicode-font/releases/download/v${version}/Junicode_${version}.zip"; - hash = "sha256-uzPzZ6b/CxdcoXSsxf2Cfs9/MpcGn7pQfdwL37pbvXg="; + hash = "sha256-hdCDLwTiyE2ZpFgmYAX7YWCujUwozIozD+k/lCStJUg="; }; outputs = [ "out" "doc" "tex" ]; diff --git a/third_party/nixpkgs/pkgs/data/fonts/junicode/tex-font-path.patch b/third_party/nixpkgs/pkgs/data/fonts/junicode/tex-font-path.patch index 13b311b39c..3e0fd69b36 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/junicode/tex-font-path.patch +++ b/third_party/nixpkgs/pkgs/data/fonts/junicode/tex-font-path.patch @@ -77,7 +77,7 @@ index c01ccaf..07a99ad 100644 % DECLARE THE FONTS --\setmainfont{Junicode VF}[ +-\setmainfont{JunicodeVF}[ - ItalicFont = {*-Italic}, - BoldFont = {*}, - BoldItalicFont = {*-Italic}, diff --git a/third_party/nixpkgs/pkgs/data/icons/dracula-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/dracula-icon-theme/default.nix index d09037cad1..4a6fe773f4 100644 --- a/third_party/nixpkgs/pkgs/data/icons/dracula-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/dracula-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation { pname = "dracula-icon-theme"; - version = "unstable-2021-07-21"; + version = "0-unstable-2024-05-26"; src = fetchFromGitHub { owner = "m4thewz"; repo = "dracula-icons"; - rev = "2d3c83caa8664e93d956cfa67a0f21418b5cdad8"; - hash = "sha256-GY+XxTM22jyNq8kaB81zNfHRhfXujArFcyzDa8kjxCQ="; + rev = "6232e5217429a3ae6396c9e054f5338cecdbb7a5"; + hash = "sha256-u2cIUTLWYs8VIqg6ZAUyz0nmzuFAZC4oh7bE67+B1Vg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/misc/cacert/default.nix b/third_party/nixpkgs/pkgs/data/misc/cacert/default.nix index be45a9c464..d98a50f34f 100644 --- a/third_party/nixpkgs/pkgs/data/misc/cacert/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/cacert/default.nix @@ -20,7 +20,7 @@ let blocklist = writeText "cacert-blocklist.txt" (lib.concatStringsSep "\n" blacklist); extraCertificatesBundle = writeText "cacert-extra-certificates-bundle.crt" (lib.concatStringsSep "\n\n" extraCertificateStrings); - srcVersion = "3.101.1"; + srcVersion = "3.104"; version = if nssOverride != null then nssOverride.version else srcVersion; meta = with lib; { homepage = "https://curl.haxx.se/docs/caextract.html"; @@ -37,7 +37,7 @@ let owner = "nss-dev"; repo = "nss"; rev = "NSS_${lib.replaceStrings ["."] ["_"] version}_RTM"; - hash = "sha256-KcRiOUbdFnH618MFM6uxmRn+/Jn4QMHtv1BELXrCAX4="; + hash = "sha256-TEGEKocapU5OTqx69n8nrn/X3SZr49d1alHM73UnDJw="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/data/misc/media-player-info/default.nix b/third_party/nixpkgs/pkgs/data/misc/media-player-info/default.nix index 74fb444152..bf7fe4da30 100644 --- a/third_party/nixpkgs/pkgs/data/misc/media-player-info/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/media-player-info/default.nix @@ -1,16 +1,19 @@ -{ lib, stdenv, fetchurl, pkg-config, python3, udev, systemd }: +{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, python3, udev, systemd }: stdenv.mkDerivation rec { pname = "media-player-info"; - version = "24"; + version = "26"; - src = fetchurl { - url = "https://www.freedesktop.org/software/media-player-info/${pname}-${version}.tar.gz"; - sha256 = "0d0i7av8v369hzvlynwlrbickv1brlzsmiky80lrjgjh1gdldkz6"; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "media-player-info"; + repo = "media-player-info"; + rev = version; + hash = "sha256-VoMr5Lxy6u/BA/9t65/S8AW41YU0FLp6eftYUVdoMjY="; }; buildInputs = [ udev systemd ]; - nativeBuildInputs = [ pkg-config python3 ]; + nativeBuildInputs = [ autoreconfHook pkg-config python3 ]; postPatch = '' patchShebangs ./tools diff --git a/third_party/nixpkgs/pkgs/data/misc/publicsuffix-list/default.nix b/third_party/nixpkgs/pkgs/data/misc/publicsuffix-list/default.nix index 3a46cc980b..d12c615487 100644 --- a/third_party/nixpkgs/pkgs/data/misc/publicsuffix-list/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/publicsuffix-list/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation { pname = "publicsuffix-list"; - version = "0-unstable-2024-08-21"; + version = "0-unstable-2024-09-10"; src = fetchFromGitHub { owner = "publicsuffix"; repo = "list"; - rev = "30c3fc2db5ec0ecbc2efbb798b12459e9a22fffd"; - hash = "sha256-RmSlBl6lHFFvEEG2rsnwMpF9X8tv0VhPwhnke4UxUmA="; + rev = "fbcc4c495e8aed1fe0e90156e6b3796556eb6978"; + hash = "sha256-L6TepLI91IWImX453GO8VNSSle75f0H1IZbFr2qepDA="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/data/misc/tzdata/default.nix b/third_party/nixpkgs/pkgs/data/misc/tzdata/default.nix index 522b2da68c..f21357b4ca 100644 --- a/third_party/nixpkgs/pkgs/data/misc/tzdata/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/tzdata/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "tzdata"; - version = "2024a"; + version = "2024b"; srcs = [ (fetchurl { url = "https://data.iana.org/time-zones/releases/tzdata${finalAttrs.version}.tar.gz"; - hash = "sha256-DQQ0RZrL0gWaeo2h8zBKhKhlkfbtacYkj/+lArbt/+M="; + hash = "sha256-cOdU2xJqjQ2z0W1rTLX37B4E1fJhJV5FWKZ/6S055VA="; }) (fetchurl { url = "https://data.iana.org/time-zones/releases/tzcode${finalAttrs.version}.tar.gz"; - hash = "sha256-gAcolK3/WkWPHRQ+FuTKHYsqEiycU5naSCy2jLpqH/g="; + hash = "sha256-XkOPxEliSQavFqGP9Fc3OfDNqYYuXsKNO8sZy67Q9nI="; }) ]; @@ -34,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: { "LIBDIR=${placeholder "dev"}/lib" "MANDIR=${placeholder "man"}/share/man" "AWK=awk" + "CURL=:" # disable network access "CFLAGS=-DHAVE_LINK=0" "CFLAGS+=-DZIC_BLOAT_DEFAULT=\\\"fat\\\"" "cc=${stdenv.cc.targetPrefix}cc" @@ -45,11 +46,10 @@ stdenv.mkDerivation (finalAttrs: { "CFLAGS+=-DRESERVE_STD_EXT_IDS" ]; + enableParallelBuilding = true; + doCheck = true; - # everything except for: - # - check_web, because that needs curl and wants to talk to https://validator.w3.org - # - check_now, because that depends on the current time - checkTarget = "check_back check_character_set check_white_space check_links check_name_lengths check_slashed_abbrs check_sorted check_tables check_ziguard check_zishrink check_tzs"; + checkTarget = "check"; installFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "zic=${buildPackages.tzdata.bin}/bin/zic" 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 8170852020..c579941e42 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 = "20240920063125"; + version = "20241013063848"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-NNBC7Pd8mxPuC2LVmedZLtvsnw2LfbD+VEPwtTU5DQE="; + hash = "sha256-YFsz+fT2LPU4TakQ2V1PtETmnXI5r3qAaERAqM9mX5g="; }; vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg="; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/themes/dracula-theme/default.nix b/third_party/nixpkgs/pkgs/data/themes/dracula-theme/default.nix index 29d3e6a2cd..67f472323a 100644 --- a/third_party/nixpkgs/pkgs/data/themes/dracula-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/dracula-theme/default.nix @@ -2,7 +2,7 @@ let themeName = "Dracula"; - version = "4.0.0-unstable-2024-09-24"; + version = "4.0.0-unstable-2024-10-03"; in stdenvNoCC.mkDerivation { pname = "dracula-theme"; @@ -11,8 +11,8 @@ stdenvNoCC.mkDerivation { src = fetchFromGitHub { owner = "dracula"; repo = "gtk"; - rev = "f2d2ea560a83ebdef6734b70dd9683272b47894d"; - hash = "sha256-/xgvlcMC4AHITy15dVHhdTIeu1mcA6Luhdanpr1as4Q="; + rev = "b5b7f3aed7060e14b848ca449a1d575c872f4e73"; + hash = "sha256-hsWyvmxEBJKdNem+eYbGF+UBopP3p90SdFNP7wBuE74="; }; propagatedUserEnvPkgs = [ 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 224150c173..0a3d994586 100644 --- a/third_party/nixpkgs/pkgs/data/themes/qogir-kde/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/qogir-kde/default.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "qogir-kde"; - version = "0-unstable-2024-09-01"; + version = "0-unstable-2024-09-21"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = "dff5c1fbbaa0b824684c65063b635cf27bcb19ce"; - hash = "sha256-uK9lJVRdMszA0am1/E4mfIN50yNKONH85M7+e0ERtn4="; + rev = "9f665cc10ded4fe0a3100c9151a5bd12d1ac50ca"; + hash = "sha256-3WdDzOKO962RykLS8P4paxEiA1keGhuah/GhAKdsuhA="; }; # Propagate sddm theme dependencies to user env otherwise sddm does diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix index cb87e36630..be2af30cc3 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix @@ -15,7 +15,7 @@ qtdbusextended, gsettings-qt, elfutils, - ffmpeg, + ffmpeg_6, ffmpegthumbnailer, mpv, xorg, @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { qtmpris gsettings-qt elfutils - ffmpeg + ffmpeg_6 ffmpegthumbnailer xorg.libXtst xorg.libXdmcp @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { "--prefix LD_LIBRARY_PATH : ${ lib.makeLibraryPath [ mpv - ffmpeg + ffmpeg_6 ffmpegthumbnailer gst_all_1.gstreamer gst_all_1.gst-plugins-base diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-music/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-music/default.nix index 9013306af6..95cd7cf466 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-music/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-music/default.nix @@ -9,7 +9,7 @@ qt6integration, qt6platform-plugins, qt6mpris, - ffmpeg, + ffmpeg_6, libvlc, qt6Packages, taglib, @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { qt6Packages.qtbase qt6Packages.qt5compat qt6Packages.qtmultimedia - ffmpeg + ffmpeg_6 libvlc taglib SDL2 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 2e8b53dfa7..a665236714 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6core/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6core/default.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, cmake, pkg-config, doxygen, @@ -26,6 +27,11 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./fix-pkgconfig-path.patch ./fix-pri-path.patch + (fetchpatch { + name = "fix-build-on-qt-6.8.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dtk6core/-/raw/d2e991f96b2940e8533b7e944bab5a7dd6aa0fb7/qt-6.8.patch"; + hash = "sha256-HZxUrtUmVwnNUwcBoU7ewb+McsRkALQglPBbJU8HTkk="; + }) ]; postPatch = '' 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 ed54eb321c..1011faf0f1 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6declarative/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6declarative/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./fix-pkgconfig-path.patch ./fix-pri-path.patch + ./fix-build-on-qt-6.8.patch ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6declarative/fix-build-on-qt-6.8.patch b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6declarative/fix-build-on-qt-6.8.patch new file mode 100644 index 0000000000..ab09398c01 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6declarative/fix-build-on-qt-6.8.patch @@ -0,0 +1,135 @@ +diff --git a/qt6/src/CMakeLists.txt b/qt6/src/CMakeLists.txt +index 4314b72..a7ecaf1 100644 +--- a/qt6/src/CMakeLists.txt ++++ b/qt6/src/CMakeLists.txt +@@ -25,6 +25,7 @@ dtk_extend_target(${PLUGIN_NAME} EnableCov ${ENABLE_COV}) + qt_add_translations(${LIB_NAME} + TS_FILES ${TS_FILES} + QM_FILES_OUTPUT_VARIABLE QM_FILES ++ IMMEDIATE_CALL + ) + + set_target_properties(${LIB_NAME} PROPERTIES +diff --git a/src/private/dbackdropnode.cpp b/src/private/dbackdropnode.cpp +index 91c398a..1ed0ad8 100644 +--- a/src/private/dbackdropnode.cpp ++++ b/src/private/dbackdropnode.cpp +@@ -320,8 +320,8 @@ public: + renderer->setDevicePixelRatio(base->devicePixelRatio()); + renderer->setDeviceRect(base->deviceRect()); + renderer->setViewportRect(base->viewportRect()); +- renderer->setProjectionMatrix(base->projectionMatrix()); +- renderer->setProjectionMatrixWithNativeNDC(base->projectionMatrixWithNativeNDC()); ++ renderer->setProjectionMatrix(base->projectionMatrix(0)); ++ renderer->setProjectionMatrixWithNativeNDC(base->projectionMatrixWithNativeNDC(0)); + } else { + renderer->setDevicePixelRatio(1.0); + renderer->setDeviceRect(QRect(QPoint(0, 0), pixelSize)); +@@ -336,8 +336,8 @@ public: + } + + if (Q_UNLIKELY(!matrix.isIdentity())) { +- renderer->setProjectionMatrix(renderer->projectionMatrix() * matrix); +- renderer->setProjectionMatrixWithNativeNDC(renderer->projectionMatrixWithNativeNDC() * matrix); ++ renderer->setProjectionMatrix(renderer->projectionMatrix(0) * matrix); ++ renderer->setProjectionMatrixWithNativeNDC(renderer->projectionMatrixWithNativeNDC(0) * matrix); + } + + renderer->setRootNode(rootNode); +diff --git a/src/private/dmaskeffectnode.cpp b/src/private/dmaskeffectnode.cpp +index c4db07d..da1e4ce 100644 +--- a/src/private/dmaskeffectnode.cpp ++++ b/src/private/dmaskeffectnode.cpp +@@ -35,7 +35,7 @@ protected: + class OpaqueTextureMaterialShader : public QSGOpaqueTextureMaterialRhiShader + { + public: +- OpaqueTextureMaterialShader(); ++ OpaqueTextureMaterialShader(int viewCount); + + bool updateUniformData(RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) override; + +@@ -48,7 +48,7 @@ public: + class TextureMaterialShader : public OpaqueTextureMaterialShader + { + public: +- TextureMaterialShader(); ++ TextureMaterialShader(int viewCount); + + #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect) override; +@@ -61,7 +61,8 @@ protected: + #endif + }; + +-OpaqueTextureMaterialShader::OpaqueTextureMaterialShader() ++OpaqueTextureMaterialShader::OpaqueTextureMaterialShader(int viewCount) ++ : QSGOpaqueTextureMaterialRhiShader(viewCount) + { + #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + #if QT_CONFIG(opengl) +@@ -236,8 +237,8 @@ bool OpaqueTextureMaterialShader::updateGraphicsPipelineState(RenderState &state + } + #endif + +-TextureMaterialShader::TextureMaterialShader() +- : OpaqueTextureMaterialShader() ++TextureMaterialShader::TextureMaterialShader(int viewCount) ++ : OpaqueTextureMaterialShader(viewCount) + { + #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // TODO qt6 + #if QT_CONFIG(opengl) +@@ -529,7 +530,7 @@ QSGMaterialShader *TextureMaterial::createShader() const + QSGMaterialShader *TextureMaterial::createShader(QSGRendererInterface::RenderMode renderMode) const + { + Q_UNUSED(renderMode) +- return new TextureMaterialShader; ++ return new TextureMaterialShader(viewCount()); + } + #endif + +@@ -553,7 +554,7 @@ QSGMaterialShader *OpaqueTextureMaterial::createShader() const + QSGMaterialShader *OpaqueTextureMaterial::createShader(QSGRendererInterface::RenderMode renderMode) const + { + Q_UNUSED(renderMode) +- return new OpaqueTextureMaterialShader; ++ return new OpaqueTextureMaterialShader(viewCount()); + } + #endif + +diff --git a/src/private/drectanglenode.cpp b/src/private/drectanglenode.cpp +index efeeab6..b961588 100644 +--- a/src/private/drectanglenode.cpp ++++ b/src/private/drectanglenode.cpp +@@ -72,7 +72,8 @@ void CornerColorShader::initialize() + m_idQtOpacity = program->uniformLocation("qt_Opacity"); + } + #else +-CornerColorShader::CornerColorShader() ++CornerColorShader::CornerColorShader(int viewCount) ++ : QSGOpaqueTextureMaterialRhiShader(viewCount) + { + setShaderFileName(QSGMaterialShader::VertexStage, QStringLiteral(":/dtk/declarative/shaders_ng/cornerscolorshader.vert.qsb")); + setShaderFileName(QSGMaterialShader::FragmentStage, QStringLiteral(":/dtk/declarative/shaders_ng/cornerscolorshader.frag.qsb")); +@@ -128,7 +129,7 @@ QSGMaterialShader *CornerColorMaterial::createShader() const + QSGMaterialShader *CornerColorMaterial::createShader(QSGRendererInterface::RenderMode renderMode) const + { + Q_UNUSED(renderMode) +- return new CornerColorShader; ++ return new CornerColorShader(viewCount()); + } + #endif + +diff --git a/src/private/drectanglenode_p.h b/src/private/drectanglenode_p.h +index aee5a7c..7962154 100644 +--- a/src/private/drectanglenode_p.h ++++ b/src/private/drectanglenode_p.h +@@ -37,7 +37,7 @@ private: + class CornerColorShader : public QSGOpaqueTextureMaterialRhiShader + { + public: +- CornerColorShader(); ++ CornerColorShader(int viewCount); + bool updateUniformData(RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial); + }; + #endif 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 e6dddb9358..99888c90e0 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6gui/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6gui/default.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, cmake, pkg-config, doxygen, @@ -24,6 +25,11 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./fix-pkgconfig-path.patch ./fix-pri-path.patch + (fetchpatch { + name = "fix-build-on-qt-6.8.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dtk6gui/-/raw/b6b8521fd69c28dbca5f6e8d1d8258c904b6caf1/qt-6.8.patch"; + hash = "sha256-Fu5vwvKJGMW94JYoIPvDCeXs8WrAskQlVRX/3FYQFGY="; + }) ]; postPatch = '' 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 b76a189b27..2813dbb949 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6widget/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6widget/default.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, cmake, pkg-config, doxygen, @@ -25,6 +26,11 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./fix-pkgconfig-path.patch ./fix-pri-path.patch + (fetchpatch { + name = "fix-build-on-qt-6.8.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dtk6widget/-/raw/c4ac094715daa4ec319dc4d55bbca9d818845f82/qt-6.8.patch"; + hash = "sha256-XEgtAV0mF1+C26wCaukjuv4WNbP4ISGgXt/eav7h9ko="; + }) ]; postPatch = '' 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 08093b0bef..2b13bd66ab 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 @@ -2,16 +2,13 @@ stdenv, lib, fetchFromGitHub, - dtkwidget, - deepin-gettext-tools, - qt5integration, - qmake, - qtbase, - qttools, - qtx11extras, pkg-config, - wrapQtAppsHook, + deepin-gettext-tools, + libsForQt5, + dtkwidget, udisks2-qt5, + qt5platform-plugins, + qt5integration, }: stdenv.mkDerivation rec { @@ -34,30 +31,29 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - qmake - qttools + libsForQt5.qmake + libsForQt5.qttools + libsForQt5.wrapQtAppsHook pkg-config - wrapQtAppsHook deepin-gettext-tools ]; buildInputs = [ dtkwidget udisks2-qt5 - qtx11extras + qt5platform-plugins + qt5integration + libsForQt5.qtx11extras ]; cmakeFlags = [ "-DVERSION=${version}" ]; - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH - qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ]; - - meta = with lib; { + meta = { description = "Simple graphical interface for creating file system in a block device"; mainProgram = "dde-device-formatter"; homepage = "https://github.com/linuxdeepin/dde-device-formatter"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/impatience/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/impatience/default.nix index 8b1e24fd64..dfef4a3a72 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/impatience/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/impatience/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-impatience"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "timbertson"; repo = "gnome-shell-impatience"; rev = "refs/tags/version-${version}"; - hash = "sha256-yBRnhdCDeA0bL+kkrmnIqyXAlhZzO2Vthc4Dnba80j4="; + hash = "sha256-Z+tpmmGbC1rgV4U1w6qM3g85FwpRvzHbBCmFCfcmc60="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnustep/make/setup-hook.sh b/third_party/nixpkgs/pkgs/desktops/gnustep/make/setup-hook.sh index 0bfbd35f45..202084cc67 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnustep/make/setup-hook.sh +++ b/third_party/nixpkgs/pkgs/desktops/gnustep/make/setup-hook.sh @@ -18,7 +18,7 @@ addGnustepInstallFlags() { ) } -preInstallPhases+=" addGnustepInstallFlags" +appendToVar preInstallPhases addGnustepInstallFlags addGNUstepEnvVars() { local filename diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix index 34abc5d808..88770eeaf9 100644 --- a/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix @@ -6,12 +6,12 @@ gitUpdater, nixosTests, cmake, - content-hub, exiv2, gettext, gst_all_1, libusermetrics, lomiri-action-api, + lomiri-content-hub, lomiri-ui-toolkit, lomiri-thumbnailer, pkg-config, @@ -145,9 +145,9 @@ stdenv.mkDerivation (finalAttrs: { qzxing # QML - content-hub libusermetrics lomiri-action-api + lomiri-content-hub lomiri-ui-toolkit lomiri-thumbnailer qtpositioning @@ -192,7 +192,7 @@ stdenv.mkDerivation (finalAttrs: { export QML2_IMPORT_PATH=${ listToQtVar qtbase.qtQmlPrefix [ lomiri-ui-toolkit - content-hub + lomiri-content-hub lomiri-thumbnailer ] } @@ -203,7 +203,7 @@ stdenv.mkDerivation (finalAttrs: { ln -s $out/share/lomiri-camera-app/assets/lomiri-camera-app-splash.svg $out/share/lomiri-app-launch/splash/lomiri-camera-app.svg ln -s $out/share/lomiri-camera-app/assets/lomiri-barcode-reader-app-splash.svg $out/share/lomiri-app-launch/splash/lomiri-barcode-reader-app.svg - install -Dm644 ../camera-contenthub.json $out/share/content-hub/peers/lomiri-camera-app + install -Dm644 ../camera-contenthub.json $out/share/lomiri-content-hub/peers/lomiri-camera-app ''; dontWrapGApps = true; diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-clock-app/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-clock-app/default.nix index 6403ed165c..b750184e73 100644 --- a/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-clock-app/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-clock-app/default.nix @@ -6,10 +6,10 @@ gitUpdater, nixosTests, cmake, - content-hub, geonames, gettext, libusermetrics, + lomiri-content-hub, lomiri-sounds, lomiri-ui-toolkit, makeWrapper, @@ -124,8 +124,8 @@ stdenv.mkDerivation (finalAttrs: { qtbase # QML - content-hub libusermetrics + lomiri-content-hub lomiri-ui-toolkit qtdeclarative qtmultimedia @@ -172,7 +172,7 @@ stdenv.mkDerivation (finalAttrs: { export QML2_IMPORT_PATH=${ listToQtVar qtbase.qtQmlPrefix ( [ - content-hub + lomiri-content-hub lomiri-ui-toolkit qtmultimedia u1db-qt diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-docviewer-app/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-docviewer-app/default.nix index 165987ef18..6c5ce2a57c 100644 --- a/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-docviewer-app/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-docviewer-app/default.nix @@ -7,9 +7,9 @@ gitUpdater, nixosTests, cmake, - content-hub, gettext, libreoffice-unwrapped, + lomiri-content-hub, lomiri-ui-toolkit, pkg-config, poppler, @@ -21,61 +21,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-docviewer-app"; - version = "3.0.4"; + version = "3.1.0"; src = fetchFromGitLab { owner = "ubports"; repo = "development/apps/lomiri-docviewer-app"; rev = "v${finalAttrs.version}"; - hash = "sha256-xUBE+eSAfG2yMlE/DI+6JHQx+3HiNwtSTv/P4YOAE7Y="; + hash = "sha256-zesBZmaMiMJwHtj3SoaNeHPiM9VNGEa4nTIiG8nskqI="; }; patches = [ - # Remove when version > 3.0.4 - (fetchpatch { - name = "0001-lomiri-docviewer-app-Set-gettext-domain.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/8dc2c911817c45451ff341e4ae4b841bcc134945.patch"; - hash = "sha256-vP6MYl7qhJzkgtnVelMMIbc0ZkHxC1s3abUXJ2zVi4w="; - }) - (fetchpatch { - name = "0002-lomiri-docviewer-app-Install-splash-file.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/ef20bbdd5e80040bf11273a5fc2964400086fdc9.patch"; - hash = "sha256-ylPFn53PJRyyzhN1SxtmNFMFeDsV9UxyQhAqULA5PJM="; - }) - - # Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/72 merged & in release - (fetchpatch { - name = "1001-lomiri-docviewer-app-Stop-using-qt5_use_modules.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/120c81dd71356f2e06ef5c44d114b665236a7382.patch"; - hash = "sha256-4VCw90qYnQ/o67ndp9o8h+wUl2IUpmVGb9xyY55AMIQ="; - }) - (fetchpatch { - name = "1002-lomiri-docviewer-app-Move-Qt-find_package-to-top-level.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/43ee96a3a33b7a8f04e95f434982bcc60ba4b257.patch"; - hash = "sha256-3LggdNo4Yak4SVAD/4/mMCl8PjZy1dIx9i5hKHM5fJU="; - }) - - # Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/73 merged & in release - (fetchpatch { - name = "1011-lomiri-docviewer-app-Call-i18n-bindtextdomain.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/67599a841917304f76ffa1167a217718542a8b46.patch"; - hash = "sha256-nbi3qX14kWtFcXrxAD41IeybDIRTNfUdRgSP1vDI/Hs="; - }) - - # Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/74 merged & in release - (fetchpatch { - name = "1021-lomiri-docviewer-app-Use-GNUInstallDirs-more-better.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/40a860a118077c05692002db694be77ea62dc5b3.patch"; - hash = "sha256-/zhpIdqZ7WsU4tx4/AZs5w8kEopjH2boiHdHaJk5RXk="; - }) - - # Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/75 merged & in release - (fetchpatch { - name = "1031-lomiri-docviewer-app-Use-BUILD_TESTING.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/6f1eb739a3e0bf0ba847f94f8ea8411e0a385c2d.patch"; - hash = "sha256-yVuYG+1JGo/I4TVRZ3UQeO/TJ8GiFO5BJ9Bs7glK7hg="; - }) - # Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/76 merged & in release # fetchpatch2 because there's a file rename (fetchpatch2 { @@ -84,11 +39,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-KdHyKXM0hMMIFkuDn5JZJOEuitWAXT2QQOuR+1AolP0="; }) - # Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/77 merged & in release + # Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/81 merged & in release (fetchpatch { - name = "1051-lomiri-docviewer-app-Install-content-hub-lomiri-url-dispatcher-files.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/98f5ab9d51ba05e8c3ed1991c0b67d3922b5ba90.patch"; - hash = "sha256-JA26ga1CNOdbis87lSzqbUbs94Oc1vlxraXZxx3dsu8="; + name = "1051-lomiri-docviewer-app-XDGify-icon.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/a319e648ba15a7868d9ceb3a77ea15ad196e515b.patch"; + hash = "sha256-JMSnN8EyWPHhqHzaJxy3JIhNaOvPLYkVDnNCrPGbO4E="; }) ]; @@ -98,7 +53,6 @@ stdenv.mkDerivation (finalAttrs: { # We don't want absolute paths in desktop files substituteInPlace data/CMakeLists.txt \ - --replace-fail 'ICON "''${DATA_DIR}/''${ICON_FILE}"' 'ICON lomiri-docviewer-app' \ --replace-fail 'SPLASH "''${DATA_DIR}/''${SPLASH_FILE}"' 'SPLASH "lomiri-app-launch/splash/lomiri-docviewer-app.svg"' ''; @@ -118,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { qtdeclarative # QML - content-hub + lomiri-content-hub lomiri-ui-toolkit qtsystems ]; @@ -133,9 +87,8 @@ stdenv.mkDerivation (finalAttrs: { doCheck = false; postInstall = '' - mkdir -p $out/share/{icons/hicolor/scalable/apps,lomiri-app-launch/splash} + mkdir -p $out/share/lomiri-app-launch/splash - ln -s $out/share/{lomiri-docviewer-app/docviewer-app.svg,icons/hicolor/scalable/apps/lomiri-docviewer-app.svg} ln -s $out/share/{lomiri-docviewer-app/docviewer-app-splash.svg,lomiri-app-launch/splash/lomiri-docviewer-app.svg} ''; diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix index fa91e1531b..9ad6cee361 100644 --- a/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix @@ -2,13 +2,12 @@ stdenv, lib, fetchFromGitLab, - fetchpatch, gitUpdater, nixosTests, biometryd, cmake, - content-hub, gettext, + lomiri-content-hub, lomiri-thumbnailer, lomiri-ui-extras, lomiri-ui-toolkit, @@ -22,65 +21,22 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-filemanager-app"; - version = "1.0.4"; + version = "1.1.2"; src = fetchFromGitLab { owner = "ubports"; repo = "development/apps/lomiri-filemanager-app"; rev = "v${finalAttrs.version}"; - hash = "sha256-vjGCTfXoqul1S7KUJXG6JwgZOc2etXWsdKbyQ/V3abA="; + hash = "sha256-XA1Gdb0Kpc3BEifmgHhQ38moKkCkYbhpr8wptnddZlk="; }; - patches = [ - # This sets the *wrong* domain, but at least it sets *some* domain. - # Remove when version > 1.0.4 - (fetchpatch { - name = "0001-lomiri-filemanager-app-Set-a-gettext-domain.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/commit/b310434d2c25a3b446d3d975f3755eb473a833e8.patch"; - hash = "sha256-gzFFzZCIxedMGW4fp6sonnHj/HmwqdqU5fvGhXUsSOI="; - }) - - # Set the *correct* domain. - # Remove when version > 1.0.4 - (fetchpatch { - name = "0002-lomiri-filemanager-app-Fix-gettext-domain.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/commit/2bb19aeef2baba8d12df1e4976becc08d7cf341d.patch"; - hash = "sha256-wreOMMvBjf316N/XJv3VfI5f5N/VFiEraeadtgRStjA="; - }) - - # Bind domain to locale dir - # Remove when https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/merge_requests/112 merged & in release - (fetchpatch { - name = "0003-lomiri-filemanager-app-Call-i18n.bindtextdomain.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/commit/ac0ab681c52c691d464cf94707b013b39675ad2d.patch"; - hash = "sha256-mwpcHwMT2FcNC6KIZNuSWU/bA8XP8rEQKHn7t5m6npM="; - }) - - # Stop using deprecated qt5_use_modules - # Remove when https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/merge_requests/113 merged & in release - (fetchpatch { - name = "0004-lomiri-filemanager-app-Stop-using-qt5_use_modules.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/commit/c2bfe927b16e660bf4730371b1e61e442e034780.patch"; - hash = "sha256-wPOZP2FOaacEGj4SMS5Q/TO+/L11Qz7NTux4kA86Bcs="; - }) - - # Use pkg-config for smbclient flags - # Remove when https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/merge_requests/115 merged & in release - (fetchpatch { - name = "0005-lomiri-filemanager-app-Get-smbclient-flags-via-pkg-config.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/commit/aa791da5999719724e0b0592765e8fa2962305c6.patch"; - hash = "sha256-fFAYKBR28ym/n7fhP9O6VE2owarLxK8cN9QeExHFbtU="; - }) - ]; - postPatch = '' # Use correct QML install path, don't pull in autopilot test code (we can't run that system) # Remove absolute paths from desktop file, https://github.com/NixOS/nixpkgs/issues/308324 substituteInPlace CMakeLists.txt \ --replace-fail 'qmake -query QT_INSTALL_QML' 'echo ${placeholder "out"}/${qtbase.qtQmlPrefix}' \ --replace-fail 'add_subdirectory(tests)' '#add_subdirectory(tests)' \ - --replace-fail 'ICON ''${CMAKE_INSTALL_PREFIX}/''${DATA_DIR}/''${ICON_FILE}' 'ICON lomiri-filemanager-app' \ - --replace-fail 'SPLASH ''${CMAKE_INSTALL_PREFIX}/''${DATA_DIR}/''${SPLASH_FILE}' 'SPLASH lomiri-app-launch/splash/lomiri-filemanager-app.svg' + --replace-fail 'SPLASH ''${DATA_DIR}/''${SPLASH_FILE}' 'SPLASH lomiri-app-launch/splash/lomiri-filemanager-app.svg' # In case this ever gets run, at least point it to a correct-ish path substituteInPlace tests/autopilot/CMakeLists.txt \ @@ -103,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { # QML biometryd - content-hub + lomiri-content-hub lomiri-thumbnailer lomiri-ui-extras lomiri-ui-toolkit @@ -117,14 +73,6 @@ stdenv.mkDerivation (finalAttrs: { # No tests we can actually run (just autopilot) doCheck = false; - postInstall = '' - # Some misc files don't get installed to the correct paths for us - mkdir -p $out/share/{content-hub/peers,icons/hicolor/scalable/apps,lomiri-app-launch/splash} - ln -s $out/share/lomiri-filemanager-app/content-hub.json $out/share/content-hub/peers/lomiri-filemanager-app - ln -s $out/share/lomiri-filemanager-app/filemanager.svg $out/share/icons/hicolor/scalable/apps/lomiri-filemanager-app.svg - ln -s $out/share/lomiri-filemanager-app/splash.svg $out/share/lomiri-app-launch/splash/lomiri-filemanager-app.svg - ''; - passthru = { tests.vm = nixosTests.lomiri-filemanager-app; updateScript = gitUpdater { rev-prefix = "v"; }; diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix index deed853358..817ce9b69b 100644 --- a/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix @@ -6,11 +6,11 @@ gitUpdater, nixosTests, cmake, - content-hub, exiv2, imagemagick, libglvnd, libmediainfo, + lomiri-content-hub, lomiri-thumbnailer, lomiri-ui-extras, lomiri-ui-toolkit, @@ -25,79 +25,30 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-gallery-app"; - version = "3.0.2"; + version = "3.1.0"; src = fetchFromGitLab { owner = "ubports"; repo = "development/apps/lomiri-gallery-app"; rev = "v${finalAttrs.version}"; - hash = "sha256-nX9dTL4W0WxrwvszGd4AUIx4yUrghMM7ZMtGZLhZE/8="; + hash = "sha256-uKGPic9XYUj0rLA05i6GjLM+n17MYgiFJMWnLXHKmIU="; }; patches = [ - # Remove when version > 3.0.2 - (fetchpatch { - name = "0001-lomiri-gallery-app-Newer-Evix2-compat.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/afa019b5e9071fbafaa9afb3b4effdae6e0774c5.patch"; - hash = "sha256-gBc++6EQ7t3VcBZTknkIpC0bJ/P15oI+G0YoQWtjnSY="; - }) - - # Remove when https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/merge_requests/147 merged & in release - (fetchpatch { - name = "0002-lomiri-gallery-app-Stop-using-qt5_use_modules.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/0149c8d422c3e0889d7d523789dc65776a52c4f9.patch"; - hash = "sha256-jS81F7KNbAn5J8sDDXzhXARNYAu6dEKcbNHpHp/3MaI="; - }) - - # Remove when https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/merge_requests/148 merged & in release - (fetchpatch { - name = "0003-lomiri-gallery-app-Fix-GNUInstallDirs.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/805121b362a9b486094e570053884b9ffa92b152.patch"; - hash = "sha256-fyAqKjZ0g7Sw7fWP1IW4SpZ+g0xi/pH6RJie1K3doP0="; - }) - - # Remove when https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/merge_requests/149 merged & in release - (fetchpatch { - name = "0004-lomiri-gallery-app-Fix-icons.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/906966536363e80fe9906dee935d991955e8f842.patch"; - hash = "sha256-LJ+ILhokceXFUvP/G1BEBE/J1/XUAmNBxu551x0Q6nk="; - }) - - # Remove when https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/merge_requests/150 merged & in release - (fetchpatch { - name = "0005-lomiri-gallery-app-Add-ENABLE_WERROR.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/fe32a3453b88cc3563e53ab124f669ce307e9688.patch"; - hash = "sha256-nFCtY3857D5e66rIME+lj6x4exEfx9D2XGEgyWhemgI="; - }) - - # Remove when https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/merge_requests/151 merged & in release - (fetchpatch { - name = "0006-lomiri-gallery-app-BUILD_TESTING.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/51f3d5e643db5576b051da63c58ba3492c851e44.patch"; - hash = "sha256-5aGx2xfCDgq/khgkzGsvUOmTIYALjyfn6W7IR5dldr8="; - }) - (fetchpatch { - name = "0007-lomiri-gallery-app-Top-level-Qt5Test.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/c308c689c2841d71554ff6397a110d1a12016b70.patch"; - hash = "sha256-fXVOKjnj4EPeby9iEp3mZRqx9MLqdF8SUVEouCkyDRc="; - }) - # Remove when https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/merge_requests/152 merged & in release (fetchpatch { - name = "0008-lomiri-gallery-app-bindtextdomain.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/90a79972741ee0c5dc734dba6c42afeb3ee6a699.patch"; - hash = "sha256-YAmH0he5/rZYKWFyPzUFAKJuHhUTxB3q8zbLL7Spz/c="; + name = "0001-lomiri-gallery-app-bindtextdomain.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/592eff118cb5056886b73e6698f8941c7a16f2e0.patch"; + hash = "sha256-aR/Lnzvq4RuRLI75mMd4xTGMAcijm1adSAGVFZZ++No="; + }) + (fetchpatch { + name = "0002-lomiri-gallery-app-C++ify-i18n.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/a7582abbe0acef4d49c77a4395bc22dbd1707ef3.patch"; + hash = "sha256-qzqTXqIYX+enoOwwV9d9fxe7tVYLuh1WkL8Ij/Qx0H0="; }) ]; postPatch = '' - # 0003-lomiri-gallery-app-Fix-icons.patch cannot be fully applied via patches due to binary diffs - # Remove when https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/merge_requests/149 merged & in release - for size in 64x64 128x128 256x256; do - rm desktop/icons/hicolor/"$size"/apps/gallery-app.png - magick desktop/lomiri-gallery-app.svg -resize "$size" desktop/icons/hicolor/"$size"/apps/lomiri-gallery-app.png - done - # Make splash path in desktop file relative substituteInPlace desktop/lomiri-gallery-app.desktop.in.in \ --replace-fail 'X-Lomiri-Splash-Image=@SPLASH@' 'X-Lomiri-Splash-Image=lomiri-app-launch/splash/lomiri-gallery-app.svg' @@ -130,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { qtsvg # QML - content-hub + lomiri-content-hub lomiri-thumbnailer lomiri-ui-extras lomiri-ui-toolkit @@ -164,9 +115,6 @@ stdenv.mkDerivation (finalAttrs: { # Link splash to splash dir mkdir -p $out/share/lomiri-app-launch/splash ln -s $out/share/{lomiri-gallery-app/lomiri-gallery-app-splash.svg,lomiri-app-launch/splash/lomiri-gallery-app.svg} - - # Old name - mv $out/share/content-hub/peers/{,lomiri-}gallery-app ''; passthru = { diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix index 115d1d01ab..6085f4d1b5 100644 --- a/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix @@ -9,7 +9,6 @@ biometryd, cmake, cmake-extras, - content-hub, dbus, deviceinfo, geonames, @@ -24,6 +23,7 @@ libqofono, libqtdbustest, libqtdbusmock, + lomiri-content-hub, lomiri-indicator-network, lomiri-schemas, lomiri-settings-components, @@ -122,8 +122,8 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = [ ayatana-indicator-datetime biometryd - content-hub libqofono + lomiri-content-hub lomiri-indicator-network lomiri-schemas lomiri-settings-components diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix index 0b2b6f6e57..a6bf2877ef 100644 --- a/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitLab -, fetchpatch , gitUpdater , nixosTests , cmake @@ -18,41 +17,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-terminal-app"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitLab { owner = "ubports"; repo = "development/apps/lomiri-terminal-app"; rev = "v${finalAttrs.version}"; - hash = "sha256-mXbPmVcl5dL78QUp+w3o4im5ohUQCPTKWLSVqlNO0yo="; + hash = "sha256-374ATxF+XhoALzYv6DEyj6IYgb82Ch4zcmqK0RXmlzI="; }; - patches = [ - # Stop usage of private qt5_use_modules function, seemingly unavailable in this package - # Remove when https://gitlab.com/ubports/development/apps/lomiri-terminal-app/-/merge_requests/103 merged & in release - (fetchpatch { - name = "0001-lomiri-terminal-app-Stop-using-qt5_use_modules.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-terminal-app/-/commit/db210c74e771a427066aebdc3a99cab6e782d326.patch"; - hash = "sha256-op4+/eo8rBRMcW6MZ0rOEFReM7JBCck1B+AsgAPyqAI="; - }) - - # Explicitly bind textdomain, don't rely on hacky workaround in LUITK - # Remove when https://gitlab.com/ubports/development/apps/lomiri-terminal-app/-/merge_requests/104 merged & in release - (fetchpatch { - name = "0002-lomiri-terminal-app-Call-i18n.bindtextdomain.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-terminal-app/-/commit/7f9d419e29043f0d0922d2ac1dce5673e2723a01.patch"; - hash = "sha256-HfIvGVbIdTasoHAfHysnzFLufQQ4lskym5HTekH+mjk="; - }) - - # Add more & correct existing usage of GNUInstallDirs variables - # Remove when https://gitlab.com/ubports/development/apps/lomiri-terminal-app/-/merge_requests/105 merged & in release - (fetchpatch { - name = "0003-lomiri-terminal-app-GNUInstallDirs-usage.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-terminal-app/-/commit/fcde1f05bb442c74b1dff95917fd7594f26e97a7.patch"; - hash = "sha256-umxCMGNjyz0TVmwH0Gl0MpgjLQtkW9cHkUfpNJcoasE="; - }) - ]; - postPatch = '' substituteInPlace CMakeLists.txt \ --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/applications/morph-browser/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/applications/morph-browser/default.nix index 12c71a4f90..ff636197d7 100644 --- a/third_party/nixpkgs/pkgs/desktops/lomiri/applications/morph-browser/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lomiri/applications/morph-browser/default.nix @@ -5,10 +5,10 @@ , gitUpdater , nixosTests , cmake -, content-hub , gettext , libapparmor , lomiri-action-api +, lomiri-content-hub , lomiri-ui-extras , lomiri-ui-toolkit , pkg-config @@ -27,23 +27,16 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "morph-browser"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/morph-browser"; rev = finalAttrs.version; - hash = "sha256-C5iXv8VS8Mm1ryxK7Vi5tVmiM01OSIFiTyH0vP9B/xA="; + hash = "sha256-VxSADFTlaxQUDc81TzGkx54mjAUgY2L+suQC9zYGKo0="; }; patches = [ - # Remove when https://gitlab.com/ubports/development/core/morph-browser/-/merge_requests/575 merged & in release - (fetchpatch { - name = "0001-morph-browser-tst_SessionUtilsTests-Set-permissions-on-temporary-xdg-runtime-directory.patch"; - url = "https://gitlab.com/ubports/development/core/morph-browser/-/commit/e90206105b8b287fbd6e45ac37ca1cd259981928.patch"; - hash = "sha256-5htFn+OGVVBn3mJQaZcF5yt0mT+2QRlKyKFesEhklfA="; - }) - # Remove when https://gitlab.com/ubports/development/core/morph-browser/-/merge_requests/576 merged & in release (fetchpatch { name = "0002-morph-browser-Call-i18n-bindtextdomain-with-buildtime-determined-locale-path.patch"; @@ -84,8 +77,8 @@ stdenv.mkDerivation (finalAttrs: { qtwebengine # QML - content-hub lomiri-action-api + lomiri-content-hub lomiri-ui-extras lomiri-ui-toolkit qqc2-suru-style @@ -132,7 +125,8 @@ stdenv.mkDerivation (finalAttrs: { standalone = nixosTests.morph-browser; # Lomiri-specific issues with the desktop file may break the entire session, make sure it still works - lomiri = nixosTests.lomiri; + lomiri-basics = nixosTests.lomiri.desktop-basics; + lomiri-appinteractions = nixosTests.lomiri.desktop-appinteractions; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/applications/teleports/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/applications/teleports/default.nix index f5fceb5bd4..8a9d318f4b 100644 --- a/third_party/nixpkgs/pkgs/desktops/lomiri/applications/teleports/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lomiri/applications/teleports/default.nix @@ -7,8 +7,8 @@ gitUpdater, nixosTests, cmake, - content-hub, intltool, + lomiri-content-hub, lomiri-indicator-network, lomiri-push-qml, lomiri-thumbnailer, @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - content-hub + lomiri-content-hub lomiri-indicator-network lomiri-push-qml lomiri-thumbnailer @@ -102,10 +102,10 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = '' - mkdir -p $out/share/{applications,content-hub/peers,icons/hicolor/scalable/apps,lomiri-app-launch/splash,lomiri-url-dispatcher/urls} + mkdir -p $out/share/{applications,lomiri-content-hub/peers,icons/hicolor/scalable/apps,lomiri-app-launch/splash,lomiri-url-dispatcher/urls} ln -s $out/share/teleports/teleports.desktop $out/share/applications/teleports.desktop - ln -s $out/share/teleports/teleports.content-hub $out/share/content-hub/peers/teleports + ln -s $out/share/teleports/teleports.content-hub $out/share/lomiri-content-hub/peers/teleports ln -s $out/share/teleports/assets/icon.svg $out/share/icons/hicolor/scalable/apps/teleports.svg ln -s $out/share/teleports/assets/splash.svg $out/share/lomiri-app-launch/splash/teleports.svg ln -s $out/share/teleports/teleports.url-dispatcher $out/share/lomiri-url-dispatcher/urls/teleports.url-dispatcher diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/default.nix index 8e5dbd2ff9..c4794109b8 100644 --- a/third_party/nixpkgs/pkgs/desktops/lomiri/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lomiri/default.nix @@ -56,7 +56,7 @@ let #### Services biometryd = callPackage ./services/biometryd { }; - content-hub = callPackage ./services/content-hub { }; + lomiri-content-hub = callPackage ./services/lomiri-content-hub { }; hfd-service = callPackage ./services/hfd-service { }; history-service = callPackage ./services/history-service { }; lomiri-download-manager = callPackage ./services/lomiri-download-manager { }; @@ -70,5 +70,6 @@ let in lib.makeScope libsForQt5.newScope packages // lib.optionalAttrs config.allowAliases { + content-hub = lib.warn "`content-hub` was renamed to `lomiri-content-hub`." pkgs.lomiri.lomiri-content-hub; # Added on 2024-09-11 lomiri-system-settings-security-privacy = lib.warn "`lomiri-system-settings-security-privacy` upstream was merged into `lomiri-system-settings`. Please use `pkgs.lomiri.lomiri-system-settings-unwrapped` if you need to directly access the plugins that belonged to this project." pkgs.lomiri.lomiri-system-settings-unwrapped; # Added on 2024-08-08 } diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/development/u1db-qt/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/development/u1db-qt/default.nix index 8eeffa84ce..9bba0d914c 100644 --- a/third_party/nixpkgs/pkgs/desktops/lomiri/development/u1db-qt/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lomiri/development/u1db-qt/default.nix @@ -1,25 +1,26 @@ -{ stdenv -, lib -, fetchFromGitLab -, fetchpatch -, gitUpdater -, testers -, cmake -, dbus-test-runner -, pkg-config -, qtbase -, qtdeclarative +{ + stdenv, + lib, + fetchFromGitLab, + fetchpatch, + gitUpdater, + testers, + cmake, + dbus-test-runner, + pkg-config, + qtbase, + qtdeclarative, }: stdenv.mkDerivation (finalAttrs: { pname = "u1db-qt"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/u1db-qt"; rev = finalAttrs.version; - hash = "sha256-qlWkxpiVEUbpsKhzR0s7SKaEFCLM2RH+v9XmJ3qLoGY="; + hash = "sha256-KmAEgnWHY0cDKJqRhZpY0fzVjNlEU67e559XEbAPpJI="; }; outputs = [ @@ -29,12 +30,11 @@ stdenv.mkDerivation (finalAttrs: { ]; patches = [ - # Fixes some issues with the pkg-config file - # Remove when https://gitlab.com/ubports/development/core/u1db-qt/-/merge_requests/7 merged & in release + # Remove when https://gitlab.com/ubports/development/core/u1db-qt/-/merge_requests/8 merged & in release (fetchpatch { - name = "0001-u1db-qt-Fix-pkg-config-files-includedir-variable.patch"; - url = "https://gitlab.com/ubports/development/core/u1db-qt/-/commit/ddafbfadfad6dfc508a866835354a4701dda1fe1.patch"; - hash = "sha256-entwjU9TiHuSuht7Cdl0k1v0cP7350a04/FXgTVhGmk="; + name = "0001-u1db-qt-Use-BUILD_TESTING.patch"; + url = "https://gitlab.com/ubports/development/core/u1db-qt/-/commit/df5d526df26c056d54bfa532a3a3fa025d655690.patch"; + hash = "sha256-CILMcvqXrTbEL/N2Tic4IsKLnTtmFJ2QbV3r4PsQ5t0="; }) ]; @@ -48,10 +48,6 @@ stdenv.mkDerivation (finalAttrs: { # For our automatic pkg-config output patcher to work, prefix must be used here substituteInPlace libu1db-qt.pc.in \ --replace-fail 'libdir=''${exec_prefix}/lib' 'libdir=''${prefix}/lib' - '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) '' - # Other locations add dependencies to custom check target from tests - substituteInPlace CMakeLists.txt \ - --replace-fail 'add_subdirectory(tests)' 'add_custom_target(check COMMAND "echo check dummy")' ''; strictDeps = true; @@ -67,9 +63,7 @@ stdenv.mkDerivation (finalAttrs: { qtdeclarative ]; - nativeCheckInputs = [ - dbus-test-runner - ]; + nativeCheckInputs = [ dbus-test-runner ]; cmakeFlags = [ # Needs qdoc, see https://github.com/NixOS/nixpkgs/pull/245379 @@ -104,14 +98,12 @@ stdenv.mkDerivation (finalAttrs: { updateScript = gitUpdater { }; }; - meta = with lib; { + meta = { description = "Qt5 binding and QtQuick2 plugin for U1DB"; homepage = "https://gitlab.com/ubports/development/core/u1db-qt"; - license = licenses.lgpl3Only; - maintainers = teams.lomiri.members; - platforms = platforms.linux; - pkgConfigModules = [ - "libu1db-qt5" - ]; + license = lib.licenses.lgpl3Only; + maintainers = lib.teams.lomiri.members; + platforms = lib.platforms.linux; + pkgConfigModules = [ "libu1db-qt5" ]; }; }) diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix index 5717ae35f1..967485fcf4 100644 --- a/third_party/nixpkgs/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix @@ -1,29 +1,28 @@ -{ stdenv -, lib -, fetchFromGitLab -, gitUpdater -, qmake -, qtdeclarative -, qtquickcontrols2 +{ + stdenv, + lib, + fetchFromGitLab, + gitUpdater, + qmake, + qtdeclarative, + qtquickcontrols2, }: stdenv.mkDerivation (finalAttrs: { pname = "qqc2-suru-style"; - version = "0.20230206"; + version = "0.20230630"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/qqc2-suru-style"; - rev = finalAttrs.version; - hash = "sha256-ZLPuXnhlR1IDhGnprcdWHLnOeS6ZzVkFhQML0iKMjO8="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-kAgHsNWwUWxHg26bTMmlq8m9DR4+ob4pl/oUX7516hM="; }; # QMake can't find Qt modules from buildInputs strictDeps = false; - nativeBuildInputs = [ - qmake - ]; + nativeBuildInputs = [ qmake ]; buildInputs = [ qtdeclarative @@ -34,12 +33,16 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { description = "Suru Style for QtQuick Controls 2"; homepage = "https://gitlab.com/ubports/development/core/qqc2-suru-style"; changelog = "https://gitlab.com/ubports/development/core/qqc2-suru-style/-/blob/${finalAttrs.version}/ChangeLog"; - license = with licenses; [ gpl2Plus lgpl3Only cc-by-sa-30 ]; - maintainers = teams.lomiri.members; - platforms = platforms.unix; + license = with lib.licenses; [ + gpl2Plus + lgpl3Only + cc-by-sa-30 + ]; + maintainers = lib.teams.lomiri.members; + platforms = lib.platforms.unix; }; }) diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/services/content-hub/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix similarity index 56% rename from third_party/nixpkgs/pkgs/desktops/lomiri/services/content-hub/default.nix rename to third_party/nixpkgs/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix index a1fd997578..dd2f6d3ab2 100644 --- a/third_party/nixpkgs/pkgs/desktops/lomiri/services/content-hub/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix @@ -1,8 +1,6 @@ { stdenv , lib , fetchFromGitLab -, fetchpatch -, fetchpatch2 , gitUpdater , testers , cmake @@ -30,14 +28,14 @@ }: stdenv.mkDerivation (finalAttrs: { - pname = "content-hub"; - version = "1.1.1"; + pname = "lomiri-content-hub"; + version = "2.0.0"; src = fetchFromGitLab { owner = "ubports"; - repo = "development/core/content-hub"; + repo = "development/core/lomiri-content-hub"; rev = finalAttrs.version; - hash = "sha256-sQeyJV+Wc6PHKGIefl/dfU06XqTdICsn+Xamjx3puiI="; + hash = "sha256-eA5oCoAZB7fWyWm0Sy6wXh0EW+h76bdfJ2dotr7gUC0="; }; outputs = [ @@ -46,44 +44,6 @@ stdenv.mkDerivation (finalAttrs: { "examples" ]; - patches = [ - # Remove when version > 1.1.1 - (fetchpatch { - name = "0001-content-hub-Migrate-to-GetConnectionCredentials.patch"; - url = "https://gitlab.com/ubports/development/core/content-hub/-/commit/9ec9df32f77383eec7994d8e3e6961531bc8464d.patch"; - hash = "sha256-14dZosMTMa1FDGEMuil0r1Hz6vn+L9XC83NMAqC7Ol8="; - }) - - # Remove when https://gitlab.com/ubports/development/core/content-hub/-/merge_requests/34 merged & in release - (fetchpatch { - name = "0002-content-hub-import-Lomiri-Content-CMakeLists-Drop-qt-argument-to-qmlplugindump.patch"; - url = "https://gitlab.com/ubports/development/core/content-hub/-/commit/63a4baf1469de31c4fd50c69ed85d061f5e8e80a.patch"; - hash = "sha256-T+6T9lXne6AhDFv9d7L8JNwdl8f0wjDmvSoNVPkHza4="; - }) - - # Remove when version > 1.1.1 - # fetchpatch2 due to renames, https://github.com/NixOS/nixpkgs/issues/32084 - (fetchpatch2 { - name = "0003-content-hub-Add-more-better-GNUInstallDirs-variables-usage.patch"; - url = "https://gitlab.com/ubports/development/core/content-hub/-/commit/3c5ca4a8ec125e003aca78c14521b70140856c25.patch"; - hash = "sha256-kYN0eLwMyM/9yK+zboyEsoPKZMZ4SCXodVYsvkQr2F8="; - }) - - # Remove when version > 1.1.1 - (fetchpatch { - name = "0004-content-hub-Fix-generation-of-transfer_files-and-moc_test_harness.patch"; - url = "https://gitlab.com/ubports/development/core/content-hub/-/commit/68899c75e77e1f34176b8a550d52794413e5070f.patch"; - hash = "sha256-HAxePnzY/cL2c+o+Aw2N1pdr8rsbHGmRsH2EQkrBcHg="; - }) - - # Remove when https://gitlab.com/ubports/development/core/lomiri-content-hub/-/merge_requests/40 merged & in release - (fetchpatch { - name = "0006-content-hub-Fix-AppArmor-less-transfer.patch"; - url = "https://gitlab.com/ubports/development/core/content-hub/-/commit/b58e5c8babf00ad7c402555c96254ce0165adb9e.patch"; - hash = "sha256-a7x/0NiUBmmFlq96jkHyLCL0f5NIFh5JR/H+FQ/2GqI="; - }) - ]; - postPatch = '' substituteInPlace import/*/Content/CMakeLists.txt \ --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" @@ -163,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput share/applications/$exampleExe.desktop $examples done moveToOutput share/icons $examples - moveToOutput share/content-hub/peers $examples + moveToOutput share/lomiri-content-hub/peers $examples ''; postFixup = '' @@ -178,20 +138,20 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - description = "Content sharing/picking service"; + description = "Content sharing/picking service for the Lomiri desktop"; longDescription = '' - content-hub is a mediation service to let applications share content between them, + lomiri-content-hub is a mediation service to let applications share content between them, even if they are not running at the same time. ''; - homepage = "https://gitlab.com/ubports/development/core/content-hub"; - changelog = "https://gitlab.com/ubports/development/core/content-hub/-/blob/${finalAttrs.version}/ChangeLog"; + homepage = "https://gitlab.com/ubports/development/core/lomiri-content-hub"; + changelog = "https://gitlab.com/ubports/development/core/lomiri-content-hub/-/blob/${finalAttrs.version}/ChangeLog"; license = with lib.licenses; [ gpl3Only lgpl3Only ]; - mainProgram = "content-hub-service"; + mainProgram = "lomiri-content-hub-service"; maintainers = lib.teams.lomiri.members; platforms = lib.platforms.linux; pkgConfigModules = [ - "libcontent-hub" - "libcontent-hub-glib" + "liblomiri-content-hub" + "liblomiri-content-hub-glib" ]; }; }) diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/services/mediascanner2/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/services/mediascanner2/default.nix index b8d562367e..3a1fbe0122 100644 --- a/third_party/nixpkgs/pkgs/desktops/lomiri/services/mediascanner2/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lomiri/services/mediascanner2/default.nix @@ -1,39 +1,40 @@ -{ stdenv -, lib -, fetchFromGitLab -, gitUpdater -, testers -, boost -, cmake -, cmake-extras -, dbus -, dbus-cpp -, gdk-pixbuf -, glib -, gst_all_1 -, gtest -, libapparmor -, libexif -, pkg-config -, properties-cpp -, qtbase -, qtdeclarative -, shared-mime-info -, sqlite -, taglib -, udisks -, wrapQtAppsHook +{ + stdenv, + lib, + fetchFromGitLab, + gitUpdater, + testers, + boost, + cmake, + cmake-extras, + dbus, + dbus-cpp, + gdk-pixbuf, + glib, + gst_all_1, + gtest, + libapparmor, + libexif, + pkg-config, + properties-cpp, + qtbase, + qtdeclarative, + shared-mime-info, + sqlite, + taglib, + udisks, + wrapQtAppsHook, }: stdenv.mkDerivation (finalAttrs: { pname = "mediascanner2"; - version = "0.115"; + version = "0.117"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/mediascanner2"; rev = finalAttrs.version; - hash = "sha256-UEwFe65VB2asxQhuWGEAVow/9rEvZxry4dd2/60fXN4="; + hash = "sha256-e1vDPnIIfevXj9ODEEKJ2y4TiU0H+08aTf2vU+emdQk="; }; outputs = [ @@ -43,11 +44,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace src/qml/MediaScanner.*/CMakeLists.txt \ - --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" - - # Lomiri desktop doesn't identify itself under Canonical's name anymore - substituteInPlace src/daemon/scannerdaemon.cc \ - --replace 'Unity8' 'Lomiri' + --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" ''; strictDeps = true; @@ -59,35 +56,33 @@ stdenv.mkDerivation (finalAttrs: { wrapQtAppsHook ]; - buildInputs = [ - boost - cmake-extras - dbus - dbus-cpp - gdk-pixbuf - glib - libapparmor - libexif - properties-cpp - qtbase - qtdeclarative - shared-mime-info - sqlite - taglib - udisks - ] ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-good - ]); + buildInputs = + [ + boost + cmake-extras + dbus + dbus-cpp + gdk-pixbuf + glib + libapparmor + libexif + properties-cpp + qtbase + qtdeclarative + shared-mime-info + sqlite + taglib + udisks + ] + ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + ]); - checkInputs = [ - gtest - ]; + checkInputs = [ gtest ]; - cmakeFlags = [ - "-DENABLE_TESTS=${lib.boolToString finalAttrs.finalPackage.doCheck}" - ]; + cmakeFlags = [ (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) ]; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; @@ -108,15 +103,13 @@ stdenv.mkDerivation (finalAttrs: { updateScript = gitUpdater { }; }; - meta = with lib; { + meta = { description = "Media scanner service & access library"; homepage = "https://gitlab.com/ubports/development/core/mediascanner2"; - license = licenses.gpl3Only; - maintainers = teams.lomiri.members; + license = lib.licenses.gpl3Only; + maintainers = lib.teams.lomiri.members; mainProgram = "mediascanner-service-2.0"; - platforms = platforms.linux; - pkgConfigModules = [ - "mediascanner-2.0" - ]; + platforms = lib.platforms.linux; + pkgConfigModules = [ "mediascanner-2.0" ]; }; }) diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/libqtxdg/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/libqtxdg/default.nix index 155b9c58bd..5de096ee29 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -7,7 +7,7 @@ , lxqt-build-tools , wrapQtAppsHook , gitUpdater -, version ? "4.0.0" +, version ? "4.0.1" }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { rev = version; hash = { "3.12.0" = "sha256-y+3noaHubZnwUUs8vbMVvZPk+6Fhv37QXUb//reedCU="; - "4.0.0" = "sha256-TTFgkAI3LulYGuqdhorkjNYyo942y1oFy5SRAKl9ZxU="; + "4.0.1" = "sha256-h8uHIB0KuSHQVHI61h5BmpvpJHumloHMKN3GabH66EM="; }."${version}"; }; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix index 5b874aca3d..5f6874f49b 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix @@ -9,6 +9,7 @@ , vala , libadwaita , libgee +, libical , granite7 , gtk4 , libxml2 @@ -18,13 +19,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-datetime"; - version = "8.0.0"; + version = "8.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-PE1ig8p9H4MfipIpN3ubXAJNzLwGVW89adn+SF3rEuQ="; + sha256 = "sha256-VOL0F0obuXVz0G5hMI/hpUf2T3H8XUw64wu4MxRi57g="; }; patches = [ @@ -47,6 +48,7 @@ stdenv.mkDerivation rec { gtk4 libadwaita libgee + libical switchboard ]; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index 9c67c245c8..8790cc68c4 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -92,13 +92,13 @@ in stdenv.mkDerivation rec { pname = "elementary-session-settings"; - version = "8.0.0"; + version = "8.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = "session-settings"; rev = version; - sha256 = "sha256-CtArMzM6eukH/Ob0W/U4xh2vvqm17m3T0w7lhcRid74="; + sha256 = "sha256-4B7lUjHEa4LdKrmsFCB3iFIsdVd/rgwmtQUAgAj3rXs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh index 05ddc6a172..57a7a6c899 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh @@ -10,5 +10,5 @@ xdtAutogenPhase() { } if [ -z "${dontUseXdtAutogenPhase-}" ]; then - preConfigurePhases+=(xdtAutogenPhase) + appendToVar preConfigurePhases xdtAutogenPhase fi diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/elixir-ls/default.nix b/third_party/nixpkgs/pkgs/development/beam-modules/elixir-ls/default.nix index e1c4a9ae81..8d4eba70cc 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/elixir-ls/default.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/elixir-ls/default.nix @@ -4,12 +4,12 @@ let pname = "elixir-ls"; - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "elixir-lsp"; repo = "elixir-ls"; rev = "v${version}"; - hash = "sha256-GYDaHcdCiU0qh8OJSwll6RLvcakM/amlK3BfTi/kZwM="; + hash = "sha256-d5O7DGEKuwHbjxwJa3HNtaycQIzFTi74UxszRH7TVzQ="; }; in mixRelease { @@ -20,7 +20,7 @@ mixRelease { mixFodDeps = fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version elixir; - hash = "sha256-ZmzGsf06DIZMqQBz7FZo0CtZ9TZzk7jxMRAWFHA5fOA="; + hash = "sha256-OxQeIdqjY/k02q+nLQnZ+/Zxy/bdjjSCRrVu0usQcsc="; }; # elixir-ls is an umbrella app diff --git a/third_party/nixpkgs/pkgs/development/compilers/cairo/default.nix b/third_party/nixpkgs/pkgs/development/compilers/cairo/default.nix index 0749175f08..b77bd2357b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/cairo/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/cairo/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cairo"; - version = "2.8.2"; + version = "2.8.4"; src = fetchFromGitHub { owner = "starkware-libs"; repo = "cairo"; rev = "v${version}"; - hash = "sha256-vBdIGkdQa/csqsu4DbgIYitVbDLDUAFmIUytZ7IcxNk="; + hash = "sha256-xHvBbm1ewNu96TyK//l2emiq+jaPhSWvvbVK9Q/O5lo="; }; - cargoHash = "sha256-w3kzEM34HYQ6KgILaDpmZbCgAh8Ql24DRe12woUAhVI="; + cargoHash = "sha256-E6nnT+I5ur4PPvLjwfebR1Tdm206hI05HCVc3IWDqFY="; # openssl crate requires perl during build process nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/chicken/5/overrides.nix b/third_party/nixpkgs/pkgs/development/compilers/chicken/5/overrides.nix index 0f9c89140a..ec465aa8d7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/chicken/5/overrides.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/chicken/5/overrides.nix @@ -139,7 +139,7 @@ in addToNativeBuildInputs pkgs.taglib old ); uuid-lib = addToBuildInputs pkgs.libuuid; - webview = addToBuildInputsWithPkgConfig pkgs.webkitgtk; + webview = addToBuildInputsWithPkgConfig pkgs.webkitgtk_4_0; ws-client = addToBuildInputs pkgs.zlib; xlib = addToPropagatedBuildInputs pkgs.xorg.libX11; yaml = addToBuildInputs pkgs.libyaml; diff --git a/third_party/nixpkgs/pkgs/development/compilers/circt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/circt/default.nix index 493a426135..c3f16b447e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/circt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/circt/default.nix @@ -18,12 +18,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.86.0"; + version = "1.87.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - hash = "sha256-xV7vu3zdWBXgnCCUN9ge1GZemo0prmpQrZ1np86i3jI="; + hash = "sha256-buWpoym57YxyHJySYaektAUmuSRXMS+YBwtjWpoV1Vg="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/colm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/colm/default.nix index 6ec15a0ebd..7db574022b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/colm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/colm/default.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper asciidoc autoreconfHook ]; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=int-conversion"; + }; + doCheck = true; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix new file mode 100644 index 0000000000..06153d33d4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix @@ -0,0 +1,293 @@ +{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }: + +# v8.0 (active) + +let + commonPackages = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.8"; hash = "sha256-5iWiiKBaB6V5x3GDvZ1DpyxDHFIsmewksoeIizz8Z7k="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-2KBKkVUlpiO1bOY+Ia2PKjurY2taV7CHnzU7Jr5HYUs="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.8"; hash = "sha256-3x7ltOqJJXYO+zHIIvH1SDEz9fTrHqNoyK68teiHGZQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-ZGunPQaL6Kz97BpQY9lSOPEsy1CvZiTZeidqnG18anw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-x45oE7EFl6V29tVnuvzfcnAufOQjVf8FYxG8TSNz77k="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-UHKTFAfqIxoBZ38I6wBdMNA6NyQ4FhSJcHNQZxjaCu4="; }) + (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-KmiA+uHHYOnsfdG3F20mu0XllcRxEvMvWkHz7vK39KQ="; }) + (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.8"; hash = "sha256-st7UdPx9AFKf9o6WewsmUKhbP2IG2KQjHRCTdP4Vj00="; }) + ]; + + hostPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "8.0.8"; hash = "sha256-VL9omnR1wz323jyU+UQWPuwKOv7UfkkiZ+8ja1JYDM8="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "8.0.8"; hash = "sha256-MaWj6kbZ4td5Yq1aMyK1nqUva7d5bDXSewRoqjF0jS0="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-Dz8dkFRN//VvdLjWxe8+5o81adh/gqYyo5aHxtjzoqs="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "8.0.8"; hash = "sha256-MJmQmBHWgvsqO8XYLnqsyUTfQ72VeJ/3EHq6OHtZ+n8="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-dmtcy7cqijoJAUCEJTNcvqaRneRMCn7WJkurjk2YpN8="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "8.0.8"; hash = "sha256-liIF45Ljv47Wkl9xhN2IWH4vbFPCUkvF++i7ENsCB+o="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "8.0.8"; hash = "sha256-Y3KRiZ9i1IQoU/X70+c5hUkPsfSUJD8mrWecspUAEPw="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-LACty1K+yIIJiTgArn6DpuMqKS+uhVBCgIG2e4W1XBI="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "8.0.8"; hash = "sha256-deYqv/tadlpOOMof1/MoLu2fIjcfbQ4Y/auc97c0GIM="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-a6q/Fq88tknCNUEMiGAdCNOMj8rUyWMa3LdasqMl06I="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "8.0.8"; hash = "sha256-MeztjburvdAXPWL4eLVhvL2+K9qd3otNatH8QbJf3Mk="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-Q7ZRUqGLN41EIbmTPQXiiLIJsLWwHHlTMCg7e9B38Fs="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "8.0.8"; hash = "sha256-nb0PV2g3PjENKIFLnnUynIxa9GWjVRyprHRbrMAfHW4="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-exBYb8kUySdkudyNrs5ArXa/wkkS2b6lhVpm4jZMnqQ="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; version = "8.0.8"; hash = "sha256-b6WidfvMYv6zHy1nd4kGc5oCg5tTDxPlg8CESjurv5E="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-4OtC6HUOpa6DSJPkA+/72wQHgGj3Kqh7iQyJtvvNtz8="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; version = "8.0.8"; hash = "sha256-bHuEFTwVzaQOEV1w/Jtfe8ZHMOtwHWsSqiiqoun+SkQ="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-wTLpzd7iu6eCyOn6ct4ZzB2NQq7GzNUJEsh+zkgHbdU="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; version = "8.0.8"; hash = "sha256-Q6mYxptkYaF0ThyJSX0uUVKK6R6x6Xkfi/40EqiDAQA="; }) + ]; + }; + + targetPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "8.0.8"; hash = "sha256-H3XoUT5B3taEoJvUFhlTRZ5/LI8VVaFxd82QZejD+xE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "8.0.8"; hash = "sha256-eYuDkv5aQvet7FzZOsZ5LZHnbNE4na74cmq3JsDaBNA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "8.0.8"; hash = "sha256-UMSNfp7fmU9UTkCj6GFoqz4iLDpM1zh0WP9W7KBIMAM="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-lSBjAXq7gADmOA7NaK9S+S+8Xx8oTsI6Mrp3fgA3eVM="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-RZ3KnxLJocJS9mSAwP69XCe0kA/uCppUNSMp4soCkN0="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-iW0U93hxohZrnGYB4us1XAaOBXMtMofMlN/FVdVjSS4="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-X6iM6I4WpVbLCEDhwwUrih1801VKfFz3gAaYZuQMTxk="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "8.0.8"; hash = "sha256-wCNIvKB1pav/orE1e9Ljcb8NUiaIZ447KsyHtEI1uFM="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.8"; hash = "sha256-Yu/CZXF9OS9CtGV1ohPRRLHKpg3xZXmH+8aukhZjJO4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.8"; hash = "sha256-hSj6/ogmBRNoC4VIqmkp7IsFcYf1IzVhHFsGU4BW/ug="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.8"; hash = "sha256-VXwu3zMEoxrLfABVIc2zIN22JsoUwCeuM7W++7lGeVc="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-GRldzHE2XXJdR6qAdcxgLcXZM1gNoiGsfJg0M5qnlR4="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-VACUGeR/lEFnS8O3kVBimN8U2sIr1/aU9hHyBA4cnKU="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-C3891F6er32h/x4bjp7nMbHOWvaGhjaAVxPwGQtxwtc="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-s57vIXMmdrTdlGmfqyemkSJP11MltQWemJnet92e+A8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "8.0.8"; hash = "sha256-HDpL4+yMCXuy05nnJWKqZB2KkumluhvznAxAglZ2x5o="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.8"; hash = "sha256-/9Hsru4pLWKMb2LTF1erdHILGdEc/2NnuTIG+dcf1jY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.8"; hash = "sha256-Leqb/Un4/GRgRcymCJWnPhjZCn8A2hl4nFdYJfkNdqs="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.8"; hash = "sha256-y5IbKOkqAKBpyWiA0PFmrtVXGXsWLHvX2FsiICm6egU="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-Ls2+jcDC4FW9zO81O2JP6BtKeazhydWEiXBPg/GJsfw="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-jJ7jGIYzDYqBZzJEG3BwS+NqUv7o7tRxUNgOTQ0oFSs="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-SCj9QjWOJvv3TvlR0TpIyFZrebRFTkVFVPdQ82F08gQ="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-LbvKpuOg1Rdqtabz1UvoADiNOkh+phBdXcD9iBGAAD0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "8.0.8"; hash = "sha256-TwTvStZ7PMGpFh16lSI4iAJwDz/lnJkqHk/RQ0KEQB0="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "8.0.8"; hash = "sha256-p2Xix0JrQlMxDbvuPmXXaikVLVdKo1OPdk5w5PKSp3A="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "8.0.8"; hash = "sha256-shWbs109a6xx0JyJH1hwjs0OR/KhemxYjjLJhrTzE7w="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "8.0.8"; hash = "sha256-cdjNG4XehuADgSuW0c/PKC+6VA0rdzisUKYJXMPhSvM="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-kxAG5q8z/6d3jjYhIbEOLTa9sFUveg9AK9QWEYb+Osc="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-M881jx3YlNWC51BZguFtvn9UfU6neFeRhSaq0zsMCFI="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-BwC5R+ECo52tePjkq/B6OEQvS4hq8tlAfUOBi9UufSg="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-E6clBJ6GdZd3d6XaGqlwcyJq9UN4a9t+ixdZi7Ro4Xw="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "8.0.8"; hash = "sha256-epjQsC2vTOpppEuMljG78vm/RWecUu/YJRAt+2ETd9s="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "8.0.8"; hash = "sha256-DHGL/dDpQ6LhathaNJxp3M3qQcCEG9oYisUQ6WMurMA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "8.0.8"; hash = "sha256-6hx88DtgvvwRhyEFHS32AKvRwwHZyS44SxYRG4La+i0="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-KdRDHgeE6ShPewlbreXJ+87JrPGdhO5CEGBzVOyn44M="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-g7De3JFCkr1wtMguY1QJXAZD5CX855/xen6pCMCrkDE="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-PdskfOr7EiC4VDvyAo5k5MjmKayexsyPNkJhaAhVXjg="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-tSZ9tj81dWrHqrau0in1b/ZgbMyDs5P9Ea3sofhQ/ks="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "8.0.8"; hash = "sha256-21RqIxjfaIOaABcqoe9AlZElWdXNd44dX0jodejOFNY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "8.0.8"; hash = "sha256-nCSziE636/NGvg4J8HKI0CZ48SZZvwKu22QZa7Q/sAg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "8.0.8"; hash = "sha256-3vnqKFPAhjoLP6h/MnVfhoWOr2/0XvnUyufafbYED8Q="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-4zmkFZSBB46KjlubRHJ+DIBZs22CJLbIonT9hVsf57o="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-JeCvY8S+YPlFMwNokIxIfOsMc+cPSxIRozAVT03+ZlU="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-EXfxzK1Z7kqCDckq829GHat6EfYCKJ+9BrcBeHd1raA="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-oDjnxygsxPsy1Mgnx59tpmqikAgN5H4o3IBzXup4zNo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "8.0.8"; hash = "sha256-xxkmlp9i3x/4Ii+e4YYMPAA4iWdK2cwwj4030tp3o+U="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.8"; hash = "sha256-ZB3eGK98abOZpcYmfWx0V3G/8AWr20gGyB/Ko5Zl91I="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.8"; hash = "sha256-L1IBy+DvMCZIbTzmlvSU2vsRrlZz7f29VS4H0+1/stw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.8"; hash = "sha256-6G+7coU3SeYUTAjWl0iSYi28nGv5mzTnS8nkMMffGP0="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-O59V6pzicz7KWwUy+5qB3nAwSxhRsM9HoCq2uInaaHY="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-o3tSBAtHJGV5FbpreOQPF1VPb1ZoJI0unynfBUwvZ+E="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-NI6EnCoVuFHZ6mH9ZMXb38GhmQUhfxwP+vPlO/MsVnI="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-zvmCpjhY5JRezpwVr0S90rJfV0YGZ/wFJswo7Bl6tQQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "8.0.8"; hash = "sha256-D4qB2A3tJGN3nJcxMl/gBxA+LQx5QiawYWHn1Y3jWHs="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.8"; hash = "sha256-emanxsPDi9tYicfkeLRVN4r+yZq06jG2RdoVpRG/lK0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.8"; hash = "sha256-x7WOZWhE4NX6yc5MBlFO4EKHt4ExhnGx6lhmYrr8wfk="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.8"; hash = "sha256-SWEUTsvHkPP9S8iRW/PrneIZV7NRkz3IPiVmKZ95X6w="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-bG/yxRP8uNHjCcZkSOlqSqgWIesuww8irvtSsC8jIfE="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-0EJXF7Aa+7nEUOvqMCDLr5Gwa9OWu/Ol5kpCymTVkP8="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-sdCf4IfySwQalViNicdX1NFN3obWCImm6I6Zzhu1pxs="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-jHU0GS/mtOjKniVojxzKdk6VgQghNLRWi4G0/W+kflw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "8.0.8"; hash = "sha256-hBmQqsJX4lPCEkwh0kuZl81KNkqR+4FZWwBKaGQPPPk="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "8.0.8"; hash = "sha256-kWp27hqFc4GlvnFiiPZlW8F6UEXmFRNAN5RkkNfM0D4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.8"; hash = "sha256-lD/M7PhWXUSsS3FJ4doXNo+zFLIAnhqBmtfBkDvOX9U="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "8.0.8"; hash = "sha256-xJc8ynP8Yaq3fdBrd+1wSgF02dx6fKaO8Ty1JJvm87w="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-/1nQT+3thlkAeQbfsIakuD+/oZsq9KeI0vCgCFubOO8="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-2P9wZVY4iQmOxKttjrqb2fKQMWHzupFgVuwcE4egAOU="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-ZTK07ZSjid/flmTDgrp/GH37rmYpOYdXTKzJnEeIx3k="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-Lzxot9nzljMCvyqLHiXOu6qC3rgB3iN6JG5t1QCAbko="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.8"; hash = "sha256-NmsUnkmjpbxYa3jNjLa3+CbbSa1ipFvolk6fjJQ52co="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.8"; hash = "sha256-pkfKvNeb779TUp9jp19peJjCXK3NGpexaFjWwc3dSBo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "8.0.8"; hash = "sha256-C0zUiMMAQ9nd1n7PDVoBhCShHzdGI67YFySTpeFH8uE="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-ojXEKX1OwepAx61seCAPh27UATzGTsE6VenT061IOmU="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-wMhsf3QncEUGSnFrGEck2Kyb8cPLPW8n7ZgKHwebdI4="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-AGqQ6fZicft/cBquuHb9jOh10N8gr/sLfijYzwm9vcM="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-hl5uj5iR2xXkefLQJ7DVU0NfThLatJUOqm9MGZUN9HM="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.8"; hash = "sha256-gS1Lu8UcYwlJL+N4Q86NnObCYOjsaG09+bHbjXr1Ro8="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.8"; hash = "sha256-z5swa/BoIPh7oDb4WpAh5uvXZ46artGD/lnQm4e2cko="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.8"; hash = "sha256-fpqkDTGVOO85fWS+X5Yj//NRkVoRf/RxJZ974N4OKvI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "8.0.8"; hash = "sha256-nZEdf9Y3TLgyLOzSpn5ryl4xAbIy1vMGnVqCcYr4G74="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-NDGG0iZtxXLArTb3DEF1ELT3nHNTT5ogXqG00+70f9s="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-QYpsPJMunG+1LY6iOhkqe3TWZeUnV2sFdCRGKByEJcg="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-B0EIM5Jxi367oSvB1mHiHE3VpdoE02OF9FbFC1FlkLk="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-y1V5P/emZwwzWoz0UtMC/OYQjK+nGe9vkrY4RE9HRVI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.8"; hash = "sha256-vz7hG4LOgtZVpOMCCDrosxSiSUAIFmHWHxPe2kfIAWo="; }) + ]; + }; + +in rec { + release_8_0 = "8.0.8"; + + aspnetcore_8_0 = buildAspNetCore { + version = "8.0.8"; + srcs = { + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/26f16795-9928-4ddd-96f4-666e6e256715/bf797e4f997c965aeb0183b467fcf71a/aspnetcore-runtime-8.0.8-linux-arm.tar.gz"; + hash = "sha512-0P7t2Ru0AoBp2M/xcmGR6fCZIOdWQF3g0rv29DEWJ3zJPr4kg/QFuqSXK1T/6JsJy+FypjnmA5eucTjfXvSMTg=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/f6fcf2c9-39ad-49c7-80b5-92306309e796/3cac9217f55528cb60c95702ba92d78b/aspnetcore-runtime-8.0.8-linux-arm64.tar.gz"; + hash = "sha512-w9ydcfygpI7algdMvO9MmiZcHE4Qy/84YU3XTXlEOunRzNEHFHZM0EEpH4HYPA7Rwwer+JJJq0tvWKXelS/P/Q=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/648de803-0b0c-46bc-9601-42a94dae0b41/241fd17cee8d473a78675e30681979bb/aspnetcore-runtime-8.0.8-linux-x64.tar.gz"; + hash = "sha512-1sDMKqx5+6y/gbWX8oZ2NZn2YnjBfdtEjOC5PUmbrY+Id31CWFTmhgKUWrGK+KYfHuWdQx1VAwBhN/hhE/qosg=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/9255e487-cdf2-4690-9840-74712503e37d/40be3d122db1d1ffa53a9843321c3979/aspnetcore-runtime-8.0.8-linux-musl-arm.tar.gz"; + hash = "sha512-XZ9gnnLc/MFra7Y9Sef9R8Pi13kT2d4UhkQX+ypTSy99tWUw2xZazGNjNkHHBtD6upXbmFsJhEZ32MtBA5oMZw=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/95f358cf-86b5-4789-8ee8-063067081c8b/e50e603b2453d7dc65eeb26dd4cfb398/aspnetcore-runtime-8.0.8-linux-musl-arm64.tar.gz"; + hash = "sha512-YCjCkwbUlp7kBMRZ3KMTDx6WFNGVTo7UQAFAs1rYoeZqCos64CFV32vQRs2TCQdCIEh6HCYlw58IG9xsjtYgBQ=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/7d2ac05d-2bef-4069-9513-bb2ef7fab48d/4f3d2d3fec003a65513dc1f70c126ab7/aspnetcore-runtime-8.0.8-linux-musl-x64.tar.gz"; + hash = "sha512-gi8uFxbcLSqkb/CPTS2bueqMgjMnhdCrpfTzPl62C9zYTomc0qE8qTAyImcQtfDKXHFZvtoXAn+E76KFJ4tXmA=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/a7080974-fac8-446c-ba20-313f6f323fbe/f907c126c9bcd394939a7cdf86b85f4b/aspnetcore-runtime-8.0.8-osx-arm64.tar.gz"; + hash = "sha512-oZbGKxTpE2NiBzgmoD524KFHAn8DZVUpQm5ZT35E643QNtrqgJl4dgRxccF5PH7c+lFGvVWgG1kdlAX7FkbrAA=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/465bdf6e-407d-4512-a222-32dafb225ad8/c22004de330d10a06141dee0f42b5d12/aspnetcore-runtime-8.0.8-osx-x64.tar.gz"; + hash = "sha512-07qNz63c1tUP1DSRH+PrgwlmaTmooe3oANfaLdgU7714HRRJpCtx0ccdlZNGXp6XIFAl60MoCO+aO6DcvboOPg=="; + }; + }; + }; + + runtime_8_0 = buildNetRuntime { + version = "8.0.8"; + srcs = { + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/5e427de4-981a-481e-9fec-fa77b02a7edb/0d156acae55ca1329b6b9a8de70f398f/dotnet-runtime-8.0.8-linux-arm.tar.gz"; + hash = "sha512-yHr1qq8y4YzNwpZRecZaq65eDp6Oogn2w2QnDOLkr//ql5yiLhQ95GdONqKxLGa1dViK4hnxZjaspxIUQCQCiA=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/ac04b123-0542-4e80-9216-93f51a6814b3/d110733c152d34ab4eedb435ccfdab4d/dotnet-runtime-8.0.8-linux-arm64.tar.gz"; + hash = "sha512-JG+35e21Hbk0Ica7dCD3o1hDC5iyJKcftw5xorzgvJH4U6qJEJ8hiLCrKFMqJFw9UrqsFjRj4BoCAZ3qN/058g=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/68c87f8a-862c-4870-a792-9c89b3c8aa2d/2319ebfb46d3a903341966586e8b0898/dotnet-runtime-8.0.8-linux-x64.tar.gz"; + hash = "sha512-j1IgCYxWL6NJBBd0jrn0+coVUfcVVyi567GSQ1nGPBje3vZDvNiexntZy1sbnecoPuFW7zgf+xaAG1FtupsbDw=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/2f4507aa-972d-429c-9129-cfe95c1279eb/60dd9afc3f4786a568b01119c2280c63/dotnet-runtime-8.0.8-linux-musl-arm.tar.gz"; + hash = "sha512-im+SDZPX1VJ9won0clIeKmca+05mOqrP2CwyZYwuo56rQ6XJfT09e6WEA+v79suW/HP/W3zMGpRH0Tv0HuuAyQ=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8d78f160-0833-4db5-bd62-947f8bc2d571/25638f47211018a7bd8fd9d314763196/dotnet-runtime-8.0.8-linux-musl-arm64.tar.gz"; + hash = "sha512-JvNeHGB0p9maQOpI9sAtt49OLHQ8vHRGOglNoBThJuk3nQm05WgJrJgpsmtroKkBrcR638PF01qX6erVppMUiQ=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/d9c4e4e4-bb2d-4f1a-9ded-bff5e354bd5a/0c6dbc5f68bea36a65fdf80e6aa4d55f/dotnet-runtime-8.0.8-linux-musl-x64.tar.gz"; + hash = "sha512-yi/zIUVQZRMlP4Ds1ytcJNi9oo9EroPJiMOev6dec31VELy4S8J6FJ0uaZV2H4sSTXcBUirpu8rBf8MmZyF+tg=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/e9ded115-7a30-4952-bb72-ff101583f20b/5a7628261b98d095d2c97ec3fe5267be/dotnet-runtime-8.0.8-osx-arm64.tar.gz"; + hash = "sha512-iLBt0FGBm9noziw0CyUW3A5Kd9Vl7/FF2OlXslUqZB4jWlzn6Ns2B0dYh7x2bxUw0B0Ofv2A0QzWUqKZlUOYtA=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/0159972b-a4d6-4683-b32a-9da824d5689e/ffb0784119abf49015be375b5a016413/dotnet-runtime-8.0.8-osx-x64.tar.gz"; + hash = "sha512-gCmYbB+LvxsOjQkpdWFW/kHUbS326+GrHGb7zqKt1Hw1uTRXPGGYeXz2DSs3LNRj5wMmwKNbCSbatNXBV6NX8w=="; + }; + }; + }; + + sdk_8_0_1xx = buildNetSdk { + version = "8.0.108"; + srcs = { + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/27228a4b-1ae9-4c1f-8a21-eecd21d6c7b8/c0500c9fac6db54f68c04956b828e8ea/dotnet-sdk-8.0.108-linux-arm.tar.gz"; + hash = "sha512-+vqFZLNLUktCCeEEfOfPEZCl1C57obE1JPXeYCsHXmMM3SKVZ/FOsvCubJaskQrp27T8TlKN+VjJ0xRxNB7tyg=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/07df5bfc-98ae-4335-91c4-c95ec5f99a58/48a310e5d1bde3e77c53a51c99bdfc08/dotnet-sdk-8.0.108-linux-arm64.tar.gz"; + hash = "sha512-bMcj8rE50ZsuF9pZNmmNOIpbZGOLde94xAxAftPP096nRcKRbwPvyeZkefxV1gjrOokwVyfs2xyZmxg7WN4ljQ=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/95a365b4-ac3b-4300-ab6b-54cbc73220f4/4aabad928064af8761315ef34b08c24b/dotnet-sdk-8.0.108-linux-x64.tar.gz"; + hash = "sha512-Vmbd9vqbZd6rpNfF/MLi1W9jHE9fb7Kp9ZGa8GFqsrQgsSqCi+zC5LhiinasPa6CS1Wr3lxtWsWe4THX7Ornwg=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/24ef2f24-ca8e-4c3d-8466-2311550147d4/acbf2877ab4b8a611a3b63a9b9853dfc/dotnet-sdk-8.0.108-linux-musl-arm.tar.gz"; + hash = "sha512-77MI2BrBAgli8U0D58qUGaKQGghGEg4HzZXGVAf+KYGiY2DC/+oUHYBYGqxtLDanN5x2wHsvs31O+4NpBfj/aA=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/63bf0f75-e962-46b3-b7c3-12aa20129d46/071514943265037c423e6f5e40df7ace/dotnet-sdk-8.0.108-linux-musl-arm64.tar.gz"; + hash = "sha512-5wCbo3OwQ8y0aVVycayK5RirnJtbNk6YQdi5cwW2A28zJA5nLnxIN5hhaiM0KXSNUDj9/TNjUrggYK/WRXRwRQ=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/cab77c39-2e16-4f29-a9cb-e490d7fff442/ee37bc88e34e082a64d834ed5041bcee/dotnet-sdk-8.0.108-linux-musl-x64.tar.gz"; + hash = "sha512-dEcVUB3jlG8GzTFvNcq8DjY+CvZRBEyXZwjA1I1OsNCUidkszrKDx1Gy7tDik86qq93Lq/fCXiHWWOv/ncMEqg=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/64a3d858-c2e3-48d1-8236-7c6702efc1f8/191bed6c7f89244eb998b0f186db57d7/dotnet-sdk-8.0.108-osx-arm64.tar.gz"; + hash = "sha512-g7ASdkdLS2K/CigvvhHSNTohkdkL7NQDs3PNbfyVJkRCqQcRetj2FXZbE5aSZ7iH0mqfJNvV+I2LVdqpRBLRPA=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/5ea78b09-65a7-4b08-ac65-bfae17afb322/7416ecc76a30ae4c77e71aade36e037f/dotnet-sdk-8.0.108-osx-x64.tar.gz"; + hash = "sha512-qA/uJ5q/61WKVUDKKpaaEbs9vq3ow52MR76KLWIu8cK+2yLIdFmK1B2/8rldWkMZe9n1X8kzq07eXty2p2z2yw=="; + }; + }; + inherit commonPackages hostPackages targetPackages; + }; + + sdk = sdk_8_0; + + + sdk_8_0 = sdk_8_0_1xx; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/8/default.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/8/default.nix index 8b98aa962d..d7310cd819 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/8/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/8/default.nix @@ -1,9 +1,8 @@ { callPackage , dotnetCorePackages -, bootstrapSdk }: callPackage ../dotnet.nix { releaseManifestFile = ./release.json; releaseInfoFile = ./release-info.json; + bootstrapSdkFile = ./bootstrap-sdk.nix; depsFile = ./deps.nix; - inherit bootstrapSdk; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/8/deps.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/8/deps.nix index b77029b3ac..db44150cdd 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/8/deps.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/8/deps.nix @@ -1,11 +1,11 @@ { fetchNuGet }: [ (fetchNuGet { hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; pname = "Newtonsoft.Json"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/newtonsoft.json/13.0.1/newtonsoft.json.13.0.1.nupkg"; version = "13.0.1"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILAsm"; sha256 = "327399b6bee8f18db222120e77f662addcac6fe8c6e46a5e238d4cc9a3ee7b30"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/8.0.7-servicing.24313.11/runtime.linux-arm64.microsoft.netcore.ilasm.8.0.7-servicing.24313.11.nupkg"; version = "8.0.7-servicing.24313.11"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "c8adbb9a816a3272fd305c827a6183be673a143e693a803ab038b737ce5cc7eb"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/8.0.7-servicing.24313.11/runtime.linux-arm64.microsoft.netcore.ildasm.8.0.7-servicing.24313.11.nupkg"; version = "8.0.7-servicing.24313.11"; }) - (fetchNuGet { hash = "sha256-8B+2bg279IxspjUCUG2kvvwrOJ4kBfqgAZLYkSpFXDA="; pname = "runtime.linux-x64.Microsoft.NETCore.ILAsm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/8.0.7-servicing.24313.11/runtime.linux-x64.microsoft.netcore.ilasm.8.0.7-servicing.24313.11.nupkg"; version = "8.0.7-servicing.24313.11"; }) - (fetchNuGet { hash = "sha256-qwzB9mCoBWiqz7sMfDMwBwgZHm4Jls7Uq23dhpPE8dE="; pname = "runtime.linux-x64.Microsoft.NETCore.ILDAsm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/8.0.7-servicing.24313.11/runtime.linux-x64.microsoft.netcore.ildasm.8.0.7-servicing.24313.11.nupkg"; version = "8.0.7-servicing.24313.11"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILAsm"; sha256 = "6b4e532da6481799e2d5ba0f466439b1dbb72b38f99d658f01ef13abb8fa4143"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/8.0.7-servicing.24313.11/runtime.osx-arm64.microsoft.netcore.ilasm.8.0.7-servicing.24313.11.nupkg"; version = "8.0.7-servicing.24313.11"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "45944f5e8b6a2f55defb432e47aef685842445edcbd209dc714efea5a7500422"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/8.0.7-servicing.24313.11/runtime.osx-arm64.microsoft.netcore.ildasm.8.0.7-servicing.24313.11.nupkg"; version = "8.0.7-servicing.24313.11"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILAsm"; sha256 = "249166f90b4ed837c0797d8c7bed45d55d058aae223e9f163590bee2bbeaf996"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/8.0.7-servicing.24313.11/runtime.osx-x64.microsoft.netcore.ilasm.8.0.7-servicing.24313.11.nupkg"; version = "8.0.7-servicing.24313.11"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILDAsm"; sha256 = "ad9bda1369dab0aeb3179735a653f6cd92af08a01c33b220a902f9da1b0b9e65"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/8.0.7-servicing.24313.11/runtime.osx-x64.microsoft.netcore.ildasm.8.0.7-servicing.24313.11.nupkg"; version = "8.0.7-servicing.24313.11"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILAsm"; sha256 = "5e6469e8cb678ffe0dd238b80cec17ef6667291b481c375e81292fd403b9ae6e"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/8.0.8-servicing.24366.12/runtime.linux-arm64.microsoft.netcore.ilasm.8.0.8-servicing.24366.12.nupkg"; version = "8.0.8-servicing.24366.12"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "57aba33fa6933c296454ceab3d58469ce089573218595efdaac74ca047562dce"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/8.0.8-servicing.24366.12/runtime.linux-arm64.microsoft.netcore.ildasm.8.0.8-servicing.24366.12.nupkg"; version = "8.0.8-servicing.24366.12"; }) + (fetchNuGet { hash = "sha256-5wddL132f1W80dHLP8Nn5EVvStTauNUH+E5JvVboC5k="; pname = "runtime.linux-x64.Microsoft.NETCore.ILAsm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/8.0.8-servicing.24366.12/runtime.linux-x64.microsoft.netcore.ilasm.8.0.8-servicing.24366.12.nupkg"; version = "8.0.8-servicing.24366.12"; }) + (fetchNuGet { hash = "sha256-73CVn14q/pnCxN2qPaINi+u6YQSVwEKI8xtCT1NAs04="; pname = "runtime.linux-x64.Microsoft.NETCore.ILDAsm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/8.0.8-servicing.24366.12/runtime.linux-x64.microsoft.netcore.ildasm.8.0.8-servicing.24366.12.nupkg"; version = "8.0.8-servicing.24366.12"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILAsm"; sha256 = "e386ffb4c9bb0a5f9f3fc8ff1cf389a6564c8d4d6747b39954207f2a541cc67c"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/8.0.8-servicing.24366.12/runtime.osx-arm64.microsoft.netcore.ilasm.8.0.8-servicing.24366.12.nupkg"; version = "8.0.8-servicing.24366.12"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "479117fab25d26d59d8d605a308b53116a0cdce88e4cb5923a31187916d8297c"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/8.0.8-servicing.24366.12/runtime.osx-arm64.microsoft.netcore.ildasm.8.0.8-servicing.24366.12.nupkg"; version = "8.0.8-servicing.24366.12"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILAsm"; sha256 = "dcd72a80e4268a8231790b647ed83b214185f0c8c33fc3656618495d2cefb343"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/8.0.8-servicing.24366.12/runtime.osx-x64.microsoft.netcore.ilasm.8.0.8-servicing.24366.12.nupkg"; version = "8.0.8-servicing.24366.12"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILDAsm"; sha256 = "0a77e58f66baa31981d503bcc8ebbda4816643c8162e685d8b0620cb707f5668"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/8.0.8-servicing.24366.12/runtime.osx-x64.microsoft.netcore.ildasm.8.0.8-servicing.24366.12.nupkg"; version = "8.0.8-servicing.24366.12"; }) ] diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/8/release-info.json b/third_party/nixpkgs/pkgs/development/compilers/dotnet/8/release-info.json index c444ebd7f1..55471559c4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/8/release-info.json +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/8/release-info.json @@ -1,5 +1,5 @@ { - "tarballHash": "sha256-/LB6wcJyN25e8+wuBBmnBhdafkczl0LoUX0R/NlUdEU=", - "artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.107-servicing.24317.1.centos.9-x64.tar.gz", - "artifactsHash": "sha256-eduApTyIPz8aVvMCHckVLEJ69/fDLWNtw7EpRq36Qfo=" + "tarballHash": "sha256-HSks3/qFi3khT0E4bU1ek+g8xd5yzmhlqCfnec30EKo=", + "artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.108-servicing.24372.1.centos.9-x64.tar.gz", + "artifactsHash": "sha256-hEAyX3XJG6jHJV4sv1DHxT48u1mSTTXEWwODBm4L7cE=" } diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/8/release.json b/third_party/nixpkgs/pkgs/development/compilers/dotnet/8/release.json index 0da99bb31c..501d01cd0a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/8/release.json +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/8/release.json @@ -1,10 +1,10 @@ { - "release": "8.0.8", + "release": "8.0.10", "channel": "8.0", - "tag": "v8.0.8", - "sdkVersion": "8.0.108", - "runtimeVersion": "8.0.8", - "aspNetCoreVersion": "8.0.8", + "tag": "v8.0.10", + "sdkVersion": "8.0.110", + "runtimeVersion": "8.0.10", + "aspNetCoreVersion": "8.0.10", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "e78e8a64f20e61e1fea4f24afca66ad1dc56285f" + "sourceVersion": "8922fe64a1903ed4e35e24568efb056b3e0fad43" } diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix new file mode 100644 index 0000000000..f01b54a350 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix @@ -0,0 +1,249 @@ +{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }: + +# v9.0 (go-live) + +let + commonPackages = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-IcIfs7kmYWeUW0xI23FCgzzdTx/TstTzY/En7HZ3IYE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-YtwuWl1DpYuKY97P2iJmm7ov5q05by3eFL4inl+Kwhc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-aHywWxrhPfKRL5sZelbQiUZaMLRn+e4A3UXihjNBLoE="; }) + (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-KaSR5WA+aTDOR41PuvwsXZt/zHsOJOKxBEfSGxFO07o="; }) + (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-f9o3PGHsW2BNMN9noBsUFv0SRRUR2m+RHceJtjCzd60="; }) + ]; + + hostPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-1P7Y8+FoxfaL3vTLPx5/LPYw2ZVhxC5sTSKbjHCPAuc="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-yT+zcwYGL1f8oMC7S9sdLjbLpaR5/zdrRtpozZ+w/YY="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-U8rxugP2w8JS1I1cTMzN3XYjw9uVHZqPDDppdE9dtns="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-iRO1a77VwLcu4vWro3eHHcxh8nQlY/ik4+pT/2c3khA="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-XIODRgELUOKfn5L5g40Mxzcf/qH7pCJoRRvZPW1eY38="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-hqYfNrj8fhgSMkK+sEQTtZdidJeD2vvvDoMBtK8ZmYI="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-JMpiQJY23noyNK0KjkkyGmYJJLyTNiHhlZPKA6vSQB4="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-XjcQWqUEadp9u90HZU45gt/ANzn7Z7yuV24SrMKY7tM="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-Dbt1T/Y9AsuITCNDu7+9to+9Q8aUAGmEsemONyucNkg="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-AlWrYGpqFSTj6UDEZ77kFq+KrN9SOO7fLu+R5hiICTM="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-ewDINCVRtePHQRceMn0xhUFNjEr08AsaS9WBvz3lcLs="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-8CNaSv1PxoyQGSc7W64BlviEgBtggYzSjDh6vPl3YSI="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-DV1kc2BhDSHgmWE7lqUtM3u5YfXl/EKo3FU04LHzP5o="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-58cO2fdzdLYkWC6q7dn5dXKpMj4WzE95tlnPqW0X+W0="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-GugOroZ0SRoGoP3xE3jt91vTbHwXLPq8bHYckNC8SIA="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-ceT9q9ZCwhGnp+BrxgjPcoyrAqKHc7VK47M4tM2pQmw="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-lvAHbw3hhS6OnCuUMLEa4NKJWZPHqcBM3IeXpeYtLHo="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-ZV5ptFKjt4UX+ytjnWMRk0/Xc+hR8tuYb8ADqLlTFnU="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-ULArvCiy+bOHtkD5E0q7u+Cfg7R+IJZ4A60ldV798vs="; }) + ]; + }; + + targetPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-eC46DyuObx9VhFP4PyY/3JWqAck8bW4Bt2hZyuapLRY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-6WaE1hKyIBnsTe3YlVP/lHR9HOnMkYtqDZEZLzidFAc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-u7sukf/qUk+gUVxFj/r9rzkQTVUcg2SqNhOmhPOsEyg="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-pYPVNaL6x5zRCBxCsPso8Ae0k9aaDbvH0aHS+j5pdIs="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-hKCalXcwzlgMLwthSnTcHkDOW1g2XUo4Kj49uryZvt8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-qlxs6pqhMQHkvOkJY37f9VMlxwnjUffue656XJaRLWI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-h1FtdGrQp0HjK8fJajK1h5YV9fgBZCBQOH9M4pqMamE="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-EBCX8Uvy+Z40i+VjuUK+F5CAZYblQLKzAExfx/uQ+gE="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-KmyOl6C8u/PrCAMiY/KwELYvRafnM4SfcnEhKvU5BeU="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-Q41rpitFgIbgUpIh7iGzXTaCVDoUoDJ7HYddW2krHAE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-bsQyjyidOkZLtjR1JadsIkRp6gDlHjEsJEbNLgKGtdE="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-2YfhVuvSJe2sIkPFgocqAJubbb1PU7r93YoICq3ntAo="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-oPUyQZ9bGNbk6yPeIAQkNmDmDNcq3o2jFIsunotBBps="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-CBwqR3ii9Yg3O9lG/UAFaltVHmH5aFk2r8+IV1zeIS4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-Uw965RIeMJJ3uV5xX6WWGVq8i+CHXpiOw1mOT6rPmFI="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-JBUxkn0eUboAElHl+o2LyC7f9eJz4jJ9/odxXa43FSM="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-ZsUpPpaD4cfjTnTPAw1VqKHYX51XFG1ck0Ae2dWUKt8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-RY5CrQ9K9VZeh8+1r8Rjg0gEFBBRqR5EGTFkBfx0+3Q="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-FG9CGm1wZlMzKGzr70+qg62NLmYot0uG9yilyoEBpmw="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-QtCqH/Ah7EW2lNWHq9y4sAQI+8XOWMLBrqPIuDEV1ic="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-wdwHZFStEDDU0v8nah6hylLErKUxC9x3CvgL/9Qcfwo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-QnGhafheornOKm2H+UO9M+a57S7OzU7oomMp1Gs+qcQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-v8J9etz1hP2q02KbUjKxDUc8So2qlzajFCDbM9N9TiE="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-HZS5qup9w2rWf1K5zIq7BEYTi8BC5co+Mz9Ey7iOcPc="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-hSj4rqdeeerbuFQT7DI38eIOI3XUUun7nfi4ypPyggU="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-4sp79lNVzgWRV2l1WjURkZBTq13OTRPfoRsaWU1Kd+Q="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-JT2SL5C1RXS80C7hB+YcCHW9Nynq4+1dCd4nckZVDsM="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-pnE0Z0AxP+2tiQT72EIjrsfRxN9q/rWQ/5J1SIF8rVg="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-DO5bDJGbzav8ji/1Wp5+VCU2xd/7P+tD8eMCBCeisq0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-ORBkaFVuxvBBcqo0vklECC72Paoy13E33gt/ctHojq0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-oFvsMtKz+O9/B7asuc2DsH8KhRhAdS4D6qR64O8dE48="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-sXYAaSQvdrsknqu85ZzDfRFKQ3lKxPmK3CeYJwJ/u78="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-/GFhQQTpATa+eVsIKIS5hYQwEzueYT7IClqfTuO7OiY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-DJWq3FrbwU6QCJLuMWKFvQhwrszUHIHbZEi+cjnUkAI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-NtpJ9HN+LvXLb/qBn3Dz5XGTqhrlB8oUFCzge9zkxJ0="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-quzQ5GEyFmdsn7VXSsjSFHIcYnHwxb3OXP5Rcnar7mw="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-53HpBsY1A7xFKDSKW+yMjoTdK+calt2k8z1XQbIx39I="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-zzq0pwTb9ayiuFijGfhXPyIk7YsGu1Q611CvHhPAGPM="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-WUB7TDKuqe/+vZMdwtmb8yst0+6STi/H7gf1jmb0adw="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-mc6g5oRPUbsFFwn5KDeY0LbzLGlyiPZxAhtjGEsIh+I="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-lMVZtEPD48KKReYFsJ2rmJzCvlQNkGvajbfmd/ZYfFA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-mHRvOES1i3VCmHfyQOakMNyvvJYS0xGdF8YFNpTEDx8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-X29sAPaFb6yZptgoQK6QnRKbLRmmkrnvWw2zHC1MHE8="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-8LP07HWuRAyUGk5aSIpBHcAso16yM6UQ7YbPAen0Zgs="; }) + ]; + }; + +in rec { + release_9_0 = "9.0.0-rc.1"; + + aspnetcore_9_0 = buildAspNetCore { + version = "9.0.0-rc.1.24452.1"; + srcs = { + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/c414fabc-f831-4c5d-af5e-8e85ebecc6a0/670acec9f83315bec2788393db85e708/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-arm.tar.gz"; + hash = "sha512-EgHd12xUpnbLKHRD7xszFtCHufNVfHl/ckzU/LhphutJmzEilZskl2RE4mIoXAWooPjz8oKJRjHlj6TeQrtUiQ=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/c5075cd5-2552-4f77-96ce-31450f9ff8d5/e6ff2b52e2a27a60eb3585cbca01d60b/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-arm64.tar.gz"; + hash = "sha512-hGEKOPuamOt70muompxJmGguw//7Xq3lu6+6/WPKx9mlJ5YYu1slddJ/7sCY2l/m9xUMZyU/Pzd2JgFZA5bhIg=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/da25731f-e296-4e2a-8f2b-0213d26e1799/859039cd012f8cfba53991f8f5543609/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-x64.tar.gz"; + hash = "sha512-+P0oXWe7BE1jFZaGnWMB4QoqJDyByaBQlqZq/0+zQxUpgSx0gubPDgZejgZfxQsWtQ1/KklaswB3povUWzujdg=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/8d4492ed-c733-4cfc-bf16-4f13191587f2/c843723067d5fc1d790ffa1810c683c1/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-musl-arm.tar.gz"; + hash = "sha512-Kdvu4spDebM0V+KwVliBFPoxgTUGxTWaIxRfI6QdBj0F6qCX6hF2I6QPqxE1FrRRUL0XovBXKHViwz/pFovymQ=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/bc3735cb-fea1-4f97-8669-3ab0e389d055/084b94228b13a45478ac75f5158801b3/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-musl-arm64.tar.gz"; + hash = "sha512-n08aOk85N3d5v092zguXYxAtnKYX/99h/3Wg2Bxcxj+1BCcI/xCxqD5VgFDZuVu68Vn6d+J8wD4K00NEHhZLXg=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/10aac5f7-c037-4874-8c05-425e668b0a24/4706d38e511259862e93a61f15dda28f/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-musl-x64.tar.gz"; + hash = "sha512-D5RfnHYZkY1hmmbPtsiwH9mTlDjOjvi+B5f66ky9c87eb9JcIlhV77eTvmcL/A9xmOnyMfoFEdfPMZ0vq7rJ0w=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/0bae8dff-9440-4388-a03e-af44e20673a8/8ab257a4963967970cd59c31c213f38d/aspnetcore-runtime-9.0.0-rc.1.24452.1-osx-arm64.tar.gz"; + hash = "sha512-A/fgM1LRrS1U6d5MHN16lMIxG7NtTGKWZh+rKGzd6/P1cgT3OJLv1T9Dz7E7pzyvrpXQUixHvgMgPV+2mg7P6Q=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/b0414fd7-20f9-4363-9dbf-072880e97b17/89584fa06e9ba1154a7e02402a28d82f/aspnetcore-runtime-9.0.0-rc.1.24452.1-osx-x64.tar.gz"; + hash = "sha512-/0puNbQfUgBSHqSyV7KT5NSPF4bMqpzYW1W6lq02A228FJ0v+CDx3/Xy2az2w4tsNUDnAMLC21/m2C1PhfRhrg=="; + }; + }; + }; + + runtime_9_0 = buildNetRuntime { + version = "9.0.0-rc.1.24431.7"; + srcs = { + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/26c238f2-53a2-4fdc-981e-31272c80d107/67c11b008d57d501cd2e5ca642cbc8c1/dotnet-runtime-9.0.0-rc.1.24431.7-linux-arm.tar.gz"; + hash = "sha512-ioPeMA6PnsZ/cFAE9VIpVz3Yv7EG9sQjie+ylsI4buJ4Rvgbqv5rQmnpxyaQN+XsPxN2xyvBA+RkHJGBp+V2Rw=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/54f6fb3b-da5b-4a2d-98f4-ae07c814a586/e5f2a5ba551ffe53ea1c2ae9b7681f0b/dotnet-runtime-9.0.0-rc.1.24431.7-linux-arm64.tar.gz"; + hash = "sha512-hUK7k4Hk7Kbw687d7GhSXMWeNPckRhPPM8shUfVwwzRcttCBxJKwEHDnYtNEDwLUVYI0Uy1Y/z3JGQV+Bre9rA=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/72048153-7c19-4e69-bcf3-22563060db07/cd181715a0f7cd3cec8c87b115181da9/dotnet-runtime-9.0.0-rc.1.24431.7-linux-x64.tar.gz"; + hash = "sha512-n5qFuNn2Ni7SwtDt79BJmRgbLDhmR2RPvB2fJIJVOHMkOZ7bHEC8f6jEetwi4tcdtfJc55RSHVnkbEBZO19sxQ=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/c948e710-a590-4492-870d-1e44ce476a55/86522880c5160af3c81bfa71378b79b9/dotnet-runtime-9.0.0-rc.1.24431.7-linux-musl-arm.tar.gz"; + hash = "sha512-ERibzBMUhpSROsX7BQt324EErGLdOblwzZau85n3p87mVqMUtE8BE/lnJufuCiad6jhjcCD+BiYaiwHKDfnktA=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/9ef6c8f0-49ac-4b37-9e7a-0f2cbbc74472/ceebdb8281a18bc80d17147ec3146cd0/dotnet-runtime-9.0.0-rc.1.24431.7-linux-musl-arm64.tar.gz"; + hash = "sha512-3WKnNzaydaFbWv+jRloO89aWGaBsyqo5FrMx9Fs4WakCjnjrfNhcdm3v+5cDx7uWeI9AYdVJy98yW/gYlDEFIQ=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/30c11bec-b456-45de-bb45-5e892fd1a509/cd72910d2c8b0c908f717a3563c2445f/dotnet-runtime-9.0.0-rc.1.24431.7-linux-musl-x64.tar.gz"; + hash = "sha512-vXcBXKRriSj3CmHmz+8jxeMIrUDAPd1CHCEBQbGjjNXE2O31Nl6LruIn21pqxx++pIHBqLPFum6lgzCv3X/iMQ=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8abf3e03-1ab3-40fd-a9cf-fa22005be2e8/cb0c3c5d130ef8ae76a982860fd3606a/dotnet-runtime-9.0.0-rc.1.24431.7-osx-arm64.tar.gz"; + hash = "sha512-qCX8qe3eU6tqvA7+DETW+yXFx3rrLTW2xBTULzZEU86wae2duIZcK7glI5ifzrfMy/hgR2mVkP91amucVMIddA=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/13d7d905-549f-44e8-9062-a678a742c5fb/94c51ca9c08ef9b5cceabafc2337118f/dotnet-runtime-9.0.0-rc.1.24431.7-osx-x64.tar.gz"; + hash = "sha512-9i+GfqtjNzfEUP+wVDpybxui9GpCZctHl42I2tDGuAqNtcz29YOEL4XLYTuW0vfGgG1mmCb0uSuQbnHY0Q5T6A=="; + }; + }; + }; + + sdk_9_0_1xx = buildNetSdk { + version = "9.0.100-rc.1.24452.12"; + srcs = { + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/87c96627-cf20-47d7-8cb4-d5e083084dd4/07d4b533e746b344a3dbf9f7279f450b/dotnet-sdk-9.0.100-rc.1.24452.12-linux-arm.tar.gz"; + hash = "sha512-8xpKLDCAqSHP3XGTPR9XwvV/9MQ/WgrW9SZAvHkeVPjAUm2OEgatIfhoI1elPPbUiKiwEQfnw0vq/iyMNCXdjA=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/f7739964-9e84-4bb7-9435-509458a15f9c/a95ad7f9deb8ce2fd30173dfe86f55ba/dotnet-sdk-9.0.100-rc.1.24452.12-linux-arm64.tar.gz"; + hash = "sha512-9XQlNxKIAcGZoScmYXUGYFh4iibopgPL0mocFunvM6XUGOR5Cjzqci195IPu6LaODeS7Hf3yeXEzae07TRY6EQ=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/3b2b3c23-574b-45d7-b2b0-c67f0e935308/23ed647eb71a8f07414124422c15927d/dotnet-sdk-9.0.100-rc.1.24452.12-linux-x64.tar.gz"; + hash = "sha512-6BMIF7d50BBKbu4z2Y2Xw/rRwzYBNDX0fA6eIjcBcrddo3reduSd7Hy+aWiEOQ0uaUHMaeK61Vk9bRxrQQgwUQ=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/8cb683aa-4558-45ac-944a-73ac40b708d2/2795bd0253d5518490378edc7f7b562e/dotnet-sdk-9.0.100-rc.1.24452.12-linux-musl-arm.tar.gz"; + hash = "sha512-hICQDhS9EDT1hsPhdAK+LwTKslDXm00d2jqoh+n6+mg604it9/JbXHsNxDM3XOHCcrPZQZY25tsPe/MA6EGgpQ=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8737d284-0c4b-49a0-984c-23fddc7abcd8/ada586539e4417b557d60d0214e8b2eb/dotnet-sdk-9.0.100-rc.1.24452.12-linux-musl-arm64.tar.gz"; + hash = "sha512-ZWv6TnxKPuKAuZ6v+mILCbibOjufbTPJ14fB+JOLhK+1qkPYBUboGiv9UydwwoLFmuoWf1DQGlcCeiBh5ZXw6Q=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/791e9a41-59da-4f92-9dfb-2cceaaea001b/710f7adf35dc2f32be49ac2834ad0afd/dotnet-sdk-9.0.100-rc.1.24452.12-linux-musl-x64.tar.gz"; + hash = "sha512-sdgATPnD/7Uw+7PUJZF0ywdqMroAJo2qQ9v0Uv5tRsz5eaY9f1OucKL6ehAanfG9O4QFUqySqFIRm7c4WmX2Xw=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/930f4eb8-188f-47d5-8a26-28ca393b7d1b/c07a519e3d7e326c3f640ef72ea1193e/dotnet-sdk-9.0.100-rc.1.24452.12-osx-arm64.tar.gz"; + hash = "sha512-rzCzHNk36fyX4WS4NijCwezSEym3X3Qtn1IyqmhCfSW11wLMVlqoYNPHOMhyd5BWm/ZqPtdOXO9xmuWJ0wKEbw=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/e26e36f6-746f-462c-8599-5d0a1f00e786/f1b8264ac10442b40009aa8cea46b23b/dotnet-sdk-9.0.100-rc.1.24452.12-osx-x64.tar.gz"; + hash = "sha512-DR8HGO7vAGw+z77+6/nfB3LsIsdNtLtjW2RjuK7f05VydLkItR7AGc7WnT569K6SUvGOh7FKRBHhCJpMxB430A=="; + }; + }; + inherit commonPackages hostPackages targetPackages; + }; + + sdk = sdk_9_0; + + + sdk_9_0 = sdk_9_0_1xx; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/9/default.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/9/default.nix index 2c7c83aaa6..55cb65f495 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/9/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/9/default.nix @@ -3,7 +3,7 @@ }: callPackage ../dotnet.nix { releaseManifestFile = ./release.json; releaseInfoFile = ./release-info.json; + bootstrapSdkFile = ./bootstrap-sdk.nix; allowPrerelease = true; depsFile = ./deps.nix; - bootstrapSdk = dotnetCorePackages.sdk_9_0; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/9/release-info.json b/third_party/nixpkgs/pkgs/development/compilers/dotnet/9/release-info.json index 89a33e292f..6e9805f3ea 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/9/release-info.json +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/9/release-info.json @@ -1,5 +1,5 @@ { - "tarballHash": "sha256-t4BQcN1rCG5XKfsJJqnpBHzyXtCrWbQaxpJ8gBpRrVk=", + "tarballHash": "sha256-VvRGu2GKw8XBvfOuICjQvV1UlTjRcuHX8j6x3w7uJtY=", "artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.100-rc.1.24452.1.centos.9-x64.tar.gz", "artifactsHash": "sha256-HRu23+7cJVAoTaFm0hnHk1lOC8HiBIvTs9TgWKVS8xw=" } diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/9/release.json b/third_party/nixpkgs/pkgs/development/compilers/dotnet/9/release.json index 61f7c3e524..2afbc2fc6e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/9/release.json +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/9/release.json @@ -1,10 +1,10 @@ { - "release": "9.0.0-rc.1", + "release": "9.0.0-rc.2", "channel": "9.0", - "tag": "v9.0.0-rc.1.24431.7", - "sdkVersion": "9.0.100-rc.1.24452.1", - "runtimeVersion": "9.0.0-rc.1.24431.7", - "aspNetCoreVersion": "9.0.0-rc.1.24452.1", + "tag": "v9.0.0-rc.2.24473.5", + "sdkVersion": "9.0.100-rc.2.24474.1", + "runtimeVersion": "9.0.0-rc.2.24473.5", + "aspNetCoreVersion": "9.0.0-rc.2.24474.3", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "f2e150252ab0fe4f796fac30ba5ffeb22c1c4156" + "sourceVersion": "b4c156e3f670d86ad737595a912c5c85c481b9ac" } diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/build-dotnet.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/build-dotnet.nix index e9ae30070d..3d48e1d981 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -194,10 +194,10 @@ mkCommon type rec { let majorVersion = lib.concatStringsSep "." (lib.take 2 (lib.splitVersion version)); in - writeShellScript "update-dotnet-${majorVersion}" '' - pushd pkgs/development/compilers/dotnet - exec ${./update.sh} "${majorVersion}" - ''; + [ + ./update.sh + majorVersion + ]; }; meta = with lib; { @@ -207,6 +207,7 @@ mkCommon type rec { maintainers = with maintainers; [ kuznero mdarocha + corngood ]; mainProgram = "dotnet"; platforms = lib.filter ( diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/default.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/default.nix index 69cd17ec62..88aaa28c8d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/default.nix @@ -23,18 +23,20 @@ makeScopeWithSplicing' { fetchNupkg = callPackage ../../../build-support/dotnet/fetch-nupkg { }; buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) { }; - buildAttrs = { - inherit fetchNupkg; - buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; }); - buildNetRuntime = attrs: buildDotnet (attrs // { type = "runtime"; }); - buildNetSdk = attrs: buildDotnet (attrs // { type = "sdk"; }); - }; + buildDotnetSdk = + version: + import version { + inherit fetchNupkg; + buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; }); + buildNetRuntime = attrs: buildDotnet (attrs // { type = "runtime"; }); + buildNetSdk = attrs: buildDotnet (attrs // { type = "sdk"; }); + }; ## Files in versions/ are generated automatically by update.sh ## - dotnet_6_0 = import ./versions/6.0.nix buildAttrs; - dotnet_7_0 = import ./versions/7.0.nix buildAttrs; - dotnet_8_0 = import ./versions/8.0.nix buildAttrs; - dotnet_9_0 = import ./versions/9.0.nix buildAttrs; + dotnet_6_0 = buildDotnetSdk ./versions/6.0.nix; + dotnet_7_0 = buildDotnetSdk ./versions/7.0.nix; + dotnet_8_0 = buildDotnetSdk ./versions/8.0.nix; + dotnet_9_0 = buildDotnetSdk ./versions/9.0.nix; runtimeIdentifierMap = { "x86_64-linux" = "linux-x64"; @@ -47,7 +49,7 @@ makeScopeWithSplicing' { in { - inherit callPackage fetchNupkg; + inherit callPackage fetchNupkg buildDotnetSdk; # Convert a "stdenv.hostPlatform.system" to a dotnet RID systemToDotnetRid = @@ -65,7 +67,7 @@ makeScopeWithSplicing' { mkNugetDeps = callPackage ../../../build-support/dotnet/make-nuget-deps { }; addNuGetDeps = callPackage ../../../build-support/dotnet/add-nuget-deps { }; - dotnet_8 = recurseIntoAttrs (callPackage ./8 { bootstrapSdk = dotnet_8_0.sdk_8_0_1xx; }); + dotnet_8 = recurseIntoAttrs (callPackage ./8 { }); dotnet_9 = recurseIntoAttrs (callPackage ./9 { }); } // lib.optionalAttrs config.allowAliases { diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh b/third_party/nixpkgs/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh index 1e7908b049..76f8734d4e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh @@ -198,5 +198,5 @@ configureNuget() { } if [[ -z ${dontConfigureNuget-} ]]; then - preConfigurePhases+=(configureNuget) + appendToVar preConfigurePhases configureNuget fi diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/dotnet.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/dotnet.nix index 7e94f3432f..c56ff55279 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/dotnet.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/dotnet.nix @@ -5,18 +5,28 @@ fetchurl, releaseManifestFile, releaseInfoFile, + bootstrapSdkFile, allowPrerelease ? false, depsFile, - bootstrapSdk, pkgsBuildHost, + buildDotnetSdk, }: let - inherit (lib.importJSON releaseInfoFile) tarballHash artifactsUrl artifactsHash; + inherit (lib.importJSON releaseInfoFile) + tarballHash + artifactsUrl + artifactsHash + bootstrapSdk + ; pkgs = callPackage ./stage1.nix { - inherit releaseManifestFile tarballHash depsFile; - bootstrapSdk = bootstrapSdk.overrideAttrs (old: { + inherit + releaseManifestFile + tarballHash + depsFile + ; + bootstrapSdk = (buildDotnetSdk bootstrapSdkFile).sdk.overrideAttrs (old: { passthru = old.passthru or { } // { artifacts = stdenvNoCC.mkDerivation rec { name = lib.nameFromURL artifactsUrl ".tar.gz"; @@ -43,7 +53,12 @@ pkgs vmr = pkgs.vmr.overrideAttrs (old: { passthru = old.passthru // { updateScript = pkgsBuildHost.callPackage ./update.nix { - inherit releaseManifestFile releaseInfoFile allowPrerelease; + inherit + releaseManifestFile + releaseInfoFile + bootstrapSdkFile + allowPrerelease + ; }; }; }); diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/packages.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/packages.nix index f9a5190d15..b32bf3f2d9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/packages.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/packages.nix @@ -7,6 +7,7 @@ strip-nondeterminism, zip, nugetPackageHook, + baseName ? "dotnet", fallbackTargetPackages ? { }, }: @@ -93,7 +94,7 @@ let }; sdk = mkCommon "sdk" rec { - pname = "dotnet-sdk"; + pname = "${baseName}-sdk"; version = releaseManifest.sdkVersion; src = vmr; @@ -147,7 +148,7 @@ let }; runtime = mkCommon "runtime" rec { - pname = "dotnet-runtime"; + pname = "${baseName}-runtime"; version = releaseManifest.runtimeVersion; src = vmr; @@ -172,7 +173,7 @@ let }; aspnetcore = mkCommon "aspnetcore" rec { - pname = "dotnet-aspnetcore-runtime"; + pname = "${baseName}-aspnetcore-runtime"; version = releaseManifest.aspNetCoreVersion or releaseManifest.runtimeVersion; src = vmr; diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/stage0.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/stage0.nix index b10f0ac2cc..e8be69d1f0 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/stage0.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/stage0.nix @@ -12,6 +12,7 @@ patchNupkgs, symlinkJoin, + baseName ? "dotnet", releaseManifestFile, tarballHash, depsFile, @@ -34,7 +35,12 @@ let vmr = (mkVMR { - inherit releaseManifestFile tarballHash bootstrapSdk; + inherit + baseName + releaseManifestFile + tarballHash + bootstrapSdk + ; }).overrideAttrs (old: rec { prebuiltPackages = mkNugetDeps { @@ -138,4 +144,4 @@ let }; }); in -mkPackages { inherit vmr; } +mkPackages { inherit baseName vmr; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/stage1.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/stage1.nix index 94fb0fa24c..0aa67615ad 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/stage1.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/stage1.nix @@ -13,7 +13,12 @@ let mkPackages = callPackage ./packages.nix; mkVMR = callPackage ./vmr.nix; - stage0 = callPackage ./stage0.nix args; + stage0 = callPackage ./stage0.nix ( + args + // { + baseName = "dotnet-stage0"; + } + ); vmr = (mkVMR { diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/update.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/update.nix index cb482d7658..4fa837a4a2 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/update.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/update.nix @@ -13,6 +13,7 @@ releaseManifestFile, releaseInfoFile, + bootstrapSdkFile, allowPrerelease, }: @@ -42,16 +43,33 @@ let in writeScript "update-dotnet-vmr.sh" '' #! ${nix}/bin/nix-shell - #! nix-shell -i ${runtimeShell} --pure ${drv} + #! nix-shell -i ${runtimeShell} --pure ${drv} --keep UPDATE_NIX_ATTR_PATH set -euo pipefail - query=$(cat <&2 echo "release is already $release" exit fi @@ -91,13 +112,16 @@ writeScript "update-dotnet-vmr.sh" '' tarballHash=$(nix-hash --to-sri --type sha256 "''${prefetch[0]}") tarball=''${prefetch[1]} - curl -L "$sigUrl" -o release.sig + curl -fssL "$sigUrl" -o release.sig - export GNUPGHOME=$PWD/.gnupg - gpg --batch --import ${releaseKey} - gpg --batch --verify release.sig "$tarball" + ( + export GNUPGHOME=$PWD/.gnupg + trap 'gpgconf --kill all' EXIT + gpg --batch --import ${releaseKey} + gpg --batch --verify release.sig "$tarball" + ) - tar --strip-components=1 --no-wildcards-match-slash --wildcards -xzf "$tarball" \*/eng/Versions.props + tar --strip-components=1 --no-wildcards-match-slash --wildcards -xzf "$tarball" \*/eng/Versions.props \*/global.json artifactsVersion=$(xq -r '.Project.PropertyGroup | map(select(.PrivateSourceBuiltArtifactsVersion)) | .[] | .PrivateSourceBuiltArtifactsVersion' eng/Versions.props) @@ -112,6 +136,8 @@ writeScript "update-dotnet-vmr.sh" '' artifactsHash=$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url "$artifactsUrl")") + sdkVersion=$(jq -r .tools.dotnet global.json) + jq --null-input \ --arg _0 "$tarballHash" \ --arg _1 "$artifactsUrl" \ @@ -123,5 +149,13 @@ writeScript "update-dotnet-vmr.sh" '' }' > "${toString releaseInfoFile}" cp release.json "${toString releaseManifestFile}" + + cd - + + # needs to be run in nixpkgs + ${lib.escapeShellArg (toString ./update.sh)} \ + -o ${lib.escapeShellArg (toString bootstrapSdkFile)} --sdk "$sdkVersion" + + $(nix-build -A $UPDATE_NIX_ATTR_PATH.fetch-deps --no-out-link) ) '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/update.sh b/third_party/nixpkgs/pkgs/development/compilers/dotnet/update.sh index 58c307c0a4..8598f1f5d7 100755 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/update.sh +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/update.sh @@ -4,8 +4,6 @@ set -Eeuo pipefail -cd "$(dirname "${BASH_SOURCE[0]}")" - rids=({linux-{,musl-}{arm,arm64,x64},osx-{arm64,x64},win-{arm64,x64,x86}}) release () { @@ -52,7 +50,7 @@ platform_sources () { echo " };" } -nuget_url="$(curl -f "https://api.nuget.org/v3/index.json" | jq --raw-output '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"')" +nuget_url="$(curl -fsSL "https://api.nuget.org/v3/index.json" | jq --raw-output '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"')" generate_package_list() { local version="$1" indent="$2" @@ -199,107 +197,123 @@ netcore_target_packages () { generate_package_list "$version" ' ' "${pkgs[@]}" } -main () { - local pname - pname=$(basename "$0") - if [[ ! "$*" =~ ^.*[0-9]{1,}\.[0-9]{1,}.*$ ]]; then - echo "Usage: $pname [sem-versions] +usage () { + echo "Usage: $pname [[--sdk] [-o output] sem-version] ... Get updated dotnet src (platform - url & sha512) expressions for specified versions Examples: $pname 6.0.14 7.0.201 - specific x.y.z versions $pname 6.0 7.0 - latest x.y versions " >&2 - exit 1 +} + +update() { + local -r sem_version=$1 sdk=$2 + local output=$3 + + local patch_specified=false + # Check if a patch was specified as an argument. + # If so, generate file for the specific version. + # If only x.y version was provided, get the latest patch + # version of the given x.y version. + if [[ "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,} ]]; then + patch_specified=true + elif [[ ! "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}$ ]]; then + usage + return 1 fi - for sem_version in "$@"; do - echo "Generating ./versions/${sem_version}.nix" - local patch_specified=false - # Check if a patch was specified as an argument. - # If so, generate file for the specific version. - # If only x.y version was provided, get the latest patch - # version of the given x.y version. - if [[ "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,} ]]; then - patch_specified=true - elif [[ ! "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}$ ]]; then - continue - fi + : ${output:="$(dirname "${BASH_SOURCE[0]}")"/versions/$sem_version.nix} + echo "Generating $output" - # Make sure the x.y version is properly passed to .NET release metadata url. - # Then get the json file and parse it to find the latest patch release. - local major_minor content major_minor_patch - major_minor=$(sed 's/^\([0-9]*\.[0-9]*\).*$/\1/' <<< "$sem_version") - content=$(curl -sL https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/"$major_minor"/releases.json) + # Make sure the x.y version is properly passed to .NET release metadata url. + # Then get the json file and parse it to find the latest patch release. + local major_minor content major_minor_patch + major_minor=$(sed 's/^\([0-9]*\.[0-9]*\).*$/\1/' <<< "$sem_version") + content=$(curl -fsSL https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/"$major_minor"/releases.json) + if [[ -n $sdk ]]; then + major_minor_patch=$( + jq -r --arg version "$sem_version" ' + .releases[] | + select(.sdks[].version == $version) | + ."release-version"' <<< "$content") + else major_minor_patch=$([ "$patch_specified" == true ] && echo "$sem_version" || jq -r '."latest-release"' <<< "$content") - local major_minor_underscore=${major_minor/./_} + fi + local major_minor_underscore=${major_minor/./_} - local release_content aspnetcore_version runtime_version - release_content=$(release "$content" "$major_minor_patch") - aspnetcore_version=$(jq -r '."aspnetcore-runtime".version' <<< "$release_content") - runtime_version=$(jq -r '.runtime.version' <<< "$release_content") - local -a sdk_versions + local release_content aspnetcore_version runtime_version + local -a sdk_versions + + release_content=$(release "$content" "$major_minor_patch") + aspnetcore_version=$(jq -r '."aspnetcore-runtime".version' <<< "$release_content") + runtime_version=$(jq -r '.runtime.version' <<< "$release_content") + + if [[ -n $sdk ]]; then + sdk_versions=("$sem_version") + else mapfile -t sdk_versions < <(jq -r '.sdks[] | .version' <<< "$release_content" | sort -rn) + fi - # If patch was not specified, check if the package is already the latest version - # If it is, exit early - if [ "$patch_specified" == false ] && [ -f "./versions/${sem_version}.nix" ]; then - local current_version - current_version=$(nix-instantiate --eval -E "(import ./versions/${sem_version}.nix { \ - buildAspNetCore = { ... }: {}; \ - buildNetSdk = { ... }: {}; \ - buildNetRuntime = { ... }: {}; \ - fetchNupkg = { ... }: {}; \ - }).release_${major_minor_underscore}" | jq -r) + # If patch was not specified, check if the package is already the latest version + # If it is, exit early + if [ "$patch_specified" == false ] && [ -f "$output" ]; then + local current_version + current_version=$(nix-instantiate --eval -E "(import $output { \ + buildAspNetCore = { ... }: {}; \ + buildNetSdk = { ... }: {}; \ + buildNetRuntime = { ... }: {}; \ + fetchNupkg = { ... }: {}; \ + }).release_${major_minor_underscore}" | jq -r) - if [[ "$current_version" == "$major_minor_patch" ]]; then - echo "Nothing to update." - continue - fi + if [[ "$current_version" == "$major_minor_patch" ]]; then + echo "Nothing to update." + return fi + fi - local aspnetcore_files runtime_files - aspnetcore_files="$(release_files "$release_content" .\"aspnetcore-runtime\")" - runtime_files="$(release_files "$release_content" .runtime)" + local aspnetcore_files runtime_files + aspnetcore_files="$(release_files "$release_content" .\"aspnetcore-runtime\")" + runtime_files="$(release_files "$release_content" .runtime)" - local channel_version support_phase - channel_version=$(jq -r '."channel-version"' <<< "$content") - support_phase=$(jq -r '."support-phase"' <<< "$content") + local channel_version support_phase + channel_version=$(jq -r '."channel-version"' <<< "$content") + support_phase=$(jq -r '."support-phase"' <<< "$content") - local aspnetcore_sources runtime_sources - aspnetcore_sources="$(platform_sources "$aspnetcore_files")" - runtime_sources="$(platform_sources "$runtime_files")" + local aspnetcore_sources runtime_sources + aspnetcore_sources="$(platform_sources "$aspnetcore_files")" + runtime_sources="$(platform_sources "$runtime_files")" - result=$(mktemp) - trap "rm -f $result" TERM INT EXIT + result=$(mktemp) + trap "rm -f $result" TERM INT EXIT - ( - echo "{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }: + ( + echo "{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }: # v$channel_version ($support_phase) let commonPackages = [" - aspnetcore_packages "${aspnetcore_version}" - netcore_packages "${runtime_version}" - echo " ]; + aspnetcore_packages "${aspnetcore_version}" + netcore_packages "${runtime_version}" + echo " ]; hostPackages = {" - for rid in "${rids[@]}"; do - echo " $rid = [" - netcore_host_packages "${runtime_version}" "$rid" - echo " ];" - done - echo " }; + for rid in "${rids[@]}"; do + echo " $rid = [" + netcore_host_packages "${runtime_version}" "$rid" + echo " ];" + done + echo " }; targetPackages = {" - for rid in "${rids[@]}"; do - echo " $rid = [" - aspnetcore_target_packages "${aspnetcore_version}" "$rid" - netcore_target_packages "${runtime_version}" "$rid" - echo " ];" - done - echo " }; + for rid in "${rids[@]}"; do + echo " $rid = [" + aspnetcore_target_packages "${aspnetcore_version}" "$rid" + netcore_target_packages "${runtime_version}" "$rid" + echo " ];" + done + echo " }; in rec { release_$major_minor_underscore = \"$major_minor_patch\"; @@ -314,37 +328,68 @@ in rec { $runtime_sources };" - local -A feature_bands - unset latest_sdk + local -A feature_bands + unset latest_sdk - for sdk_version in "${sdk_versions[@]}"; do - local sdk_base_version=${sdk_version%-*} - local feature_band=${sdk_base_version:0:-2}xx - # sometimes one release has e.g. both 8.0.202 and 8.0.203 - [[ ! ${feature_bands[$feature_band]+true} ]] || continue - feature_bands[$feature_band]=$sdk_version - local sdk_files sdk_sources - sdk_files="$(release_files "$release_content" ".sdks[] | select(.version == \"$sdk_version\")")" - sdk_sources="$(platform_sources "$sdk_files")" - local sdk_attrname=sdk_${feature_band//./_} - [[ -v latest_sdk ]] || local latest_sdk=$sdk_attrname + for sdk_version in "${sdk_versions[@]}"; do + local sdk_base_version=${sdk_version%-*} + local feature_band=${sdk_base_version:0:-2}xx + # sometimes one release has e.g. both 8.0.202 and 8.0.203 + [[ ! ${feature_bands[$feature_band]+true} ]] || continue + feature_bands[$feature_band]=$sdk_version + local sdk_files sdk_sources + sdk_files="$(release_files "$release_content" ".sdks[] | select(.version == \"$sdk_version\")")" + sdk_sources="$(platform_sources "$sdk_files")" + local sdk_attrname=sdk_${feature_band//./_} + [[ -v latest_sdk ]] || local latest_sdk=$sdk_attrname - echo " + echo " $sdk_attrname = buildNetSdk { version = \"${sdk_version}\"; $sdk_sources inherit commonPackages hostPackages targetPackages; };" - done + done + if [[ -n $sdk ]]; then echo " + sdk = sdk_$major_minor_underscore; +" + fi + + echo " sdk_$major_minor_underscore = $latest_sdk; }" )> "${result}" - cp "${result}" "./versions/${sem_version}.nix" - echo "Generated ./versions/${sem_version}.nix" - done + cp "${result}" "$output" + echo "Generated $output" +} + +main () { + local pname sdk output + pname=$(basename "$0") + + sdk= + output= + + while [ $# -gt 0 ]; do + case $1 in + --sdk) + shift + sdk=1 + ;; + -o) + shift + output=$1 + shift + ;; + *) + update "$1" "$sdk" "$output" + shift + ;; + esac + done } main "$@" diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/6.0.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/6.0.nix index 4018790882..388943cf23 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/6.0.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/6.0.nix @@ -4,312 +4,312 @@ let commonPackages = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.33"; hash = "sha256-GcPiO+iI0JsHYlqURAmzWjOnDX2jDCUY4jYaIwr8ojs="; }) - (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-SboOaKgRAWf8Ce2mb8izqvTxGNYsKAbgNIDGmdwaMpo="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.33"; hash = "sha256-BiGUcXo1FQTlZdR6ndhUQ8lrYG3KaGXNXRVF+Fc3L28="; }) - (fetchNupkg { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-tkJtIwdMSbz4VNyTnz/HQcV8LuN6PAAiN5p34aHhSog="; }) - (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-Eo22rJu2roKFD85Fme3hSYqoHE2YdehHAW+kTi0J2aA="; }) - (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-LOwFh6fozyRwqvP2CBt8JaSsrkNY/D0kHcXlFP/uvYo="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.35"; hash = "sha256-BxvIeZIaBdC0wyDQqKW0E5axSRSrtQk3oEPsT287014="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-9q5paA6a9Z9XH939/LI3CY3WUMI3k+3r5ql5DCQIvR4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.35"; hash = "sha256-IcpSbsSHgYBbNVvbcXfmRRM9bdx3pogLncO4RuXEab0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-sbboITtBgkzX9wtGhtQbjVHVlP+tOjr0eBvuTPR5n+I="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-CgptZ0sWSK+sq1S6vaHPSeX2VZiWQ1qB94BngSE3eTg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-3fYohmmqpwAaIbZSD8bCOrHpsj6HbbOebamH4JxNk/8="; }) ]; hostPackages = { linux-arm = [ - (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "6.0.33"; hash = "sha256-pMY7bdG2du0Lh3xpAUls7WWAzqenMwlvw3tmtkoVmO0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "6.0.35"; hash = "sha256-VQHuYjJLLOhgV0Bc2qiuLjDBYj/ZdayFApxvsMaybfQ="; }) ]; linux-arm64 = [ - (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "6.0.33"; hash = "sha256-BU3yVfKE2h+dHUQcqhxOOp8Pbdwbm3RxPy3/KkjtBMo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "6.0.35"; hash = "sha256-CEguy8PYd6Q/xgPVoUJiT9Kjvpk3ViyY9S0mKkZRtYc="; }) ]; linux-x64 = [ - (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.33"; hash = "sha256-4YrPHTlKoNvCgmgKvZx1naRQBiFN81KMMaDQ1VW52H0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.35"; hash = "sha256-3vy31ixbl8nmjyWgquh47daDf8KYJK1GiKdgUobZ4OE="; }) ]; linux-musl-arm = [ - (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "6.0.33"; hash = "sha256-pECdxdP0x1buwSaxZpioR51ORRl5BokV3JXUb23kGoI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "6.0.35"; hash = "sha256-HffLekYLq/WAmBJaK7JS+08P5MXbsZRSO7zQsP28KIg="; }) ]; linux-musl-arm64 = [ - (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "6.0.33"; hash = "sha256-MOW9RvWvQbrFIehX3UVdZjhoQz46uj1m0oIJQlwFKUE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "6.0.35"; hash = "sha256-7SitZSktVg5PPAxl3zh9v09ls4u57jqKoV3YDZWgkRo="; }) ]; linux-musl-x64 = [ - (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "6.0.33"; hash = "sha256-R9TbY5HpSt1R08xB3mmxTWZE3TBFeK4bH5BLUCyMQ5c="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "6.0.35"; hash = "sha256-b7swPOMAs3J++EXnwPP9BnG/5ti+qs3q+73gO33cIx0="; }) ]; osx-arm64 = [ - (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "6.0.33"; hash = "sha256-ArfQKZst3BbZ1J9I7Rmdg4aehEYWY71jG7bOkMot7BE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "6.0.35"; hash = "sha256-LjGQxsPj2WeXJEM/t89iw5mZg6uOFD0fkLil0lqKq50="; }) ]; osx-x64 = [ - (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "6.0.33"; hash = "sha256-fBfBkKW/nYwFsO1xd0u/nOIZnIG0CGW/RE23PsOQeE4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "6.0.35"; hash = "sha256-6Zc+12VfsFsFbfuh727PB1j7EDQeiuJYtSA7MUxUXj0="; }) ]; win-arm64 = [ - (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; version = "6.0.33"; hash = "sha256-c+3lplcEkrMapHA+nQPt4v2IkeiAvif6u2Ux32V5Iy0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; version = "6.0.35"; hash = "sha256-XPnsu3T9dfuwupKbGDQK2LsrMsvVasZZlN1b7usP+kg="; }) ]; win-x64 = [ - (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; version = "6.0.33"; hash = "sha256-qHleUXickhYB1CIWGWzsMB/BX61fuJXcVchkuKAOwLw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; version = "6.0.35"; hash = "sha256-7+ldzOhrKwoQymhLz9Nk6tO7Hd3VxLYYUuTLAttmWZ8="; }) ]; win-x86 = [ - (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; version = "6.0.33"; hash = "sha256-wxAzeoLe47TV5GWXXVWRyC+AKqBuTJ79RqS0DwqJpGk="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; version = "6.0.35"; hash = "sha256-SWxLLPrTpdw9EE0sZeS4GGcDzi7vGVvO19TeD/Zo+kA="; }) ]; }; targetPackages = { linux-arm = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.33"; hash = "sha256-9IIvr+MVkup8SygTV0HIHObHQt7gNAEj+0kYanmJ83Y="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.33"; hash = "sha256-ReYcVuhM8+it8FhEWNM+HLTiRsJi+8Xauscpus/uPQ8="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.33"; hash = "sha256-NMTRG9jt6aHRuHKQhV2P0ex194t1FM0ZXkQBEdLVIjk="; }) - (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-LKtXdCHaIx88J13bSmANZiAGgYyse8qtha+pi4LPwMQ="; }) - (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-e9KR+J6yBSp6Py/xkrW2Mtc2xW84YDZ/4KFJPY4EkEw="; }) - (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-x18Pl1WygIEU75poeIXlcP3ZxdrS4nRRJ/K3lv6mfyY="; }) - (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-xMt9SDtZ9SlLQpy3GJKx/SxfqGCKIk30HFhQ8HpnUos="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.33"; hash = "sha256-E636XnOUoY2BQP1HkUCGWMRCupjVeQPUVxIiqn1cqm0="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.35"; hash = "sha256-tpSLvTe0WX8+N4L6Ww9F35aobI2F06lGLwmtoVGPoMc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.35"; hash = "sha256-NDUtM1/wQYziwzGZEtizHqLfgsbqCDyXdqRziZgZ1xc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.35"; hash = "sha256-eJDl6txbRr3/Bcm0jgLq5sa0RjCpKjx9gJtxRkwKFa0="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-c4OtjF4mwQ5oDg7aTIL3UXWlgjzScj7MAiOZkwvtUBs="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-NqFL81Xr7RMl7Mc/bdKI2TCHzq4QpG4kdd7sERPzOWc="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-WUnzXWrYltA+PDv5lOIoNA6d7c6Yk0x5bO4AqjkttFM="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-PR+IPCMNROJiZxu7ZYRpzeAhW5N+HC6jEC3N/VXwyyQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.35"; hash = "sha256-RoTet98wvZZiKsDu2ex7HPtxrEIvDXm571bTMHPd4zc="; }) ]; linux-arm64 = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.33"; hash = "sha256-g5zbB1DnCSKuCOWtF09GEqGn1uJLdlTN6kqdnSCzRjQ="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.33"; hash = "sha256-rwWOpf2Pdg84c8bKIUcMYuDTI0kXUELL/nl9psSmX+E="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.33"; hash = "sha256-obRKiJEVpZ5E3TE7q2oHaYwFYhI23rMiHwp+8ORkwXY="; }) - (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-GLQ/7vf+kqHLu6yeiSY8rq5yPUmZvxKtQ6HRR8iRV34="; }) - (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-oXlmQZ93jZaq7gj8q4MCXWpx0MxKuHhON2SPE44o+ns="; }) - (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-/skm1EA/eVeK/Fedra9Naavck9mkWXZdZTOw+/oFw8E="; }) - (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-mLZz9Y4TzJHjsTMemYfeXXHHqG77rXLSOxN3r7bpd48="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.33"; hash = "sha256-9oS5Gf9E74c3xG79oFKMoGbHmuuH03QT0CEWu8Zrmn4="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.35"; hash = "sha256-jM/HzLumZvI939DrNb8LHnEr/in1Lws0j/FAfdXSzbk="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.35"; hash = "sha256-yrtPCYD8skaWnfIoaUdQ1dns0YrypxDocskS2WGxF6g="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.35"; hash = "sha256-jPUhSrzqnH1GNi/c7dSnZSQhFNVGdmlAQkDLdXVWBBc="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-pQd99gNiGGK41kib34QMP2JN2nkqrVrYJqX4qZoZSN0="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-86wblZsGVVwesDUfxhsCHXecS2NpwBLAEZUeUmaHnVg="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-JRXfIeOZL7DVzc2Tb0AuNo3PBKn//bqtUzkyoqWF8oA="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-A1E7kjTJKLAoZ4CyImcFGus7w+/H99/U1MUhQXJzIl8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.35"; hash = "sha256-VbV29mYgcewUk/aCnc28eUCH616+h3M7K+HTLs4rqeU="; }) ]; linux-x64 = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.33"; hash = "sha256-ToaiqVy5qonomAVBg5PO1GgrPKL4Cc1BZTJ0z/2LquA="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.33"; hash = "sha256-5iYNZATXOePDsLA9lI80o1Gjxw4E+B4bJbwdYJJHcZY="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.33"; hash = "sha256-2xdhvnKsFc8utDWN09zeXzZ5op+WUqkoWLuzdtQAkrA="; }) - (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-3mzU+lDVG+8TqO3OoNnDmj0JhQCuqNxpS3PDvj+3WCE="; }) - (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-m+m6kJGKBSYKQH7K+FZWT6eY3TDkRsbgy5QPxymhWhE="; }) - (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-ueIBjdXXdDBHHVLndlCXOu4h97BTChMHE2xOGqtdaHQ="; }) - (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-PojG+X32PbRZTuGYnAzvuBp+gxR20Vg+Uk2Zj264bsI="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.33"; hash = "sha256-mTvhLH6NynlNipMtUToAF3C63rzubVrvaiYo6OqB61A="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.35"; hash = "sha256-2eUqoTcqTU3ebv53IV6yvN9EhkOqnyBRd2tz74HuSsE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.35"; hash = "sha256-maNzxJQ5oCd86VI4ROzl4RqOV1RNXn3qWjrAfBjr2Y0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.35"; hash = "sha256-Gf3e0EdBEgq8GcZttTHbKGupFlDyB80nhYpBN0X9Kro="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-FemQgMovKuiS9dS48aAsMH9rQbUJnTM+olHU2gXJiqI="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-bQHLUwuKtiBUc02l6nqw0UntRySCZZ5f80jqE9GRJ1k="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-y0ZMcO7UQHK/tsV7FWxcaWs4cHnQIwDyS5KF4/MUrB4="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-0Nf5dX053Yy3ErDt/GH0IdefsE4C5Iwxu+V3yBQGXac="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.35"; hash = "sha256-NK9bR7E+4z4v6G1WqG74Be431jTgQZZnVUKIL1YH1vA="; }) ]; linux-musl-arm = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.33"; hash = "sha256-DaKK9vpjByD/Pn9L1BcTufbHHyzX5R2NnqTBStv8nUc="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.33"; hash = "sha256-g/3W0QDx58TsJCHinDefR5EzVD3Dp0cLVNdXOTdpGIc="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.33"; hash = "sha256-wrY7taxtG79TQfQbenMCYVzWdXZm3UWN79OX7ofM9G0="; }) - (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-vu0Prhi85qQZI4/C8xlW0M5sAxlS2l87WmLRn+rugo4="; }) - (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-4x53jrWRUCzKBK6hY6gFFL1xNXN7rqlyf4V8bkXVOLo="; }) - (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-8AYUSNze/g1Ji9S4gaZ7oYppAySnUXnjDVlm/O7jNts="; }) - (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-4it4ArciHQ+N1Z148mc3hTmb4p/X2PNUBGcGChuqEFk="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.35"; hash = "sha256-INxaOVFZsCkue1I+uBBbB6bVUinMSJwzoW1nREyC/TY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.35"; hash = "sha256-KG5o3HrmzzUcHn9MmaQsELqhW9pbf8v/BEl8XOy26bE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.35"; hash = "sha256-1gKuXzwtNC84PBNOSX76ZFUT87DHuOEJmKhmZg026tM="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-G9oP2+gqthzh1TzcPx9rhuA9rIdxm4aKpds2jLbz98g="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-fMyXnJKdHAcPQF3bG5It53BmwVICOBJZ9mZ5e8rhjIg="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-rL3yEEknGnpA0/W8GWkoT62C2nm2P1IY5b0FlWqNVIQ="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-hBpRmWVYievxvE7Oq2LOsq6flZWAMqOGILa1T4dySL8="; }) ]; linux-musl-arm64 = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.33"; hash = "sha256-lZCTehqxeLYENhg0CuYpYO6GY3/tP1UCNnJf9MddrRo="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.33"; hash = "sha256-VnJaB1pt07GDdmOasNpOzMp7Mkiqns7t6as4cSVmeAY="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.33"; hash = "sha256-3ya2Hio+/UB0EdRLwuQYFu/ZzAmKSZFor5QJ+D5jyXo="; }) - (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-/YQTVPObD9OrhU5dQV3dYM+zBuLwpvJrxbiv3Nj7OoU="; }) - (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-XqVPPIwNmwnSBrObqg2PgAotqSiFHL7In+6oB+hz1ZU="; }) - (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-H8dMez59DOTiUuxbV9QVkGsE2nkgI0tFNlmzHfXeDag="; }) - (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-YXt9pfVsqOZid+STshFAEglcYgjievWquHMGqWkhZE8="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.35"; hash = "sha256-FfDa/XMaER+fNf0ESjA+ZG1YsxbniiDf667N1I0i9EM="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.35"; hash = "sha256-Yb5w1a3vVPTd9YRdmsmB/GmVIA2h5UUMex6eJILttyQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.35"; hash = "sha256-T9wE4xhZFDRBFdY+aJ5ljQedmq94ULjgUl80JgOOLls="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-GqDM1An86Cix3IeE0ptVz/GevTeodIap+OnC+UK1JCE="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-Z2v8eRQTqqI1JTZELbRyC5nXWtq6Iq4hw2Kq/kZesTQ="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-Y+0OeW13o2vT3ZRUlSQnVMzhQefZnB3bEpniCK/7NXs="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-hkiXK3LEUWpi1sPKfjISRyDN9whidIW/7TcYKsf5sX0="; }) ]; linux-musl-x64 = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.33"; hash = "sha256-W0SgEXUKeOoZVPUC5fpHw9zyyfydCOdPPxHdF5Xb3b8="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.33"; hash = "sha256-Lf1TDP7q5JqeLLTTNpm9NE/EGKedcFVrFBtnukqreRM="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.33"; hash = "sha256-FvGON+QxJq7/U3lBb2xeQZttUmxfi+WH2eqt2Ya7aKE="; }) - (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-SPiJX2RUYD066ReIvEk8mj9MIIEQOvWRIjDE0w4eGyQ="; }) - (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-OMJo1JDbTGuWDRJbmgNMPK1tyvPya8OB/PYKBGFQMek="; }) - (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-vHZltBs2GcaCi4J6oi1atf1qLC6ElWuU0aruO34ystg="; }) - (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-S4FD0SnrgsfXju5xFyizsQn9hf6DYiREqKi7baNabf0="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.33"; hash = "sha256-uxZDZIk6YNlnwFF2v66vu+bdx4EtcGB/TCIy4Yuv9Uk="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.35"; hash = "sha256-QtmwSe9LB21xBOEIP37msHIbLV9g/cp5j5qI7UeVy8k="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.35"; hash = "sha256-H+fKDq3g0i6dgvbpI2U/EcH0qW+oTr5mkh7S44AWaLo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.35"; hash = "sha256-lyFTNQNL5Gd/Yz/wIn5pp38lQh91mpfSSX4ofsyPaXE="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-zP5FKatImRSjN+UKbPpmB+ILTrBrL+YnEt+DoI2x00c="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-s+E1b74zGUPjb2ON4Ecu0YyaBmh89R7FuLumBIWwrww="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-71iLcbj3hgrGalx1p3aP3gnukTbbIzGX0DHayfoqc14="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-myOR5s0P8oGaNvefX2RBOMKIoWKdTYyN/VVXzjOUkRs="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.35"; hash = "sha256-vTMU6Vb6WXB9Nwf/naJAG1Lv2SfmAd2rTSEh9e+ITsM="; }) ]; osx-arm64 = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.33"; hash = "sha256-OY/vdqAzZ99I4lEZbOOQw12TE0AIb5pXxKTvDxO2M2Q="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.33"; hash = "sha256-k3LenomOlacyzq4FlBY/TwV7+ClbK4U0A/O9r0pZHT4="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.33"; hash = "sha256-9KHubWicibZOcixiByzuBKPnJM2u5DSQC9jR3MAR1bI="; }) - (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-7SWFzAlSSCnUbrBtHFcSXnRnfhbHVYjWFhPdeYD7kgk="; }) - (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-X2xWlIbN2GCuHyZtENOWtiI2oyh9YsCbNy4zyHVgDEw="; }) - (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-oJFf9OyPR075rnWA3OTkL9yXh+F97l7fA+EoxAK9TCs="; }) - (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-cM7z2SJoZ0vUVZaAFzZsr6LLFT1aB/FgaFEnPmjaQmU="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.33"; hash = "sha256-EuMc9QvSFCK00E6Ic4ggCTBfElaoTMTpdho1qA9Dcw0="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.35"; hash = "sha256-6mY2uBhvKCpEFJLYX9+f1mpYrWdN69i+14DPjO4U8eo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.35"; hash = "sha256-cBcfv7tnZa2xO5T5VOx3/7EvJ5u4/C4dFnV1Jj6VFPU="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.35"; hash = "sha256-IGArFhlq3UzZY93lJ+WrB+zmuu/2o8lVwT7MJKpz6DE="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-L1rUVh+A+U0kgoPe5dtsPiigrAwHYkMaHeI5deU/VCw="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-cOGw/YSJucZXdEki9rDo7XAWibi/9xbC1dfE13g+dNw="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-oZujYDpYlBKGKd6W72VJklXnywJmTAJAUbgD90u7wC0="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-9OvPAvtnIEx/opAkBBmqMGcRfjfCP3WVgJSydZNT2Rw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.35"; hash = "sha256-uOoIWrQ6cAUFTtAaaI8VMzk43m+eA6jijUQUU7e/87I="; }) ]; osx-x64 = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.33"; hash = "sha256-53MAV3RO1kXzy5IpdZDZIOhoUzFqWHn7+A3aWwdTONQ="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.33"; hash = "sha256-tu72AwDH1+oAIXjOJcNbeyKm1s4pncYp0avbMSBrcJQ="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.33"; hash = "sha256-smh6SiTtCAuFglqWrXiGGsoIDP9dhGuIKdYjmw+xCyY="; }) - (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-XHypFT3BZS7yjYD4qrktW+KB/Vg9WO3GlVpQiZkbOiU="; }) - (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-9l9tYg70D7bIGmANOnoVPiehm0R2FOKSryevw9ZSf/E="; }) - (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-wP3mcAnXnfMMz4eW1NX9GtZx1V29+OFCdlsXBDhznks="; }) - (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-n3vRppIStWqCc+lf5vegOoEnWQo39/lmS2s+iBqQZ3o="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.33"; hash = "sha256-DI2FvmRB+YAKqE+TFSQAnFPzvZf20gJl1kF1LdCD7WM="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.35"; hash = "sha256-ljEkMgkgfEeqzRnmTubjSK2dzkph0cSQ7+2J986F7HI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.35"; hash = "sha256-05wMp5+etiV/vgktqGo8+4XB7FNYxwCUKpJsW48tgvQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.35"; hash = "sha256-EtFBg8yBNhAEQlL97oVGiu05rPMSKLd0wE44zTBT7FI="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-v9FM/PSYQ0a6Mhp/xU0kTzqz6G1JEvFDgcvcOgoMg4c="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-UalwiTf1Wqbxi8duMS1L9S/P1xFAD4qkd1YnJjkWWMA="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-TKywsrAlBP3OIY6rieeO4wGuGvKIoeNx+rhRz3Qn+tw="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-nBjl1AgKzjNgAy9ebqwuMW++3agzj21DQRGOE6i4s6w="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.35"; hash = "sha256-Cal1R6Vv7iuN45fuIOx85LlRk0tdB0YmhVtoKmkmWCQ="; }) ]; win-arm64 = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.33"; hash = "sha256-I2cXLq282Y4Hqwwb4j4UIpZKzwdbzGV42LTzTSQdemY="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.33"; hash = "sha256-wP+GUxx6dtOt5ZExByyvU5zRuznGye5LPisgS6/7Bm0="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.33"; hash = "sha256-lIklP4WcYw09ZfEWj67YQYAkMM6G0na9G3Q8SRg0K/Q="; }) - (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-d4YXZ4+nnv/98fIBjd4VRKISbdFQSccwCENFPmg3JRg="; }) - (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-T07ezC0o0V648IoVvrguWMxHyowEGp/ZsuixGbpazes="; }) - (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-PwhD8MxNS+YB7+bS/TqMXXCmqMWY8rt4ZrqmtsnX7AI="; }) - (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-ay71j8SXGK3rLyja/ggA/5P8UJpxB91DOkuIeLEDMlE="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.35"; hash = "sha256-cDfyVD5ium1TUmjAEwmSIPZVOodXsE76lSi5l6fRiZI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.35"; hash = "sha256-/bEn2roiWJVqTJvBFIAdNDLVHaP6HVWRkJYFKQ1BwnQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.35"; hash = "sha256-yzO+2ZY1c2Qa5zYlGWcPw62lorqvmC9w3kqMemuDdIs="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-HBi4LxSX6yEC/L8b2SIOXxNLeUAJz2XJ8m0gSvg8JEs="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-P0bPG2kQtwoaSZRrWvWbHvVtKQ0bbaYBIL6y6R4AzCw="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-8KpLHzAuQtxX9ZvAah9tIZffgr3UdA1ioVjQhTGGoF8="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-4gcr5XiY62fdxU1PgF8URrhmRF38IwqTnCb4w211me8="; }) ]; win-x64 = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.33"; hash = "sha256-UjItoakBkTBGTMQU5TC9xFbt4imiLnwotTx510VcMYA="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.33"; hash = "sha256-XcJRWTFQsBWTqwwQlo2I7NUsxcTTyLjNJqgQJDEyj2U="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.33"; hash = "sha256-S2+8yeI0ahzgbpStXF8fQ06oaqkZ1AKHt+bCBnml+wY="; }) - (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-uZLgWv4QJCpPz8hIU/RCuTpdyyl58Bjk8/q84j6O7P4="; }) - (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-K6VhsUdZ9BCUG2cehfFTvceLCEqQUEuBOKtIHDO9i+M="; }) - (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-DFpoFsXJSeSoTjb0m/ZVAy70FnsWjddFH0JuipZ2zts="; }) - (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-ktOtUmKwRSgzKBctyvmrMOlYppR4xzN64UPWajq/3/o="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.33"; hash = "sha256-QQ12AvhNi3LzYilmNIrub4Kd4/vLaSxVLdJyDHDBxeo="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.35"; hash = "sha256-CbAFtObNlLAFckuxQ098QyRydKFer3Lx5GFqI384IHY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.35"; hash = "sha256-K48UCK5GmLu8XcwnhcnU/vGRp3Myg99zA1qjLmYf++0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.35"; hash = "sha256-TF0WcItnVgxmveY+HuQuPkJcTN0Ow2ek2vLNrYnM1wI="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-zQTo+xPX8ybQNELE+urZr4gpkk7DVmWioAh95yrTMaQ="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-9gM7UTQezIFzY12Q2hCnHfTyyP08LokuEpQM92axC3Q="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-4MuvhqMTP7CjUU5t5FuR31tDr36XGe4vO1Qa9T6OCb0="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-Xx5O61O33NGDkh5+RYwBtHKuiWr40Y7T01dwCSAzd+M="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.35"; hash = "sha256-1Lj+5osDgRccxe8LD7cFnOQLSznv7QqspICltvG5Jag="; }) ]; win-x86 = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.33"; hash = "sha256-7/7MpglFhvZJb8AaNA4zDQm/pgRPbLEUkAOnDOqhz5E="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.33"; hash = "sha256-OybB5ATvnnPEsKAdn5a/UdjSPcT78wlf38YNmuRWBZg="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.33"; hash = "sha256-jso4iQqVeEXZNeofbxuHS+wva9pG/1mFPYzIpYx/iPo="; }) - (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-raZK4I1xpCglN63I/jSRLfY4EkUdhqnaOzRPjD9BLgI="; }) - (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-QzMZjkDauMOrs1ZbN/dOCQlUpgMrGsTCNAzT3evupW0="; }) - (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-Tx5FSn8m15qjJ0Q0JcrnRhujGgV7WTr0btNviHMKe1I="; }) - (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-I/jbwabthRKpT7olXuTgaIRTATapDS4WgbUgA77Hijw="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.33"; hash = "sha256-24iKtiEYCAQLmRxRUfLBgwoq4Qmho+Jz5VvXr65StbU="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.35"; hash = "sha256-54J48BHMX4YBZYBlSh8servhI9IVHs1rsf5gJVr2SPg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.35"; hash = "sha256-ckJ2xR4qf8OQdk/KhCjVmV91lX8pj19qjlsJ+i5bkMI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.35"; hash = "sha256-yKl+zDJ8afJUSJbaoXvgEWDGsedDFR0xL7ov+ww8MXk="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-8+ZO5pMigKiX5bVQSthNZGm+HV3MCiDOZZ/RvyFZ6hw="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-LQ5JsLnwzLDBWi0vEBAFD3tsLTqxn8pB21nyxctBXDg="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-CK5Ms6ByKq57M0zbzRclrooBpNW4CHq5Pr8D1I8jvQY="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-A3STk3RqaylVSY2mKRgcF+WHXXIKhobaOT/zNRo+wHs="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.35"; hash = "sha256-Z3OPxtSzMp5QpQKPg7/PSPMSKbx1XNK3rOGvMulLCq4="; }) ]; }; in rec { - release_6_0 = "6.0.33"; + release_6_0 = "6.0.35"; aspnetcore_6_0 = buildAspNetCore { - version = "6.0.33"; + version = "6.0.35"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/4ac9397f-3f4a-4cd0-aba2-35e7f1b47396/9823f50c32028899f430bc3ae87251b1/aspnetcore-runtime-6.0.33-linux-arm.tar.gz"; - hash = "sha512-f6jM4xyaoMg9/RZ7ehFsi0o00hsRVO/HgbwqOMFNNQ54tbnub7jjgU5k3sbJLg8r9cXMmvkMc+o4zLZlQGBBdg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/44b0aa96-3ad1-4406-946f-680e9a52897b/8a6b84db7a63924f98b4197ce07313be/aspnetcore-runtime-6.0.35-linux-arm.tar.gz"; + hash = "sha512-LRUjAbm/xfnO2rxsmJAYdXXpDCNivscJ+73opCPab1M6z3ePNNVf4XSQbq7y3AnaVwtanSXdeopUy+TnP3RfQw=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/0c5a5f3a-881e-4ceb-a334-c5e3b210eef8/9834ffebacea659cd14d272fb01f81c4/aspnetcore-runtime-6.0.33-linux-arm64.tar.gz"; - hash = "sha512-emCnejBgcKO5TbGs+nOTi2iAzQeb2sPlyrF0pHr0Z7kgjp9B2OEuCAgx1SgVHNqltmC+papv5TfsFEVDwP/9lQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/5b5b9407-22c3-4ea4-aefe-c958ea78e7d1/1abb142a2ff944d822d133af369dbe21/aspnetcore-runtime-6.0.35-linux-arm64.tar.gz"; + hash = "sha512-yUn9G57+kjHkxuAG7zxKWu3B1M5kypvBzVLxzpiE6iODe0nx5qerS23wxvYKMlc+Ku/eThTyBYEtAEt7nr4Pdg=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/91f66f75-bd3e-48f1-acb9-99c0da753f96/42c47999ee4c4d108774536afe5da160/aspnetcore-runtime-6.0.33-linux-x64.tar.gz"; - hash = "sha512-ErNP4dCmef9j20vwAqKYgZTZ5k0OEH0SjCR4Id2Tmobs7Q/kU8BjjTdC2sOjLlM3ksJimUAPtP1VZrdRd+ZodQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/ccdb3628-8f55-411b-b0f1-669d42604ad8/81283ab8762aaab1be72772711f07f86/aspnetcore-runtime-6.0.35-linux-x64.tar.gz"; + hash = "sha512-2G2pODOKbZclBDbUk0Do8RTAW0ZRLKViqtym8+d0A9NkaNPzTtXy2TXAcPnhSu33KZ9aA9KWTb1ldrmi0+d26A=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/e9b663a7-2199-4111-b18e-5ec1f2f2f87e/1746ce0319914f58806f523c6f6ed24d/aspnetcore-runtime-6.0.33-linux-musl-arm.tar.gz"; - hash = "sha512-V0q861fybhX04s60g3Zh4ZLECJhoSIDgeLitTPyPUG4lpQ883HJ24XqVVuleK5LrxtQadKZWJEGA0nNBSFqc6w=="; + url = "https://download.visualstudio.microsoft.com/download/pr/5d62f7bf-a359-4213-9801-a6e625abcd5f/3d21aef16435231e8dba45d9d97b66f4/aspnetcore-runtime-6.0.35-linux-musl-arm.tar.gz"; + hash = "sha512-Rbo8KaqV5IEKcQkHvZPafD46CceXLXsZhXqkeuT9X60ZvawsXgN/mr0ZlqJ9Djms/8Mnjy53gkdBQAcPNV2Iig=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/a4b5cbf6-85d9-46a0-b698-aaf3cde78d34/e1d46fec4ac226e170ccbacbf111d911/aspnetcore-runtime-6.0.33-linux-musl-arm64.tar.gz"; - hash = "sha512-PaV7PeE02zjxcJRRjRZlM1ZJHPXWciKyw31yDsEAZE3suPs62NymRRNO+6e1e/Faol/oS5oScRqoDH3gxghhtA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/fd8b54ab-b3da-4bbc-8cad-e15955a61813/f8afd41bb9cf46a39da72177b56b3a29/aspnetcore-runtime-6.0.35-linux-musl-arm64.tar.gz"; + hash = "sha512-TpkmOTjp3h+lCPzfClnn9hojT4vWCklH0EPFrFvDEI60YlS8txSMoKA5H16c7nTbHqYX9XbX43ryK6EI6UM+Gg=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/94348e55-d279-4667-abf6-00a70cfa4773/67a06176a4ac8fbab11013cd728ed823/aspnetcore-runtime-6.0.33-linux-musl-x64.tar.gz"; - hash = "sha512-9aQ7C8HIMv1wzfpP4JhJYCdggxEzokEvX30llJbM0NxlmZunek6NSwanYUuFHUeX+S1cfFwcJvOWQrde3P8Twg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/69cd357d-c16c-4578-a109-8fbcdd5f0e30/9c6b46794e4c784fdec1990ffeffb021/aspnetcore-runtime-6.0.35-linux-musl-x64.tar.gz"; + hash = "sha512-UCEM7ZDRfqg3D7vK3j+/ub6SaQ+up31VFtyK3k7ug0CLLTf4EsygIAh0QdLzFGUHCGeSz/F/dBMwjrEvpKvWbQ=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/74fa4afa-a6d6-4c32-8ef7-fe88148f10cd/c887bff014d198532ba942988cba124b/aspnetcore-runtime-6.0.33-osx-arm64.tar.gz"; - hash = "sha512-JqLx1ss++d9barwW4CX8Lprto4a12lNCirrmfXb/AHvJIa7GDP+Wddu3KR23t1xae8qttU6MBN5ZMIsC3ekkzA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/ebda945e-7bb9-4079-b4f2-6a444bbc8d4c/1b7c0b929586db13610d8613329a9fba/aspnetcore-runtime-6.0.35-osx-arm64.tar.gz"; + hash = "sha512-VEhzIbRxDYIt1W31Bp1q/N0fmHZyd9yJ4bMDWrG61QKLRXk+m4+f9X4y1jMrW//ztobGUIbsR0OgJ2G0KVeTtA=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/d4641b35-5b85-4250-9913-0f6a2c276888/bd8483d09a767f6c19f9274da2819624/aspnetcore-runtime-6.0.33-osx-x64.tar.gz"; - hash = "sha512-+Nzz1t56NNf7QC/R3fVb2BDMy5WDHRIxK8dgfGx96KRiAMZtfnUyUBA5Yboul/pqhSBrSUQuGuqx4pDsabtVxQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/12e0840c-f541-4796-9b7d-7c4568f6af78/41fd0ea7532a0f0e26a6a8755103856e/aspnetcore-runtime-6.0.35-osx-x64.tar.gz"; + hash = "sha512-zIC6WajaQRI4noQs89svOqJjZUR1neTScPuwXHAOyR2gYrrTSYSYnFblwaecL/YMuDR+jmei8UqSqFm2pSVHxQ=="; }; }; }; runtime_6_0 = buildNetRuntime { - version = "6.0.33"; + version = "6.0.35"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/19a5a6e5-87bf-44b2-b7ed-ac44e9a253b8/00fca686dc0139022528dbe5f6e0f0b3/dotnet-runtime-6.0.33-linux-arm.tar.gz"; - hash = "sha512-wzSbHJi/jQt50NPeXBJ5L73UrvHAS20MEV1aplHP0uhkJSEXCzEtsMtvrNBXlYs4fGDrauW4KOIlAwDvvW8xlQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/2c52af07-c968-4edd-acb7-766d81766809/9de0174ec8abfc27498b763c0e1bd370/dotnet-runtime-6.0.35-linux-arm.tar.gz"; + hash = "sha512-X0HAD45gzirQe+91o+rYmGuZtwaoxLsssPqMrfovq9rjwXUBqpx39jSq0CooyMiGkjWQe68LnXI9ZQITlSzpJA=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/694cd8af-7e9f-4161-8c1d-1c9a7b1d074f/d3a8dc90d971ec4f135f6452c176dc93/dotnet-runtime-6.0.33-linux-arm64.tar.gz"; - hash = "sha512-xwDUrj42H6KjkKj88pSiJ3kxsOpgvUovDsK7mCu2xhi6AC5ZVcPuloByB7JW4QKJzxz6NyApt1iu+mvxJo1F+w=="; + url = "https://download.visualstudio.microsoft.com/download/pr/8f344652-6b7e-4136-b6ca-c1a46d998835/e00bad479ac747a8ddc90e7d006aaa52/dotnet-runtime-6.0.35-linux-arm64.tar.gz"; + hash = "sha512-lF4k+cLWd+Zf3aoGyv6NUY7lmc6YiDtg/Z1zQyD6Lz4cy/tG6ibukl4xn7VDDC4Y1kJp/a6WAwFpxLbT2BHqdw=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/250c78ac-a53f-4679-ad2a-cc31fa4c4001/204b39eb9634a8dd9f39cbcaf56030f2/dotnet-runtime-6.0.33-linux-x64.tar.gz"; - hash = "sha512-CJIBVUTYkDmZ+OD62ra0uR6xgOSV+l42wadVsdQuE0hYt72/1g0YgGUNnFKNB+MbnM/HPmUOXYkKlVkCqJE5zw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/79e3d66e-14b8-4c20-9816-37c0c0964c8c/98ed84be388dfa1a7db279e9beefbee8/dotnet-runtime-6.0.35-linux-x64.tar.gz"; + hash = "sha512-2NENYA+2ZDNpSVdvjsBTTb/9Vz91S550HyCBIiH6/KxfUJp+GrROnmP8Mae128sZ5OwZMP/SkxIhLcdFSXcJDg=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/e311cc4b-e2a4-46ef-8f0f-5996ac64e6d2/0a423f3d95284288d08250ce9e34ba06/dotnet-runtime-6.0.33-linux-musl-arm.tar.gz"; - hash = "sha512-qVlKSJ+GNK8B58YKyrX37grFRLmM5z7mcTWb7Nb2sp9NnmTf4xZoIsBQYVdzHsRPptsCqL4bF6J5r2GmZ5z9OA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/4355d376-a0b5-4b33-8a80-3171b45100bb/d8ee2b66411370f06b55daaaa8bbac4f/dotnet-runtime-6.0.35-linux-musl-arm.tar.gz"; + hash = "sha512-ya+XXOzd9F2FX8DnU1dkokso1kr0OmasJb/9a+lpmn5dsg9WrN7emeluRun2ITXlGvE25yJVnQx3++uH0m3qxg=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/6c147b46-cd90-4412-9df3-ca84fe040261/d026454e65fe16a83590bd75f139fbf4/dotnet-runtime-6.0.33-linux-musl-arm64.tar.gz"; - hash = "sha512-5XB5cLKoUrgLH9d6OIPlDeySXZHriQEsFm5KRekXBkwkBApuREsFR2cDPLm56DFLa1EX/62m0kirf5DI5A/lVQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/b737d8bf-ec51-490b-a86d-fd6309965ed4/c2631e668020a1114fd5aa54adabb19f/dotnet-runtime-6.0.35-linux-musl-arm64.tar.gz"; + hash = "sha512-wBNlsOXMct/HvzwdUS7cdNDvlZy3phN9Z+ntnYom2HRCWOowBd8AmELLr0aETJE2JuPcuhWDARis2V4U08LmcA=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/28d86acf-06f5-4bff-919b-28a26264591b/452ad01a142981b4ee4fd55b97117cf7/dotnet-runtime-6.0.33-linux-musl-x64.tar.gz"; - hash = "sha512-O/5Pnd4Cva812wcnHPVoc7UIwyKTGLvn1Hju2FVBftOUHZ2ajt4v0cxc5fe3PE5a5GZtLMR/4q4J1fhiXEbpgg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/30443c06-a028-4ccc-88b0-8a98691ec823/d0ee93efc931577aa00eabf7cfea98ad/dotnet-runtime-6.0.35-linux-musl-x64.tar.gz"; + hash = "sha512-sqP6JlbLJVI12IbadHU8eMPW1Sti4Q1pBTucCLZiZYZ9bzabSm4TOr/yHSspEnIudXQ44unbrRC522pVVFzUFQ=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/aad5df88-c193-4579-b847-633186659a2f/1688cb1838ae0f0b67d16f3ed808f566/dotnet-runtime-6.0.33-osx-arm64.tar.gz"; - hash = "sha512-ldDmRvaI5vRlRWJd+uRtgyXHruRmHT8OWQRKzO2cYZL/UVJDVWluj4aOvREumgNtAclR9ySdhjwwDQfBoJE9Gg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/079437b4-612a-4a5e-be11-decf9fd90666/1932ebb2603542a3b647d958c9412824/dotnet-runtime-6.0.35-osx-arm64.tar.gz"; + hash = "sha512-SIDLPGlnRFKDHBMOAqShKCZTTWBbEVnEMu060E5hjg2gdgN0hMPDS9jHORwXMF63a2lXzaFGAK755yvUfaW9Zg=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/82217487-71ef-43cb-8678-d293b802b5a6/cfe49dd7b7e0e3040d4fdc9258c61dde/dotnet-runtime-6.0.33-osx-x64.tar.gz"; - hash = "sha512-oK2B1Ls2HZHtx7QhQoKPtaxbdTduatATf38ou6XA0LaMZ69wi8hcFeu3qsX5jfIL2DpWFEob+axa6vXK+E5BKA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/55a4f552-2e06-4ecf-bb99-873cc072646f/0b2a5a90c60e8ceb862aa7f7160cf0e8/dotnet-runtime-6.0.35-osx-x64.tar.gz"; + hash = "sha512-czTb9uCb6tbvJwPd5p5qWo2b9D08otb8rzk/XE9K5arXyAPQxFR9AdbwgGD4Zm/PLB+9VDlXnVjZKHCGwNwfSg=="; }; }; }; sdk_6_0_4xx = buildNetSdk { - version = "6.0.425"; + version = "6.0.427"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/2ff9a08a-9a84-498d-83e2-82e3e3c3d03d/64b283f30bb7df0260c8a7596dfcdff4/dotnet-sdk-6.0.425-linux-arm.tar.gz"; - hash = "sha512-4Muzo4dP7HYCbVzhGs2uB6cg6wK1AMh4gqrrpI5uwpDWI3PlG1M2fsqqG9S9dw8soaquw6hJm90cEUiU2qpNrw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/7ba415c7-4750-44a2-9007-1bdcdee75c34/05c4467df0d7b5de0bc228a25e342ea4/dotnet-sdk-6.0.427-linux-arm.tar.gz"; + hash = "sha512-THZlTY0q6YxztN+GAC3wfFSaQRz3+hPxHoEVAbpH5e4EKC6sdab82s8686M/h/WrOowfLLTebSXgkTl5edDy6g=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/ec8e29f5-2fbe-47d8-b0c5-81f11434c00f/ba4bd30be448d649e5ddf1991bf76252/dotnet-sdk-6.0.425-linux-arm64.tar.gz"; - hash = "sha512-wV+VZk/QVw1bDLlMeva7pf6DBHAATw6VjknVN2RxTL+N3WILONSHtgon2/1GepVYVqqz35yVjN4XyUIHn9qlWg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/30d99992-ae6a-45b8-a8b3-560d2e587ea8/a35304fce1d8a6f5c76a2ccd8da9d431/dotnet-sdk-6.0.427-linux-arm64.tar.gz"; + hash = "sha512-kSmWG1Std9rCtN6XOHX3rNHo0oM2c6UZI3BmIODFt7jFsFfI05VTKtnaRrHctauP0HpPVSvVclbVoMIQcK1XcQ=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/f57cd7db-7781-4ee0-9285-010a6435ef4f/ebc5bb7e43d2a288a8efcc6401ce3f85/dotnet-sdk-6.0.425-linux-x64.tar.gz"; - hash = "sha512-oEt1r3xYUCOKjZmm9gs3dTRn22FYMbs4M8FK7Ib6otbum4ZDiFeYkkoB4orP9ErJ7TnIn3y+U8XLh1PIAuhQOQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/12ee34e8-640c-400e-a6dc-4892b442df92/81d40fc98a5bbbfbafa4cc1ab86d6288/dotnet-sdk-6.0.427-linux-x64.tar.gz"; + hash = "sha512-qc0eXMw8XYR6yi7yHdFF9hxrGMTnWjwvya7VksYGbVEbi2WMVMLNhRk4/lq6I4bl9vUQBfZAa0IBEMDsQIqEAQ=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/04bfd229-7d52-40dc-a5eb-d31fe15fbf44/639e3b8aa8616ad25515bfe36faeb2c0/dotnet-sdk-6.0.425-linux-musl-arm.tar.gz"; - hash = "sha512-xZ6g72yA+AkHrqIj3Hqa1pQxseZyNN7k/uD5EJ7nzovVivaxAq0ReIn04syO98zu+absgLEFeMbqS4RBLyseBg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/58a54963-a8a8-44fc-bfc2-c2e87e066656/7d0a5a831d123b801c55bd6993c9e69b/dotnet-sdk-6.0.427-linux-musl-arm.tar.gz"; + hash = "sha512-QpfEiPsM33LE+zutBXQTwXOgcGa/ZR/IxAdbhsIjFhLmlJR7fsvsDUPNaSG4PfIGulKNOHo23dbGcLOK/ZOV2Q=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/b5f55496-6494-45bc-9ba3-7aefdefb4518/61f15988a48d429bec81f5c5307f01d9/dotnet-sdk-6.0.425-linux-musl-arm64.tar.gz"; - hash = "sha512-1Yqs5bAh/HMKDaIjPoXjrkcyVqfekzS4kyzC4NBQVDwesbFtzTR193fN9Z5ClxyF0n3vSX/lzwamtgRs6NI+xA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/49bb77df-ebaf-4a77-b6d7-d178c3b1f97f/c87e3f996af3fddd9cb253f0f5720d1c/dotnet-sdk-6.0.427-linux-musl-arm64.tar.gz"; + hash = "sha512-Zw6MlJQ5qm11NI0vphAYxmIdghzrX4Rz/5uBvBsh3Ck9Cxb6gETG5XKarcBJEmVNGuCkqEr03KCJFXExHp1M8A=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/c94a92f9-153a-4620-844c-f964dcc7eb8e/ad7baee9c9ed782a5c9ad34509ff47a5/dotnet-sdk-6.0.425-linux-musl-x64.tar.gz"; - hash = "sha512-zZVyNYECuCFIdP81O76Casm6Dw0m1JST8xKoo7x8D6ui/IK9Xft0AonTJC3N94s0GZbThiNyPGkb5Gk3WnLfng=="; + url = "https://download.visualstudio.microsoft.com/download/pr/8db04a7e-0da2-4064-b17a-c36888961d8a/3919a6cc424dc0dfd581569d02f1db54/dotnet-sdk-6.0.427-linux-musl-x64.tar.gz"; + hash = "sha512-OOY7wulLXfuqX/zDHpbqr5iJqGrgOyu6cu1zQ015hX1WVmNFxlogx6XmL0RLjxOj7Wo+flaKPDTIN8/OzRymjw=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/24192716-57e3-4e69-9950-7840e05053d1/79398f054d34fb3e424c029e6d41a551/dotnet-sdk-6.0.425-osx-arm64.tar.gz"; - hash = "sha512-c4OxiMhQCrhiXNNPaffsWk2f9MpxX5XuAg8r0ILVAjaXsCHKSzseageC+uL/iVhuVB5FT+2s3xxJtC9uR9EgEQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/9354e51e-f557-4d99-8b0c-53bb03055201/8267bd56eb17a930408805fc986e8b98/dotnet-sdk-6.0.427-osx-arm64.tar.gz"; + hash = "sha512-itcxThu4FvtBmIQpMSIOnsjIiFtDWW7IkK88IXeJQQE1Ov66tj8rhwFiMExqKiDRpFzu9Bn3LZBNWYouTo2c6Q=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/ce410b9f-c7f6-4180-a373-bcb6528a0778/448c9df07432b5dc62d08868ccfef62a/dotnet-sdk-6.0.425-osx-x64.tar.gz"; - hash = "sha512-V1fGYdgkCGgKbkXvvKJgu52hRb2D+CdSgOm6dWooJ841x653yySOnubGz0ZzDG5QFSuYwKCCwN52T15SLftsog=="; + url = "https://download.visualstudio.microsoft.com/download/pr/fb30dfb9-b1d0-46a1-a59f-ae1037158de1/83d66d2d78b8ae231c3ded22f1832537/dotnet-sdk-6.0.427-osx-x64.tar.gz"; + hash = "sha512-HVZg3R7ObcaX5GeYGy9pxrM5q5PJdtSC76m0L2tcg/EsGS5bQg9zqajkb7vtk1+DZCF6pBC+3g8DKsmSstPqfA=="; }; }; inherit commonPackages hostPackages targetPackages; }; sdk_6_0_1xx = buildNetSdk { - version = "6.0.133"; + version = "6.0.135"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/af2b3ac2-cf96-4087-809b-60192e8564d0/952e49c2581e6c73d6229c2ce14e994d/dotnet-sdk-6.0.133-linux-arm.tar.gz"; - hash = "sha512-6Ua3XNGqu1M5mqv6RBCC2cwPMk2zcdlgeSvPWrZkRaFjAvEfkea6NMaZpr7WRe5PF87FXZtxGXJvABEADixuNw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/dfdf3287-c7bd-42be-9bbe-caeb66babde2/c611e2e9ea33fa8fd38f56fac2b185aa/dotnet-sdk-6.0.135-linux-arm.tar.gz"; + hash = "sha512-i5xwskkBYby1C9jOi/gis+ToVv62pVJXVSzBEaaBBb2HJkHBBIwTKAWEhJLoS8Ryc3zqZkcG/Mt5Duu//ASd3g=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/759c84b7-4d67-4eb4-94c6-0214d150db31/aea9ac1878560278c50174ee213d88c6/dotnet-sdk-6.0.133-linux-arm64.tar.gz"; - hash = "sha512-aCDWLO1tl3Dr02Z6ZKdOIklHHuWSDkzkEB8h5VlQ+NROvk/78gvGYmD9XR7cXlNKbwtwUi/EGl5I51sLsA5uoQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/26d70255-74d7-4d66-81e2-529690046f82/701bfc25c386baea4bfcc727c9790b81/dotnet-sdk-6.0.135-linux-arm64.tar.gz"; + hash = "sha512-aTnKlKkdaGKn8+shVeRXIMmetEHBzR8qIt7YNRxf6gmBwu9DOwVzwe0uQzdWRmZqmvLI4KUawabDA92R4YdnYQ=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/3fd189c1-072f-4193-8f1c-663b68b9b06f/bf63007e0f0ba0b3d07f1af06c1dee6a/dotnet-sdk-6.0.133-linux-x64.tar.gz"; - hash = "sha512-e0/gCVvG0+pD/Dsy8vwszI/sg7DFD/dLnpoBntQHIfRsYNezrAiEGl+J0IAtjDR7FKRFAyoA89moZhVYucdHlA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/69e35e96-d24c-45c9-a653-ea977a7e2a22/f31e9851ba9b2524740bf9d8b5a9af70/dotnet-sdk-6.0.135-linux-x64.tar.gz"; + hash = "sha512-+ZD6BjY4WjpOprDhzKpFYT/vRC02EAFSNvwkdIlfLCRGVZ8vuULJARcbuEfNgl/MV1+4LRIMxdHPF11cCuAc/w=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/b700d687-929e-4e81-be67-1f7f39cd01da/f9d75264cbf2786cae51edfd57c72208/dotnet-sdk-6.0.133-linux-musl-arm.tar.gz"; - hash = "sha512-xmabIp3sZGchla/XoY6qwwpROoanAAbqtXDtr4qWfoUpvtMQ9OkQdvxM7H8LULSya7Gp1hcJqvPqSH7dMuF2QA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/1bec17df-b72b-4c12-a2b6-c994a956fa68/11909df0d405b09250451b8392eaa953/dotnet-sdk-6.0.135-linux-musl-arm.tar.gz"; + hash = "sha512-efG9eL5bl3eyr9+J+SVy0ykVja4A+qVPTnquRxZBzOkNQx8DmpNQ2iWPz+MhjF62ovJnbzl25RqLp0KBy5q44A=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/f92a7e79-c792-48bb-8d07-4a6ee24b62d6/26bc7013753251407efd71eaf6ad8a3a/dotnet-sdk-6.0.133-linux-musl-arm64.tar.gz"; - hash = "sha512-Tkz5HhzprAV2OLKjI2N1KMiYZtqPiPbHD/yI1UtrcoF4GtF+Ys3wP19oRHrk7O5IsV+5fJCLyaVcOMdb8HXCTg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/350dc511-d24e-4435-a503-97cb85bc2e10/9adae96f67f61a23a47a73165a55117a/dotnet-sdk-6.0.135-linux-musl-arm64.tar.gz"; + hash = "sha512-3Jw7lZ/WZCT7nDdVf/ZdsH7dXsgWvNBSTNYPioeQJa4bQOy3dXkto3etz8IjDl0g9y5olGQU8xi7M5AdXmKJaQ=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/31aa43a2-5537-4423-8994-564c25089f9e/872a4380086a5a174025e2835a2fe043/dotnet-sdk-6.0.133-linux-musl-x64.tar.gz"; - hash = "sha512-9Sur8vgIZ1NZN0aN925x7322UKWGEzMJoQtNigTKIFPN+OekJvb/NKPmc0N/c81RabGhw3a8CZNfyjSozyEjNw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/97d9a05f-760a-43a3-84c2-d401617a76b7/17811377c44145af03fab8023b8b1661/dotnet-sdk-6.0.135-linux-musl-x64.tar.gz"; + hash = "sha512-5g8kSywm1Aurm3r05RBcQtM3928dMzcQk9ssfsARi6Zl2VoJzZSl3jJPIspEWAayD+ELMGhEBjhzI60PoiKgVw=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/fee562a1-baa6-4e8f-a3dd-2c49eae8a891/564d31d1daea39179782c413f99c6160/dotnet-sdk-6.0.133-osx-arm64.tar.gz"; - hash = "sha512-wBkxUhZs775gp8vbSvfi3zZcnmegzg/1zBqgakbU/9bMzaO/AmpHEW8C5MUodf3XBKo4CBfbw+q2U9MPT1/+IA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/82ff3f30-674d-4b21-94c1-9dc86a365a35/49c84376a1478ce39a77447e1b0925fe/dotnet-sdk-6.0.135-osx-arm64.tar.gz"; + hash = "sha512-R2bOlU/MCbDAThs+GeVZ3JzdwFU8gPKhanf7UGoqthAEDu05DJFT8+6nYnG7W6/NaWyhvHry7JzZIE9G72acTQ=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/c8f09b91-04fe-4d0a-8d01-0556c53f2a5d/cbfe49b3182a2c4ebc7aecd22b6ac881/dotnet-sdk-6.0.133-osx-x64.tar.gz"; - hash = "sha512-4UJ4Ula3MavW972nmxQium65E19hUm1vaHvmcUYlNAPL7IXT7mb0nld+fylrMvlPpwXM8EgpKxwA+YHS70/VLg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/22a4f335-6027-4d0e-a3bf-8ae061a5c958/8c710aceee7279ed15e5acdcaff49589/dotnet-sdk-6.0.135-osx-x64.tar.gz"; + hash = "sha512-jyLm2pDs2qiwXu5EP+YIn+iWgto6xOjT7i7iyf5gorXxZap0TKEqCnG3HsoSXVPa/GSL6C0a7ErjOhRDzpZj+g=="; }; }; inherit commonPackages hostPackages targetPackages; diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/8.0.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/8.0.nix index 1d787aac0a..56c405200a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/8.0.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/8.0.nix @@ -4,361 +4,361 @@ let commonPackages = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.8"; hash = "sha256-5iWiiKBaB6V5x3GDvZ1DpyxDHFIsmewksoeIizz8Z7k="; }) - (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-2KBKkVUlpiO1bOY+Ia2PKjurY2taV7CHnzU7Jr5HYUs="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.8"; hash = "sha256-3x7ltOqJJXYO+zHIIvH1SDEz9fTrHqNoyK68teiHGZQ="; }) - (fetchNupkg { pname = "Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-ZGunPQaL6Kz97BpQY9lSOPEsy1CvZiTZeidqnG18anw="; }) - (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-x45oE7EFl6V29tVnuvzfcnAufOQjVf8FYxG8TSNz77k="; }) - (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-UHKTFAfqIxoBZ38I6wBdMNA6NyQ4FhSJcHNQZxjaCu4="; }) - (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-KmiA+uHHYOnsfdG3F20mu0XllcRxEvMvWkHz7vK39KQ="; }) - (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.8"; hash = "sha256-st7UdPx9AFKf9o6WewsmUKhbP2IG2KQjHRCTdP4Vj00="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.10"; hash = "sha256-qr83tlgz2OZRkz8f8uquUeZbQpB8WAGd5o+XYl36giY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-IKp5I4FIEGQ5+Xsjc48EG63eHAIraQWUcJcvf5vIeIE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.10"; hash = "sha256-DloETXESPFWqSvOdmAOFnKCq+veTqhdltiYj87Euhr4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-2co1p+5boK5rAuf9AET29KV+kTv9zhHc6PSoamkHZRA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-HFlAWYmT55k/Y+QxnueMGptQDgkuFdQtrmWL1lCVviE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-29PVFF5yeT0svgK2xWVG23xOrRSDCFJK+wVZGZHtY7c="; }) + (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; version = "8.0.10"; hash = "sha256-vSt23zRo8oVhOv91+Eo743yMB5ng+X7iKkr+NW4EfMc="; }) + (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.10"; hash = "sha256-QIiMkIBvrdaep+lvBn4YiB6h63FbSVi7UmDz32nLZ+E="; }) ]; hostPackages = { linux-arm = [ - (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "8.0.8"; hash = "sha256-VL9omnR1wz323jyU+UQWPuwKOv7UfkkiZ+8ja1JYDM8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "8.0.10"; hash = "sha256-PAHPeo+P+orHurd4JstFAFnC61j4uwq2eE4c1nQmh+w="; }) ]; linux-arm64 = [ - (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "8.0.8"; hash = "sha256-MaWj6kbZ4td5Yq1aMyK1nqUva7d5bDXSewRoqjF0jS0="; }) - (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-Dz8dkFRN//VvdLjWxe8+5o81adh/gqYyo5aHxtjzoqs="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "8.0.10"; hash = "sha256-ssF6ALeeAGnvYFd5kFTuJoxLwtV8lk5u6LlnXMbJ59U="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.10"; hash = "sha256-ufgpQqiZuvToDX8hMnZ7KSZPiVJKRuHzOo/uVtwWQpQ="; }) ]; linux-x64 = [ - (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "8.0.8"; hash = "sha256-MJmQmBHWgvsqO8XYLnqsyUTfQ72VeJ/3EHq6OHtZ+n8="; }) - (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-dmtcy7cqijoJAUCEJTNcvqaRneRMCn7WJkurjk2YpN8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "8.0.10"; hash = "sha256-EBtD7t30cZibJ4VDdZET1ASVU2yp9FYMDNUsgaJoLGw="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.10"; hash = "sha256-dUr7mwCg93f+Oc54hzUzxGxv8J5TR4dCVhsYBfLn6KY="; }) ]; linux-musl-arm = [ - (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "8.0.8"; hash = "sha256-liIF45Ljv47Wkl9xhN2IWH4vbFPCUkvF++i7ENsCB+o="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "8.0.10"; hash = "sha256-rtKhU2VHqLi7cHJVb6Miw0BJNcabrHNve4fjpsIQe5E="; }) ]; linux-musl-arm64 = [ - (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "8.0.8"; hash = "sha256-Y3KRiZ9i1IQoU/X70+c5hUkPsfSUJD8mrWecspUAEPw="; }) - (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-LACty1K+yIIJiTgArn6DpuMqKS+uhVBCgIG2e4W1XBI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "8.0.10"; hash = "sha256-1wIIAc/Bp4YnWSXxI9/1UT/Iz8mW/OQSgGKCEen7SD4="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.10"; hash = "sha256-DYMtF8/2qOg+XrfPSWJ1RB623Wn8Bjp3cuaqT5iQiZI="; }) ]; linux-musl-x64 = [ - (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "8.0.8"; hash = "sha256-deYqv/tadlpOOMof1/MoLu2fIjcfbQ4Y/auc97c0GIM="; }) - (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-a6q/Fq88tknCNUEMiGAdCNOMj8rUyWMa3LdasqMl06I="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "8.0.10"; hash = "sha256-zcfmtvbRzfrzM/fc7aPWHUhLGetn8u3G9LXTBNGy55I="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.10"; hash = "sha256-GIwrkh6iD0c+cLdcYhJJHAXhBhA7ZWXs4/MmWWnaHOY="; }) ]; osx-arm64 = [ - (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "8.0.8"; hash = "sha256-MeztjburvdAXPWL4eLVhvL2+K9qd3otNatH8QbJf3Mk="; }) - (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-Q7ZRUqGLN41EIbmTPQXiiLIJsLWwHHlTMCg7e9B38Fs="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "8.0.10"; hash = "sha256-okqfX5kWkn+fYSqx/lNhvxkGeTmgjlvrXMVDpuF+/y0="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.10"; hash = "sha256-5U/C3N47whMMmfBAD8hyM3ZBs2ZxFqaKhobXWLkRXgs="; }) ]; osx-x64 = [ - (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "8.0.8"; hash = "sha256-nb0PV2g3PjENKIFLnnUynIxa9GWjVRyprHRbrMAfHW4="; }) - (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-exBYb8kUySdkudyNrs5ArXa/wkkS2b6lhVpm4jZMnqQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "8.0.10"; hash = "sha256-8+LQHhzQvobpEOVLDC8ySv/qhzC1uf0jk6nj8ioMWnc="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.10"; hash = "sha256-NZVCCKfPG3LBGYVGTk23fvSqXk8AOq8J9f4caTvRulg="; }) ]; win-arm64 = [ - (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; version = "8.0.8"; hash = "sha256-b6WidfvMYv6zHy1nd4kGc5oCg5tTDxPlg8CESjurv5E="; }) - (fetchNupkg { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-4OtC6HUOpa6DSJPkA+/72wQHgGj3Kqh7iQyJtvvNtz8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; version = "8.0.10"; hash = "sha256-CZL295MOXANUs9tgO9Kul2m46zfr/EcrJWXep74w8PE="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.10"; hash = "sha256-yrvkrtY6qrs+2a6FghTL2uQgf6L2o3oh/WG9KWcwgog="; }) ]; win-x64 = [ - (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; version = "8.0.8"; hash = "sha256-bHuEFTwVzaQOEV1w/Jtfe8ZHMOtwHWsSqiiqoun+SkQ="; }) - (fetchNupkg { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-wTLpzd7iu6eCyOn6ct4ZzB2NQq7GzNUJEsh+zkgHbdU="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; version = "8.0.10"; hash = "sha256-ccqaKMg/PMKHZ2kjqOrM4wIh8V/R1cYyPnWYYa9jR+w="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.10"; hash = "sha256-HqFgB9cr0v3WstnK+wNjdVZerbQbfufzKA9NsHdIrWw="; }) ]; win-x86 = [ - (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; version = "8.0.8"; hash = "sha256-Q6mYxptkYaF0ThyJSX0uUVKK6R6x6Xkfi/40EqiDAQA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; version = "8.0.10"; hash = "sha256-jenosV/Wf8K2SiLsp4rzIu7/c2A3s+jydkmwCZ+jj44="; }) ]; }; targetPackages = { linux-arm = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "8.0.8"; hash = "sha256-H3XoUT5B3taEoJvUFhlTRZ5/LI8VVaFxd82QZejD+xE="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "8.0.8"; hash = "sha256-eYuDkv5aQvet7FzZOsZ5LZHnbNE4na74cmq3JsDaBNA="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "8.0.8"; hash = "sha256-UMSNfp7fmU9UTkCj6GFoqz4iLDpM1zh0WP9W7KBIMAM="; }) - (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-lSBjAXq7gADmOA7NaK9S+S+8Xx8oTsI6Mrp3fgA3eVM="; }) - (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-RZ3KnxLJocJS9mSAwP69XCe0kA/uCppUNSMp4soCkN0="; }) - (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-iW0U93hxohZrnGYB4us1XAaOBXMtMofMlN/FVdVjSS4="; }) - (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-X6iM6I4WpVbLCEDhwwUrih1801VKfFz3gAaYZuQMTxk="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "8.0.8"; hash = "sha256-wCNIvKB1pav/orE1e9Ljcb8NUiaIZ447KsyHtEI1uFM="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "8.0.10"; hash = "sha256-/s3SAZgRROQSOBYAAKgZwhj/FJXN3+RG5VPDbn663QA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "8.0.10"; hash = "sha256-aVWKeHvQ4zS5bXZAoUqjefBp4TYwxW6vap5XvklN7uc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "8.0.10"; hash = "sha256-Eg/hxnHtIiJ8Zcne4x4KI0xzpmxlK+1Xm2WtrZZXWjg="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-xfTjxK8Oojq87vappJZkQDWvt406M8LjqrWmzdb7SQQ="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-qNdDGfs2NBc22FcSI/jut1QPCaRn//vEZbl3+YieO2Q="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-juf2Zbtxh2JqAXB7GYa5HBJxcUrzXQrtK16ZfszEJ4A="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-SRtJaf4VwCLFM1NICesfSgrxYYYVEXK3bCse0QJ0yW8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "8.0.10"; hash = "sha256-X4vSzi9KUcNracYG7VtEGBuLfI0UBljMjypxqQBFFfw="; }) ]; linux-arm64 = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.8"; hash = "sha256-Yu/CZXF9OS9CtGV1ohPRRLHKpg3xZXmH+8aukhZjJO4="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.8"; hash = "sha256-hSj6/ogmBRNoC4VIqmkp7IsFcYf1IzVhHFsGU4BW/ug="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.8"; hash = "sha256-VXwu3zMEoxrLfABVIc2zIN22JsoUwCeuM7W++7lGeVc="; }) - (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-GRldzHE2XXJdR6qAdcxgLcXZM1gNoiGsfJg0M5qnlR4="; }) - (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-VACUGeR/lEFnS8O3kVBimN8U2sIr1/aU9hHyBA4cnKU="; }) - (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-C3891F6er32h/x4bjp7nMbHOWvaGhjaAVxPwGQtxwtc="; }) - (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-s57vIXMmdrTdlGmfqyemkSJP11MltQWemJnet92e+A8="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "8.0.8"; hash = "sha256-HDpL4+yMCXuy05nnJWKqZB2KkumluhvznAxAglZ2x5o="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.10"; hash = "sha256-uiplc7OczySA2Ni9Tnmi17FOYHp/U57qH0ou7Pc2OzI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.10"; hash = "sha256-VFIH/EWE2TW+akirg+IpaISG289PP0tl5Ur8+sGFj8I="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.10"; hash = "sha256-EhepWr2Mk/nPAtE+J++1MHQkbu5n9xewHwroSWlcr/Y="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-eLxtO3uYgCYryuidL2O2fG8egh+np0HTb3bJ/rKs14Q="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-oQ7p6X/5NVdVw7U4wbnNy4xK+dZNvPbXWFjA4UuPGzo="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-2l0Q+H02bzRG0NBStTaVOKLeZ4CNjWCj07cjkgOugIs="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-EmYjZ/h+hH0NLe4estuua0Yh33yoIMHNosVuyTNQDaY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "8.0.10"; hash = "sha256-yyTxpyvp6NWMODvZ0wVZRAWVzCgODFvBBnWrGawP7+8="; }) ]; linux-x64 = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.8"; hash = "sha256-/9Hsru4pLWKMb2LTF1erdHILGdEc/2NnuTIG+dcf1jY="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.8"; hash = "sha256-Leqb/Un4/GRgRcymCJWnPhjZCn8A2hl4nFdYJfkNdqs="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.8"; hash = "sha256-y5IbKOkqAKBpyWiA0PFmrtVXGXsWLHvX2FsiICm6egU="; }) - (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-Ls2+jcDC4FW9zO81O2JP6BtKeazhydWEiXBPg/GJsfw="; }) - (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-jJ7jGIYzDYqBZzJEG3BwS+NqUv7o7tRxUNgOTQ0oFSs="; }) - (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-SCj9QjWOJvv3TvlR0TpIyFZrebRFTkVFVPdQ82F08gQ="; }) - (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-LbvKpuOg1Rdqtabz1UvoADiNOkh+phBdXcD9iBGAAD0="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "8.0.8"; hash = "sha256-TwTvStZ7PMGpFh16lSI4iAJwDz/lnJkqHk/RQ0KEQB0="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.10"; hash = "sha256-8noK1Ws4w7JCCH5NGT9DYNqKUIE/89omwoJJaT31DvE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.10"; hash = "sha256-NUzt/9eU3UV1iw8hggRTDV1po5Xtq9ooEZ5inJ0TRp8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.10"; hash = "sha256-lYyvJWF0qVxM1u/rpXMpAuekwQX8+ATX4H0B1VYKPu8="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-Yp9WQ3kQzP5AFc+luQ3t+6x3nbpnSBmSeXaQUda2+jM="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-H6CfsMpTtenNySVdYFt27DJqM+89paFp6V7PK91XDqA="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-RUTadf5Nxvt0McVm/z29y3LQNGvakR0DGAXvQISk/F4="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-CSp3a8I3EbjXozgWQGl2nzn1o4TdbgZeQ6d5A/ipOVg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "8.0.10"; hash = "sha256-t0vB9HOaB5CLKvRST1QeKlpgEG6nvX+qRkEvAZffUFY="; }) ]; linux-musl-arm = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "8.0.8"; hash = "sha256-p2Xix0JrQlMxDbvuPmXXaikVLVdKo1OPdk5w5PKSp3A="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "8.0.8"; hash = "sha256-shWbs109a6xx0JyJH1hwjs0OR/KhemxYjjLJhrTzE7w="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "8.0.8"; hash = "sha256-cdjNG4XehuADgSuW0c/PKC+6VA0rdzisUKYJXMPhSvM="; }) - (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-kxAG5q8z/6d3jjYhIbEOLTa9sFUveg9AK9QWEYb+Osc="; }) - (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-M881jx3YlNWC51BZguFtvn9UfU6neFeRhSaq0zsMCFI="; }) - (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-BwC5R+ECo52tePjkq/B6OEQvS4hq8tlAfUOBi9UufSg="; }) - (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-E6clBJ6GdZd3d6XaGqlwcyJq9UN4a9t+ixdZi7Ro4Xw="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "8.0.10"; hash = "sha256-wDwLqu16ILj4q1eu+/tMZR3D0CuX7zeoPZe233hg7Vc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "8.0.10"; hash = "sha256-n3fx5GHZrP0PTb8UMusgZe1nHkrsi6Vk7iY+NqRJ4Ss="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "8.0.10"; hash = "sha256-l3yE6YMFKts1bBxbJUILpd2g4I75MWAgqeW2TMMgNzs="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-yxkx7C3R64TDYbsgVGPoM+8BFD8PS41/MHmOZiJJhwc="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-yqOvz/0ZgF6pWzg6gtiHGPfm3GKfMwAaqJGfd+K+0ng="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-EGK0d5m88xBScyeohJOsfNeiaK4Iis94TkqPHoBDOrI="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-iACw3MvgxtdoHeLF+sBPJVbRYDlFj/ixTeaNw5qXGR4="; }) ]; linux-musl-arm64 = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "8.0.8"; hash = "sha256-epjQsC2vTOpppEuMljG78vm/RWecUu/YJRAt+2ETd9s="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "8.0.8"; hash = "sha256-DHGL/dDpQ6LhathaNJxp3M3qQcCEG9oYisUQ6WMurMA="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "8.0.8"; hash = "sha256-6hx88DtgvvwRhyEFHS32AKvRwwHZyS44SxYRG4La+i0="; }) - (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-KdRDHgeE6ShPewlbreXJ+87JrPGdhO5CEGBzVOyn44M="; }) - (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-g7De3JFCkr1wtMguY1QJXAZD5CX855/xen6pCMCrkDE="; }) - (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-PdskfOr7EiC4VDvyAo5k5MjmKayexsyPNkJhaAhVXjg="; }) - (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-tSZ9tj81dWrHqrau0in1b/ZgbMyDs5P9Ea3sofhQ/ks="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "8.0.10"; hash = "sha256-trm/1LZPN4BDr1SvQmacTGVZDQLVKuVH0w7GJ84FQVg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "8.0.10"; hash = "sha256-e+o0ec/E4I4blmj1ltcovIXqK6GCEwV5CMblUZuD2/8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "8.0.10"; hash = "sha256-OhXUVHm0WABY9w9oTX6rCNI5iQhJcqzhwS7V2HIsWp4="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-IzTftfK+vS8ZBo//8XPxDMUbvNirBaQSz21q3jNAvag="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-XRTCbG+e85AGYcv8wDvL2NmrRwHUPb4xgjKWwmOhVyw="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-9kP2XFjP+som53HTV97vTEmqyZLN+KIVj+RzcaPKcI0="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-k3XtnZPIHDWE6bZX0IDVOJ3MMhBcd/y3Wq0Qkeqm7bU="; }) ]; linux-musl-x64 = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "8.0.8"; hash = "sha256-21RqIxjfaIOaABcqoe9AlZElWdXNd44dX0jodejOFNY="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "8.0.8"; hash = "sha256-nCSziE636/NGvg4J8HKI0CZ48SZZvwKu22QZa7Q/sAg="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "8.0.8"; hash = "sha256-3vnqKFPAhjoLP6h/MnVfhoWOr2/0XvnUyufafbYED8Q="; }) - (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-4zmkFZSBB46KjlubRHJ+DIBZs22CJLbIonT9hVsf57o="; }) - (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-JeCvY8S+YPlFMwNokIxIfOsMc+cPSxIRozAVT03+ZlU="; }) - (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-EXfxzK1Z7kqCDckq829GHat6EfYCKJ+9BrcBeHd1raA="; }) - (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-oDjnxygsxPsy1Mgnx59tpmqikAgN5H4o3IBzXup4zNo="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "8.0.8"; hash = "sha256-xxkmlp9i3x/4Ii+e4YYMPAA4iWdK2cwwj4030tp3o+U="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "8.0.10"; hash = "sha256-HUrye7hNJsLS36Vh/dDiQDn1oUtoNcTWwulersn2k/c="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "8.0.10"; hash = "sha256-Jqxj6tDq1DadZk4tMNQo8RpLNhmlFlN0kBFY9VRJmb0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "8.0.10"; hash = "sha256-JnHGicqJ2Na95KyJkX+UAM0uDmAhkqmVIhktMg49aWU="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-Itqy8JDjPpXH5U1wLl6gj80b65zI8tQYAe+AEzgxtZE="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-OSDH9d9EASV/kswQjlEIu6kaQlfRMpT91TPJDkPlb4Q="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-GdPlVPjzC0scVledxgs24kFZSHujYyq2UHDAzLgt/eE="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-I3jZdK86aqDnxz2xvcp8oGJurpmaPckuJR0TG3OxOOc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "8.0.10"; hash = "sha256-QQ+B9S/q35MsxikeP43OQ8J5mghq5f+xdPHaNdBMeCc="; }) ]; osx-arm64 = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.8"; hash = "sha256-ZB3eGK98abOZpcYmfWx0V3G/8AWr20gGyB/Ko5Zl91I="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.8"; hash = "sha256-L1IBy+DvMCZIbTzmlvSU2vsRrlZz7f29VS4H0+1/stw="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.8"; hash = "sha256-6G+7coU3SeYUTAjWl0iSYi28nGv5mzTnS8nkMMffGP0="; }) - (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-O59V6pzicz7KWwUy+5qB3nAwSxhRsM9HoCq2uInaaHY="; }) - (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-o3tSBAtHJGV5FbpreOQPF1VPb1ZoJI0unynfBUwvZ+E="; }) - (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-NI6EnCoVuFHZ6mH9ZMXb38GhmQUhfxwP+vPlO/MsVnI="; }) - (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-zvmCpjhY5JRezpwVr0S90rJfV0YGZ/wFJswo7Bl6tQQ="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "8.0.8"; hash = "sha256-D4qB2A3tJGN3nJcxMl/gBxA+LQx5QiawYWHn1Y3jWHs="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.10"; hash = "sha256-GL7OjLalZPKLsoheVJAmVStJFpJ7zTDJtikCP7fB3jU="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.10"; hash = "sha256-IZ59kjeU/mGHBVXtOO5AFK0ocxwFAkFqwtn99N+l0zw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.10"; hash = "sha256-0fH2KlzVL5ydblrVtBtAoHa5kNYY92Wzv8FCVqav3Mw="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-XTWvKlTEEi6lrBZcJawPrxj2bjmsWVFGphjCxpSIBLM="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-C+u78GUiX6VzkoOYuqiTy8DvHUsJzWR+apJu8ZU/tWI="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-DVxeH8nfflyG+pCdft8MfDfEBCD/7dXTwlOz0aGnH8A="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-p9KjfiNnhtqTCl2aQlYq/UmPsyqx2+mddTA8nbh2xnk="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "8.0.10"; hash = "sha256-d7Gb+lPHI7xmMwhsTQzWJBq42QUsSRRU9BWZxmdXKWo="; }) ]; osx-x64 = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.8"; hash = "sha256-emanxsPDi9tYicfkeLRVN4r+yZq06jG2RdoVpRG/lK0="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.8"; hash = "sha256-x7WOZWhE4NX6yc5MBlFO4EKHt4ExhnGx6lhmYrr8wfk="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.8"; hash = "sha256-SWEUTsvHkPP9S8iRW/PrneIZV7NRkz3IPiVmKZ95X6w="; }) - (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-bG/yxRP8uNHjCcZkSOlqSqgWIesuww8irvtSsC8jIfE="; }) - (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-0EJXF7Aa+7nEUOvqMCDLr5Gwa9OWu/Ol5kpCymTVkP8="; }) - (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-sdCf4IfySwQalViNicdX1NFN3obWCImm6I6Zzhu1pxs="; }) - (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-jHU0GS/mtOjKniVojxzKdk6VgQghNLRWi4G0/W+kflw="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "8.0.8"; hash = "sha256-hBmQqsJX4lPCEkwh0kuZl81KNkqR+4FZWwBKaGQPPPk="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.10"; hash = "sha256-u6/4q54irXtyKSSi1bH6HYrvcod7yfs5YdYD0NXeYbs="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.10"; hash = "sha256-B4aqUvMpyewAwquTRVh+bs2RG875ZsveYQU89+4VFxw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.10"; hash = "sha256-XKUQ0DDWWbZNtgGPKhdI7ufpd9Ki1EcOcK9ojiaWEVM="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-Gl5S9T53P3xZj5eRwPe26SnMlPboQHB4lxTw1nIB2Ac="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-vmGaHkqKQC4WA9Kl26ZpQv4H8YIJblk15RayYATG1JA="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-MFSnCAiE9A6EvhUQff4g/6Js/sxORln2lhW74NTeQ34="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-lYNFKHvU3RZVzwqkGzxPem5LHfijEFnO4OcGGn5BUMg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "8.0.10"; hash = "sha256-7RRH1rAdGFkdB/FNrQTDgBywr1tYc1Rezo8LXRSZ70A="; }) ]; win-arm64 = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "8.0.8"; hash = "sha256-kWp27hqFc4GlvnFiiPZlW8F6UEXmFRNAN5RkkNfM0D4="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.8"; hash = "sha256-lD/M7PhWXUSsS3FJ4doXNo+zFLIAnhqBmtfBkDvOX9U="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "8.0.8"; hash = "sha256-xJc8ynP8Yaq3fdBrd+1wSgF02dx6fKaO8Ty1JJvm87w="; }) - (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-/1nQT+3thlkAeQbfsIakuD+/oZsq9KeI0vCgCFubOO8="; }) - (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-2P9wZVY4iQmOxKttjrqb2fKQMWHzupFgVuwcE4egAOU="; }) - (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-ZTK07ZSjid/flmTDgrp/GH37rmYpOYdXTKzJnEeIx3k="; }) - (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-Lzxot9nzljMCvyqLHiXOu6qC3rgB3iN6JG5t1QCAbko="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "8.0.10"; hash = "sha256-OdRFIExBixFh1xwOtEA94xedmHVGPXvPopF9Lbf3ec0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.10"; hash = "sha256-pmsaof0XFXZQmn+s5nijm820TSdQaFlH/EpGy4OqMhA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "8.0.10"; hash = "sha256-xbgfV4a1gtH6gzoXSe7njaDEvvx3L+zVfLhfF4705r8="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-1H/t2OQMWfypSe1g6jWITx3klMD+QgUAj5iApzL2vTY="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-HmWsVmYVtNxX4xbQ3Mbra2vo0kjvMGXEQ+zbcTAAmsY="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-rHlT/ZFXIVkgo1QgJh+h0OJ6gnizyuqAaBczb7Z1NOU="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-d+ILcAY9ZvXx2klfv6zxASRq76htI4k9eTO+Ctq6+DE="; }) ]; win-x64 = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.8"; hash = "sha256-NmsUnkmjpbxYa3jNjLa3+CbbSa1ipFvolk6fjJQ52co="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.8"; hash = "sha256-pkfKvNeb779TUp9jp19peJjCXK3NGpexaFjWwc3dSBo="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "8.0.8"; hash = "sha256-C0zUiMMAQ9nd1n7PDVoBhCShHzdGI67YFySTpeFH8uE="; }) - (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-ojXEKX1OwepAx61seCAPh27UATzGTsE6VenT061IOmU="; }) - (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-wMhsf3QncEUGSnFrGEck2Kyb8cPLPW8n7ZgKHwebdI4="; }) - (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-AGqQ6fZicft/cBquuHb9jOh10N8gr/sLfijYzwm9vcM="; }) - (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-hl5uj5iR2xXkefLQJ7DVU0NfThLatJUOqm9MGZUN9HM="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.8"; hash = "sha256-gS1Lu8UcYwlJL+N4Q86NnObCYOjsaG09+bHbjXr1Ro8="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.10"; hash = "sha256-MrEAlX9Ep1w6fnXM1H5PehDbVXj6HrSSBE8ka5+zr4w="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.10"; hash = "sha256-bLWBI3G4+TrV5cyaaKbuk0RSh7Q6lYI5msZd8QXi7so="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "8.0.10"; hash = "sha256-B6o1+6o3Cih7cmgo2ClwBkIYcDA7NGZ6JClaHRDJ/B8="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-TJtsPhmyiE6XAX6WmSASd7vcRQwREJYd76CKGzCt3c4="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-59D1z/LeAqw09/SsJegUQWQ702r5wsmp7O87iDZz788="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-OCDkL6JuPoxle/clIRlg8A2/COUIuzqeq7cSYzNWcmQ="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-ld/Tu7HAiAGZg6+RYMO4hpg3NKs3dX8XlSHPsLLygrs="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.10"; hash = "sha256-3nn0MR1m1P1usLy0JCtiCjon3w0xdl2MyEJaHbILmW0="; }) ]; win-x86 = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.8"; hash = "sha256-z5swa/BoIPh7oDb4WpAh5uvXZ46artGD/lnQm4e2cko="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.8"; hash = "sha256-fpqkDTGVOO85fWS+X5Yj//NRkVoRf/RxJZ974N4OKvI="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "8.0.8"; hash = "sha256-nZEdf9Y3TLgyLOzSpn5ryl4xAbIy1vMGnVqCcYr4G74="; }) - (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-NDGG0iZtxXLArTb3DEF1ELT3nHNTT5ogXqG00+70f9s="; }) - (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-QYpsPJMunG+1LY6iOhkqe3TWZeUnV2sFdCRGKByEJcg="; }) - (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-B0EIM5Jxi367oSvB1mHiHE3VpdoE02OF9FbFC1FlkLk="; }) - (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-y1V5P/emZwwzWoz0UtMC/OYQjK+nGe9vkrY4RE9HRVI="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.8"; hash = "sha256-vz7hG4LOgtZVpOMCCDrosxSiSUAIFmHWHxPe2kfIAWo="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.10"; hash = "sha256-O7gy7qe+EQsU/i9LVpNFjs2RjrLppQFatD+u9W8Wgo4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.10"; hash = "sha256-oA9gg0LDJrjGx69md9bWUfQy2ED3OVhhMMmAw26L2mg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "8.0.10"; hash = "sha256-02ueHHg0U7yEvkLV4gdxXg2XIDSJ0LBCt5gNcrsy3O4="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-M4LLVUaJpyHWzSqYsXMzB4OgxlzHf4Pp79XwNgnO6DQ="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-yRaUcqgJr+XHo70nWJUxX4yJwavaiN3pBKE+Ov8bFTs="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-ZJN/v/J1b/89BquCxWHZlnfbsQn8N3756HPQ3Z8Zv0g="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-4mNR0mls8jqyh4Lu+Wv/HykJOlwLlX0ceyR4arrnNe4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.10"; hash = "sha256-KUdzJDhpW9xj5xSH4zovpwZb7I3zcTKXa2PFRlBlOzs="; }) ]; }; in rec { - release_8_0 = "8.0.8"; + release_8_0 = "8.0.10"; aspnetcore_8_0 = buildAspNetCore { - version = "8.0.8"; + version = "8.0.10"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/26f16795-9928-4ddd-96f4-666e6e256715/bf797e4f997c965aeb0183b467fcf71a/aspnetcore-runtime-8.0.8-linux-arm.tar.gz"; - hash = "sha512-0P7t2Ru0AoBp2M/xcmGR6fCZIOdWQF3g0rv29DEWJ3zJPr4kg/QFuqSXK1T/6JsJy+FypjnmA5eucTjfXvSMTg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/50a67fd4-a5dd-42f1-a3ac-e008c3115dcc/816972da008ae5cee7612cad9b6808f0/aspnetcore-runtime-8.0.10-linux-arm.tar.gz"; + hash = "sha512-+ui2snCk3JIY35m7PMEPClLbntNjC6ggVkAhVNJ8I4925EVh+FNIzxpPfivR29kQ1BOKke9mq+VoXZlys9BQqg=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/f6fcf2c9-39ad-49c7-80b5-92306309e796/3cac9217f55528cb60c95702ba92d78b/aspnetcore-runtime-8.0.8-linux-arm64.tar.gz"; - hash = "sha512-w9ydcfygpI7algdMvO9MmiZcHE4Qy/84YU3XTXlEOunRzNEHFHZM0EEpH4HYPA7Rwwer+JJJq0tvWKXelS/P/Q=="; + url = "https://download.visualstudio.microsoft.com/download/pr/f93af34d-cde3-4231-a54f-119c328bd876/663b3c2dbf1ed2a3e08ac8e614060571/aspnetcore-runtime-8.0.10-linux-arm64.tar.gz"; + hash = "sha512-OkePkxDHSLdCfJHes7qD9MAlV6fXo9c4JSa23Dna09k4AiR1qyDwYPG07TZcexuVodCJzKUCpCMpjEE3m/+BEQ=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/648de803-0b0c-46bc-9601-42a94dae0b41/241fd17cee8d473a78675e30681979bb/aspnetcore-runtime-8.0.8-linux-x64.tar.gz"; - hash = "sha512-1sDMKqx5+6y/gbWX8oZ2NZn2YnjBfdtEjOC5PUmbrY+Id31CWFTmhgKUWrGK+KYfHuWdQx1VAwBhN/hhE/qosg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/6d143cf6-e215-428e-bcde-9fd50ea0e1be/99652e31b3e0161a3f1f933e0bedf223/aspnetcore-runtime-8.0.10-linux-x64.tar.gz"; + hash = "sha512-MyIfGZZMywbLp0Qg2sv+W/0Db3hHOHCTEZ+POR1XFuHFqOBXIfIzWYRAm0NCPXm1HsVx5R8M365tnSorLZhQWg=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/9255e487-cdf2-4690-9840-74712503e37d/40be3d122db1d1ffa53a9843321c3979/aspnetcore-runtime-8.0.8-linux-musl-arm.tar.gz"; - hash = "sha512-XZ9gnnLc/MFra7Y9Sef9R8Pi13kT2d4UhkQX+ypTSy99tWUw2xZazGNjNkHHBtD6upXbmFsJhEZ32MtBA5oMZw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/ccbec918-1f15-4f1e-ad7e-b4d1a679fa91/f8fc5b5f2fccf1fbdf164132da8fbda6/aspnetcore-runtime-8.0.10-linux-musl-arm.tar.gz"; + hash = "sha512-RbGzEQzSxmhMMSCnGdemLXpqwVR0EB5in0fOASq+HGWqZ7k/sKBRKLdGL+PwPtxcukD8eIAE+Iio47J8hh7sVg=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/95f358cf-86b5-4789-8ee8-063067081c8b/e50e603b2453d7dc65eeb26dd4cfb398/aspnetcore-runtime-8.0.8-linux-musl-arm64.tar.gz"; - hash = "sha512-YCjCkwbUlp7kBMRZ3KMTDx6WFNGVTo7UQAFAs1rYoeZqCos64CFV32vQRs2TCQdCIEh6HCYlw58IG9xsjtYgBQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/c150b15d-79f6-4343-8aad-7748ad4765de/0e0768e8874957a8b37415919d77a9e1/aspnetcore-runtime-8.0.10-linux-musl-arm64.tar.gz"; + hash = "sha512-xx6iRxYGYJa0i+XOi5/ToUT/hlg4L3sZPJw4jq20J5tkSyvHoCk8AaYQhDmdXonIlS+T3tkL6qxqAcNhxXqP4Q=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/7d2ac05d-2bef-4069-9513-bb2ef7fab48d/4f3d2d3fec003a65513dc1f70c126ab7/aspnetcore-runtime-8.0.8-linux-musl-x64.tar.gz"; - hash = "sha512-gi8uFxbcLSqkb/CPTS2bueqMgjMnhdCrpfTzPl62C9zYTomc0qE8qTAyImcQtfDKXHFZvtoXAn+E76KFJ4tXmA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/fd29b6fd-e351-4758-8c61-0d9c0a6813d9/8be59cf5b2537298eb59d44e472c6b4b/aspnetcore-runtime-8.0.10-linux-musl-x64.tar.gz"; + hash = "sha512-hK8Vb9YUX8aZxzhl6hKlmU5D54iUX+3NXIDZE2uUgq0NngvduTP19y/x3PuQ0G3C6Uoh0C7aELwQFfPkuGOdFA=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/a7080974-fac8-446c-ba20-313f6f323fbe/f907c126c9bcd394939a7cdf86b85f4b/aspnetcore-runtime-8.0.8-osx-arm64.tar.gz"; - hash = "sha512-oZbGKxTpE2NiBzgmoD524KFHAn8DZVUpQm5ZT35E643QNtrqgJl4dgRxccF5PH7c+lFGvVWgG1kdlAX7FkbrAA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/05bfc51d-d738-4796-ad78-6f16dadd2382/9a64a66f30708e38b6470a480ecc850c/aspnetcore-runtime-8.0.10-osx-arm64.tar.gz"; + hash = "sha512-K8kXmEOTIij7NVDNPu6IpkXFttaVpWFWQZXwtFg/wMkHFiVN3pJQIL3aA9DgGB8El1DAb4OYoht/0O9bjB/lhA=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/465bdf6e-407d-4512-a222-32dafb225ad8/c22004de330d10a06141dee0f42b5d12/aspnetcore-runtime-8.0.8-osx-x64.tar.gz"; - hash = "sha512-07qNz63c1tUP1DSRH+PrgwlmaTmooe3oANfaLdgU7714HRRJpCtx0ccdlZNGXp6XIFAl60MoCO+aO6DcvboOPg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/135424ff-12b7-4b4b-83e0-1d04b053ef5e/9274109d1ec702677474c148ad2af1ff/aspnetcore-runtime-8.0.10-osx-x64.tar.gz"; + hash = "sha512-euH0JLv/pSuB5duPHVkNZ8NKiGUOtXPQXJIiu7dP+J5v8FgbbOJnVY8Z/jQzRz1KhRO+9PXhiAzeA/GWBrDULQ=="; }; }; }; runtime_8_0 = buildNetRuntime { - version = "8.0.8"; + version = "8.0.10"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/5e427de4-981a-481e-9fec-fa77b02a7edb/0d156acae55ca1329b6b9a8de70f398f/dotnet-runtime-8.0.8-linux-arm.tar.gz"; - hash = "sha512-yHr1qq8y4YzNwpZRecZaq65eDp6Oogn2w2QnDOLkr//ql5yiLhQ95GdONqKxLGa1dViK4hnxZjaspxIUQCQCiA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/3f8dea7e-13bf-4931-b11e-77fcc6de7ca9/37531adc6a054037c064c47dae4e7f77/dotnet-runtime-8.0.10-linux-arm.tar.gz"; + hash = "sha512-8GuHh+T4b2FWmVkiiprn0Qu3ofqWcBDX88oAgMhQUTz1ZXwY1HIhHOFogP9er8bIRCpWSy+DUdd8XdJwITyYTA=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/ac04b123-0542-4e80-9216-93f51a6814b3/d110733c152d34ab4eedb435ccfdab4d/dotnet-runtime-8.0.8-linux-arm64.tar.gz"; - hash = "sha512-JG+35e21Hbk0Ica7dCD3o1hDC5iyJKcftw5xorzgvJH4U6qJEJ8hiLCrKFMqJFw9UrqsFjRj4BoCAZ3qN/058g=="; + url = "https://download.visualstudio.microsoft.com/download/pr/6c71a005-d902-4df5-8cbb-f1fd53cf14f7/658dd2a2a839c14173e3804befec6a7e/dotnet-runtime-8.0.10-linux-arm64.tar.gz"; + hash = "sha512-MVmf+8pxAkf04D/pmxCYsoeg7YIKlEtabtIjcmUcl9Z1McNKutvFLlno9wtPds0zEiHQCGhPP+79m+KQSnPjiA=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/68c87f8a-862c-4870-a792-9c89b3c8aa2d/2319ebfb46d3a903341966586e8b0898/dotnet-runtime-8.0.8-linux-x64.tar.gz"; - hash = "sha512-j1IgCYxWL6NJBBd0jrn0+coVUfcVVyi567GSQ1nGPBje3vZDvNiexntZy1sbnecoPuFW7zgf+xaAG1FtupsbDw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/ebc433c4-8f01-43c8-a1e2-bbe1291ba857/e073f3f679d7a4067a56e8f5d12fc0e5/dotnet-runtime-8.0.10-linux-x64.tar.gz"; + hash = "sha512-f7gTZ3cg0SXCM3/txhMbIw2vHB151ZEqHKa14Iv3gCtBLeMkjWRbZIOrI/P66DftAqDlIOMwIM/vLIiMVPR0rA=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/2f4507aa-972d-429c-9129-cfe95c1279eb/60dd9afc3f4786a568b01119c2280c63/dotnet-runtime-8.0.8-linux-musl-arm.tar.gz"; - hash = "sha512-im+SDZPX1VJ9won0clIeKmca+05mOqrP2CwyZYwuo56rQ6XJfT09e6WEA+v79suW/HP/W3zMGpRH0Tv0HuuAyQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/a254fc53-e78b-4039-91ca-38fb3e42535e/be0d765e74b082a5919248c97866c7cd/dotnet-runtime-8.0.10-linux-musl-arm.tar.gz"; + hash = "sha512-rsjIIFkaE9F9gKFogPpiKWHqOpgtXqMLJuqRXtjYYOlQCyrHruB6rMCj9QXqM6ZlA3CWo9vJ7ZX8zzNeS0udqw=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/8d78f160-0833-4db5-bd62-947f8bc2d571/25638f47211018a7bd8fd9d314763196/dotnet-runtime-8.0.8-linux-musl-arm64.tar.gz"; - hash = "sha512-JvNeHGB0p9maQOpI9sAtt49OLHQ8vHRGOglNoBThJuk3nQm05WgJrJgpsmtroKkBrcR638PF01qX6erVppMUiQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/aa047a4f-73b1-4a00-bb94-1fdf28bdf606/533876a5403795f02d8071d6fc9be4d6/dotnet-runtime-8.0.10-linux-musl-arm64.tar.gz"; + hash = "sha512-Huyv4nKgce14vJG0yQCrcOwQLJ+Cztz94nm9mSGn50DunogVOKAKbOQA2dwOvJMF6M1JYtskMec7aR4QUmlOwQ=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/d9c4e4e4-bb2d-4f1a-9ded-bff5e354bd5a/0c6dbc5f68bea36a65fdf80e6aa4d55f/dotnet-runtime-8.0.8-linux-musl-x64.tar.gz"; - hash = "sha512-yi/zIUVQZRMlP4Ds1ytcJNi9oo9EroPJiMOev6dec31VELy4S8J6FJ0uaZV2H4sSTXcBUirpu8rBf8MmZyF+tg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/abd532e1-6dae-443d-a35c-fdbd5053e239/1ab2cb2acddcbd435cb6970721f0f85a/dotnet-runtime-8.0.10-linux-musl-x64.tar.gz"; + hash = "sha512-LW7cwUudn++TrHL7MrF6Yxjyr1vdg8SzSzXFkdzUBtpNSJwaTVgIphusLuFLQLtrDo/+m0JJAbcP4tlp3v+ghw=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/e9ded115-7a30-4952-bb72-ff101583f20b/5a7628261b98d095d2c97ec3fe5267be/dotnet-runtime-8.0.8-osx-arm64.tar.gz"; - hash = "sha512-iLBt0FGBm9noziw0CyUW3A5Kd9Vl7/FF2OlXslUqZB4jWlzn6Ns2B0dYh7x2bxUw0B0Ofv2A0QzWUqKZlUOYtA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/5fcb418a-d290-4fd9-bba3-d0ebe56eab58/e20afef70b5f56e36daf054ee3e09d82/dotnet-runtime-8.0.10-osx-arm64.tar.gz"; + hash = "sha512-10aWjQSUf0qH0k+/RxMJoDd/mQoYd+km1uUbUCIQQ6snDABRf1eKpT1lPhiszDhvVVGp9KzTawIz+2Y8NTOtLg=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/0159972b-a4d6-4683-b32a-9da824d5689e/ffb0784119abf49015be375b5a016413/dotnet-runtime-8.0.8-osx-x64.tar.gz"; - hash = "sha512-gCmYbB+LvxsOjQkpdWFW/kHUbS326+GrHGb7zqKt1Hw1uTRXPGGYeXz2DSs3LNRj5wMmwKNbCSbatNXBV6NX8w=="; + url = "https://download.visualstudio.microsoft.com/download/pr/c71dbec0-22de-4f32-aa1f-8e7112fa380a/54b3ec6159d2f72c813d913afaebcf2f/dotnet-runtime-8.0.10-osx-x64.tar.gz"; + hash = "sha512-RKvEd79+tA4UHXFfiVw8WwkUgYVHNt3lNHqZcxkdy188P5bdk2DighSfHZejPXwIuTgAil7fO1xI47k9s1FxBw=="; }; }; }; sdk_8_0_4xx = buildNetSdk { - version = "8.0.401"; + version = "8.0.403"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/788ca4e7-c3ea-405d-9f82-2d362d4a08f6/d54b1aefd4048bcf4eebb24edfc6aeb9/dotnet-sdk-8.0.401-linux-arm.tar.gz"; - hash = "sha512-+5Co5S9d0p5ZU+RmLMnVfKqW3GqPb/bPrheUeqij9Ttf7xuzW4wFgV+hyvvccxefcpbOhGv1dp7hLJ2vW9J5QQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/382e3bc7-f055-48b9-965b-89b070c15713/54b2af6b1ef970f852c29a850661728b/dotnet-sdk-8.0.403-linux-arm.tar.gz"; + hash = "sha512-3cwikxZHW6c8xGUY6iY6l71X+nhGpP5277kPh0MR6Kf1cYrG3LhhaDW0Mhr0bw4CZa5IsQblrcm6gszojoBKSw=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/14742499-fc32-461e-bdb8-67b147763eee/c14113944f734526153f1aaac38ddfca/dotnet-sdk-8.0.401-linux-arm64.tar.gz"; - hash = "sha512-6HOLITUdAwqDvmRFcfNnTI3anm+9NgsiGQenEI+rAr7NGOEzGQdTWhKU2MTQ9ghRlnTCfHfcLCgDzFPM4+EODQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/853490db-6fd3-4c17-ad8e-9dbb61261252/3d36d7d5b861bbb219aa1a66af6e6fd2/dotnet-sdk-8.0.403-linux-arm64.tar.gz"; + hash = "sha512-9C4bqaiX+RyNc0sJqb/IJCjwYpt83ZN1JiFY2fKCeXwZlVjDeufzaUflfYrcYa+UkFlcTmu9BSF/1tBRM93tTQ=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/db901b0a-3144-4d07-b8ab-6e7a43e7a791/4d9d1b39b879ad969c6c0ceb6d052381/dotnet-sdk-8.0.401-linux-x64.tar.gz"; - hash = "sha512-TSGA6CyWMxiGNHbPYcA1vT2CFl57cHUbojEiW1V13yTTDAeJ1XSMOjeeHmiWtX5ZKGIYys1ED/sAdck1UJT9jA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/ca6cd525-677e-4d3a-b66c-11348a6f920a/ec395f498f89d0ca4d67d903892af82d/dotnet-sdk-8.0.403-linux-x64.tar.gz"; + hash = "sha512-eqA2eCKLF09RxFNfGDSM33pdNeJDsfjLKKSjDkAuR1Z9Bt9jyPbaS9w8fomPVPSswI2ZUr+knT8iDQNTJTrD6Q=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/f9eed98d-5e19-4822-85d6-c59c62376bad/52ba188eabe759516711f14247c57f7a/dotnet-sdk-8.0.401-linux-musl-arm.tar.gz"; - hash = "sha512-xcVH6zAdyWXu8dm8xkIxZ44glZG4AZengknTXRZVpUafOc5t5lQ2N19uQtItFZw9xIe+F/bb52NAQAlfyYjbIQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/8c87dbf9-f000-41f4-bb78-3aea9eceb73c/d75a2445ca5e49bb07243f047c602013/dotnet-sdk-8.0.403-linux-musl-arm.tar.gz"; + hash = "sha512-a8XsagruodiwAq8e32PaD9yj1U0s605RqQ6lOpp1hWHRYeT6EKw+68Vku9QAwblN8uBMJrrgHZm7wQnk7uMjZQ=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/8f3dec03-a016-4c06-a4b0-04efcffbe521/e0e94170cbed0aa9312be63e43a69932/dotnet-sdk-8.0.401-linux-musl-arm64.tar.gz"; - hash = "sha512-L6q5PdOKSThgMgg6D0o6WlZh1uz/SpjwaO16oHsgEjOAT6Dl76SRG27r7cmZTVnE1dhD3rdz5+JieyqpfmNKgg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/18e32a84-60ec-4d82-8ab1-84511be4172b/4a1e6bdd4f15e0d55e0d9bb20c67631e/dotnet-sdk-8.0.403-linux-musl-arm64.tar.gz"; + hash = "sha512-u2POAascZLhr2U2QwQ5WhocnYnWlz5FvaE/l8TFyN0UhZjnjfTzPK3kj9VjxkN04SP9iH7yOnspbSVG1t1uhEA=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/3ce68ecc-a007-4d15-9196-79ced76a154a/6a45f69bb5c24576abeea048cea09987/dotnet-sdk-8.0.401-linux-musl-x64.tar.gz"; - hash = "sha512-5xG3SDImlGPif5iwScRC02hM3CExFRMyhaKxie9FZLZRJ3R83TqQDeU1gQGb349HQm8s/Jv8HAw6gxBvm7VOpQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/662d63c4-fb9e-494f-96a6-e5d564dbb488/b39e35ac3115e6c8b0c1333d8327d7c8/dotnet-sdk-8.0.403-linux-musl-x64.tar.gz"; + hash = "sha512-kgNzMgsHaVRhgPUJn9ujNDg7RRAxIPxa34dlg5huw6VxToL81kdUed9BXzMtzk0KmJwF2uH00aUNAmW5Eh+NLw=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/29ef2c29-154a-4c44-9450-071ae664767a/4ce00627f3eaee13874b54f033a9a27a/dotnet-sdk-8.0.401-osx-arm64.tar.gz"; - hash = "sha512-oyMsBpO0HuaxjcPIsm2C3ZEWEyvXhx3JwKCsxeeZXzUudghp/pGgiChBfqe5H8J4Wa7qRJue+rwXwTaldzfJPg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/0f1c8c1a-a14d-451e-8a14-4088b0d29cf0/37d7a2637468a506214ce484985fe040/dotnet-sdk-8.0.403-osx-arm64.tar.gz"; + hash = "sha512-89r8w54THem///GQrswI2HqgYlpmJFr1XAGbXLZNFZPNq/ZSwZfOQVK718VM9ownNJnZaaNIheO33wiQv1yTNg=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/b266f183-c677-4f93-a729-abe0334401ea/ca0ce4f684c4cfea2d372223f9c67cbd/dotnet-sdk-8.0.401-osx-x64.tar.gz"; - hash = "sha512-Bjrq9OlJuW1QG3eHMnnwKGzeRvkhK1kYHG2yFjBAH9ajUuMlmEjO6OEn5M6shaJeC842aZovtvbiqRmXxvYerg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/8d0cf513-65cf-4691-a436-7363a5c10af7/ea63a46f9c1f901cec977f2c88538146/dotnet-sdk-8.0.403-osx-x64.tar.gz"; + hash = "sha512-Px9csJDUYaAmUF/8XR/ObxW6U1SzAiVMB37rl88jyDUDtFTi+BJfvdNkf00686GkNngNKihC1csJ0HarXkAURg=="; }; }; inherit commonPackages hostPackages targetPackages; }; sdk_8_0_3xx = buildNetSdk { - version = "8.0.304"; + version = "8.0.306"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/c73041ed-e684-4dc9-981a-2db502409dd7/0e24c20b4b1d0a728e20982de0b8790f/dotnet-sdk-8.0.304-linux-arm.tar.gz"; - hash = "sha512-MbSFdO52Ow1BggwfSWs+BVNsa2n9bnZBJEsc1l3MOy7V77SD17/MPC/O0v5OlGWJpY4kTdxaExyyZUgiAYwNLg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/4bbd0de3-6535-4f95-9b21-e0ca491bf9e3/9fb72861024e7ba9d6a35292cbc0e06c/dotnet-sdk-8.0.306-linux-arm.tar.gz"; + hash = "sha512-3fTLvDPhTqU0n9DRNy82uOMpIL7INiXa0YeH5xf2FNlKn9ntpC4LP75o/9vHnTQ/Nww0EsagvEdQqIw+XF3wpw=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/be9572a5-bcd5-46a0-b10d-0d00229ad57c/b80d3adb25c20fec467bd33f29f9a1be/dotnet-sdk-8.0.304-linux-arm64.tar.gz"; - hash = "sha512-bOk7ozCEi0BFtsY/lq0KkcR0Nhywogi9QSjUGP1toEaVVZrdY9+aCs8oOjLm54EyjTl5r5AOCyOCzwBsmYKAbQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/ef4ce459-c628-43c8-86af-353d9d7e7c44/804deed3b6ec5a3312867f62e6cda7f4/dotnet-sdk-8.0.306-linux-arm64.tar.gz"; + hash = "sha512-OlVLkjULbn09hu2SlJKV1GmWNZRhgkDJiBrbNvzK+4pRpZYahQVvMvC7V0O23c/YjnOTWeDKzGniAnfHR8K+Kw=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/52cedf32-8a92-4966-b184-18404ea1c5a4/cc399fff1b152b822776514ad247df50/dotnet-sdk-8.0.304-linux-x64.tar.gz"; - hash = "sha512-lxw0Q3kkDsS/qvHsppxmZ+WUzdDf3N5uiWLLekHWad/5HGROSO7TVz2EG3s+YM4C4MJ6fON7Zs3sJ780Vwh8Sg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/29fd0b9f-1b65-41ee-8d3b-9621c99ffa68/67a5a0c8846c41bfb5521c1df3915bd8/dotnet-sdk-8.0.306-linux-x64.tar.gz"; + hash = "sha512-tZZTUIp/G3/1Y8M9ItkufnHV/qLwHWAEKd8+8mL9rfEdEcwlH8s0lxWuhv4Os/jzUiPw+E1w3S/hw5o/CfbgIQ=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/21dcf586-94e5-44f2-8407-bd409d73f59a/ec99c395aae24f38dd5cf91c8dc06fd3/dotnet-sdk-8.0.304-linux-musl-arm.tar.gz"; - hash = "sha512-0tEHHGdGZKj+lvYaYgTFb54sZZjSoR406skWX/MNHNMxGeEOeUmamjVOxGHjBj5Ad3KzYvNkDmQRTNzSpO8Pag=="; + url = "https://download.visualstudio.microsoft.com/download/pr/45e213b3-e64a-4425-8022-12551182f8d7/7440e33fddc3b065de3ec91c25dc1169/dotnet-sdk-8.0.306-linux-musl-arm.tar.gz"; + hash = "sha512-JtkK+U9PC0AXRiHatloxTBxlgSNlDV5ypD/9rNxdHocYGo7OHNDuZwrmkLZRzWiUdW/RqzzxMxfeVddhkK+vEA=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/8083f186-347d-43ff-ac05-575f63a1c692/dfbfb3ee9943b880472ccb8e5517a881/dotnet-sdk-8.0.304-linux-musl-arm64.tar.gz"; - hash = "sha512-8mbyyMQFN32ExPGRegxKdJMJfMhTlA7hKQ7vyHdzMZNagAAqnGx8AxmP82YbyKui6TNBXYp3iUn/kB2ov9qNGg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/5ecf5f2d-d4a3-4e2d-a78e-9d0d02352473/b1167527b6911875ef8b4ae1734c6fd3/dotnet-sdk-8.0.306-linux-musl-arm64.tar.gz"; + hash = "sha512-Ce0bWlt6EDoFg1O+EHEhK16ZWI2fiEHWeRSsO/c1b3zWGn2qnU+JmMlBCARiVxe4Cgw2eygNxBubelwTJRnV9A=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/5cf9b56c-0da6-4229-9e30-44547aba8be6/20d2e5353050b04d3272aa5c4a1b689c/dotnet-sdk-8.0.304-linux-musl-x64.tar.gz"; - hash = "sha512-QdptR5cqfKZ268Bxhh+jxW8xH2PuCff+A8wJzvHkdx5O/nPF/GsCq4TwB8LnBE1+4WxliXH6hW1T8V9D5qYdmw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/5b32ef16-9c52-45e7-b713-afede9fad881/f15872dc2cc9df4d85b4b8d34f94d559/dotnet-sdk-8.0.306-linux-musl-x64.tar.gz"; + hash = "sha512-dWVzSibY7znXyOrylnYoyeDkyr3CJTkKhOKI4zXNLjZ67zxivkLybqP3cA+T12wFyulXyqjY96yOKsSl0SfT6Q=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/5ba638c9-0721-42c5-8bf8-9706c0f9c033/f8dbde51758bd9e734a9c932b60e12bc/dotnet-sdk-8.0.304-osx-arm64.tar.gz"; - hash = "sha512-aZOpULxb/w7+diuiViqIdh6TxhAk2TYzIJlQy7aK61/xify/6SR6HN67435zgTYSPH1O2hBQcIYIux/wQI7/TQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/5750e793-89c6-419a-9d06-cb4f85dc5884/de1bdcda0b0a5b42ce1e82e8011d97ac/dotnet-sdk-8.0.306-osx-arm64.tar.gz"; + hash = "sha512-MGq/ju8/FtiJlW8YQzsKcdnf7sw8Bj5ODTP9/jfU8tEQbCfMxElhqeLgWIOCwz0SGSuXNGIeqk7a5o561BWRpQ=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/8b5c27ce-6c82-4a06-8960-15ebd5434595/508572144872e190e7f00ba6583011d4/dotnet-sdk-8.0.304-osx-x64.tar.gz"; - hash = "sha512-UPAmVDbow9dWugCrf81gbLXUUte+3k2vl+TALMl9u6/AC3bzfsTwe77UvuZDpDOEndvTY60tkWqlll7nS6MX1g=="; + url = "https://download.visualstudio.microsoft.com/download/pr/c5d29ba1-2952-4da3-8eb0-9eb0aad0a857/8535d896d90cf0e02244a20ad895290e/dotnet-sdk-8.0.306-osx-x64.tar.gz"; + hash = "sha512-cq9N/PmNTi7bq0hd1zeRoXucJ+ya/YekCo8KsDXKcE0MxRScNLSeKZh1/K7DCaFy2rgTYLziewm1F94CJLyuAg=="; }; }; inherit commonPackages hostPackages targetPackages; }; sdk_8_0_1xx = buildNetSdk { - version = "8.0.108"; + version = "8.0.110"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/27228a4b-1ae9-4c1f-8a21-eecd21d6c7b8/c0500c9fac6db54f68c04956b828e8ea/dotnet-sdk-8.0.108-linux-arm.tar.gz"; - hash = "sha512-+vqFZLNLUktCCeEEfOfPEZCl1C57obE1JPXeYCsHXmMM3SKVZ/FOsvCubJaskQrp27T8TlKN+VjJ0xRxNB7tyg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/090357d3-4a98-4737-af12-95cd0f7c51d9/d3c813f556a47c6e302767b8ee1d2915/dotnet-sdk-8.0.110-linux-arm.tar.gz"; + hash = "sha512-QP5sEu4/Vim45hUFIGVPmVqg7pgxXeFiN0IDDhaLFiJyGtZA0m9Ev8EfIZO3r6D4vcu5U81Be0V254rLBTu3Yw=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/07df5bfc-98ae-4335-91c4-c95ec5f99a58/48a310e5d1bde3e77c53a51c99bdfc08/dotnet-sdk-8.0.108-linux-arm64.tar.gz"; - hash = "sha512-bMcj8rE50ZsuF9pZNmmNOIpbZGOLde94xAxAftPP096nRcKRbwPvyeZkefxV1gjrOokwVyfs2xyZmxg7WN4ljQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/22fdf62f-eb78-456c-9a82-75da635a2dfc/d47faae423b4f0666944beeee63cb6b3/dotnet-sdk-8.0.110-linux-arm64.tar.gz"; + hash = "sha512-KGylYOebHHidgPtvm2qtLhBdbjk5z2djlBJ+SB6bIAvJ2nLYe7gWK2sqT2JpSjbtZsofPY7eJhp5CrtnZTfRZA=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/95a365b4-ac3b-4300-ab6b-54cbc73220f4/4aabad928064af8761315ef34b08c24b/dotnet-sdk-8.0.108-linux-x64.tar.gz"; - hash = "sha512-Vmbd9vqbZd6rpNfF/MLi1W9jHE9fb7Kp9ZGa8GFqsrQgsSqCi+zC5LhiinasPa6CS1Wr3lxtWsWe4THX7Ornwg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/9d4db360-5016-4be5-9783-cbf515a7d011/17e0019da97f0f57548a2d7a53edcf28/dotnet-sdk-8.0.110-linux-x64.tar.gz"; + hash = "sha512-Pcckqt3tl7rmOZafixVgGWJlSvZWGhMv1lDsagOnRzoQYfj192BstLGksSfmzb+1k1S8AlvT8HtW4Khxa0tmrA=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/24ef2f24-ca8e-4c3d-8466-2311550147d4/acbf2877ab4b8a611a3b63a9b9853dfc/dotnet-sdk-8.0.108-linux-musl-arm.tar.gz"; - hash = "sha512-77MI2BrBAgli8U0D58qUGaKQGghGEg4HzZXGVAf+KYGiY2DC/+oUHYBYGqxtLDanN5x2wHsvs31O+4NpBfj/aA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/8991cc2c-60ba-4cf9-a687-1fc9c07f459b/12e0c566b39176c4c57f080c30754964/dotnet-sdk-8.0.110-linux-musl-arm.tar.gz"; + hash = "sha512-5YzynONaW3dGYQ8u3TVVZ1GTUBuZjafZ7FKHVcuz/cTSJJ2zOGRah4DUevRvFpw3wTybrWfgDIYNM0xGoBFAeg=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/63bf0f75-e962-46b3-b7c3-12aa20129d46/071514943265037c423e6f5e40df7ace/dotnet-sdk-8.0.108-linux-musl-arm64.tar.gz"; - hash = "sha512-5wCbo3OwQ8y0aVVycayK5RirnJtbNk6YQdi5cwW2A28zJA5nLnxIN5hhaiM0KXSNUDj9/TNjUrggYK/WRXRwRQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/a06e8e00-14bf-48c6-af18-799760b12228/8765ce8c3bf2e468a640084d3c12a702/dotnet-sdk-8.0.110-linux-musl-arm64.tar.gz"; + hash = "sha512-ejcF2layS9s3tRbkJd+UT6jPMqPV4lI5z6Sq2UpxbV8QkYMK1FJ0omEEq0q3cuDc2GeaaY2vW8NLJMtygtiG4A=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/cab77c39-2e16-4f29-a9cb-e490d7fff442/ee37bc88e34e082a64d834ed5041bcee/dotnet-sdk-8.0.108-linux-musl-x64.tar.gz"; - hash = "sha512-dEcVUB3jlG8GzTFvNcq8DjY+CvZRBEyXZwjA1I1OsNCUidkszrKDx1Gy7tDik86qq93Lq/fCXiHWWOv/ncMEqg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/47769d7e-7c66-4887-9041-caf21b3766f7/46218edc4901dc48740c6a154ae21b83/dotnet-sdk-8.0.110-linux-musl-x64.tar.gz"; + hash = "sha512-jjgxPlsWv8ATmiK6tkx4GPm2bbn/7U5q3sINyuhhjZ3CDGy+8rwks0QLZ5Vp4d3qRLB2YeQdRd4LoZbkUm9oGA=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/64a3d858-c2e3-48d1-8236-7c6702efc1f8/191bed6c7f89244eb998b0f186db57d7/dotnet-sdk-8.0.108-osx-arm64.tar.gz"; - hash = "sha512-g7ASdkdLS2K/CigvvhHSNTohkdkL7NQDs3PNbfyVJkRCqQcRetj2FXZbE5aSZ7iH0mqfJNvV+I2LVdqpRBLRPA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/8d926822-6970-434e-b77f-13db037f929c/73e8ebd5b9129e903e6833c8e755b1ed/dotnet-sdk-8.0.110-osx-arm64.tar.gz"; + hash = "sha512-bWTqXAA4FLD+9LW750yvnqUCZ32iLGdrLbAbuUBTokM+qaqTIGcUWAnF2YhTpsSoB0s/JK6Ld8g1lAJwiYv8zA=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/5ea78b09-65a7-4b08-ac65-bfae17afb322/7416ecc76a30ae4c77e71aade36e037f/dotnet-sdk-8.0.108-osx-x64.tar.gz"; - hash = "sha512-qA/uJ5q/61WKVUDKKpaaEbs9vq3ow52MR76KLWIu8cK+2yLIdFmK1B2/8rldWkMZe9n1X8kzq07eXty2p2z2yw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/3927a23c-34ce-48e5-804d-a83c9a4110f9/5e5642702e03e8572f2f772c2166d331/dotnet-sdk-8.0.110-osx-x64.tar.gz"; + hash = "sha512-xWuCfacAPfcAZiq9CPWvBr4iOHlL9O0kl41hLkW5fA2ieSv7RSOHGoCjI7stT3aJ3p0hbu8ptlEIeV3sIKdBgA=="; }; }; inherit commonPackages hostPackages targetPackages; diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/9.0.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/9.0.nix index f615911b77..e740d180f0 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/9.0.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/9.0.nix @@ -4,239 +4,239 @@ let commonPackages = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-IcIfs7kmYWeUW0xI23FCgzzdTx/TstTzY/En7HZ3IYE="; }) - (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-YtwuWl1DpYuKY97P2iJmm7ov5q05by3eFL4inl+Kwhc="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-aHywWxrhPfKRL5sZelbQiUZaMLRn+e4A3UXihjNBLoE="; }) - (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-KaSR5WA+aTDOR41PuvwsXZt/zHsOJOKxBEfSGxFO07o="; }) - (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-f9o3PGHsW2BNMN9noBsUFv0SRRUR2m+RHceJtjCzd60="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-dhl6zr9+TY8ty/bJjkm7bVbRwc6J+P8FqOiv1B3/+yc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-5NMC2RF2xmdc5tPbeDvkMtr24JeWfh1LzqU8+3o9nz8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-N3eNI7njwqYAwf6Y/MEliLinqCbR05lSelIWgFG/P1A="; }) + (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-KlBEQYRSy00ZH+bFkG0xPpwT7qOmm47bBgeblYtI5G4="; }) + (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-FJ+4ZPyU6LZLGr0c/zffRGH2lpNrclbaC3V8a8u9kro="; }) ]; hostPackages = { linux-arm = [ - (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-1P7Y8+FoxfaL3vTLPx5/LPYw2ZVhxC5sTSKbjHCPAuc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-Ye6nUVh6gkD68zVlUg5uXYob2WCfNb+NgI7ByGkPrsY="; }) ]; linux-arm64 = [ - (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-yT+zcwYGL1f8oMC7S9sdLjbLpaR5/zdrRtpozZ+w/YY="; }) - (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-U8rxugP2w8JS1I1cTMzN3XYjw9uVHZqPDDppdE9dtns="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-PnyYvI8pAmh1P9VWXX/Ckz4THQEbiwg/3wD7unDy/5E="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-leqqHeRkRMJCDX6P4mzjdc/E7X1GfvdN2iZ3QRAOjCA="; }) ]; linux-x64 = [ - (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-iRO1a77VwLcu4vWro3eHHcxh8nQlY/ik4+pT/2c3khA="; }) - (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-XIODRgELUOKfn5L5g40Mxzcf/qH7pCJoRRvZPW1eY38="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-tmEH/rvjBsmocEFt4iFnzILq+kJqEO9E6GHXqFTLmE4="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-v5lk9Y0Krg3P6umdHnB+3RORoovXRzUkKjmd0WWLtB8="; }) ]; linux-musl-arm = [ - (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-hqYfNrj8fhgSMkK+sEQTtZdidJeD2vvvDoMBtK8ZmYI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-Yv0eYUjFuGPEl+NNGboMQEsuuh72pg5adUHWA0lg+9w="; }) ]; linux-musl-arm64 = [ - (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-JMpiQJY23noyNK0KjkkyGmYJJLyTNiHhlZPKA6vSQB4="; }) - (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-XjcQWqUEadp9u90HZU45gt/ANzn7Z7yuV24SrMKY7tM="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-x1VIdkrzpg3GTVtHRlKPsPC062H3FZyu4ZZsaitTjLw="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-f7gxJhKCgdqoByaOCQUCJRfkzvvQn+EbaZJqXJTTLCU="; }) ]; linux-musl-x64 = [ - (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-Dbt1T/Y9AsuITCNDu7+9to+9Q8aUAGmEsemONyucNkg="; }) - (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-AlWrYGpqFSTj6UDEZ77kFq+KrN9SOO7fLu+R5hiICTM="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-qjvgKFhLLRDYEJZqJzzosj+G0/2rHVo9iltR6w5YvOI="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-9odWsDB2OiwJ1Rw0SfNREnSvYn1p3WSmomBFbWegwOw="; }) ]; osx-arm64 = [ - (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-ewDINCVRtePHQRceMn0xhUFNjEr08AsaS9WBvz3lcLs="; }) - (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-8CNaSv1PxoyQGSc7W64BlviEgBtggYzSjDh6vPl3YSI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-BVQtI6mHKz/uRk6jszpYesgKvnOmiTEQa5JwjFmhp4A="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-hioVbT84W4i7/Li0UIuebF34RHwkHRCdYyn7vxkMyk0="; }) ]; osx-x64 = [ - (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-DV1kc2BhDSHgmWE7lqUtM3u5YfXl/EKo3FU04LHzP5o="; }) - (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-58cO2fdzdLYkWC6q7dn5dXKpMj4WzE95tlnPqW0X+W0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-zqAivHOPdikSayzdg4lWEaB8yvbdRIbhwuYonx+cYoo="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-y+lKV0p7ybzXtDpTY2GwCdh2IWnAb6MdeQiRD87tr4Y="; }) ]; win-arm64 = [ - (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-GugOroZ0SRoGoP3xE3jt91vTbHwXLPq8bHYckNC8SIA="; }) - (fetchNupkg { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-ceT9q9ZCwhGnp+BrxgjPcoyrAqKHc7VK47M4tM2pQmw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-fhc4491T3JB+k4XmPyfMK6bwqpfx7Mbugs/sh9hCb6U="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-hF/f/muateSDsp9oNafpzgtFtNm0kYuAG5YhJCVx0L0="; }) ]; win-x64 = [ - (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-lvAHbw3hhS6OnCuUMLEa4NKJWZPHqcBM3IeXpeYtLHo="; }) - (fetchNupkg { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-ZV5ptFKjt4UX+ytjnWMRk0/Xc+hR8tuYb8ADqLlTFnU="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-9AbfJQ6S6wxIwyecuMQPFp5g1Be/MZKz0A+YLvg0vME="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-gJIIbWDEcDP3fJZLS67+pSeIUBJPdAxy/ICLU8nKGLU="; }) ]; win-x86 = [ - (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-ULArvCiy+bOHtkD5E0q7u+Cfg7R+IJZ4A60ldV798vs="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-SdNqAE+cjhGk8Be1sPOy3SvcXmUlBEvFUAMnGaBm9dU="; }) ]; }; targetPackages = { linux-arm = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-eC46DyuObx9VhFP4PyY/3JWqAck8bW4Bt2hZyuapLRY="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-6WaE1hKyIBnsTe3YlVP/lHR9HOnMkYtqDZEZLzidFAc="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-u7sukf/qUk+gUVxFj/r9rzkQTVUcg2SqNhOmhPOsEyg="; }) - (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-pYPVNaL6x5zRCBxCsPso8Ae0k9aaDbvH0aHS+j5pdIs="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-C/rbNcMEVFr+X4cc8uWafZZfTBmVrdohkwlVay49i5o="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-CrY8BoFI0y3jGCoMUxGle+q/1eR0jDo3c4/OHGkfpWc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-ry7q5h8R7E5EYWekPpurKvQSzIvgk6+PDhXmO8LGmbc="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-rWX+2sujaeh4865lAXlazeEkAhdHv+nOw+nUGFg/PCY="; }) ]; linux-arm64 = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-hKCalXcwzlgMLwthSnTcHkDOW1g2XUo4Kj49uryZvt8="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-qlxs6pqhMQHkvOkJY37f9VMlxwnjUffue656XJaRLWI="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-h1FtdGrQp0HjK8fJajK1h5YV9fgBZCBQOH9M4pqMamE="; }) - (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-EBCX8Uvy+Z40i+VjuUK+F5CAZYblQLKzAExfx/uQ+gE="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-X+/z6pjwjLfAaVlRu9a8UppQH+rWGNfOd+M6T6IpGA8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-AkQO8KH84aWw/nbLTU5Pwe3Y+nMY6qO/ocak626vfTI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-gX5B8VfFFKQ/c+ZyW/plJQvJR0tD3/L5u2LAF0GwqKg="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-/h8tt997pSkGTKFcPjc41m1L6aFtnlrhyI89qtT4AAo="; }) ]; linux-x64 = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-KmyOl6C8u/PrCAMiY/KwELYvRafnM4SfcnEhKvU5BeU="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-Q41rpitFgIbgUpIh7iGzXTaCVDoUoDJ7HYddW2krHAE="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-bsQyjyidOkZLtjR1JadsIkRp6gDlHjEsJEbNLgKGtdE="; }) - (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-2YfhVuvSJe2sIkPFgocqAJubbb1PU7r93YoICq3ntAo="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-hzjiFI6ldUwohHqn+joLwj0QCSEsKA7fpsusiSUYiOE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-c7USudhIPx+sIax6rAq35ZWENK7VcvTRMI5Zjw0lBRg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-rW+noSMYQ/9HGMWY4Q1GdLyJ4XlwPGyBoOxJaldKU3k="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-3PrM40rNOxEETs+BuB4apQp11UM/Tt4qCqqEe6pDCug="; }) ]; linux-musl-arm = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-oPUyQZ9bGNbk6yPeIAQkNmDmDNcq3o2jFIsunotBBps="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-CBwqR3ii9Yg3O9lG/UAFaltVHmH5aFk2r8+IV1zeIS4="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-Uw965RIeMJJ3uV5xX6WWGVq8i+CHXpiOw1mOT6rPmFI="; }) - (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-JBUxkn0eUboAElHl+o2LyC7f9eJz4jJ9/odxXa43FSM="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-fbp4ArPk2XTAssAQTkrNtFHU9kzIV5zY/Jjq92Mpi+s="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-RWW2aK5C5b6opNsXqnO6XjCDPZ0EtHToHBOgPjGQS1g="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-Wd+w/+tWFL+gmhmf0wj1ym/JURGxHjJqLsieHsDw5sg="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-QELdzwfVBm1vMmFWdSN23g35/O/rtan708KHN1PiDV4="; }) ]; linux-musl-arm64 = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-ZsUpPpaD4cfjTnTPAw1VqKHYX51XFG1ck0Ae2dWUKt8="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-RY5CrQ9K9VZeh8+1r8Rjg0gEFBBRqR5EGTFkBfx0+3Q="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-FG9CGm1wZlMzKGzr70+qg62NLmYot0uG9yilyoEBpmw="; }) - (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-QtCqH/Ah7EW2lNWHq9y4sAQI+8XOWMLBrqPIuDEV1ic="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-yvHXdiGpCUWxLduToPbio8fcw9Mtyl5zvo9tCg0aV98="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-Zrs2qA7PtIYBjpk/i3HzMrqOvU00I9hBfTjp5o+4fsk="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-fsmi+VG1+9QYegQT3vPN6QhNVUOKQu2X4u92etqPTfI="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-Wr6Tsylj+lyhfrwMUJ44duIJ8qTNQzxkmAMy90hv1uM="; }) ]; linux-musl-x64 = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-wdwHZFStEDDU0v8nah6hylLErKUxC9x3CvgL/9Qcfwo="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-QnGhafheornOKm2H+UO9M+a57S7OzU7oomMp1Gs+qcQ="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-v8J9etz1hP2q02KbUjKxDUc8So2qlzajFCDbM9N9TiE="; }) - (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-HZS5qup9w2rWf1K5zIq7BEYTi8BC5co+Mz9Ey7iOcPc="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-Cn7eSPm1YLMdEXGkNwiFo9nGfHNq+bJRFA3f4A/9Aec="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-CGdQ7pTIO8gUrWB6KozR9DWrILLNk4K50p7hfj/KA/4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-PHMxmQJ8GxmSliTONInEGcKUxAfLAlmY4v8H86dxxYs="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-9Botmmfm2w8kmre5N6QdhczSl9ULvPKzNi8A5SNxP/I="; }) ]; osx-arm64 = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-hSj4rqdeeerbuFQT7DI38eIOI3XUUun7nfi4ypPyggU="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-4sp79lNVzgWRV2l1WjURkZBTq13OTRPfoRsaWU1Kd+Q="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-JT2SL5C1RXS80C7hB+YcCHW9Nynq4+1dCd4nckZVDsM="; }) - (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-pnE0Z0AxP+2tiQT72EIjrsfRxN9q/rWQ/5J1SIF8rVg="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-FCTCJCtnbeN46+G6jionwMVL/ombLiWJ12w8gZv7vPk="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-O2kh/ld/qx8AoltZBY5QScxXmePNwu25xwix6aLPhuQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-Nek+eCGSSlSXFElKc3ZDdKAR+VqfYIKO0ZvXxLPAnvQ="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-GhT5AhdQZnFFr3LZsArYg9asONt+teRjUJJjenhSY3k="; }) ]; osx-x64 = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-DO5bDJGbzav8ji/1Wp5+VCU2xd/7P+tD8eMCBCeisq0="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-ORBkaFVuxvBBcqo0vklECC72Paoy13E33gt/ctHojq0="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-oFvsMtKz+O9/B7asuc2DsH8KhRhAdS4D6qR64O8dE48="; }) - (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-sXYAaSQvdrsknqu85ZzDfRFKQ3lKxPmK3CeYJwJ/u78="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-Goj+/hMmaBAMPB9E1whGTgDfu2a5Kd6uAnIrLI88juQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-dkt2vVIvPIt+ewrp8ggNODm6Bvbj6LLpFmHH81PnVSw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-mQflfj047ONkda7KpQZga0WWzbIGzMf9Ls+ipMrnpuw="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-LIOwkyYFeTVmiQjJLt++yutwY7rLupshKhptuciNjVI="; }) ]; win-arm64 = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-/GFhQQTpATa+eVsIKIS5hYQwEzueYT7IClqfTuO7OiY="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-DJWq3FrbwU6QCJLuMWKFvQhwrszUHIHbZEi+cjnUkAI="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-NtpJ9HN+LvXLb/qBn3Dz5XGTqhrlB8oUFCzge9zkxJ0="; }) - (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-quzQ5GEyFmdsn7VXSsjSFHIcYnHwxb3OXP5Rcnar7mw="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-6aXnFRj5cnGWFjL830CktLTqisZsqnSaeuBC5J39eeY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-V0WFhdRjor/oI4pcB7/XhKjBFefJFy6Mo4BZjmUJjEc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-btKg62ky/0St7WYjXXZnoz99DdHNUpCnOXHaBWSc/rs="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-LX5fCmJl4PFgHStU5s4cNjUIeXFlinlA0PAD4tRYZk8="; }) ]; win-x64 = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-53HpBsY1A7xFKDSKW+yMjoTdK+calt2k8z1XQbIx39I="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-zzq0pwTb9ayiuFijGfhXPyIk7YsGu1Q611CvHhPAGPM="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-WUB7TDKuqe/+vZMdwtmb8yst0+6STi/H7gf1jmb0adw="; }) - (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-mc6g5oRPUbsFFwn5KDeY0LbzLGlyiPZxAhtjGEsIh+I="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-gRLb6tj22ig30xwYcSGL+mb3IEAoPweMGJtbTpfTS5k="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-WgEZAR4QO34XCQHhxbZ4DAlRDXkdyftbVFjanN7lm1o="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-W2K3711R50a4ofgvv9lOsHY8HC2luKjfSTPByGJhP1I="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-Zv+W3RVduqZy+8tDuGOzgYEDwsJf3rBTehoZKGC1eEw="; }) ]; win-x86 = [ - (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-lMVZtEPD48KKReYFsJ2rmJzCvlQNkGvajbfmd/ZYfFA="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-mHRvOES1i3VCmHfyQOakMNyvvJYS0xGdF8YFNpTEDx8="; }) - (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-X29sAPaFb6yZptgoQK6QnRKbLRmmkrnvWw2zHC1MHE8="; }) - (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-8LP07HWuRAyUGk5aSIpBHcAso16yM6UQ7YbPAen0Zgs="; }) + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-R2ZhPNxNQxgvDMENdOblDL+PpZqfjzau70COkjUTO10="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-XgQyMZ2KEgZaBgrJKGYtlL6msnvxoLvzisHdOkN3Nlc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-1RpTJXq08lBJ1SqBNKSzZPs3DB6Wc1hNXYYuyqwI700="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-IMroqfAI4aHTFggLYwURdsY7Z8M3mly8QEJjQRSgPa8="; }) ]; }; in rec { - release_9_0 = "9.0.0-rc.1"; + release_9_0 = "9.0.0-rc.2"; aspnetcore_9_0 = buildAspNetCore { - version = "9.0.0-rc.1.24452.1"; + version = "9.0.0-rc.2.24474.3"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/c414fabc-f831-4c5d-af5e-8e85ebecc6a0/670acec9f83315bec2788393db85e708/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-arm.tar.gz"; - hash = "sha512-EgHd12xUpnbLKHRD7xszFtCHufNVfHl/ckzU/LhphutJmzEilZskl2RE4mIoXAWooPjz8oKJRjHlj6TeQrtUiQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/bb68e2f8-fc3e-42ae-85f6-ba2bf4bc8ecb/524d5256a3798a7795837d7b104fb927/aspnetcore-runtime-9.0.0-rc.2.24474.3-linux-arm.tar.gz"; + hash = "sha512-1qqmHfZrxCKWNQ9WoT5PWltWdw5izfS7KmR/gNs7ymMuf4tk27LSuEJuhi7fPKdb68/p219qbpTsCFV6T3pGGw=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/c5075cd5-2552-4f77-96ce-31450f9ff8d5/e6ff2b52e2a27a60eb3585cbca01d60b/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-arm64.tar.gz"; - hash = "sha512-hGEKOPuamOt70muompxJmGguw//7Xq3lu6+6/WPKx9mlJ5YYu1slddJ/7sCY2l/m9xUMZyU/Pzd2JgFZA5bhIg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/687495c2-a3a5-4cf5-98e3-2adfef55a1e4/ef59f43e13c7107ab17e59c276da2485/aspnetcore-runtime-9.0.0-rc.2.24474.3-linux-arm64.tar.gz"; + hash = "sha512-tt5mjOhxRHa+eK4A7WYCfzpbBtlcZ2itaz7KTQ85bJGEMmfA6MAxYLcJp6zcvCsJBH8eyNRjCdQMPTH4ScyYHw=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/da25731f-e296-4e2a-8f2b-0213d26e1799/859039cd012f8cfba53991f8f5543609/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-x64.tar.gz"; - hash = "sha512-+P0oXWe7BE1jFZaGnWMB4QoqJDyByaBQlqZq/0+zQxUpgSx0gubPDgZejgZfxQsWtQ1/KklaswB3povUWzujdg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/f75b68ca-9e93-468c-925d-3ce85f8a4d0f/3a31e60149a0ca0f9e8d7c05666cfcba/aspnetcore-runtime-9.0.0-rc.2.24474.3-linux-x64.tar.gz"; + hash = "sha512-k3DCYXTNfxsv71jgpTBByUt9VBLxXqWGX7xlOmWxSLH5LnmS8UdhCmyi6SAR/yjENICrJqbn+M1W8hia8GEL6A=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/8d4492ed-c733-4cfc-bf16-4f13191587f2/c843723067d5fc1d790ffa1810c683c1/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-musl-arm.tar.gz"; - hash = "sha512-Kdvu4spDebM0V+KwVliBFPoxgTUGxTWaIxRfI6QdBj0F6qCX6hF2I6QPqxE1FrRRUL0XovBXKHViwz/pFovymQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/bc4a32ff-51a4-44af-9f7e-fec219ed91b6/4ef16e8019a45a760fc00569cb979ccd/aspnetcore-runtime-9.0.0-rc.2.24474.3-linux-musl-arm.tar.gz"; + hash = "sha512-+mwjYESxZ9+g44mq87jkLRQp8ZOvAUua5oV+LcG2SmWoAoxqwX6D2+Xsh25o7py4U9/gGciLOp+hX8xqoLAX+A=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/bc3735cb-fea1-4f97-8669-3ab0e389d055/084b94228b13a45478ac75f5158801b3/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-musl-arm64.tar.gz"; - hash = "sha512-n08aOk85N3d5v092zguXYxAtnKYX/99h/3Wg2Bxcxj+1BCcI/xCxqD5VgFDZuVu68Vn6d+J8wD4K00NEHhZLXg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/8548303d-93c5-4846-87ad-af4c79877a26/6e3dc8573f2cd923959bdc39c8d37eb4/aspnetcore-runtime-9.0.0-rc.2.24474.3-linux-musl-arm64.tar.gz"; + hash = "sha512-YwPe+FCO5N+Xnm7mgBB32n0FF9MgO9/3SjbNuuVwidfHJpHtoApdqnQLKDGQlQtcqO0PoRErfSqxHBRZCd6RmQ=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/10aac5f7-c037-4874-8c05-425e668b0a24/4706d38e511259862e93a61f15dda28f/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-musl-x64.tar.gz"; - hash = "sha512-D5RfnHYZkY1hmmbPtsiwH9mTlDjOjvi+B5f66ky9c87eb9JcIlhV77eTvmcL/A9xmOnyMfoFEdfPMZ0vq7rJ0w=="; + url = "https://download.visualstudio.microsoft.com/download/pr/ee8ef896-6330-4f7f-86ad-172d67793e08/fdbe8aa1eb6fe38e8ad3fe471495d388/aspnetcore-runtime-9.0.0-rc.2.24474.3-linux-musl-x64.tar.gz"; + hash = "sha512-nEGqO/ymPJSP+HPMNBoJEEmEEWfmRMwU8fVD/qO+dbEICMOEgwORb/NHIAOszYAfe8gfzIbZLBpcns0p2b3jug=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/0bae8dff-9440-4388-a03e-af44e20673a8/8ab257a4963967970cd59c31c213f38d/aspnetcore-runtime-9.0.0-rc.1.24452.1-osx-arm64.tar.gz"; - hash = "sha512-A/fgM1LRrS1U6d5MHN16lMIxG7NtTGKWZh+rKGzd6/P1cgT3OJLv1T9Dz7E7pzyvrpXQUixHvgMgPV+2mg7P6Q=="; + url = "https://download.visualstudio.microsoft.com/download/pr/0ffcfb0e-3d17-4b00-8bf2-db75b095252c/5bd0a672caf63b32b39b92c0677a2a4f/aspnetcore-runtime-9.0.0-rc.2.24474.3-osx-arm64.tar.gz"; + hash = "sha512-HdXqCzgA3Ti9piOSgJM2A5ummzrD8agnOmhmTKDCO2MoSKNIuNnp4OdlObbl4VgkMguDBXHC+uPflK0PJiiNMA=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/b0414fd7-20f9-4363-9dbf-072880e97b17/89584fa06e9ba1154a7e02402a28d82f/aspnetcore-runtime-9.0.0-rc.1.24452.1-osx-x64.tar.gz"; - hash = "sha512-/0puNbQfUgBSHqSyV7KT5NSPF4bMqpzYW1W6lq02A228FJ0v+CDx3/Xy2az2w4tsNUDnAMLC21/m2C1PhfRhrg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/7a757e46-1c68-449e-8b1c-64293c30242d/aa10955edc95ab4419bbad34f8e4899a/aspnetcore-runtime-9.0.0-rc.2.24474.3-osx-x64.tar.gz"; + hash = "sha512-tirwJSlndP0w9g6+OKgGEviqB4Av/PHJPT2pBStGEQj+XK7DVvlczYdy6nUUhiw3mvuzwZsjyOi1OvmhhAiBPg=="; }; }; }; runtime_9_0 = buildNetRuntime { - version = "9.0.0-rc.1.24431.7"; + version = "9.0.0-rc.2.24473.5"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/26c238f2-53a2-4fdc-981e-31272c80d107/67c11b008d57d501cd2e5ca642cbc8c1/dotnet-runtime-9.0.0-rc.1.24431.7-linux-arm.tar.gz"; - hash = "sha512-ioPeMA6PnsZ/cFAE9VIpVz3Yv7EG9sQjie+ylsI4buJ4Rvgbqv5rQmnpxyaQN+XsPxN2xyvBA+RkHJGBp+V2Rw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/a0fea09f-b78f-4381-be80-3bb7c363f010/7dbd31bdfde0fd28038f9feb5c24de4e/dotnet-runtime-9.0.0-rc.2.24473.5-linux-arm.tar.gz"; + hash = "sha512-w+oUlK7VbFV0BnhuFtriWi0bCeCG+kcL7nhQID88mV/wh4ujZwehFxnbHlF8b8ulOxA6aYe0/akVjfU2y/0n0A=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/54f6fb3b-da5b-4a2d-98f4-ae07c814a586/e5f2a5ba551ffe53ea1c2ae9b7681f0b/dotnet-runtime-9.0.0-rc.1.24431.7-linux-arm64.tar.gz"; - hash = "sha512-hUK7k4Hk7Kbw687d7GhSXMWeNPckRhPPM8shUfVwwzRcttCBxJKwEHDnYtNEDwLUVYI0Uy1Y/z3JGQV+Bre9rA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/59fcedfa-70be-4166-ad7a-aa724c8d0754/56ab42fd18b3ec36eca8e9a52398032a/dotnet-runtime-9.0.0-rc.2.24473.5-linux-arm64.tar.gz"; + hash = "sha512-NVzbOrCgH74jtwZ5FsdRazFq2jYN6pt3Nf6TXsoXI8obMkB+yjr6fHIrvwYZkAGabVY7w1l/33KUDOs4rirQTg=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/72048153-7c19-4e69-bcf3-22563060db07/cd181715a0f7cd3cec8c87b115181da9/dotnet-runtime-9.0.0-rc.1.24431.7-linux-x64.tar.gz"; - hash = "sha512-n5qFuNn2Ni7SwtDt79BJmRgbLDhmR2RPvB2fJIJVOHMkOZ7bHEC8f6jEetwi4tcdtfJc55RSHVnkbEBZO19sxQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/69beb740-ba0e-4a0b-a82a-737c61cb75cb/eff5e94b382efcdcd2a80278e04edb92/dotnet-runtime-9.0.0-rc.2.24473.5-linux-x64.tar.gz"; + hash = "sha512-ugQx57uCrMqxRM8WZsRwVJ2BAqF/JgzX4NmIkjon861cEMrdFgtaGA1bsVlyFD8w/bc7aH0fjMwC6ekzSrjCzQ=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/c948e710-a590-4492-870d-1e44ce476a55/86522880c5160af3c81bfa71378b79b9/dotnet-runtime-9.0.0-rc.1.24431.7-linux-musl-arm.tar.gz"; - hash = "sha512-ERibzBMUhpSROsX7BQt324EErGLdOblwzZau85n3p87mVqMUtE8BE/lnJufuCiad6jhjcCD+BiYaiwHKDfnktA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/1ae9bcc8-f0c6-4e58-ae9e-1a97ad4176e7/97a25ba8dd8535ed125d0c3773a8f64b/dotnet-runtime-9.0.0-rc.2.24473.5-linux-musl-arm.tar.gz"; + hash = "sha512-WeLXyzWmOYR1LSlr8CoejCqNsNy7K7zkM3X59+qN7ZOGfOTCCwnAPelOPjNGPxXL+a/wWKkzHa8KxQTEdx25bA=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/9ef6c8f0-49ac-4b37-9e7a-0f2cbbc74472/ceebdb8281a18bc80d17147ec3146cd0/dotnet-runtime-9.0.0-rc.1.24431.7-linux-musl-arm64.tar.gz"; - hash = "sha512-3WKnNzaydaFbWv+jRloO89aWGaBsyqo5FrMx9Fs4WakCjnjrfNhcdm3v+5cDx7uWeI9AYdVJy98yW/gYlDEFIQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/f5868a65-9c13-4020-8f22-afbd6ce09d13/7a342e4798cebc6cba90a6569e9dbec0/dotnet-runtime-9.0.0-rc.2.24473.5-linux-musl-arm64.tar.gz"; + hash = "sha512-PekyCYPo4EPrW8MB4yRCVXCyHM8NXrl8Ph/eKrl+mCBtjReE2W1pE74LtLjOUMXP+Vbn+Jge4KHxyd8idnkhKg=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/30c11bec-b456-45de-bb45-5e892fd1a509/cd72910d2c8b0c908f717a3563c2445f/dotnet-runtime-9.0.0-rc.1.24431.7-linux-musl-x64.tar.gz"; - hash = "sha512-vXcBXKRriSj3CmHmz+8jxeMIrUDAPd1CHCEBQbGjjNXE2O31Nl6LruIn21pqxx++pIHBqLPFum6lgzCv3X/iMQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/d9e2009e-5bab-4a62-88e1-ae5e3ed4e0a0/617b2bf0e8292164424e71c342ed8d13/dotnet-runtime-9.0.0-rc.2.24473.5-linux-musl-x64.tar.gz"; + hash = "sha512-1AoYYdTlUKRtTpEEF20QfqoKG+lMxqxYPvMx5q0xzK9NN6QnYgMAo3N2yG8SKpIKK3tAtOSsNHvi1io43IPZZQ=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/8abf3e03-1ab3-40fd-a9cf-fa22005be2e8/cb0c3c5d130ef8ae76a982860fd3606a/dotnet-runtime-9.0.0-rc.1.24431.7-osx-arm64.tar.gz"; - hash = "sha512-qCX8qe3eU6tqvA7+DETW+yXFx3rrLTW2xBTULzZEU86wae2duIZcK7glI5ifzrfMy/hgR2mVkP91amucVMIddA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/cb30091f-cc2e-489f-a8ae-87a08a9d220d/7ce11a740f6d5641c514fe68b2cb2dd2/dotnet-runtime-9.0.0-rc.2.24473.5-osx-arm64.tar.gz"; + hash = "sha512-e1DF3vwyGDOYKU5MuRpZBgYXZ4QIpYbOmB4PR/uDPIUxsw4D/EZXoJFjRgYFcwJB42bJITw4EHfmVHU441bosw=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/13d7d905-549f-44e8-9062-a678a742c5fb/94c51ca9c08ef9b5cceabafc2337118f/dotnet-runtime-9.0.0-rc.1.24431.7-osx-x64.tar.gz"; - hash = "sha512-9i+GfqtjNzfEUP+wVDpybxui9GpCZctHl42I2tDGuAqNtcz29YOEL4XLYTuW0vfGgG1mmCb0uSuQbnHY0Q5T6A=="; + url = "https://download.visualstudio.microsoft.com/download/pr/b9385375-2ccd-4e9f-9e4a-8d7f6d58c3d3/00e123163e6bfaae9119c5fb355f0d53/dotnet-runtime-9.0.0-rc.2.24473.5-osx-x64.tar.gz"; + hash = "sha512-TSYNygwim2QOkORVS1FhwLnZX4u5gOtT5hlAviLIMoSdMokQfhyBWMgYklh2GidpXppClrkIag1EyMEkQFMfyA=="; }; }; }; sdk_9_0_1xx = buildNetSdk { - version = "9.0.100-rc.1.24452.12"; + version = "9.0.100-rc.2.24474.11"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/87c96627-cf20-47d7-8cb4-d5e083084dd4/07d4b533e746b344a3dbf9f7279f450b/dotnet-sdk-9.0.100-rc.1.24452.12-linux-arm.tar.gz"; - hash = "sha512-8xpKLDCAqSHP3XGTPR9XwvV/9MQ/WgrW9SZAvHkeVPjAUm2OEgatIfhoI1elPPbUiKiwEQfnw0vq/iyMNCXdjA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/ba992713-4a38-4b45-9c24-8222f2ba01d7/e8746f2e70e0f06e3d9282c6d43bce65/dotnet-sdk-9.0.100-rc.2.24474.11-linux-arm.tar.gz"; + hash = "sha512-c2oOG/d5FSjmyYhIUX9s5x2U+hpacrHl2iybVycJ1Xlkq1OyDx4rn8aOLMc5zbo7kfwI2F6EB/u/zQ1fuxHH2Q=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/f7739964-9e84-4bb7-9435-509458a15f9c/a95ad7f9deb8ce2fd30173dfe86f55ba/dotnet-sdk-9.0.100-rc.1.24452.12-linux-arm64.tar.gz"; - hash = "sha512-9XQlNxKIAcGZoScmYXUGYFh4iibopgPL0mocFunvM6XUGOR5Cjzqci195IPu6LaODeS7Hf3yeXEzae07TRY6EQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/817f5589-0347-4254-b19a-67c30d9ce4f8/3dfe6b98927c4003fc004a1a32132a76/dotnet-sdk-9.0.100-rc.2.24474.11-linux-arm64.tar.gz"; + hash = "sha512-tTLcvLR8T9LJBgGNLsZj3hcZF598naj2Kj8hpi40zSYJ+3zuyJ9a7bKjUkf2f1Q6AsaE4WkgU7/y/cQYTfY/Uw=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/3b2b3c23-574b-45d7-b2b0-c67f0e935308/23ed647eb71a8f07414124422c15927d/dotnet-sdk-9.0.100-rc.1.24452.12-linux-x64.tar.gz"; - hash = "sha512-6BMIF7d50BBKbu4z2Y2Xw/rRwzYBNDX0fA6eIjcBcrddo3reduSd7Hy+aWiEOQ0uaUHMaeK61Vk9bRxrQQgwUQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/202e929a-e985-4eab-a78a-d7159fc204e4/0c85219d441cd3bbffd4fb65b7e36fe5/dotnet-sdk-9.0.100-rc.2.24474.11-linux-x64.tar.gz"; + hash = "sha512-EmqSv6nvTnBgn4snzeD64bFEqRr4pG3pSdgD0qobrQKFsbm4/GDUAgbTRqrEnkhwm+xOds325Un4kFCGAD6AmA=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/8cb683aa-4558-45ac-944a-73ac40b708d2/2795bd0253d5518490378edc7f7b562e/dotnet-sdk-9.0.100-rc.1.24452.12-linux-musl-arm.tar.gz"; - hash = "sha512-hICQDhS9EDT1hsPhdAK+LwTKslDXm00d2jqoh+n6+mg604it9/JbXHsNxDM3XOHCcrPZQZY25tsPe/MA6EGgpQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/ce9a6b41-d58d-4def-bf4d-2ff6a022c846/321706c736aaf0391a642d5d1e4d3e1b/dotnet-sdk-9.0.100-rc.2.24474.11-linux-musl-arm.tar.gz"; + hash = "sha512-pzn40pdEFS0zt7O3SThvD1E7ZtHy42PBCCu4dt7TiOHMbdJrD5ArO835V07dOGn4ALkjZIw92pDckbdsStXNlw=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/8737d284-0c4b-49a0-984c-23fddc7abcd8/ada586539e4417b557d60d0214e8b2eb/dotnet-sdk-9.0.100-rc.1.24452.12-linux-musl-arm64.tar.gz"; - hash = "sha512-ZWv6TnxKPuKAuZ6v+mILCbibOjufbTPJ14fB+JOLhK+1qkPYBUboGiv9UydwwoLFmuoWf1DQGlcCeiBh5ZXw6Q=="; + url = "https://download.visualstudio.microsoft.com/download/pr/add40efa-8de0-4fb8-9ac1-bed94c85caae/30527cbdf0f429eb778ab03f2fadf896/dotnet-sdk-9.0.100-rc.2.24474.11-linux-musl-arm64.tar.gz"; + hash = "sha512-KlWo4OMbUg3ZzfPvqA9Seuh77DuA26RLxhPKq0dWtz0fFFCGSJ+rD1WpZogCmsoUBhriWNHc/Dbt6O4LKo9Htw=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/791e9a41-59da-4f92-9dfb-2cceaaea001b/710f7adf35dc2f32be49ac2834ad0afd/dotnet-sdk-9.0.100-rc.1.24452.12-linux-musl-x64.tar.gz"; - hash = "sha512-sdgATPnD/7Uw+7PUJZF0ywdqMroAJo2qQ9v0Uv5tRsz5eaY9f1OucKL6ehAanfG9O4QFUqySqFIRm7c4WmX2Xw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/5e1ed970-6da9-42aa-840c-784c63c3a1af/4bb5d67f6983d22667d4d198d6e72ffd/dotnet-sdk-9.0.100-rc.2.24474.11-linux-musl-x64.tar.gz"; + hash = "sha512-JCyCo2HXOcuZdhnJggR7BfpGyNclZOq4TaSdK4Mb6xxcvyveWA3wtoVYdL8aQ2CiYxkSd9VgLc3GoBlDWgDO2A=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/930f4eb8-188f-47d5-8a26-28ca393b7d1b/c07a519e3d7e326c3f640ef72ea1193e/dotnet-sdk-9.0.100-rc.1.24452.12-osx-arm64.tar.gz"; - hash = "sha512-rzCzHNk36fyX4WS4NijCwezSEym3X3Qtn1IyqmhCfSW11wLMVlqoYNPHOMhyd5BWm/ZqPtdOXO9xmuWJ0wKEbw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/90c92374-0f9d-457b-a612-13cef4db7507/fc5ff8876123abfcde954906215ed1d0/dotnet-sdk-9.0.100-rc.2.24474.11-osx-arm64.tar.gz"; + hash = "sha512-wkVoXBJXKVaXrqxs8WnNY3XX5yXruHYO/OvsOfpuv2/jrVtgmUJviZ+KCgMywEeXfef4QypObyijSEiRSpJboQ=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/e26e36f6-746f-462c-8599-5d0a1f00e786/f1b8264ac10442b40009aa8cea46b23b/dotnet-sdk-9.0.100-rc.1.24452.12-osx-x64.tar.gz"; - hash = "sha512-DR8HGO7vAGw+z77+6/nfB3LsIsdNtLtjW2RjuK7f05VydLkItR7AGc7WnT569K6SUvGOh7FKRBHhCJpMxB430A=="; + url = "https://download.visualstudio.microsoft.com/download/pr/33f4f5cb-7423-4930-8e4b-d96f1fd088a9/87d414df2c160713cdaeec06c62cf6a9/dotnet-sdk-9.0.100-rc.2.24474.11-osx-x64.tar.gz"; + hash = "sha512-EY+pVt0zDQ30SeFGhbNi4ut7RPvpVBuXwSXZOnjcLlMCiKO6Hro5KNMF9KC5JUyEgMC4kwQYciZnn5W9bxvHWg=="; }; }; inherit commonPackages hostPackages targetPackages; diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/vmr.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/vmr.nix index 2c95d7d6ee..7cdbd36e9b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/vmr.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/vmr.nix @@ -2,6 +2,7 @@ clangStdenv, lib, fetchurl, + fetchpatch, dotnetCorePackages, jq, curl, @@ -27,6 +28,7 @@ unzip, yq, + baseName ? "dotnet", bootstrapSdk, releaseManifestFile, tarballHash, @@ -54,9 +56,15 @@ let _icu = if isDarwin then darwin.ICU else icu; + # error NU1903: Package 'System.Text.Json' 8.0.4 has a known high severity vulnerability, + disableNU1903 = fetchpatch { + url = "https://github.com/dotnet/sdk/pull/44028.patch"; + hash = "sha256-r6AOhXhwT8ar3aS0r5CA9sPiBsp3pnnPIVO+5l5CUGM="; + }; + in stdenv.mkDerivation rec { - pname = "dotnet-vmr"; + pname = "${baseName}-vmr"; version = release; # TODO: fix this in the binary sdk packages @@ -138,11 +146,13 @@ stdenv.mkDerivation rec { (global-name "com.apple.system.opendirectoryd.membership")) ''; - patches = lib.optionals (lib.versionAtLeast version "9") [ - ./UpdateNuGetConfigPackageSourcesMappings-don-t-add-em.patch - ] ++ lib.optionals (lib.versionOlder version "9") [ - ./fix-aspnetcore-portable-build.patch - ]; + patches = + lib.optionals (lib.versionAtLeast version "9") [ + ./UpdateNuGetConfigPackageSourcesMappings-don-t-add-em.patch + ] + ++ lib.optionals (lib.versionOlder version "9") [ + ./fix-aspnetcore-portable-build.patch + ]; postPatch = '' @@ -216,6 +226,9 @@ stdenv.mkDerivation rec { -s //Project -t elem -n Import \ -i \$prev -t attr -n Project -v "${./patch-npm-packages.proj}" \ src/aspnetcore/eng/DotNetBuild.props + + # patch is from sdk repo where vmr bits are in src/SourceBuild/content + patch -p4 < ${disableNU1903} '' + lib.optionalString (lib.versionAtLeast version "9") '' # https://github.com/dotnet/source-build/issues/3131#issuecomment-2030215805 diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix b/third_party/nixpkgs/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix index 0e1ce6e678..f7412a37ec 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix @@ -59,15 +59,22 @@ runCommand "flutter-artifacts-${flutterPlatform}-${systemPlatform}" passthru = { inherit flutterPlatform; }; -} '' +} ('' export FLUTTER_ROOT="$NIX_BUILD_TOP" lndir -silent '${flutter'}' "$FLUTTER_ROOT" rm -rf "$FLUTTER_ROOT/bin/cache" mkdir "$FLUTTER_ROOT/bin/cache" +'' + lib.optionalString (lib.versionAtLeast flutter'.version "3.26") '' + mkdir "$FLUTTER_ROOT/bin/cache/dart-sdk" + lndir -silent '${flutter'}/bin/cache/dart-sdk' "$FLUTTER_ROOT/bin/cache/dart-sdk" +'' + '' HOME="$(mktemp -d)" flutter precache -v '--${flutterPlatform}' ${builtins.concatStringsSep " " (map (p: "'--no-${p}'") (lib.remove flutterPlatform flutterPlatforms))} rm -rf "$FLUTTER_ROOT/bin/cache/lockfile" +'' + lib.optionalString (lib.versionAtLeast flutter'.version "3.26") '' + rm -rf "$FLUTTER_ROOT/bin/cache/dart-sdk" +'' + '' find "$FLUTTER_ROOT" -type l -lname '${flutter'}/*' -delete cp -r bin/cache "$out" -'' +'') diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/artifacts/prepare-artifacts.nix b/third_party/nixpkgs/pkgs/development/compilers/flutter/artifacts/prepare-artifacts.nix index def75e280d..23bd8485cc 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/artifacts/prepare-artifacts.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/artifacts/prepare-artifacts.nix @@ -16,6 +16,7 @@ mkdir -p "$out/bin" cp -r . "$out/bin/cache" + rm -f "$out/bin/cache/flutter.version.json" runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_26/data.json b/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_26/data.json new file mode 100644 index 0000000000..3d1b530a66 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_26/data.json @@ -0,0 +1,1052 @@ +{ + "version": "3.26.0-0.1.pre", + "engineVersion": "059e4e6d8ff6de39c29441c53e949bfb0bf17972", + "engineSwiftShaderHash": "sha256-mRLCvhNkmHz7Rv6GzXkY7OB1opBSq+ATWZ466qZdgto=", + "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f", + "channel": "beta", + "engineHashes": { + "x86_64-linux": { + "aarch64-linux": "sha256-tOrgkuPsQedWjCObrwZ9ICY15YWi+aVpxOQPE6vdeGc=", + "x86_64-linux": "sha256-tOrgkuPsQedWjCObrwZ9ICY15YWi+aVpxOQPE6vdeGc=" + } + }, + "dartVersion": "3.6.0-216.1.beta", + "dartHash": { + "x86_64-linux": "sha256-Vvdx4Bi7a/ySrxAv3UejlmmbNyKzdDr9RCS9tVGscDQ=", + "aarch64-linux": "sha256-SHqk1bm/5+ixOA5RHuToHQDN/NrNKZIrkkaBh9Cvl/I=", + "x86_64-darwin": "sha256-dbw0+OtjYkdRCgLDP+oNcOUgR5C8gC12NdftNAk7x0Q=", + "aarch64-darwin": "sha256-XOpBwyrMqIKutXgLEjGuta/3yhK+DpoSChNVXc9MMYA=" + }, + "flutterHash": "sha256-4YXm/MbhQsifJYpeUjmP8h6sm7pWrjBSpbCTV9p659o=", + "artifactHashes": { + "android": { + "aarch64-darwin": "sha256-CmjEq9T5gNgNKp8mik6HwVAsAfdWXBK2nHwL28L08xk=", + "aarch64-linux": "sha256-sucpfdtDzNMmCpWOZGVp48uNSrj221fOROI8huRs8Xc=", + "x86_64-darwin": "sha256-CmjEq9T5gNgNKp8mik6HwVAsAfdWXBK2nHwL28L08xk=", + "x86_64-linux": "sha256-sucpfdtDzNMmCpWOZGVp48uNSrj221fOROI8huRs8Xc=" + }, + "fuchsia": { + "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", + "aarch64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", + "x86_64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", + "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=" + }, + "ios": { + "aarch64-darwin": "sha256-kRgyKtnMs7xefe+XmCoYbO7sa7Dz1o0ltcRdiDvSeik=", + "aarch64-linux": "sha256-kRgyKtnMs7xefe+XmCoYbO7sa7Dz1o0ltcRdiDvSeik=", + "x86_64-darwin": "sha256-kRgyKtnMs7xefe+XmCoYbO7sa7Dz1o0ltcRdiDvSeik=", + "x86_64-linux": "sha256-kRgyKtnMs7xefe+XmCoYbO7sa7Dz1o0ltcRdiDvSeik=" + }, + "linux": { + "aarch64-darwin": "sha256-tnvQp4Vdthqwgt1bFRpZVJOuTX752yJE91yJNpwSOp4=", + "aarch64-linux": "sha256-tnvQp4Vdthqwgt1bFRpZVJOuTX752yJE91yJNpwSOp4=", + "x86_64-darwin": "sha256-vIfHgLif151Ymtu/aFtwHZTk28H2feHd9cOedUmSWXY=", + "x86_64-linux": "sha256-vIfHgLif151Ymtu/aFtwHZTk28H2feHd9cOedUmSWXY=" + }, + "macos": { + "aarch64-darwin": "sha256-/4R3Wlcs6ksMkTTZJ/YzEgWWCQJBKlnWr+PNCtcL3oc=", + "aarch64-linux": "sha256-/4R3Wlcs6ksMkTTZJ/YzEgWWCQJBKlnWr+PNCtcL3oc=", + "x86_64-darwin": "sha256-/4R3Wlcs6ksMkTTZJ/YzEgWWCQJBKlnWr+PNCtcL3oc=", + "x86_64-linux": "sha256-/4R3Wlcs6ksMkTTZJ/YzEgWWCQJBKlnWr+PNCtcL3oc=" + }, + "universal": { + "aarch64-darwin": "sha256-M2Fuqfgq79+FilJ5vU0Iarn0cpV3+4AxuxFEc3fwm+4=", + "aarch64-linux": "sha256-NqlNboNjLFAeuLHu6lNnMnrEb902nwIV1b/DNfrr3h8=", + "x86_64-darwin": "sha256-tlGwnwAov1eBe54mD9Q6D86qIEBkHBODJs5SVJyP5M0=", + "x86_64-linux": "sha256-0lxLRRQq+bRDPXyxEtZVGtzzqhrcsTYx01jeFX3ejLc=" + }, + "web": { + "aarch64-darwin": "sha256-fVOuJCTciHWv+HRFtSgn8zrexspBe+MUnc/cZlOeoqM=", + "aarch64-linux": "sha256-fVOuJCTciHWv+HRFtSgn8zrexspBe+MUnc/cZlOeoqM=", + "x86_64-darwin": "sha256-fVOuJCTciHWv+HRFtSgn8zrexspBe+MUnc/cZlOeoqM=", + "x86_64-linux": "sha256-fVOuJCTciHWv+HRFtSgn8zrexspBe+MUnc/cZlOeoqM=" + }, + "windows": { + "x86_64-darwin": "sha256-mwbk0VwxsbnMjy8trtjgZZ96jF3QuQJDcc0VSs6mQxI=", + "x86_64-linux": "sha256-mwbk0VwxsbnMjy8trtjgZZ96jF3QuQJDcc0VSs6mQxI=" + } + }, + "pubspecLock": { + "packages": { + "_fe_analyzer_shared": { + "dependency": "direct main", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "45cfa8471b89fb6643fe9bf51bd7931a76b8f5ec2d65de4fb176dba8d4f22c77", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "73.0.0" + }, + "_macros": { + "dependency": "transitive", + "description": "dart", + "source": "sdk", + "version": "0.3.2" + }, + "analyzer": { + "dependency": "direct main", + "description": { + "name": "analyzer", + "sha256": "4959fec185fe70cce007c57e9ab6983101dbe593d2bf8bbfb4453aaec0cf470a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.8.0" + }, + "archive": { + "dependency": "direct main", + "description": { + "name": "archive", + "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.6.1" + }, + "args": { + "dependency": "direct main", + "description": { + "name": "args", + "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.0" + }, + "async": { + "dependency": "direct main", + "description": { + "name": "async", + "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.11.0" + }, + "boolean_selector": { + "dependency": "direct main", + "description": { + "name": "boolean_selector", + "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "browser_launcher": { + "dependency": "direct main", + "description": { + "name": "browser_launcher", + "sha256": "54a2da4d152c34760b87cbd4a9fe8a563379487e57bfcd1b387be394dfa91734", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "built_collection": { + "dependency": "direct main", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "direct main", + "description": { + "name": "built_value", + "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.9.2" + }, + "checked_yaml": { + "dependency": "direct dev", + "description": { + "name": "checked_yaml", + "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "cli_config": { + "dependency": "direct main", + "description": { + "name": "cli_config", + "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "clock": { + "dependency": "direct main", + "description": { + "name": "clock", + "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "collection": { + "dependency": "direct dev", + "description": { + "name": "collection", + "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.19.0" + }, + "completion": { + "dependency": "direct main", + "description": { + "name": "completion", + "sha256": "f11b7a628e6c42b9edc9b0bc3aa490e2d930397546d2f794e8e1325909d11c60", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "convert": { + "dependency": "direct main", + "description": { + "name": "convert", + "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.1" + }, + "coverage": { + "dependency": "direct main", + "description": { + "name": "coverage", + "sha256": "7b594a150942e0d3be99cd45a1d0b5caff27ba5a27f292ed8e8d904ba3f167b5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.1" + }, + "crypto": { + "dependency": "direct main", + "description": { + "name": "crypto", + "sha256": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.5" + }, + "csslib": { + "dependency": "direct main", + "description": { + "name": "csslib", + "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "dap": { + "dependency": "direct main", + "description": { + "name": "dap", + "sha256": "c0e53b52c9529d901329045afc4c5acb04304a28acde4b54ab0a08a93da546aa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "dds": { + "dependency": "direct main", + "description": { + "name": "dds", + "sha256": "263f8831bfe57136fd4c07cf87df9b3f65457438b8b4d237e1b1d603c6d1cdbd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.6" + }, + "dds_service_extensions": { + "dependency": "direct main", + "description": { + "name": "dds_service_extensions", + "sha256": "390ae1d0128bb43ffe11f8e3c6cd3a481c1920492d1026883d379cee50bdf1a2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "devtools_shared": { + "dependency": "direct main", + "description": { + "name": "devtools_shared", + "sha256": "72369878105eccd563547afbad97407a2431b96bd4c04a1d6da75cb068437f50", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.2" + }, + "dtd": { + "dependency": "direct main", + "description": { + "name": "dtd", + "sha256": "6e4e508c0d03e12e2c96f21faa0e5acc191f9431ecd02adb8daee64dbfae6b86", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "dwds": { + "dependency": "direct main", + "description": { + "name": "dwds", + "sha256": "d0cf9d18511df6b397c40527f3fd8ddb47b7efcc501e703dd94f13cabaf82ffc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "24.1.0" + }, + "extension_discovery": { + "dependency": "direct main", + "description": { + "name": "extension_discovery", + "sha256": "20735622d0763865f9d94c3ecdce4441174530870760253e9d364fb4f3da8688", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "fake_async": { + "dependency": "direct main", + "description": { + "name": "fake_async", + "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.1" + }, + "ffi": { + "dependency": "direct main", + "description": { + "name": "ffi", + "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "file": { + "dependency": "direct main", + "description": { + "name": "file", + "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "file_testing": { + "dependency": "direct dev", + "description": { + "name": "file_testing", + "sha256": "0aaadb4025bd350403f4308ad6c4cea953278d9407814b8342558e4946840fb5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "fixnum": { + "dependency": "direct main", + "description": { + "name": "fixnum", + "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "flutter_template_images": { + "dependency": "direct main", + "description": { + "name": "flutter_template_images", + "sha256": "fd3e55af73c577b9e3f88d4080d3e366cb5c8ef3fbd50b94dfeca56bb0235df6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.0" + }, + "frontend_server_client": { + "dependency": "direct main", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "glob": { + "dependency": "direct main", + "description": { + "name": "glob", + "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "graphs": { + "dependency": "direct main", + "description": { + "name": "graphs", + "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "html": { + "dependency": "direct main", + "description": { + "name": "html", + "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.15.4" + }, + "http": { + "dependency": "direct main", + "description": { + "name": "http", + "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "http_multi_server": { + "dependency": "direct main", + "description": { + "name": "http_multi_server", + "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "http_parser": { + "dependency": "direct main", + "description": { + "name": "http_parser", + "sha256": "40f592dd352890c3b60fec1b68e786cefb9603e05ff303dbc4dda49b304ecdf4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "intl": { + "dependency": "direct main", + "description": { + "name": "intl", + "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.19.0" + }, + "io": { + "dependency": "direct main", + "description": { + "name": "io", + "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "js": { + "dependency": "direct main", + "description": { + "name": "js", + "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.1" + }, + "json_annotation": { + "dependency": "direct dev", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "json_rpc_2": { + "dependency": "direct main", + "description": { + "name": "json_rpc_2", + "sha256": "5e469bffa23899edacb7b22787780068d650b106a21c76db3c49218ab7ca447e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "logging": { + "dependency": "direct main", + "description": { + "name": "logging", + "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "macros": { + "dependency": "transitive", + "description": { + "name": "macros", + "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2-main.4" + }, + "matcher": { + "dependency": "direct main", + "description": { + "name": "matcher", + "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.16+1" + }, + "meta": { + "dependency": "direct main", + "description": { + "name": "meta", + "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.15.0" + }, + "mime": { + "dependency": "direct main", + "description": { + "name": "mime", + "sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.6" + }, + "multicast_dns": { + "dependency": "direct main", + "description": { + "name": "multicast_dns", + "sha256": "982c4cc4cda5f98dd477bddfd623e8e4bd1014e7dbf9e7b05052e14a5b550b99", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.2+7" + }, + "mustache_template": { + "dependency": "direct main", + "description": { + "name": "mustache_template", + "sha256": "a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "native_assets_builder": { + "dependency": "direct main", + "description": { + "name": "native_assets_builder", + "sha256": "3368f3eda23d59e98c8eadeafe609feb3bf6c342e5885796d6eceadc3d4581f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.2" + }, + "native_assets_cli": { + "dependency": "direct main", + "description": { + "name": "native_assets_cli", + "sha256": "1ff032c0ca050391c4c5107485f1a26e0e95cee18d1fdb2b7bdbb990efd3c188", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.3" + }, + "native_stack_traces": { + "dependency": "direct main", + "description": { + "name": "native_stack_traces", + "sha256": "8ba566c10ea781491c203876b04b9bdcf19dfbe17b9e486869f20eaae0ee470f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.0" + }, + "node_preamble": { + "dependency": "direct main", + "description": { + "name": "node_preamble", + "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "package_config": { + "dependency": "direct main", + "description": { + "name": "package_config", + "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "path": { + "dependency": "direct main", + "description": { + "name": "path", + "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.0" + }, + "petitparser": { + "dependency": "direct main", + "description": { + "name": "petitparser", + "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.2" + }, + "platform": { + "dependency": "direct main", + "description": { + "name": "platform", + "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.5" + }, + "pool": { + "dependency": "direct main", + "description": { + "name": "pool", + "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.1" + }, + "process": { + "dependency": "direct main", + "description": { + "name": "process", + "sha256": "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.2" + }, + "pub_semver": { + "dependency": "direct main", + "description": { + "name": "pub_semver", + "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "pubspec_parse": { + "dependency": "direct dev", + "description": { + "name": "pubspec_parse", + "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "shelf": { + "dependency": "direct main", + "description": { + "name": "shelf", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.2" + }, + "shelf_packages_handler": { + "dependency": "direct main", + "description": { + "name": "shelf_packages_handler", + "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "shelf_proxy": { + "dependency": "direct main", + "description": { + "name": "shelf_proxy", + "sha256": "a71d2307f4393211930c590c3d2c00630f6c5a7a77edc1ef6436dfd85a6a7ee3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "shelf_static": { + "dependency": "direct main", + "description": { + "name": "shelf_static", + "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "shelf_web_socket": { + "dependency": "direct main", + "description": { + "name": "shelf_web_socket", + "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "source_map_stack_trace": { + "dependency": "direct main", + "description": { + "name": "source_map_stack_trace", + "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "source_maps": { + "dependency": "direct main", + "description": { + "name": "source_maps", + "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.12" + }, + "source_span": { + "dependency": "direct main", + "description": { + "name": "source_span", + "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.0" + }, + "sprintf": { + "dependency": "direct main", + "description": { + "name": "sprintf", + "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "sse": { + "dependency": "direct main", + "description": { + "name": "sse", + "sha256": "111a05843ea9035042975744fe61d5e8b95bc4d38656dbafc5532da77a0bb89a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.6" + }, + "stack_trace": { + "dependency": "direct main", + "description": { + "name": "stack_trace", + "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.11.1" + }, + "standard_message_codec": { + "dependency": "direct main", + "description": { + "name": "standard_message_codec", + "sha256": "fc7dd712d191b7e33196a0ecf354c4573492bb95995e7166cb6f73b047f9cae0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.1+4" + }, + "stream_channel": { + "dependency": "direct main", + "description": { + "name": "stream_channel", + "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "string_scanner": { + "dependency": "direct main", + "description": { + "name": "string_scanner", + "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "sync_http": { + "dependency": "direct main", + "description": { + "name": "sync_http", + "sha256": "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.1" + }, + "term_glyph": { + "dependency": "direct main", + "description": { + "name": "term_glyph", + "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "test": { + "dependency": "direct main", + "description": { + "name": "test", + "sha256": "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.25.8" + }, + "test_api": { + "dependency": "direct main", + "description": { + "name": "test_api", + "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.3" + }, + "test_core": { + "dependency": "direct main", + "description": { + "name": "test_core", + "sha256": "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.5" + }, + "typed_data": { + "dependency": "direct main", + "description": { + "name": "typed_data", + "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.2" + }, + "unified_analytics": { + "dependency": "direct main", + "description": { + "name": "unified_analytics", + "sha256": "916215af2dc2f54a204c6bfbc645ec401b6a150048764814379f42e09b557d2d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.2" + }, + "usage": { + "dependency": "direct main", + "description": { + "name": "usage", + "sha256": "0bdbde65a6e710343d02a56552eeaefd20b735e04bfb6b3ee025b6b22e8d0e15", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.1" + }, + "uuid": { + "dependency": "direct main", + "description": { + "name": "uuid", + "sha256": "83d37c7ad7aaf9aa8e275490669535c8080377cfa7a7004c24dfac53afffaa90", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.4.2" + }, + "vm_service": { + "dependency": "direct main", + "description": { + "name": "vm_service", + "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.2.5" + }, + "vm_service_interface": { + "dependency": "direct main", + "description": { + "name": "vm_service_interface", + "sha256": "f827453d9a3f8ceae04e389810da26f9b67636bdd13aa2dd9405b110c4daf59c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "vm_snapshot_analysis": { + "dependency": "direct main", + "description": { + "name": "vm_snapshot_analysis", + "sha256": "5a79b9fbb6be2555090f55b03b23907e75d44c3fd7bdd88da09848aa5a1914c8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.6" + }, + "watcher": { + "dependency": "direct main", + "description": { + "name": "watcher", + "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "web": { + "dependency": "direct main", + "description": { + "name": "web", + "sha256": "d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "web_socket": { + "dependency": "direct main", + "description": { + "name": "web_socket", + "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.6" + }, + "web_socket_channel": { + "dependency": "direct main", + "description": { + "name": "web_socket_channel", + "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "webdriver": { + "dependency": "direct main", + "description": { + "name": "webdriver", + "sha256": "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "webkit_inspection_protocol": { + "dependency": "direct main", + "description": { + "name": "webkit_inspection_protocol", + "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "xml": { + "dependency": "direct main", + "description": { + "name": "xml", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "yaml": { + "dependency": "direct main", + "description": { + "name": "yaml", + "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "yaml_edit": { + "dependency": "direct main", + "description": { + "name": "yaml_edit", + "sha256": "e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + } + }, + "sdks": { + "dart": ">=3.4.3 <4.0.0" + } + } +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_26/patches/deregister-pub-dependencies-artifact.patch b/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_26/patches/deregister-pub-dependencies-artifact.patch new file mode 100644 index 0000000000..01e34c6d29 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_26/patches/deregister-pub-dependencies-artifact.patch @@ -0,0 +1,19 @@ +diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart +index 252021cf78..e50ef0885d 100644 +--- a/packages/flutter_tools/lib/src/flutter_cache.dart ++++ b/packages/flutter_tools/lib/src/flutter_cache.dart +@@ -51,14 +51,6 @@ class FlutterCache extends Cache { + registerArtifact(IosUsbArtifacts(artifactName, this, platform: platform)); + } + registerArtifact(FontSubsetArtifacts(this, platform: platform)); +- registerArtifact(PubDependencies( +- logger: logger, +- // flutter root and pub must be lazily initialized to avoid accessing +- // before the version is determined. +- flutterRoot: () => Cache.flutterRoot!, +- pub: () => pub, +- projectFactory: projectFactory, +- )); + } + } + \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_26/patches/disable-auto-update.patch b/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_26/patches/disable-auto-update.patch new file mode 100644 index 0000000000..2ad292efd2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_26/patches/disable-auto-update.patch @@ -0,0 +1,30 @@ +diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart +index e4e474ab6e..5548599802 100644 +--- a/packages/flutter_tools/lib/src/runner/flutter_command.dart ++++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart +@@ -1693,7 +1693,7 @@ Run 'flutter -h' (or 'flutter -h') for available flutter commands and + + // Populate the cache. We call this before pub get below so that the + // sky_engine package is available in the flutter cache for pub to find. +- if (shouldUpdateCache) { ++ if (false) { + // First always update universal artifacts, as some of these (e.g. + // ios-deploy on macOS) are required to determine `requiredArtifacts`. + final bool offline; +diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +index 50783f8435..db94062840 100644 +--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart ++++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +@@ -377,11 +377,7 @@ class FlutterCommandRunner extends CommandRunner { + globals.analytics.suppressTelemetry(); + } + +- globals.flutterVersion.ensureVersionFile(); + final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false; +- if (await _shouldCheckForUpdates(topLevelResults, topLevelMachineFlag: machineFlag)) { +- await globals.flutterVersion.checkFlutterVersionFreshness(); +- } + + // See if the user specified a specific device. + final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?; + diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_26/patches/fix-ios-build-xcode-backend-sh.patch b/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_26/patches/fix-ios-build-xcode-backend-sh.patch new file mode 100644 index 0000000000..825d40fc61 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_26/patches/fix-ios-build-xcode-backend-sh.patch @@ -0,0 +1,69 @@ +From 6df275df3b8694daf16302b407520e3b1dee6724 Mon Sep 17 00:00:00 2001 +From: Philip Hayes +Date: Thu, 12 Sep 2024 13:23:00 -0700 +Subject: [PATCH] fix: cleanup xcode_backend.sh to fix iOS build w/ + `NixOS/nixpkgs` flutter + +This patch cleans up `xcode_backend.sh`. It now effectively just runs +`exec $FLUTTER_ROOT/bin/dart ./xcode_backend.dart`. + +The previous `xcode_backend.sh` tries to discover `$FLUTTER_ROOT` from +argv[0], even though its presence is already guaranteed (the wrapped +`xcode_backend.dart` also relies on this env). + +When using nixpkgs flutter, the flutter SDK directory is composed of several +layers, joined together using symlinks (called a `symlinkJoin`). Without this +patch, the auto-discover traverses the symlinks into the wrong layer, and so it +uses an "unwrapped" `dart` command instead of a "wrapped" dart that sets some +important envs/flags (like `$FLUTTER_ROOT`). + +Using the "unwrapped" dart then manifests in this error when compiling, since +it doesn't see the ios build-support artifacts: + +``` +$ flutter run -d iphone +Running Xcode build... +Xcode build done. 6.4s +Failed to build iOS app +Error (Xcode): Target debug_unpack_ios failed: Error: Flutter failed to create a directory at "//XXXX-flutter-3.24.1-unwrapped/bin/cache/artifacts". +``` +--- + packages/flutter_tools/bin/xcode_backend.sh | 25 ++++----------------- + 1 file changed, 4 insertions(+), 21 deletions(-) + +diff --git a/packages/flutter_tools/bin/xcode_backend.sh b/packages/flutter_tools/bin/xcode_backend.sh +index 2889d7c8e4..48b9d06c6e 100755 +--- a/packages/flutter_tools/bin/xcode_backend.sh ++++ b/packages/flutter_tools/bin/xcode_backend.sh +@@ -6,24 +6,7 @@ + # exit on error, or usage of unset var + set -euo pipefail + +-# Needed because if it is set, cd may print the path it changed to. +-unset CDPATH +- +-function follow_links() ( +- cd -P "$(dirname -- "$1")" +- file="$PWD/$(basename -- "$1")" +- while [[ -h "$file" ]]; do +- cd -P "$(dirname -- "$file")" +- file="$(readlink -- "$file")" +- cd -P "$(dirname -- "$file")" +- file="$PWD/$(basename -- "$file")" +- done +- echo "$file" +-) +- +-PROG_NAME="$(follow_links "${BASH_SOURCE[0]}")" +-BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)" +-FLUTTER_ROOT="$BIN_DIR/../../.." +-DART="$FLUTTER_ROOT/bin/dart" +- +-"$DART" "$BIN_DIR/xcode_backend.dart" "$@" ++# Run `dart ./xcode_backend.dart` with the dart from $FLUTTER_ROOT. ++dart="${FLUTTER_ROOT}/bin/dart" ++xcode_backend_dart="${BASH_SOURCE[0]%.sh}.dart" ++exec "${dart}" "${xcode_backend_dart}" "$@" +-- +2.46.0 + diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_26/patches/gradle-flutter-tools-wrapper.patch b/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_26/patches/gradle-flutter-tools-wrapper.patch new file mode 100644 index 0000000000..de6080efbb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_26/patches/gradle-flutter-tools-wrapper.patch @@ -0,0 +1,44 @@ +This patch introduces an intermediate Gradle build step to alter the behavior +of flutter_tools' Gradle project, specifically moving the creation of `build` +and `.gradle` directories from within the Nix Store to somewhere in `$HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev`. + +Without this patch, flutter_tools' Gradle project tries to generate `build` and `.gradle` +directories within the Nix Store. Resulting in read-only errors when trying to build a +Flutter Android app at runtime. + +This patch takes advantage of the fact settings.gradle takes priority over settings.gradle.kts to build the intermediate Gradle project +when a Flutter app runs `includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")` + +`rootProject.buildFileName = "/dev/null"` so that the intermediate project doesn't use `build.gradle.kts` that's in the same directory. + +The intermediate project makes a `settings.gradle` file in `$HOME/.cache/flutter/nix-flutter-tools-gradle//` and `includeBuild`s it. +This Gradle project will build the actual `packages/flutter_tools/gradle` project by setting +`rootProject.projectDir = new File("$settingsDir")` and `apply from: new File("$settingsDir/settings.gradle.kts")`. + +Now the `.gradle` will be built in `$HOME/.cache/flutter/nix-flutter-tools-gradle//`, but `build` doesn't. +To move `build` to `$HOME/.cache/flutter/nix-flutter-tools-gradle//` as well, we need to set `buildDirectory`. +diff --git a/packages/flutter_tools/gradle/settings.gradle b/packages/flutter_tools/gradle/settings.gradle +new file mode 100644 +index 0000000000..b2485c94b4 +--- /dev/null ++++ b/packages/flutter_tools/gradle/settings.gradle +@@ -0,0 +1,19 @@ ++rootProject.buildFileName = "/dev/null" ++ ++def engineShortRev = (new File("$settingsDir/../../../bin/internal/engine.version")).text.take(10) ++def dir = new File("$System.env.HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev") ++dir.mkdirs() ++def file = new File(dir, "settings.gradle") ++ ++file.text = """ ++rootProject.projectDir = new File("$settingsDir") ++apply from: new File("$settingsDir/settings.gradle.kts") ++ ++gradle.allprojects { project -> ++ project.beforeEvaluate { ++ project.layout.buildDirectory = new File("$dir/build") ++ } ++} ++""" ++ ++includeBuild(dir) diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/builder.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/builder.nix index 8e08762387..0e89cbd615 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/builder.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/builder.nix @@ -302,7 +302,7 @@ originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // { fi # Get rid of some "fixed" header files - rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux,sys/mount.h,bits/statx.h} + rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux,sys/mount.h,bits/statx.h,pthread.h} # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks. for i in $out/bin/*-gcc*; do diff --git a/third_party/nixpkgs/pkgs/development/compilers/glslang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/glslang/default.nix index 9d67dde87c..5c39c5d5c1 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/glslang/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/glslang/default.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 bison jq ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + postPatch = '' cp --no-preserve=mode -r "${spirv-tools.src}" External/spirv-tools ln -s "${spirv-headers.src}" External/spirv-tools/external/spirv-headers diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.22.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.22.nix index afda23ba96..a87d57b9c7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.22.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.22.nix @@ -47,11 +47,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.22.7"; + version = "1.22.8"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-ZkMth9heDPrD7f/mN9WTD8Td9XkzE/4R5KDzMwI8h58="; + hash = "sha256-3xLCPr8Z3qD0v0aiLL7aSj7Kb0dPMYOQzndJdCeEQLg="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.23.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.23.nix index 65c562389b..80bba9cb53 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.23.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.23.nix @@ -47,11 +47,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.23.1"; + version = "1.23.2"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-buROKYN50Ual5aprHFtdX10KM2XqvdcHQebiE0DsOw0="; + hash = "sha256-NpMBYqk99BfZC9IsbhTa/0cFuqwrAkGO3aZxzfqc0H8="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/jasmin-compiler/default.nix b/third_party/nixpkgs/pkgs/development/compilers/jasmin-compiler/default.nix index a19dd7cfb6..9e77fd73c1 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/jasmin-compiler/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/jasmin-compiler/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jasmin-compiler"; - version = "2024.07.0"; + version = "2024.07.1"; src = fetchurl { url = "https://github.com/jasmin-lang/jasmin/releases/download/v${version}/jasmin-compiler-v${version}.tar.bz2"; - hash = "sha256-jE1LSL/fW7RKE5GeVzYtw4aFxtzTiz7IasD5YwDm4HE="; + hash = "sha256-at6jWm/Dv/duKmBBCIFkKborMxsQEpqEDO6NrJgzhz8="; }; sourceRoot = "jasmin-compiler-v${version}/compiler"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/julia/1.6-bin.nix b/third_party/nixpkgs/pkgs/development/compilers/julia/1.6-bin.nix deleted file mode 100644 index dea8a140ee..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/julia/1.6-bin.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ autoPatchelfHook, fetchurl, lib, stdenv }: - -stdenv.mkDerivation rec { - pname = "julia-bin"; - version = "1.6.7"; - - src = { - x86_64-linux = fetchurl { - url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz"; - sha256 = "sha256-bEUi1ZXky80AFXrEWKcviuwBdXBT0gc/mdqjnkQrKjY="; - }; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - # Julia’s source files are in different locations for source and binary - # releases. Thus we temporarily create a symlink to allow us to share patches - # with source releases. - prePatch = '' - ln -s share/julia/test - ''; - patches = [ - # Source release Nix patch(es) relevant for binary releases as well. - ./patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch - ]; - postPatch = '' - # Revert symlink hack. - rm test - - # Julia fails to pick up our Certification Authority root certificates, but - # it provides its own so we can simply disable the test. Patching in the - # dynamic path to ours require us to rebuild the Julia system image. - substituteInPlace share/julia/stdlib/v${lib.versions.majorMinor version}/NetworkOptions/test/runtests.jl \ - --replace '@test ca_roots_path() != bundled_ca_roots()' \ - '@test_skip ca_roots_path() != bundled_ca_roots()' - ''; - - nativeBuildInputs = [ autoPatchelfHook ]; - - installPhase = '' - runHook preInstall - cp -r . $out - runHook postInstall - ''; - - # Breaks backtraces, etc. - dontStrip = true; - - doInstallCheck = true; - preInstallCheck = '' - # Some tests require read/write access to $HOME. - export HOME="$TMPDIR" - ''; - installCheckPhase = '' - runHook preInstallCheck - # Command lifted from `test/Makefile`. - $out/bin/julia \ - --check-bounds=yes \ - --startup-file=no \ - --depwarn=error \ - $out/share/julia/test/runtests.jl - runHook postInstallCheck - ''; - - meta = { - description = "High-level, high-performance, dynamic language for technical computing"; - homepage = "https://julialang.org"; - # Bundled and linked with various GPL code, although Julia itself is MIT. - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ raskin thomasjm ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "julia"; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/compilers/julia/default.nix b/third_party/nixpkgs/pkgs/development/compilers/julia/default.nix index becbd64ea5..6a805b5ccb 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/julia/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/julia/default.nix @@ -12,7 +12,6 @@ let in { - julia_16-bin = wrapJulia (callPackage ./1.6-bin.nix { }); julia_19-bin = wrapJulia (callPackage (import ./generic-bin.nix { version = "1.9.4"; @@ -39,6 +38,17 @@ in }; }) { }); + julia_111-bin = wrapJulia (callPackage + (import ./generic-bin.nix { + version = "1.11.1"; + sha256 = { + x86_64-linux = "cca8d13dc4507e4f62a129322293313ee574f300d4df9e7db30b7b41c5f8a8f3"; + aarch64-linux = "bd623ef3801c5a56103464d349c7901d5cc034405ad289332c67f1e8ecc05840"; + x86_64-darwin = "59885de9310788c1ed12f41e7d2c2f05eabd314888cd105d299837b76a4a7240"; + aarch64-darwin = "e09d13e1c6c98452e91e698220688dd784ec8e5367e9e6443099c5f9aa2add78"; + }; + }) + { }); julia_19 = wrapJulia (callPackage (import ./generic.nix { version = "1.9.4"; @@ -57,4 +67,13 @@ in ]; }) { }); + julia_111 = wrapJulia (callPackage + (import ./generic.nix { + version = "1.11.1"; + hash = "sha256-pJuATeboagP+Jsc/WIUeruH/JD1yBPK1rk28XB3CdY0="; + patches = [ + ./patches/1.11/0002-skip-failing-and-flaky-tests.patch + ]; + }) + { }); } diff --git a/third_party/nixpkgs/pkgs/development/compilers/julia/generic-bin.nix b/third_party/nixpkgs/pkgs/development/compilers/julia/generic-bin.nix index fd78e61138..a7d7f127d5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/julia/generic-bin.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/julia/generic-bin.nix @@ -24,6 +24,11 @@ let "REPL" # Test flaky "ccall" + ] ++ lib.optionals (lib.versionAtLeast version "1.11") [ + # Test flaky + # https://github.com/JuliaLang/julia/issues/54280 + "loading" + "cmdlineargs" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Test flaky on ofborg "FileWatching" diff --git a/third_party/nixpkgs/pkgs/development/compilers/julia/generic.nix b/third_party/nixpkgs/pkgs/development/compilers/julia/generic.nix index 53a5067e78..16f7bbce07 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/julia/generic.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/julia/generic.nix @@ -9,12 +9,14 @@ , which , python3 , gfortran +, cacert , cmake , perl , gnum4 , openssl , libxml2 , zlib +, buildPackages }: stdenv.mkDerivation rec { @@ -42,12 +44,18 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 zlib + ] ++ lib.optionals (lib.versionAtLeast version "1.11") [ + cacert ]; dontUseCmakeConfigure = true; postPatch = '' patchShebangs . + '' + lib.optionalString (lib.versionAtLeast version "1.11") '' + substituteInPlace deps/curl.mk \ + --replace-fail 'cd $(dir $<) && $(TAR) jxf $(notdir $<)' \ + 'cd $(dir $<) && $(TAR) jxf $(notdir $<) && sed -i "s|/usr/bin/env perl|${lib.getExe buildPackages.perl}|" curl-$(CURL_VER)/scripts/cd2nroff' ''; makeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/julia/patches/1.11/0002-skip-failing-and-flaky-tests.patch b/third_party/nixpkgs/pkgs/development/compilers/julia/patches/1.11/0002-skip-failing-and-flaky-tests.patch new file mode 100644 index 0000000000..3577e6e71e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/julia/patches/1.11/0002-skip-failing-and-flaky-tests.patch @@ -0,0 +1,25 @@ +From 9da2f2596db9f4f1a61825d82d9b8c3f3b2e99aa Mon Sep 17 00:00:00 2001 +From: Nick Cao +Date: Wed, 10 Jan 2024 20:58:20 -0500 +Subject: [PATCH 2/2] skip failing and flaky tests + +--- + test/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/Makefile b/test/Makefile +index 88dbe5b2b4..a2a7a55e20 100644 +--- a/test/Makefile ++++ b/test/Makefile +@@ -28,7 +28,7 @@ default: + + $(TESTS): + @cd $(SRCDIR) && \ +- $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl $@) ++ $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl --skip NetworkOptions REPL channels FileWatching ccall loading cmdlineargs $@) + + $(addprefix revise-, $(TESTS)): revise-% : + @cd $(SRCDIR) && \ +-- +2.43.0 + diff --git a/third_party/nixpkgs/pkgs/development/compilers/julia/patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch b/third_party/nixpkgs/pkgs/development/compilers/julia/patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch deleted file mode 100644 index 243a9cfd76..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/julia/patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 44c2c979c4f2222567ce65f506cf47fb87482348 Mon Sep 17 00:00:00 2001 -From: Pontus Stenetorp -Date: Thu, 8 Apr 2021 04:37:44 +0000 -Subject: [PATCH 5/6] nix: Enable parallel unit tests for sandbox - -Disabled by default due to lack of networking in the Nix sandbox. This -greatly speeds up the build process on a multi-core system. ---- - test/runtests.jl | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/test/runtests.jl b/test/runtests.jl -index 2f9cd058bb..2f8c19fa32 100644 ---- a/test/runtests.jl -+++ b/test/runtests.jl -@@ -83,8 +83,9 @@ prepend!(tests, linalg_tests) - import LinearAlgebra - cd(@__DIR__) do - n = 1 -- if net_on -- n = min(Sys.CPU_THREADS, length(tests)) -+ if net_on || haskey(ENV, "NIX_BUILD_CORES") -+ x = haskey(ENV, "NIX_BUILD_CORES") ? parse(Int, ENV["NIX_BUILD_CORES"]) : Sys.CPU_THREADS -+ n = min(x, Sys.CPU_THREADS, length(tests)) - n > 1 && addprocs_with_testenv(n) - LinearAlgebra.BLAS.set_num_threads(1) - end --- -2.29.3 - diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/compiler-rt/armv6-scudo-libatomic.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/armv6-scudo-libatomic.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/compilers/llvm/common/compiler-rt/armv6-scudo-libatomic.patch rename to third_party/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/armv6-scudo-libatomic.patch diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/compiler-rt/armv6-scudo-libatomic.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/compiler-rt/armv6-scudo-libatomic.patch new file mode 100644 index 0000000000..c4da700fea --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/compiler-rt/armv6-scudo-libatomic.patch @@ -0,0 +1,65 @@ +From a56bb19a9dc303a50ef12d83cd24c2395bf81076 Mon Sep 17 00:00:00 2001 +From: Ben Wolsieffer +Date: Wed, 7 Dec 2022 21:25:46 -0500 +Subject: [PATCH] [scudo][standalone] Use CheckAtomic to decide to link to + libatomic + +Standalone scudo uses the atomic operation builtin functions, which require +linking to libatomic on some platforms. Currently, this is done in an ad-hoc +manner. MIPS platforms always link to libatomic, and the tests are always linked +to it as well. libatomic is required on base ARMv6 (but not ARMv6K), but it is +currently not linked, causing the build to fail. + +This patch replaces this ad-hoc logic with the CheckAtomic CMake module already +used in other parts of LLVM. The CheckAtomic module checks whether std::atomic +requires libatomic, which is not strictly the same as checking the atomic +builtins, but should have the same results as far as I know. If this is +problematic, a custom version of CheckAtomic could be used to specifically test +the builtins. +--- + compiler-rt/lib/scudo/standalone/CMakeLists.txt | 7 +++++++ + compiler-rt/lib/scudo/standalone/tests/CMakeLists.txt | 4 +--- + 2 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/lib/scudo/standalone/CMakeLists.txt b/lib/scudo/standalone/CMakeLists.txt +index ae5c354768c8..eb27374ca520 100644 +--- a/lib/scudo/standalone/CMakeLists.txt ++++ b/lib/scudo/standalone/CMakeLists.txt +@@ -1,5 +1,8 @@ + add_compiler_rt_component(scudo_standalone) + ++include(DetermineGCCCompatible) ++include(CheckAtomic) ++ + include_directories(../.. include) + + set(SCUDO_CFLAGS) +@@ -34,6 +37,10 @@ list(APPEND SCUDO_LINK_FLAGS -Wl,-z,defs,-z,now,-z,relro) + + list(APPEND SCUDO_LINK_FLAGS -ffunction-sections -fdata-sections -Wl,--gc-sections) + ++if(HAVE_CXX_ATOMICS_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB) ++ list(APPEND SCUDO_LINK_FLAGS -latomic) ++endif() ++ + # We don't use the C++ standard library, so avoid including it by mistake. + append_list_if(COMPILER_RT_HAS_NOSTDLIBXX_FLAG -nostdlib++ SCUDO_LINK_FLAGS) + append_list_if(CXX_SUPPORTS_UNWINDLIB_NONE_FLAG --unwindlib=none SCUDO_LINK_FLAGS) +diff --git a/lib/scudo/standalone/tests/CMakeLists.txt b/lib/scudo/standalone/tests/CMakeLists.txt +index 8200cd2588b3..73b3e9403c35 100644 +--- a/lib/scudo/standalone/tests/CMakeLists.txt ++++ b/lib/scudo/standalone/tests/CMakeLists.txt +@@ -39,9 +39,7 @@ set(SCUDO_UNITTEST_LINK_FLAGS + ${COMPILER_RT_UNWINDER_LINK_LIBS} + ${SANITIZER_TEST_CXX_LIBRARIES}) + list(APPEND SCUDO_UNITTEST_LINK_FLAGS -pthread -no-pie) +-# Linking against libatomic is required with some compilers +-check_library_exists(atomic __atomic_load_8 "" COMPILER_RT_HAS_LIBATOMIC) +-if (COMPILER_RT_HAS_LIBATOMIC) ++if (HAVE_CXX_ATOMICS_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB) + list(APPEND SCUDO_UNITTEST_LINK_FLAGS -latomic) + endif() + +-- +2.38.1 + diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/19/compiler-rt/armv6-scudo-libatomic.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/19/compiler-rt/armv6-scudo-libatomic.patch new file mode 100644 index 0000000000..6f8528cfa3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/19/compiler-rt/armv6-scudo-libatomic.patch @@ -0,0 +1,62 @@ +From a56bb19a9dc303a50ef12d83cd24c2395bf81076 Mon Sep 17 00:00:00 2001 +From: Ben Wolsieffer +Date: Wed, 7 Dec 2022 21:25:46 -0500 +Subject: [PATCH] [scudo][standalone] Use CheckAtomic to decide to link to + libatomic + +Standalone scudo uses the atomic operation builtin functions, which require +linking to libatomic on some platforms. Currently, this is done in an ad-hoc +manner. MIPS platforms always link to libatomic, and the tests are always linked +to it as well. libatomic is required on base ARMv6 (but not ARMv6K), but it is +currently not linked, causing the build to fail. + +This patch replaces this ad-hoc logic with the CheckAtomic CMake module already +used in other parts of LLVM. The CheckAtomic module checks whether std::atomic +requires libatomic, which is not strictly the same as checking the atomic +builtins, but should have the same results as far as I know. If this is +problematic, a custom version of CheckAtomic could be used to specifically test +the builtins. +--- + compiler-rt/lib/scudo/standalone/CMakeLists.txt | 7 +++++++ + compiler-rt/lib/scudo/standalone/tests/CMakeLists.txt | 4 +--- + 2 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/lib/scudo/standalone/CMakeLists.txt b/lib/scudo/standalone/CMakeLists.txt +index dc700cec9bec..671dc7046604 100644 +--- a/lib/scudo/standalone/CMakeLists.txt ++++ b/lib/scudo/standalone/CMakeLists.txt +@@ -1,5 +1,8 @@ + add_compiler_rt_component(scudo_standalone) + ++include(DetermineGCCCompatible) ++include(CheckAtomic) ++ + include_directories(../.. include) + + set(SCUDO_CFLAGS) +@@ -39,6 +42,10 @@ list(APPEND SCUDO_LINK_FLAGS -Wl,-z,defs,-z,now,-z,relro) + + list(APPEND SCUDO_LINK_FLAGS -ffunction-sections -fdata-sections -Wl,--gc-sections) + ++if(HAVE_CXX_ATOMICS_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB) ++ list(APPEND SCUDO_LINK_FLAGS -latomic) ++endif() ++ + # We don't use the C++ standard library, so avoid including it by mistake. + append_list_if(COMPILER_RT_HAS_NOSTDLIBXX_FLAG -nostdlib++ SCUDO_LINK_FLAGS) + append_list_if(CXX_SUPPORTS_UNWINDLIB_NONE_FLAG --unwindlib=none SCUDO_LINK_FLAGS) +diff --git a/lib/scudo/standalone/tests/CMakeLists.txt b/lib/scudo/standalone/tests/CMakeLists.txt +index a85eb737dba0..a23cf4d494f6 100644 +--- a/lib/scudo/standalone/tests/CMakeLists.txt ++++ b/lib/scudo/standalone/tests/CMakeLists.txt +@@ -47,7 +47,7 @@ set(SCUDO_UNITTEST_LINK_FLAGS + ${SANITIZER_TEST_CXX_LIBRARIES}) + list(APPEND SCUDO_UNITTEST_LINK_FLAGS -pthread -no-pie) + +-append_list_if(COMPILER_RT_HAS_LIBATOMIC -latomic SCUDO_UNITTEST_LINK_FLAGS) ++append_list_if((HAVE_CXX_ATOMICS_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB) -latomic SCUDO_UNITTEST_LINK_FLAGS) + + set(SCUDO_TEST_HEADERS + scudo_unit_test.h +2.38.1 + diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/19/libclc/use-default-paths.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/19/libclc/use-default-paths.patch new file mode 100644 index 0000000000..09079242ee --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/19/libclc/use-default-paths.patch @@ -0,0 +1,31 @@ +From e8b910246d0c7c3d9fff994f71c6f8a48ec09a50 Mon Sep 17 00:00:00 2001 +From: Tristan Ross +Date: Sat, 24 Aug 2024 19:56:24 -0700 +Subject: [PATCH] [libclc] use default paths with find_program when possible + +--- + libclc/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 02bb859ae8590b..6bcd8ae52a5794 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -55,7 +55,7 @@ if( LIBCLC_STANDALONE_BUILD OR CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DI + # Import required tools + if( NOT EXISTS ${LIBCLC_CUSTOM_LLVM_TOOLS_BINARY_DIR} ) + foreach( tool IN ITEMS clang llvm-as llvm-link opt ) +- find_program( LLVM_TOOL_${tool} ${tool} PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH ) ++ find_program( LLVM_TOOL_${tool} ${tool} PATHS ${LLVM_TOOLS_BINARY_DIR} ) + set( ${tool}_exe ${LLVM_TOOL_${tool}} ) + set( ${tool}_target ) + endforeach() +@@ -104,7 +104,7 @@ foreach( tool IN ITEMS clang opt llvm-as llvm-link ) + endforeach() + + # llvm-spirv is an optional dependency, used to build spirv-* targets. +-find_program( LLVM_SPIRV llvm-spirv PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH ) ++find_program( LLVM_SPIRV llvm-spirv PATHS ${LLVM_TOOLS_BINARY_DIR} ) + + if( LLVM_SPIRV ) + add_executable( libclc::llvm-spirv IMPORTED GLOBAL ) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/bolt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/bolt/default.nix index 9d6385ae74..d62841b48d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/bolt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/bolt/default.nix @@ -3,6 +3,7 @@ stdenv, llvm_meta, monorepoSrc, + release_version, runCommand, cmake, libxml2, @@ -20,16 +21,22 @@ stdenv.mkDerivation (finalAttrs: { inherit version patches; # Blank llvm dir just so relative path works - src = runCommand "bolt-src-${finalAttrs.version}" { } '' - mkdir $out - cp -r ${monorepoSrc}/cmake "$out" - cp -r ${monorepoSrc}/${finalAttrs.pname} "$out" - cp -r ${monorepoSrc}/third-party "$out" + src = runCommand "bolt-src-${finalAttrs.version}" { } ( + '' + mkdir $out + '' + + lib.optionalString (lib.versionAtLeast release_version "14") '' + cp -r ${monorepoSrc}/cmake "$out" + '' + + '' + cp -r ${monorepoSrc}/${finalAttrs.pname} "$out" + cp -r ${monorepoSrc}/third-party "$out" - # tablegen stuff, probably not the best way but it works... - cp -r ${monorepoSrc}/llvm/ "$out" - chmod -R +w $out/llvm - ''; + # tablegen stuff, probably not the best way but it works... + cp -r ${monorepoSrc}/llvm/ "$out" + chmod -R +w $out/llvm + '' + ); sourceRoot = "${finalAttrs.src.name}/bolt"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/clang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/clang/default.nix index 2b5aca1093..5c9662c24d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/clang/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/clang/default.nix @@ -24,12 +24,14 @@ let pname = "clang"; src' = if monorepoSrc != null then - runCommand "${pname}-src-${version}" {} '' + runCommand "${pname}-src-${version}" {} ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/${pname} "$out" cp -r ${monorepoSrc}/clang-tools-extra "$out" - '' else src; + '') else src; self = stdenv.mkDerivation (finalAttrs: rec { inherit pname version patches; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/compiler-rt/default.nix index a6d727739d..cce348b3ef 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/compiler-rt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/compiler-rt/default.nix @@ -47,11 +47,13 @@ let pname = baseName + lib.optionalString (haveLibc) "-libc"; src' = if monorepoSrc != null then - runCommand "${baseName}-src-${version}" {} '' + runCommand "${baseName}-src-${version}" {} ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/${baseName} "$out" - '' else src; + '') else src; preConfigure = lib.optionalString (!haveLibc) '' cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding") diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/default.nix index d5f7f0a840..2f47f1a583 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/default.nix @@ -190,6 +190,21 @@ let path = ../12; } ]; + "compiler-rt/armv6-scudo-libatomic.patch" = [ + { + after = "19"; + path = ../19; + } + { + after = "15"; + before = "19"; + path = ../15; + } + { + before = "15"; + path = ../14; + } + ]; "compiler-rt/armv7l.patch" = [ { before = "15"; @@ -279,6 +294,12 @@ let path = ../14; } ]; + "libclc/use-default-paths.patch" = [ + { + after = "19"; + path = ../19; + } + ]; }; constraints = patches."${p}" or null; @@ -325,13 +346,7 @@ let tools = lib.makeExtensible ( tools: let - callPackage = newScope ( - tools - // args - // metadata - # Previously monorepoSrc was erroneously not being passed through. - // lib.optionalAttrs (lib.versionOlder metadata.release_version "14") { monorepoSrc = null; } # Preserve a bug during #307211, TODO: remove; causes llvm 13 rebuild. - ); + callPackage = newScope (tools // args // metadata); clangVersion = if (lib.versionOlder metadata.release_version "16") then metadata.release_version @@ -478,7 +493,18 @@ let stripLen = 1; hash = "sha256-fqw5gTSEOGs3kAguR4tINFG7Xja1RAje+q67HJt2nGg="; }) - ]; + ] + ++ + lib.optionals + (lib.versionAtLeast metadata.release_version "17" && lib.versionOlder metadata.release_version "19") + [ + # Fixes test-suite on glibc 2.40 (https://github.com/llvm/llvm-project/pull/100804) + (fetchpatch2 { + url = "https://github.com/llvm/llvm-project/commit/1e8df9e85a1ff213e5868bd822877695f27504ad.patch"; + hash = "sha256-EX+PYGicK73lsL/J0kSZ4S5y1/NHIclBddhsnV6NPPI="; + stripLen = 1; + }) + ]; pollyPatches = [ (metadata.getVersionFile "llvm/gnu-install-dirs-polly.patch") ] ++ lib.optional (lib.versionAtLeast metadata.release_version "15") @@ -725,12 +751,9 @@ let && stdenv.targetPlatform.useLLVM or false ) "-lunwind" ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - nixSupport.cc-ldflags = - lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) - ( - [ "-L${targetLlvmLibraries.libunwind}/lib" ] - ++ lib.optional (lib.versionAtLeast metadata.release_version "17") "--undefined-version" - ); + nixSupport.cc-ldflags = lib.optionals ( + !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD + ) [ "-L${targetLlvmLibraries.libunwind}/lib" ]; } ); @@ -933,10 +956,10 @@ let lib.optional (lib.versionOlder metadata.release_version "18") # Prevent a compilation error on darwin (metadata.getVersionFile "compiler-rt/darwin-targetconditionals.patch") - ++ - lib.optional (lib.versionAtLeast metadata.release_version "15") - # See: https://github.com/NixOS/nixpkgs/pull/186575 - ./compiler-rt/darwin-plistbuddy-workaround.patch + ++ lib.optionals (lib.versionAtLeast metadata.release_version "15") [ + # See: https://github.com/NixOS/nixpkgs/pull/186575 + ./compiler-rt/darwin-plistbuddy-workaround.patch + ] ++ lib.optional (lib.versions.major metadata.release_version == "15") # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 @@ -947,9 +970,15 @@ let # Fix build on armv6l ./compiler-rt/armv6-mcr-dmb.patch ./compiler-rt/armv6-sync-ops-no-thumb.patch - ./compiler-rt/armv6-no-ldrexd-strexd.patch + ] + ++ lib.optionals (lib.versionOlder metadata.release_version "18") [ + # Fix build on armv6l ./compiler-rt/armv6-scudo-no-yield.patch - ./compiler-rt/armv6-scudo-libatomic.patch + ] + ++ [ + # Fix build on armv6l + ./compiler-rt/armv6-no-ldrexd-strexd.patch + (metadata.getVersionFile "compiler-rt/armv6-scudo-libatomic.patch") ] ++ lib.optional (lib.versionAtLeast metadata.release_version "19") (fetchpatch { url = "https://github.com/llvm/llvm-project/pull/99837/commits/14ae0a660a38e1feb151928a14f35ff0f4487351.patch"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/libclc.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/libclc.nix index 4c2081e693..c24fc6e3b4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/libclc.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/libclc.nix @@ -1,42 +1,87 @@ -{ lib, stdenv, version, runCommand, monorepoSrc, llvm, buildPackages, buildLlvmTools, ninja, cmake, python3 }: - +{ + lib, + stdenv, + version, + runCommand, + monorepoSrc, + llvm, + buildPackages, + buildLlvmTools, + ninja, + cmake, + python3, + release_version, + getVersionFile, +}: +let + spirv-llvm-translator = buildPackages.spirv-llvm-translator.override { + inherit (buildLlvmTools) llvm; + }; +in stdenv.mkDerivation rec { pname = "libclc"; inherit version; - src = runCommand "${pname}-src-${version}" {} '' - mkdir -p "$out" - cp -r ${monorepoSrc}/cmake "$out" - cp -r ${monorepoSrc}/${pname} "$out" - ''; + src = runCommand "${pname}-src-${version}" { } ( + '' + mkdir -p "$out" + '' + + lib.optionalString (lib.versionAtLeast release_version "14") '' + cp -r ${monorepoSrc}/cmake "$out" + '' + + '' + cp -r ${monorepoSrc}/${pname} "$out" + '' + ); sourceRoot = "${src.name}/${pname}"; - outputs = [ "out" "dev" ]; - - patches = [ - ./libclc/libclc-gnu-install-dirs.patch + outputs = [ + "out" + "dev" ]; - # cmake expects all required binaries to be in the same place, so it will not be able to find clang without the patch - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace 'find_program( LLVM_CLANG clang PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_CLANG clang PATHS "${buildLlvmTools.clang.cc}/bin" NO_DEFAULT_PATH )' \ - --replace 'find_program( LLVM_AS llvm-as PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_AS llvm-as PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ - --replace 'find_program( LLVM_LINK llvm-link PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_LINK llvm-link PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ - --replace 'find_program( LLVM_OPT opt PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_OPT opt PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ - --replace 'find_program( LLVM_SPIRV llvm-spirv PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_SPIRV llvm-spirv PATHS "${buildPackages.spirv-llvm-translator.override { inherit (buildLlvmTools) llvm; }}/bin" NO_DEFAULT_PATH )' - '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' - substituteInPlace CMakeLists.txt \ - --replace 'COMMAND prepare_builtins' 'COMMAND ${buildLlvmTools.libclc.dev}/bin/prepare_builtins' - ''; + patches = + [ ./libclc/libclc-gnu-install-dirs.patch ] + # LLVM 19 changes how host tools are looked up. + # Need to remove NO_DEFAULT_PATH and the PATHS arguments for find_program + # so CMake can actually find the tools in nativeBuildInputs. + # https://github.com/llvm/llvm-project/pull/105969 + ++ lib.optional (lib.versionAtLeast release_version "19") ( + getVersionFile "libclc/use-default-paths.patch" + ); - nativeBuildInputs = [ cmake ninja python3 ]; + # cmake expects all required binaries to be in the same place, so it will not be able to find clang without the patch + postPatch = + lib.optionalString (lib.versionOlder release_version "19") '' + substituteInPlace CMakeLists.txt \ + --replace 'find_program( LLVM_CLANG clang PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ + 'find_program( LLVM_CLANG clang PATHS "${buildLlvmTools.clang.cc}/bin" NO_DEFAULT_PATH )' \ + --replace 'find_program( LLVM_AS llvm-as PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ + 'find_program( LLVM_AS llvm-as PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ + --replace 'find_program( LLVM_LINK llvm-link PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ + 'find_program( LLVM_LINK llvm-link PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ + --replace 'find_program( LLVM_OPT opt PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ + 'find_program( LLVM_OPT opt PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ + --replace 'find_program( LLVM_SPIRV llvm-spirv PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ + 'find_program( LLVM_SPIRV llvm-spirv PATHS "${spirv-llvm-translator}/bin" NO_DEFAULT_PATH )' + '' + + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + substituteInPlace CMakeLists.txt \ + --replace 'COMMAND prepare_builtins' 'COMMAND ${buildLlvmTools.libclc.dev}/bin/prepare_builtins' + ''; + + nativeBuildInputs = + [ + cmake + ninja + python3 + ] + ++ lib.optional (lib.versionAtLeast release_version "19") [ + buildLlvmTools.clang.cc + buildLlvmTools.llvm + spirv-llvm-translator + ]; buildInputs = [ llvm ]; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/libunwind/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/libunwind/default.nix index 77854ddfcc..63b9737092 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/libunwind/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/libunwind/default.nix @@ -19,7 +19,9 @@ let src' = if monorepoSrc != null then runCommand "${pname}-src-${version}" {} ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/${pname} "$out" mkdir -p "$out/libcxx" cp -r ${monorepoSrc}/libcxx/cmake "$out/libcxx" diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/lld/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/lld/default.nix index d5c0f7cb3a..32cf5cb464 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/lld/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/lld/default.nix @@ -19,21 +19,23 @@ let pname = "lld"; src' = if monorepoSrc != null then - runCommand "lld-src-${version}" {} '' + runCommand "lld-src-${version}" {} ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/${pname} "$out" mkdir -p "$out/libunwind" cp -r ${monorepoSrc}/libunwind/include "$out/libunwind" mkdir -p "$out/llvm" - '' else src; + '') else src; postPatch = lib.optionalString (lib.versions.major release_version == "12") '' substituteInPlace MachO/CMakeLists.txt --replace \ '(''${LLVM_MAIN_SRC_DIR}/' '(' mkdir -p libunwind/include tar -xf "${libunwind.src}" --wildcards -C libunwind/include --strip-components=2 "libunwind-*/include/" - '' + lib.optionalString (lib.versions.major release_version == "13" && stdenv.hostPlatform.isDarwin) '' + '' + lib.optionalString (lib.versions.major release_version == "13") '' substituteInPlace MachO/CMakeLists.txt --replace \ '(''${LLVM_MAIN_SRC_DIR}/' '(../' ''; @@ -75,4 +77,4 @@ stdenv.mkDerivation (rec { of several different linkers. ''; }; -} // (if (postPatch == "" && lib.versions.major release_version != "13") then {} else { inherit postPatch; })) +} // (lib.optionalAttrs (postPatch != "") { inherit postPatch; })) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/lldb.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/lldb.nix index 4f679f4dcf..38bc91977c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/lldb.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/lldb.nix @@ -32,7 +32,9 @@ let if monorepoSrc != null then runCommand "lldb-src-${version}" { } ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/lldb "$out" '' + lib.optionalString (lib.versionAtLeast release_version "19" && enableManpages) '' mkdir -p "$out/llvm" diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/llvm/default.nix index 281a21ca15..fc139c7037 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -77,11 +77,15 @@ let pname = "llvm"; + # TODO: simplify versionAtLeast condition for cmake and third-party via rebuild src' = if monorepoSrc != null then runCommand "${pname}-src-${version}" {} ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/${pname} "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/third-party "$out" '' + lib.optionalString enablePolly '' chmod u+w "$out/${pname}/tools" diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/mlir/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/mlir/default.nix index e4dd12d69e..9c3c71c3b7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/mlir/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/mlir/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , llvm_meta +, release_version , buildLlvmTools , monorepoSrc , runCommand @@ -18,14 +19,16 @@ stdenv.mkDerivation rec { inherit version doCheck; # Blank llvm dir just so relative path works - src = runCommand "${pname}-src-${version}" { } '' + src = runCommand "${pname}-src-${version}" { } ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/mlir "$out" cp -r ${monorepoSrc}/third-party "$out/third-party" mkdir -p "$out/llvm" - ''; + ''); sourceRoot = "${src.name}/mlir"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/openmp/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/openmp/default.nix index 57c6de07c7..1ad5948edb 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/openmp/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/openmp/default.nix @@ -21,11 +21,13 @@ let pname = "openmp"; src' = if monorepoSrc != null then - runCommand "${pname}-src-${version}" {} '' + runCommand "${pname}-src-${version}" {} ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/${pname} "$out" - '' else src; + '') else src; in stdenv.mkDerivation (rec { inherit pname version patches; diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/17/default.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/17/default.nix index 4dc57ec98a..d43ffc8b68 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/17/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/17/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, pkgs, fetchFromGitHub, writeText, openjdk17_headless, gradle_7 , pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib -, ffmpeg_7-headless, python3, ruby +, ffmpeg-headless, python3, ruby , withMedia ? true , withWebKit ? false }: @@ -30,7 +30,7 @@ in stdenv.mkDerivation { ../backport-ffmpeg-7-support-jfx11.patch ]; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_7-headless ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg-headless ]; nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/21/default.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/21/default.nix index 5eed503cad..5266f5d807 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/21/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/21/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, pkgs, fetchFromGitHub, writeText , openjdk21_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst -, libXxf86vm, glib, alsa-lib, ffmpeg_7, python3, ruby +, libXxf86vm, glib, alsa-lib, ffmpeg, python3, ruby , withMedia ? true , withWebKit ? false }: @@ -29,7 +29,7 @@ in stdenv.mkDerivation { ../backport-ffmpeg-7-support-jfx21.patch ]; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_7 ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg ]; nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/22/default.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/22/default.nix index a64cecb8c9..5dde07c2d0 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/22/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/22/default.nix @@ -16,7 +16,7 @@ , libXxf86vm , glib , alsa-lib -, ffmpeg_7 +, ffmpeg , python3 , ruby , withMedia ? true @@ -51,7 +51,7 @@ in stdenv.mkDerivation { }) ]; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_7 ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg ]; nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/orc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/orc/default.nix index dd71582bdf..4d799b04e7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/orc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/orc/default.nix @@ -18,11 +18,11 @@ inherit (lib) optional optionals; in stdenv.mkDerivation rec { pname = "orc"; - version = "0.4.39"; + version = "0.4.40"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/orc/${pname}-${version}.tar.xz"; - sha256 = "sha256-M+0jh/Sbgl+hucOwBy4F8lkUG4lUdK0IWuURQ9MEDMA="; + hash = "sha256-P8K+5437fEH9lgUGH8aRONt98Afq4vZpofVui6zvdKs="; }; postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/1_80.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/1_81.nix similarity index 65% rename from third_party/nixpkgs/pkgs/development/compilers/rust/1_80.nix rename to third_party/nixpkgs/pkgs/development/compilers/rust/1_81.nix index fe301144af..b433504c81 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/1_80.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/1_81.nix @@ -27,6 +27,7 @@ llvm_18, wrapCCWith, overrideCC, + fetchpatch, }@args: let llvmSharedFor = @@ -46,8 +47,8 @@ let in import ./default.nix { - rustcVersion = "1.80.1"; - rustcSha256 = "sha256-LAuPZDlC3LgQy8xQ8pJWSxtuRNtdX0UJEVOZbfldLcQ="; + rustcVersion = "1.81.0"; + rustcSha256 = "hyRI/r3/MuUMPJCn4V+bstsTHRPFiP6QcbDtiIN8z6c="; llvmSharedForBuild = llvmSharedFor pkgsBuildBuild; llvmSharedForHost = llvmSharedFor pkgsBuildHost; @@ -104,28 +105,35 @@ import ./default.nix # Note: the version MUST be one version prior to the version we're # building - bootstrapVersion = "1.79.0"; + bootstrapVersion = "1.80.1"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "0a1e371809446cd77dba7abce2afb4efac8d8b2e63483cfe19f1c98bf9ab7855"; - x86_64-unknown-linux-gnu = "628efa8ef0658a7c4199883ee132281f19931448d3cfee4ecfd768898fe74c18"; - x86_64-unknown-linux-musl = "2e4b0e40d027e2b31a40163986b4c04dfd0bce41c706a99f2e82ba473a4383de"; - arm-unknown-linux-gnueabihf = "ce8d8d296277a06e0d2f63a21a0586717e09be3df28c0d1a04bc2c6f85eecc15"; - armv7-unknown-linux-gnueabihf = "31968f88b22058e384dfb3cdf3efe7f60c03481d790300fcffc420d5ba3851f2"; - aarch64-unknown-linux-gnu = "f7d3b31581331b54af97cf3162e65b8c26c8aa14d42f71c1ce9adc1078ef54e5"; - aarch64-unknown-linux-musl = "f8100c806754cd21600ded26546467a1a242db9b9ab8a6a666656e3cc4edfa52"; - x86_64-apple-darwin = "62f018aad30bafa0ef8bff0ed60d5d45e6cadc799769aad9d945509203e9f921"; - aarch64-apple-darwin = "e70a9362975b94df7dbc6e2ed5ceab4254dd32f72ba497ff4a70440ace3f729f"; - powerpc64le-unknown-linux-gnu = "9865eeebb5bb20006367d3148d9116576499ec958d847e22b645f008a1bc4170"; - riscv64gc-unknown-linux-gnu = "c8d38e600ef4dea8b375df2d08153393816ffd3dcab18e4d081ddc19e28b5a40"; - s390x-unknown-linux-gnu = "1e9f1b27ce47d831108e1d1bb6ef7ab86f95bedfea843318292f821142fe1f6c"; - x86_64-unknown-freebsd = "3c8005f488b8dda0fc6d47928868200852106cac2b568934ae9a2e5c89d3a50d"; + i686-unknown-linux-gnu = "1bc0ce998dcf070994ad46292637c5c7368f4bdf1cec1a08baa43af74926be54"; + x86_64-unknown-linux-gnu = "9eedaea9719914a0f4673899aa11693607f25486569913fcca5905ef1da784ec"; + x86_64-unknown-linux-musl = "5b38cc33ed789e15542ee4cbff6fbb11a61d8946b2b1e9e6843386abed398737"; + arm-unknown-linux-gnueabihf = "f07a757846bcc74404380312d7dec4342be887da20e1d5101aaa4cc14d222eb4"; + armv7-unknown-linux-gnueabihf = "1daaf1944f0ba08ae1fcded8698742fdc6ae00027981c5900ea066214137a99d"; + aarch64-unknown-linux-gnu = "4ae791da82be6e7223f4f6cd477799624481aa1011e17c37753a57d257f89198"; + aarch64-unknown-linux-musl = "929d85092b64f69196e8fba2c88ce7a11dd6e4ccd583e4e3363591af041c400f"; + x86_64-apple-darwin = "4fcc0dad8b47066e13877e2839760ef1f40754a90a8fe83ecd4a1f14bf63c71a"; + aarch64-apple-darwin = "170ea11a424d67bbf16df3a4788e0d844ced00490e44c18c366304db1ef8ca6d"; + powerpc64le-unknown-linux-gnu = "0eb2b3efc93cad3baf4653357a4a8a2d5a963ae80dbce8955e1bb4f60e02c659"; + riscv64gc-unknown-linux-gnu = "1c1a70a6a38fb9483d77a330a957ccd436be83d8033a9023fc742ccd8e3ef5ca"; + s390x-unknown-linux-gnu = "ca7f0ede6ec61c9f8bb5ac239c2fd14c1db3b164c58abc934851186489d247df"; + x86_64-unknown-freebsd = "d7f4f66c3cc97616bcd37d9f63ed14c3c22c72a467f308453df2f1b128ffe0bc"; }; - selectRustPackage = pkgs: pkgs.rust_1_80; + selectRustPackage = pkgs: pkgs.rust_1_81; - rustcPatches = [ ]; + rustcPatches = [ + (fetchpatch { + name = "fix-fastCross.patch"; + url = "https://github.com/rust-lang/rust/commit/c15469a7fec811d1a4f69ff26e18c6f383df41d2.patch"; + excludes = [ "src/bootstrap/src/core/build_steps/dist.rs" ]; + hash = "sha256-t8tW0eUZVJu6jUaXo41ZoPblNKisdL6ueoNLaf9Vhog="; + }) + ]; } ( @@ -134,5 +142,6 @@ import ./default.nix "llvm_18" "wrapCCWith" "overrideCC" + "fetchpatch" ] ) diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/binary.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/binary.nix index 6d31f1af55..df3b8f729f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/binary.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/binary.nix @@ -61,6 +61,37 @@ rec { dontStrip = true; setupHooks = ./setup-hook.sh; + + passthru = rec { + tier1TargetPlatforms = [ + # Platforms with host tools from + # https://doc.rust-lang.org/nightly/rustc/platform-support.html + "x86_64-darwin" "i686-darwin" "aarch64-darwin" + "i686-freebsd" "x86_64-freebsd" + "x86_64-solaris" + "aarch64-linux" "armv6l-linux" "armv7l-linux" "i686-linux" + "loongarch64-linux" "powerpc64-linux" "powerpc64le-linux" + "riscv64-linux" "s390x-linux" "x86_64-linux" + "aarch64-netbsd" "armv7l-netbsd" "i686-netbsd" "powerpc-netbsd" + "x86_64-netbsd" + "i686-openbsd" "x86_64-openbsd" + "i686-windows" "x86_64-windows" + ]; + targetPlatforms = tier1TargetPlatforms ++ [ + # Platforms without host tools from + # https://doc.rust-lang.org/nightly/rustc/platform-support.html + "armv7a-darwin" + "armv5tel-linux" "armv7a-linux" "m68k-linux" "mips-linux" + "mips64-linux" "mipsel-linux" "mips64el-linux" "riscv32-linux" + "armv6l-netbsd" "mipsel-netbsd" "riscv64-netbsd" + "x86_64-redox" + "wasm32-wasi" + ]; + badTargetPlatforms = [ + # Rust is currently unable to target the n32 ABI + lib.systems.inspect.patterns.isMips64n32 + ]; + }; }; rustc = wrapRustc rustc-unwrapped; diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix index c8eb3f438e..f22add43a6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix @@ -109,6 +109,9 @@ in stdenv.mkDerivation (finalAttrs: { "--tools=rustc,rustdoc,rust-analyzer-proc-macro-srv" "--enable-rpath" "--enable-vendor" + # For Nixpkgs it makes more sense to use stdenv's linker than + # letting rustc build its own. + "--disable-lld" "--build=${stdenv.buildPlatform.rust.rustcTargetSpec}" "--host=${stdenv.hostPlatform.rust.rustcTargetSpec}" # std is built for all platforms in --target. @@ -230,7 +233,7 @@ in stdenv.mkDerivation (finalAttrs: { export JEMALLOC_SYS_WITH_LG_VADDR=48 '' + lib.optionalString (!(finalAttrs.src.passthru.isReleaseTarball or false)) '' mkdir .cargo - cat > .cargo/config <<\EOF + cat > .cargo/config.toml <<\EOF [source.crates-io] replace-with = "vendored-sources" [source.vendored-sources] @@ -303,6 +306,7 @@ in stdenv.mkDerivation (finalAttrs: { passthru = { llvm = llvmShared; inherit llvmPackages; + inherit (rustc) tier1TargetPlatforms targetPlatforms badTargetPlatforms; tests = { inherit fd ripgrep wezterm; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit firefox thunderbird; }; @@ -313,19 +317,9 @@ in stdenv.mkDerivation (finalAttrs: { description = "Safe, concurrent, practical language"; maintainers = with maintainers; [ havvy ] ++ teams.rust.members; license = [ licenses.mit licenses.asl20 ]; - platforms = [ - # Platforms with host tools from - # https://doc.rust-lang.org/nightly/rustc/platform-support.html - "x86_64-darwin" "i686-darwin" "aarch64-darwin" - "i686-freebsd" "x86_64-freebsd" - "x86_64-solaris" - "aarch64-linux" "armv6l-linux" "armv7l-linux" "i686-linux" - "loongarch64-linux" "powerpc64-linux" "powerpc64le-linux" - "riscv64-linux" "s390x-linux" "x86_64-linux" - "aarch64-netbsd" "armv7l-netbsd" "i686-netbsd" "powerpc-netbsd" - "x86_64-netbsd" - "i686-openbsd" "x86_64-openbsd" - "i686-windows" "x86_64-windows" - ]; + platforms = rustc.tier1TargetPlatforms; + # If rustc can't target a platform, we also can't build rustc for + # that platform. + badPlatforms = rustc.badTargetPlatforms; }; }) diff --git a/third_party/nixpkgs/pkgs/development/compilers/sagittarius-scheme/default.nix b/third_party/nixpkgs/pkgs/development/compilers/sagittarius-scheme/default.nix index 3877d752f7..e370c56f02 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/sagittarius-scheme/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/sagittarius-scheme/default.nix @@ -16,10 +16,10 @@ let platformLdLibraryPath = if stdenv.hostPlatform.isDarwin then "DYLD_FALLBACK_ in stdenv.mkDerivation rec { pname = "sagittarius-scheme"; - version = "0.9.11"; + version = "0.9.12"; src = fetchurl { url = "https://bitbucket.org/ktakashi/${pname}/downloads/sagittarius-${version}.tar.gz"; - hash = "sha256-LIF1EW8sMBMKycQnVAXk+5iEpKmRHMmzBILAg2tjk8c="; + hash = "sha256-w6aQkC7/vKO8exvDpsSsLyLXrm4FSKh8XYGJgseEII0="; }; preBuild = '' # since we lack rpath during build, need to explicitly add build path diff --git a/third_party/nixpkgs/pkgs/development/compilers/scala/bare.nix b/third_party/nixpkgs/pkgs/development/compilers/scala/bare.nix index 684537e160..2588e3fd5a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/scala/bare.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/scala/bare.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://scala-lang.org/"; license = licenses.asl20; platforms = platforms.all; + mainProgram = "scala"; maintainers = with maintainers; [ karolchmist virusdave diff --git a/third_party/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix b/third_party/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix index 89e4452e7d..dd4bb0b766 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv -, fetchFromGitHub -, fetchpatch -, cmake -, pkg-config -, lit -, llvm -, spirv-headers -, spirv-tools +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + cmake, + pkg-config, + lit, + llvm, + spirv-headers, + spirv-tools, }: let @@ -15,31 +17,50 @@ let # ROCm, if actively updated will always be at the latest version branch = - if llvmMajor == "18" then rec { - version = "18.1.0"; - rev = "v${version}"; - hash = "sha256-64guZiuO7VpaX01wNIjV7cnjEAe6ineMdY44S6sA33k="; - } else if llvmMajor == "17" || isROCm then rec { - version = "17.0.0"; - rev = "v${version}"; - hash = "sha256-Rzm5Py9IPFtS9G7kME+uSwZ/0gPGW6MlL35ZWk4LfHM="; - } else if llvmMajor == "16" then rec { - version = "16.0.0"; - rev = "v${version}"; - hash = "sha256-EUabcYqSjXshbPmcs1DRLvCSL1nd9rEdpqELBrItCW8="; - } else if llvmMajor == "15" then rec { - version = "15.0.0"; - rev = "v${version}"; - hash = "sha256-OsDohXRxovtEXaWiRGp8gJ0dXmoALyO+ZimeSO8aPVI="; - } else if llvmMajor == "14" then { - version = "14.0.0+unstable-2024-07-15"; - rev = "2823e7052b7999c10fff63bc8089e5aa205716f4"; - hash = "sha256-8/4B74hYge6WiH7PzRGEgE3W7f9IkQ4VMmfkWKYA/l4="; - } else if llvmMajor == "11" then { - version = "11.0.0+unstable-2022-05-04"; - rev = "4ef524240833abfeee1c5b9fff6b1bd53f4806b3"; # 267 commits ahead of v11.0.0 - hash = "sha256-NoIoa20+2sH41rEnr8lsMhtfesrtdPINiXtUnxYVm8s="; - } else throw "Incompatible LLVM version."; + if llvmMajor == "19" then + rec { + version = "19.1.0"; + rev = "dad1f0eaab8047a4f73c50ed5f3d1694b78aae97"; + hash = "sha256-mUvDF5y+cBnqUaHjyiiE8cJGH5MfQMqGFy6bYv9vCVY="; + } + else if llvmMajor == "18" then + rec { + version = "18.1.0"; + rev = "v${version}"; + hash = "sha256-64guZiuO7VpaX01wNIjV7cnjEAe6ineMdY44S6sA33k="; + } + else if llvmMajor == "17" || isROCm then + rec { + version = "17.0.0"; + rev = "v${version}"; + hash = "sha256-Rzm5Py9IPFtS9G7kME+uSwZ/0gPGW6MlL35ZWk4LfHM="; + } + else if llvmMajor == "16" then + rec { + version = "16.0.0"; + rev = "v${version}"; + hash = "sha256-EUabcYqSjXshbPmcs1DRLvCSL1nd9rEdpqELBrItCW8="; + } + else if llvmMajor == "15" then + rec { + version = "15.0.0"; + rev = "v${version}"; + hash = "sha256-OsDohXRxovtEXaWiRGp8gJ0dXmoALyO+ZimeSO8aPVI="; + } + else if llvmMajor == "14" then + { + version = "14.0.0+unstable-2024-07-15"; + rev = "2823e7052b7999c10fff63bc8089e5aa205716f4"; + hash = "sha256-8/4B74hYge6WiH7PzRGEgE3W7f9IkQ4VMmfkWKYA/l4="; + } + else if llvmMajor == "11" then + { + version = "11.0.0+unstable-2022-05-04"; + rev = "4ef524240833abfeee1c5b9fff6b1bd53f4806b3"; # 267 commits ahead of v11.0.0 + hash = "sha256-NoIoa20+2sH41rEnr8lsMhtfesrtdPINiXtUnxYVm8s="; + } + else + throw "Incompatible LLVM version."; in stdenv.mkDerivation { pname = "SPIRV-LLVM-Translator"; @@ -51,71 +72,87 @@ stdenv.mkDerivation { inherit (branch) rev hash; }; - patches = lib.optionals (llvmMajor == "18") [ - # Fixes build after SPV_INTEL_maximum_registers breaking change - # TODO: remove on next spirv-headers release - (fetchpatch { - url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/d970c9126c033ebcbb7187bc705eae2e54726b74.patch"; - revert = true; - hash = "sha256-71sJuGqVjTcB549eIiCO0LoqAgxkdEHCoxh8Pd/Qzz8="; - }) - ] ++ lib.optionals (lib.versionAtLeast llvmMajor "15" && lib.versionOlder llvmMajor "18") [ - # Fixes build after spirv-headers breaking change - (fetchpatch { - url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/0166a0fb86dc6c0e8903436bbc3a89bc3273ebc0.patch"; - excludes = ["spirv-headers-tag.conf"]; - hash = "sha256-17JJG8eCFVphElY5fVT/79hj0bByWxo8mVp1ZNjQk/M="; - }) - ] ++ lib.optionals (llvmMajor == "16") [ - # Fixes builds that link against external LLVM dynamic library - (fetchpatch { - url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/f3b9b604d7eda18d0d1029d94a6eebd33aa3a3fe.patch"; - hash = "sha256-opDjyZcy7O4wcSfm/A51NCIiDyIvbcmbv9ns1njdJbc="; - }) - ] ++ lib.optionals (llvmMajor == "14") [ - (fetchpatch { - # tries to install llvm-spirv into llvm nix store path - url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/cce9a2f130070d799000cac42fe24789d2b777ab.patch"; - revert = true; - hash = "sha256-GbFacttZRDCgA0jkUoFA4/B3EDn3etweKvM09OwICJ8="; - }) - ]; + patches = + lib.optionals (llvmMajor == "18") [ + # Fixes build after SPV_INTEL_maximum_registers breaking change + # TODO: remove on next spirv-headers release + (fetchpatch { + url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/d970c9126c033ebcbb7187bc705eae2e54726b74.patch"; + revert = true; + hash = "sha256-71sJuGqVjTcB549eIiCO0LoqAgxkdEHCoxh8Pd/Qzz8="; + }) + ] + ++ lib.optionals (lib.versionAtLeast llvmMajor "15" && lib.versionOlder llvmMajor "18") [ + # Fixes build after spirv-headers breaking change + (fetchpatch { + url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/0166a0fb86dc6c0e8903436bbc3a89bc3273ebc0.patch"; + excludes = [ "spirv-headers-tag.conf" ]; + hash = "sha256-17JJG8eCFVphElY5fVT/79hj0bByWxo8mVp1ZNjQk/M="; + }) + ] + ++ lib.optionals (llvmMajor == "16") [ + # Fixes builds that link against external LLVM dynamic library + (fetchpatch { + url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/f3b9b604d7eda18d0d1029d94a6eebd33aa3a3fe.patch"; + hash = "sha256-opDjyZcy7O4wcSfm/A51NCIiDyIvbcmbv9ns1njdJbc="; + }) + ] + ++ lib.optionals (llvmMajor == "14") [ + (fetchpatch { + # tries to install llvm-spirv into llvm nix store path + url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/cce9a2f130070d799000cac42fe24789d2b777ab.patch"; + revert = true; + hash = "sha256-GbFacttZRDCgA0jkUoFA4/B3EDn3etweKvM09OwICJ8="; + }) + ]; - nativeBuildInputs = [ pkg-config cmake ] - ++ (if isROCm then [ llvm ] else [ llvm.dev ]); + nativeBuildInputs = [ + pkg-config + cmake + ] ++ (if isROCm then [ llvm ] else [ llvm.dev ]); - buildInputs = [ spirv-headers spirv-tools ] - ++ lib.optionals (!isROCm) [ llvm ]; + buildInputs = [ + spirv-headers + spirv-tools + ] ++ lib.optionals (!isROCm) [ llvm ]; nativeCheckInputs = [ lit ]; - cmakeFlags = [ - "-DLLVM_INCLUDE_TESTS=ON" - "-DLLVM_DIR=${(if isROCm then llvm else llvm.dev)}" - "-DBUILD_SHARED_LIBS=YES" - "-DLLVM_SPIRV_BUILD_EXTERNAL=YES" - # RPATH of binary /nix/store/.../bin/llvm-spirv contains a forbidden reference to /build/ - "-DCMAKE_SKIP_BUILD_RPATH=ON" - ] ++ lib.optional (llvmMajor != "11") "-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${spirv-headers.src}"; + cmakeFlags = + [ + "-DLLVM_INCLUDE_TESTS=ON" + "-DLLVM_DIR=${(if isROCm then llvm else llvm.dev)}" + "-DBUILD_SHARED_LIBS=YES" + "-DLLVM_SPIRV_BUILD_EXTERNAL=YES" + # RPATH of binary /nix/store/.../bin/llvm-spirv contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ] + ++ lib.optional (llvmMajor != "11") "-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${spirv-headers.src}" + ++ lib.optional (llvmMajor == "19") "-DBASE_LLVM_VERSION=${lib.versions.majorMinor llvm.version}.0"; # FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist doCheck = false; - makeFlags = [ "all" "llvm-spirv" ]; + makeFlags = [ + "all" + "llvm-spirv" + ]; - postInstall = '' - install -D tools/llvm-spirv/llvm-spirv $out/bin/llvm-spirv - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - install_name_tool $out/bin/llvm-spirv \ - -change @rpath/libLLVMSPIRVLib.dylib $out/lib/libLLVMSPIRVLib.dylib - ''; + postInstall = + '' + install -D tools/llvm-spirv/llvm-spirv $out/bin/llvm-spirv + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + install_name_tool $out/bin/llvm-spirv \ + -change @rpath/libLLVMSPIRVLib.dylib $out/lib/libLLVMSPIRVLib.dylib + ''; meta = with lib; { - homepage = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator"; + homepage = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator"; description = "Tool and a library for bi-directional translation between SPIR-V and LLVM IR"; mainProgram = "llvm-spirv"; - license = licenses.ncsa; - platforms = platforms.unix; + license = licenses.ncsa; + platforms = platforms.unix; maintainers = with maintainers; [ gloaming ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/setup-hook.sh b/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/setup-hook.sh index 160fbb1ccc..260d874ebf 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/setup-hook.sh +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/setup-hook.sh @@ -1,3 +1,5 @@ +# shellcheck shell=bash + # Build using 'swift-build'. swiftpmBuildPhase() { runHook preBuild @@ -8,10 +10,10 @@ swiftpmBuildPhase() { fi local flagsArray=( - -j $buildCores + -j "$buildCores" -c "${swiftpmBuildConfig-release}" - $swiftpmFlags "${swiftpmFlagsArray[@]}" ) + concatTo flagsArray swiftpmFlags swiftpmFlagsArray echoCmd 'build flags' "${flagsArray[@]}" TERM=dumb swift-build "${flagsArray[@]}" @@ -33,10 +35,10 @@ swiftpmCheckPhase() { fi local flagsArray=( - -j $buildCores + -j "$buildCores" -c "${swiftpmBuildConfig-release}" - $swiftpmFlags "${swiftpmFlagsArray[@]}" ) + concatTo flagsArray swiftpmFlags swiftpmFlagsArray echoCmd 'check flags' "${flagsArray[@]}" TERM=dumb swift-test "${flagsArray[@]}" @@ -53,8 +55,8 @@ fi swiftpmBinPath() { local flagsArray=( -c "${swiftpmBuildConfig-release}" - $swiftpmFlags "${swiftpmFlagsArray[@]}" ) + concatTo flagsArray swiftpmFlags swiftpmFlagsArray swift-build --show-bin-path "${flagsArray[@]}" } diff --git a/third_party/nixpkgs/pkgs/development/compilers/typescript/default.nix b/third_party/nixpkgs/pkgs/development/compilers/typescript/default.nix index 513f8a9918..de15795895 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/typescript/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/typescript/default.nix @@ -2,20 +2,20 @@ buildNpmPackage rec { pname = "typescript"; - version = "5.6.2"; + version = "5.6.3"; src = fetchFromGitHub { owner = "microsoft"; repo = "TypeScript"; rev = "v${version}"; - hash = "sha256-aomoO/1E7zdhRNTCKqbA7ktor03zjg5HZXPxhH8iris="; + hash = "sha256-DsGTVqCbzifPmgCrca5M7qeUPiMThByq6esN+bMt4fU="; }; patches = [ ./disable-dprint-dstBundler.patch ]; - npmDepsHash = "sha256-I44XhQzUsbf6Q4r2o40l9qBU8FMRZuYhb7dLVvFDyJc="; + npmDepsHash = "sha256-w3Tm7BJ2usrjut6HrhjgXe7TIgq5PxYeHRenz4aybk4="; passthru.tests = { version = testers.testVersion { diff --git a/third_party/nixpkgs/pkgs/development/compilers/vlang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/vlang/default.nix index 267f473274..62077a7e4f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/vlang/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/vlang/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, glfw, freetype, openssl, makeWrapper, upx, boehmgc, xorg, binaryen, darwin }: let - version = "0.4.4"; + version = "0.4.8"; ptraceSubstitution = '' #include #include @@ -10,12 +10,12 @@ let # So we fix its rev to correspond to the V version. vc = stdenv.mkDerivation { pname = "v.c"; - version = "0.4.4"; + version = "0.4.8"; src = fetchFromGitHub { owner = "vlang"; repo = "vc"; - rev = "66eb8eae253d31fa5622e35a69580d9ad8efcccb"; - hash = "sha256-YGlzr0Qq7+NtrnbaFPBuclzjOZBOnTe3BOhsuwdsQ5c="; + rev = "54beb1f416b404a06b894e6883a0e2368d80bc3e"; + hash = "sha256-hofganRnWPRCjjsItwF2BKam4dCqzMCrjgWSjZLSrlo="; }; # patch the ptrace reference for darwin @@ -46,7 +46,7 @@ stdenv.mkDerivation { owner = "vlang"; repo = "v"; rev = version; - hash = "sha256-Aqecw8K+igHx5R34lQiWtdNfeGn+umcjcS4w0vXgpLM="; + hash = "sha256-V4f14TcuKW8unzlo6i/tE6MzSb3HAll478OU2LxiTPQ="; }; propagatedBuildInputs = [ glfw freetype openssl ] diff --git a/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix b/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix index 43e941824f..cdb23470ca 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix @@ -75,13 +75,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "yosys"; - version = "0.45"; + version = "0.46"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-NF4NQ7mCfARuMsMTJVBbJk39puJ8+D41woYEPgthfUI="; + hash = "sha256-OnSKsX5G8Tc6AMFCmuWg6AekJvvG+K5Zr5rZZll+c/o="; fetchSubmodules = true; leaveDotGit = true; postFetch = '' diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/RustExtraction/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/RustExtraction/default.nix new file mode 100644 index 0000000000..4aaa96e77f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/coq-modules/RustExtraction/default.nix @@ -0,0 +1,57 @@ +{ + lib, + mkCoqDerivation, + which, + coq, + metacoq, + version ? null, +}: + +with lib; +mkCoqDerivation { + pname = "RustExtraction"; + repo = "coq-rust-extraction"; + owner = "AU-COBRA"; + domain = "github.com"; + + inherit version; + defaultVersion = + with versions; + switch + [ + coq.coq-version + metacoq.version + ] + [ + { + cases = [ + (range "8.17" "8.19") + (range "1.3.1" "1.3.2") + ]; + out = "0.1.0"; + } + ] + null; + + release."0.1.0".sha256 = "+Of/DP2Vjsa7ASKswjlvqqhcmDhC9WrozridedNZQkY="; + + releaseRev = v: "v${v}"; + + propagatedBuildInputs = [ + coq.ocamlPackages.findlib + metacoq + ]; + + postPatch = '' + patchShebangs ./process_extraction.sh + patchShebangs ./tests/process-extraction-examples.sh + ''; + + mlPlugin = true; + + meta = { + description = "A framework for extracting Coq programs to Rust"; + maintainers = with maintainers; [ _4ever2 ]; + license = licenses.mit; + }; +} 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 c9db564c19..eacafcbe38 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 @@ -10,6 +10,7 @@ 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 { diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coqutil/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coqutil/default.nix new file mode 100644 index 0000000000..ceac4b17b4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coqutil/default.nix @@ -0,0 +1,30 @@ +{ + coq, + findutils, + lib, + mkCoqDerivation, + version ? null, +}: + +mkCoqDerivation { + pname = "coqutil"; + owner = "mit-plv"; + + inherit version; + defaultVersion = with lib.versions; lib.switch coq.version [ + { case = range "8.18" "8.20"; out = "0.0.6"; } + { case = range "8.17" "8.20"; out = "0.0.5"; } + ] null; + + releaseRev = v: "v${v}"; + release."0.0.6".sha256 = "sha256-c/ddrj0ahuaj9Zu7YBqK7Q0ur+LK7Fgaa//nxQpQcm4="; + release."0.0.5".sha256 = "sha256-vkZIAAr82GNuCGlCVRgSCj/nqIdD8FITBiX1a8fybqw="; + + nativeBuildInputs = [ findutils ]; + + meta = { + description = "Coq library for tactics, basic definitions, sets, maps"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ stepbrobd ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/json/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/json/default.nix index 6638c8b211..f30c238aaf 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/json/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/json/default.nix @@ -1,6 +1,6 @@ { lib, mkCoqDerivation, coq, parsec, MenhirLib, version ? null }: -mkCoqDerivation { +(mkCoqDerivation { pname = "json"; owner = "liyishuai"; repo = "coq-json"; @@ -8,19 +8,23 @@ mkCoqDerivation { defaultVersion = let inherit (lib.versions) range; in lib.switch coq.coq-version [ + { case = range "8.14" "8.20"; out = "0.2.0"; } { case = range "8.14" "8.20"; out = "0.1.3"; } ] null; release = { + "0.2.0".sha256 = "sha256-qDRTgWLUvu4x3/d3BDcqo2I4W5ZmLyRiwuY/Tm/FuKA="; "0.1.3".sha256 = "sha256-lElAzW4IuX+BB6ngDjlyKn0MytLRfbhQanB+Lct/WR0="; }; releaseRev = v: "v${v}"; propagatedBuildInputs = [ parsec MenhirLib coq.ocamlPackages.menhir ]; - buildFlags = [ "MENHIRFLAGS=--coq" "MENHIRFLAGS+=--coq-no-version-check" ]; + useDuneifVersion = v: lib.versions.isGe "0.2.0" v || v == "dev"; meta = { description = "From JSON to Coq, and vice versa."; license = lib.licenses.bsd3; }; -} +}).overrideAttrs (o: lib.optionalAttrs (o.version != null + && lib.versions.isLt "0.2.0" o.version) + { buildFlags = [ "MENHIRFLAGS=--coq" "MENHIRFLAGS+=--coq-no-version-check" ]; }) 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 9b5d827eec..292e7e369b 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/parsec/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/parsec/default.nix @@ -11,14 +11,18 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ + { case = range "8.14" "8.20"; out = "0.2.0"; } { 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; + release."0.2.0".sha256 = "sha256-hM6LVFQ2VQ42QeHu8Ex+oz1VvJUr+g8/nZN+bYHEljQ="; release."0.1.2".sha256 = "sha256-QN0h1CsX86DQBDsluXLtNUvMh3r60/0iDSbYam67AhA="; release."0.1.1".sha256 = "sha256:1c0l18s68pzd4c8i3jimh2yz0pqm4g38pca4bm7fr18r8xmqf189"; release."0.1.0".sha256 = "sha256:01avfcqirz2b9wjzi9iywbhz9szybpnnj3672dgkfsimyg9jgnsr"; + useDuneifVersion = v: lib.versions.isGe "0.2.0" v || v == "dev"; + meta = with lib; { description = "Library for serialization to S-expressions"; license = licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/development/cuda-modules/setup-hooks/setup-cuda-hook.sh b/third_party/nixpkgs/pkgs/development/cuda-modules/setup-hooks/setup-cuda-hook.sh index 6e57c7b107..7799d72873 100644 --- a/third_party/nixpkgs/pkgs/development/cuda-modules/setup-hooks/setup-cuda-hook.sh +++ b/third_party/nixpkgs/pkgs/development/cuda-modules/setup-hooks/setup-cuda-hook.sh @@ -54,7 +54,8 @@ setupCUDAToolkit_ROOT() { fi done - export cmakeFlags+=" -DCUDAToolkit_INCLUDE_DIR=$CUDAToolkit_INCLUDE_DIR -DCUDAToolkit_ROOT=$CUDAToolkit_ROOT" + appendToVar cmakeFlags "-DCUDAToolkit_INCLUDE_DIR=$CUDAToolkit_INCLUDE_DIR" + appendToVar cmakeFlags "-DCUDAToolkit_ROOT=$CUDAToolkit_ROOT" } preConfigureHooks+=(setupCUDAToolkit_ROOT) @@ -72,8 +73,8 @@ setupCUDAToolkitCompilers() { # https://cmake.org/cmake/help/latest/envvar/CUDAHOSTCXX.html # https://cmake.org/cmake/help/latest/variable/CMAKE_CUDA_HOST_COMPILER.html - export cmakeFlags+=" -DCUDA_HOST_COMPILER=@ccFullPath@" - export cmakeFlags+=" -DCMAKE_CUDA_HOST_COMPILER=@ccFullPath@" + appendToVar cmakeFlags "-DCUDA_HOST_COMPILER=@ccFullPath@" + appendToVar cmakeFlags "-DCMAKE_CUDA_HOST_COMPILER=@ccFullPath@" # For non-CMake projects: # We prepend --compiler-bindir to nvcc flags. @@ -85,7 +86,7 @@ setupCUDAToolkitCompilers() { export CUDAHOSTCXX="@ccFullPath@"; fi - export NVCC_PREPEND_FLAGS+=" --compiler-bindir=@ccRoot@/bin" + appendToVar NVCC_PREPEND_FLAGS "--compiler-bindir=@ccRoot@/bin" # NOTE: We set -Xfatbin=-compress-all, which reduces the size of the compiled # binaries. If binaries grow over 2GB, they will fail to link. This is a problem for us, as @@ -94,7 +95,7 @@ setupCUDAToolkitCompilers() { # # @SomeoneSerge: original comment was made by @ConnorBaker in .../cudatoolkit/common.nix if [[ -z "${dontCompressFatbin-}" ]]; then - export NVCC_PREPEND_FLAGS+=" -Xfatbin=-compress-all" + appendToVar NVCC_PREPEND_FLAGS "-Xfatbin=-compress-all" fi } preConfigureHooks+=(setupCUDAToolkitCompilers) diff --git a/third_party/nixpkgs/pkgs/development/embedded/edl/default.nix b/third_party/nixpkgs/pkgs/development/embedded/edl/default.nix index 77ac437624..86f27bf6a2 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/edl/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/edl/default.nix @@ -51,7 +51,8 @@ python3Packages.buildPythonPackage { meta = with lib; { homepage = "https://github.com/bkerler/edl"; description = "Qualcomm EDL tool (Sahara / Firehose / Diag)"; - license = licenses.mit; + # See https://github.com/NixOS/nixpkgs/issues/348931 + license = licenses.unfree; maintainers = with maintainers; [ lorenz xddxdd 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 01f448cc73..ac803a8792 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -461,31 +461,33 @@ self: super: { # Manually maintained cachix-api = overrideCabal (drv: { - version = "1.7.4"; + version = "1.7.5"; src = pkgs.fetchFromGitHub { owner = "cachix"; repo = "cachix"; - rev = "v1.7.4"; - sha256 = "sha256-lHy5kgx6J8uD+16SO47dPrbob98sh+W1tf4ceSqPVK4="; + rev = "v1.7.5"; + sha256 = "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs="; }; postUnpack = "sourceRoot=$sourceRoot/cachix-api"; }) super.cachix-api; cachix = (overrideCabal (drv: { - version = "1.7.4"; + version = "1.7.5"; src = pkgs.fetchFromGitHub { owner = "cachix"; repo = "cachix"; - rev = "v1.7.4"; - sha256 = "sha256-lHy5kgx6J8uD+16SO47dPrbob98sh+W1tf4ceSqPVK4="; + rev = "v1.7.5"; + sha256 = "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs="; }; postUnpack = "sourceRoot=$sourceRoot/cachix"; }) (lib.pipe (super.cachix.override { nix = self.hercules-ci-cnix-store.nixPackage; + hnix-store-core = self.hnix-store-core_0_8_0_0; }) [ (addBuildTool self.hercules-ci-cnix-store.nixPackage) (addBuildTool pkgs.buildPackages.pkg-config) + (addBuildDepend self.hnix-store-nar) ] )); diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index 6400e5246a..0b7264e175 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -1431,4 +1431,9 @@ self: super: builtins.intersectAttrs super { "--skip=/Cabal.Paths/paths" ]; }) super.doctest; + + # tracked upstream: https://github.com/snapframework/openssl-streams/pull/11 + # certificate used only 1024 Bit RSA key and SHA-1, which is not allowed in OpenSSL 3.1+ + # security level 2 + openssl-streams = appendPatch ./patches/openssl-streams-cert.patch super.openssl-streams; } 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 5502eb1703..885e78c922 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -124113,7 +124113,7 @@ self: { "gi-javascriptcore" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading - , text, transformers, webkitgtk + , text, transformers, webkitgtk_4_0 }: mkDerivation { pname = "gi-javascriptcore"; @@ -124124,11 +124124,11 @@ self: { base bytestring containers gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ webkitgtk ]; + libraryPkgconfigDepends = [ webkitgtk_4_0 ]; description = "JavaScriptCore bindings"; license = lib.licenses.lgpl21Only; badPlatforms = lib.platforms.darwin; - }) {inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs) webkitgtk_4_0;}; "gi-javascriptcore_6_0_4" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib @@ -124469,7 +124469,7 @@ self: { ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers, webkitgtk + , haskell-gi-overloading, text, transformers, webkitgtk_4_0 }: mkDerivation { pname = "gi-webkit"; @@ -124484,17 +124484,17 @@ self: { gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ webkitgtk ]; + libraryPkgconfigDepends = [ webkitgtk_4_0 ]; description = "WebKit bindings"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - }) {inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs) webkitgtk_4_0;}; "gi-webkit2" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers, webkitgtk + , haskell-gi-overloading, text, transformers, webkitgtk_4_0 }: mkDerivation { pname = "gi-webkit2"; @@ -124509,17 +124509,17 @@ self: { gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ webkitgtk ]; + libraryPkgconfigDepends = [ webkitgtk_4_0 ]; description = "WebKit2 bindings"; license = lib.licenses.lgpl21Only; badPlatforms = lib.platforms.darwin; - }) {inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs) webkitgtk_4_0;}; "gi-webkit2webextension" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdk , gi-gio, gi-gobject, gi-gtk, gi-javascriptcore, gi-soup , haskell-gi, haskell-gi-base, haskell-gi-overloading, text - , transformers, webkitgtk + , transformers, webkitgtk_4_0 }: mkDerivation { pname = "gi-webkit2webextension"; @@ -124534,13 +124534,13 @@ self: { gi-javascriptcore gi-soup haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ webkitgtk ]; + libraryPkgconfigDepends = [ webkitgtk_4_0 ]; description = "WebKit2-WebExtension bindings"; license = lib.licenses.lgpl21Only; badPlatforms = lib.platforms.darwin; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs) webkitgtk_4_0;}; "gi-webkitwebprocessextension" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdk @@ -309518,7 +309518,7 @@ self: { , gi-gtk, gi-webkit2, gtk3, haskell-gi-base, http-types, lens , mime-types, mtl, network, process, random, scientific, split , tasty, tasty-quickcheck, text, transformers, unordered-containers - , utf8-string, vector, webkitgtk, xdg-basedir, xmonad + , utf8-string, vector, webkitgtk_4_0, xdg-basedir, xmonad , xmonad-contrib }: mkDerivation { @@ -309537,7 +309537,7 @@ self: { mime-types mtl network process random scientific split text transformers unordered-containers utf8-string vector xdg-basedir ]; - executablePkgconfigDepends = [ gtk3 webkitgtk ]; + executablePkgconfigDepends = [ gtk3 webkitgtk_4_0 ]; testHaskellDepends = [ aeson base bytestring containers dbus directory filepath gi-gdk gi-gio gi-glib gi-gtk gi-webkit2 haskell-gi-base http-types lens @@ -309550,7 +309550,7 @@ self: { hydraPlatforms = lib.platforms.none; mainProgram = "tianbar"; broken = true; - }) {inherit (pkgs) gtk3; inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs) gtk3; inherit (pkgs) webkitgtk_4_0;}; "tibetan-utils" = callPackage ({ mkDerivation, base, composition-prelude, hspec, hspec-megaparsec @@ -332056,30 +332056,30 @@ self: { setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ webkit ]; - description = "JavaScriptCore FFI from webkitgtk"; + description = "JavaScriptCore FFI from webkitgtk_4_0"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; }) {webkit = null;}; "webkit2gtk3-javascriptcore" = callPackage - ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }: + ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk_4_0 }: mkDerivation { pname = "webkit2gtk3-javascriptcore"; version = "0.14.4.6"; sha256 = "06g9ik2pzv761bj5kas17jxh6wxks3dd4vvrimliybs5s5b61b24"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; - libraryPkgconfigDepends = [ webkitgtk ]; - description = "JavaScriptCore FFI from webkitgtk"; + libraryPkgconfigDepends = [ webkitgtk_4_0 ]; + description = "JavaScriptCore FFI from webkitgtk_4_0"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; - }) {inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs) webkitgtk_4_0;}; "webkitgtk3" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, glib , gtk2hs-buildtools, gtk3, mtl, pango, text, transformers - , webkitgtk + , webkitgtk_4_0 }: mkDerivation { pname = "webkitgtk3"; @@ -332090,27 +332090,27 @@ self: { libraryHaskellDepends = [ base bytestring cairo glib gtk3 mtl pango text transformers ]; - libraryPkgconfigDepends = [ webkitgtk ]; + libraryPkgconfigDepends = [ webkitgtk_4_0 ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the Webkit library"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs) webkitgtk_4_0;}; "webkitgtk3-javascriptcore" = callPackage - ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }: + ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk_4_0 }: mkDerivation { pname = "webkitgtk3-javascriptcore"; version = "0.14.2.1"; sha256 = "0kcjrka0c9ifq3zfhmkv05wy3xb7v0cyznfxldp2gjcn1haq084j"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; - libraryPkgconfigDepends = [ webkitgtk ]; - description = "JavaScriptCore FFI from webkitgtk"; + libraryPkgconfigDepends = [ webkitgtk_4_0 ]; + description = "JavaScriptCore FFI from webkitgtk_4_0"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - }) {inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs) webkitgtk_4_0;}; "webmention" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, either diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/patches/openssl-streams-cert.patch b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/openssl-streams-cert.patch new file mode 100644 index 0000000000..2a668e6d14 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/openssl-streams-cert.patch @@ -0,0 +1,137 @@ +From ae9f8db059b6093092f6bd5155d55557c0892a4e Mon Sep 17 00:00:00 2001 +From: Markus Theil +Date: Sat, 5 Oct 2024 11:44:45 +0200 +Subject: [PATCH] regenerate test certificate to work with OpenSSL security + level 2 + +Signed-off-by: Markus Theil +--- + test/cert.pem | 43 ++++++++++++++++++++++++--------- + test/key.pem | 67 +++++++++++++++++++++++++++++++++++++++------------ + 2 files changed, 83 insertions(+), 27 deletions(-) + +diff --git a/test/cert.pem b/test/cert.pem +index 13a87f5..a9dd418 100644 +--- a/test/cert.pem ++++ b/test/cert.pem +@@ -1,14 +1,33 @@ + -----BEGIN CERTIFICATE----- +-MIICOzCCAaQCCQChUcwtek3F7DANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQGEwJD +-SDEPMA0GA1UECAwGWnVyaWNoMQ8wDQYDVQQHDAZadXJpY2gxFzAVBgNVBAoMDlNu +-YXAgRnJhbWV3b3JrMRgwFgYDVQQDDA9HcmVnb3J5IENvbGxpbnMwHhcNMTAxMjEx +-MTk1MjA0WhcNMzgwNDI3MTk1MjA0WjBiMQswCQYDVQQGEwJDSDEPMA0GA1UECAwG +-WnVyaWNoMQ8wDQYDVQQHDAZadXJpY2gxFzAVBgNVBAoMDlNuYXAgRnJhbWV3b3Jr +-MRgwFgYDVQQDDA9HcmVnb3J5IENvbGxpbnMwgZ8wDQYJKoZIhvcNAQEBBQADgY0A +-MIGJAoGBAMcWrmVJ0xn3JcKf+b8Y+Bs+rRacodl/R+N7UJXTyfkByB7bzN6VR2h8 +-oRYJu7DhETs/w4o/Af9vNwsJBJVovcbV6FAAbl45TMDq2QZVtPwwTDi8R52QbRIR +-WBxge3aHeMUz1hV32iMzGPVe4jKSaO2KcbVOFphwc8VmA59GvShfAgMBAAEwDQYJ +-KoZIhvcNAQEFBQADgYEAXsRchaVlL4RP5V+r1npL7n4W3Ge2O7F+fQ2dX6tNyqeo +-tMAdc6wYahg3m+PejWASVCh0vVEjBx2WYOMRPsmk/DYLUi4UwZYPrvZtbfSbMrD+ +-mYmZhqCDM4316qAg5OwcTON3+VZXMwbXCVM+vUCvZIw4xh6ywNjvuQjCzy7oKMg= ++MIIFpTCCA42gAwIBAgIUJuFs2fMmpGUlm+CT7l6v2LdnpeEwDQYJKoZIhvcNAQEL ++BQAwYjELMAkGA1UEBhMCQ0gxDzANBgNVBAgMBlp1cmljaDEPMA0GA1UEBwwGWnVy ++aWNoMRcwFQYDVQQKDA5TbmFwIEZyYW1ld29yazEYMBYGA1UEAwwPR3JlZ29yeSBD ++b2xsaW5zMB4XDTI0MTAwNTA5NDM1NFoXDTQ0MDkzMDA5NDM1NFowYjELMAkGA1UE ++BhMCQ0gxDzANBgNVBAgMBlp1cmljaDEPMA0GA1UEBwwGWnVyaWNoMRcwFQYDVQQK ++DA5TbmFwIEZyYW1ld29yazEYMBYGA1UEAwwPR3JlZ29yeSBDb2xsaW5zMIICIjAN ++BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA26OMdBRG9IybxVYY49z5xp4adabK ++QKMgBctSbY9+AXQ8dR0mPswQRMNG0upQyJJPTFXUBvKr2N2K00XbWIMifwhCfkBo ++9/JsOuQLNH1Dc627/amx9fuRrJJBnVUOZ9YOg9ytjaItXQ0rngv+lz8EH8IL8SB5 ++AQJr+MRRNr5JD44+/+au3oyL3eoDkb/MT3y2dyUCX7Kuk49h5iiTsPDp6DLQLxl2 ++YegJNh67qrw0gBSjhB0s0Yv7EqVeKTNEx89SkIdOSXh+S3Sf1foAU0Aq3v0a6aIh ++MLrN5Fo3TjQbhF9mlRjYZOM7HbrZsz7X6t77y9Ac4lgFWhbrCdtKFnwP3X1qHAou ++jfzwmnC7Z7h7rzoS0opjE29UcuOPaA7Jw/rbl3SpAab1UVVhOdMxvkJ+gshdJT8W ++uAoovhuyhtimM7l4vkwPqSD5y+h+zNiW5Lx1H1kAsyHeQ8zOI/wnuW4VjvhUb/Q+ ++LZWXmzEBZdGXZloj11py6B3b83atHU+R2LZQnDhnjU15JBG7WN7/anExz3Q7rRfs ++oYHa5qoV+sol53VIJDj+6nsJGfbr1WAonLxDOc8B3E7uu6fGSLeoTZj+hKCZhhsD ++1jnlGG1skpYqf+ECXgq8TGlFRjn6ae3Z7Tq/UFu0a+cbsHHBSUwKG17mtaaqbDeY ++8kWUWNDKtUSewb0CAwEAAaNTMFEwHQYDVR0OBBYEFDj0ry4aPDK4/pbxzbLdUrtN ++4EuXMB8GA1UdIwQYMBaAFDj0ry4aPDK4/pbxzbLdUrtN4EuXMA8GA1UdEwEB/wQF ++MAMBAf8wDQYJKoZIhvcNAQELBQADggIBACct1UKUYYORYcjV96HuPVQSN00iLLUj ++C2QWfF2rF6sToX46oEHfwtIpBT3kATB2G8Ltt5OBohek0eLpGIaJyMYlhiRb6ubz ++O8jcgD2d0FKEBAIEYK+UvuKakWKY3C72zNzL89KOkCqS5o8dYXhMtxPi/ncAdyUa ++jIKHhZx1gYIkaYRVgnnLk4NrpIH3WZmwGj5y/k8ha4vvbfg4pf04FAWliqmD+30E ++qyF0GtxhVN7ZffEn610i9DCsxQet5DiThlZMB9gSZK0VqvTdaKR7qmAohEe5mKBr ++/MbERm8E36B1sW3uGTJLu/irFZtoez2IYNBJaatkKjk3bv+cHKV3E/VTKMMKFtLS ++poLtaAZpuLr4Lg1RS1dCU2f6NaNYuKl30ROAf8ro++8Rnn1WMVc+8x3EhyMJzJYT +++NLnB+8PnoOj2jkc0lY+AqbwSREIivRoN1frbqHfsyZc8Mkds1FUCHLun77LMBVi ++HwmG1frnJ6X9actf1sQqXSqD0URenqTpZSu8YKAkhH3oaKm5I0IyYUeynCk1ck8G ++PyiRk2sj4II7nrzZOCJSJsgDweZdqoul3qKki4V/4+sMgmsAIHJYy/nCwl1HThQ8 ++XY15cF3dnf1bcly1ooj7bL4DrPuG1oWpzDIlIkJ+ZTsPrKK3/Vy2pUkklKowmq3w ++qHcAZ2oKVR1s + -----END CERTIFICATE----- +diff --git a/test/key.pem b/test/key.pem +index 3db6603..ef99b04 100644 +--- a/test/key.pem ++++ b/test/key.pem +@@ -1,15 +1,52 @@ +------BEGIN RSA PRIVATE KEY----- +-MIICXgIBAAKBgQDHFq5lSdMZ9yXCn/m/GPgbPq0WnKHZf0fje1CV08n5Acge28ze +-lUdofKEWCbuw4RE7P8OKPwH/bzcLCQSVaL3G1ehQAG5eOUzA6tkGVbT8MEw4vEed +-kG0SEVgcYHt2h3jFM9YVd9ojMxj1XuIykmjtinG1ThaYcHPFZgOfRr0oXwIDAQAB +-AoGBAIr+p9UpfIvFRASkYd3sFdQXpwqBYnIR7ePBBVsFWR5TAx+gP2ErAYbOdDyJ +-oRN1nu0psGBFaySlxd0bd6rETLFXMWbA0uDJcqASrlsOhsbhgPH7aExYfAi7eX8h +-FAwD//j2E1sS6WvNWu0YANKR2yrM9R0vcbt0GF7hlmyV7lhRAkEA+6DCI6nfbdvR +-jkvaxzOdC9jY/eBI9a4BbyjPLUSlTuQsGrp6s0Sj1LOQscItzqkPSutugM3f1dlG +-lqq31/fnqQJBAMqMOknRBlOZY8DBfCorvNXAjIenoqlqE1D4yTL+tE5C3zEyvTcF +-jPAaX220vf1OkL1bX4jKUxx8uXIqiYND9McCQQCWoWWWc9qMqUqJJF+TYBJjRSyg +-zeLfL4ssQAHF15Id5/l/BqLtLenlKpkz0EobrJi7ALTl5lhYa/kVuJzVbFIBAkEA +-shE17U9mUHi5yexQTILHMORmp5wo1Of8s2ME/2ANBACmV4pT7ttiXHPTEY+kt90q +-Qk7iXlABYToFjuj2nABSYQJAO6W9P18mM2p6vkiBuNReW6VN/ftYqq5TLK3hXh2Q +-0d5v0eW9ce7CiQueH5kxq44EVVTIDiVLe2pk+BQIntMC8w== +------END RSA PRIVATE KEY----- ++-----BEGIN PRIVATE KEY----- ++MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDbo4x0FEb0jJvF ++Vhjj3PnGnhp1pspAoyAFy1Jtj34BdDx1HSY+zBBEw0bS6lDIkk9MVdQG8qvY3YrT ++RdtYgyJ/CEJ+QGj38mw65As0fUNzrbv9qbH1+5GskkGdVQ5n1g6D3K2Noi1dDSue ++C/6XPwQfwgvxIHkBAmv4xFE2vkkPjj7/5q7ejIvd6gORv8xPfLZ3JQJfsq6Tj2Hm ++KJOw8OnoMtAvGXZh6Ak2HruqvDSAFKOEHSzRi/sSpV4pM0THz1KQh05JeH5LdJ/V +++gBTQCre/RrpoiEwus3kWjdONBuEX2aVGNhk4zsdutmzPtfq3vvL0BziWAVaFusJ ++20oWfA/dfWocCi6N/PCacLtnuHuvOhLSimMTb1Ry449oDsnD+tuXdKkBpvVRVWE5 ++0zG+Qn6CyF0lPxa4Cii+G7KG2KYzuXi+TA+pIPnL6H7M2JbkvHUfWQCzId5DzM4j ++/Ce5bhWO+FRv9D4tlZebMQFl0ZdmWiPXWnLoHdvzdq0dT5HYtlCcOGeNTXkkEbtY ++3v9qcTHPdDutF+yhgdrmqhX6yiXndUgkOP7qewkZ9uvVYCicvEM5zwHcTu67p8ZI ++t6hNmP6EoJmGGwPWOeUYbWySlip/4QJeCrxMaUVGOfpp7dntOr9QW7Rr5xuwccFJ ++TAobXua1pqpsN5jyRZRY0Mq1RJ7BvQIDAQABAoICAAIB114rM5p3W31nmUV3Ju2J ++Uy6+kLbGVtv+skOP42P82DLuH9lEkPnT5VvhlM3pxQw/9OFVtTt/i3h9TlvGIln8 ++rRY4HU12G3DuqxSLzYKV30kvlGcDVB7lMkYkuW46VE/LrpFZXqaXoM2qXeVWHSye ++H8ZQbef+tJZlfY7YGSpUJOAT+gaiIa1sPqPwbQalRN9HXmNvVQLtCpppcK9rWt6K ++nQDv2mIFgRS2c1rEKrWomqBHNPo67YHg3YCtDYScRiyjHpRzeQdUVZlFa4cskl0P ++J+sOgSpPwWMZbkvKaZ2hfTpBFnSA6Bt63OjzWtKfFDgrWsw4Z4odz1WRJGGauM62 ++HwroFPCXCit2KCieu23hmsy+Bzh9kdKby8Y3IIdCkTxpslc8au5Psz9uETOXCRwG ++XrANA+OjIawNb3M6Lp3//F07V5eTdWNGrkCByfe0O6/tbnQXPnpqb4u39mnRDQgM ++O69TUCZNaHFQoN7cVJl6hMM6+i3ymMbNOk46hqiqe12KeO8iN/kp/GyGKEP0+H+K ++K2xniIYvm4s+1BE4klkU3S1TQhlZInYu5DFKtGb++n2+UfUlC6bLvA7aAh0K/yOC ++zECPZV8InyTwOaom/CHfWEnBUSEvqvaw/r1DNYqsRR8QSFzlNxx7rDwcEsfy0rJt ++0Ru9jSGCYBRR/EeBHY5JAoIBAQDvqF0K5k/WUIRdybygi22pkEcXbajC0s0Z7Wm/ ++/Uh2zOw2tDv2wfN26Jk9YvPFuZzkgTZSSHBtVHLaju8LXzIDtbD7990KyWKTm/QX ++ynm/Depp7HWbKVxgWAa0Q0DNUNl/vTGHtj9MDGYx798GzGfrQvIs50jBvjnw1QcN +++vkNkkEFTOc3XYKWdPMsqfUowgVC73aiK3Bq1g514F5hj6OPuiyAbrWluS0jsOLG ++fWGbo9Aw7PmAD8oCjrkpGslLuIVjw0j9Ro0o6iK8+5rzdyai5WsSRBeBsBw5N3pg ++OzDXiBm8mfu9TDk7O7ZXM9Jw/jrV5lGks+XHMsPm1Flrtx7pAoIBAQDqnbj1uwH/ ++Z1fd4+hVygXsHju77IoSx5mgSuXhDn+tl35IbUR0rgPNNLc/TVo4FHuJuKHdH3/G ++un9tYLfo/CCMZOMM/Tlh5ZSm1d9BCniCxlmbdXka5DXJ34TTAL2ssdwBagRmaj7n ++8o1EhOdqB+DszGoLWm2NUXPZOFCaMD30vjQ6xeY+YkePCsPpffr4YeTDtgsX7URE ++sTNfyAXtK5boQg1VkowlAP+EYqggnu10sOn3Hddxq2YHTi2cCDSSuctCfqyvfVea ++LudIh5pIfwxie8w09znMxKJhUij1duRcv+L9z/O+zjSW2gPPlvqgw7gcg3cCp1RM +++WGX9V2jPE+1AoIBAGL+echp0CqnwbV4AmmSjm7PQP5ldqNbLgt6rQb4Gbmw9hW2 ++p1pLTUUd2UapHCbdf/hHg2fDsmUG0BaFmippXSB5Ka06+lxdSVHNxqsZIOcRWXX9 ++jarVD+pgEgzeBuOIdP816EK1vjmsmX4hJlAJmRdt5Nk1hDE7YXWgmTRmKgA4HJGS ++7aNKBgoeLuCRJ8p5MnEutyNPrDUFTJ3WW0YTbi2Napp2oKPe9M1cYKA65FnE9ddv ++27PRUdFyoPtgrCuSAc9uuDSesupmpIjJqXzOB/CbsXmvFMKmO1JLH0qmyIsPFgp4 ++1Kqh1LYp+SzWJCQ2b5kxdSICiXSZ/J/ZsUI0NxkCggEBAKzYSd1vSod5ATjNoOsj ++DL3pgCRwnUA8oKeAxl7JqbKf+z8skNRNJyvU/HO8bw0FugW6ajVX8XDdEOfp61PP +++8KyyLtXCyFeW+eVhQaLykC+FGH9Z50yJ5Zz/4zb7OD/n4/DJT62Y2XKQd0K9Noe ++t8x8xFtc4XzNV0XewTL2+44FWsE57uhiy0lMqwyn7W9z3293/DBCcpsQ2UJlQEh8 ++Zo7xqpUyg+D3HUfQzwBJVbM0awnNiF2L4nzbUaq0ONcn3eE9Jceb1iAXEflTPYzP ++XLZpcgZLZN/AtchxGQ/N6WuTSo2m2HHnxMKmF0ymdDpgNpF7IQBpeifDSe0DrVqH ++IkkCggEBAKdRzi+vHk2sNAM+oRt6wnSxmVi38YhqQY3jB/BUKrmG9yeU/5NrLnLV ++UHEw8X+bAIaDXcjW8nH9l8mmCpWRv6Atk69KCAYCnyHkDmMjyEbFkG+VW1mJKeQD ++J7MA8QMwg8nW3t6GdyGNupLP65EIVaOd0+W27qzHOinWq/vlrJLi7DAk7ZxDbZxa ++YsE0Dy6oko0M0cN+NhgfsOE2/E9u3u+OfM7WqJjvKs7nPBh1mlSmGXB0srbsdF5X ++zSi2PxEM87K9FjhwdLRg1Wgq1hqK5xeFpvQETd5dCwrbPDnWd4H91jycquVQ29+f ++F3fTQNKQ93zJWtUhTUSPO2BzPnZh8UE= ++-----END PRIVATE KEY----- +-- +2.46.0 + diff --git a/third_party/nixpkgs/pkgs/development/interpreters/angelscript/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/angelscript/default.nix index 24ac89eb4c..9e38dc8d28 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/angelscript/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/angelscript/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "angelscript"; - version = "2.36.1"; + version = "2.37.0"; src = fetchurl { url = "https://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip"; - sha256 = "sha256-WLt0mvnH44YwRwX05uYnrkHf4D4LanPD0NLgF8T8lI8="; + sha256 = "sha256-DFLRaIAWoLJITpylSUccTild8GB3DFeEAUTGSBX1TxA="; }; nativeBuildInputs = [ unzip cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/octave/hooks/octave-write-required-octave-packages-hook.sh b/third_party/nixpkgs/pkgs/development/interpreters/octave/hooks/octave-write-required-octave-packages-hook.sh index 64e87d6824..fb808485a3 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/octave/hooks/octave-write-required-octave-packages-hook.sh +++ b/third_party/nixpkgs/pkgs/development/interpreters/octave/hooks/octave-write-required-octave-packages-hook.sh @@ -13,5 +13,5 @@ octaveWriteRequiredOctavePackagesPhase() { # Yes its a bit long... if [ -z "${dontWriteRequiredOctavePackagesPhase-}" ]; then echo "Using octaveWriteRequiredOctavePackagesPhase" - preDistPhases+=" octaveWriteRequiredOctavePackagesPhase" + appendToVar preDistPhases octaveWriteRequiredOctavePackagesPhase fi diff --git a/third_party/nixpkgs/pkgs/development/interpreters/octave/hooks/write-required-octave-packages-hook.sh b/third_party/nixpkgs/pkgs/development/interpreters/octave/hooks/write-required-octave-packages-hook.sh index 032ea398ac..6c5de6e4fc 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/octave/hooks/write-required-octave-packages-hook.sh +++ b/third_party/nixpkgs/pkgs/development/interpreters/octave/hooks/write-required-octave-packages-hook.sh @@ -13,5 +13,5 @@ writeRequiredOctavePackagesPhase() { # Yes its a bit long... if [ -z "${dontWriteRequiredOctavePackagesPhase-}" ]; then echo "Using writeRequiredOctavePackagesPhase" - preDistPhases+=" writeRequiredOctavePackagesPhase" + appendToVar preDistPhases writeRequiredOctavePackagesPhase fi diff --git a/third_party/nixpkgs/pkgs/development/interpreters/perl/cross540.patch b/third_party/nixpkgs/pkgs/development/interpreters/perl/cross540.patch new file mode 100644 index 0000000000..0736c16d4f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/perl/cross540.patch @@ -0,0 +1,224 @@ +From: =?UTF-8?q?Christian=20K=C3=B6gler?= +Date: Mon, 10 Apr 2023 22:12:24 +0200 +Subject: [PATCH] miniperl compatible modules + +CPAN::Meta +ExtUtils::MakeMaker +JSON::PP +Data::Dumper + +Updated for perl v5.40.0 by marcus@means.no + +--- + + # safe if given an unblessed reference +diff --git a/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm b/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm +index 746abd63bc..c55d7cd2d0 100644 +--- a/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm ++++ b/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm +@@ -1,6 +1,7 @@ + use 5.008001; # sane UTF-8 support + use strict; + use warnings; ++no warnings 'experimental::builtin'; + package CPAN::Meta::YAML; # git description: v1.68-2-gcc5324e + # XXX-INGY is 5.8.1 too old/broken for utf8? + # XXX-XDG Lancaster consensus was that it was sufficient until +@@ -650,27 +651,29 @@ sub _dump_string { + join '', map { "$_\n" } @lines; + } + +-sub _has_internal_string_value { ++# taken from cpan/JSON-PP/lib/JSON/PP.pm ++sub _looks_like_number { + my $value = shift; +- my $b_obj = B::svref_2object(\$value); # for round trip problem +- return $b_obj->FLAGS & B::SVf_POK(); ++ no warnings 'numeric'; ++ # if the utf8 flag is on, it almost certainly started as a string ++ return if utf8::is_utf8($value); ++ # detect numbers ++ # string & "" -> "" ++ # number & "" -> 0 (with warning) ++ # nan and inf can detect as numbers, so check with * 0 ++ return unless length((my $dummy = "") & $value); ++ return unless 0 + $value eq $value; ++ return 1 if $value * 0 == 0; ++ return -1; # inf/nan + } + + sub _dump_scalar { + my $string = $_[1]; + my $is_key = $_[2]; +- # Check this before checking length or it winds up looking like a string! +- my $has_string_flag = _has_internal_string_value($string); + return '~' unless defined $string; + return "''" unless length $string; +- if (Scalar::Util::looks_like_number($string)) { +- # keys and values that have been used as strings get quoted +- if ( $is_key || $has_string_flag ) { +- return qq['$string']; +- } +- else { +- return $string; +- } ++ if (_looks_like_number($string)) { ++ return qq['$string']; + } + if ( $string =~ /[\x00-\x09\x0b-\x0d\x0e-\x1f\x7f-\x9f\'\n]/ ) { + $string =~ s/\\/\\\\/g; +@@ -800,9 +803,6 @@ sub errstr { + # Helper functions. Possibly not needed. + + +-# Use to detect nv or iv +-use B; +- + # XXX-INGY Is flock CPAN::Meta::YAML's responsibility? + # Some platforms can't flock :-( + # XXX-XDG I think it is. When reading and writing files, we ought +@@ -822,35 +822,8 @@ sub _can_flock { + } + } + +- +-# XXX-INGY Is this core in 5.8.1? Can we remove this? +-# XXX-XDG Scalar::Util 1.18 didn't land until 5.8.8, so we need this +-##################################################################### +-# Use Scalar::Util if possible, otherwise emulate it +- +-use Scalar::Util (); + BEGIN { +- local $@; +- if ( eval { Scalar::Util->VERSION(1.18); } ) { +- *refaddr = *Scalar::Util::refaddr; +- } +- else { +- eval <<'END_PERL'; +-# Scalar::Util failed to load or too old +-sub refaddr { +- my $pkg = ref($_[0]) or return undef; +- if ( !! UNIVERSAL::can($_[0], 'can') ) { +- bless $_[0], 'Scalar::Util::Fake'; +- } else { +- $pkg = undef; +- } +- "$_[0]" =~ /0x(\w+)/; +- my $i = do { no warnings 'portable'; hex $1 }; +- bless $_[0], $pkg if defined $pkg; +- $i; +-} +-END_PERL +- } ++ *refaddr = *builtin::refaddr; + } + + delete $CPAN::Meta::YAML::{refaddr}; +diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm +index 3604eae402..991f69d275 100644 +--- a/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm ++++ b/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm +@@ -1,12 +1,13 @@ + use strict; + use warnings; ++no warnings 'experimental::builtin'; + + package CPAN::Meta::Merge; + + our $VERSION = '2.150010'; + + use Carp qw/croak/; +-use Scalar::Util qw/blessed/; ++use builtin qw/blessed/; + use CPAN::Meta::Converter 2.141170; + + sub _is_identical { +diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm +index d4e93fd8a5..809da68d02 100644 +--- a/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm ++++ b/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm +@@ -1,6 +1,7 @@ + use 5.006; + use strict; + use warnings; ++no warnings 'experimental::builtin'; + package CPAN::Meta::Prereqs; + + our $VERSION = '2.150010'; +@@ -14,7 +15,6 @@ our $VERSION = '2.150010'; + #pod =cut + + use Carp qw(confess); +-use Scalar::Util qw(blessed); + use CPAN::Meta::Requirements 2.121; + + #pod =method new +@@ -168,7 +168,12 @@ sub types_in { + sub with_merged_prereqs { + my ($self, $other) = @_; + +- my @other = blessed($other) ? $other : @$other; ++ eval 'require Scalar::Util'; ++ my @other = unless($@){ ++ Scalar::Util::blessed($other) ? $other : @$other; ++ }else{ ++ builtin::blessed($other) ? $other : @$other; ++ } + + my @prereq_objs = ($self, @other); + +diff --git a/cpan/JSON-PP/lib/JSON/PP.pm b/cpan/JSON-PP/lib/JSON/PP.pm +index fc8fcbc8f0..cda7b90c65 100644 +--- a/cpan/JSON-PP/lib/JSON/PP.pm ++++ b/cpan/JSON-PP/lib/JSON/PP.pm +@@ -4,6 +4,7 @@ package JSON::PP; + + use 5.008; + use strict; ++no warnings 'experimental::builtin'; + + use Exporter (); + BEGIN { our @ISA = ('Exporter') } +diff --git a/dist/Data-Dumper/Dumper.pm b/dist/Data-Dumper/Dumper.pm +index bb6d3caedb..0c2fde4743 100644 +--- a/dist/Data-Dumper/Dumper.pm ++++ b/dist/Data-Dumper/Dumper.pm +@@ -11,6 +11,7 @@ package Data::Dumper; + + use strict; + use warnings; ++no warnings 'experimental::builtin'; + + #$| = 1; + +@@ -125,8 +126,7 @@ sub new { + # Packed numeric addresses take less memory. Plus pack is faster than sprintf + + sub format_refaddr { +- require Scalar::Util; +- pack "J", Scalar::Util::refaddr(shift); ++ pack "J", builtin::refaddr(shift); + }; + + # +@@ -282,9 +282,8 @@ sub _dump { + warn "WARNING(Freezer method call failed): $@" if $@; + } + +- require Scalar::Util; +- my $realpack = Scalar::Util::blessed($val); +- my $realtype = $realpack ? Scalar::Util::reftype($val) : ref $val; ++ my $realpack = builtin::blessed($val); ++ my $realtype = $realpack ? builtin::reftype($val) : ref $val; + $id = format_refaddr($val); + + # Note: By this point $name is always defined and of non-zero length. +@@ -576,7 +575,7 @@ sub _dump { + # here generates a different result. So there are actually "three" different + # implementations of Data::Dumper (kind of sort of) but we only test two. + elsif (!defined &_vstring +- and ref $ref eq 'VSTRING' || eval{Scalar::Util::isvstring($val)}) { ++ and ref $ref eq 'VSTRING') { + $out .= sprintf "v%vd", $val; + } + # \d here would treat "1\x{660}" as a safe decimal number diff --git a/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix index 76a51dc8cb..8fd99172be 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix @@ -54,14 +54,6 @@ let }; in rec { - # Maint version - perl536 = callPackage ./interpreter.nix { - self = perl536; - version = "5.36.3"; - sha256 = "sha256-8qGtiBFjkaF2Ji3ULfxS7yKvtA9MDpgQ8V1WHm8ccmo="; - inherit passthruFun; - }; - # Maint version perl538 = callPackage ./interpreter.nix { self = perl538; @@ -69,4 +61,12 @@ in rec { sha256 = "sha256-oKMVNEUet7g8fWWUpJdUOlTUiLyQygD140diV39AZV4="; inherit passthruFun; }; + + # Maint version + perl540 = callPackage ./interpreter.nix { + self = perl540; + version = "5.40.0"; + sha256 = "sha256-x0A0jzVzljJ6l5XT6DI7r9D+ilx4NfwcuroMyN/nFh8="; + inherit passthruFun; + }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/perl/http-tiny-verify-ssl-by-default.patch b/third_party/nixpkgs/pkgs/development/interpreters/perl/http-tiny-verify-ssl-by-default.patch deleted file mode 100644 index 5924806151..0000000000 --- a/third_party/nixpkgs/pkgs/development/interpreters/perl/http-tiny-verify-ssl-by-default.patch +++ /dev/null @@ -1,79 +0,0 @@ -Patch for HTTP::Tiny that defaults verify_SSL to 1 - -Based on proposed Debian patch by Dominic Hargreaves: -https://salsa.debian.org/perl-team/interpreter/perl/-/commit/1490431e40e22052f75a0b3449f1f53cbd27ba92 - - -diff --git a/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm b/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm -index 5803e4599..88ba51461 100644 ---- a/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm -+++ b/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm -@@ -40,7 +40,7 @@ sub _croak { require Carp; Carp::croak(@_) } - #pod * C — Request timeout in seconds (default is 60) If a socket open, - #pod read or write takes longer than the timeout, an exception is thrown. - #pod * C — A boolean that indicates whether to validate the SSL --#pod certificate of an C — connection (default is false) -+#pod certificate of an C — connection (default is true) - #pod * C — A hashref of C — options to pass through to - #pod L - #pod -@@ -112,7 +112,7 @@ sub new { - max_redirect => 5, - timeout => defined $args{timeout} ? $args{timeout} : 60, - keep_alive => 1, -- verify_SSL => $args{verify_SSL} || $args{verify_ssl} || 0, # no verification by default -+ verify_SSL => $args{verify_SSL} // $args{verify_ssl} // 1, # verification by default - no_proxy => $ENV{no_proxy}, - }; - -@@ -1038,7 +1038,7 @@ sub new { - timeout => 60, - max_line_size => 16384, - max_header_lines => 64, -- verify_SSL => 0, -+ verify_SSL => 1, - SSL_options => {}, - %args - }, $class; -@@ -1765,7 +1765,7 @@ C — Request timeout in seconds (default is 60) If a socket open, read - - =item * - --C — A boolean that indicates whether to validate the SSL certificate of an C — connection (default is false) -+C — A boolean that indicates whether to validate the SSL certificate of an C — connection (default is true) - - =item * - -@@ -2035,7 +2035,7 @@ Verification of server identity - - =back - --B. -+B. - - Server identity verification is controversial and potentially tricky because it - depends on a (usually paid) third-party Certificate Authority (CA) trust model -@@ -2043,16 +2043,14 @@ to validate a certificate as legitimate. This discriminates against servers - with self-signed certificates or certificates signed by free, community-driven - CA's such as L. - --By default, HTTP::Tiny does not make any assumptions about your trust model, --threat level or risk tolerance. It just aims to give you an encrypted channel --when you need one. -- - Setting the C attribute to a true value will make HTTP::Tiny verify - that an SSL connection has a valid SSL certificate corresponding to the host - name of the connection and that the SSL certificate has been verified by a CA. - Assuming you trust the CA, this will protect against a L. If you are --concerned about security, you should enable this option. -+attack|http://en.wikipedia.org/wiki/Man-in-the-middle_attack>. -+ -+If you are not concerned about security, and this default in NixOS causes -+problems, you should disable this option. - - Certificate verification requires a file containing trusted CA certificates. - --- - - diff --git a/third_party/nixpkgs/pkgs/development/interpreters/perl/interpreter.nix b/third_party/nixpkgs/pkgs/development/interpreters/perl/interpreter.nix index 23336cb8f4..b10ba2b1f2 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/perl/interpreter.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/perl/interpreter.nix @@ -28,7 +28,7 @@ assert (enableCrypt -> (libxcrypt != null)); let - crossCompiling = stdenv.buildPlatform != stdenv.hostPlatform; + crossCompiling = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr"; libcInc = lib.getDev libc; libcLib = lib.getLib libc; @@ -62,17 +62,15 @@ stdenv.mkDerivation (rec { disallowedReferences = [ stdenv.cc ]; - patches = - # Enable TLS/SSL verification in HTTP::Tiny by default - lib.optional (lib.versionOlder version "5.38.0") ./http-tiny-verify-ssl-by-default.patch - + patches = [] # Do not look in /usr etc. for dependencies. - ++ lib.optional (lib.versionOlder version "5.38.0") ./no-sys-dirs-5.31.patch - ++ lib.optional (lib.versionAtLeast version "5.38.0") ./no-sys-dirs-5.38.0.patch + ++ lib.optional ((lib.versions.majorMinor version) == "5.38") ./no-sys-dirs-5.38.0.patch + ++ lib.optional ((lib.versions.majorMinor version) == "5.40") ./no-sys-dirs-5.40.0.patch ++ lib.optional stdenv.hostPlatform.isSunOS ./ld-shared.patch ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ] - ++ lib.optional crossCompiling ./cross.patch; + ++ lib.optional (crossCompiling && (lib.versionAtLeast version "5.40.0")) ./cross540.patch + ++ lib.optional (crossCompiling && (lib.versionOlder version "5.40.0")) ./cross.patch; # This is not done for native builds because pwd may need to come from # bootstrap tools when building bootstrap perl. @@ -97,25 +95,38 @@ stdenv.mkDerivation (rec { # Miniperl needs -lm. perl needs -lrt. configureFlags = (if crossCompiling - then [ "-Dlibpth=\"\"" "-Dglibpth=\"\"" "-Ddefault_inc_excludes_dot" ] - else [ "-de" "-Dcc=cc" ]) + then [ + "-Dlibpth=\"\"" + "-Dglibpth=\"\"" + "-Ddefault_inc_excludes_dot" + ] + else ([ + "-de" + "-Dprefix=${placeholder "out"}" + "-Dman1dir=${placeholder "out"}/share/man/man1" + "-Dman3dir=${placeholder "out"}/share/man/man3" + ] ++ + (if (stdenv.cc.targetPrefix != "") + then [ + "-Dcc=${stdenv.cc.targetPrefix}cc" + "-Dnm=${stdenv.cc.targetPrefix}nm" + "-Dar=${stdenv.cc.targetPrefix}ar" + ] + else [ + "-Dcc=cc" + "-Duseshrplib" + ]))) ++ [ "-Uinstallusrbinperl" "-Dinstallstyle=lib/perl5" - ] ++ lib.optional (!crossCompiling) "-Duseshrplib" ++ [ "-Dlocincpth=${libcInc}/include" "-Dloclibpth=${libcLib}/lib" ] + ++ lib.optional stdenv.hostPlatform.isStatic "-Uusedl" ++ lib.optionals ((builtins.match ''5\.[0-9]*[13579]\..+'' version) != null) [ "-Dusedevel" "-Uversiononly" ] ++ lib.optional stdenv.hostPlatform.isSunOS "-Dcc=gcc" ++ lib.optional enableThreading "-Dusethreads" ++ lib.optional (!enableCrypt) "-A clear:d_crypt_r" - ++ lib.optional stdenv.hostPlatform.isStatic "--all-static" - ++ lib.optionals (!crossCompiling) [ - "-Dprefix=${placeholder "out"}" - "-Dman1dir=${placeholder "out"}/share/man/man1" - "-Dman3dir=${placeholder "out"}/share/man/man3" - ] ++ lib.optionals (stdenv.hostPlatform.isFreeBSD && crossCompiling && enableCrypt) [ # https://github.com/Perl/perl5/issues/22295 # configure cannot figure out that we have crypt automatically, but we really do @@ -124,11 +135,17 @@ stdenv.mkDerivation (rec { configureScript = lib.optionalString (!crossCompiling) "${stdenv.shell} ./Configure"; + # !canExecute cross uses miniperl which doesn't have this + postConfigure = lib.optionalString (!crossCompiling && stdenv.cc.targetPrefix != "") '' + substituteInPlace Makefile \ + --replace-fail "AR = ar" "AR = ${stdenv.cc.targetPrefix}ar" + ''; + dontAddStaticConfigureFlags = true; dontAddPrefix = !crossCompiling; - enableParallelBuilding = !crossCompiling; + enableParallelBuilding = false; # perl includes the build date, the uname of the build system and the # username of the build user in some files. @@ -156,6 +173,10 @@ stdenv.mkDerivation (rec { OLD_ZLIB = False GZIP_OS_CODE = AUTO_DETECT USE_ZLIB_NG = False + '' + lib.optionalString (lib.versionAtLeast version "5.40.0") '' + ZLIB_INCLUDE = ${zlib.dev}/include + ZLIB_LIB = ${zlib.out}/lib + '' + '' EOF '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" "" @@ -240,15 +261,15 @@ stdenv.mkDerivation (rec { priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl` mainProgram = "perl"; }; -} // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "84db4c71ae3d3b01fb2966cd15a060a7be334710"; # Nov 29, 2023 +} // lib.optionalAttrs crossCompiling rec { + crossVersion = "1.6"; perl-cross-src = fetchFromGitHub { name = "perl-cross-${crossVersion}"; owner = "arsv"; repo = "perl-cross"; rev = crossVersion; - sha256 = "sha256-1Zqw4sy/lD2nah0Z8rAE11tSpq1Ym9nBbatDczR+mxs="; + sha256 = "sha256-TVDLxw8ctl64LSfLfB4/WLYlSTO31GssSzmdVfqkBmg="; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/perl/no-sys-dirs-5.31.patch b/third_party/nixpkgs/pkgs/development/interpreters/perl/no-sys-dirs-5.40.0.patch similarity index 75% rename from third_party/nixpkgs/pkgs/development/interpreters/perl/no-sys-dirs-5.31.patch rename to third_party/nixpkgs/pkgs/development/interpreters/perl/no-sys-dirs-5.40.0.patch index 62dce0e25b..cf4894b337 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/perl/no-sys-dirs-5.31.patch +++ b/third_party/nixpkgs/pkgs/development/interpreters/perl/no-sys-dirs-5.40.0.patch @@ -1,7 +1,8 @@ -diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure ---- perl-5.20.0-orig/Configure 2014-05-26 15:34:18.000000000 +0200 -+++ perl-5.20.0/Configure 2014-06-25 10:43:35.368285986 +0200 -@@ -106,15 +106,7 @@ +diff --git a/Configure b/Configure +index 4da7088bff..1a86e0a77d 100755 +--- a/Configure ++++ b/Configure +@@ -108,15 +108,7 @@ if test -d c:/. || ( uname -a | grep -i 'os\(/\|\)2' 2>&1 ) 2>&1 >/dev/null ; th fi : Proper PATH setting @@ -18,8 +19,8 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure for p in $paths do -@@ -1337,8 +1329,7 @@ - archname='' +@@ -1459,8 +1451,7 @@ groupstype='' + i_whoami='' : Possible local include directories to search. : Set locincpth to "" in a hint file to defeat local include searches. -locincpth="/usr/local/include /opt/local/include /usr/gnu/include" @@ -28,8 +29,8 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure : : no include file wanted by default inclwanted='' -@@ -1349,17 +1340,12 @@ - +@@ -1474,19 +1465,12 @@ DEBUGGING='' + archobjs='' libnames='' : change the next line if compiling for Xenix/286 on Xenix/386 -xlibpth='/usr/lib/386 /lib/386' @@ -45,12 +46,14 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure -test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" -test -f /shlib/libc.so && glibpth="/shlib $glibpth" -test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64" +- +-: Private path used by Configure to find libraries. Its value +glibpth="" - - : Private path used by Configure to find libraries. Its value : is prepended to libpth. This variable takes care of special -@@ -1391,8 +1377,6 @@ - libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" + : machines, like the mips. Usually, it should be empty. + plibpth='' +@@ -1519,8 +1503,6 @@ libswanted="cl pthread socket bind inet ndbm gdbm dbm db malloc dl ld" + libswanted="$libswanted sun m crypt sec util c cposix posix ucb bsd BSD" : We probably want to search /usr/shlib before most other libraries. : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. -glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` @@ -58,7 +61,7 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure : Do not use vfork unless overridden by a hint file. usevfork=false -@@ -2446,7 +2430,6 @@ +@@ -2585,7 +2567,6 @@ uname zip " pth=`echo $PATH | sed -e "s/$p_/ /g"` @@ -66,7 +69,7 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure for file in $loclist; do eval xxx=\$$file case "$xxx" in -@@ -4936,7 +4919,7 @@ +@@ -5032,7 +5013,7 @@ esac : Set private lib path case "$plibpth" in '') if ./mips; then @@ -75,7 +78,7 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure fi;; esac case "$libpth" in -@@ -8600,13 +8583,8 @@ +@@ -8869,13 +8850,8 @@ esac echo " " case "$sysman" in '') @@ -91,7 +94,7 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure ;; esac if $test -d "$sysman"; then -@@ -19900,9 +19878,10 @@ +@@ -21740,9 +21716,10 @@ $rm_try tryp case "$full_ar" in '') full_ar=$ar ;; esac @@ -103,29 +106,11 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure : see what type gids are declared as in the kernel echo " " -Only in perl-5.20.0/: Configure.orig -diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/ext/Errno/Errno_pm.PL perl-5.20.0/ext/Errno/Errno_pm.PL ---- perl-5.20.0-orig/ext/Errno/Errno_pm.PL 2014-05-26 15:34:20.000000000 +0200 -+++ perl-5.20.0/ext/Errno/Errno_pm.PL 2014-06-25 10:31:24.317970047 +0200 -@@ -134,12 +126,7 @@ - if ($dep =~ /(\S+errno\.h)/) { - $file{$1} = 1; - } -- } elsif ($^O eq 'linux' && -- $Config{gccversion} ne '' && -- $Config{gccversion} !~ /intel/i && -- # might be using, say, Intel's icc -- $linux_errno_h -- ) { -+ } elsif (0) { - $file{$linux_errno_h} = 1; - } elsif ($^O eq 'haiku') { - # hidden in a special place -Only in perl-5.20.0/ext/Errno: Errno_pm.PL.orig -diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/freebsd.sh perl-5.20.0/hints/freebsd.sh ---- perl-5.20.0-orig/hints/freebsd.sh 2014-01-31 22:55:51.000000000 +0100 -+++ perl-5.20.0/hints/freebsd.sh 2014-06-25 10:25:53.263964680 +0200 -@@ -119,21 +119,21 @@ +diff --git a/hints/freebsd.sh b/hints/freebsd.sh +index 70bb90ee95..6580219c17 100644 +--- a/hints/freebsd.sh ++++ b/hints/freebsd.sh +@@ -127,21 +127,21 @@ case "$osvers" in objformat=`/usr/bin/objformat` if [ x$objformat = xaout ]; then if [ -e /usr/lib/aout ]; then @@ -153,10 +138,11 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/freebsd.sh perl-5.20.0/hints/ ldflags="-Wl,-E " lddlflags="-shared " cccdlflags='-DPIC -fPIC' -diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/linux.sh ---- perl-5.20.0-orig/hints/linux.sh 2014-05-26 15:34:20.000000000 +0200 -+++ perl-5.20.0/hints/linux.sh 2014-06-25 10:33:47.354883843 +0200 -@@ -150,28 +150,6 @@ case "$optimize" in +diff --git a/hints/linux.sh b/hints/linux.sh +index 83ba0c5c97..d7b6ce04fe 100644 +--- a/hints/linux.sh ++++ b/hints/linux.sh +@@ -176,27 +176,6 @@ case "$optimize" in ;; esac @@ -164,7 +150,7 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/li -# (such as -lm) in /lib or /usr/lib. So we have to ask gcc to tell us -# where to look. We don't want gcc's own libraries, however, so we -# filter those out. --# This could be conditional on Unbuntu, but other distributions may +-# This could be conditional on Ubuntu, but other distributions may -# follow suit, and this scheme seems to work even on rather old gcc's. -# This unconditionally uses gcc because even if the user is using another -# compiler, we still need to find the math library and friends, and I don't @@ -176,16 +162,15 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/li -if [ -x /usr/bin/gcc ] ; then - gcc=/usr/bin/gcc -# clang also provides -print-search-dirs --elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then +-elif ${cc:-cc} --version 2>/dev/null | grep -q -e '^clang version' -e ' clang version'; then - gcc=${cc:-cc} -else - gcc=gcc -fi -- + case "$plibpth" in '') plibpth=`LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries | - cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'` -@@ -208,32 +186,6 @@ case "$usequadmath" in +@@ -234,31 +213,6 @@ case "$usequadmath" in ;; esac @@ -214,11 +199,10 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/li - done - ;; -esac -- + if ${sh:-/bin/sh} -c exit; then echo '' - echo 'You appear to have a working bash. Good.' -@@ -311,33 +263,6 @@ sparc*) +@@ -337,32 +291,6 @@ sparc*) ;; esac @@ -248,7 +232,6 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/li - fi - ;; -esac -- + # Linux on Synology. if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then - # Tested on Synology DS213 and DS413 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 6d4bd47ba2..37764506e2 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix @@ -207,81 +207,29 @@ let inherit hash; }; - # The CPython interpreter contains a _sysconfigdata_ - # module that is imported by the sysconfig and distutils.sysconfig modules. - # The sysconfigdata module is generated at build time and contains settings - # required for building Python extension modules, such as include paths and - # other compiler flags. By default, the sysconfigdata module is loaded from - # the currently running interpreter (ie. the build platform interpreter), but - # when cross-compiling we want to load it from the host platform interpreter. - # This can be done using the _PYTHON_SYSCONFIGDATA_NAME environment variable. - # The _PYTHON_HOST_PLATFORM variable also needs to be set to get the correct - # platform suffix on extension modules. The correct values for these variables - # are not documented, and must be derived from the configure script (see links - # below). - sysconfigdataHook = with stdenv.hostPlatform; with passthru; let - machdep = if isWindows then "win32" else parsed.kernel.name; # win32 is added by Fedora’s patch + # win32 is added by Fedora’s patch + machdep = if stdenv.hostPlatform.isWindows then + "win32" + else + stdenv.hostPlatform.parsed.kernel.name; - # https://github.com/python/cpython/blob/e488e300f5c01289c10906c2e53a8e43d6de32d8/configure.ac#L428 - # The configure script uses "arm" as the CPU name for all 32-bit ARM - # variants when cross-compiling, but native builds include the version - # suffix, so we do the same. - pythonHostPlatform = let - cpu = { - # According to PEP600, Python's name for the Power PC - # architecture is "ppc", not "powerpc". Without the Rosetta - # Stone below, the PEP600 requirement that "${ARCH} matches - # the return value from distutils.util.get_platform()" fails. - # https://peps.python.org/pep-0600/ - powerpc = "ppc"; - powerpcle = "ppcle"; - powerpc64 = "ppc64"; - powerpc64le = "ppc64le"; - }.${parsed.cpu.name} or parsed.cpu.name; - in "${machdep}-${cpu}"; - - # https://github.com/python/cpython/blob/e488e300f5c01289c10906c2e53a8e43d6de32d8/configure.ac#L724 - multiarchCpu = - if isAarch32 then - if parsed.cpu.significantByte.name == "littleEndian" then "arm" else "armeb" - else if isx86_32 then "i386" - else parsed.cpu.name; - - pythonAbiName = let - # python's build doesn't match the nixpkgs abi in some cases. - # https://github.com/python/cpython/blob/e488e300f5c01289c10906c2e53a8e43d6de32d8/configure.ac#L724 - nixpkgsPythonAbiMappings = { - "gnuabielfv2" = "gnu"; - "muslabielfv2" = "musl"; - }; - pythonAbi = nixpkgsPythonAbiMappings.${parsed.abi.name} or parsed.abi.name; - in - # Python <3.11 doesn't distinguish musl and glibc and always prefixes with "gnu" - if versionOlder version "3.11" then - replaceStrings [ "musl" ] [ "gnu" ] pythonAbi - else - pythonAbi; - - multiarch = - if isDarwin then "darwin" - else if isFreeBSD then "" - else if isWindows then "" - else "${multiarchCpu}-${machdep}-${pythonAbiName}"; - - abiFlags = optionalString isPy37 "m"; - - # https://github.com/python/cpython/blob/e488e300f5c01289c10906c2e53a8e43d6de32d8/configure.ac#L78 - pythonSysconfigdataName = "_sysconfigdata_${abiFlags}_${machdep}_${multiarch}"; - in '' - sysconfigdataHook() { - if [ "$1" = '${placeholder "out"}' ]; then - export _PYTHON_HOST_PLATFORM='${pythonHostPlatform}' - export _PYTHON_SYSCONFIGDATA_NAME='${pythonSysconfigdataName}' - fi - } - - addEnvHooks "$hostOffset" sysconfigdataHook - ''; + # https://github.com/python/cpython/blob/e488e300f5c01289c10906c2e53a8e43d6de32d8/configure.ac#L428 + # The configure script uses "arm" as the CPU name for all 32-bit ARM + # variants when cross-compiling, but native builds include the version + # suffix, so we do the same. + pythonHostPlatform = let + cpu = { + # According to PEP600, Python's name for the Power PC + # architecture is "ppc", not "powerpc". Without the Rosetta + # Stone below, the PEP600 requirement that "${ARCH} matches + # the return value from distutils.util.get_platform()" fails. + # https://peps.python.org/pep-0600/ + powerpc = "ppc"; + powerpcle = "ppcle"; + powerpc64 = "ppc64"; + powerpc64le = "ppc64le"; + }.${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name; + in "${machdep}-${cpu}"; execSuffix = stdenv.hostPlatform.extensions.executable; in with passthru; stdenv.mkDerivation (finalAttrs: { @@ -612,8 +560,31 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { # Add CPython specific setup-hook that configures distutils.sysconfig to # always load sysconfigdata from host Python. postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' - cat << "EOF" >> "$out/nix-support/setup-hook" - ${sysconfigdataHook} + # https://github.com/python/cpython/blob/e488e300f5c01289c10906c2e53a8e43d6de32d8/configure.ac#L78 + sysconfigdataName="$(make --eval $'print-sysconfigdata-name: + \t@echo _sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) ' print-sysconfigdata-name)" + + # The CPython interpreter contains a _sysconfigdata_ + # module that is imported by the sysconfig and distutils.sysconfig modules. + # The sysconfigdata module is generated at build time and contains settings + # required for building Python extension modules, such as include paths and + # other compiler flags. By default, the sysconfigdata module is loaded from + # the currently running interpreter (ie. the build platform interpreter), but + # when cross-compiling we want to load it from the host platform interpreter. + # This can be done using the _PYTHON_SYSCONFIGDATA_NAME environment variable. + # The _PYTHON_HOST_PLATFORM variable also needs to be set to get the correct + # platform suffix on extension modules. The correct values for these variables + # are not documented, and must be derived from the configure script (see links + # below). + cat <> "$out/nix-support/setup-hook" + sysconfigdataHook() { + if [ "\$1" = '$out' ]; then + export _PYTHON_HOST_PLATFORM='${pythonHostPlatform}' + export _PYTHON_SYSCONFIGDATA_NAME='$sysconfigdataName' + fi + } + + addEnvHooks "\$hostOffset" sysconfigdataHook EOF ''; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix index f8e886c803..b936ea1e22 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix @@ -20,10 +20,10 @@ sourceVersion = { major = "3"; minor = "12"; - patch = "5"; + patch = "6"; suffix = ""; }; - hash = "sha256-+oouEsXmILCfU+ZbzYdVDS5aHi4Ev4upkdzFUROHY5c="; + hash = "sha256-GZllgpjPL7g33/7Y/zwDPvDJjvIM9zxdX2a+1auJaXw="; }; }; @@ -73,10 +73,10 @@ in { sourceVersion = { major = "3"; minor = "11"; - patch = "9"; + patch = "10"; suffix = ""; }; - hash = "sha256-mx6JZSP8UQaREmyGRAbZNgo9Hphqy9pZzaV7Wr2kW4c="; + hash = "sha256-B6Q1bpEpAOYaFcsJSaBsSgUBLiE+zWtOhND2equ+43I="; inherit (darwin) configd; inherit passthruFun; }; @@ -93,9 +93,9 @@ in { major = "3"; minor = "13"; patch = "0"; - suffix = "rc3"; + suffix = ""; }; - hash = "sha256-yLx5AYWvHLd7dcAcvBqmQt/c+Xo3DS0QCQvHuqcNpX4="; + hash = "sha256-CG3liC48sxDU3KSEV1IuLkgBjs1D2pzfgn9qB1nvsH0="; inherit (darwin) configd; inherit passthruFun; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh index 06694e79e4..a9e82674c5 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh @@ -58,5 +58,5 @@ function pytestCheckPhase() { if [ -z "${dontUsePytestCheck-}" ] && [ -z "${installCheckPhase-}" ]; then echo "Using pytestCheckPhase" - preDistPhases+=" pytestCheckPhase" + appendToVar preDistPhases pytestCheckPhase fi diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh index 0abcad3c42..6ba3d7f65c 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh @@ -6,5 +6,5 @@ pythonCatchConflictsPhase() { } if [ -z "${dontUsePythonCatchConflicts-}" ]; then - preDistPhases+=" pythonCatchConflictsPhase" + appendToVar preDistPhases pythonCatchConflictsPhase fi diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh index b65d6e7452..f4ef271ac1 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh @@ -18,5 +18,5 @@ pythonImportsCheckPhase () { if [ -z "${dontUsePythonImportsCheck-}" ]; then echo "Using pythonImportsCheckPhase" - preDistPhases+=" pythonImportsCheckPhase" + appendToVar preDistPhases pythonImportsCheckPhase fi diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/python-recompile-bytecode-hook.sh b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/python-recompile-bytecode-hook.sh index 649d0c17ea..7ac8c2d5cc 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/python-recompile-bytecode-hook.sh +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/python-recompile-bytecode-hook.sh @@ -20,5 +20,5 @@ pythonRecompileBytecodePhase () { } if [ -z "${dontUsePythonRecompileBytecode-}" ]; then - postPhases+=" pythonRecompileBytecodePhase" + appendToVar postPhases pythonRecompileBytecodePhase fi diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh index 1180694294..d67c0c5573 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh @@ -13,5 +13,5 @@ pythonRemoveBinBytecodePhase () { } if [ -z "${dontUsePythonRemoveBinBytecode-}" ]; then - preDistPhases+=" pythonRemoveBinBytecodePhase" + appendToVar preDistPhases pythonRemoveBinBytecodePhase fi diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/python-runtime-deps-check-hook.sh b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/python-runtime-deps-check-hook.sh index 43a2f9b887..dc888262ea 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/python-runtime-deps-check-hook.sh +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/python-runtime-deps-check-hook.sh @@ -16,5 +16,5 @@ pythonRuntimeDepsCheckHook() { if [ -z "${dontCheckRuntimeDeps-}" ]; then echo "Using pythonRuntimeDepsCheckHook" - preInstallPhases+=" pythonRuntimeDepsCheckHook" + appendToVar preInstallPhases pythonRuntimeDepsCheckHook fi diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/sphinx-hook.sh b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/sphinx-hook.sh index 0307e83d94..0f32a6ec0e 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/sphinx-hook.sh +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/sphinx-hook.sh @@ -69,4 +69,4 @@ installSphinxPhase() { runHook postInstallSphinx } -preDistPhases+=" buildSphinxPhase installSphinxPhase" +appendToVar preDistPhases buildSphinxPhase installSphinxPhase diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/unittest-check-hook.sh b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/unittest-check-hook.sh index f4bd347477..64ecb13cbc 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/unittest-check-hook.sh +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/unittest-check-hook.sh @@ -13,5 +13,5 @@ unittestCheckPhase() { if [ -z "${dontUseUnittestCheck-}" ] && [ -z "${installCheckPhase-}" ]; then echo "Using unittestCheckPhase" - preDistPhases+=" unittestCheckPhase" + appendToVar preDistPhases unittestCheckPhase fi diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix index 086ebfb3ed..2337b2eaa7 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -61,7 +61,7 @@ let cleanAttrs = lib.flip removeAttrs [ "disabled" "checkPhase" "checkInputs" "nativeCheckInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "pyproject" "format" - "disabledTestPaths" "outputs" "stdenv" + "disabledTestPaths" "disabledTests" "pytestFlagsArray" "unittestFlagsArray" "outputs" "stdenv" "dependencies" "optional-dependencies" "build-system" ]; @@ -215,23 +215,6 @@ let isSetuptoolsDependency = isSetuptoolsDependency' (attrs.pname or null); - passthru = - attrs.passthru or { } - // { - updateScript = let - filename = head (splitString ":" self.meta.position); - in attrs.passthru.updateScript or [ update-python-libraries filename ]; - } - // optionalAttrs (dependencies != []) { - inherit dependencies; - } - // optionalAttrs (optional-dependencies != {}) { - inherit optional-dependencies; - } - // optionalAttrs (build-system != []) { - inherit build-system; - }; - # Keep extra attributes from `attrs`, e.g., `patchPhase', etc. self = toPythonModule (stdenv.mkDerivation ((cleanAttrs attrs) // { @@ -324,7 +307,21 @@ let outputs = outputs ++ optional withDistOutput "dist"; - inherit passthru; + passthru = attrs.passthru or { } + // { + updateScript = let + filename = head (splitString ":" self.meta.position); + in attrs.passthru.updateScript or [ update-python-libraries filename ]; + } + // optionalAttrs (dependencies != []) { + inherit dependencies; + } + // optionalAttrs (optional-dependencies != {}) { + inherit optional-dependencies; + } + // optionalAttrs (build-system != []) { + inherit build-system; + }; meta = { # default to python's platforms @@ -335,11 +332,21 @@ let # If given use the specified checkPhase, otherwise use the setup hook. # Longer-term we should get rid of `checkPhase` and use `installCheckPhase`. installCheckPhase = attrs.checkPhase; - } // optionalAttrs (disabledTestPaths != []) { + } // optionalAttrs (attrs.doCheck or true) ( + optionalAttrs (disabledTestPaths != []) { disabledTestPaths = escapeShellArgs disabledTestPaths; - })); + } // optionalAttrs (attrs ? disabledTests) { + # `escapeShellArgs` should be used as well as `disabledTestPaths`, + # but some packages rely on existing raw strings. + disabledTests = attrs.disabledTests; + } // optionalAttrs (attrs ? pytestFlagsArray) { + pytestFlagsArray = attrs.pytestFlagsArray; + } // optionalAttrs (attrs ? unittestFlagsArray) { + unittestFlagsArray = attrs.unittestFlagsArray; + } + ))); in extendDerivation (disabled -> throw "${name} not supported for interpreter ${python.executable}") - passthru + { } self diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/python-packages-base.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/python-packages-base.nix index 9fad8e56d5..1b10b44fb2 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/python-packages-base.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/python-packages-base.nix @@ -37,15 +37,15 @@ let else ./python2/mk-python-derivation.nix; - buildPythonPackage = makeOverridablePythonPackage (lib.makeOverridable (callPackage mkPythonDerivation { + buildPythonPackage = makeOverridablePythonPackage (callPackage mkPythonDerivation { inherit namePrefix; # We want Python libraries to be named like e.g. "python3.6-${name}" inherit toPythonModule; # Libraries provide modules - })); + }); - buildPythonApplication = makeOverridablePythonPackage (lib.makeOverridable (callPackage mkPythonDerivation { + buildPythonApplication = makeOverridablePythonPackage (callPackage mkPythonDerivation { namePrefix = ""; # Python applications should not have any prefix toPythonModule = x: x; # Application does not provide modules. - })); + }); # Check whether a derivation provides a Python module. hasPythonModule = drv: drv?pythonModule && drv.pythonModule == python; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/tests.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/tests.nix index 6574b62957..ba96f70825 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/tests.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/tests.nix @@ -75,7 +75,7 @@ let is_virtualenv = "False"; }; - } // lib.optionalAttrs (python.pythonAtLeast "3.8") { + } // { # Venv built using Python Nix environment (python.buildEnv) # TODO: Cannot create venv from a nix env # Error: Command '['/nix/store/ddc8nqx73pda86ibvhzdmvdsqmwnbjf7-python3-3.7.6-venv/bin/python3.7', '-Im', 'ensurepip', '--upgrade', '--default-pip']' returned non-zero exit status 1. @@ -105,22 +105,24 @@ let # Integration tests involving the package set. # All PyPy package builds are broken at the moment - integrationTests = lib.optionalAttrs (!python.isPyPy) ( - lib.optionalAttrs (python.isPy3k && !stdenv.hostPlatform.isDarwin) { # darwin has no split-debug - cpython-gdb = callPackage ./tests/test_cpython_gdb { - interpreter = python; - }; - } // lib.optionalAttrs (python.pythonAtLeast "3.7") { - # Before the addition of NIX_PYTHONPREFIX mypy was broken with typed packages - nix-pythonprefix-mypy = callPackage ./tests/test_nix_pythonprefix { - interpreter = python; - }; - # Make sure tkinter is importable. See https://github.com/NixOS/nixpkgs/issues/238990 - tkinter = callPackage ./tests/test_tkinter { - interpreter = python; - }; - } - ); + integrationTests = lib.optionalAttrs (!python.isPyPy) ({ + # Make sure tkinter is importable. See https://github.com/NixOS/nixpkgs/issues/238990 + tkinter = callPackage ./tests/test_tkinter { + interpreter = python; + }; + } // lib.optionalAttrs (python.isPy3k && python.pythonOlder "3.13" && !stdenv.hostPlatform.isDarwin) { # darwin has no split-debug + # fails on python3.13 + cpython-gdb = callPackage ./tests/test_cpython_gdb { + interpreter = python; + }; + } // lib.optionalAttrs (python.isPy3k && python.pythonOlder "3.13") { + # Before the addition of NIX_PYTHONPREFIX mypy was broken with typed packages + # mypy does not yet support python3.13 + # https://github.com/python/mypy/issues/17264 + nix-pythonprefix-mypy = callPackage ./tests/test_nix_pythonprefix { + interpreter = python; + }; + }); # Test editable package support editableTests = let diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix index 369d242192..b703fa52df 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix @@ -313,8 +313,8 @@ in { }; ruby_3_3 = generic { - version = rubyVersion "3" "3" "4" ""; - hash = "sha256-/mow+X1U4Cl2jy3fSSNpnEFs28Om6W2z4tVxbH25ajQ="; + version = rubyVersion "3" "3" "5" ""; + hash = "sha256-N4GjUEIiwvJstLnrnBoS2/SUTTZs4kqf+M+Z7LznUZY="; cargoHash = "sha256-GeelTMRFIyvz1QS2L+Q3KAnyQy7jc0ejhx3TdEFVEbk="; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix index 73d2e4f99e..e5894476e9 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "25.0.1"; + version = "25.0.2"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-l0tkEV4roec3xK57oXV49ofNdpuZ+hCuzde6YazYPZc="; + hash = "sha256-5Wu5gK3g7nkMDwUGkwnx400PRkb0jknX/GKeEAJ9Vgg="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-0pt3wZlhLuN0E6f6AU0uC0qmkuII2OXxUTChuzQjvqI="; + cargoHash = "sha256-jLdVxWjfJSkfHcmw5i02gXI2uEUB7KxiEfdFtfc020U="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/julia-modules/package-closure.nix b/third_party/nixpkgs/pkgs/development/julia-modules/package-closure.nix index bb0b08b33e..8bc9e2774d 100644 --- a/third_party/nixpkgs/pkgs/development/julia-modules/package-closure.nix +++ b/third_party/nixpkgs/pkgs/development/julia-modules/package-closure.nix @@ -10,131 +10,6 @@ }: let - # The specific package resolution code depends on the Julia version - # These are pretty similar and could be combined to reduce duplication - resolveCode = if lib.versionOlder julia.version "1.7" then resolveCode1_6 else resolveCode1_8; - - resolveCode1_6 = '' - import Pkg.API: check_package_name - import Pkg.Types: Context!, PRESERVE_NONE, manifest_info, project_deps_resolve!, registry_resolve!, stdlib_resolve!, ensure_resolved - import Pkg.Operations: _resolve, assert_can_add, is_dep, update_package_add - - foreach(pkg -> check_package_name(pkg.name, :add), pkgs) - pkgs = deepcopy(pkgs) # deepcopy for avoid mutating PackageSpec members - Context!(ctx) - - project_deps_resolve!(ctx, pkgs) - registry_resolve!(ctx, pkgs) - stdlib_resolve!(pkgs) - ensure_resolved(ctx, pkgs, registry=true) - - assert_can_add(ctx, pkgs) - - for (i, pkg) in pairs(pkgs) - entry = manifest_info(ctx, pkg.uuid) - pkgs[i] = update_package_add(ctx, pkg, entry, is_dep(ctx, pkg)) - end - - foreach(pkg -> ctx.env.project.deps[pkg.name] = pkg.uuid, pkgs) - - pkgs, deps_map = _resolve(ctx, pkgs, PRESERVE_NONE) -''; - - resolveCode1_8 = '' - import Pkg.API: handle_package_input! - import Pkg.Types: PRESERVE_NONE, UUID, VersionSpec, project_deps_resolve!, registry_resolve!, stdlib_resolve!, ensure_resolved - import Pkg.Operations: _resolve, assert_can_add, update_package_add - import TOML - - foreach(handle_package_input!, pkgs) - - # The handle_package_input! call above clears pkg.path, so we have to apply package overrides after - overrides = Dict{String, String}(${builtins.concatStringsSep ", " (lib.mapAttrsToList (name: path: ''"${name}" => "${path}"'') packageOverrides)}) - println("Package overrides: ") - println(overrides) - for pkg in pkgs - if pkg.name in keys(overrides) - pkg.path = overrides[pkg.name] - - # Try to read the UUID from $(pkg.path)/Project.toml. If successful, put the package into ctx.env.project.deps. - # This is necessary for the ensure_resolved call below to succeed, and will allow us to use an override even - # if it does not appear in the registry. - # See https://github.com/NixOS/nixpkgs/issues/279853 - project_toml = joinpath(pkg.path, "Project.toml") - if isfile(project_toml) - toml_data = TOML.parsefile(project_toml) - if haskey(toml_data, "uuid") - ctx.env.project.deps[pkg.name] = UUID(toml_data["uuid"]) - end - end - end - end - - project_deps_resolve!(ctx.env, pkgs) - registry_resolve!(ctx.registries, pkgs) - stdlib_resolve!(pkgs) - ensure_resolved(ctx, ctx.env.manifest, pkgs, registry=true) - - assert_can_add(ctx, pkgs) - - for (i, pkg) in pairs(pkgs) - entry = Pkg.Types.manifest_info(ctx.env.manifest, pkg.uuid) - is_dep = any(uuid -> uuid == pkg.uuid, [uuid for (name, uuid) in ctx.env.project.deps]) - pkgs[i] = update_package_add(ctx, pkg, entry, is_dep) - end - - foreach(pkg -> ctx.env.project.deps[pkg.name] = pkg.uuid, pkgs) - - # Save the original pkgs for later. We might need to augment it with the weak dependencies - orig_pkgs = pkgs - - pkgs, deps_map = _resolve(ctx.io, ctx.env, ctx.registries, pkgs, PRESERVE_NONE, ctx.julia_version) - - if VERSION >= VersionNumber("1.9") - while true - # Check for weak dependencies, which appear on the RHS of the deps_map but not in pkgs. - # Build up weak_name_to_uuid - uuid_to_name = Dict() - for pkg in pkgs - uuid_to_name[pkg.uuid] = pkg.name - end - weak_name_to_uuid = Dict() - for (uuid, deps) in pairs(deps_map) - for (dep_name, dep_uuid) in pairs(deps) - if !haskey(uuid_to_name, dep_uuid) - weak_name_to_uuid[dep_name] = dep_uuid - end - end - end - - if isempty(weak_name_to_uuid) - break - end - - # We have nontrivial weak dependencies, so add each one to the initial pkgs and then re-run _resolve - println("Found weak dependencies: $(keys(weak_name_to_uuid))") - - orig_uuids = Set([pkg.uuid for pkg in orig_pkgs]) - - for (name, uuid) in pairs(weak_name_to_uuid) - if uuid in orig_uuids - continue - end - - pkg = PackageSpec(name, uuid) - - push!(orig_uuids, uuid) - push!(orig_pkgs, pkg) - ctx.env.project.deps[name] = uuid - entry = Pkg.Types.manifest_info(ctx.env.manifest, uuid) - orig_pkgs[length(orig_pkgs)] = update_package_add(ctx, pkg, entry, false) - end - - global pkgs, deps_map = _resolve(ctx.io, ctx.env, ctx.registries, orig_pkgs, PRESERVE_NONE, ctx.julia_version) - end - end - ''; - juliaExpression = packageNames: '' import Pkg Pkg.Registry.add(Pkg.RegistrySpec(path="${augmentedRegistry}")) @@ -144,7 +19,7 @@ let input = ${lib.generators.toJSON {} packageNames} if isfile("extra_package_names.txt") - append!(input, readlines("extra_package_names.txt")) + append!(input, readlines("extra_package_names.txt")) end input = unique(input) @@ -155,20 +30,21 @@ let ctx = Context() - ${resolveCode} + overrides = Dict{String, String}(${builtins.concatStringsSep ", " (lib.mapAttrsToList (name: path: ''"${name}" => "${path}"'') packageOverrides)}) + ${builtins.readFile ./resolve_packages.jl} open(ENV["out"], "w") do io - for spec in pkgs - println(io, "- name: " * spec.name) - println(io, " uuid: " * string(spec.uuid)) - println(io, " version: " * string(spec.version)) - if endswith(spec.name, "_jll") && haskey(deps_map, spec.uuid) - println(io, " depends_on: ") - for (dep_name, dep_uuid) in pairs(deps_map[spec.uuid]) - println(io, " \"$(dep_name)\": \"$(dep_uuid)\"") - end + for spec in pkgs + println(io, "- name: " * spec.name) + println(io, " uuid: " * string(spec.uuid)) + println(io, " version: " * string(spec.version)) + if endswith(spec.name, "_jll") && haskey(deps_map, spec.uuid) + println(io, " depends_on: ") + for (dep_name, dep_uuid) in pairs(deps_map[spec.uuid]) + println(io, " \"$(dep_name)\": \"$(dep_uuid)\"") + end + end end - end end ''; in diff --git a/third_party/nixpkgs/pkgs/development/julia-modules/resolve_packages.jl b/third_party/nixpkgs/pkgs/development/julia-modules/resolve_packages.jl new file mode 100644 index 0000000000..fce60035d5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/julia-modules/resolve_packages.jl @@ -0,0 +1,99 @@ +import Pkg.API: handle_package_input! +import Pkg.Types: PRESERVE_NONE, UUID, VersionSpec, project_deps_resolve!, registry_resolve!, stdlib_resolve!, ensure_resolved +import Pkg.Operations: _resolve, assert_can_add, update_package_add +import TOML + +foreach(handle_package_input!, pkgs) + +# The handle_package_input! call above clears pkg.path, so we have to apply package overrides after +println("Package overrides: ") +println(overrides) +for pkg in pkgs + if pkg.name in keys(overrides) + pkg.path = overrides[pkg.name] + + # Try to read the UUID from $(pkg.path)/Project.toml. If successful, put the package into ctx.env.project.deps. + # This is necessary for the ensure_resolved call below to succeed, and will allow us to use an override even + # if it does not appear in the registry. + # See https://github.com/NixOS/nixpkgs/issues/279853 + project_toml = joinpath(pkg.path, "Project.toml") + if isfile(project_toml) + toml_data = TOML.parsefile(project_toml) + if haskey(toml_data, "uuid") + ctx.env.project.deps[pkg.name] = UUID(toml_data["uuid"]) + end + end + end +end + +project_deps_resolve!(ctx.env, pkgs) +registry_resolve!(ctx.registries, pkgs) +stdlib_resolve!(pkgs) +ensure_resolved(ctx, ctx.env.manifest, pkgs, registry=true) + +assert_can_add(ctx, pkgs) + +for (i, pkg) in pairs(pkgs) + entry = Pkg.Types.manifest_info(ctx.env.manifest, pkg.uuid) + is_dep = any(uuid -> uuid == pkg.uuid, [uuid for (name, uuid) in ctx.env.project.deps]) + if VERSION >= VersionNumber("1.11") + pkgs[i] = update_package_add(ctx, pkg, entry, nothing, nothing, is_dep) + else + pkgs[i] = update_package_add(ctx, pkg, entry, is_dep) + end +end + +foreach(pkg -> ctx.env.project.deps[pkg.name] = pkg.uuid, pkgs) + +# Save the original pkgs for later. We might need to augment it with the weak dependencies +orig_pkgs = pkgs + +pkgs, deps_map = _resolve(ctx.io, ctx.env, ctx.registries, pkgs, PRESERVE_NONE, ctx.julia_version) + +if VERSION >= VersionNumber("1.9") + while true + # Check for weak dependencies, which appear on the RHS of the deps_map but not in pkgs. + # Build up weak_name_to_uuid + uuid_to_name = Dict() + for pkg in pkgs + uuid_to_name[pkg.uuid] = pkg.name + end + weak_name_to_uuid = Dict() + for (uuid, deps) in pairs(deps_map) + for (dep_name, dep_uuid) in pairs(deps) + if !haskey(uuid_to_name, dep_uuid) + weak_name_to_uuid[dep_name] = dep_uuid + end + end + end + + if isempty(weak_name_to_uuid) + break + end + + # We have nontrivial weak dependencies, so add each one to the initial pkgs and then re-run _resolve + println("Found weak dependencies: $(keys(weak_name_to_uuid))") + + orig_uuids = Set([pkg.uuid for pkg in orig_pkgs]) + + for (name, uuid) in pairs(weak_name_to_uuid) + if uuid in orig_uuids + continue + end + + pkg = PackageSpec(name, uuid) + + push!(orig_uuids, uuid) + push!(orig_pkgs, pkg) + ctx.env.project.deps[name] = uuid + entry = Pkg.Types.manifest_info(ctx.env.manifest, uuid) + if VERSION >= VersionNumber("1.11") + orig_pkgs[length(orig_pkgs)] = update_package_add(ctx, pkg, entry, nothing, nothing, false) + else + orig_pkgs[length(orig_pkgs)] = update_package_add(ctx, pkg, entry, false) + end + end + + global pkgs, deps_map = _resolve(ctx.io, ctx.env, ctx.registries, orig_pkgs, PRESERVE_NONE, ctx.julia_version) + end +end diff --git a/third_party/nixpkgs/pkgs/development/libraries/aalib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aalib/default.nix index 3ba1620fe8..2c644233d0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aalib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aalib/default.nix @@ -29,6 +29,10 @@ stdenv.mkDerivation rec { configureFlags = [ "--without-x" "--with-ncurses=${ncurses.dev}" ]; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + postInstall = '' mkdir -p $dev/bin mv $bin/bin/aalib-config $dev/bin/aalib-config diff --git a/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202103.nix b/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202103.nix index 0dfd60d175..ec43a98c04 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202103.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202103.nix @@ -59,5 +59,7 @@ stdenv.mkDerivation rec { license = licenses.asl20; platforms = platforms.all; maintainers = [ maintainers.andersk ]; + # Requires LFS64 APIs. 202401 and later are fine. + broken = stdenv.hostPlatform.isMusl; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202301.nix b/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202301.nix index 5024372802..0280a183e8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202301.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202301.nix @@ -44,5 +44,7 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.asl20; platforms = platforms.all; maintainers = [ maintainers.andersk ]; + # Requires LFS64 APIs. 202401 and later are fine. + broken = stdenv.hostPlatform.isMusl; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/accountsservice/default.nix b/third_party/nixpkgs/pkgs/development/libraries/accountsservice/default.nix index 1a5f03f635..1bb42e9c3f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/accountsservice/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/accountsservice/default.nix @@ -74,6 +74,14 @@ stdenv.mkDerivation rec { libxcrypt ]; + env = lib.optionalAttrs (stdenv.cc.isGNU && (lib.versionAtLeast (lib.getVersion stdenv.cc.cc) "14")) { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=deprecated-declarations" + "-Wno-error=implicit-function-declaration" + "-Wno-error=return-mismatch" + ]; + }; + mesonFlags = [ "-Dadmin_group=wheel" "-Dlocalstatedir=/var" diff --git a/third_party/nixpkgs/pkgs/development/libraries/agg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/agg/default.nix index 020c2dce95..cd098ae825 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/agg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/agg/default.nix @@ -40,6 +40,8 @@ stdenv.mkDerivation rec { "--x-libraries=${lib.getLib libX11}/lib" ]; + NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; + # libtool --tag=CXX --mode=link g++ -g -O2 libexamples.la ../src/platform/X11/libaggplatformX11.la ../src/libagg.la -o alpha_mask2 alpha_mask2.o # libtool: error: cannot find the library 'libexamples.la' enableParallelBuilding = false; diff --git a/third_party/nixpkgs/pkgs/development/libraries/alglib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/alglib/default.nix index 1bd2ad6fe3..45717082a8 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.02.0"; + version = "4.03.0"; src = fetchurl { url = "https://www.alglib.net/translator/re/alglib-${version}.cpp.gpl.tgz"; - sha256 = "sha256-U7/ukBXdwC8GkpevFfSfbgbiyOf7CkDv0PUAL8BnAag="; + sha256 = "sha256-k7/U9Tq2ND8+qd8tHZP9Gq1okJF3tMNej3WE/6NkBYI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/aqbanking/sources.nix b/third_party/nixpkgs/pkgs/development/libraries/aqbanking/sources.nix index 6163266212..aff1447c9f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aqbanking/sources.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aqbanking/sources.nix @@ -1,9 +1,9 @@ { # https://www.aquamaniac.de/rdm/projects/gwenhywfar/files gwenhywfar = { - version = "5.10.1"; - hash = "sha256-ovYKnd5don5X4OXvX4kx9JXB1UGtkKhB4rYjFWVUcWA="; - releaseId = "465"; + version = "5.11.2beta"; + hash = "sha256-5/KxLAktb1mPKeJVsLAD2YrBeWyFtzpXCJDb8tzzWyQ="; + releaseId = "518"; }; # https://www.aquamaniac.de/rdm/projects/libchipcard/files @@ -15,8 +15,8 @@ # https://www.aquamaniac.de/rdm/projects/aqbanking/files aqbanking = { - version = "6.5.4"; - hash = "sha256-DRbOrnbwcY5GZjj0VHqLFJJ/HY2YMiB5zWSBrd4wrJk="; - releaseId = "499"; + version = "6.5.12beta"; + hash = "sha256-TH6+eEiULmOciB1Mqo4vjgF9JbF4BW+llrTjS6BtctY="; + releaseId = "526"; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/attr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/attr/default.nix index eb8f0d1c3b..dfc8a5cdb8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/attr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/attr/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext ]; + patches = [ ./musl.patch ]; + postPatch = '' for script in install-sh include/install-sh; do patchShebangs $script diff --git a/third_party/nixpkgs/pkgs/development/libraries/attr/musl.patch b/third_party/nixpkgs/pkgs/development/libraries/attr/musl.patch new file mode 100644 index 0000000000..818161f152 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/attr/musl.patch @@ -0,0 +1,27 @@ +From 8a80d895dfd779373363c3a4b62ecce5a549efb2 Mon Sep 17 00:00:00 2001 +From: "Haelwenn (lanodan) Monnier" +Date: Sat, 30 Mar 2024 10:17:10 +0100 +Subject: tools/attr.c: Add missing libgen.h include for basename(3) + +Fixes compilation issue with musl and modern C99 compilers. + +See: https://bugs.gentoo.org/926294 +--- + tools/attr.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/attr.c b/tools/attr.c +index f12e4af..6a3c1e9 100644 +--- a/tools/attr.c ++++ b/tools/attr.c +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + #include + +-- +cgit v1.1 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix index 829dc76dce..3eadad12ad 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "aws-c-mqtt"; - version = "0.10.4"; + version = "0.10.5"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-mqtt"; rev = "v${version}"; - hash = "sha256-i+ssZzHC8MPfyOaRqvjq0z7w772BJqIA6BwntW1fRek="; + hash = "sha256-PByF0P+4gwSQKk7qHc79p025TbWZ0QeFXqO2GOtuaII="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/boringssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/boringssl/default.nix index 01c3884c42..68ca686403 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/boringssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/boringssl/default.nix @@ -10,17 +10,17 @@ # reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md buildGoModule { pname = "boringssl"; - version = "unstable-2024-02-15"; + version = "unstable-2024-09-20"; src = fetchgit { url = "https://boringssl.googlesource.com/boringssl"; - rev = "5a1a5fbdb865fa58f1da0fd8bf6426f801ea37ac"; - hash = "sha256-nu+5TeWEAVLGhTE15kxmTWZxo0V2elNUy67gdaU3Y+I="; + rev = "718900aeb84c601523e71abbd18fd70c9e2ad884"; + hash = "sha256-TdSObRECiGRQcgz6N2LhKvSi9yRYOZYJdK6MyfJX2Bo="; }; nativeBuildInputs = [ cmake ninja perl ]; - vendorHash = "sha256-074bgtoBRS3SOxLrwZbBdK1jFpdCvF6tRtU1CkrhoDY="; + vendorHash = "sha256-GlhLsPD+yp2LdqsIsfXNEaNKKlc76p0kBCyu4rlEmMg="; proxyVendor = true; # hack to get both go and cmake configure phase diff --git a/third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix index 4368965d4f..cdf994442d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix @@ -13,11 +13,11 @@ in stdenv.mkDerivation (finalAttrs: let inherit (finalAttrs) pname version; in { pname = "cairo"; - version = "1.18.0"; + version = "1.18.2"; src = fetchurl { url = "https://cairographics.org/${if lib.mod (builtins.fromJSON (lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${pname}-${version}.tar.xz"; - hash = "sha256-JDoHNrl4oz3uKfnMp1IXM7eKZbVBggb+970cPUzxC2Q="; + hash = "sha256-piubtCQl6ETMPW3d4EP/Odur7dFULrpXout5+FiJ1Fo="; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/chmlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/chmlib/default.nix index df65e78ff5..baa67d8fb2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/chmlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/chmlib/default.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + meta = with lib; { homepage = "http://www.jedrea.com/chmlib"; license = licenses.lgpl2; diff --git a/third_party/nixpkgs/pkgs/development/libraries/chromaprint/default.nix b/third_party/nixpkgs/pkgs/development/libraries/chromaprint/default.nix index e264693cea..539e633341 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/chromaprint/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/chromaprint/default.nix @@ -5,7 +5,7 @@ , fetchpatch2 , cmake , ninja -, ffmpeg_7 +, ffmpeg , darwin , zlib }: @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja ]; - buildInputs = [ ffmpeg_7 ] ++ lib.optionals stdenv.hostPlatform.isDarwin + buildInputs = [ ffmpeg ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Accelerate CoreGraphics CoreVideo zlib ]); cmakeFlags = [ "-DBUILD_EXAMPLES=ON" "-DBUILD_TOOLS=ON" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/clap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/clap/default.nix index 1fc6d5a2d4..7bd9dca846 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/clap/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/clap/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "clap"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "free-audio"; repo = "clap"; rev = finalAttrs.version; - hash = "sha256-3VDl6hMSRFrMtYeiUMoZhJf0wkMxVs9ZELKJqLGYJ+g="; + hash = "sha256-W3cvAtBrd+zyGj7xNSuFFChUUVjRadH6aCv5Zcvq/qs="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/clfft/default.nix b/third_party/nixpkgs/pkgs/development/libraries/clfft/default.nix index 5843c1b1fc..52ff8e4e05 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/clfft/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/clfft/default.nix @@ -1,7 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fftw, fftwFloat, boost, opencl-clhpp, ocl-icd, darwin }: +{ lib, gccStdenv, fetchFromGitHub, cmake, fftw, fftwFloat, boost, opencl-clhpp, ocl-icd, darwin }: let inherit (darwin.apple_sdk.frameworks) OpenCL; + stdenv = gccStdenv; in stdenv.mkDerivation rec { pname = "clfft"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/coeurl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/coeurl/default.nix deleted file mode 100644 index 580cd488c9..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/coeurl/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, fetchpatch -, ninja -, pkg-config -, meson -, libevent -, curl -, spdlog -}: - -stdenv.mkDerivation rec { - pname = "coeurl"; - version = "0.3.0"; - - src = fetchFromGitLab { - domain = "nheko.im"; - owner = "nheko-reborn"; - repo = pname; - rev = "v${version}"; - hash = "sha256-sN+YSddUOdnJLcnHyWdjNm1PpxCwnkwiqSvyrwUrg6w="; - }; - patches = [ - # Fix compatibility issues with curl > 7.85, see: - # https://nheko.im/nheko-reborn/coeurl/-/commit/d926893007c353fbc149d8538a5762ca8384273a - # PATCH CAN BE REMOVED AFTER 0.3.0 - (fetchpatch { - url = "https://nheko.im/nheko-reborn/coeurl/-/commit/d926893007c353fbc149d8538a5762ca8384273a.patch"; - hash = "sha256-hOBk7riuVI7k7qe/SMq3XJnFzyZ0gB9kVG7dKvWOsPY="; - }) - # Fix error when building with fmt >= 10, see: - # https://nheko.im/nheko-reborn/coeurl/-/commit/831e2ee8e9cf08ea1ee9736cde8370f9d0312abc - # PATCH CAN BE REMOVED AFTER 0.3.0 - (fetchpatch { - url = "https://nheko.im/nheko-reborn/coeurl/-/commit/831e2ee8e9cf08ea1ee9736cde8370f9d0312abc.patch"; - hash = "sha256-a52Id7Nm3Mmmwv7eL58j6xovjlkpAO4KahVM/Q3H65w="; - }) - ]; - postPatch = '' - substituteInPlace subprojects/curl.wrap --replace '[provides]' '[provide]' - ''; - - nativeBuildInputs = [ ninja pkg-config meson ]; - - buildInputs = [ libevent curl spdlog ]; - - meta = with lib; { - description = "Simple async wrapper around CURL for C++"; - homepage = "https://nheko.im/nheko-reborn/coeurl"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ rnhmjoj ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix index 60a0d8569a..e98ae4cbb1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix @@ -47,6 +47,10 @@ stdenv.mkDerivation rec { "CFLAGS=-DTIME_WITH_SYS_TIME" ]; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + installFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "framedir=$(out)/Library/Frameworks/SASL2.framework" ]; passthru.tests = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/directfb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/directfb/default.nix index be6a2da656..d761804cac 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/directfb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/directfb/default.nix @@ -65,7 +65,11 @@ stdenv.mkDerivation rec { libXrender ]); - NIX_LDFLAGS = "-lgcc_s"; + env = { + NIX_LDFLAGS = "-lgcc_s"; + } // lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-fpermissive"; + }; configureFlags = [ "--enable-sdl" diff --git a/third_party/nixpkgs/pkgs/development/libraries/duckdb/versions.json b/third_party/nixpkgs/pkgs/development/libraries/duckdb/versions.json index 47cad94b53..1797b9b0b0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/duckdb/versions.json +++ b/third_party/nixpkgs/pkgs/development/libraries/duckdb/versions.json @@ -1,5 +1,5 @@ { - "version": "1.1.1", - "rev": "af39bd0dcf66876e09ac2a7c3baa28fe1b301151", - "hash": "sha256-YPS3DqIYmFKXGkiQiU7/QKNNn7+YyavrA4uDenKuX2g=" + "version": "1.1.2", + "rev": "f680b7d08f56183391b581077d4baf589e1cc8bd", + "hash": "sha256-JoGGnlu2aioO6XbeUZDe23AHSBxciLSEKBWRedPuXjI=" } diff --git a/third_party/nixpkgs/pkgs/development/libraries/expat/default.nix b/third_party/nixpkgs/pkgs/development/libraries/expat/default.nix index 50ae45f38e..83284ff64f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/expat/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/expat/default.nix @@ -17,7 +17,7 @@ # files. let - version = "2.6.2"; + version = "2.6.3"; tag = "R_${lib.replaceStrings ["."] ["_"] version}"; in stdenv.mkDerivation (finalAttrs: { @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = with finalAttrs; "https://github.com/libexpat/libexpat/releases/download/${tag}/${pname}-${version}.tar.xz"; - hash = "sha256-7hS0xdiQixvsN62TdgfqsYPU2YBqCK3uRyw8MSHSc2Q="; + hash = "sha256-J02yVKaXm95arUBHY6cElWlA5GWEPyqb2e168i4sDvw="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/default.nix index f6a6403435..c88566d2e7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/default.nix @@ -1,4 +1,8 @@ -{ callPackage, darwin }: +{ + callPackage, + darwin, + cudaPackages, +}: let mkFFmpeg = @@ -14,6 +18,7 @@ let VideoToolbox ; inherit (darwin) xcode; + inherit (cudaPackages) cuda_cudart cuda_nvcc libnpp; } // (initArgs // { inherit ffmpegVariant; }) ); @@ -50,11 +55,17 @@ rec { ffmpeg_7-headless = mkFFmpeg v7 "headless"; ffmpeg_7-full = mkFFmpeg v7 "full"; - # Please make sure this is updated to the latest version on the next major - # update to ffmpeg - # Packages which use ffmpeg as a library, should pin to the relevant major - # version number which the upstream support. - ffmpeg = ffmpeg_6; - ffmpeg-headless = ffmpeg_6-headless; - ffmpeg-full = ffmpeg_6-full; + # Please make sure this is updated to new major versions once they + # build and work on all the major platforms. If absolutely necessary + # due to severe breaking changes, the bump can wait a little bit to + # give the most proactive users time to migrate, but don’t hold off + # for too long. + # + # Packages which depend on FFmpeg should generally use these + # unversioned aliases to allow for quicker migration to new releases, + # but can pin one of the versioned variants if they do not work with + # the current default version. + ffmpeg = ffmpeg_7; + ffmpeg-headless = ffmpeg_7-headless; + ffmpeg-full = ffmpeg_7-full; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix index dc47194465..b0ccaeeb45 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, removeReferencesTo, addDriverRunpath, pkg-config, perl, texinfo, texinfo6, yasm +{ lib, config, stdenv, buildPackages, removeReferencesTo, addDriverRunpath, pkg-config, perl, texinfo, texinfo6, yasm # You can fetch any upstream version using this derivation by specifying version and hash # NOTICE: Always use this argument to override the version. Do not use overrideAttrs. @@ -52,6 +52,7 @@ , withCoreImage ? withHeadlessDeps && stdenv.hostPlatform.isDarwin # Apple CoreImage framework , withCuda ? withFullDeps && withNvcodec , withCudaLLVM ? withFullDeps +, withCudaNVCC ? withFullDeps && withUnfree && config.cudaSupport , withCuvid ? withHeadlessDeps && withNvcodec , withDav1d ? withHeadlessDeps # AV1 decoder (focused on speed and correctness) , withDc1394 ? withFullDeps && !stdenv.hostPlatform.isDarwin # IIDC-1394 grabbing (ieee 1394) @@ -81,9 +82,9 @@ , withModplug ? withFullDeps && !stdenv.hostPlatform.isDarwin # ModPlug support , withMp3lame ? withHeadlessDeps # LAME MP3 encoder , withMysofa ? withFullDeps # HRTF support via SOFAlizer +, withNpp ? withFullDeps && withUnfree && config.cudaSupport # Nvidia Performance Primitives-based code , withNvdec ? withHeadlessDeps && withNvcodec , withNvenc ? withHeadlessDeps && withNvcodec -, withOgg ? withHeadlessDeps # Ogg container used by vorbis & theora , withOpenal ? withFullDeps # OpenAL 1.1 capture support , withOpencl ? withFullDeps , withOpencoreAmrnb ? withFullDeps && withVersion3 # AMR-NB de/encoder @@ -119,7 +120,7 @@ , withVaapi ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD) # Vaapi hardware acceleration , withVdpau ? withSmallDeps && !stdenv.hostPlatform.isMinGW # Vdpau hardware acceleration , withVideoToolbox ? withHeadlessDeps && stdenv.hostPlatform.isDarwin # Apple VideoToolbox -, withVidStab ? withFullDeps && withGPL # Video stabilization +, withVidStab ? withHeadlessDeps && withGPL # Video stabilization , withVmaf ? withFullDeps && !stdenv.hostPlatform.isAarch64 && lib.versionAtLeast version "5" # Netflix's VMAF (Video Multi-Method Assessment Fusion) , withVoAmrwbenc ? withFullDeps && withVersion3 # AMR-WB encoder , withVorbis ? withHeadlessDeps # Vorbis de/encoding, native encoder exists @@ -263,7 +264,6 @@ , libjxl , libmodplug , libmysofa -, libogg , libopenmpt , libopus , libplacebo @@ -335,6 +335,12 @@ , CoreImage , VideoToolbox , xcode # unfree contains metalcc and metallib +/* + * Cuda Packages + */ +, cuda_cudart +, cuda_nvcc +, libnpp /* * Testing */ @@ -572,6 +578,7 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withCoreImage "coreimage") (enableFeature withCuda "cuda") (enableFeature withCudaLLVM "cuda-llvm") + (enableFeature withCudaNVCC "cuda-nvcc") (enableFeature withCuvid "cuvid") (enableFeature withDav1d "libdav1d") (enableFeature withDc1394 "libdc1394") @@ -612,6 +619,7 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withModplug "libmodplug") (enableFeature withMp3lame "libmp3lame") (enableFeature withMysofa "libmysofa") + (enableFeature withNpp "libnpp") (enableFeature withNvdec "nvdec") (enableFeature withNvenc "nvenc") (enableFeature withOpenal "openal") @@ -717,7 +725,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ removeReferencesTo addDriverRunpath perl pkg-config yasm ] # Texinfo version 7.1 introduced breaking changes, which older versions of ffmpeg do not handle. ++ (if versionOlder version "5" then [ texinfo6 ] else [ texinfo ]) - ++ optionals withCudaLLVM [ clang ]; + ++ optionals withCudaLLVM [ clang ] + ++ optionals withCudaNVCC [ cuda_nvcc ]; buildInputs = [] ++ optionals withAlsa [ alsa-lib ] @@ -737,6 +746,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withChromaprint [ chromaprint ] ++ optionals withCodec2 [ codec2 ] ++ optionals withCoreImage [ CoreImage ] + ++ optionals withCudaNVCC [ cuda_cudart cuda_nvcc ] ++ optionals withDav1d [ dav1d ] ++ optionals withDc1394 [ libdc1394 libraw1394 ] ++ optionals withDrm [ libdrm ] @@ -764,7 +774,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withModplug [ libmodplug ] ++ optionals withMp3lame [ lame ] ++ optionals withMysofa [ libmysofa ] - ++ optionals withOgg [ libogg ] + ++ optionals withNpp [ libnpp cuda_cudart cuda_nvcc ] ++ optionals withOpenal [ openal ] ++ optionals withOpencl [ ocl-icd opencl-headers ] ++ optionals (withOpencoreAmrnb || withOpencoreAmrwb) [ opencore-amr ] @@ -823,6 +833,13 @@ stdenv.mkDerivation (finalAttrs: { buildFlags = [ "all" ] ++ optional buildQtFaststart "tools/qt-faststart"; # Build qt-faststart executable + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=incompatible-pointer-types" + "-Wno-error=int-conversion" + ]; + }; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; # Fails with SIGABRT otherwise FIXME: Why? diff --git a/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix index 34e156256a..814224a44f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix @@ -38,11 +38,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "freetype"; - version = "2.13.2"; + version = "2.13.3"; src = let inherit (finalAttrs) pname version; in fetchurl { url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-EpkcTlXFBt1/m3ZZM+Yv0r4uBtQhUF15UKEy5PG7SE0="; + sha256 = "sha256-BVA1BmbUJ8dNrrhdWse7NTrLpfdpVjlZlTEanG8GMok="; }; propagatedBuildInputs = [ zlib bzip2 brotli libpng ]; # needed when linking against freetype diff --git a/third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix index be39b0d7cb..180ff45534 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix @@ -2,32 +2,40 @@ , stdenv , fetchFromGitHub , cmake +, ninja , gtest , prometheus-cpp }: stdenv.mkDerivation rec { pname = "gbenchmark"; - version = "1.8.5"; + version = "1.9.0"; src = fetchFromGitHub { owner = "google"; repo = "benchmark"; rev = "v${version}"; - hash = "sha256-c46Xna/t21WKaFa7n4ieIacsrxJ+15uGNYWCUVuUhsI="; + hash = "sha256-5cl1PIjhXaL58kSyWZXRWLq6BITS2BwEovPhwvk2e18="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ninja ]; - postPatch = '' - cp -r ${gtest.src} googletest - chmod -R u+w googletest + checkInputs = [ gtest ]; - # https://github.com/google/benchmark/issues/1396 - substituteInPlace cmake/benchmark.pc.in \ - --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ - ''; + cmakeFlags = [ + (lib.cmakeBool "BENCHMARK_USE_BUNDLED_GTEST" false) + (lib.cmakeBool "BENCHMARK_ENABLE_WERROR" false) + ]; + + # We ran into issues with gtest 1.8.5 conditioning on + # `#if __has_cpp_attribute(maybe_unused)`, which was, for some + # reason, going through even when C++14 was being used and + # breaking the build on Darwin by triggering errors about using + # C++17 features. + # + # This might be a problem with our Clang, as it does not reproduce + # with Xcode, but we just work around it by silencing the warning. + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-c++17-attribute-extensions"; # Tests fail on 32-bit due to not enough precision doCheck = stdenv.hostPlatform.is64bit; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gcr/4.nix b/third_party/nixpkgs/pkgs/development/libraries/gcr/4.nix index dd860d0bc7..b99c5f9eaa 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gcr/4.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gcr/4.nix @@ -22,6 +22,7 @@ , gnome , python3 , shared-mime-info +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd }: stdenv.mkDerivation rec { @@ -56,8 +57,9 @@ stdenv.mkDerivation rec { pango libsecret openssh - systemd gtk4 + ] ++ lib.optionals systemdSupport [ + systemd ]; propagatedBuildInputs = [ @@ -74,6 +76,7 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/issues/140824 "-Dssh_agent=false" "-Dgpg_path=${lib.getBin gnupg}/bin/gpg" + (lib.mesonEnable "systemd" systemdSupport) ]; doCheck = false; # fails 21 out of 603 tests, needs dbus daemon diff --git a/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix index 99fb182bc8..b6cae32e92 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix @@ -28,7 +28,7 @@ let testDeps = [ - gtk3 atk pango.out gdk-pixbuf harfbuzz + gtk3 atk pango.out gdk-pixbuf harfbuzz glib.out ]; in stdenv.mkDerivation (finalAttrs: { pname = "gjs"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gle/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gle/default.nix index f9ef65197b..b1b064fdb1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gle/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gle/default.nix @@ -1,19 +1,48 @@ -{lib, stdenv, fetchurl, libglut, libX11, libXt, libXmu, libXi, libXext, libGL, libGLU}: +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + libglut, + libX11, + libXt, + libXmu, + libXi, + libXext, + libGL, + libGLU, +}: + stdenv.mkDerivation rec { pname = "gle"; - version = "3.1.0"; - buildInputs = [libGLU libGL libglut libX11 libXt libXmu libXi libXext]; - src = fetchurl { - urls = [ - "mirror://sourceforge/project/gle/gle/gle-${version}/gle-${version}.tar.gz" - "https://www.linas.org/gle/pub/gle-${version}.tar.gz" - ]; - sha256 = "09zs1di4dsssl9k322nzildvf41jwipbzhik9p43yb1bcfsp92nw"; + version = "3.1.2"; + + buildInputs = [ + libGLU + libGL + libglut + libX11 + libXt + libXmu + libXi + libXext + ]; + + nativeBuildInputs = [ + autoreconfHook + ]; + + src = fetchFromGitHub { + owner = "linas"; + repo = "glextrusion"; + rev = "refs/tags/${pname}-${version}"; + sha256 = "sha256-yvCu0EOwxOMN6upeHX+C2sIz1YVjjB/320g+Mf24S6g="; }; + meta = { description = "Tubing and extrusion library"; - license = lib.licenses.gpl2 ; - maintainers = [lib.maintainers.raskin]; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/glib/setup-hook.sh b/third_party/nixpkgs/pkgs/development/libraries/glib/setup-hook.sh index 8ead5510ec..9eabf8a679 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glib/setup-hook.sh +++ b/third_party/nixpkgs/pkgs/development/libraries/glib/setup-hook.sh @@ -12,7 +12,7 @@ addEnvHooks "$targetOffset" make_glib_find_gsettings_schemas glibPreInstallPhase() { makeFlagsArray+=("gsettingsschemadir=${!outputLib}/share/gsettings-schemas/$name/glib-2.0/schemas/") } -preInstallPhases+=" glibPreInstallPhase" +appendToVar preInstallPhases glibPreInstallPhase glibPreFixupPhase() { # Move gschemas in case the install flag didn't help diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/2.39-master.patch b/third_party/nixpkgs/pkgs/development/libraries/glibc/2.39-master.patch deleted file mode 100644 index 88e629981e..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/glibc/2.39-master.patch +++ /dev/null @@ -1,10857 +0,0 @@ -commit 6d1e3fb07b45e2e31e469b16cf21b24bccf8914c -Author: Andreas K. Hüttel -Date: Wed Jan 31 02:12:43 2024 +0100 - - Replace advisories directory - - Signed-off-by: Andreas K. Hüttel - -diff --git a/advisories/GLIBC-SA-2023-0001 b/advisories/GLIBC-SA-2023-0001 -deleted file mode 100644 -index 3d19c91b6a..0000000000 ---- a/advisories/GLIBC-SA-2023-0001 -+++ /dev/null -@@ -1,14 +0,0 @@ --printf: incorrect output for integers with thousands separator and width field -- --When the printf family of functions is called with a format specifier --that uses an (enable grouping) and a minimum width --specifier, the resulting output could be larger than reasonably expected --by a caller that computed a tight bound on the buffer size. The --resulting larger than expected output could result in a buffer overflow --in the printf family of functions. -- --CVE-Id: CVE-2023-25139 --Public-Date: 2023-02-02 --Vulnerable-Commit: e88b9f0e5cc50cab57a299dc7efe1a4eb385161d (2.37) --Fix-Commit: c980549cc6a1c03c23cc2fe3e7b0fe626a0364b0 (2.38) --Fix-Commit: 07b9521fc6369d000216b96562ff7c0ed32a16c4 (2.37-4) -diff --git a/advisories/GLIBC-SA-2023-0002 b/advisories/GLIBC-SA-2023-0002 -deleted file mode 100644 -index 5122669a64..0000000000 ---- a/advisories/GLIBC-SA-2023-0002 -+++ /dev/null -@@ -1,15 +0,0 @@ --getaddrinfo: Stack read overflow in no-aaaa mode -- --If the system is configured in no-aaaa mode via /etc/resolv.conf, --getaddrinfo is called for the AF_UNSPEC address family, and a DNS --response is received over TCP that is larger than 2048 bytes, --getaddrinfo may potentially disclose stack contents via the returned --address data, or crash. -- --CVE-Id: CVE-2023-4527 --Public-Date: 2023-09-12 --Vulnerable-Commit: f282cdbe7f436c75864e5640a409a10485e9abb2 (2.36) --Fix-Commit: bd77dd7e73e3530203be1c52c8a29d08270cb25d (2.39) --Fix-Commit: 4ea972b7edd7e36610e8cde18bf7a8149d7bac4f (2.36-113) --Fix-Commit: b7529346025a130fee483d42178b5c118da971bb (2.37-38) --Fix-Commit: b25508dd774b617f99419bdc3cf2ace4560cd2d6 (2.38-19) -diff --git a/advisories/GLIBC-SA-2023-0003 b/advisories/GLIBC-SA-2023-0003 -deleted file mode 100644 -index d3aef80348..0000000000 ---- a/advisories/GLIBC-SA-2023-0003 -+++ /dev/null -@@ -1,15 +0,0 @@ --getaddrinfo: Potential use-after-free -- --When an NSS plugin only implements the _gethostbyname2_r and --_getcanonname_r callbacks, getaddrinfo could use memory that was freed --during buffer resizing, potentially causing a crash or read or write to --arbitrary memory. -- --CVE-Id: CVE-2023-4806 --Public-Date: 2023-09-12 --Fix-Commit: 973fe93a5675c42798b2161c6f29c01b0e243994 (2.39) --Fix-Commit: e09ee267c03e3150c2c9ba28625ab130705a485e (2.34-420) --Fix-Commit: e3ccb230a961b4797510e6a1f5f21fd9021853e7 (2.35-270) --Fix-Commit: a9728f798ec7f05454c95637ee6581afaa9b487d (2.36-115) --Fix-Commit: 6529a7466c935f36e9006b854d6f4e1d4876f942 (2.37-39) --Fix-Commit: 00ae4f10b504bc4564e9f22f00907093f1ab9338 (2.38-20) -diff --git a/advisories/GLIBC-SA-2023-0004 b/advisories/GLIBC-SA-2023-0004 -deleted file mode 100644 -index 5286a7aa54..0000000000 ---- a/advisories/GLIBC-SA-2023-0004 -+++ /dev/null -@@ -1,16 +0,0 @@ --tunables: local privilege escalation through buffer overflow -- --If a tunable of the form NAME=NAME=VAL is passed in the environment of a --setuid program and NAME is valid, it may result in a buffer overflow, --which could be exploited to achieve escalated privileges. This flaw was --introduced in glibc 2.34. -- --CVE-Id: CVE-2023-4911 --Public-Date: 2023-10-03 --Vulnerable-Commit: 2ed18c5b534d9e92fc006202a5af0df6b72e7aca (2.34) --Fix-Commit: 1056e5b4c3f2d90ed2b4a55f96add28da2f4c8fa (2.39) --Fix-Commit: dcc367f148bc92e7f3778a125f7a416b093964d9 (2.34-423) --Fix-Commit: c84018a05aec80f5ee6f682db0da1130b0196aef (2.35-274) --Fix-Commit: 22955ad85186ee05834e47e665056148ca07699c (2.36-118) --Fix-Commit: b4e23c75aea756b4bddc4abcf27a1c6dca8b6bd3 (2.37-45) --Fix-Commit: 750a45a783906a19591fb8ff6b7841470f1f5701 (2.38-27) -diff --git a/advisories/GLIBC-SA-2023-0005 b/advisories/GLIBC-SA-2023-0005 -deleted file mode 100644 -index cc4eb90b82..0000000000 ---- a/advisories/GLIBC-SA-2023-0005 -+++ /dev/null -@@ -1,18 +0,0 @@ --getaddrinfo: DoS due to memory leak -- --The fix for CVE-2023-4806 introduced a memory leak when an application --calls getaddrinfo for AF_INET6 with AI_CANONNAME, AI_ALL and AI_V4MAPPED --flags set. -- --CVE-Id: CVE-2023-5156 --Public-Date: 2023-09-25 --Vulnerable-Commit: e09ee267c03e3150c2c9ba28625ab130705a485e (2.34-420) --Vulnerable-Commit: e3ccb230a961b4797510e6a1f5f21fd9021853e7 (2.35-270) --Vulnerable-Commit: a9728f798ec7f05454c95637ee6581afaa9b487d (2.36-115) --Vulnerable-Commit: 6529a7466c935f36e9006b854d6f4e1d4876f942 (2.37-39) --Vulnerable-Commit: 00ae4f10b504bc4564e9f22f00907093f1ab9338 (2.38-20) --Fix-Commit: 8006457ab7e1cd556b919f477348a96fe88f2e49 (2.34-421) --Fix-Commit: 17092c0311f954e6f3c010f73ce3a78c24ac279a (2.35-272) --Fix-Commit: 856bac55f98dc840e7c27cfa82262b933385de90 (2.36-116) --Fix-Commit: 4473d1b87d04b25cdd0e0354814eeaa421328268 (2.37-42) --Fix-Commit: 5ee59ca371b99984232d7584fe2b1a758b4421d3 (2.38-24) -diff --git a/advisories/GLIBC-SA-2024-0001 b/advisories/GLIBC-SA-2024-0001 -deleted file mode 100644 -index 28931c75ae..0000000000 ---- a/advisories/GLIBC-SA-2024-0001 -+++ /dev/null -@@ -1,15 +0,0 @@ --syslog: Heap buffer overflow in __vsyslog_internal -- --__vsyslog_internal did not handle a case where printing a SYSLOG_HEADER --containing a long program name failed to update the required buffer --size, leading to the allocation and overflow of a too-small buffer on --the heap. -- --CVE-Id: CVE-2023-6246 --Public-Date: 2024-01-30 --Vulnerable-Commit: 52a5be0df411ef3ff45c10c7c308cb92993d15b1 (2.37) --Fix-Commit: 6bd0e4efcc78f3c0115e5ea9739a1642807450da (2.39) --Fix-Commit: 23514c72b780f3da097ecf33a793b7ba9c2070d2 (2.38-42) --Fix-Commit: 97a4292aa4a2642e251472b878d0ec4c46a0e59a (2.37-57) --Vulnerable-Commit: b0e7888d1fa2dbd2d9e1645ec8c796abf78880b9 (2.36-16) --Fix-Commit: d1a83b6767f68b3cb5b4b4ea2617254acd040c82 (2.36-126) -diff --git a/advisories/GLIBC-SA-2024-0002 b/advisories/GLIBC-SA-2024-0002 -deleted file mode 100644 -index 940bfcf2fc..0000000000 ---- a/advisories/GLIBC-SA-2024-0002 -+++ /dev/null -@@ -1,15 +0,0 @@ --syslog: Heap buffer overflow in __vsyslog_internal -- --__vsyslog_internal used the return value of snprintf/vsnprintf to --calculate buffer sizes for memory allocation. If these functions (for --any reason) failed and returned -1, the resulting buffer would be too --small to hold output. -- --CVE-Id: CVE-2023-6779 --Public-Date: 2024-01-30 --Vulnerable-Commit: 52a5be0df411ef3ff45c10c7c308cb92993d15b1 (2.37) --Fix-Commit: 7e5a0c286da33159d47d0122007aac016f3e02cd (2.39) --Fix-Commit: d0338312aace5bbfef85e03055e1212dd0e49578 (2.38-43) --Fix-Commit: 67062eccd9a65d7fda9976a56aeaaf6c25a80214 (2.37-58) --Vulnerable-Commit: b0e7888d1fa2dbd2d9e1645ec8c796abf78880b9 (2.36-16) --Fix-Commit: 2bc9d7c002bdac38b5c2a3f11b78e309d7765b83 (2.36-127) -diff --git a/advisories/GLIBC-SA-2024-0003 b/advisories/GLIBC-SA-2024-0003 -deleted file mode 100644 -index b43a5150ab..0000000000 ---- a/advisories/GLIBC-SA-2024-0003 -+++ /dev/null -@@ -1,13 +0,0 @@ --syslog: Integer overflow in __vsyslog_internal -- --__vsyslog_internal calculated a buffer size by adding two integers, but --did not first check if the addition would overflow. -- --CVE-Id: CVE-2023-6780 --Public-Date: 2024-01-30 --Vulnerable-Commit: 52a5be0df411ef3ff45c10c7c308cb92993d15b1 (2.37) --Fix-Commit: ddf542da94caf97ff43cc2875c88749880b7259b (2.39) --Fix-Commit: d37c2b20a4787463d192b32041c3406c2bd91de0 (2.38-44) --Fix-Commit: 2b58cba076e912961ceaa5fa58588e4b10f791c0 (2.37-59) --Vulnerable-Commit: b0e7888d1fa2dbd2d9e1645ec8c796abf78880b9 (2.36-16) --Fix-Commit: b9b7d6a27aa0632f334352fa400771115b3c69b7 (2.36-128) -diff --git a/advisories/README b/advisories/README -deleted file mode 100644 -index 94e68b1350..0000000000 ---- a/advisories/README -+++ /dev/null -@@ -1,73 +0,0 @@ --GNU C Library Security Advisory Format --====================================== -- --Security advisories in this directory follow a simple git commit log --format, with a heading and free-format description augmented with tags --to allow parsing key information. References to code changes are --specific to the glibc repository and follow a specific format: -- -- Tag-name: (release-version) -- --The indicates a specific commit in the repository. The --release-version indicates the publicly consumable release in which this --commit is known to exist. The release-version is derived from the --git-describe format, (i.e. stripped out from glibc-2.34.NNN-gxxxx) and --is of the form 2.34-NNN. If the -NNN suffix is absent, it means that --the change is in that release tarball, otherwise the change is on the --release/2.YY/master branch and not in any released tarball. -- --The following tags are currently being used: -- --CVE-Id: --This is the CVE-Id assigned under the CVE Program --(https://www.cve.org/). -- --Public-Date: --The date this issue became publicly known. -- --Vulnerable-Commit: --The commit that introduced this vulnerability. There could be multiple --entries, one for each release branch in the glibc repository; the --release-version portion of this tag should tell you which branch this is --on. -- --Fix-Commit: --The commit that fixed this vulnerability. There could be multiple --entries for each release branch in the glibc repository, indicating that --all of those commits contributed to fixing that issue in each of those --branches. -- --Adding an Advisory -------------------- -- --An advisory for a CVE needs to be added on the master branch in two steps: -- --1. Add the text of the advisory without any Fix-Commit tags along with -- the fix for the CVE. Add the Vulnerable-Commit tag, if applicable. -- The advisories directory does not exist in release branches, so keep -- the advisory text commit distinct from the code changes, to ease -- backports. Ask for the GLIBC-SA advisory number from the security -- team. -- --2. Finish all backports on release branches and then back on the msater -- branch, add all commit refs to the advisory using the Fix-Commit -- tags. Don't bother adding the release-version subscript since the -- next step will overwrite it. -- --3. Run the process-advisories.sh script in the scripts directory on the -- advisory: -- -- scripts/process-advisories.sh update GLIBC-SA-YYYY-NNNN -- -- (replace YYYY-NNNN with the actual advisory number). -- --4. Verify the updated advisory and push the result. -- --Getting a NEWS snippet from advisories ---------------------------------------- -- --Run: -- -- scripts/process-advisories.sh news -- --and copy the content into the NEWS file. - -commit 63295e4fda1f6dab4bf7442706fe303bf283036c -Author: Adhemerval Zanella -Date: Mon Feb 5 16:10:24 2024 +0000 - - arm: Remove wrong ldr from _dl_start_user (BZ 31339) - - The commit 49d877a80b29d3002887b084eec6676d9f5fec18 (arm: Remove - _dl_skip_args usage) removed the _SKIP_ARGS literal, which was - previously loader to r4 on loader _start. However, the cleanup did not - remove the following 'ldr r4, [sl, r4]' on _dl_start_user, used to check - to skip the arguments after ld self-relocations. - - In my testing, the kernel initially set r4 to 0, which makes the - ldr instruction just read the _GLOBAL_OFFSET_TABLE_. However, since r4 - is a callee-saved register; a different runtime might not zero - initialize it and thus trigger an invalid memory access. - - Checked on arm-linux-gnu. - - Reported-by: Adrian Ratiu - Reviewed-by: Szabolcs Nagy - (cherry picked from commit 1e25112dc0cb2515d27d8d178b1ecce778a9d37a) - -diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h -index b857bbc868..dd1a0f6b6e 100644 ---- a/sysdeps/arm/dl-machine.h -+++ b/sysdeps/arm/dl-machine.h -@@ -139,7 +139,6 @@ _start:\n\ - _dl_start_user:\n\ - adr r6, .L_GET_GOT\n\ - add sl, sl, r6\n\ -- ldr r4, [sl, r4]\n\ - @ save the entry point in another register\n\ - mov r6, r0\n\ - @ get the original arg count\n\ - -commit 312e159626b67fe11f39e83e222cf4348a3962f3 -Author: Adhemerval Zanella -Date: Thu Feb 1 14:29:53 2024 -0300 - - mips: FIx clone3 implementation (BZ 31325) - - For o32 we need to setup a minimal stack frame to allow cprestore - on __thread_start_clone3 (which instruct the linker to save the - gp for PIC). Also, there is no guarantee by kABI that $8 will be - preserved after syscall execution, so we need to save it on the - provided stack. - - Checked on mipsel-linux-gnu. - - Reported-by: Khem Raj - Tested-by: Khem Raj - (cherry picked from commit bbd248ac0d75efdef8fe61ea69b1fb25fb95b6e7) - -diff --git a/sysdeps/unix/sysv/linux/mips/clone3.S b/sysdeps/unix/sysv/linux/mips/clone3.S -index e9fec2fa47..481b8ae963 100644 ---- a/sysdeps/unix/sysv/linux/mips/clone3.S -+++ b/sysdeps/unix/sysv/linux/mips/clone3.S -@@ -37,11 +37,6 @@ - - .text - .set nomips16 --#if _MIPS_SIM == _ABIO32 --# define EXTRA_LOCALS 1 --#else --# define EXTRA_LOCALS 0 --#endif - #define FRAMESZ ((NARGSAVE*SZREG)+ALSZ)&ALMASK - GPOFF= FRAMESZ-(1*SZREG) - NESTED(__clone3, SZREG, sp) -@@ -68,8 +63,31 @@ NESTED(__clone3, SZREG, sp) - beqz a0, L(error) /* No NULL cl_args pointer. */ - beqz a2, L(error) /* No NULL function pointer. */ - -+#if _MIPS_SIM == _ABIO32 -+ /* Both stack and stack_size on clone_args are defined as uint64_t, and -+ there is no need to handle values larger than to 32 bits for o32. */ -+# if __BYTE_ORDER == __BIG_ENDIAN -+# define CL_STACKPOINTER_OFFSET 44 -+# define CL_STACKSIZE_OFFSET 52 -+# else -+# define CL_STACKPOINTER_OFFSET 40 -+# define CL_STACKSIZE_OFFSET 48 -+# endif -+ -+ /* For o32 we need to setup a minimal stack frame to allow cprestore -+ on __thread_start_clone3. Also there is no guarantee by kABI that -+ $8 will be preserved after syscall execution (so we need to save it -+ on the provided stack). */ -+ lw t0, CL_STACKPOINTER_OFFSET(a0) /* Load the stack pointer. */ -+ lw t1, CL_STACKSIZE_OFFSET(a0) /* Load the stack_size. */ -+ addiu t1, -32 /* Update the stack size. */ -+ addu t2, t1, t0 /* Calculate the thread stack. */ -+ sw a3, 0(t2) /* Save argument pointer. */ -+ sw t1, CL_STACKSIZE_OFFSET(a0) /* Save the new stack size. */ -+#else - move $8, a3 /* a3 is set to 0/1 for syscall success/error - while a4/$8 is returned unmodified. */ -+#endif - - /* Do the system call, the kernel expects: - v0: system call number -@@ -125,7 +143,11 @@ L(thread_start_clone3): - - /* Restore the arg for user's function. */ - move t9, a2 /* Function pointer. */ -+#if _MIPS_SIM == _ABIO32 -+ PTR_L a0, 0(sp) -+#else - move a0, $8 /* Argument pointer. */ -+#endif - - /* Call the user's function. */ - jal t9 - -commit d0724994de40934c552f1f68de89053848a44927 -Author: Xi Ruoyao -Date: Thu Feb 22 21:26:55 2024 +0100 - - math: Update mips64 ulps - - Signed-off-by: Andreas K. Hüttel - (cherry picked from commit e2a65ecc4b30a797df7dc6529f09b712aa256029) - -diff --git a/sysdeps/mips/mips64/libm-test-ulps b/sysdeps/mips/mips64/libm-test-ulps -index 78969745b2..933aba4735 100644 ---- a/sysdeps/mips/mips64/libm-test-ulps -+++ b/sysdeps/mips/mips64/libm-test-ulps -@@ -1066,17 +1066,17 @@ double: 1 - ldouble: 1 - - Function: "j0": --double: 2 -+double: 3 - float: 9 - ldouble: 2 - - Function: "j0_downward": --double: 5 -+double: 6 - float: 9 - ldouble: 9 - - Function: "j0_towardzero": --double: 6 -+double: 7 - float: 9 - ldouble: 9 - -@@ -1146,6 +1146,7 @@ float: 6 - ldouble: 8 - - Function: "log": -+double: 1 - float: 1 - ldouble: 1 - - -commit e0910f1d3278f05439fb434ee528fc9be1b6bd5e -Author: Stefan Liebler -Date: Thu Feb 22 15:03:27 2024 +0100 - - S390: Do not clobber r7 in clone [BZ #31402] - - Starting with commit e57d8fc97b90127de4ed3e3a9cdf663667580935 - "S390: Always use svc 0" - clone clobbers the call-saved register r7 in error case: - function or stack is NULL. - - This patch restores the saved registers also in the error case. - Furthermore the existing test misc/tst-clone is extended to check - all error cases and that clone does not clobber registers in this - error case. - - (cherry picked from commit 02782fd12849b6673cb5c2728cb750e8ec295aa3) - -diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/clone.S b/sysdeps/unix/sysv/linux/s390/s390-32/clone.S -index 4c882ef2ee..a7a863242c 100644 ---- a/sysdeps/unix/sysv/linux/s390/s390-32/clone.S -+++ b/sysdeps/unix/sysv/linux/s390/s390-32/clone.S -@@ -53,6 +53,7 @@ ENTRY(__clone) - br %r14 - error: - lhi %r2,-EINVAL -+ lm %r6,%r7,24(%r15) /* Load registers. */ - j SYSCALL_ERROR_LABEL - PSEUDO_END (__clone) - -diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/clone.S b/sysdeps/unix/sysv/linux/s390/s390-64/clone.S -index 4eb104be71..c552a6b8de 100644 ---- a/sysdeps/unix/sysv/linux/s390/s390-64/clone.S -+++ b/sysdeps/unix/sysv/linux/s390/s390-64/clone.S -@@ -54,6 +54,7 @@ ENTRY(__clone) - br %r14 - error: - lghi %r2,-EINVAL -+ lmg %r6,%r7,48(%r15) /* Restore registers. */ - jg SYSCALL_ERROR_LABEL - PSEUDO_END (__clone) - -diff --git a/sysdeps/unix/sysv/linux/tst-clone.c b/sysdeps/unix/sysv/linux/tst-clone.c -index 470676ab2b..2bc7124983 100644 ---- a/sysdeps/unix/sysv/linux/tst-clone.c -+++ b/sysdeps/unix/sysv/linux/tst-clone.c -@@ -16,12 +16,16 @@ - License along with the GNU C Library; if not, see - . */ - --/* BZ #2386 */ -+/* BZ #2386, BZ #31402 */ - #include - #include - #include - #include - #include -+#include /* For _STACK_GROWS_{UP,DOWN}. */ -+#include -+ -+volatile unsigned v = 0xdeadbeef; - - int child_fn(void *arg) - { -@@ -30,22 +34,67 @@ int child_fn(void *arg) - } - - static int --do_test (void) -+__attribute__((noinline)) -+do_clone (int (*fn)(void *), void *stack) - { - int result; -+ unsigned int a = v; -+ unsigned int b = v; -+ unsigned int c = v; -+ unsigned int d = v; -+ unsigned int e = v; -+ unsigned int f = v; -+ unsigned int g = v; -+ unsigned int h = v; -+ unsigned int i = v; -+ unsigned int j = v; -+ unsigned int k = v; -+ unsigned int l = v; -+ unsigned int m = v; -+ unsigned int n = v; -+ unsigned int o = v; -+ -+ result = clone (fn, stack, 0, NULL); -+ -+ /* Check that clone does not clobber call-saved registers. */ -+ TEST_VERIFY (a == v && b == v && c == v && d == v && e == v && f == v -+ && g == v && h == v && i == v && j == v && k == v && l == v -+ && m == v && n == v && o == v); -+ -+ return result; -+} -+ -+static void -+__attribute__((noinline)) -+do_test_single (int (*fn)(void *), void *stack) -+{ -+ printf ("%s (fn=%p, stack=%p)\n", __FUNCTION__, fn, stack); -+ errno = 0; -+ -+ int result = do_clone (fn, stack); -+ -+ TEST_COMPARE (errno, EINVAL); -+ TEST_COMPARE (result, -1); -+} - -- result = clone (child_fn, NULL, 0, NULL); -+static int -+do_test (void) -+{ -+ char st[128 * 1024] __attribute__ ((aligned)); -+ void *stack = NULL; -+#if _STACK_GROWS_DOWN -+ stack = st + sizeof (st); -+#elif _STACK_GROWS_UP -+ stack = st; -+#else -+# error "Define either _STACK_GROWS_DOWN or _STACK_GROWS_UP" -+#endif - -- if (errno != EINVAL || result != -1) -- { -- printf ("FAIL: clone()=%d (wanted -1) errno=%d (wanted %d)\n", -- result, errno, EINVAL); -- return 1; -- } -+ do_test_single (child_fn, NULL); -+ do_test_single (NULL, stack); -+ do_test_single (NULL, NULL); - -- puts ("All OK"); - return 0; - } - --#define TEST_FUNCTION do_test () --#include "../test-skeleton.c" -+#include - -commit 1b9c1a0047fb26a65a9b2a7b8cd977243f7d353c -Author: Jakub Jelinek -Date: Wed Jan 31 19:17:27 2024 +0100 - - Use gcc __builtin_stdc_* builtins in stdbit.h if possible - - The following patch uses the GCC 14 __builtin_stdc_* builtins in stdbit.h - for the type-generic macros, so that when compiled with GCC 14 or later, - it supports not just 8/16/32/64-bit unsigned integers, but also 128-bit - (if target supports them) and unsigned _BitInt (any supported precision). - And so that the macros don't expand arguments multiple times and can be - evaluated in constant expressions. - - The new testcase is gcc's gcc/testsuite/gcc.dg/builtin-stdc-bit-1.c - adjusted to test stdbit.h and the type-generic macros in there instead - of the builtins and adjusted to use glibc test framework rather than - gcc style tests with __builtin_abort (). - - Signed-off-by: Jakub Jelinek - Reviewed-by: Joseph Myers - (cherry picked from commit da89496337b97e6a2aaf1e81d55cf998f6db1070) - -diff --git a/manual/stdbit.texi b/manual/stdbit.texi -index fe41c671d8..6c75ed9a20 100644 ---- a/manual/stdbit.texi -+++ b/manual/stdbit.texi -@@ -32,7 +32,13 @@ and @code{unsigned long long int}. In addition, there is a - corresponding type-generic macro (not listed below), named the same as - the functions but without any suffix such as @samp{_uc}. The - type-generic macro can only be used with an argument of an unsigned --integer type with a width of 8, 16, 32 or 64 bits. -+integer type with a width of 8, 16, 32 or 64 bits, or when using -+a compiler with support for -+@uref{https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html,@code{__builtin_stdc_bit_ceil}}, -+etc.@:, built-in functions such as GCC 14.1 or later -+any unsigned integer type those built-in functions support. -+In GCC 14.1 that includes support for @code{unsigned __int128} and -+@code{unsigned _BitInt(@var{n})} if supported by the target. - - @deftypefun {unsigned int} stdc_leading_zeros_uc (unsigned char @var{x}) - @deftypefunx {unsigned int} stdc_leading_zeros_us (unsigned short @var{x}) -diff --git a/stdlib/Makefile b/stdlib/Makefile -index d587f054d1..9898cc5d8a 100644 ---- a/stdlib/Makefile -+++ b/stdlib/Makefile -@@ -308,6 +308,7 @@ tests := \ - tst-setcontext10 \ - tst-setcontext11 \ - tst-stdbit-Wconversion \ -+ tst-stdbit-builtins \ - tst-stdc_bit_ceil \ - tst-stdc_bit_floor \ - tst-stdc_bit_width \ -diff --git a/stdlib/stdbit.h b/stdlib/stdbit.h -index f334eb174d..2801590c63 100644 ---- a/stdlib/stdbit.h -+++ b/stdlib/stdbit.h -@@ -64,9 +64,13 @@ extern unsigned int stdc_leading_zeros_ul (unsigned long int __x) - __extension__ - extern unsigned int stdc_leading_zeros_ull (unsigned long long int __x) - __THROW __attribute_const__; --#define stdc_leading_zeros(x) \ -+#if __glibc_has_builtin (__builtin_stdc_leading_zeros) -+# define stdc_leading_zeros(x) (__builtin_stdc_leading_zeros (x)) -+#else -+# define stdc_leading_zeros(x) \ - (stdc_leading_zeros_ull (x) \ - - (unsigned int) (8 * (sizeof (0ULL) - sizeof (x)))) -+#endif - - #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_clzll) - static __always_inline unsigned int -@@ -116,9 +120,13 @@ extern unsigned int stdc_leading_ones_ul (unsigned long int __x) - __extension__ - extern unsigned int stdc_leading_ones_ull (unsigned long long int __x) - __THROW __attribute_const__; --#define stdc_leading_ones(x) \ -+#if __glibc_has_builtin (__builtin_stdc_leading_ones) -+# define stdc_leading_ones(x) (__builtin_stdc_leading_ones (x)) -+#else -+# define stdc_leading_ones(x) \ - (stdc_leading_ones_ull ((unsigned long long int) (x) \ - << 8 * (sizeof (0ULL) - sizeof (x)))) -+#endif - - #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_clzll) - static __always_inline unsigned int -@@ -168,11 +176,15 @@ extern unsigned int stdc_trailing_zeros_ul (unsigned long int __x) - __extension__ - extern unsigned int stdc_trailing_zeros_ull (unsigned long long int __x) - __THROW __attribute_const__; --#define stdc_trailing_zeros(x) \ -+#if __glibc_has_builtin (__builtin_stdc_trailing_zeros) -+# define stdc_trailing_zeros(x) (__builtin_stdc_trailing_zeros (x)) -+#else -+# define stdc_trailing_zeros(x) \ - (sizeof (x) == 8 ? stdc_trailing_zeros_ull (x) \ - : sizeof (x) == 4 ? stdc_trailing_zeros_ui (x) \ - : sizeof (x) == 2 ? stdc_trailing_zeros_us (__pacify_uint16 (x)) \ - : stdc_trailing_zeros_uc (__pacify_uint8 (x))) -+#endif - - #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_ctzll) - static __always_inline unsigned int -@@ -222,7 +234,11 @@ extern unsigned int stdc_trailing_ones_ul (unsigned long int __x) - __extension__ - extern unsigned int stdc_trailing_ones_ull (unsigned long long int __x) - __THROW __attribute_const__; --#define stdc_trailing_ones(x) (stdc_trailing_ones_ull (x)) -+#if __glibc_has_builtin (__builtin_stdc_trailing_ones) -+# define stdc_trailing_ones(x) (__builtin_stdc_trailing_ones (x)) -+#else -+# define stdc_trailing_ones(x) (stdc_trailing_ones_ull (x)) -+#endif - - #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_ctzll) - static __always_inline unsigned int -@@ -272,11 +288,15 @@ extern unsigned int stdc_first_leading_zero_ul (unsigned long int __x) - __extension__ - extern unsigned int stdc_first_leading_zero_ull (unsigned long long int __x) - __THROW __attribute_const__; --#define stdc_first_leading_zero(x) \ -+#if __glibc_has_builtin (__builtin_stdc_first_leading_zero) -+# define stdc_first_leading_zero(x) (__builtin_stdc_first_leading_zero (x)) -+#else -+# define stdc_first_leading_zero(x) \ - (sizeof (x) == 8 ? stdc_first_leading_zero_ull (x) \ - : sizeof (x) == 4 ? stdc_first_leading_zero_ui (x) \ - : sizeof (x) == 2 ? stdc_first_leading_zero_us (__pacify_uint16 (x)) \ - : stdc_first_leading_zero_uc (__pacify_uint8 (x))) -+#endif - - #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_clzll) - static __always_inline unsigned int -@@ -326,11 +346,15 @@ extern unsigned int stdc_first_leading_one_ul (unsigned long int __x) - __extension__ - extern unsigned int stdc_first_leading_one_ull (unsigned long long int __x) - __THROW __attribute_const__; --#define stdc_first_leading_one(x) \ -+#if __glibc_has_builtin (__builtin_stdc_first_leading_one) -+# define stdc_first_leading_one(x) (__builtin_stdc_first_leading_one (x)) -+#else -+# define stdc_first_leading_one(x) \ - (sizeof (x) == 8 ? stdc_first_leading_one_ull (x) \ - : sizeof (x) == 4 ? stdc_first_leading_one_ui (x) \ - : sizeof (x) == 2 ? stdc_first_leading_one_us (__pacify_uint16 (x)) \ - : stdc_first_leading_one_uc (__pacify_uint8 (x))) -+#endif - - #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_clzll) - static __always_inline unsigned int -@@ -380,11 +404,15 @@ extern unsigned int stdc_first_trailing_zero_ul (unsigned long int __x) - __extension__ - extern unsigned int stdc_first_trailing_zero_ull (unsigned long long int __x) - __THROW __attribute_const__; --#define stdc_first_trailing_zero(x) \ -+#if __glibc_has_builtin (__builtin_stdc_first_trailing_zero) -+# define stdc_first_trailing_zero(x) (__builtin_stdc_first_trailing_zero (x)) -+#else -+# define stdc_first_trailing_zero(x) \ - (sizeof (x) == 8 ? stdc_first_trailing_zero_ull (x) \ - : sizeof (x) == 4 ? stdc_first_trailing_zero_ui (x) \ - : sizeof (x) == 2 ? stdc_first_trailing_zero_us (__pacify_uint16 (x)) \ - : stdc_first_trailing_zero_uc (__pacify_uint8 (x))) -+#endif - - #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_ctzll) - static __always_inline unsigned int -@@ -434,11 +462,15 @@ extern unsigned int stdc_first_trailing_one_ul (unsigned long int __x) - __extension__ - extern unsigned int stdc_first_trailing_one_ull (unsigned long long int __x) - __THROW __attribute_const__; --#define stdc_first_trailing_one(x) \ -+#if __glibc_has_builtin (__builtin_stdc_first_trailing_one) -+# define stdc_first_trailing_one(x) (__builtin_stdc_first_trailing_one (x)) -+#else -+# define stdc_first_trailing_one(x) \ - (sizeof (x) == 8 ? stdc_first_trailing_one_ull (x) \ - : sizeof (x) == 4 ? stdc_first_trailing_one_ui (x) \ - : sizeof (x) == 2 ? stdc_first_trailing_one_us (__pacify_uint16 (x)) \ - : stdc_first_trailing_one_uc (__pacify_uint8 (x))) -+#endif - - #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_ctzll) - static __always_inline unsigned int -@@ -488,9 +520,13 @@ extern unsigned int stdc_count_zeros_ul (unsigned long int __x) - __extension__ - extern unsigned int stdc_count_zeros_ull (unsigned long long int __x) - __THROW __attribute_const__; --#define stdc_count_zeros(x) \ -+#if __glibc_has_builtin (__builtin_stdc_count_zeros) -+# define stdc_count_zeros(x) (__builtin_stdc_count_zeros (x)) -+#else -+# define stdc_count_zeros(x) \ - (stdc_count_zeros_ull (x) \ - - (unsigned int) (8 * (sizeof (0ULL) - sizeof (x)))) -+#endif - - #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_popcountll) - static __always_inline unsigned int -@@ -540,7 +576,11 @@ extern unsigned int stdc_count_ones_ul (unsigned long int __x) - __extension__ - extern unsigned int stdc_count_ones_ull (unsigned long long int __x) - __THROW __attribute_const__; --#define stdc_count_ones(x) (stdc_count_ones_ull (x)) -+#if __glibc_has_builtin (__builtin_stdc_count_ones) -+# define stdc_count_ones(x) (__builtin_stdc_count_ones (x)) -+#else -+# define stdc_count_ones(x) (stdc_count_ones_ull (x)) -+#endif - - #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_popcountll) - static __always_inline unsigned int -@@ -590,10 +630,14 @@ extern bool stdc_has_single_bit_ul (unsigned long int __x) - __extension__ - extern bool stdc_has_single_bit_ull (unsigned long long int __x) - __THROW __attribute_const__; --#define stdc_has_single_bit(x) \ -+#if __glibc_has_builtin (__builtin_stdc_has_single_bit) -+# define stdc_has_single_bit(x) (__builtin_stdc_has_single_bit (x)) -+#else -+# define stdc_has_single_bit(x) \ - ((bool) (sizeof (x) <= sizeof (unsigned int) \ - ? stdc_has_single_bit_ui (x) \ - : stdc_has_single_bit_ull (x))) -+#endif - - static __always_inline bool - __hsb64_inline (uint64_t __x) -@@ -641,7 +685,11 @@ extern unsigned int stdc_bit_width_ul (unsigned long int __x) - __extension__ - extern unsigned int stdc_bit_width_ull (unsigned long long int __x) - __THROW __attribute_const__; --#define stdc_bit_width(x) (stdc_bit_width_ull (x)) -+#if __glibc_has_builtin (__builtin_stdc_bit_width) -+# define stdc_bit_width(x) (__builtin_stdc_bit_width (x)) -+#else -+# define stdc_bit_width(x) (stdc_bit_width_ull (x)) -+#endif - - #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_clzll) - static __always_inline unsigned int -@@ -691,7 +739,11 @@ extern unsigned long int stdc_bit_floor_ul (unsigned long int __x) - __extension__ - extern unsigned long long int stdc_bit_floor_ull (unsigned long long int __x) - __THROW __attribute_const__; --#define stdc_bit_floor(x) ((__typeof (x)) stdc_bit_floor_ull (x)) -+#if __glibc_has_builtin (__builtin_stdc_bit_floor) -+# define stdc_bit_floor(x) (__builtin_stdc_bit_floor (x)) -+#else -+# define stdc_bit_floor(x) ((__typeof (x)) stdc_bit_floor_ull (x)) -+#endif - - #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_clzll) - static __always_inline uint64_t -@@ -743,7 +795,11 @@ extern unsigned long int stdc_bit_ceil_ul (unsigned long int __x) - __extension__ - extern unsigned long long int stdc_bit_ceil_ull (unsigned long long int __x) - __THROW __attribute_const__; --#define stdc_bit_ceil(x) ((__typeof (x)) stdc_bit_ceil_ull (x)) -+#if __glibc_has_builtin (__builtin_stdc_bit_ceil) -+# define stdc_bit_ceil(x) (__builtin_stdc_bit_ceil (x)) -+#else -+# define stdc_bit_ceil(x) ((__typeof (x)) stdc_bit_ceil_ull (x)) -+#endif - - #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_clzll) - static __always_inline uint64_t -diff --git a/stdlib/tst-stdbit-builtins.c b/stdlib/tst-stdbit-builtins.c -new file mode 100644 -index 0000000000..536841ca8a ---- /dev/null -+++ b/stdlib/tst-stdbit-builtins.c -@@ -0,0 +1,778 @@ -+/* Test type-generic macros with compiler __builtin_stdc_* support. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#include -+#include -+#include -+ -+#if __glibc_has_builtin (__builtin_stdc_leading_zeros) \ -+ && __glibc_has_builtin (__builtin_stdc_leading_ones) \ -+ && __glibc_has_builtin (__builtin_stdc_trailing_zeros) \ -+ && __glibc_has_builtin (__builtin_stdc_trailing_ones) \ -+ && __glibc_has_builtin (__builtin_stdc_first_leading_zero) \ -+ && __glibc_has_builtin (__builtin_stdc_first_leading_one) \ -+ && __glibc_has_builtin (__builtin_stdc_first_trailing_zero) \ -+ && __glibc_has_builtin (__builtin_stdc_first_trailing_one) \ -+ && __glibc_has_builtin (__builtin_stdc_count_zeros) \ -+ && __glibc_has_builtin (__builtin_stdc_count_ones) \ -+ && __glibc_has_builtin (__builtin_stdc_has_single_bit) \ -+ && __glibc_has_builtin (__builtin_stdc_bit_width) \ -+ && __glibc_has_builtin (__builtin_stdc_bit_floor) \ -+ && __glibc_has_builtin (__builtin_stdc_bit_ceil) -+ -+# if !defined (BITINT_MAXWIDTH) && defined (__BITINT_MAXWIDTH__) -+# define BITINT_MAXWIDTH __BITINT_MAXWIDTH__ -+# endif -+ -+typedef unsigned char uc; -+typedef unsigned short us; -+typedef unsigned int ui; -+typedef unsigned long int ul; -+typedef unsigned long long int ull; -+ -+# define expr_has_type(e, t) _Generic (e, default : 0, t : 1) -+ -+static int -+do_test (void) -+{ -+ TEST_COMPARE (stdc_leading_zeros ((uc) 0), CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_leading_zeros ((uc) 0), ui), 1); -+ TEST_COMPARE (stdc_leading_zeros ((us) 0), sizeof (short) * CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_leading_zeros ((us) 0), ui), 1); -+ TEST_COMPARE (stdc_leading_zeros (0U), sizeof (int) * CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_leading_zeros (0U), ui), 1); -+ TEST_COMPARE (stdc_leading_zeros (0UL), sizeof (long int) * CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_leading_zeros (0UL), ui), 1); -+ TEST_COMPARE (stdc_leading_zeros (0ULL), sizeof (long long int) * CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_leading_zeros (0ULL), ui), 1); -+ TEST_COMPARE (stdc_leading_zeros ((uc) ~0U), 0); -+ TEST_COMPARE (stdc_leading_zeros ((us) ~0U), 0); -+ TEST_COMPARE (stdc_leading_zeros (~0U), 0); -+ TEST_COMPARE (stdc_leading_zeros (~0UL), 0); -+ TEST_COMPARE (stdc_leading_zeros (~0ULL), 0); -+ TEST_COMPARE (stdc_leading_zeros ((uc) 3), CHAR_BIT - 2); -+ TEST_COMPARE (stdc_leading_zeros ((us) 9), sizeof (short) * CHAR_BIT - 4); -+ TEST_COMPARE (stdc_leading_zeros (34U), sizeof (int) * CHAR_BIT - 6); -+ TEST_COMPARE (stdc_leading_zeros (130UL), sizeof (long int) * CHAR_BIT - 8); -+ TEST_COMPARE (stdc_leading_zeros (512ULL), -+ sizeof (long long int) * CHAR_BIT - 10); -+ TEST_COMPARE (stdc_leading_ones ((uc) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_leading_ones ((uc) 0), ui), 1); -+ TEST_COMPARE (stdc_leading_ones ((us) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_leading_ones ((us) 0), ui), 1); -+ TEST_COMPARE (stdc_leading_ones (0U), 0); -+ TEST_COMPARE (expr_has_type (stdc_leading_ones (0U), ui), 1); -+ TEST_COMPARE (stdc_leading_ones (0UL), 0); -+ TEST_COMPARE (expr_has_type (stdc_leading_ones (0UL), ui), 1); -+ TEST_COMPARE (stdc_leading_ones (0ULL), 0); -+ TEST_COMPARE (expr_has_type (stdc_leading_ones (0ULL), ui), 1); -+ TEST_COMPARE (stdc_leading_ones ((uc) ~0U), CHAR_BIT); -+ TEST_COMPARE (stdc_leading_ones ((us) ~0U), sizeof (short) * CHAR_BIT); -+ TEST_COMPARE (stdc_leading_ones (~0U), sizeof (int) * CHAR_BIT); -+ TEST_COMPARE (stdc_leading_ones (~0UL), sizeof (long int) * CHAR_BIT); -+ TEST_COMPARE (stdc_leading_ones (~0ULL), sizeof (long long int) * CHAR_BIT); -+ TEST_COMPARE (stdc_leading_ones ((uc) ~3), CHAR_BIT - 2); -+ TEST_COMPARE (stdc_leading_ones ((us) ~9), sizeof (short) * CHAR_BIT - 4); -+ TEST_COMPARE (stdc_leading_ones (~34U), sizeof (int) * CHAR_BIT - 6); -+ TEST_COMPARE (stdc_leading_ones (~130UL), sizeof (long int) * CHAR_BIT - 8); -+ TEST_COMPARE (stdc_leading_ones (~512ULL), -+ sizeof (long long int) * CHAR_BIT - 10); -+ TEST_COMPARE (stdc_trailing_zeros ((uc) 0), CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_trailing_zeros ((uc) 0), ui), 1); -+ TEST_COMPARE (stdc_trailing_zeros ((us) 0), sizeof (short) * CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_trailing_zeros ((us) 0), ui), 1); -+ TEST_COMPARE (stdc_trailing_zeros (0U), sizeof (int) * CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_trailing_zeros (0U), ui), 1); -+ TEST_COMPARE (stdc_trailing_zeros (0UL), sizeof (long int) * CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_trailing_zeros (0UL), ui), 1); -+ TEST_COMPARE (stdc_trailing_zeros (0ULL), sizeof (long long int) * CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_trailing_zeros (0ULL), ui), 1); -+ TEST_COMPARE (stdc_trailing_zeros ((uc) ~0U), 0); -+ TEST_COMPARE (stdc_trailing_zeros ((us) ~0U), 0); -+ TEST_COMPARE (stdc_trailing_zeros (~0U), 0); -+ TEST_COMPARE (stdc_trailing_zeros (~0UL), 0); -+ TEST_COMPARE (stdc_trailing_zeros (~0ULL), 0); -+ TEST_COMPARE (stdc_trailing_zeros ((uc) 2), 1); -+ TEST_COMPARE (stdc_trailing_zeros ((us) 24), 3); -+ TEST_COMPARE (stdc_trailing_zeros (32U), 5); -+ TEST_COMPARE (stdc_trailing_zeros (128UL), 7); -+ TEST_COMPARE (stdc_trailing_zeros (512ULL), 9); -+ TEST_COMPARE (stdc_trailing_ones ((uc) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_trailing_ones ((uc) 0), ui), 1); -+ TEST_COMPARE (stdc_trailing_ones ((us) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_trailing_ones ((us) 0), ui), 1); -+ TEST_COMPARE (stdc_trailing_ones (0U), 0); -+ TEST_COMPARE (expr_has_type (stdc_trailing_ones (0U), ui), 1); -+ TEST_COMPARE (stdc_trailing_ones (0UL), 0); -+ TEST_COMPARE (expr_has_type (stdc_trailing_ones (0UL), ui), 1); -+ TEST_COMPARE (stdc_trailing_ones (0ULL), 0); -+ TEST_COMPARE (expr_has_type (stdc_trailing_ones (0ULL), ui), 1); -+ TEST_COMPARE (stdc_trailing_ones ((uc) ~0U), CHAR_BIT); -+ TEST_COMPARE (stdc_trailing_ones ((us) ~0U), sizeof (short) * CHAR_BIT); -+ TEST_COMPARE (stdc_trailing_ones (~0U), sizeof (int) * CHAR_BIT); -+ TEST_COMPARE (stdc_trailing_ones (~0UL), sizeof (long int) * CHAR_BIT); -+ TEST_COMPARE (stdc_trailing_ones (~0ULL), sizeof (long long int) * CHAR_BIT); -+ TEST_COMPARE (stdc_trailing_ones ((uc) 5), 1); -+ TEST_COMPARE (stdc_trailing_ones ((us) 15), 4); -+ TEST_COMPARE (stdc_trailing_ones (127U), 7); -+ TEST_COMPARE (stdc_trailing_ones (511UL), 9); -+ TEST_COMPARE (stdc_trailing_ones (~0ULL >> 2), -+ sizeof (long long int) * CHAR_BIT - 2); -+ TEST_COMPARE (stdc_first_leading_zero ((uc) 0), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_zero ((uc) 0), ui), 1); -+ TEST_COMPARE (stdc_first_leading_zero ((us) 0), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_zero ((us) 0), ui), 1); -+ TEST_COMPARE (stdc_first_leading_zero (0U), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_zero (0U), ui), 1); -+ TEST_COMPARE (stdc_first_leading_zero (0UL), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_zero (0UL), ui), 1); -+ TEST_COMPARE (stdc_first_leading_zero (0ULL), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_zero (0ULL), ui), 1); -+ TEST_COMPARE (stdc_first_leading_zero ((uc) ~0U), 0); -+ TEST_COMPARE (stdc_first_leading_zero ((us) ~0U), 0); -+ TEST_COMPARE (stdc_first_leading_zero (~0U), 0); -+ TEST_COMPARE (stdc_first_leading_zero (~0UL), 0); -+ TEST_COMPARE (stdc_first_leading_zero (~0ULL), 0); -+ TEST_COMPARE (stdc_first_leading_zero ((uc) ~3U), CHAR_BIT - 1); -+ TEST_COMPARE (stdc_first_leading_zero ((us) ~15U), -+ sizeof (short) * CHAR_BIT - 3); -+ TEST_COMPARE (stdc_first_leading_zero (~63U), sizeof (int) * CHAR_BIT - 5); -+ TEST_COMPARE (stdc_first_leading_zero (~255UL), -+ sizeof (long int) * CHAR_BIT - 7); -+ TEST_COMPARE (stdc_first_leading_zero (~1023ULL), -+ sizeof (long long int) * CHAR_BIT - 9); -+ TEST_COMPARE (stdc_first_leading_one ((uc) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_one ((uc) 0), ui), 1); -+ TEST_COMPARE (stdc_first_leading_one ((us) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_one ((us) 0), ui), 1); -+ TEST_COMPARE (stdc_first_leading_one (0U), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_one (0U), ui), 1); -+ TEST_COMPARE (stdc_first_leading_one (0UL), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_one (0UL), ui), 1); -+ TEST_COMPARE (stdc_first_leading_one (0ULL), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_one (0ULL), ui), 1); -+ TEST_COMPARE (stdc_first_leading_one ((uc) ~0U), 1); -+ TEST_COMPARE (stdc_first_leading_one ((us) ~0U), 1); -+ TEST_COMPARE (stdc_first_leading_one (~0U), 1); -+ TEST_COMPARE (stdc_first_leading_one (~0UL), 1); -+ TEST_COMPARE (stdc_first_leading_one (~0ULL), 1); -+ TEST_COMPARE (stdc_first_leading_one ((uc) 3), CHAR_BIT - 1); -+ TEST_COMPARE (stdc_first_leading_one ((us) 9), -+ sizeof (short) * CHAR_BIT - 3); -+ TEST_COMPARE (stdc_first_leading_one (34U), sizeof (int) * CHAR_BIT - 5); -+ TEST_COMPARE (stdc_first_leading_one (130UL), -+ sizeof (long int) * CHAR_BIT - 7); -+ TEST_COMPARE (stdc_first_leading_one (512ULL), -+ sizeof (long long int) * CHAR_BIT - 9); -+ TEST_COMPARE (stdc_first_trailing_zero ((uc) 0), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero ((uc) 0), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_zero ((us) 0), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero ((us) 0), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_zero (0U), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero (0U), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_zero (0UL), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero (0UL), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_zero (0ULL), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero (0ULL), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_zero ((uc) ~0U), 0); -+ TEST_COMPARE (stdc_first_trailing_zero ((us) ~0U), 0); -+ TEST_COMPARE (stdc_first_trailing_zero (~0U), 0); -+ TEST_COMPARE (stdc_first_trailing_zero (~0UL), 0); -+ TEST_COMPARE (stdc_first_trailing_zero (~0ULL), 0); -+ TEST_COMPARE (stdc_first_trailing_zero ((uc) 2), 1); -+ TEST_COMPARE (stdc_first_trailing_zero ((us) 15), 5); -+ TEST_COMPARE (stdc_first_trailing_zero (63U), 7); -+ TEST_COMPARE (stdc_first_trailing_zero (128UL), 1); -+ TEST_COMPARE (stdc_first_trailing_zero (511ULL), 10); -+ TEST_COMPARE (stdc_first_trailing_one ((uc) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_one ((uc) 0), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_one ((us) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_one ((us) 0), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_one (0U), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_one (0U), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_one (0UL), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_one (0UL), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_one (0ULL), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_one (0ULL), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_one ((uc) ~0U), 1); -+ TEST_COMPARE (stdc_first_trailing_one ((us) ~0U), 1); -+ TEST_COMPARE (stdc_first_trailing_one (~0U), 1); -+ TEST_COMPARE (stdc_first_trailing_one (~0UL), 1); -+ TEST_COMPARE (stdc_first_trailing_one (~0ULL), 1); -+ TEST_COMPARE (stdc_first_trailing_one ((uc) 4), 3); -+ TEST_COMPARE (stdc_first_trailing_one ((us) 96), 6); -+ TEST_COMPARE (stdc_first_trailing_one (127U), 1); -+ TEST_COMPARE (stdc_first_trailing_one (511UL), 1); -+ TEST_COMPARE (stdc_first_trailing_one (~0ULL << 12), 13); -+ TEST_COMPARE (stdc_count_zeros ((uc) 0), CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_count_zeros ((uc) 0), ui), 1); -+ TEST_COMPARE (stdc_count_zeros ((us) 0), sizeof (short) * CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_count_zeros ((us) 0), ui), 1); -+ TEST_COMPARE (stdc_count_zeros (0U), sizeof (int) * CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_count_zeros (0U), ui), 1); -+ TEST_COMPARE (stdc_count_zeros (0UL), sizeof (long int) * CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_count_zeros (0UL), ui), 1); -+ TEST_COMPARE (stdc_count_zeros (0ULL), sizeof (long long int) * CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_count_zeros (0ULL), ui), 1); -+ TEST_COMPARE (stdc_count_zeros ((uc) ~0U), 0); -+ TEST_COMPARE (stdc_count_zeros ((us) ~0U), 0); -+ TEST_COMPARE (stdc_count_zeros (~0U), 0); -+ TEST_COMPARE (stdc_count_zeros (~0UL), 0); -+ TEST_COMPARE (stdc_count_zeros (~0ULL), 0); -+ TEST_COMPARE (stdc_count_zeros ((uc) 1U), CHAR_BIT - 1); -+ TEST_COMPARE (stdc_count_zeros ((us) 42), sizeof (short) * CHAR_BIT - 3); -+ TEST_COMPARE (stdc_count_zeros (291U), sizeof (int) * CHAR_BIT - 4); -+ TEST_COMPARE (stdc_count_zeros (~1315UL), 5); -+ TEST_COMPARE (stdc_count_zeros (3363ULL), -+ sizeof (long long int) * CHAR_BIT - 6); -+ TEST_COMPARE (stdc_count_ones ((uc) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_count_ones ((uc) 0), ui), 1); -+ TEST_COMPARE (stdc_count_ones ((us) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_count_ones ((us) 0), ui), 1); -+ TEST_COMPARE (stdc_count_ones (0U), 0); -+ TEST_COMPARE (expr_has_type (stdc_count_ones (0U), ui), 1); -+ TEST_COMPARE (stdc_count_ones (0UL), 0); -+ TEST_COMPARE (expr_has_type (stdc_count_ones (0UL), ui), 1); -+ TEST_COMPARE (stdc_count_ones (0ULL), 0); -+ TEST_COMPARE (expr_has_type (stdc_count_ones (0ULL), ui), 1); -+ TEST_COMPARE (stdc_count_ones ((uc) ~0U), CHAR_BIT); -+ TEST_COMPARE (stdc_count_ones ((us) ~0U), sizeof (short) * CHAR_BIT); -+ TEST_COMPARE (stdc_count_ones (~0U), sizeof (int) * CHAR_BIT); -+ TEST_COMPARE (stdc_count_ones (~0UL), sizeof (long int) * CHAR_BIT); -+ TEST_COMPARE (stdc_count_ones (~0ULL), sizeof (long long int) * CHAR_BIT); -+ TEST_COMPARE (stdc_count_ones ((uc) ~1U), CHAR_BIT - 1); -+ TEST_COMPARE (stdc_count_ones ((us) ~42), sizeof (short) * CHAR_BIT - 3); -+ TEST_COMPARE (stdc_count_ones (~291U), sizeof (int) * CHAR_BIT - 4); -+ TEST_COMPARE (stdc_count_ones (1315UL), 5); -+ TEST_COMPARE (stdc_count_ones (~3363ULL), -+ sizeof (long long int) * CHAR_BIT - 6); -+ TEST_COMPARE (stdc_has_single_bit ((uc) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_has_single_bit ((uc) 0), _Bool), 1); -+ TEST_COMPARE (stdc_has_single_bit ((us) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_has_single_bit ((us) 0), _Bool), 1); -+ TEST_COMPARE (stdc_has_single_bit (0U), 0); -+ TEST_COMPARE (expr_has_type (stdc_has_single_bit (0U), _Bool), 1); -+ TEST_COMPARE (stdc_has_single_bit (0UL), 0); -+ TEST_COMPARE (expr_has_type (stdc_has_single_bit (0UL), _Bool), 1); -+ TEST_COMPARE (stdc_has_single_bit (0ULL), 0); -+ TEST_COMPARE (expr_has_type (stdc_has_single_bit (0ULL), _Bool), 1); -+ TEST_COMPARE (stdc_has_single_bit ((uc) 2), 1); -+ TEST_COMPARE (stdc_has_single_bit ((us) 8), 1); -+ TEST_COMPARE (stdc_has_single_bit (32U), 1); -+ TEST_COMPARE (stdc_has_single_bit (128UL), 1); -+ TEST_COMPARE (stdc_has_single_bit (512ULL), 1); -+ TEST_COMPARE (stdc_has_single_bit ((uc) 7), 0); -+ TEST_COMPARE (stdc_has_single_bit ((us) 96), 0); -+ TEST_COMPARE (stdc_has_single_bit (513U), 0); -+ TEST_COMPARE (stdc_has_single_bit (1022UL), 0); -+ TEST_COMPARE (stdc_has_single_bit (12ULL), 0); -+ TEST_COMPARE (stdc_bit_width ((uc) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_width ((uc) 0), ui), 1); -+ TEST_COMPARE (stdc_bit_width ((us) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_width ((us) 0), ui), 1); -+ TEST_COMPARE (stdc_bit_width (0U), 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_width (0U), ui), 1); -+ TEST_COMPARE (stdc_bit_width (0UL), 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_width (0UL), ui), 1); -+ TEST_COMPARE (stdc_bit_width (0ULL), 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_width (0ULL), ui), 1); -+ TEST_COMPARE (stdc_bit_width ((uc) ~0U), CHAR_BIT); -+ TEST_COMPARE (stdc_bit_width ((us) ~0U), sizeof (short) * CHAR_BIT); -+ TEST_COMPARE (stdc_bit_width (~0U), sizeof (int) * CHAR_BIT); -+ TEST_COMPARE (stdc_bit_width (~0UL), sizeof (long int) * CHAR_BIT); -+ TEST_COMPARE (stdc_bit_width (~0ULL), sizeof (long long int) * CHAR_BIT); -+ TEST_COMPARE (stdc_bit_width ((uc) ((uc) ~0U >> 1)), CHAR_BIT - 1); -+ TEST_COMPARE (stdc_bit_width ((uc) 6), 3); -+ TEST_COMPARE (stdc_bit_width ((us) 12U), 4); -+ TEST_COMPARE (stdc_bit_width ((us) ((us) ~0U >> 5)), -+ sizeof (short) * CHAR_BIT - 5); -+ TEST_COMPARE (stdc_bit_width (137U), 8); -+ TEST_COMPARE (stdc_bit_width (269U), 9); -+ TEST_COMPARE (stdc_bit_width (39UL), 6); -+ TEST_COMPARE (stdc_bit_width (~0UL >> 2), sizeof (long int) * CHAR_BIT - 2); -+ TEST_COMPARE (stdc_bit_width (1023ULL), 10); -+ TEST_COMPARE (stdc_bit_width (1024ULL), 11); -+ TEST_COMPARE (stdc_bit_floor ((uc) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_floor ((uc) 0), uc), 1); -+ TEST_COMPARE (stdc_bit_floor ((us) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_floor ((us) 0), us), 1); -+ TEST_COMPARE (stdc_bit_floor (0U), 0U); -+ TEST_COMPARE (expr_has_type (stdc_bit_floor (0U), ui), 1); -+ TEST_COMPARE (stdc_bit_floor (0UL), 0UL); -+ TEST_COMPARE (expr_has_type (stdc_bit_floor (0UL), ul), 1); -+ TEST_COMPARE (stdc_bit_floor (0ULL), 0ULL); -+ TEST_COMPARE (expr_has_type (stdc_bit_floor (0ULL), ull), 1); -+ TEST_COMPARE (stdc_bit_floor ((uc) ~0U), (1U << (CHAR_BIT - 1))); -+ TEST_COMPARE (stdc_bit_floor ((us) ~0U), -+ (1U << (sizeof (short) * CHAR_BIT - 1))); -+ TEST_COMPARE (stdc_bit_floor (~0U), (1U << (sizeof (int) * CHAR_BIT - 1))); -+ TEST_COMPARE (stdc_bit_floor (~0UL), -+ (1UL << (sizeof (long int) * CHAR_BIT - 1))); -+ TEST_COMPARE (stdc_bit_floor (~0ULL), -+ (1ULL << (sizeof (long long int) * CHAR_BIT - 1))); -+ TEST_COMPARE (stdc_bit_floor ((uc) 4), 4); -+ TEST_COMPARE (stdc_bit_floor ((uc) 7), 4); -+ TEST_COMPARE (stdc_bit_floor ((us) 8U), 8); -+ TEST_COMPARE (stdc_bit_floor ((us) 31U), 16); -+ TEST_COMPARE (stdc_bit_floor (137U), 128U); -+ TEST_COMPARE (stdc_bit_floor (269U), 256U); -+ TEST_COMPARE (stdc_bit_floor (511UL), 256UL); -+ TEST_COMPARE (stdc_bit_floor (512UL), 512UL); -+ TEST_COMPARE (stdc_bit_floor (513UL), 512ULL); -+ TEST_COMPARE (stdc_bit_floor (1024ULL), 1024ULL); -+ TEST_COMPARE (stdc_bit_ceil ((uc) 0), 1); -+ TEST_COMPARE (expr_has_type (stdc_bit_ceil ((uc) 0), uc), 1); -+ TEST_COMPARE (stdc_bit_ceil ((us) 0), 1); -+ TEST_COMPARE (expr_has_type (stdc_bit_ceil ((us) 0), us), 1); -+ TEST_COMPARE (stdc_bit_ceil (0U), 1U); -+ TEST_COMPARE (expr_has_type (stdc_bit_ceil (0U), ui), 1); -+ TEST_COMPARE (stdc_bit_ceil (0UL), 1UL); -+ TEST_COMPARE (expr_has_type (stdc_bit_ceil (0UL), ul), 1); -+ TEST_COMPARE (stdc_bit_ceil (0ULL), 1ULL); -+ TEST_COMPARE (expr_has_type (stdc_bit_ceil (0ULL), ull), 1); -+ TEST_COMPARE (stdc_bit_ceil ((uc) ~0U), 0); -+ TEST_COMPARE (stdc_bit_ceil ((us) ~0U), 0); -+ TEST_COMPARE (stdc_bit_ceil (~0U), 0U); -+ TEST_COMPARE (stdc_bit_ceil (~0UL), 0UL); -+ TEST_COMPARE (stdc_bit_ceil (~0ULL), 0ULL); -+ TEST_COMPARE (stdc_bit_ceil ((uc) ((uc) ~0U >> 1)), (1U << (CHAR_BIT - 1))); -+ TEST_COMPARE (stdc_bit_ceil ((uc) ((uc) ~0U >> 1)), (1U << (CHAR_BIT - 1))); -+ TEST_COMPARE (stdc_bit_ceil ((us) ((us) ~0U >> 1)), -+ (1U << (sizeof (short) * CHAR_BIT - 1))); -+ TEST_COMPARE (stdc_bit_ceil ((us) ((us) ~0U >> 1)), -+ (1U << (sizeof (short) * CHAR_BIT - 1))); -+ TEST_COMPARE (stdc_bit_ceil (~0U >> 1), -+ (1U << (sizeof (int) * CHAR_BIT - 1))); -+ TEST_COMPARE (stdc_bit_ceil (1U << (sizeof (int) * CHAR_BIT - 1)), -+ (1U << (sizeof (int) * CHAR_BIT - 1))); -+ TEST_COMPARE (stdc_bit_ceil (~0UL >> 1), -+ (1UL << (sizeof (long int) * CHAR_BIT - 1))); -+ TEST_COMPARE (stdc_bit_ceil (~0UL >> 1), -+ (1UL << (sizeof (long int) * CHAR_BIT - 1))); -+ TEST_COMPARE (stdc_bit_ceil (1ULL -+ << (sizeof (long long int) * CHAR_BIT - 1)), -+ (1ULL << (sizeof (long long int) * CHAR_BIT - 1))); -+ TEST_COMPARE (stdc_bit_ceil (~0ULL >> 1), -+ (1ULL << (sizeof (long long int) * CHAR_BIT - 1))); -+ TEST_COMPARE (stdc_bit_ceil ((uc) 1), 1); -+ TEST_COMPARE (stdc_bit_ceil ((uc) 2), 2); -+ TEST_COMPARE (stdc_bit_ceil ((us) 3U), 4); -+ TEST_COMPARE (stdc_bit_ceil ((us) 4U), 4); -+ TEST_COMPARE (stdc_bit_ceil (5U), 8U); -+ TEST_COMPARE (stdc_bit_ceil (269U), 512U); -+ TEST_COMPARE (stdc_bit_ceil (511UL), 512UL); -+ TEST_COMPARE (stdc_bit_ceil (512UL), 512UL); -+ TEST_COMPARE (stdc_bit_ceil (513ULL), 1024ULL); -+ TEST_COMPARE (stdc_bit_ceil (1025ULL), 2048ULL); -+# ifdef __SIZEOF_INT128__ -+ TEST_COMPARE (stdc_leading_zeros ((unsigned __int128) 0), -+ sizeof (__int128) * CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_leading_zeros ((unsigned __int128) 0), ui), -+ 1); -+ TEST_COMPARE (stdc_leading_zeros (~(unsigned __int128) 0), 0); -+ TEST_COMPARE (stdc_leading_ones ((unsigned __int128) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_leading_ones ((unsigned __int128) 0), ui), -+ 1); -+ TEST_COMPARE (stdc_leading_ones (~(unsigned __int128) 0), -+ sizeof (__int128) * CHAR_BIT); -+ TEST_COMPARE (stdc_trailing_zeros ((unsigned __int128) 0), -+ sizeof (__int128) * CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_trailing_zeros ((unsigned __int128) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_trailing_zeros (~(unsigned __int128) 0), 0); -+ TEST_COMPARE (stdc_trailing_ones ((unsigned __int128) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_trailing_ones ((unsigned __int128) 0), ui), -+ 1); -+ TEST_COMPARE (stdc_trailing_ones (~(unsigned __int128) 0), -+ sizeof (__int128) * CHAR_BIT); -+ TEST_COMPARE (stdc_first_leading_zero ((unsigned __int128) 0), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_zero ((unsigned __int128) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_first_leading_zero (~(unsigned __int128) 0), 0); -+ TEST_COMPARE (stdc_first_leading_one ((unsigned __int128) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_one ((unsigned __int128) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_first_leading_one (~(unsigned __int128) 0), 1); -+ TEST_COMPARE (stdc_first_trailing_zero ((unsigned __int128) 0), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero ((unsigned __int128) -+ 0), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_zero (~(unsigned __int128) 0), 0); -+ TEST_COMPARE (stdc_first_trailing_one ((unsigned __int128) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_one ((unsigned __int128) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_first_trailing_one (~(unsigned __int128) 0), 1); -+ TEST_COMPARE (stdc_count_zeros ((unsigned __int128) 0), -+ sizeof (__int128) * CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_count_zeros ((unsigned __int128) 0), ui), -+ 1); -+ TEST_COMPARE (stdc_count_zeros (~(unsigned __int128) 0), 0); -+ TEST_COMPARE (stdc_count_ones ((unsigned __int128) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_count_ones ((unsigned __int128) 0), ui), -+ 1); -+ TEST_COMPARE (stdc_count_ones (~(unsigned __int128) 0), -+ sizeof (__int128) * CHAR_BIT); -+ TEST_COMPARE (stdc_has_single_bit ((unsigned __int128) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_has_single_bit ((unsigned __int128) 0), -+ _Bool), 1); -+ TEST_COMPARE (stdc_has_single_bit (~(unsigned __int128) 0), 0); -+ TEST_COMPARE (stdc_bit_width ((unsigned __int128) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_width ((unsigned __int128) 0), ui), 1); -+ TEST_COMPARE (stdc_bit_width (~(unsigned __int128) 0), -+ sizeof (__int128) * CHAR_BIT); -+ TEST_COMPARE (stdc_bit_floor ((unsigned __int128) 0) != 0, 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_floor ((unsigned __int128) 0), -+ unsigned __int128), 1); -+ TEST_COMPARE (stdc_bit_floor (~(unsigned __int128) 0) -+ != ((unsigned __int128) 1) << (sizeof (__int128) -+ * CHAR_BIT - 1), 0); -+ TEST_COMPARE (stdc_bit_ceil ((unsigned __int128) 0) != 1, 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_ceil ((unsigned __int128) 0), -+ unsigned __int128), 1); -+ TEST_COMPARE (stdc_bit_ceil ((unsigned __int128) 1) != 1, 0); -+ TEST_COMPARE (stdc_bit_ceil ((~(unsigned __int128) 0) >> 1) -+ != ((unsigned __int128) 1) << (sizeof (__int128) -+ * CHAR_BIT - 1), 0); -+ TEST_COMPARE (stdc_bit_ceil (~(unsigned __int128) 0) != 0, 0); -+# endif -+ uc a = 0; -+ TEST_COMPARE (stdc_bit_width (a++), 0); -+ TEST_COMPARE (a, 1); -+ ull b = 0; -+ TEST_COMPARE (stdc_bit_width (b++), 0); -+ TEST_COMPARE (b, 1); -+ TEST_COMPARE (stdc_bit_floor (a++), 1); -+ TEST_COMPARE (a, 2); -+ TEST_COMPARE (stdc_bit_floor (b++), 1); -+ TEST_COMPARE (b, 2); -+ TEST_COMPARE (stdc_bit_ceil (a++), 2); -+ TEST_COMPARE (a, 3); -+ TEST_COMPARE (stdc_bit_ceil (b++), 2); -+ TEST_COMPARE (b, 3); -+ TEST_COMPARE (stdc_leading_zeros (a++), CHAR_BIT - 2); -+ TEST_COMPARE (a, 4); -+ TEST_COMPARE (stdc_leading_zeros (b++), -+ sizeof (long long int) * CHAR_BIT - 2); -+ TEST_COMPARE (b, 4); -+ TEST_COMPARE (stdc_leading_ones (a++), 0); -+ TEST_COMPARE (a, 5); -+ TEST_COMPARE (stdc_leading_ones (b++), 0); -+ TEST_COMPARE (b, 5); -+ TEST_COMPARE (stdc_trailing_zeros (a++), 0); -+ TEST_COMPARE (a, 6); -+ TEST_COMPARE (stdc_trailing_zeros (b++), 0); -+ TEST_COMPARE (b, 6); -+ TEST_COMPARE (stdc_trailing_ones (a++), 0); -+ TEST_COMPARE (a, 7); -+ TEST_COMPARE (stdc_trailing_ones (b++), 0); -+ TEST_COMPARE (b, 7); -+ TEST_COMPARE (stdc_first_leading_zero (a++), 1); -+ TEST_COMPARE (a, 8); -+ TEST_COMPARE (stdc_first_leading_zero (b++), 1); -+ TEST_COMPARE (b, 8); -+ TEST_COMPARE (stdc_first_leading_one (a++), CHAR_BIT - 3); -+ TEST_COMPARE (a, 9); -+ TEST_COMPARE (stdc_first_leading_one (b++), -+ sizeof (long long int) * CHAR_BIT - 3); -+ TEST_COMPARE (b, 9); -+ TEST_COMPARE (stdc_first_trailing_zero (a++), 2); -+ TEST_COMPARE (a, 10); -+ TEST_COMPARE (stdc_first_trailing_zero (b++), 2); -+ TEST_COMPARE (b, 10); -+ TEST_COMPARE (stdc_first_trailing_one (a++), 2); -+ TEST_COMPARE (a, 11); -+ TEST_COMPARE (stdc_first_trailing_one (b++), 2); -+ TEST_COMPARE (b, 11); -+ TEST_COMPARE (stdc_count_zeros (a++), CHAR_BIT - 3); -+ TEST_COMPARE (a, 12); -+ TEST_COMPARE (stdc_count_zeros (b++), -+ sizeof (long long int) * CHAR_BIT - 3); -+ TEST_COMPARE (b, 12); -+ TEST_COMPARE (stdc_count_ones (a++), 2); -+ TEST_COMPARE (a, 13); -+ TEST_COMPARE (stdc_count_ones (b++), 2); -+ TEST_COMPARE (b, 13); -+ TEST_COMPARE (stdc_has_single_bit (a++), 0); -+ TEST_COMPARE (a, 14); -+ TEST_COMPARE (stdc_has_single_bit (b++), 0); -+ TEST_COMPARE (b, 14); -+# ifdef BITINT_MAXWIDTH -+# if BITINT_MAXWIDTH >= 64 -+ TEST_COMPARE (stdc_leading_zeros (0uwb), 1); -+ TEST_COMPARE (expr_has_type (stdc_leading_zeros (0uwb), ui), 1); -+ TEST_COMPARE (stdc_leading_zeros (1uwb), 0); -+ TEST_COMPARE (expr_has_type (stdc_leading_zeros (1uwb), ui), 1); -+ TEST_COMPARE (stdc_leading_ones (0uwb), 0); -+ TEST_COMPARE (expr_has_type (stdc_leading_ones (0uwb), ui), 1); -+ TEST_COMPARE (stdc_leading_ones (1uwb), 1); -+ TEST_COMPARE (expr_has_type (stdc_leading_ones (1uwb), ui), 1); -+ TEST_COMPARE (stdc_trailing_zeros (0uwb), 1); -+ TEST_COMPARE (expr_has_type (stdc_trailing_zeros (0uwb), ui), 1); -+ TEST_COMPARE (stdc_trailing_zeros (1uwb), 0); -+ TEST_COMPARE (expr_has_type (stdc_trailing_zeros (1uwb), ui), 1); -+ TEST_COMPARE (stdc_trailing_ones (0uwb), 0); -+ TEST_COMPARE (expr_has_type (stdc_trailing_ones (0uwb), ui), 1); -+ TEST_COMPARE (stdc_trailing_ones (1uwb), 1); -+ TEST_COMPARE (expr_has_type (stdc_trailing_ones (1uwb), ui), 1); -+ TEST_COMPARE (stdc_first_leading_zero (0uwb), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_zero (0uwb), ui), 1); -+ TEST_COMPARE (stdc_first_leading_zero (1uwb), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_zero (1uwb), ui), 1); -+ TEST_COMPARE (stdc_first_leading_one (0uwb), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_one (0uwb), ui), 1); -+ TEST_COMPARE (stdc_first_leading_one (1uwb), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_one (1uwb), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_zero (0uwb), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero (0uwb), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_zero (1uwb), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero (1uwb), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_one (0uwb), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_one (0uwb), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_one (1uwb), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_one (1uwb), ui), 1); -+ TEST_COMPARE (stdc_count_zeros (0uwb), 1); -+ TEST_COMPARE (expr_has_type (stdc_count_zeros (0uwb), ui), 1); -+ TEST_COMPARE (stdc_count_zeros (1uwb), 0); -+ TEST_COMPARE (expr_has_type (stdc_count_zeros (1uwb), ui), 1); -+ TEST_COMPARE (stdc_count_ones (0uwb), 0); -+ TEST_COMPARE (expr_has_type (stdc_count_ones (0uwb), ui), 1); -+ TEST_COMPARE (stdc_count_ones (1uwb), 1); -+ TEST_COMPARE (expr_has_type (stdc_count_ones (1uwb), ui), 1); -+ TEST_COMPARE (stdc_has_single_bit (0uwb), 0); -+ TEST_COMPARE (expr_has_type (stdc_has_single_bit (0uwb), _Bool), 1); -+ TEST_COMPARE (stdc_has_single_bit (1uwb), 1); -+ TEST_COMPARE (expr_has_type (stdc_has_single_bit (1uwb), _Bool), 1); -+ TEST_COMPARE (stdc_bit_width (0uwb), 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_width (0uwb), ui), 1); -+ TEST_COMPARE (stdc_bit_width (1uwb), 1); -+ TEST_COMPARE (expr_has_type (stdc_bit_width (1uwb), ui), 1); -+ TEST_COMPARE (stdc_bit_floor (0uwb), 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_floor (0uwb), unsigned _BitInt(1)), 1); -+ TEST_COMPARE (stdc_bit_floor (1uwb), 1); -+ TEST_COMPARE (expr_has_type (stdc_bit_floor (1uwb), unsigned _BitInt(1)), 1); -+ TEST_COMPARE (stdc_bit_ceil (0uwb), 1); -+ TEST_COMPARE (expr_has_type (stdc_bit_ceil (0uwb), unsigned _BitInt(1)), 1); -+ TEST_COMPARE (stdc_bit_ceil (1uwb), 1); -+ TEST_COMPARE (expr_has_type (stdc_bit_ceil (1uwb), unsigned _BitInt(1)), 1); -+ unsigned _BitInt(1) c = 0; -+ TEST_COMPARE (stdc_bit_floor (c++), 0); -+ TEST_COMPARE (c, 1); -+ TEST_COMPARE (stdc_bit_floor (c++), 1); -+ TEST_COMPARE (c, 0); -+ TEST_COMPARE (stdc_bit_ceil (c++), 1); -+ TEST_COMPARE (c, 1); -+ TEST_COMPARE (stdc_bit_ceil (c++), 1); -+ TEST_COMPARE (c, 0); -+# endif -+# if BITINT_MAXWIDTH >= 512 -+ TEST_COMPARE (stdc_leading_zeros ((unsigned _BitInt(512)) 0), 512); -+ TEST_COMPARE (expr_has_type (stdc_leading_zeros ((unsigned _BitInt(512)) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_leading_zeros ((unsigned _BitInt(373)) 0), 373); -+ TEST_COMPARE (expr_has_type (stdc_leading_zeros ((unsigned _BitInt(373)) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_leading_zeros (~(unsigned _BitInt(512)) 0), 0); -+ TEST_COMPARE (stdc_leading_zeros (~(unsigned _BitInt(373)) 0), 0); -+ TEST_COMPARE (stdc_leading_zeros ((unsigned _BitInt(512)) 275), 512 - 9); -+ TEST_COMPARE (stdc_leading_zeros ((unsigned _BitInt(373)) 512), 373 - 10); -+ TEST_COMPARE (stdc_leading_ones ((unsigned _BitInt(512)) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_leading_ones ((unsigned _BitInt(512)) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_leading_ones ((unsigned _BitInt(373)) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_leading_ones ((unsigned _BitInt(373)) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_leading_ones (~(unsigned _BitInt(512)) 0), 512); -+ TEST_COMPARE (stdc_leading_ones (~(unsigned _BitInt(373)) 0), 373); -+ TEST_COMPARE (stdc_leading_ones (~(unsigned _BitInt(512)) 275), 512 - 9); -+ TEST_COMPARE (stdc_leading_ones (~(unsigned _BitInt(373)) 512), 373 - 10); -+ TEST_COMPARE (stdc_trailing_zeros ((unsigned _BitInt(512)) 0), 512); -+ TEST_COMPARE (expr_has_type (stdc_trailing_zeros ((unsigned _BitInt(512)) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_trailing_zeros ((unsigned _BitInt(373)) 0), 373); -+ TEST_COMPARE (expr_has_type (stdc_trailing_zeros ((unsigned _BitInt(373)) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_trailing_zeros (~(unsigned _BitInt(512)) 0), 0); -+ TEST_COMPARE (stdc_trailing_zeros (~(unsigned _BitInt(373)) 0), 0); -+ TEST_COMPARE (stdc_trailing_zeros ((unsigned _BitInt(512)) 256), 8); -+ TEST_COMPARE (stdc_trailing_zeros ((unsigned _BitInt(373)) 512), 9); -+ TEST_COMPARE (stdc_trailing_ones ((unsigned _BitInt(512)) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_trailing_ones ((unsigned _BitInt(512)) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_trailing_ones ((unsigned _BitInt(373)) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_trailing_ones ((unsigned _BitInt(373)) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_trailing_ones (~(unsigned _BitInt(512)) 0), 512); -+ TEST_COMPARE (stdc_trailing_ones (~(unsigned _BitInt(373)) 0), 373); -+ TEST_COMPARE (stdc_trailing_ones ((unsigned _BitInt(512)) 255), 8); -+ TEST_COMPARE (stdc_trailing_ones ((~(unsigned _BitInt(373)) 0) >> 2), -+ 373 - 2); -+ TEST_COMPARE (stdc_first_leading_zero ((unsigned _BitInt(512)) 0), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_zero ((unsigned _BitInt(512)) -+ 0), ui), 1); -+ TEST_COMPARE (stdc_first_leading_zero ((unsigned _BitInt(373)) 0), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_zero ((unsigned _BitInt(373)) -+ 0), ui), 1); -+ TEST_COMPARE (stdc_first_leading_zero (~(unsigned _BitInt(512)) 0), 0); -+ TEST_COMPARE (stdc_first_leading_zero (~(unsigned _BitInt(373)) 0), 0); -+ TEST_COMPARE (stdc_first_leading_zero (~(unsigned _BitInt(512)) 511), -+ 512 - 8); -+ TEST_COMPARE (stdc_first_leading_zero (~(unsigned _BitInt(373)) 1023), -+ 373 - 9); -+ TEST_COMPARE (stdc_first_leading_one ((unsigned _BitInt(512)) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_one ((unsigned _BitInt(512)) -+ 0), ui), 1); -+ TEST_COMPARE (stdc_first_leading_one ((unsigned _BitInt(373)) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_one ((unsigned _BitInt(373)) -+ 0), ui), 1); -+ TEST_COMPARE (stdc_first_leading_one (~(unsigned _BitInt(512)) 0), 1); -+ TEST_COMPARE (stdc_first_leading_one (~(unsigned _BitInt(373)) 0), 1); -+ TEST_COMPARE (stdc_first_leading_one ((unsigned _BitInt(512)) 275), 512 - 8); -+ TEST_COMPARE (stdc_first_leading_one ((unsigned _BitInt(373)) 512), 373 - 9); -+ TEST_COMPARE (stdc_first_trailing_zero ((unsigned _BitInt(512)) 0), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero ((unsigned -+ _BitInt(512)) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_first_trailing_zero ((unsigned _BitInt(373)) 0), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero ((unsigned -+ _BitInt(373)) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_first_trailing_zero (~(unsigned _BitInt(512)) 0), 0); -+ TEST_COMPARE (stdc_first_trailing_zero (~(unsigned _BitInt(373)) 0), 0); -+ TEST_COMPARE (stdc_first_trailing_zero ((unsigned _BitInt(512)) 255), 9); -+ TEST_COMPARE (stdc_first_trailing_zero ((unsigned _BitInt(373)) 511), 10); -+ TEST_COMPARE (stdc_first_trailing_one ((unsigned _BitInt(512)) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_one ((unsigned _BitInt(512)) -+ 0), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_one ((unsigned _BitInt(373)) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_one ((unsigned _BitInt(373)) -+ 0), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_one (~(unsigned _BitInt(512)) 0), 1); -+ TEST_COMPARE (stdc_first_trailing_one (~(unsigned _BitInt(373)) 0), 1); -+ TEST_COMPARE (stdc_first_trailing_one (((unsigned _BitInt(512)) 255) << 175), -+ 176); -+ TEST_COMPARE (stdc_first_trailing_one ((~(unsigned _BitInt(373)) 0) << 311), -+ 312); -+ TEST_COMPARE (stdc_count_zeros ((unsigned _BitInt(512)) 0), 512); -+ TEST_COMPARE (expr_has_type (stdc_count_zeros ((unsigned _BitInt(512)) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_count_zeros ((unsigned _BitInt(373)) 0), 373); -+ TEST_COMPARE (expr_has_type (stdc_count_zeros ((unsigned _BitInt(373)) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_count_zeros (~(unsigned _BitInt(512)) 0), 0); -+ TEST_COMPARE (stdc_count_zeros (~(unsigned _BitInt(373)) 0), 0); -+ TEST_COMPARE (stdc_count_zeros ((unsigned _BitInt(512)) 1315), 512 - 5); -+ TEST_COMPARE (stdc_count_zeros ((unsigned _BitInt(373)) 3363), 373 - 6); -+ TEST_COMPARE (stdc_count_ones ((unsigned _BitInt(512)) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_count_ones ((unsigned _BitInt(512)) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_count_ones ((unsigned _BitInt(373)) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_count_ones ((unsigned _BitInt(373)) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_count_ones (~(unsigned _BitInt(512)) 0), 512); -+ TEST_COMPARE (stdc_count_ones (~(unsigned _BitInt(373)) 0), 373); -+ TEST_COMPARE (stdc_count_ones (~(unsigned _BitInt(512)) 1315), 512 - 5); -+ TEST_COMPARE (stdc_count_ones (~(unsigned _BitInt(373)) 3363), 373 - 6); -+ TEST_COMPARE (stdc_has_single_bit ((unsigned _BitInt(512)) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_has_single_bit ((unsigned _BitInt(512)) 0), -+ _Bool), 1); -+ TEST_COMPARE (stdc_has_single_bit ((unsigned _BitInt(373)) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_has_single_bit ((unsigned _BitInt(373)) 0), -+ _Bool), 1); -+ TEST_COMPARE (stdc_has_single_bit (~(unsigned _BitInt(512)) 0), 0); -+ TEST_COMPARE (stdc_has_single_bit (~(unsigned _BitInt(373)) 0), 0); -+ TEST_COMPARE (stdc_has_single_bit (((unsigned _BitInt(512)) 1022) << 279), -+ 0); -+ TEST_COMPARE (stdc_has_single_bit (((unsigned _BitInt(373)) 12) << 305), 0); -+ TEST_COMPARE (stdc_bit_width ((unsigned _BitInt(512)) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_width ((unsigned _BitInt(512)) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_bit_width ((unsigned _BitInt(373)) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_width ((unsigned _BitInt(373)) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_bit_width (~(unsigned _BitInt(512)) 0), 512); -+ TEST_COMPARE (stdc_bit_width (~(unsigned _BitInt(373)) 0), 373); -+ TEST_COMPARE (stdc_bit_width (((unsigned _BitInt(512)) 1023) << 405), -+ 405 + 10); -+ TEST_COMPARE (stdc_bit_width (((unsigned _BitInt(373)) 1024) << 242), -+ 242 + 11); -+ TEST_COMPARE (stdc_bit_floor ((unsigned _BitInt(512)) 0) != 0, 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_floor ((unsigned _BitInt(512)) 0), -+ unsigned _BitInt(512)), 1); -+ TEST_COMPARE (stdc_bit_floor ((unsigned _BitInt(373)) 0) != 0, 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_floor ((unsigned _BitInt(373)) 0), -+ unsigned _BitInt(373)), 1); -+ TEST_COMPARE (stdc_bit_floor (~(unsigned _BitInt(512)) 0) -+ != ((unsigned _BitInt(512)) 1) << (512 - 1), 0); -+ TEST_COMPARE (stdc_bit_floor (~(unsigned _BitInt(373)) 0) -+ != ((unsigned _BitInt(373)) 1) << (373 - 1), 0); -+ TEST_COMPARE (stdc_bit_floor (((unsigned _BitInt(512)) 511) << 405) -+ != (((unsigned _BitInt(512)) 256) << 405), 0); -+ TEST_COMPARE (stdc_bit_floor (((unsigned _BitInt(373)) 512) << 242) -+ != (((unsigned _BitInt(512)) 512) << 242), 0); -+ TEST_COMPARE (stdc_bit_ceil ((unsigned _BitInt(512)) 0) != 1, 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_ceil ((unsigned _BitInt(512)) 0), -+ unsigned _BitInt(512)), 1); -+ TEST_COMPARE (stdc_bit_ceil ((unsigned _BitInt(373)) 0) != 1, 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_ceil ((unsigned _BitInt(373)) 0), -+ unsigned _BitInt(373)), 1); -+ TEST_COMPARE (stdc_bit_ceil (~(unsigned _BitInt(512)) 0) != 0, 0); -+ TEST_COMPARE (stdc_bit_ceil (~(unsigned _BitInt(373)) 0) != 0, 0); -+ TEST_COMPARE (stdc_bit_ceil (((unsigned _BitInt(512)) 1) << (512 - 1)) -+ != ((unsigned _BitInt(512)) 1) << (512 - 1), 0); -+ TEST_COMPARE (stdc_bit_ceil ((~(unsigned _BitInt(373)) 0) >> 1) -+ != ((unsigned _BitInt(373)) 1) << (373 - 1), 0); -+ TEST_COMPARE (stdc_bit_ceil (((unsigned _BitInt(512)) 512) << 405) -+ != (((unsigned _BitInt(512)) 512) << 405), 0); -+ TEST_COMPARE (stdc_bit_ceil (((unsigned _BitInt(373)) 513) << 242) -+ != (((unsigned _BitInt(512)) 1024) << 242), 0); -+ TEST_COMPARE (stdc_bit_floor ((unsigned _BitInt(BITINT_MAXWIDTH)) 0) != 0, -+ 0); -+ TEST_COMPARE (stdc_bit_floor (~(unsigned _BitInt(BITINT_MAXWIDTH)) 0) -+ != ((unsigned _BitInt(BITINT_MAXWIDTH)) 1) << (BITINT_MAXWIDTH -+ - 1), 0); -+ TEST_COMPARE (stdc_bit_floor (((unsigned _BitInt(BITINT_MAXWIDTH)) 511) -+ << 405) -+ != (((unsigned _BitInt(BITINT_MAXWIDTH)) 256) << 405), 0); -+ TEST_COMPARE (stdc_bit_floor (((unsigned _BitInt(BITINT_MAXWIDTH)) 512) -+ << 405) -+ != (((unsigned _BitInt(BITINT_MAXWIDTH)) 512) << 405), 0); -+ TEST_COMPARE (stdc_bit_ceil ((unsigned _BitInt(BITINT_MAXWIDTH)) 0) != 1, 0); -+ TEST_COMPARE (stdc_bit_ceil (~(unsigned _BitInt(BITINT_MAXWIDTH)) 0) != 0, -+ 0); -+ TEST_COMPARE (stdc_bit_ceil (((unsigned _BitInt(BITINT_MAXWIDTH)) 1) -+ << (BITINT_MAXWIDTH - 1)) -+ != ((unsigned _BitInt(BITINT_MAXWIDTH)) 1) << (BITINT_MAXWIDTH -+ - 1), 0); -+ TEST_COMPARE (stdc_bit_ceil (((unsigned _BitInt(BITINT_MAXWIDTH)) 512) -+ << 405) -+ != (((unsigned _BitInt(BITINT_MAXWIDTH)) 512) << 405), 0); -+ TEST_COMPARE (stdc_bit_ceil (((unsigned _BitInt(BITINT_MAXWIDTH)) 513) -+ << 405) -+ != (((unsigned _BitInt(BITINT_MAXWIDTH)) 1024) << 405), 0); -+# endif -+# endif -+ return 0; -+} -+#else -+static int -+do_test (void) -+{ -+ return 0; -+} -+#endif -+ -+#include - -commit 71fcdba577884627c3ee4e43beb915da752efb1f -Author: Florian Weimer -Date: Fri Mar 15 19:08:24 2024 +0100 - - linux: Use rseq area unconditionally in sched_getcpu (bug 31479) - - Originally, nptl/descr.h included , but we removed that - in commit 2c6b4b272e6b4d07303af25709051c3e96288f2d ("nptl: - Unconditionally use a 32-byte rseq area"). After that, it was - not ensured that the RSEQ_SIG macro was defined during sched_getcpu.c - compilation that provided a definition. This commit always checks - the rseq area for CPU number information before using the other - approaches. - - This adds an unnecessary (but well-predictable) branch on - architectures which do not define RSEQ_SIG, but its cost is small - compared to the system call. Most architectures that have vDSO - acceleration for getcpu also have rseq support. - - Fixes: 2c6b4b272e6b4d07303af25709051c3e96288f2d - Fixes: 1d350aa06091211863e41169729cee1bca39f72f - Reviewed-by: Arjun Shankar - (cherry picked from commit 7a76f218677d149d8b7875b336722108239f7ee9) - -diff --git a/sysdeps/unix/sysv/linux/sched_getcpu.c b/sysdeps/unix/sysv/linux/sched_getcpu.c -index dfb884568d..72a3360550 100644 ---- a/sysdeps/unix/sysv/linux/sched_getcpu.c -+++ b/sysdeps/unix/sysv/linux/sched_getcpu.c -@@ -33,17 +33,9 @@ vsyscall_sched_getcpu (void) - return r == -1 ? r : cpu; - } - --#ifdef RSEQ_SIG - int - sched_getcpu (void) - { - int cpu_id = THREAD_GETMEM_VOLATILE (THREAD_SELF, rseq_area.cpu_id); - return __glibc_likely (cpu_id >= 0) ? cpu_id : vsyscall_sched_getcpu (); - } --#else /* RSEQ_SIG */ --int --sched_getcpu (void) --{ -- return vsyscall_sched_getcpu (); --} --#endif /* RSEQ_SIG */ - -commit ee7f4c54e19738c2c27d3846e1e9b3595c89221f -Author: Manjunath Matti -Date: Tue Mar 19 15:29:48 2024 -0500 - - powerpc: Add HWCAP3/HWCAP4 data to TCB for Power Architecture. - - This patch adds a new feature for powerpc. In order to get faster - access to the HWCAP3/HWCAP4 masks, similar to HWCAP/HWCAP2 (i.e. for - implementing __builtin_cpu_supports() in GCC) without the overhead of - reading them from the auxiliary vector, we now reserve space for them - in the TCB. - - Suggested-by: Peter Bergner - Reviewed-by: Peter Bergner - (cherry picked from commit 3ab9b88e2ac91062b6d493fe32bd101a55006c6a) - -diff --git a/elf/dl-diagnostics.c b/elf/dl-diagnostics.c -index 7345ebc4e5..aaf67b87e8 100644 ---- a/elf/dl-diagnostics.c -+++ b/elf/dl-diagnostics.c -@@ -235,6 +235,8 @@ _dl_print_diagnostics (char **environ) - _dl_diagnostics_print_labeled_value ("dl_hwcap", GLRO (dl_hwcap)); - _dl_diagnostics_print_labeled_value ("dl_hwcap_important", HWCAP_IMPORTANT); - _dl_diagnostics_print_labeled_value ("dl_hwcap2", GLRO (dl_hwcap2)); -+ _dl_diagnostics_print_labeled_value ("dl_hwcap3", GLRO (dl_hwcap3)); -+ _dl_diagnostics_print_labeled_value ("dl_hwcap4", GLRO (dl_hwcap4)); - _dl_diagnostics_print_labeled_string - ("dl_hwcaps_subdirs", _dl_hwcaps_subdirs); - _dl_diagnostics_print_labeled_value -diff --git a/elf/dl-support.c b/elf/dl-support.c -index 2f502c8b0d..451932dd03 100644 ---- a/elf/dl-support.c -+++ b/elf/dl-support.c -@@ -158,6 +158,8 @@ const ElfW(Phdr) *_dl_phdr; - size_t _dl_phnum; - uint64_t _dl_hwcap; - uint64_t _dl_hwcap2; -+uint64_t _dl_hwcap3; -+uint64_t _dl_hwcap4; - - enum dso_sort_algorithm _dl_dso_sort_algo; - -diff --git a/elf/elf.h b/elf/elf.h -index 455731663c..1c394c64cd 100644 ---- a/elf/elf.h -+++ b/elf/elf.h -@@ -1234,6 +1234,10 @@ typedef struct - #define AT_RSEQ_FEATURE_SIZE 27 /* rseq supported feature size. */ - #define AT_RSEQ_ALIGN 28 /* rseq allocation alignment. */ - -+/* More machine-dependent hints about processor capabilities. */ -+#define AT_HWCAP3 29 /* extension of AT_HWCAP. */ -+#define AT_HWCAP4 30 /* extension of AT_HWCAP. */ -+ - #define AT_EXECFN 31 /* Filename of executable. */ - - /* Pointer to the global system page used for system calls and other -diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h -index 117c901ccc..50f58a60e3 100644 ---- a/sysdeps/generic/ldsodefs.h -+++ b/sysdeps/generic/ldsodefs.h -@@ -646,6 +646,8 @@ struct rtld_global_ro - /* Mask for more hardware capabilities that are available on some - platforms. */ - EXTERN uint64_t _dl_hwcap2; -+ EXTERN uint64_t _dl_hwcap3; -+ EXTERN uint64_t _dl_hwcap4; - - EXTERN enum dso_sort_algorithm _dl_dso_sort_algo; - -diff --git a/sysdeps/powerpc/dl-procinfo.c b/sysdeps/powerpc/dl-procinfo.c -index a76bb6e5b0..8cf00aa7e3 100644 ---- a/sysdeps/powerpc/dl-procinfo.c -+++ b/sysdeps/powerpc/dl-procinfo.c -@@ -38,6 +38,10 @@ - needed. - */ - -+/* The total number of available bits (including those prior to -+ _DL_HWCAP_FIRST). Some of these bits might not be used. */ -+#define _DL_HWCAP_COUNT 128 -+ - #ifndef PROCINFO_CLASS - # define PROCINFO_CLASS - #endif -@@ -61,7 +65,7 @@ PROCINFO_CLASS struct cpu_features _dl_powerpc_cpu_features - #if !defined PROCINFO_DECL && defined SHARED - ._dl_powerpc_cap_flags - #else --PROCINFO_CLASS const char _dl_powerpc_cap_flags[64][15] -+PROCINFO_CLASS const char _dl_powerpc_cap_flags[_DL_HWCAP_COUNT][15] - #endif - #ifndef PROCINFO_DECL - = { -diff --git a/sysdeps/powerpc/dl-procinfo.h b/sysdeps/powerpc/dl-procinfo.h -index 68f4241095..f8cb343877 100644 ---- a/sysdeps/powerpc/dl-procinfo.h -+++ b/sysdeps/powerpc/dl-procinfo.h -@@ -22,16 +22,17 @@ - #include - #include /* This defines the PPC_FEATURE[2]_* macros. */ - --/* The total number of available bits (including those prior to -- _DL_HWCAP_FIRST). Some of these bits might not be used. */ --#define _DL_HWCAP_COUNT 64 -+/* Feature masks are all 32-bits in size. */ -+#define _DL_HWCAP_SIZE 32 - --/* Features started at bit 31 and decremented as new features were added. */ --#define _DL_HWCAP_LAST 31 -+/* AT_HWCAP2 feature strings follow the AT_HWCAP feature strings. */ -+#define _DL_HWCAP2_OFFSET _DL_HWCAP_SIZE - --/* AT_HWCAP2 features started at bit 31 and decremented as new features were -- added. HWCAP2 feature bits start at bit 0. */ --#define _DL_HWCAP2_LAST 31 -+/* AT_HWCAP3 feature strings follow the AT_HWCAP2 feature strings. */ -+#define _DL_HWCAP3_OFFSET (_DL_HWCAP2_OFFSET + _DL_HWCAP_SIZE) -+ -+/* AT_HWCAP4 feature strings follow the AT_HWCAP3 feature strings. */ -+#define _DL_HWCAP4_OFFSET (_DL_HWCAP3_OFFSET + _DL_HWCAP_SIZE) - - /* These bits influence library search. */ - #define HWCAP_IMPORTANT (PPC_FEATURE_HAS_ALTIVEC \ -@@ -187,21 +188,42 @@ _dl_procinfo (unsigned int type, unsigned long int word) - case AT_HWCAP: - _dl_printf ("AT_HWCAP: "); - -- for (int i = 0; i <= _DL_HWCAP_LAST; ++i) -+ for (int i = 0; i < _DL_HWCAP_SIZE; ++i) - if (word & (1 << i)) - _dl_printf (" %s", _dl_hwcap_string (i)); - break; - case AT_HWCAP2: - { -- unsigned int offset = _DL_HWCAP_LAST + 1; - - _dl_printf ("AT_HWCAP2: "); - -- /* We have to go through them all because the kernel added the -- AT_HWCAP2 features starting with the high bits. */ -- for (int i = 0; i <= _DL_HWCAP2_LAST; ++i) -- if (word & (1 << i)) -- _dl_printf (" %s", _dl_hwcap_string (offset + i)); -+ /* We have to go through them all because the kernel added the -+ AT_HWCAP2 features starting with the high bits. */ -+ for (int i = 0; i < _DL_HWCAP_SIZE; ++i) -+ if (word & (1 << i)) -+ _dl_printf (" %s", _dl_hwcap_string (_DL_HWCAP2_OFFSET + i)); -+ break; -+ } -+ case AT_HWCAP3: -+ { -+ _dl_printf ("AT_HWCAP3: "); -+ -+ /* We have to go through them all because the kernel added the -+ AT_HWCAP3 features starting with the high bits. */ -+ for (int i = 0; i < _DL_HWCAP_SIZE; ++i) -+ if (word & (1 << i)) -+ _dl_printf (" %s", _dl_hwcap_string (_DL_HWCAP3_OFFSET + i)); -+ break; -+ } -+ case AT_HWCAP4: -+ { -+ _dl_printf ("AT_HWCAP4: "); -+ -+ /* We have to go through them all because the kernel added the -+ AT_HWCAP4 features starting with the high bits. */ -+ for (int i = 0; i <= _DL_HWCAP_SIZE; ++i) -+ if (word & (1 << i)) -+ _dl_printf (" %s", _dl_hwcap_string (_DL_HWCAP4_OFFSET + i)); - break; - } - case AT_L1I_CACHEGEOMETRY: -diff --git a/sysdeps/powerpc/hwcapinfo.c b/sysdeps/powerpc/hwcapinfo.c -index 76344f285a..f6fede15a7 100644 ---- a/sysdeps/powerpc/hwcapinfo.c -+++ b/sysdeps/powerpc/hwcapinfo.c -@@ -31,7 +31,7 @@ void - __tcb_parse_hwcap_and_convert_at_platform (void) - { - -- uint64_t h1, h2; -+ uint64_t h1, h2, h3, h4; - - /* Read AT_PLATFORM string from auxv and convert it to a number. */ - __tcb.at_platform = _dl_string_platform (GLRO (dl_platform)); -@@ -39,6 +39,8 @@ __tcb_parse_hwcap_and_convert_at_platform (void) - /* Read HWCAP and HWCAP2 from auxv. */ - h1 = GLRO (dl_hwcap); - h2 = GLRO (dl_hwcap2); -+ h3 = GLRO (dl_hwcap3); -+ h4 = GLRO (dl_hwcap4); - - /* hwcap contains only the latest supported ISA, the code checks which is - and fills the previous supported ones. */ -@@ -64,13 +66,16 @@ __tcb_parse_hwcap_and_convert_at_platform (void) - else if (h1 & PPC_FEATURE_POWER5) - h1 |= PPC_FEATURE_POWER4; - -- uint64_t array_hwcaps[] = { h1, h2 }; -+ uint64_t array_hwcaps[] = { h1, h2, h3, h4 }; - init_cpu_features (&GLRO(dl_powerpc_cpu_features), array_hwcaps); - - /* Consolidate both HWCAP and HWCAP2 into a single doubleword so that - we can read both in a single load later. */ - __tcb.hwcap = (h1 << 32) | (h2 & 0xffffffff); -- __tcb.hwcap_extn = 0x0; -+ -+ /* Consolidate both HWCAP3 and HWCAP4 into a single doubleword so that -+ we can read both in a single load later. */ -+ __tcb.hwcap_extn = (h3 << 32) | (h4 & 0xffffffff); - - } - #if IS_IN (rtld) -diff --git a/sysdeps/unix/sysv/linux/dl-parse_auxv.h b/sysdeps/unix/sysv/linux/dl-parse_auxv.h -index e3d758b163..ea2a58ecb1 100644 ---- a/sysdeps/unix/sysv/linux/dl-parse_auxv.h -+++ b/sysdeps/unix/sysv/linux/dl-parse_auxv.h -@@ -47,6 +47,8 @@ void _dl_parse_auxv (ElfW(auxv_t) *av, dl_parse_auxv_t auxv_values) - GLRO(dl_platform) = (void *) auxv_values[AT_PLATFORM]; - GLRO(dl_hwcap) = auxv_values[AT_HWCAP]; - GLRO(dl_hwcap2) = auxv_values[AT_HWCAP2]; -+ GLRO(dl_hwcap3) = auxv_values[AT_HWCAP3]; -+ GLRO(dl_hwcap4) = auxv_values[AT_HWCAP4]; - GLRO(dl_clktck) = auxv_values[AT_CLKTCK]; - GLRO(dl_fpu_control) = auxv_values[AT_FPUCW]; - _dl_random = (void *) auxv_values[AT_RANDOM]; -diff --git a/sysdeps/unix/sysv/linux/dl-sysdep.c b/sysdeps/unix/sysv/linux/dl-sysdep.c -index ad3692d738..e1b14e9eb3 100644 ---- a/sysdeps/unix/sysv/linux/dl-sysdep.c -+++ b/sysdeps/unix/sysv/linux/dl-sysdep.c -@@ -197,6 +197,8 @@ _dl_show_auxv (void) - [AT_SYSINFO_EHDR - 2] = { "SYSINFO_EHDR: 0x", hex }, - [AT_RANDOM - 2] = { "RANDOM: 0x", hex }, - [AT_HWCAP2 - 2] = { "HWCAP2: 0x", hex }, -+ [AT_HWCAP3 - 2] = { "HWCAP3: 0x", hex }, -+ [AT_HWCAP4 - 2] = { "HWCAP4: 0x", hex }, - [AT_MINSIGSTKSZ - 2] = { "MINSIGSTKSZ: ", dec }, - [AT_L1I_CACHESIZE - 2] = { "L1I_CACHESIZE: ", dec }, - [AT_L1I_CACHEGEOMETRY - 2] = { "L1I_CACHEGEOMETRY: 0x", hex }, -diff --git a/sysdeps/unix/sysv/linux/powerpc/cpu-features.c b/sysdeps/unix/sysv/linux/powerpc/cpu-features.c -index 8e8a5ec2ea..a947d62db6 100644 ---- a/sysdeps/unix/sysv/linux/powerpc/cpu-features.c -+++ b/sysdeps/unix/sysv/linux/powerpc/cpu-features.c -@@ -94,6 +94,8 @@ init_cpu_features (struct cpu_features *cpu_features, uint64_t hwcaps[]) - which are set by __tcb_parse_hwcap_and_convert_at_platform. */ - cpu_features->hwcap = hwcaps[0]; - cpu_features->hwcap2 = hwcaps[1]; -+ cpu_features->hwcap3 = hwcaps[2]; -+ cpu_features->hwcap4 = hwcaps[3]; - /* Default is to use aligned memory access on optimized function unless - tunables is enable, since for this case user can explicit disable - unaligned optimizations. */ -diff --git a/sysdeps/unix/sysv/linux/powerpc/cpu-features.h b/sysdeps/unix/sysv/linux/powerpc/cpu-features.h -index 1294f0b601..e9eb6a13c8 100644 ---- a/sysdeps/unix/sysv/linux/powerpc/cpu-features.h -+++ b/sysdeps/unix/sysv/linux/powerpc/cpu-features.h -@@ -26,6 +26,8 @@ struct cpu_features - bool use_cached_memopt; - unsigned long int hwcap; - unsigned long int hwcap2; -+ unsigned long int hwcap3; -+ unsigned long int hwcap4; - }; - - static const char hwcap_names[] = { -diff --git a/sysdeps/unix/sysv/linux/powerpc/libc-start.c b/sysdeps/unix/sysv/linux/powerpc/libc-start.c -index a4705daf1c..6a00cd88cd 100644 ---- a/sysdeps/unix/sysv/linux/powerpc/libc-start.c -+++ b/sysdeps/unix/sysv/linux/powerpc/libc-start.c -@@ -87,6 +87,12 @@ __libc_start_main_impl (int argc, char **argv, - case AT_HWCAP2: - _dl_hwcap2 = (unsigned long int) av->a_un.a_val; - break; -+ case AT_HWCAP3: -+ _dl_hwcap3 = (unsigned long int) av->a_un.a_val; -+ break; -+ case AT_HWCAP4: -+ _dl_hwcap4 = (unsigned long int) av->a_un.a_val; -+ break; - case AT_PLATFORM: - _dl_platform = (void *) av->a_un.a_val; - break; - -commit aad45c8ac30aa1072e54903ce6aead22702f244a -Author: Amrita H S -Date: Tue Mar 19 19:08:47 2024 -0500 - - powerpc: Placeholder and infrastructure/build support to add Power11 related changes. - - The following three changes have been added to provide initial Power11 support. - 1. Add the directories to hold Power11 files. - 2. Add support to select Power11 libraries based on AT_PLATFORM. - 3. Let submachine=power11 be set automatically. - - Reviewed-by: Florian Weimer - Reviewed-by: Peter Bergner - (cherry picked from commit 1ea051145612f199d8716ecdf78b084b00b5a727) - -diff --git a/sysdeps/powerpc/dl-procinfo.h b/sysdeps/powerpc/dl-procinfo.h -index f8cb343877..b36697ba44 100644 ---- a/sysdeps/powerpc/dl-procinfo.h -+++ b/sysdeps/powerpc/dl-procinfo.h -@@ -38,7 +38,7 @@ - #define HWCAP_IMPORTANT (PPC_FEATURE_HAS_ALTIVEC \ - + PPC_FEATURE_HAS_DFP) - --#define _DL_PLATFORMS_COUNT 16 -+#define _DL_PLATFORMS_COUNT 17 - - #define _DL_FIRST_PLATFORM 32 - /* Mask to filter out platforms. */ -@@ -62,6 +62,7 @@ - #define PPC_PLATFORM_POWER8 13 - #define PPC_PLATFORM_POWER9 14 - #define PPC_PLATFORM_POWER10 15 -+#define PPC_PLATFORM_POWER11 16 - - static inline const char * - __attribute__ ((unused)) -@@ -89,6 +90,11 @@ _dl_string_platform (const char *str) - ret = _DL_FIRST_PLATFORM + PPC_PLATFORM_POWER10; - str++; - } -+ else if (str[1] == '1') -+ { -+ ret = _DL_FIRST_PLATFORM + PPC_PLATFORM_POWER11; -+ str++; -+ } - else - return -1; - break; -diff --git a/sysdeps/powerpc/powerpc32/power11/Implies b/sysdeps/powerpc/powerpc32/power11/Implies -new file mode 100644 -index 0000000000..051cbe0f79 ---- /dev/null -+++ b/sysdeps/powerpc/powerpc32/power11/Implies -@@ -0,0 +1,2 @@ -+powerpc/powerpc32/power10/fpu -+powerpc/powerpc32/power10 -diff --git a/sysdeps/powerpc/powerpc32/power11/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc32/power11/fpu/multiarch/Implies -new file mode 100644 -index 0000000000..58edb2861d ---- /dev/null -+++ b/sysdeps/powerpc/powerpc32/power11/fpu/multiarch/Implies -@@ -0,0 +1 @@ -+powerpc/powerpc32/power10/fpu/multiarch -diff --git a/sysdeps/powerpc/powerpc32/power11/multiarch/Implies b/sysdeps/powerpc/powerpc32/power11/multiarch/Implies -new file mode 100644 -index 0000000000..c70f0428ba ---- /dev/null -+++ b/sysdeps/powerpc/powerpc32/power11/multiarch/Implies -@@ -0,0 +1 @@ -+powerpc/powerpc32/power10/multiarch -diff --git a/sysdeps/powerpc/powerpc64/be/power11/Implies b/sysdeps/powerpc/powerpc64/be/power11/Implies -new file mode 100644 -index 0000000000..de481d1c13 ---- /dev/null -+++ b/sysdeps/powerpc/powerpc64/be/power11/Implies -@@ -0,0 +1,2 @@ -+powerpc/powerpc64/be/power10/fpu -+powerpc/powerpc64/be/power10 -diff --git a/sysdeps/powerpc/powerpc64/be/power11/fpu/Implies b/sysdeps/powerpc/powerpc64/be/power11/fpu/Implies -new file mode 100644 -index 0000000000..dff0e13064 ---- /dev/null -+++ b/sysdeps/powerpc/powerpc64/be/power11/fpu/Implies -@@ -0,0 +1 @@ -+powerpc/powerpc64/be/power10/fpu -diff --git a/sysdeps/powerpc/powerpc64/be/power11/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/be/power11/fpu/multiarch/Implies -new file mode 100644 -index 0000000000..c3f259e009 ---- /dev/null -+++ b/sysdeps/powerpc/powerpc64/be/power11/fpu/multiarch/Implies -@@ -0,0 +1 @@ -+powerpc/powerpc64/be/power10/fpu/multiarch -diff --git a/sysdeps/powerpc/powerpc64/be/power11/multiarch/Implies b/sysdeps/powerpc/powerpc64/be/power11/multiarch/Implies -new file mode 100644 -index 0000000000..9491a394c9 ---- /dev/null -+++ b/sysdeps/powerpc/powerpc64/be/power11/multiarch/Implies -@@ -0,0 +1 @@ -+powerpc/powerpc64/be/power10/multiarch -diff --git a/sysdeps/powerpc/powerpc64/le/power11/Implies b/sysdeps/powerpc/powerpc64/le/power11/Implies -new file mode 100644 -index 0000000000..e18182dcc1 ---- /dev/null -+++ b/sysdeps/powerpc/powerpc64/le/power11/Implies -@@ -0,0 +1,2 @@ -+powerpc/powerpc64/le/power10/fpu -+powerpc/powerpc64/le/power10 -diff --git a/sysdeps/powerpc/powerpc64/le/power11/fpu/Implies b/sysdeps/powerpc/powerpc64/le/power11/fpu/Implies -new file mode 100644 -index 0000000000..e41bd55684 ---- /dev/null -+++ b/sysdeps/powerpc/powerpc64/le/power11/fpu/Implies -@@ -0,0 +1 @@ -+powerpc/powerpc64/le/power10/fpu -diff --git a/sysdeps/powerpc/powerpc64/le/power11/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/le/power11/fpu/multiarch/Implies -new file mode 100644 -index 0000000000..c838d50931 ---- /dev/null -+++ b/sysdeps/powerpc/powerpc64/le/power11/fpu/multiarch/Implies -@@ -0,0 +1 @@ -+powerpc/powerpc64/le/power10/fpu/multiarch -diff --git a/sysdeps/powerpc/powerpc64/le/power11/multiarch/Implies b/sysdeps/powerpc/powerpc64/le/power11/multiarch/Implies -new file mode 100644 -index 0000000000..687248c3c2 ---- /dev/null -+++ b/sysdeps/powerpc/powerpc64/le/power11/multiarch/Implies -@@ -0,0 +1 @@ -+powerpc/powerpc64/le/power10/multiarch -diff --git a/sysdeps/powerpc/powerpc64/le/tst-glibc-hwcaps.c b/sysdeps/powerpc/powerpc64/le/tst-glibc-hwcaps.c -index 77465d9133..65d3e69303 100644 ---- a/sysdeps/powerpc/powerpc64/le/tst-glibc-hwcaps.c -+++ b/sysdeps/powerpc/powerpc64/le/tst-glibc-hwcaps.c -@@ -36,9 +36,11 @@ compute_level (void) - return 9; - if (strcmp (platform, "power10") == 0) - return 10; -+ if (strcmp (platform, "power11") == 0) -+ return 11; - printf ("warning: unrecognized AT_PLATFORM value: %s\n", platform); -- /* Assume that the new platform supports POWER10. */ -- return 10; -+ /* Assume that the new platform supports POWER11. */ -+ return 11; - } - - static int -diff --git a/sysdeps/powerpc/preconfigure b/sysdeps/powerpc/preconfigure -index 4de94089a3..9e5a07ab6d 100644 ---- a/sysdeps/powerpc/preconfigure -+++ b/sysdeps/powerpc/preconfigure -@@ -58,7 +58,7 @@ fi - - ;; - -- a2|970|power[4-9]|power5x|power6+|power10) -+ a2|970|power[4-9]|power5x|power6+|power10|power11) - submachine=${archcpu} - if test ${libc_cv_cc_submachine+y} - then : -diff --git a/sysdeps/powerpc/preconfigure.ac b/sysdeps/powerpc/preconfigure.ac -index 6c63bd8257..14b6dafd4a 100644 ---- a/sysdeps/powerpc/preconfigure.ac -+++ b/sysdeps/powerpc/preconfigure.ac -@@ -46,7 +46,7 @@ case "${machine}:${submachine}" in - AC_CACHE_VAL(libc_cv_cc_submachine,libc_cv_cc_submachine="") - ;; - -- a2|970|power[[4-9]]|power5x|power6+|power10) -+ a2|970|power[[4-9]]|power5x|power6+|power10|power11) - submachine=${archcpu} - AC_CACHE_VAL(libc_cv_cc_submachine,libc_cv_cc_submachine="") - ;; - -commit 983f34a1252de3ca6f2305c211d86530ea42010e -Author: caiyinyu -Date: Mon Mar 11 16:07:48 2024 +0800 - - LoongArch: Correct {__ieee754, _}_scalb -> {__ieee754, _}_scalbf - -diff --git a/sysdeps/loongarch/fpu/e_scalbf.c b/sysdeps/loongarch/fpu/e_scalbf.c -index 9f05485236..7c0395fbb5 100644 ---- a/sysdeps/loongarch/fpu/e_scalbf.c -+++ b/sysdeps/loongarch/fpu/e_scalbf.c -@@ -57,4 +57,4 @@ __ieee754_scalbf (float x, float fn) - - return x; - } --libm_alias_finite (__ieee754_scalb, __scalb) -+libm_alias_finite (__ieee754_scalbf, __scalbf) - -commit 7fc8242bf87828c935ac5df5cafb9dc7ab635fd9 -Author: H.J. Lu -Date: Fri Feb 16 07:17:10 2024 -0800 - - x86-64: Save APX registers in ld.so trampoline - - Add APX registers to STATE_SAVE_MASK so that APX registers are saved in - ld.so trampoline. This fixes BZ #31371. - - Also update STATE_SAVE_OFFSET and STATE_SAVE_MASK for i386 which will - be used by i386 _dl_tlsdesc_dynamic. - Reviewed-by: Noah Goldstein - - (cherry picked from commit dfb05f8e704edac70db38c4c8ee700769d91a413) - -diff --git a/sysdeps/x86/sysdep.h b/sysdeps/x86/sysdep.h -index 85d0a8c943..837fd28734 100644 ---- a/sysdeps/x86/sysdep.h -+++ b/sysdeps/x86/sysdep.h -@@ -21,14 +21,54 @@ - - #include - -+/* The extended state feature IDs in the state component bitmap. */ -+#define X86_XSTATE_X87_ID 0 -+#define X86_XSTATE_SSE_ID 1 -+#define X86_XSTATE_AVX_ID 2 -+#define X86_XSTATE_BNDREGS_ID 3 -+#define X86_XSTATE_BNDCFG_ID 4 -+#define X86_XSTATE_K_ID 5 -+#define X86_XSTATE_ZMM_H_ID 6 -+#define X86_XSTATE_ZMM_ID 7 -+#define X86_XSTATE_PKRU_ID 9 -+#define X86_XSTATE_TILECFG_ID 17 -+#define X86_XSTATE_TILEDATA_ID 18 -+#define X86_XSTATE_APX_F_ID 19 -+ -+#ifdef __x86_64__ - /* Offset for fxsave/xsave area used by _dl_runtime_resolve. Also need - space to preserve RCX, RDX, RSI, RDI, R8, R9 and RAX. It must be -- aligned to 16 bytes for fxsave and 64 bytes for xsave. */ --#define STATE_SAVE_OFFSET (8 * 7 + 8) -- --/* Save SSE, AVX, AVX512, mask and bound registers. */ --#define STATE_SAVE_MASK \ -- ((1 << 1) | (1 << 2) | (1 << 3) | (1 << 5) | (1 << 6) | (1 << 7)) -+ aligned to 16 bytes for fxsave and 64 bytes for xsave. -+ -+ NB: Is is non-zero because of the 128-byte red-zone. Some registers -+ are saved on stack without adjusting stack pointer first. When we -+ update stack pointer to allocate more space, we need to take the -+ red-zone into account. */ -+# define STATE_SAVE_OFFSET (8 * 7 + 8) -+ -+/* Save SSE, AVX, AVX512, mask, bound and APX registers. Bound and APX -+ registers are mutually exclusive. */ -+# define STATE_SAVE_MASK \ -+ ((1 << X86_XSTATE_SSE_ID) \ -+ | (1 << X86_XSTATE_AVX_ID) \ -+ | (1 << X86_XSTATE_BNDREGS_ID) \ -+ | (1 << X86_XSTATE_K_ID) \ -+ | (1 << X86_XSTATE_ZMM_H_ID) \ -+ | (1 << X86_XSTATE_ZMM_ID) \ -+ | (1 << X86_XSTATE_APX_F_ID)) -+#else -+/* Offset for fxsave/xsave area used by _dl_tlsdesc_dynamic. Since i386 -+ doesn't have red-zone, use 0 here. */ -+# define STATE_SAVE_OFFSET 0 -+ -+/* Save SSE, AVX, AXV512, mask and bound registers. */ -+# define STATE_SAVE_MASK \ -+ ((1 << X86_XSTATE_SSE_ID) \ -+ | (1 << X86_XSTATE_AVX_ID) \ -+ | (1 << X86_XSTATE_BNDREGS_ID) \ -+ | (1 << X86_XSTATE_K_ID) \ -+ | (1 << X86_XSTATE_ZMM_H_ID)) -+#endif - - /* Constants for bits in __x86_string_control: */ - - -commit a364304718725a31ab141936322855c76c73e35e -Author: H.J. Lu -Date: Mon Feb 26 06:37:03 2024 -0800 - - x86: Update _dl_tlsdesc_dynamic to preserve caller-saved registers - - Compiler generates the following instruction sequence for GNU2 dynamic - TLS access: - - leaq tls_var@TLSDESC(%rip), %rax - call *tls_var@TLSCALL(%rax) - - or - - leal tls_var@TLSDESC(%ebx), %eax - call *tls_var@TLSCALL(%eax) - - CALL instruction is transparent to compiler which assumes all registers, - except for EFLAGS and RAX/EAX, are unchanged after CALL. When - _dl_tlsdesc_dynamic is called, it calls __tls_get_addr on the slow - path. __tls_get_addr is a normal function which doesn't preserve any - caller-saved registers. _dl_tlsdesc_dynamic saved and restored integer - caller-saved registers, but didn't preserve any other caller-saved - registers. Add _dl_tlsdesc_dynamic IFUNC functions for FNSAVE, FXSAVE, - XSAVE and XSAVEC to save and restore all caller-saved registers. This - fixes BZ #31372. - - Add GLRO(dl_x86_64_runtime_resolve) with GLRO(dl_x86_tlsdesc_dynamic) - to optimize elf_machine_runtime_setup. - Reviewed-by: Noah Goldstein - - (cherry picked from commit 0aac205a814a8511e98d02b91a8dc908f1c53cde) - -diff --git a/elf/Makefile b/elf/Makefile -index 5d78b659ce..c5c37a9147 100644 ---- a/elf/Makefile -+++ b/elf/Makefile -@@ -424,6 +424,7 @@ tests += \ - tst-glibc-hwcaps-prepend \ - tst-global1 \ - tst-global2 \ -+ tst-gnu2-tls2 \ - tst-initfinilazyfail \ - tst-initorder \ - tst-initorder2 \ -@@ -846,6 +847,9 @@ modules-names += \ - tst-filterobj-flt \ - tst-finilazyfailmod \ - tst-globalmod2 \ -+ tst-gnu2-tls2mod0 \ -+ tst-gnu2-tls2mod1 \ -+ tst-gnu2-tls2mod2 \ - tst-initlazyfailmod \ - tst-initorder2a \ - tst-initorder2b \ -@@ -3044,8 +3048,22 @@ $(objpfx)tst-tlsgap.out: \ - $(objpfx)tst-tlsgap-mod0.so \ - $(objpfx)tst-tlsgap-mod1.so \ - $(objpfx)tst-tlsgap-mod2.so -+ -+$(objpfx)tst-gnu2-tls2: $(shared-thread-library) -+$(objpfx)tst-gnu2-tls2.out: \ -+ $(objpfx)tst-gnu2-tls2mod0.so \ -+ $(objpfx)tst-gnu2-tls2mod1.so \ -+ $(objpfx)tst-gnu2-tls2mod2.so -+ - ifeq (yes,$(have-mtls-dialect-gnu2)) -+# This test fails if dl_tlsdesc_dynamic doesn't preserve all caller-saved -+# registers. See https://sourceware.org/bugzilla/show_bug.cgi?id=31372 -+test-xfail-tst-gnu2-tls2 = yes -+ - CFLAGS-tst-tlsgap-mod0.c += -mtls-dialect=gnu2 - CFLAGS-tst-tlsgap-mod1.c += -mtls-dialect=gnu2 - CFLAGS-tst-tlsgap-mod2.c += -mtls-dialect=gnu2 -+CFLAGS-tst-gnu2-tls2mod0.c += -mtls-dialect=gnu2 -+CFLAGS-tst-gnu2-tls2mod1.c += -mtls-dialect=gnu2 -+CFLAGS-tst-gnu2-tls2mod2.c += -mtls-dialect=gnu2 - endif -diff --git a/elf/tst-gnu2-tls2.c b/elf/tst-gnu2-tls2.c -new file mode 100644 -index 0000000000..7ac04d7f33 ---- /dev/null -+++ b/elf/tst-gnu2-tls2.c -@@ -0,0 +1,122 @@ -+/* Test TLSDESC relocation. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include "tst-gnu2-tls2.h" -+ -+#ifndef IS_SUPPORTED -+# define IS_SUPPORTED() true -+#endif -+ -+/* An architecture can define it to clobber caller-saved registers in -+ malloc below to verify that the implicit TLSDESC call won't change -+ caller-saved registers. */ -+#ifndef PREPARE_MALLOC -+# define PREPARE_MALLOC() -+#endif -+ -+extern void * __libc_malloc (size_t); -+ -+size_t malloc_counter = 0; -+ -+void * -+malloc (size_t n) -+{ -+ PREPARE_MALLOC (); -+ malloc_counter++; -+ return __libc_malloc (n); -+} -+ -+static void *mod[3]; -+#ifndef MOD -+# define MOD(i) "tst-gnu2-tls2mod" #i ".so" -+#endif -+static const char *modname[3] = { MOD(0), MOD(1), MOD(2) }; -+#undef MOD -+ -+static void -+open_mod (int i) -+{ -+ mod[i] = xdlopen (modname[i], RTLD_LAZY); -+ printf ("open %s\n", modname[i]); -+} -+ -+static void -+close_mod (int i) -+{ -+ xdlclose (mod[i]); -+ mod[i] = NULL; -+ printf ("close %s\n", modname[i]); -+} -+ -+static void -+access_mod (int i, const char *sym) -+{ -+ struct tls var = { -1, -1, -1, -1 }; -+ struct tls *(*f) (struct tls *) = xdlsym (mod[i], sym); -+ /* Check that our malloc is called. */ -+ malloc_counter = 0; -+ struct tls *p = f (&var); -+ TEST_VERIFY (malloc_counter != 0); -+ printf ("access %s: %s() = %p\n", modname[i], sym, p); -+ TEST_VERIFY_EXIT (memcmp (p, &var, sizeof (var)) == 0); -+ ++(p->a); -+} -+ -+static void * -+start (void *arg) -+{ -+ /* The DTV generation is at the last dlopen of mod0 and the -+ entry for mod1 is NULL. */ -+ -+ open_mod (1); /* Reuse modid of mod1. Uses dynamic TLS. */ -+ -+ /* Force the slow path in GNU2 TLS descriptor call. */ -+ access_mod (1, "apply_tls"); -+ -+ return arg; -+} -+ -+static int -+do_test (void) -+{ -+ if (!IS_SUPPORTED ()) -+ return EXIT_UNSUPPORTED; -+ -+ open_mod (0); -+ open_mod (1); -+ open_mod (2); -+ close_mod (0); -+ close_mod (1); /* Create modid gap at mod1. */ -+ open_mod (0); /* Reuse modid of mod0, bump generation count. */ -+ -+ /* Create a thread where DTV of mod1 is NULL. */ -+ pthread_t t = xpthread_create (NULL, start, NULL); -+ xpthread_join (t); -+ return 0; -+} -+ -+#include -diff --git a/elf/tst-gnu2-tls2.h b/elf/tst-gnu2-tls2.h -new file mode 100644 -index 0000000000..77964a57a3 ---- /dev/null -+++ b/elf/tst-gnu2-tls2.h -@@ -0,0 +1,36 @@ -+/* Test TLSDESC relocation. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#include -+ -+struct tls -+{ -+ int64_t a, b, c, d; -+}; -+ -+extern struct tls *apply_tls (struct tls *); -+ -+/* An architecture can define them to verify that clobber caller-saved -+ registers aren't changed by the implicit TLSDESC call. */ -+#ifndef BEFORE_TLSDESC_CALL -+# define BEFORE_TLSDESC_CALL() -+#endif -+ -+#ifndef AFTER_TLSDESC_CALL -+# define AFTER_TLSDESC_CALL() -+#endif -diff --git a/elf/tst-gnu2-tls2mod0.c b/elf/tst-gnu2-tls2mod0.c -new file mode 100644 -index 0000000000..45556a0e17 ---- /dev/null -+++ b/elf/tst-gnu2-tls2mod0.c -@@ -0,0 +1,31 @@ -+/* DSO used by tst-gnu2-tls2. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#include "tst-gnu2-tls2.h" -+ -+__thread struct tls tls_var0 __attribute__ ((visibility ("hidden"))); -+ -+struct tls * -+apply_tls (struct tls *p) -+{ -+ BEFORE_TLSDESC_CALL (); -+ tls_var0 = *p; -+ struct tls *ret = &tls_var0; -+ AFTER_TLSDESC_CALL (); -+ return ret; -+} -diff --git a/elf/tst-gnu2-tls2mod1.c b/elf/tst-gnu2-tls2mod1.c -new file mode 100644 -index 0000000000..e10b9dbc0a ---- /dev/null -+++ b/elf/tst-gnu2-tls2mod1.c -@@ -0,0 +1,31 @@ -+/* DSO used by tst-gnu2-tls2. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#include "tst-gnu2-tls2.h" -+ -+__thread struct tls tls_var1[100] __attribute__ ((visibility ("hidden"))); -+ -+struct tls * -+apply_tls (struct tls *p) -+{ -+ BEFORE_TLSDESC_CALL (); -+ tls_var1[1] = *p; -+ struct tls *ret = &tls_var1[1]; -+ AFTER_TLSDESC_CALL (); -+ return ret; -+} -diff --git a/elf/tst-gnu2-tls2mod2.c b/elf/tst-gnu2-tls2mod2.c -new file mode 100644 -index 0000000000..141af51e55 ---- /dev/null -+++ b/elf/tst-gnu2-tls2mod2.c -@@ -0,0 +1,31 @@ -+/* DSO used by tst-gnu2-tls2. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#include "tst-gnu2-tls2.h" -+ -+__thread struct tls tls_var2 __attribute__ ((visibility ("hidden"))); -+ -+struct tls * -+apply_tls (struct tls *p) -+{ -+ BEFORE_TLSDESC_CALL (); -+ tls_var2 = *p; -+ struct tls *ret = &tls_var2; -+ AFTER_TLSDESC_CALL (); -+ return ret; -+} -diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h -index fc1ef96587..50d74fe6e9 100644 ---- a/sysdeps/i386/dl-machine.h -+++ b/sysdeps/i386/dl-machine.h -@@ -347,7 +347,7 @@ and creates an unsatisfiable circular dependency.\n", - { - td->arg = _dl_make_tlsdesc_dynamic - (sym_map, sym->st_value + (ElfW(Word))td->arg); -- td->entry = _dl_tlsdesc_dynamic; -+ td->entry = GLRO(dl_x86_tlsdesc_dynamic); - } - else - # endif -diff --git a/sysdeps/i386/dl-tlsdesc-dynamic.h b/sysdeps/i386/dl-tlsdesc-dynamic.h -new file mode 100644 -index 0000000000..3627028577 ---- /dev/null -+++ b/sysdeps/i386/dl-tlsdesc-dynamic.h -@@ -0,0 +1,190 @@ -+/* Thread-local storage handling in the ELF dynamic linker. i386 version. -+ Copyright (C) 2004-2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#undef REGISTER_SAVE_AREA -+ -+#if !defined USE_FNSAVE && (STATE_SAVE_ALIGNMENT % 16) != 0 -+# error STATE_SAVE_ALIGNMENT must be multiple of 16 -+#endif -+ -+#if DL_RUNTIME_RESOLVE_REALIGN_STACK -+# ifdef USE_FNSAVE -+# error USE_FNSAVE shouldn't be defined -+# endif -+# ifdef USE_FXSAVE -+/* Use fxsave to save all registers. */ -+# define REGISTER_SAVE_AREA 512 -+# endif -+#else -+# ifdef USE_FNSAVE -+/* Use fnsave to save x87 FPU stack registers. */ -+# define REGISTER_SAVE_AREA 108 -+# else -+# ifndef USE_FXSAVE -+# error USE_FXSAVE must be defined -+# endif -+/* Use fxsave to save all registers. Add 12 bytes to align the stack -+ to 16 bytes. */ -+# define REGISTER_SAVE_AREA (512 + 12) -+# endif -+#endif -+ -+ .hidden _dl_tlsdesc_dynamic -+ .global _dl_tlsdesc_dynamic -+ .type _dl_tlsdesc_dynamic,@function -+ -+ /* This function is used for symbols that need dynamic TLS. -+ -+ %eax points to the TLS descriptor, such that 0(%eax) points to -+ _dl_tlsdesc_dynamic itself, and 4(%eax) points to a struct -+ tlsdesc_dynamic_arg object. It must return in %eax the offset -+ between the thread pointer and the object denoted by the -+ argument, without clobbering any registers. -+ -+ The assembly code that follows is a rendition of the following -+ C code, hand-optimized a little bit. -+ -+ptrdiff_t -+__attribute__ ((__regparm__ (1))) -+_dl_tlsdesc_dynamic (struct tlsdesc *tdp) -+{ -+ struct tlsdesc_dynamic_arg *td = tdp->arg; -+ dtv_t *dtv = *(dtv_t **)((char *)__thread_pointer + DTV_OFFSET); -+ if (__builtin_expect (td->gen_count <= dtv[0].counter -+ && (dtv[td->tlsinfo.ti_module].pointer.val -+ != TLS_DTV_UNALLOCATED), -+ 1)) -+ return dtv[td->tlsinfo.ti_module].pointer.val + td->tlsinfo.ti_offset -+ - __thread_pointer; -+ -+ return ___tls_get_addr (&td->tlsinfo) - __thread_pointer; -+} -+*/ -+ cfi_startproc -+ .align 16 -+_dl_tlsdesc_dynamic: -+ /* Like all TLS resolvers, preserve call-clobbered registers. -+ We need two scratch regs anyway. */ -+ subl $32, %esp -+ cfi_adjust_cfa_offset (32) -+ movl %ecx, 20(%esp) -+ movl %edx, 24(%esp) -+ movl TLSDESC_ARG(%eax), %eax -+ movl %gs:DTV_OFFSET, %edx -+ movl TLSDESC_GEN_COUNT(%eax), %ecx -+ cmpl (%edx), %ecx -+ ja 2f -+ movl TLSDESC_MODID(%eax), %ecx -+ movl (%edx,%ecx,8), %edx -+ cmpl $-1, %edx -+ je 2f -+ movl TLSDESC_MODOFF(%eax), %eax -+ addl %edx, %eax -+1: -+ movl 20(%esp), %ecx -+ subl %gs:0, %eax -+ movl 24(%esp), %edx -+ addl $32, %esp -+ cfi_adjust_cfa_offset (-32) -+ ret -+ .p2align 4,,7 -+2: -+ cfi_adjust_cfa_offset (32) -+#if DL_RUNTIME_RESOLVE_REALIGN_STACK -+ movl %ebx, -28(%esp) -+ movl %esp, %ebx -+ cfi_def_cfa_register(%ebx) -+ and $-STATE_SAVE_ALIGNMENT, %esp -+#endif -+#ifdef REGISTER_SAVE_AREA -+ subl $REGISTER_SAVE_AREA, %esp -+# if !DL_RUNTIME_RESOLVE_REALIGN_STACK -+ cfi_adjust_cfa_offset(REGISTER_SAVE_AREA) -+# endif -+#else -+# if !DL_RUNTIME_RESOLVE_REALIGN_STACK -+# error DL_RUNTIME_RESOLVE_REALIGN_STACK must be true -+# endif -+ /* Allocate stack space of the required size to save the state. */ -+ LOAD_PIC_REG (cx) -+ subl RTLD_GLOBAL_RO_DL_X86_CPU_FEATURES_OFFSET+XSAVE_STATE_SIZE_OFFSET+_rtld_local_ro@GOTOFF(%ecx), %esp -+#endif -+#ifdef USE_FNSAVE -+ fnsave (%esp) -+#elif defined USE_FXSAVE -+ fxsave (%esp) -+#else -+ /* Save the argument for ___tls_get_addr in EAX. */ -+ movl %eax, %ecx -+ movl $TLSDESC_CALL_STATE_SAVE_MASK, %eax -+ xorl %edx, %edx -+ /* Clear the XSAVE Header. */ -+# ifdef USE_XSAVE -+ movl %edx, (512)(%esp) -+ movl %edx, (512 + 4 * 1)(%esp) -+ movl %edx, (512 + 4 * 2)(%esp) -+ movl %edx, (512 + 4 * 3)(%esp) -+# endif -+ movl %edx, (512 + 4 * 4)(%esp) -+ movl %edx, (512 + 4 * 5)(%esp) -+ movl %edx, (512 + 4 * 6)(%esp) -+ movl %edx, (512 + 4 * 7)(%esp) -+ movl %edx, (512 + 4 * 8)(%esp) -+ movl %edx, (512 + 4 * 9)(%esp) -+ movl %edx, (512 + 4 * 10)(%esp) -+ movl %edx, (512 + 4 * 11)(%esp) -+ movl %edx, (512 + 4 * 12)(%esp) -+ movl %edx, (512 + 4 * 13)(%esp) -+ movl %edx, (512 + 4 * 14)(%esp) -+ movl %edx, (512 + 4 * 15)(%esp) -+# ifdef USE_XSAVE -+ xsave (%esp) -+# else -+ xsavec (%esp) -+# endif -+ /* Restore the argument for ___tls_get_addr in EAX. */ -+ movl %ecx, %eax -+#endif -+ call HIDDEN_JUMPTARGET (___tls_get_addr) -+ /* Get register content back. */ -+#ifdef USE_FNSAVE -+ frstor (%esp) -+#elif defined USE_FXSAVE -+ fxrstor (%esp) -+#else -+ /* Save and retore ___tls_get_addr return value stored in EAX. */ -+ movl %eax, %ecx -+ movl $TLSDESC_CALL_STATE_SAVE_MASK, %eax -+ xorl %edx, %edx -+ xrstor (%esp) -+ movl %ecx, %eax -+#endif -+#if DL_RUNTIME_RESOLVE_REALIGN_STACK -+ mov %ebx, %esp -+ cfi_def_cfa_register(%esp) -+ movl -28(%esp), %ebx -+ cfi_restore(%ebx) -+#else -+ addl $REGISTER_SAVE_AREA, %esp -+ cfi_adjust_cfa_offset(-REGISTER_SAVE_AREA) -+#endif -+ jmp 1b -+ cfi_endproc -+ .size _dl_tlsdesc_dynamic, .-_dl_tlsdesc_dynamic -+ -+#undef STATE_SAVE_ALIGNMENT -diff --git a/sysdeps/i386/dl-tlsdesc.S b/sysdeps/i386/dl-tlsdesc.S -index 90d93caa0c..f002feee56 100644 ---- a/sysdeps/i386/dl-tlsdesc.S -+++ b/sysdeps/i386/dl-tlsdesc.S -@@ -18,8 +18,27 @@ - - #include - #include -+#include -+#include - #include "tlsdesc.h" - -+#ifndef DL_STACK_ALIGNMENT -+/* Due to GCC bug: -+ -+ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58066 -+ -+ __tls_get_addr may be called with 4-byte stack alignment. Although -+ this bug has been fixed in GCC 4.9.4, 5.3 and 6, we can't assume -+ that stack will be always aligned at 16 bytes. */ -+# define DL_STACK_ALIGNMENT 4 -+#endif -+ -+/* True if _dl_tlsdesc_dynamic should align stack for STATE_SAVE or align -+ stack to MINIMUM_ALIGNMENT bytes before calling ___tls_get_addr. */ -+#define DL_RUNTIME_RESOLVE_REALIGN_STACK \ -+ (STATE_SAVE_ALIGNMENT > DL_STACK_ALIGNMENT \ -+ || MINIMUM_ALIGNMENT > DL_STACK_ALIGNMENT) -+ - .text - - /* This function is used to compute the TP offset for symbols in -@@ -65,69 +84,35 @@ _dl_tlsdesc_undefweak: - .size _dl_tlsdesc_undefweak, .-_dl_tlsdesc_undefweak - - #ifdef SHARED -- .hidden _dl_tlsdesc_dynamic -- .global _dl_tlsdesc_dynamic -- .type _dl_tlsdesc_dynamic,@function -- -- /* This function is used for symbols that need dynamic TLS. -- -- %eax points to the TLS descriptor, such that 0(%eax) points to -- _dl_tlsdesc_dynamic itself, and 4(%eax) points to a struct -- tlsdesc_dynamic_arg object. It must return in %eax the offset -- between the thread pointer and the object denoted by the -- argument, without clobbering any registers. -- -- The assembly code that follows is a rendition of the following -- C code, hand-optimized a little bit. -- --ptrdiff_t --__attribute__ ((__regparm__ (1))) --_dl_tlsdesc_dynamic (struct tlsdesc *tdp) --{ -- struct tlsdesc_dynamic_arg *td = tdp->arg; -- dtv_t *dtv = *(dtv_t **)((char *)__thread_pointer + DTV_OFFSET); -- if (__builtin_expect (td->gen_count <= dtv[0].counter -- && (dtv[td->tlsinfo.ti_module].pointer.val -- != TLS_DTV_UNALLOCATED), -- 1)) -- return dtv[td->tlsinfo.ti_module].pointer.val + td->tlsinfo.ti_offset -- - __thread_pointer; -- -- return ___tls_get_addr (&td->tlsinfo) - __thread_pointer; --} --*/ -- cfi_startproc -- .align 16 --_dl_tlsdesc_dynamic: -- /* Like all TLS resolvers, preserve call-clobbered registers. -- We need two scratch regs anyway. */ -- subl $28, %esp -- cfi_adjust_cfa_offset (28) -- movl %ecx, 20(%esp) -- movl %edx, 24(%esp) -- movl TLSDESC_ARG(%eax), %eax -- movl %gs:DTV_OFFSET, %edx -- movl TLSDESC_GEN_COUNT(%eax), %ecx -- cmpl (%edx), %ecx -- ja .Lslow -- movl TLSDESC_MODID(%eax), %ecx -- movl (%edx,%ecx,8), %edx -- cmpl $-1, %edx -- je .Lslow -- movl TLSDESC_MODOFF(%eax), %eax -- addl %edx, %eax --.Lret: -- movl 20(%esp), %ecx -- subl %gs:0, %eax -- movl 24(%esp), %edx -- addl $28, %esp -- cfi_adjust_cfa_offset (-28) -- ret -- .p2align 4,,7 --.Lslow: -- cfi_adjust_cfa_offset (28) -- call HIDDEN_JUMPTARGET (___tls_get_addr) -- jmp .Lret -- cfi_endproc -- .size _dl_tlsdesc_dynamic, .-_dl_tlsdesc_dynamic -+# define USE_FNSAVE -+# define MINIMUM_ALIGNMENT 4 -+# define STATE_SAVE_ALIGNMENT 4 -+# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_fnsave -+# include "dl-tlsdesc-dynamic.h" -+# undef _dl_tlsdesc_dynamic -+# undef MINIMUM_ALIGNMENT -+# undef USE_FNSAVE -+ -+# define MINIMUM_ALIGNMENT 16 -+ -+# define USE_FXSAVE -+# define STATE_SAVE_ALIGNMENT 16 -+# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_fxsave -+# include "dl-tlsdesc-dynamic.h" -+# undef _dl_tlsdesc_dynamic -+# undef USE_FXSAVE -+ -+# define USE_XSAVE -+# define STATE_SAVE_ALIGNMENT 64 -+# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_xsave -+# include "dl-tlsdesc-dynamic.h" -+# undef _dl_tlsdesc_dynamic -+# undef USE_XSAVE -+ -+# define USE_XSAVEC -+# define STATE_SAVE_ALIGNMENT 64 -+# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_xsavec -+# include "dl-tlsdesc-dynamic.h" -+# undef _dl_tlsdesc_dynamic -+# undef USE_XSAVEC - #endif /* SHARED */ -diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile -index 4d50b327b5..992aabe43e 100644 ---- a/sysdeps/x86/Makefile -+++ b/sysdeps/x86/Makefile -@@ -1,5 +1,5 @@ - ifeq ($(subdir),csu) --gen-as-const-headers += cpu-features-offsets.sym -+gen-as-const-headers += cpu-features-offsets.sym features-offsets.sym - endif - - ifeq ($(subdir),elf) -@@ -86,6 +86,11 @@ endif - tst-ifunc-isa-2-ENV = GLIBC_TUNABLES=glibc.cpu.hwcaps=-SSE4_2,-AVX,-AVX2,-AVX512F - tst-ifunc-isa-2-static-ENV = $(tst-ifunc-isa-2-ENV) - tst-hwcap-tunables-ARGS = -- $(host-test-program-cmd) -+ -+CFLAGS-tst-gnu2-tls2.c += -msse -+CFLAGS-tst-gnu2-tls2mod0.c += -msse2 -mtune=haswell -+CFLAGS-tst-gnu2-tls2mod1.c += -msse2 -mtune=haswell -+CFLAGS-tst-gnu2-tls2mod2.c += -msse2 -mtune=haswell - endif - - ifeq ($(subdir),math) -diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c -index 25e6622a79..835113b42f 100644 ---- a/sysdeps/x86/cpu-features.c -+++ b/sysdeps/x86/cpu-features.c -@@ -27,8 +27,13 @@ - extern void TUNABLE_CALLBACK (set_hwcaps) (tunable_val_t *) - attribute_hidden; - --#if defined SHARED && defined __x86_64__ --# include -+#if defined SHARED -+extern void _dl_tlsdesc_dynamic_fxsave (void) attribute_hidden; -+extern void _dl_tlsdesc_dynamic_xsave (void) attribute_hidden; -+extern void _dl_tlsdesc_dynamic_xsavec (void) attribute_hidden; -+ -+# ifdef __x86_64__ -+# include - - static void - TUNABLE_CALLBACK (set_plt_rewrite) (tunable_val_t *valp) -@@ -47,6 +52,15 @@ TUNABLE_CALLBACK (set_plt_rewrite) (tunable_val_t *valp) - : plt_rewrite_jmp); - } - } -+# else -+extern void _dl_tlsdesc_dynamic_fnsave (void) attribute_hidden; -+# endif -+#endif -+ -+#ifdef __x86_64__ -+extern void _dl_runtime_resolve_fxsave (void) attribute_hidden; -+extern void _dl_runtime_resolve_xsave (void) attribute_hidden; -+extern void _dl_runtime_resolve_xsavec (void) attribute_hidden; - #endif - - #ifdef __LP64__ -@@ -1130,6 +1144,44 @@ no_cpuid: - TUNABLE_CALLBACK (set_x86_shstk)); - #endif - -+ if (GLRO(dl_x86_cpu_features).xsave_state_size != 0) -+ { -+ if (CPU_FEATURE_USABLE_P (cpu_features, XSAVEC)) -+ { -+#ifdef __x86_64__ -+ GLRO(dl_x86_64_runtime_resolve) = _dl_runtime_resolve_xsavec; -+#endif -+#ifdef SHARED -+ GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_xsavec; -+#endif -+ } -+ else -+ { -+#ifdef __x86_64__ -+ GLRO(dl_x86_64_runtime_resolve) = _dl_runtime_resolve_xsave; -+#endif -+#ifdef SHARED -+ GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_xsave; -+#endif -+ } -+ } -+ else -+ { -+#ifdef __x86_64__ -+ GLRO(dl_x86_64_runtime_resolve) = _dl_runtime_resolve_fxsave; -+# ifdef SHARED -+ GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fxsave; -+# endif -+#else -+# ifdef SHARED -+ if (CPU_FEATURE_USABLE_P (cpu_features, FXSR)) -+ GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fxsave; -+ else -+ GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fnsave; -+# endif -+#endif -+ } -+ - #ifdef SHARED - # ifdef __x86_64__ - TUNABLE_GET (plt_rewrite, tunable_val_t *, -diff --git a/sysdeps/x86/dl-procinfo.c b/sysdeps/x86/dl-procinfo.c -index ee957b4d70..5920d4b320 100644 ---- a/sysdeps/x86/dl-procinfo.c -+++ b/sysdeps/x86/dl-procinfo.c -@@ -86,3 +86,19 @@ PROCINFO_CLASS const char _dl_x86_platforms[4][9] - #else - , - #endif -+ -+#if defined SHARED && !IS_IN (ldconfig) -+# if !defined PROCINFO_DECL -+ ._dl_x86_tlsdesc_dynamic -+# else -+PROCINFO_CLASS void * _dl_x86_tlsdesc_dynamic -+# endif -+# ifndef PROCINFO_DECL -+= NULL -+# endif -+# ifdef PROCINFO_DECL -+; -+# else -+, -+# endif -+#endif -diff --git a/sysdeps/x86_64/features-offsets.sym b/sysdeps/x86/features-offsets.sym -similarity index 89% -rename from sysdeps/x86_64/features-offsets.sym -rename to sysdeps/x86/features-offsets.sym -index 9e4be3393a..77e990c705 100644 ---- a/sysdeps/x86_64/features-offsets.sym -+++ b/sysdeps/x86/features-offsets.sym -@@ -3,4 +3,6 @@ - #include - - RTLD_GLOBAL_RO_DL_X86_CPU_FEATURES_OFFSET offsetof (struct rtld_global_ro, _dl_x86_cpu_features) -+#ifdef __x86_64__ - RTLD_GLOBAL_DL_X86_FEATURE_1_OFFSET offsetof (struct rtld_global, _dl_x86_feature_1) -+#endif -diff --git a/sysdeps/x86/sysdep.h b/sysdeps/x86/sysdep.h -index 837fd28734..485cad9c02 100644 ---- a/sysdeps/x86/sysdep.h -+++ b/sysdeps/x86/sysdep.h -@@ -70,6 +70,12 @@ - | (1 << X86_XSTATE_ZMM_H_ID)) - #endif - -+/* States which should be saved for TLSDESC_CALL and TLS_DESC_CALL. -+ Compiler assumes that all registers, including x87 FPU stack registers, -+ are unchanged after CALL, except for EFLAGS and RAX/EAX. */ -+#define TLSDESC_CALL_STATE_SAVE_MASK \ -+ (STATE_SAVE_MASK | (1 << X86_XSTATE_X87_ID)) -+ - /* Constants for bits in __x86_string_control: */ - - /* Avoid short distance REP MOVSB. */ -diff --git a/sysdeps/x86/tst-gnu2-tls2.c b/sysdeps/x86/tst-gnu2-tls2.c -new file mode 100644 -index 0000000000..de900a423b ---- /dev/null -+++ b/sysdeps/x86/tst-gnu2-tls2.c -@@ -0,0 +1,20 @@ -+#ifndef __x86_64__ -+#include -+ -+#define IS_SUPPORTED() CPU_FEATURE_ACTIVE (SSE2) -+#endif -+ -+/* Clear XMM0...XMM7 */ -+#define PREPARE_MALLOC() \ -+{ \ -+ asm volatile ("xorps %%xmm0, %%xmm0" : : : "xmm0" ); \ -+ asm volatile ("xorps %%xmm1, %%xmm1" : : : "xmm1" ); \ -+ asm volatile ("xorps %%xmm2, %%xmm2" : : : "xmm2" ); \ -+ asm volatile ("xorps %%xmm3, %%xmm3" : : : "xmm3" ); \ -+ asm volatile ("xorps %%xmm4, %%xmm4" : : : "xmm4" ); \ -+ asm volatile ("xorps %%xmm5, %%xmm5" : : : "xmm5" ); \ -+ asm volatile ("xorps %%xmm6, %%xmm6" : : : "xmm6" ); \ -+ asm volatile ("xorps %%xmm7, %%xmm7" : : : "xmm7" ); \ -+} -+ -+#include -diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile -index 90f4ecfd26..e8babc9a4e 100644 ---- a/sysdeps/x86_64/Makefile -+++ b/sysdeps/x86_64/Makefile -@@ -10,7 +10,7 @@ LDFLAGS-rtld += -Wl,-z,nomark-plt - endif - - ifeq ($(subdir),csu) --gen-as-const-headers += features-offsets.sym link-defines.sym -+gen-as-const-headers += link-defines.sym - endif - - ifeq ($(subdir),gmon) -diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h -index 6d605d0d32..ff5d45f7cb 100644 ---- a/sysdeps/x86_64/dl-machine.h -+++ b/sysdeps/x86_64/dl-machine.h -@@ -71,9 +71,6 @@ elf_machine_runtime_setup (struct link_map *l, struct r_scope_elem *scope[], - int lazy, int profile) - { - Elf64_Addr *got; -- extern void _dl_runtime_resolve_fxsave (ElfW(Word)) attribute_hidden; -- extern void _dl_runtime_resolve_xsave (ElfW(Word)) attribute_hidden; -- extern void _dl_runtime_resolve_xsavec (ElfW(Word)) attribute_hidden; - extern void _dl_runtime_profile_sse (ElfW(Word)) attribute_hidden; - extern void _dl_runtime_profile_avx (ElfW(Word)) attribute_hidden; - extern void _dl_runtime_profile_avx512 (ElfW(Word)) attribute_hidden; -@@ -96,8 +93,6 @@ elf_machine_runtime_setup (struct link_map *l, struct r_scope_elem *scope[], - /* Identify this shared object. */ - *(ElfW(Addr) *) (got + 1) = (ElfW(Addr)) l; - -- const struct cpu_features* cpu_features = __get_cpu_features (); -- - #ifdef SHARED - /* The got[2] entry contains the address of a function which gets - called to get the address of a so far unresolved function and -@@ -107,6 +102,7 @@ elf_machine_runtime_setup (struct link_map *l, struct r_scope_elem *scope[], - end in this function. */ - if (__glibc_unlikely (profile)) - { -+ const struct cpu_features* cpu_features = __get_cpu_features (); - if (X86_ISA_CPU_FEATURE_USABLE_P (cpu_features, AVX512F)) - *(ElfW(Addr) *) (got + 2) = (ElfW(Addr)) &_dl_runtime_profile_avx512; - else if (X86_ISA_CPU_FEATURE_USABLE_P (cpu_features, AVX)) -@@ -126,15 +122,8 @@ elf_machine_runtime_setup (struct link_map *l, struct r_scope_elem *scope[], - /* This function will get called to fix up the GOT entry - indicated by the offset on the stack, and then jump to - the resolved address. */ -- if (MINIMUM_X86_ISA_LEVEL >= AVX_X86_ISA_LEVEL -- || GLRO(dl_x86_cpu_features).xsave_state_size != 0) -- *(ElfW(Addr) *) (got + 2) -- = (CPU_FEATURE_USABLE_P (cpu_features, XSAVEC) -- ? (ElfW(Addr)) &_dl_runtime_resolve_xsavec -- : (ElfW(Addr)) &_dl_runtime_resolve_xsave); -- else -- *(ElfW(Addr) *) (got + 2) -- = (ElfW(Addr)) &_dl_runtime_resolve_fxsave; -+ *(ElfW(Addr) *) (got + 2) -+ = (ElfW(Addr)) GLRO(dl_x86_64_runtime_resolve); - } - } - -@@ -383,7 +372,7 @@ and creates an unsatisfiable circular dependency.\n", - { - td->arg = _dl_make_tlsdesc_dynamic - (sym_map, sym->st_value + reloc->r_addend); -- td->entry = _dl_tlsdesc_dynamic; -+ td->entry = GLRO(dl_x86_tlsdesc_dynamic); - } - else - # endif -diff --git a/sysdeps/x86_64/dl-procinfo.c b/sysdeps/x86_64/dl-procinfo.c -index 4d1d790fbb..06637a8154 100644 ---- a/sysdeps/x86_64/dl-procinfo.c -+++ b/sysdeps/x86_64/dl-procinfo.c -@@ -41,5 +41,21 @@ - - #include - -+#if !IS_IN (ldconfig) -+# if !defined PROCINFO_DECL && defined SHARED -+ ._dl_x86_64_runtime_resolve -+# else -+PROCINFO_CLASS void * _dl_x86_64_runtime_resolve -+# endif -+# ifndef PROCINFO_DECL -+= NULL -+# endif -+# if !defined SHARED || defined PROCINFO_DECL -+; -+# else -+, -+# endif -+#endif -+ - #undef PROCINFO_DECL - #undef PROCINFO_CLASS -diff --git a/sysdeps/x86_64/dl-tlsdesc-dynamic.h b/sysdeps/x86_64/dl-tlsdesc-dynamic.h -new file mode 100644 -index 0000000000..0c2e8d5320 ---- /dev/null -+++ b/sysdeps/x86_64/dl-tlsdesc-dynamic.h -@@ -0,0 +1,166 @@ -+/* Thread-local storage handling in the ELF dynamic linker. x86_64 version. -+ Copyright (C) 2004-2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#ifndef SECTION -+# define SECTION(p) p -+#endif -+ -+#undef REGISTER_SAVE_AREA -+#undef LOCAL_STORAGE_AREA -+#undef BASE -+ -+#include "dl-trampoline-state.h" -+ -+ .section SECTION(.text),"ax",@progbits -+ -+ .hidden _dl_tlsdesc_dynamic -+ .global _dl_tlsdesc_dynamic -+ .type _dl_tlsdesc_dynamic,@function -+ -+ /* %rax points to the TLS descriptor, such that 0(%rax) points to -+ _dl_tlsdesc_dynamic itself, and 8(%rax) points to a struct -+ tlsdesc_dynamic_arg object. It must return in %rax the offset -+ between the thread pointer and the object denoted by the -+ argument, without clobbering any registers. -+ -+ The assembly code that follows is a rendition of the following -+ C code, hand-optimized a little bit. -+ -+ptrdiff_t -+_dl_tlsdesc_dynamic (register struct tlsdesc *tdp asm ("%rax")) -+{ -+ struct tlsdesc_dynamic_arg *td = tdp->arg; -+ dtv_t *dtv = *(dtv_t **)((char *)__thread_pointer + DTV_OFFSET); -+ if (__builtin_expect (td->gen_count <= dtv[0].counter -+ && (dtv[td->tlsinfo.ti_module].pointer.val -+ != TLS_DTV_UNALLOCATED), -+ 1)) -+ return dtv[td->tlsinfo.ti_module].pointer.val + td->tlsinfo.ti_offset -+ - __thread_pointer; -+ -+ return __tls_get_addr_internal (&td->tlsinfo) - __thread_pointer; -+} -+*/ -+ cfi_startproc -+ .align 16 -+_dl_tlsdesc_dynamic: -+ _CET_ENDBR -+ /* Preserve call-clobbered registers that we modify. -+ We need two scratch regs anyway. */ -+ movq %rsi, -16(%rsp) -+ mov %fs:DTV_OFFSET, %RSI_LP -+ movq %rdi, -8(%rsp) -+ movq TLSDESC_ARG(%rax), %rdi -+ movq (%rsi), %rax -+ cmpq %rax, TLSDESC_GEN_COUNT(%rdi) -+ ja 2f -+ movq TLSDESC_MODID(%rdi), %rax -+ salq $4, %rax -+ movq (%rax,%rsi), %rax -+ cmpq $-1, %rax -+ je 2f -+ addq TLSDESC_MODOFF(%rdi), %rax -+1: -+ movq -16(%rsp), %rsi -+ sub %fs:0, %RAX_LP -+ movq -8(%rsp), %rdi -+ ret -+2: -+#if DL_RUNTIME_RESOLVE_REALIGN_STACK -+ movq %rbx, -24(%rsp) -+ mov %RSP_LP, %RBX_LP -+ cfi_def_cfa_register(%rbx) -+ and $-STATE_SAVE_ALIGNMENT, %RSP_LP -+#endif -+#ifdef REGISTER_SAVE_AREA -+# if DL_RUNTIME_RESOLVE_REALIGN_STACK -+ /* STATE_SAVE_OFFSET has space for 8 integer registers. But we -+ need space for RCX, RDX, RSI, RDI, R8, R9, R10 and R11, plus -+ RBX above. */ -+ sub $(REGISTER_SAVE_AREA + STATE_SAVE_ALIGNMENT), %RSP_LP -+# else -+ sub $REGISTER_SAVE_AREA, %RSP_LP -+ cfi_adjust_cfa_offset(REGISTER_SAVE_AREA) -+# endif -+#else -+ /* Allocate stack space of the required size to save the state. */ -+ sub _rtld_local_ro+RTLD_GLOBAL_RO_DL_X86_CPU_FEATURES_OFFSET+XSAVE_STATE_SIZE_OFFSET(%rip), %RSP_LP -+#endif -+ /* Besides rdi and rsi, saved above, save rcx, rdx, r8, r9, -+ r10 and r11. */ -+ movq %rcx, REGISTER_SAVE_RCX(%rsp) -+ movq %rdx, REGISTER_SAVE_RDX(%rsp) -+ movq %r8, REGISTER_SAVE_R8(%rsp) -+ movq %r9, REGISTER_SAVE_R9(%rsp) -+ movq %r10, REGISTER_SAVE_R10(%rsp) -+ movq %r11, REGISTER_SAVE_R11(%rsp) -+#ifdef USE_FXSAVE -+ fxsave STATE_SAVE_OFFSET(%rsp) -+#else -+ movl $TLSDESC_CALL_STATE_SAVE_MASK, %eax -+ xorl %edx, %edx -+ /* Clear the XSAVE Header. */ -+# ifdef USE_XSAVE -+ movq %rdx, (STATE_SAVE_OFFSET + 512)(%rsp) -+ movq %rdx, (STATE_SAVE_OFFSET + 512 + 8)(%rsp) -+# endif -+ movq %rdx, (STATE_SAVE_OFFSET + 512 + 8 * 2)(%rsp) -+ movq %rdx, (STATE_SAVE_OFFSET + 512 + 8 * 3)(%rsp) -+ movq %rdx, (STATE_SAVE_OFFSET + 512 + 8 * 4)(%rsp) -+ movq %rdx, (STATE_SAVE_OFFSET + 512 + 8 * 5)(%rsp) -+ movq %rdx, (STATE_SAVE_OFFSET + 512 + 8 * 6)(%rsp) -+ movq %rdx, (STATE_SAVE_OFFSET + 512 + 8 * 7)(%rsp) -+# ifdef USE_XSAVE -+ xsave STATE_SAVE_OFFSET(%rsp) -+# else -+ xsavec STATE_SAVE_OFFSET(%rsp) -+# endif -+#endif -+ /* %rdi already points to the tlsinfo data structure. */ -+ call HIDDEN_JUMPTARGET (__tls_get_addr) -+ # Get register content back. -+#ifdef USE_FXSAVE -+ fxrstor STATE_SAVE_OFFSET(%rsp) -+#else -+ /* Save and retore __tls_get_addr return value stored in RAX. */ -+ mov %RAX_LP, %RCX_LP -+ movl $TLSDESC_CALL_STATE_SAVE_MASK, %eax -+ xorl %edx, %edx -+ xrstor STATE_SAVE_OFFSET(%rsp) -+ mov %RCX_LP, %RAX_LP -+#endif -+ movq REGISTER_SAVE_R11(%rsp), %r11 -+ movq REGISTER_SAVE_R10(%rsp), %r10 -+ movq REGISTER_SAVE_R9(%rsp), %r9 -+ movq REGISTER_SAVE_R8(%rsp), %r8 -+ movq REGISTER_SAVE_RDX(%rsp), %rdx -+ movq REGISTER_SAVE_RCX(%rsp), %rcx -+#if DL_RUNTIME_RESOLVE_REALIGN_STACK -+ mov %RBX_LP, %RSP_LP -+ cfi_def_cfa_register(%rsp) -+ movq -24(%rsp), %rbx -+ cfi_restore(%rbx) -+#else -+ add $REGISTER_SAVE_AREA, %RSP_LP -+ cfi_adjust_cfa_offset(-REGISTER_SAVE_AREA) -+#endif -+ jmp 1b -+ cfi_endproc -+ .size _dl_tlsdesc_dynamic, .-_dl_tlsdesc_dynamic -+ -+#undef STATE_SAVE_ALIGNMENT -diff --git a/sysdeps/x86_64/dl-tlsdesc.S b/sysdeps/x86_64/dl-tlsdesc.S -index f748af2ece..ea69f5223a 100644 ---- a/sysdeps/x86_64/dl-tlsdesc.S -+++ b/sysdeps/x86_64/dl-tlsdesc.S -@@ -18,7 +18,19 @@ - - #include - #include -+#include -+#include - #include "tlsdesc.h" -+#include "dl-trampoline-save.h" -+ -+/* Area on stack to save and restore registers used for parameter -+ passing when calling _dl_tlsdesc_dynamic. */ -+#define REGISTER_SAVE_RCX 0 -+#define REGISTER_SAVE_RDX (REGISTER_SAVE_RCX + 8) -+#define REGISTER_SAVE_R8 (REGISTER_SAVE_RDX + 8) -+#define REGISTER_SAVE_R9 (REGISTER_SAVE_R8 + 8) -+#define REGISTER_SAVE_R10 (REGISTER_SAVE_R9 + 8) -+#define REGISTER_SAVE_R11 (REGISTER_SAVE_R10 + 8) - - .text - -@@ -67,80 +79,24 @@ _dl_tlsdesc_undefweak: - .size _dl_tlsdesc_undefweak, .-_dl_tlsdesc_undefweak - - #ifdef SHARED -- .hidden _dl_tlsdesc_dynamic -- .global _dl_tlsdesc_dynamic -- .type _dl_tlsdesc_dynamic,@function -- -- /* %rax points to the TLS descriptor, such that 0(%rax) points to -- _dl_tlsdesc_dynamic itself, and 8(%rax) points to a struct -- tlsdesc_dynamic_arg object. It must return in %rax the offset -- between the thread pointer and the object denoted by the -- argument, without clobbering any registers. -- -- The assembly code that follows is a rendition of the following -- C code, hand-optimized a little bit. -- --ptrdiff_t --_dl_tlsdesc_dynamic (register struct tlsdesc *tdp asm ("%rax")) --{ -- struct tlsdesc_dynamic_arg *td = tdp->arg; -- dtv_t *dtv = *(dtv_t **)((char *)__thread_pointer + DTV_OFFSET); -- if (__builtin_expect (td->gen_count <= dtv[0].counter -- && (dtv[td->tlsinfo.ti_module].pointer.val -- != TLS_DTV_UNALLOCATED), -- 1)) -- return dtv[td->tlsinfo.ti_module].pointer.val + td->tlsinfo.ti_offset -- - __thread_pointer; -- -- return __tls_get_addr_internal (&td->tlsinfo) - __thread_pointer; --} --*/ -- cfi_startproc -- .align 16 --_dl_tlsdesc_dynamic: -- _CET_ENDBR -- /* Preserve call-clobbered registers that we modify. -- We need two scratch regs anyway. */ -- movq %rsi, -16(%rsp) -- mov %fs:DTV_OFFSET, %RSI_LP -- movq %rdi, -8(%rsp) -- movq TLSDESC_ARG(%rax), %rdi -- movq (%rsi), %rax -- cmpq %rax, TLSDESC_GEN_COUNT(%rdi) -- ja .Lslow -- movq TLSDESC_MODID(%rdi), %rax -- salq $4, %rax -- movq (%rax,%rsi), %rax -- cmpq $-1, %rax -- je .Lslow -- addq TLSDESC_MODOFF(%rdi), %rax --.Lret: -- movq -16(%rsp), %rsi -- sub %fs:0, %RAX_LP -- movq -8(%rsp), %rdi -- ret --.Lslow: -- /* Besides rdi and rsi, saved above, save rdx, rcx, r8, r9, -- r10 and r11. Also, align the stack, that's off by 8 bytes. */ -- subq $72, %rsp -- cfi_adjust_cfa_offset (72) -- movq %rdx, 8(%rsp) -- movq %rcx, 16(%rsp) -- movq %r8, 24(%rsp) -- movq %r9, 32(%rsp) -- movq %r10, 40(%rsp) -- movq %r11, 48(%rsp) -- /* %rdi already points to the tlsinfo data structure. */ -- call HIDDEN_JUMPTARGET (__tls_get_addr) -- movq 8(%rsp), %rdx -- movq 16(%rsp), %rcx -- movq 24(%rsp), %r8 -- movq 32(%rsp), %r9 -- movq 40(%rsp), %r10 -- movq 48(%rsp), %r11 -- addq $72, %rsp -- cfi_adjust_cfa_offset (-72) -- jmp .Lret -- cfi_endproc -- .size _dl_tlsdesc_dynamic, .-_dl_tlsdesc_dynamic -+# define USE_FXSAVE -+# define STATE_SAVE_ALIGNMENT 16 -+# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_fxsave -+# include "dl-tlsdesc-dynamic.h" -+# undef _dl_tlsdesc_dynamic -+# undef USE_FXSAVE -+ -+# define USE_XSAVE -+# define STATE_SAVE_ALIGNMENT 64 -+# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_xsave -+# include "dl-tlsdesc-dynamic.h" -+# undef _dl_tlsdesc_dynamic -+# undef USE_XSAVE -+ -+# define USE_XSAVEC -+# define STATE_SAVE_ALIGNMENT 64 -+# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_xsavec -+# include "dl-tlsdesc-dynamic.h" -+# undef _dl_tlsdesc_dynamic -+# undef USE_XSAVEC - #endif /* SHARED */ -diff --git a/sysdeps/x86_64/dl-trampoline-save.h b/sysdeps/x86_64/dl-trampoline-save.h -new file mode 100644 -index 0000000000..84eac4a8ac ---- /dev/null -+++ b/sysdeps/x86_64/dl-trampoline-save.h -@@ -0,0 +1,34 @@ -+/* x86-64 PLT trampoline register save macros. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#ifndef DL_STACK_ALIGNMENT -+/* Due to GCC bug: -+ -+ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58066 -+ -+ __tls_get_addr may be called with 8-byte stack alignment. Although -+ this bug has been fixed in GCC 4.9.4, 5.3 and 6, we can't assume -+ that stack will be always aligned at 16 bytes. */ -+# define DL_STACK_ALIGNMENT 8 -+#endif -+ -+/* True if _dl_runtime_resolve should align stack for STATE_SAVE or align -+ stack to 16 bytes before calling _dl_fixup. */ -+#define DL_RUNTIME_RESOLVE_REALIGN_STACK \ -+ (STATE_SAVE_ALIGNMENT > DL_STACK_ALIGNMENT \ -+ || 16 > DL_STACK_ALIGNMENT) -diff --git a/sysdeps/x86_64/dl-trampoline-state.h b/sysdeps/x86_64/dl-trampoline-state.h -new file mode 100644 -index 0000000000..575f120797 ---- /dev/null -+++ b/sysdeps/x86_64/dl-trampoline-state.h -@@ -0,0 +1,51 @@ -+/* x86-64 PLT dl-trampoline state macros. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#if (STATE_SAVE_ALIGNMENT % 16) != 0 -+# error STATE_SAVE_ALIGNMENT must be multiple of 16 -+#endif -+ -+#if (STATE_SAVE_OFFSET % STATE_SAVE_ALIGNMENT) != 0 -+# error STATE_SAVE_OFFSET must be multiple of STATE_SAVE_ALIGNMENT -+#endif -+ -+#if DL_RUNTIME_RESOLVE_REALIGN_STACK -+/* Local stack area before jumping to function address: RBX. */ -+# define LOCAL_STORAGE_AREA 8 -+# define BASE rbx -+# ifdef USE_FXSAVE -+/* Use fxsave to save XMM registers. */ -+# define REGISTER_SAVE_AREA (512 + STATE_SAVE_OFFSET) -+# if (REGISTER_SAVE_AREA % 16) != 0 -+# error REGISTER_SAVE_AREA must be multiple of 16 -+# endif -+# endif -+#else -+# ifndef USE_FXSAVE -+# error USE_FXSAVE must be defined -+# endif -+/* Use fxsave to save XMM registers. */ -+# define REGISTER_SAVE_AREA (512 + STATE_SAVE_OFFSET + 8) -+/* Local stack area before jumping to function address: All saved -+ registers. */ -+# define LOCAL_STORAGE_AREA REGISTER_SAVE_AREA -+# define BASE rsp -+# if (REGISTER_SAVE_AREA % 16) != 8 -+# error REGISTER_SAVE_AREA must be odd multiple of 8 -+# endif -+#endif -diff --git a/sysdeps/x86_64/dl-trampoline.S b/sysdeps/x86_64/dl-trampoline.S -index b2e7e0f69b..87c5137837 100644 ---- a/sysdeps/x86_64/dl-trampoline.S -+++ b/sysdeps/x86_64/dl-trampoline.S -@@ -22,25 +22,7 @@ - #include - #include - #include -- --#ifndef DL_STACK_ALIGNMENT --/* Due to GCC bug: -- -- https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58066 -- -- __tls_get_addr may be called with 8-byte stack alignment. Although -- this bug has been fixed in GCC 4.9.4, 5.3 and 6, we can't assume -- that stack will be always aligned at 16 bytes. We use unaligned -- 16-byte move to load and store SSE registers, which has no penalty -- on modern processors if stack is 16-byte aligned. */ --# define DL_STACK_ALIGNMENT 8 --#endif -- --/* True if _dl_runtime_resolve should align stack for STATE_SAVE or align -- stack to 16 bytes before calling _dl_fixup. */ --#define DL_RUNTIME_RESOLVE_REALIGN_STACK \ -- (STATE_SAVE_ALIGNMENT > DL_STACK_ALIGNMENT \ -- || 16 > DL_STACK_ALIGNMENT) -+#include "dl-trampoline-save.h" - - /* Area on stack to save and restore registers used for parameter - passing when calling _dl_fixup. */ -diff --git a/sysdeps/x86_64/dl-trampoline.h b/sysdeps/x86_64/dl-trampoline.h -index f55c6ea040..d9ccfb40d4 100644 ---- a/sysdeps/x86_64/dl-trampoline.h -+++ b/sysdeps/x86_64/dl-trampoline.h -@@ -27,39 +27,7 @@ - # undef LOCAL_STORAGE_AREA - # undef BASE - --# if (STATE_SAVE_ALIGNMENT % 16) != 0 --# error STATE_SAVE_ALIGNMENT must be multiple of 16 --# endif -- --# if (STATE_SAVE_OFFSET % STATE_SAVE_ALIGNMENT) != 0 --# error STATE_SAVE_OFFSET must be multiple of STATE_SAVE_ALIGNMENT --# endif -- --# if DL_RUNTIME_RESOLVE_REALIGN_STACK --/* Local stack area before jumping to function address: RBX. */ --# define LOCAL_STORAGE_AREA 8 --# define BASE rbx --# ifdef USE_FXSAVE --/* Use fxsave to save XMM registers. */ --# define REGISTER_SAVE_AREA (512 + STATE_SAVE_OFFSET) --# if (REGISTER_SAVE_AREA % 16) != 0 --# error REGISTER_SAVE_AREA must be multiple of 16 --# endif --# endif --# else --# ifndef USE_FXSAVE --# error USE_FXSAVE must be defined --# endif --/* Use fxsave to save XMM registers. */ --# define REGISTER_SAVE_AREA (512 + STATE_SAVE_OFFSET + 8) --/* Local stack area before jumping to function address: All saved -- registers. */ --# define LOCAL_STORAGE_AREA REGISTER_SAVE_AREA --# define BASE rsp --# if (REGISTER_SAVE_AREA % 16) != 8 --# error REGISTER_SAVE_AREA must be odd multiple of 8 --# endif --# endif -+# include "dl-trampoline-state.h" - - .globl _dl_runtime_resolve - .hidden _dl_runtime_resolve - -commit 853e915fdd6ae6c5f1a7a68d2594ec8dbfef1286 -Author: H.J. Lu -Date: Wed Feb 28 12:08:03 2024 -0800 - - x86-64: Update _dl_tlsdesc_dynamic to preserve AMX registers - - _dl_tlsdesc_dynamic should also preserve AMX registers which are - caller-saved. Add X86_XSTATE_TILECFG_ID and X86_XSTATE_TILEDATA_ID - to x86-64 TLSDESC_CALL_STATE_SAVE_MASK. Compute the AMX state size - and save it in xsave_state_full_size which is only used by - _dl_tlsdesc_dynamic_xsave and _dl_tlsdesc_dynamic_xsavec. This fixes - the AMX part of BZ #31372. Tested on AMX processor. - - AMX test is enabled only for compilers with the fix for - - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114098 - - GCC 14 and GCC 11/12/13 branches have the bug fix. - Reviewed-by: Sunil K Pandey - - (cherry picked from commit 9b7091415af47082664717210ac49d51551456ab) - -diff --git a/sysdeps/unix/sysv/linux/x86_64/Makefile b/sysdeps/unix/sysv/linux/x86_64/Makefile -index 4223feb95f..9a1e7aa646 100644 ---- a/sysdeps/unix/sysv/linux/x86_64/Makefile -+++ b/sysdeps/unix/sysv/linux/x86_64/Makefile -@@ -63,6 +63,33 @@ $(objpfx)libx86-64-isa-level%.os: $(..)/sysdeps/unix/sysv/linux/x86_64/x86-64-is - $(objpfx)libx86-64-isa-level.so: $(objpfx)libx86-64-isa-level-1.so - cp $< $@ - endif -+ -+ifeq (yes,$(have-mamx-tile)) -+tests += \ -+ tst-gnu2-tls2-amx \ -+# tests -+ -+modules-names += \ -+ tst-gnu2-tls2-amx-mod0 \ -+ tst-gnu2-tls2-amx-mod1 \ -+ tst-gnu2-tls2-amx-mod2 \ -+# modules-names -+ -+$(objpfx)tst-gnu2-tls2-amx: $(shared-thread-library) -+$(objpfx)tst-gnu2-tls2-amx.out: \ -+ $(objpfx)tst-gnu2-tls2-amx-mod0.so \ -+ $(objpfx)tst-gnu2-tls2-amx-mod1.so \ -+ $(objpfx)tst-gnu2-tls2-amx-mod2.so -+$(objpfx)tst-gnu2-tls2-amx-mod0.so: $(libsupport) -+$(objpfx)tst-gnu2-tls2-amx-mod1.so: $(libsupport) -+$(objpfx)tst-gnu2-tls2-amx-mod2.so: $(libsupport) -+ -+CFLAGS-tst-gnu2-tls2-amx.c += -mamx-tile -+CFLAGS-tst-gnu2-tls2-amx-mod0.c += -mamx-tile -mtls-dialect=gnu2 -+CFLAGS-tst-gnu2-tls2-amx-mod1.c += -mamx-tile -mtls-dialect=gnu2 -+CFLAGS-tst-gnu2-tls2-amx-mod2.c += -mamx-tile -mtls-dialect=gnu2 -+endif -+ - endif # $(subdir) == elf - - ifneq ($(enable-cet),no) -diff --git a/sysdeps/unix/sysv/linux/x86_64/include/asm/prctl.h b/sysdeps/unix/sysv/linux/x86_64/include/asm/prctl.h -index 2f511321ad..ef4631bf4b 100644 ---- a/sysdeps/unix/sysv/linux/x86_64/include/asm/prctl.h -+++ b/sysdeps/unix/sysv/linux/x86_64/include/asm/prctl.h -@@ -20,3 +20,8 @@ - # define ARCH_SHSTK_SHSTK 0x1 - # define ARCH_SHSTK_WRSS 0x2 - #endif -+ -+#ifndef ARCH_GET_XCOMP_PERM -+# define ARCH_GET_XCOMP_PERM 0x1022 -+# define ARCH_REQ_XCOMP_PERM 0x1023 -+#endif -diff --git a/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod0.c b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod0.c -new file mode 100644 -index 0000000000..2e0c7b91b7 ---- /dev/null -+++ b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod0.c -@@ -0,0 +1,2 @@ -+#include "tst-gnu2-tls2-amx.h" -+#include -diff --git a/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod1.c b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod1.c -new file mode 100644 -index 0000000000..b8a8ccf1c1 ---- /dev/null -+++ b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod1.c -@@ -0,0 +1,2 @@ -+#include "tst-gnu2-tls2-amx.h" -+#include -diff --git a/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod2.c b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod2.c -new file mode 100644 -index 0000000000..cdf4a8f363 ---- /dev/null -+++ b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod2.c -@@ -0,0 +1,2 @@ -+#include "tst-gnu2-tls2-amx.h" -+#include -diff --git a/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx.c b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx.c -new file mode 100644 -index 0000000000..ae4dd82556 ---- /dev/null -+++ b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx.c -@@ -0,0 +1,83 @@ -+/* Test TLSDESC relocation with AMX. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#include -+#include -+#include -+#include "tst-gnu2-tls2-amx.h" -+ -+extern int arch_prctl (int, ...); -+ -+#define X86_XSTATE_TILECFG_ID 17 -+#define X86_XSTATE_TILEDATA_ID 18 -+ -+/* Initialize tile config. */ -+__attribute__ ((noinline, noclone)) -+static void -+init_tile_config (__tilecfg *tileinfo) -+{ -+ int i; -+ tileinfo->palette_id = 1; -+ tileinfo->start_row = 0; -+ -+ tileinfo->colsb[0] = MAX_ROWS; -+ tileinfo->rows[0] = MAX_ROWS; -+ -+ for (i = 1; i < 4; ++i) -+ { -+ tileinfo->colsb[i] = MAX_COLS; -+ tileinfo->rows[i] = MAX_ROWS; -+ } -+ -+ _tile_loadconfig (tileinfo); -+} -+ -+static bool -+enable_amx (void) -+{ -+ uint64_t bitmask; -+ if (arch_prctl (ARCH_GET_XCOMP_PERM, &bitmask) != 0) -+ return false; -+ -+ if ((bitmask & (1 << X86_XSTATE_TILECFG_ID)) == 0) -+ return false; -+ -+ if (arch_prctl (ARCH_REQ_XCOMP_PERM, X86_XSTATE_TILEDATA_ID) != 0) -+ return false; -+ -+ /* Load tile configuration. */ -+ __tilecfg tile_data = { 0 }; -+ init_tile_config (&tile_data); -+ -+ return true; -+} -+ -+/* An architecture can define it to clobber caller-saved registers in -+ malloc below to verify that the implicit TLSDESC call won't change -+ caller-saved registers. */ -+static void -+clear_tile_register (void) -+{ -+ _tile_zero (2); -+} -+ -+#define MOD(i) "tst-gnu2-tls2-amx-mod" #i ".so" -+#define IS_SUPPORTED() enable_amx () -+#define PREPARE_MALLOC() clear_tile_register () -+ -+#include -diff --git a/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx.h b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx.h -new file mode 100644 -index 0000000000..1845a3caba ---- /dev/null -+++ b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx.h -@@ -0,0 +1,63 @@ -+/* Test TLSDESC relocation with AMX. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#include -+#include -+#include -+#include -+ -+#define MAX_ROWS 16 -+#define MAX_COLS 64 -+#define MAX 1024 -+#define STRIDE 64 -+ -+typedef struct __tile_config -+{ -+ uint8_t palette_id; -+ uint8_t start_row; -+ uint8_t reserved_0[14]; -+ uint16_t colsb[16]; -+ uint8_t rows[16]; -+} __tilecfg __attribute__ ((aligned (64))); -+ -+/* Initialize int8_t buffer */ -+static inline void -+init_buffer (int8_t *buf, int8_t value) -+{ -+ int rows, colsb, i, j; -+ rows = MAX_ROWS; -+ colsb = MAX_COLS; -+ -+ for (i = 0; i < rows; i++) -+ for (j = 0; j < colsb; j++) -+ buf[i * colsb + j] = value; -+} -+ -+#define BEFORE_TLSDESC_CALL() \ -+ int8_t src[MAX]; \ -+ int8_t res[MAX]; \ -+ /* Initialize src with data */ \ -+ init_buffer (src, 2); \ -+ /* Load tile rows from memory. */ \ -+ _tile_loadd (2, src, STRIDE); -+ -+#define AFTER_TLSDESC_CALL() \ -+ /* Store the tile data to memory. */ \ -+ _tile_stored (2, res, STRIDE); \ -+ _tile_release (); \ -+ TEST_VERIFY_EXIT (memcmp (src, res, sizeof (res)) == 0); -diff --git a/sysdeps/x86/cpu-features-offsets.sym b/sysdeps/x86/cpu-features-offsets.sym -index 6a8fd29813..21fc88d651 100644 ---- a/sysdeps/x86/cpu-features-offsets.sym -+++ b/sysdeps/x86/cpu-features-offsets.sym -@@ -3,3 +3,4 @@ - #include - - XSAVE_STATE_SIZE_OFFSET offsetof (struct cpu_features, xsave_state_size) -+XSAVE_STATE_FULL_SIZE_OFFSET offsetof (struct cpu_features, xsave_state_full_size) -diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c -index 835113b42f..d71e8d3d2e 100644 ---- a/sysdeps/x86/cpu-features.c -+++ b/sysdeps/x86/cpu-features.c -@@ -307,6 +307,8 @@ update_active (struct cpu_features *cpu_features) - __cpuid_count (0xd, 0, eax, ebx, ecx, edx); - if (ebx != 0) - { -+ /* NB: On AMX capable processors, ebx always includes AMX -+ states. */ - unsigned int xsave_state_full_size - = ALIGN_UP (ebx + STATE_SAVE_OFFSET, 64); - -@@ -320,6 +322,11 @@ update_active (struct cpu_features *cpu_features) - { - unsigned int xstate_comp_offsets[32]; - unsigned int xstate_comp_sizes[32]; -+#ifdef __x86_64__ -+ unsigned int xstate_amx_comp_offsets[32]; -+ unsigned int xstate_amx_comp_sizes[32]; -+ unsigned int amx_ecx; -+#endif - unsigned int i; - - xstate_comp_offsets[0] = 0; -@@ -327,16 +334,39 @@ update_active (struct cpu_features *cpu_features) - xstate_comp_offsets[2] = 576; - xstate_comp_sizes[0] = 160; - xstate_comp_sizes[1] = 256; -+#ifdef __x86_64__ -+ xstate_amx_comp_offsets[0] = 0; -+ xstate_amx_comp_offsets[1] = 160; -+ xstate_amx_comp_offsets[2] = 576; -+ xstate_amx_comp_sizes[0] = 160; -+ xstate_amx_comp_sizes[1] = 256; -+#endif - - for (i = 2; i < 32; i++) - { -- if ((STATE_SAVE_MASK & (1 << i)) != 0) -+ if ((FULL_STATE_SAVE_MASK & (1 << i)) != 0) - { - __cpuid_count (0xd, i, eax, ebx, ecx, edx); -- xstate_comp_sizes[i] = eax; -+#ifdef __x86_64__ -+ /* Include this in xsave_state_full_size. */ -+ amx_ecx = ecx; -+ xstate_amx_comp_sizes[i] = eax; -+ if ((AMX_STATE_SAVE_MASK & (1 << i)) != 0) -+ { -+ /* Exclude this from xsave_state_size. */ -+ ecx = 0; -+ xstate_comp_sizes[i] = 0; -+ } -+ else -+#endif -+ xstate_comp_sizes[i] = eax; - } - else - { -+#ifdef __x86_64__ -+ amx_ecx = 0; -+ xstate_amx_comp_sizes[i] = 0; -+#endif - ecx = 0; - xstate_comp_sizes[i] = 0; - } -@@ -349,6 +379,15 @@ update_active (struct cpu_features *cpu_features) - if ((ecx & (1 << 1)) != 0) - xstate_comp_offsets[i] - = ALIGN_UP (xstate_comp_offsets[i], 64); -+#ifdef __x86_64__ -+ xstate_amx_comp_offsets[i] -+ = (xstate_amx_comp_offsets[i - 1] -+ + xstate_amx_comp_sizes[i - 1]); -+ if ((amx_ecx & (1 << 1)) != 0) -+ xstate_amx_comp_offsets[i] -+ = ALIGN_UP (xstate_amx_comp_offsets[i], -+ 64); -+#endif - } - } - -@@ -357,6 +396,18 @@ update_active (struct cpu_features *cpu_features) - = xstate_comp_offsets[31] + xstate_comp_sizes[31]; - if (size) - { -+#ifdef __x86_64__ -+ unsigned int amx_size -+ = (xstate_amx_comp_offsets[31] -+ + xstate_amx_comp_sizes[31]); -+ amx_size = ALIGN_UP (amx_size + STATE_SAVE_OFFSET, -+ 64); -+ /* Set xsave_state_full_size to the compact AMX -+ state size for XSAVEC. NB: xsave_state_full_size -+ is only used in _dl_tlsdesc_dynamic_xsave and -+ _dl_tlsdesc_dynamic_xsavec. */ -+ cpu_features->xsave_state_full_size = amx_size; -+#endif - cpu_features->xsave_state_size - = ALIGN_UP (size + STATE_SAVE_OFFSET, 64); - CPU_FEATURE_SET (cpu_features, XSAVEC); -diff --git a/sysdeps/x86/include/cpu-features.h b/sysdeps/x86/include/cpu-features.h -index b9bf3115b6..cd7bd27cf3 100644 ---- a/sysdeps/x86/include/cpu-features.h -+++ b/sysdeps/x86/include/cpu-features.h -@@ -934,6 +934,8 @@ struct cpu_features - /* The full state size for XSAVE when XSAVEC is disabled by - - GLIBC_TUNABLES=glibc.cpu.hwcaps=-XSAVEC -+ -+ and the AMX state size when XSAVEC is available. - */ - unsigned int xsave_state_full_size; - /* Data cache size for use in memory and string routines, typically -diff --git a/sysdeps/x86/sysdep.h b/sysdeps/x86/sysdep.h -index 485cad9c02..db8e576e91 100644 ---- a/sysdeps/x86/sysdep.h -+++ b/sysdeps/x86/sysdep.h -@@ -56,6 +56,14 @@ - | (1 << X86_XSTATE_ZMM_H_ID) \ - | (1 << X86_XSTATE_ZMM_ID) \ - | (1 << X86_XSTATE_APX_F_ID)) -+ -+/* AMX state mask. */ -+# define AMX_STATE_SAVE_MASK \ -+ ((1 << X86_XSTATE_TILECFG_ID) | (1 << X86_XSTATE_TILEDATA_ID)) -+ -+/* States to be included in xsave_state_full_size. */ -+# define FULL_STATE_SAVE_MASK \ -+ (STATE_SAVE_MASK | AMX_STATE_SAVE_MASK) - #else - /* Offset for fxsave/xsave area used by _dl_tlsdesc_dynamic. Since i386 - doesn't have red-zone, use 0 here. */ -@@ -68,13 +76,17 @@ - | (1 << X86_XSTATE_BNDREGS_ID) \ - | (1 << X86_XSTATE_K_ID) \ - | (1 << X86_XSTATE_ZMM_H_ID)) -+ -+/* States to be included in xsave_state_size. */ -+# define FULL_STATE_SAVE_MASK STATE_SAVE_MASK - #endif - - /* States which should be saved for TLSDESC_CALL and TLS_DESC_CALL. -- Compiler assumes that all registers, including x87 FPU stack registers, -- are unchanged after CALL, except for EFLAGS and RAX/EAX. */ -+ Compiler assumes that all registers, including AMX and x87 FPU -+ stack registers, are unchanged after CALL, except for EFLAGS and -+ RAX/EAX. */ - #define TLSDESC_CALL_STATE_SAVE_MASK \ -- (STATE_SAVE_MASK | (1 << X86_XSTATE_X87_ID)) -+ (FULL_STATE_SAVE_MASK | (1 << X86_XSTATE_X87_ID)) - - /* Constants for bits in __x86_string_control: */ - -diff --git a/sysdeps/x86_64/configure b/sysdeps/x86_64/configure -index 418cc4a9b8..04a534fa12 100755 ---- a/sysdeps/x86_64/configure -+++ b/sysdeps/x86_64/configure -@@ -134,6 +134,34 @@ fi - config_vars="$config_vars - enable-cet = $enable_cet" - -+# Check if -mamx-tile works properly. -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -mamx-tile works properly" >&5 -+printf %s "checking whether -mamx-tile works properly... " >&6; } -+if test ${libc_cv_x86_have_amx_tile+y} -+then : -+ printf %s "(cached) " >&6 -+else $as_nop -+ cat > conftest.c < -+EOF -+ libc_cv_x86_have_amx_tile=no -+ if { ac_try='${CC-cc} -E $CFLAGS -mamx-tile conftest.c > conftest.i' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; }; then -+ if grep -q __builtin_ia32_ldtilecfg conftest.i; then -+ libc_cv_x86_have_amx_tile=yes -+ fi -+ fi -+ rm -rf conftest* -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_x86_have_amx_tile" >&5 -+printf "%s\n" "$libc_cv_x86_have_amx_tile" >&6; } -+config_vars="$config_vars -+have-mamx-tile = $libc_cv_x86_have_amx_tile" -+ - test -n "$critic_missing" && as_fn_error $? " - *** $critic_missing" "$LINENO" 5 - -diff --git a/sysdeps/x86_64/configure.ac b/sysdeps/x86_64/configure.ac -index d1f803c02e..c714c47351 100644 ---- a/sysdeps/x86_64/configure.ac -+++ b/sysdeps/x86_64/configure.ac -@@ -61,5 +61,20 @@ elif test $enable_cet = permissive; then - fi - LIBC_CONFIG_VAR([enable-cet], [$enable_cet]) - -+# Check if -mamx-tile works properly. -+AC_CACHE_CHECK(whether -mamx-tile works properly, -+ libc_cv_x86_have_amx_tile, [dnl -+cat > conftest.c < -+EOF -+ libc_cv_x86_have_amx_tile=no -+ if AC_TRY_COMMAND(${CC-cc} -E $CFLAGS -mamx-tile conftest.c > conftest.i); then -+ if grep -q __builtin_ia32_ldtilecfg conftest.i; then -+ libc_cv_x86_have_amx_tile=yes -+ fi -+ fi -+ rm -rf conftest*]) -+LIBC_CONFIG_VAR([have-mamx-tile], [$libc_cv_x86_have_amx_tile]) -+ - test -n "$critic_missing" && AC_MSG_ERROR([ - *** $critic_missing]) -diff --git a/sysdeps/x86_64/dl-tlsdesc-dynamic.h b/sysdeps/x86_64/dl-tlsdesc-dynamic.h -index 0c2e8d5320..9f02cfc3eb 100644 ---- a/sysdeps/x86_64/dl-tlsdesc-dynamic.h -+++ b/sysdeps/x86_64/dl-tlsdesc-dynamic.h -@@ -99,7 +99,7 @@ _dl_tlsdesc_dynamic: - # endif - #else - /* Allocate stack space of the required size to save the state. */ -- sub _rtld_local_ro+RTLD_GLOBAL_RO_DL_X86_CPU_FEATURES_OFFSET+XSAVE_STATE_SIZE_OFFSET(%rip), %RSP_LP -+ sub _rtld_local_ro+RTLD_GLOBAL_RO_DL_X86_CPU_FEATURES_OFFSET+XSAVE_STATE_FULL_SIZE_OFFSET(%rip), %RSP_LP - #endif - /* Besides rdi and rsi, saved above, save rcx, rdx, r8, r9, - r10 and r11. */ - -commit 354cabcb2634abe16da7a2ba5e648aac1204b58e -Author: H.J. Lu -Date: Mon Mar 18 06:40:16 2024 -0700 - - x86-64: Allocate state buffer space for RDI, RSI and RBX - - _dl_tlsdesc_dynamic preserves RDI, RSI and RBX before realigning stack. - After realigning stack, it saves RCX, RDX, R8, R9, R10 and R11. Define - TLSDESC_CALL_REGISTER_SAVE_AREA to allocate space for RDI, RSI and RBX - to avoid clobbering saved RDI, RSI and RBX values on stack by xsave to - STATE_SAVE_OFFSET(%rsp). - - +==================+<- stack frame start aligned at 8 or 16 bytes - | |<- RDI saved in the red zone - | |<- RSI saved in the red zone - | |<- RBX saved in the red zone - | |<- paddings for stack realignment of 64 bytes - |------------------|<- xsave buffer end aligned at 64 bytes - | |<- - | |<- - | |<- - |------------------|<- xsave buffer start at STATE_SAVE_OFFSET(%rsp) - | |<- 8-byte padding for 64-byte alignment - | |<- 8-byte padding for 64-byte alignment - | |<- R11 - | |<- R10 - | |<- R9 - | |<- R8 - | |<- RDX - | |<- RCX - +==================+<- RSP aligned at 64 bytes - - Define TLSDESC_CALL_REGISTER_SAVE_AREA, the total register save area size - for all integer registers by adding 24 to STATE_SAVE_OFFSET since RDI, RSI - and RBX are saved onto stack without adjusting stack pointer first, using - the red-zone. This fixes BZ #31501. - Reviewed-by: Sunil K Pandey - - (cherry picked from commit 717ebfa85c8240d32d0d19d86a484c31c55c9617) - -diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c -index d71e8d3d2e..6fe1b728c6 100644 ---- a/sysdeps/x86/cpu-features.c -+++ b/sysdeps/x86/cpu-features.c -@@ -310,7 +310,7 @@ update_active (struct cpu_features *cpu_features) - /* NB: On AMX capable processors, ebx always includes AMX - states. */ - unsigned int xsave_state_full_size -- = ALIGN_UP (ebx + STATE_SAVE_OFFSET, 64); -+ = ALIGN_UP (ebx + TLSDESC_CALL_REGISTER_SAVE_AREA, 64); - - cpu_features->xsave_state_size - = xsave_state_full_size; -@@ -400,8 +400,10 @@ update_active (struct cpu_features *cpu_features) - unsigned int amx_size - = (xstate_amx_comp_offsets[31] - + xstate_amx_comp_sizes[31]); -- amx_size = ALIGN_UP (amx_size + STATE_SAVE_OFFSET, -- 64); -+ amx_size -+ = ALIGN_UP ((amx_size -+ + TLSDESC_CALL_REGISTER_SAVE_AREA), -+ 64); - /* Set xsave_state_full_size to the compact AMX - state size for XSAVEC. NB: xsave_state_full_size - is only used in _dl_tlsdesc_dynamic_xsave and -@@ -409,7 +411,8 @@ update_active (struct cpu_features *cpu_features) - cpu_features->xsave_state_full_size = amx_size; - #endif - cpu_features->xsave_state_size -- = ALIGN_UP (size + STATE_SAVE_OFFSET, 64); -+ = ALIGN_UP (size + TLSDESC_CALL_REGISTER_SAVE_AREA, -+ 64); - CPU_FEATURE_SET (cpu_features, XSAVEC); - } - } -diff --git a/sysdeps/x86/sysdep.h b/sysdeps/x86/sysdep.h -index db8e576e91..7359149e17 100644 ---- a/sysdeps/x86/sysdep.h -+++ b/sysdeps/x86/sysdep.h -@@ -38,14 +38,59 @@ - #ifdef __x86_64__ - /* Offset for fxsave/xsave area used by _dl_runtime_resolve. Also need - space to preserve RCX, RDX, RSI, RDI, R8, R9 and RAX. It must be -- aligned to 16 bytes for fxsave and 64 bytes for xsave. -- -- NB: Is is non-zero because of the 128-byte red-zone. Some registers -- are saved on stack without adjusting stack pointer first. When we -- update stack pointer to allocate more space, we need to take the -- red-zone into account. */ -+ aligned to 16 bytes for fxsave and 64 bytes for xsave. It is non-zero -+ because MOV, instead of PUSH, is used to save registers onto stack. -+ -+ +==================+<- stack frame start aligned at 8 or 16 bytes -+ | |<- paddings for stack realignment of 64 bytes -+ |------------------|<- xsave buffer end aligned at 64 bytes -+ | |<- -+ | |<- -+ | |<- -+ |------------------|<- xsave buffer start at STATE_SAVE_OFFSET(%rsp) -+ | |<- 8-byte padding for 64-byte alignment -+ | |<- R9 -+ | |<- R8 -+ | |<- RDI -+ | |<- RSI -+ | |<- RDX -+ | |<- RCX -+ | |<- RAX -+ +==================+<- RSP aligned at 64 bytes -+ -+ */ - # define STATE_SAVE_OFFSET (8 * 7 + 8) - -+/* _dl_tlsdesc_dynamic preserves RDI, RSI and RBX before realigning -+ stack. After realigning stack, it saves RCX, RDX, R8, R9, R10 and -+ R11. Allocate space for RDI, RSI and RBX to avoid clobbering saved -+ RDI, RSI and RBX values on stack by xsave. -+ -+ +==================+<- stack frame start aligned at 8 or 16 bytes -+ | |<- RDI saved in the red zone -+ | |<- RSI saved in the red zone -+ | |<- RBX saved in the red zone -+ | |<- paddings for stack realignment of 64 bytes -+ |------------------|<- xsave buffer end aligned at 64 bytes -+ | |<- -+ | |<- -+ | |<- -+ |------------------|<- xsave buffer start at STATE_SAVE_OFFSET(%rsp) -+ | |<- 8-byte padding for 64-byte alignment -+ | |<- 8-byte padding for 64-byte alignment -+ | |<- R11 -+ | |<- R10 -+ | |<- R9 -+ | |<- R8 -+ | |<- RDX -+ | |<- RCX -+ +==================+<- RSP aligned at 64 bytes -+ -+ Define the total register save area size for all integer registers by -+ adding 24 to STATE_SAVE_OFFSET since RDI, RSI and RBX are saved onto -+ stack without adjusting stack pointer first, using the red-zone. */ -+# define TLSDESC_CALL_REGISTER_SAVE_AREA (STATE_SAVE_OFFSET + 24) -+ - /* Save SSE, AVX, AVX512, mask, bound and APX registers. Bound and APX - registers are mutually exclusive. */ - # define STATE_SAVE_MASK \ -@@ -66,8 +111,9 @@ - (STATE_SAVE_MASK | AMX_STATE_SAVE_MASK) - #else - /* Offset for fxsave/xsave area used by _dl_tlsdesc_dynamic. Since i386 -- doesn't have red-zone, use 0 here. */ -+ uses PUSH to save registers onto stack, use 0 here. */ - # define STATE_SAVE_OFFSET 0 -+# define TLSDESC_CALL_REGISTER_SAVE_AREA 0 - - /* Save SSE, AVX, AXV512, mask and bound registers. */ - # define STATE_SAVE_MASK \ -diff --git a/sysdeps/x86_64/tst-gnu2-tls2mod1.S b/sysdeps/x86_64/tst-gnu2-tls2mod1.S -new file mode 100644 -index 0000000000..1d636669ba ---- /dev/null -+++ b/sysdeps/x86_64/tst-gnu2-tls2mod1.S -@@ -0,0 +1,87 @@ -+/* Check if TLSDESC relocation preserves %rdi, %rsi and %rbx. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#include -+ -+/* On AVX512 machines, OFFSET == 40 caused _dl_tlsdesc_dynamic_xsavec -+ to clobber %rdi, %rsi and %rbx. On Intel AVX CPUs, the state size -+ is 960 bytes and this test didn't fail. It may be due to the unused -+ last 128 bytes. On AMD AVX CPUs, the state size is 832 bytes and -+ this test might fail without the fix. */ -+#ifndef OFFSET -+# define OFFSET 40 -+#endif -+ -+ .text -+ .p2align 4 -+ .globl apply_tls -+ .type apply_tls, @function -+apply_tls: -+ cfi_startproc -+ _CET_ENDBR -+ pushq %rbp -+ cfi_def_cfa_offset (16) -+ cfi_offset (6, -16) -+ movdqu (%RDI_LP), %xmm0 -+ lea tls_var1@TLSDESC(%rip), %RAX_LP -+ mov %RSP_LP, %RBP_LP -+ cfi_def_cfa_register (6) -+ /* Align stack to 64 bytes. */ -+ and $-64, %RSP_LP -+ sub $OFFSET, %RSP_LP -+ pushq %rbx -+ /* Set %ebx to 0xbadbeef. */ -+ movl $0xbadbeef, %ebx -+ movl $0xbadbeef, %esi -+ movq %rdi, saved_rdi(%rip) -+ movq %rsi, saved_rsi(%rip) -+ call *tls_var1@TLSCALL(%RAX_LP) -+ /* Check if _dl_tlsdesc_dynamic preserves %rdi, %rsi and %rbx. */ -+ cmpq saved_rdi(%rip), %rdi -+ jne L(hlt) -+ cmpq saved_rsi(%rip), %rsi -+ jne L(hlt) -+ cmpl $0xbadbeef, %ebx -+ jne L(hlt) -+ add %fs:0, %RAX_LP -+ movups %xmm0, 32(%RAX_LP) -+ movdqu 16(%RDI_LP), %xmm1 -+ mov %RAX_LP, %RBX_LP -+ movups %xmm1, 48(%RAX_LP) -+ lea 32(%RBX_LP), %RAX_LP -+ pop %rbx -+ leave -+ cfi_def_cfa (7, 8) -+ ret -+L(hlt): -+ hlt -+ cfi_endproc -+ .size apply_tls, .-apply_tls -+ .hidden tls_var1 -+ .globl tls_var1 -+ .section .tbss,"awT",@nobits -+ .align 16 -+ .type tls_var1, @object -+ .size tls_var1, 3200 -+tls_var1: -+ .zero 3200 -+ .local saved_rdi -+ .comm saved_rdi,8,8 -+ .local saved_rsi -+ .comm saved_rsi,8,8 -+ .section .note.GNU-stack,"",@progbits - -commit 15aebdbada54098787715448c94701f17033fc92 -Author: Adhemerval Zanella -Date: Tue Mar 12 13:21:18 2024 -0300 - - Ignore undefined symbols for -mtls-dialect=gnu2 - - So it does not fail for arm config that defaults to -mtp=soft (which - issues a call to __aeabi_read_tp). - Reviewed-by: H.J. Lu - - (cherry picked from commit 968b0ca9440040a2b31248a572891f0e55c1ab10) - -diff --git a/configure b/configure -index 59ff1e415d..117b48a421 100755 ---- a/configure -+++ b/configure -@@ -7020,7 +7020,7 @@ void foo (void) - } - EOF - if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -fPIC -mtls-dialect=gnu2 -nostdlib -nostartfiles -- conftest.c -o conftest 1>&5' -+ -shared conftest.c -o conftest 1>&5' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 - (eval $ac_try) 2>&5 - ac_status=$? -diff --git a/configure.ac b/configure.ac -index 65799e5685..19b88a47a5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1297,7 +1297,7 @@ void foo (void) - } - EOF - if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -fPIC -mtls-dialect=gnu2 -nostdlib -nostartfiles -- conftest.c -o conftest 1>&AS_MESSAGE_LOG_FD]) -+ -shared conftest.c -o conftest 1>&AS_MESSAGE_LOG_FD]) - then - libc_cv_mtls_dialect_gnu2=yes - else - -commit a8ba52bde58c69f2b31da62ad2311f119adf6cb9 -Author: Adhemerval Zanella -Date: Tue Mar 12 13:21:19 2024 -0300 - - arm: Update _dl_tlsdesc_dynamic to preserve caller-saved registers (BZ 31372) - - ARM _dl_tlsdesc_dynamic slow path has two issues: - - * The ip/r12 is defined by AAPCS as a scratch register, and gcc is - used to save the stack pointer before on some function calls. So it - should also be saved/restored as well. It fixes the tst-gnu2-tls2. - - * None of the possible VFP registers are saved/restored. ARM has the - additional complexity to have different VFP bank sizes (depending of - VFP support by the chip). - - The tst-gnu2-tls2 test is extended to check for VFP registers, although - only for hardfp builds. Different than setcontext, _dl_tlsdesc_dynamic - does not have HWCAP_ARM_IWMMXT (I don't have a way to properly test - it and it is almost a decade since newer hardware was released). - - With this patch there is no need to mark tst-gnu2-tls2 as XFAIL. - - Checked on arm-linux-gnueabihf. - Reviewed-by: H.J. Lu - - (cherry picked from commit 64c7e344289ed085517c2227d8e3b06388242c13) - -diff --git a/config.h.in b/config.h.in -index 44a34072a4..4d33c63a84 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -141,6 +141,9 @@ - /* LOONGARCH floating-point ABI for ld.so. */ - #undef LOONGARCH_ABI_FRLEN - -+/* Define whether ARM used hard-float and support VFPvX-D32. */ -+#undef HAVE_ARM_PCS_VFP_D32 -+ - /* Linux specific: minimum supported kernel version. */ - #undef __LINUX_KERNEL_VERSION - -diff --git a/elf/Makefile b/elf/Makefile -index c5c37a9147..030db4d207 100644 ---- a/elf/Makefile -+++ b/elf/Makefile -@@ -3056,10 +3056,6 @@ $(objpfx)tst-gnu2-tls2.out: \ - $(objpfx)tst-gnu2-tls2mod2.so - - ifeq (yes,$(have-mtls-dialect-gnu2)) --# This test fails if dl_tlsdesc_dynamic doesn't preserve all caller-saved --# registers. See https://sourceware.org/bugzilla/show_bug.cgi?id=31372 --test-xfail-tst-gnu2-tls2 = yes -- - CFLAGS-tst-tlsgap-mod0.c += -mtls-dialect=gnu2 - CFLAGS-tst-tlsgap-mod1.c += -mtls-dialect=gnu2 - CFLAGS-tst-tlsgap-mod2.c += -mtls-dialect=gnu2 -diff --git a/elf/tst-gnu2-tls2.h b/elf/tst-gnu2-tls2.h -index 77964a57a3..1ade8151e2 100644 ---- a/elf/tst-gnu2-tls2.h -+++ b/elf/tst-gnu2-tls2.h -@@ -27,6 +27,10 @@ extern struct tls *apply_tls (struct tls *); - - /* An architecture can define them to verify that clobber caller-saved - registers aren't changed by the implicit TLSDESC call. */ -+#ifndef INIT_TLSDESC_CALL -+# define INIT_TLSDESC_CALL() -+#endif -+ - #ifndef BEFORE_TLSDESC_CALL - # define BEFORE_TLSDESC_CALL() - #endif -diff --git a/elf/tst-gnu2-tls2mod0.c b/elf/tst-gnu2-tls2mod0.c -index 45556a0e17..3fe3c14277 100644 ---- a/elf/tst-gnu2-tls2mod0.c -+++ b/elf/tst-gnu2-tls2mod0.c -@@ -16,13 +16,14 @@ - License along with the GNU C Library; if not, see - . */ - --#include "tst-gnu2-tls2.h" -+#include - - __thread struct tls tls_var0 __attribute__ ((visibility ("hidden"))); - - struct tls * - apply_tls (struct tls *p) - { -+ INIT_TLSDESC_CALL (); - BEFORE_TLSDESC_CALL (); - tls_var0 = *p; - struct tls *ret = &tls_var0; -diff --git a/elf/tst-gnu2-tls2mod1.c b/elf/tst-gnu2-tls2mod1.c -index e10b9dbc0a..e210538468 100644 ---- a/elf/tst-gnu2-tls2mod1.c -+++ b/elf/tst-gnu2-tls2mod1.c -@@ -16,13 +16,14 @@ - License along with the GNU C Library; if not, see - . */ - --#include "tst-gnu2-tls2.h" -+#include - - __thread struct tls tls_var1[100] __attribute__ ((visibility ("hidden"))); - - struct tls * - apply_tls (struct tls *p) - { -+ INIT_TLSDESC_CALL (); - BEFORE_TLSDESC_CALL (); - tls_var1[1] = *p; - struct tls *ret = &tls_var1[1]; -diff --git a/elf/tst-gnu2-tls2mod2.c b/elf/tst-gnu2-tls2mod2.c -index 141af51e55..6d3031dc5f 100644 ---- a/elf/tst-gnu2-tls2mod2.c -+++ b/elf/tst-gnu2-tls2mod2.c -@@ -16,13 +16,14 @@ - License along with the GNU C Library; if not, see - . */ - --#include "tst-gnu2-tls2.h" -+#include - - __thread struct tls tls_var2 __attribute__ ((visibility ("hidden"))); - - struct tls * - apply_tls (struct tls *p) - { -+ INIT_TLSDESC_CALL (); - BEFORE_TLSDESC_CALL (); - tls_var2 = *p; - struct tls *ret = &tls_var2; -diff --git a/sysdeps/arm/configure b/sysdeps/arm/configure -index 35e2918922..4ef4d46cbd 100644 ---- a/sysdeps/arm/configure -+++ b/sysdeps/arm/configure -@@ -187,6 +187,38 @@ else - default-abi = soft" - fi - -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether VFP supports 32 registers" >&5 -+printf %s "checking whether VFP supports 32 registers... " >&6; } -+if test ${libc_cv_arm_pcs_vfp_d32+y} -+then : -+ printf %s "(cached) " >&6 -+else $as_nop -+ -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+void foo (void) -+{ -+ asm volatile ("vldr d16,=17" : : : "d16"); -+} -+ -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ libc_cv_arm_pcs_vfp_d32=yes -+else $as_nop -+ libc_cv_arm_pcs_vfp_d32=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_arm_pcs_vfp_d32" >&5 -+printf "%s\n" "$libc_cv_arm_pcs_vfp_d32" >&6; } -+if test "$libc_cv_arm_pcs_vfp_d32" = yes ; -+then -+ printf "%s\n" "#define HAVE_ARM_PCS_VFP_D32 1" >>confdefs.h -+ -+fi -+ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether PC-relative relocs in movw/movt work properly" >&5 - printf %s "checking whether PC-relative relocs in movw/movt work properly... " >&6; } - if test ${libc_cv_arm_pcrel_movw+y} -diff --git a/sysdeps/arm/configure.ac b/sysdeps/arm/configure.ac -index 5172e30bbe..cd00ddc9d9 100644 ---- a/sysdeps/arm/configure.ac -+++ b/sysdeps/arm/configure.ac -@@ -21,6 +21,21 @@ else - LIBC_CONFIG_VAR([default-abi], [soft]) - fi - -+AC_CACHE_CHECK([whether VFP supports 32 registers], -+ libc_cv_arm_pcs_vfp_d32, [ -+AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ -+void foo (void) -+{ -+ asm volatile ("vldr d16,=17" : : : "d16"); -+} -+]])], -+ [libc_cv_arm_pcs_vfp_d32=yes], -+ [libc_cv_arm_pcs_vfp_d32=no])]) -+if test "$libc_cv_arm_pcs_vfp_d32" = yes ; -+then -+ AC_DEFINE(HAVE_ARM_PCS_VFP_D32) -+fi -+ - AC_CACHE_CHECK([whether PC-relative relocs in movw/movt work properly], - libc_cv_arm_pcrel_movw, [ - cat > conftest.s <<\EOF -diff --git a/sysdeps/arm/dl-tlsdesc.S b/sysdeps/arm/dl-tlsdesc.S -index 764c56e70f..ada106521d 100644 ---- a/sysdeps/arm/dl-tlsdesc.S -+++ b/sysdeps/arm/dl-tlsdesc.S -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - #include "tlsdesc.h" - - .text -@@ -83,14 +84,20 @@ _dl_tlsdesc_dynamic(struct tlsdesc *tdp) - .align 2 - _dl_tlsdesc_dynamic: - /* Our calling convention is to clobber r0, r1 and the processor -- flags. All others that are modified must be saved */ -- eabi_save ({r2,r3,r4,lr}) -- push {r2,r3,r4,lr} -- cfi_adjust_cfa_offset (16) -+ flags. All others that are modified must be saved. r5 is -+ used as the hwcap value to avoid reload after __tls_get_addr -+ call. If required we will save the vector register on the slow -+ path. */ -+ eabi_save ({r2,r3,r4,r5,ip,lr}) -+ push {r2,r3,r4,r5,ip,lr} -+ cfi_adjust_cfa_offset (24) - cfi_rel_offset (r2,0) - cfi_rel_offset (r3,4) - cfi_rel_offset (r4,8) -- cfi_rel_offset (lr,12) -+ cfi_rel_offset (r5,12) -+ cfi_rel_offset (ip,16) -+ cfi_rel_offset (lr,20) -+ - ldr r1, [r0] /* td */ - GET_TLS (lr) - mov r4, r0 /* r4 = tp */ -@@ -113,22 +120,69 @@ _dl_tlsdesc_dynamic: - rsbne r0, r4, r3 - bne 2f - 1: mov r0, r1 -+ -+ /* Load the hwcap to check for vector support. */ -+ ldr r2, 3f -+ ldr r1, .Lrtld_global_ro -+0: add r2, pc, r2 -+ ldr r2, [r2, r1] -+ ldr r5, [r2, #RTLD_GLOBAL_RO_DL_HWCAP_OFFSET] -+ -+#ifdef __SOFTFP__ -+ tst r5, #HWCAP_ARM_VFP -+ beq .Lno_vfp -+#endif -+ -+ /* Store the VFP registers. Don't use VFP instructions directly -+ because this code is used in non-VFP multilibs. */ -+#define VFP_STACK_REQ (32*8 + 8) -+ sub sp, sp, VFP_STACK_REQ -+ cfi_adjust_cfa_offset (VFP_STACK_REQ) -+ mov r3, sp -+ .inst 0xeca30b20 /* vstmia r3!, {d0-d15} */ -+ tst r5, #HWCAP_ARM_VFPD32 -+ beq 4f -+ .inst 0xece30b20 /* vstmia r3!, {d16-d31} */ -+ /* Store the floating-point status register. */ -+4: .inst 0xeef12a10 /* vmrs r2, fpscr */ -+ str r2, [r3] -+.Lno_vfp: - bl __tls_get_addr - rsb r0, r4, r0 -+#ifdef __SOFTFP__ -+ tst r5, #HWCAP_ARM_VFP -+ beq 2f -+#endif -+ mov r3, sp -+ .inst 0xecb30b20 /* vldmia r3!, {d0-d15} */ -+ tst r5, #HWCAP_ARM_VFPD32 -+ beq 5f -+ .inst 0xecf30b20 /* vldmia r3!, {d16-d31} */ -+ ldr r4, [r3] -+5: .inst 0xeee14a10 /* vmsr fpscr, r4 */ -+ add sp, sp, VFP_STACK_REQ -+ cfi_adjust_cfa_offset (-VFP_STACK_REQ) -+ - 2: - #if ((defined (__ARM_ARCH_4T__) && defined (__THUMB_INTERWORK__)) \ - || defined (ARM_ALWAYS_BX)) -- pop {r2,r3,r4, lr} -- cfi_adjust_cfa_offset (-16) -+ pop {r2,r3,r4,r5,ip, lr} -+ cfi_adjust_cfa_offset (-20) - cfi_restore (lr) -+ cfi_restore (ip) -+ cfi_restore (r5) - cfi_restore (r4) - cfi_restore (r3) - cfi_restore (r2) - bx lr - #else -- pop {r2,r3,r4, pc} -+ pop {r2,r3,r4,r5,ip, pc} - #endif - eabi_fnend - cfi_endproc - .size _dl_tlsdesc_dynamic, .-_dl_tlsdesc_dynamic -+ -+3: .long _GLOBAL_OFFSET_TABLE_ - 0b - PC_OFS -+.Lrtld_global_ro: -+ .long C_SYMBOL_NAME(_rtld_global_ro)(GOT) - #endif /* SHARED */ -diff --git a/sysdeps/arm/tst-gnu2-tls2.h b/sysdeps/arm/tst-gnu2-tls2.h -new file mode 100644 -index 0000000000..e413ac21fb ---- /dev/null -+++ b/sysdeps/arm/tst-gnu2-tls2.h -@@ -0,0 +1,128 @@ -+/* Test TLSDESC relocation. ARM version. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#include -+#include -+#include -+#include -+#include -+ -+#ifndef __SOFTFP__ -+ -+# ifdef HAVE_ARM_PCS_VFP_D32 -+# define SAVE_VFP_D32 \ -+ asm volatile ("vldr d16,=17" : : : "d16"); \ -+ asm volatile ("vldr d17,=18" : : : "d17"); \ -+ asm volatile ("vldr d18,=19" : : : "d18"); \ -+ asm volatile ("vldr d19,=20" : : : "d19"); \ -+ asm volatile ("vldr d20,=21" : : : "d20"); \ -+ asm volatile ("vldr d21,=22" : : : "d21"); \ -+ asm volatile ("vldr d22,=23" : : : "d22"); \ -+ asm volatile ("vldr d23,=24" : : : "d23"); \ -+ asm volatile ("vldr d24,=25" : : : "d24"); \ -+ asm volatile ("vldr d25,=26" : : : "d25"); \ -+ asm volatile ("vldr d26,=27" : : : "d26"); \ -+ asm volatile ("vldr d27,=28" : : : "d27"); \ -+ asm volatile ("vldr d28,=29" : : : "d28"); \ -+ asm volatile ("vldr d29,=30" : : : "d29"); \ -+ asm volatile ("vldr d30,=31" : : : "d30"); \ -+ asm volatile ("vldr d31,=32" : : : "d31"); -+# else -+# define SAVE_VFP_D32 -+# endif -+ -+# define INIT_TLSDESC_CALL() \ -+ unsigned long hwcap = getauxval (AT_HWCAP) -+ -+/* Set each vector register to a value from 1 to 32 before the TLS access, -+ dump to memory after TLS access, and compare with the expected values. */ -+ -+# define BEFORE_TLSDESC_CALL() \ -+ if (hwcap & HWCAP_ARM_VFP) \ -+ { \ -+ asm volatile ("vldr d0,=1" : : : "d0"); \ -+ asm volatile ("vldr d1,=2" : : : "d1"); \ -+ asm volatile ("vldr d2,=3" : : : "d1"); \ -+ asm volatile ("vldr d3,=4" : : : "d3"); \ -+ asm volatile ("vldr d4,=5" : : : "d4"); \ -+ asm volatile ("vldr d5,=6" : : : "d5"); \ -+ asm volatile ("vldr d6,=7" : : : "d6"); \ -+ asm volatile ("vldr d7,=8" : : : "d7"); \ -+ asm volatile ("vldr d8,=9" : : : "d8"); \ -+ asm volatile ("vldr d9,=10" : : : "d9"); \ -+ asm volatile ("vldr d10,=11" : : : "d10"); \ -+ asm volatile ("vldr d11,=12" : : : "d11"); \ -+ asm volatile ("vldr d12,=13" : : : "d12"); \ -+ asm volatile ("vldr d13,=14" : : : "d13"); \ -+ asm volatile ("vldr d14,=15" : : : "d14"); \ -+ asm volatile ("vldr d15,=16" : : : "d15"); \ -+ } \ -+ if (hwcap & HWCAP_ARM_VFPD32) \ -+ { \ -+ SAVE_VFP_D32 \ -+ } -+ -+# define VFP_STACK_REQ (16*8) -+# if __BYTE_ORDER == __BIG_ENDIAN -+# define DISP 7 -+# else -+# define DISP 0 -+# endif -+ -+# ifdef HAVE_ARM_PCS_VFP_D32 -+# define CHECK_VFP_D32 \ -+ char vfp[VFP_STACK_REQ]; \ -+ asm volatile ("vstmia %0, {d16-d31}\n" \ -+ : \ -+ : "r" (vfp) \ -+ : "memory"); \ -+ \ -+ char expected[VFP_STACK_REQ] = { 0 }; \ -+ for (int i = 0; i < 16; ++i) \ -+ expected[i * 8 + DISP] = i + 17; \ -+ \ -+ if (memcmp (vfp, expected, VFP_STACK_REQ) != 0) \ -+ abort (); -+# else -+# define CHECK_VFP_D32 -+# endif -+ -+# define AFTER_TLSDESC_CALL() \ -+ if (hwcap & HWCAP_ARM_VFP) \ -+ { \ -+ char vfp[VFP_STACK_REQ]; \ -+ asm volatile ("vstmia %0, {d0-d15}\n" \ -+ : \ -+ : "r" (vfp) \ -+ : "memory"); \ -+ \ -+ char expected[VFP_STACK_REQ] = { 0 }; \ -+ for (int i = 0; i < 16; ++i) \ -+ expected[i * 8 + DISP] = i + 1; \ -+ \ -+ if (memcmp (vfp, expected, VFP_STACK_REQ) != 0) \ -+ abort (); \ -+ } \ -+ if (hwcap & HWCAP_ARM_VFPD32) \ -+ { \ -+ CHECK_VFP_D32 \ -+ } -+ -+#endif /* __SOFTFP__ */ -+ -+#include_next - -commit aded2fc004e7ee85cf0b45b1382552d41e555a23 -Author: Adhemerval Zanella -Date: Tue Mar 12 13:21:20 2024 -0300 - - elf: Enable TLS descriptor tests on aarch64 - - The aarch64 uses 'trad' for traditional tls and 'desc' for tls - descriptors, but unlike other targets it defaults to 'desc'. The - gnutls2 configure check does not set aarch64 as an ABI that uses - TLS descriptors, which then disable somes stests. - - Also rename the internal machinery fron gnu2 to tls descriptors. - - Checked on aarch64-linux-gnu. - Reviewed-by: H.J. Lu - - (cherry picked from commit 3d53d18fc71c5d9ef4773b8bce04d54b80181926) - -diff --git a/configure b/configure -index 117b48a421..432e40a592 100755 ---- a/configure -+++ b/configure -@@ -653,7 +653,7 @@ LIBGD - libc_cv_cc_loop_to_function - libc_cv_cc_submachine - libc_cv_cc_nofma --libc_cv_mtls_dialect_gnu2 -+libc_cv_mtls_descriptor - libc_cv_has_glob_dat - libc_cv_fpie - libc_cv_z_execstack -@@ -4760,6 +4760,9 @@ libc_config_ok=no - # whether to use such directories. - with_fp_cond=1 - -+# A preconfigure script may define another name to TLS descriptor variant -+mtls_descriptor=gnu2 -+ - if frags=`ls -d $srcdir/sysdeps/*/preconfigure 2> /dev/null` - then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysdeps preconfigure fragments" >&5 -@@ -7006,9 +7009,9 @@ fi - printf "%s\n" "$libc_cv_has_glob_dat" >&6; } - - --{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -mtls-dialect=gnu2" >&5 --printf %s "checking for -mtls-dialect=gnu2... " >&6; } --if test ${libc_cv_mtls_dialect_gnu2+y} -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tls descriptor support" >&5 -+printf %s "checking for tls descriptor support... " >&6; } -+if test ${libc_cv_mtls_descriptor+y} - then : - printf %s "(cached) " >&6 - else $as_nop -@@ -7019,7 +7022,7 @@ void foo (void) - i = 10; - } - EOF --if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -fPIC -mtls-dialect=gnu2 -nostdlib -nostartfiles -+if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -fPIC -mtls-dialect=$mtls_descriptor -nostdlib -nostartfiles - -shared conftest.c -o conftest 1>&5' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 - (eval $ac_try) 2>&5 -@@ -7027,17 +7030,17 @@ if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -fPIC -mtls-dialect=gnu2 -nostdlib -nost - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; } - then -- libc_cv_mtls_dialect_gnu2=yes -+ libc_cv_mtls_descriptor=$mtls_descriptor - else -- libc_cv_mtls_dialect_gnu2=no -+ libc_cv_mtls_descriptor=no - fi - rm -f conftest* - fi --{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_mtls_dialect_gnu2" >&5 --printf "%s\n" "$libc_cv_mtls_dialect_gnu2" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_mtls_descriptor" >&5 -+printf "%s\n" "$libc_cv_mtls_descriptor" >&6; } - - config_vars="$config_vars --have-mtls-dialect-gnu2 = $libc_cv_mtls_dialect_gnu2" -+have-mtls-descriptor = $libc_cv_mtls_descriptor" - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if -Wno-ignored-attributes is required for aliases" >&5 - printf %s "checking if -Wno-ignored-attributes is required for aliases... " >&6; } -diff --git a/configure.ac b/configure.ac -index 19b88a47a5..bdc385d03c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -442,6 +442,9 @@ libc_config_ok=no - # whether to use such directories. - with_fp_cond=1 - -+# A preconfigure script may define another name to TLS descriptor variant -+mtls_descriptor=gnu2 -+ - dnl Let sysdeps/*/preconfigure act here. - LIBC_PRECONFIGURE([$srcdir], [for sysdeps]) - -@@ -1287,7 +1290,7 @@ fi - rm -f conftest*]) - AC_SUBST(libc_cv_has_glob_dat) - --AC_CACHE_CHECK([for -mtls-dialect=gnu2], libc_cv_mtls_dialect_gnu2, -+AC_CACHE_CHECK([for tls descriptor support], libc_cv_mtls_descriptor, - [dnl - cat > conftest.c <&AS_MESSAGE_LOG_FD]) - then -- libc_cv_mtls_dialect_gnu2=yes -+ libc_cv_mtls_descriptor=$mtls_descriptor - else -- libc_cv_mtls_dialect_gnu2=no -+ libc_cv_mtls_descriptor=no - fi - rm -f conftest*]) --AC_SUBST(libc_cv_mtls_dialect_gnu2) --LIBC_CONFIG_VAR([have-mtls-dialect-gnu2], [$libc_cv_mtls_dialect_gnu2]) -+AC_SUBST(libc_cv_mtls_descriptor) -+LIBC_CONFIG_VAR([have-mtls-descriptor], [$libc_cv_mtls_descriptor]) - - dnl clang emits an warning for a double alias redirection, to warn the - dnl original symbol is sed even when weak definition overrides it. -diff --git a/elf/Makefile b/elf/Makefile -index 030db4d207..69aa423c4b 100644 ---- a/elf/Makefile -+++ b/elf/Makefile -@@ -999,13 +999,13 @@ modules-names-tests = $(filter-out ifuncmod% tst-tlsmod%,\ - # For +depfiles in Makerules. - extra-test-objs += tst-auditmod17.os - --ifeq (yes,$(have-mtls-dialect-gnu2)) -+ifneq (no,$(have-mtls-descriptor)) - tests += tst-gnu2-tls1 - modules-names += tst-gnu2-tls1mod - $(objpfx)tst-gnu2-tls1: $(objpfx)tst-gnu2-tls1mod.so - tst-gnu2-tls1mod.so-no-z-defs = yes --CFLAGS-tst-gnu2-tls1mod.c += -mtls-dialect=gnu2 --endif # $(have-mtls-dialect-gnu2) -+CFLAGS-tst-gnu2-tls1mod.c += -mtls-dialect=$(have-mtls-descriptor) -+endif # $(have-mtls-descriptor) - - ifeq (yes,$(have-protected-data)) - modules-names += tst-protected1moda tst-protected1modb -@@ -2972,11 +2972,11 @@ $(objpfx)tst-tls-allocation-failure-static-patched.out: \ - $(objpfx)tst-audit-tlsdesc: $(objpfx)tst-audit-tlsdesc-mod1.so \ - $(objpfx)tst-audit-tlsdesc-mod2.so \ - $(shared-thread-library) --ifeq (yes,$(have-mtls-dialect-gnu2)) -+ifneq (no,$(have-mtls-descriptor)) - # The test is valid for all TLS types, but we want to exercise GNU2 - # TLS if possible. --CFLAGS-tst-audit-tlsdesc-mod1.c += -mtls-dialect=gnu2 --CFLAGS-tst-audit-tlsdesc-mod2.c += -mtls-dialect=gnu2 -+CFLAGS-tst-audit-tlsdesc-mod1.c += -mtls-dialect=$(have-mtls-descriptor) -+CFLAGS-tst-audit-tlsdesc-mod2.c += -mtls-dialect=$(have-mtls-descriptor) - endif - $(objpfx)tst-audit-tlsdesc-dlopen: $(shared-thread-library) - $(objpfx)tst-audit-tlsdesc-dlopen.out: $(objpfx)tst-audit-tlsdesc-mod1.so \ -@@ -3055,11 +3055,11 @@ $(objpfx)tst-gnu2-tls2.out: \ - $(objpfx)tst-gnu2-tls2mod1.so \ - $(objpfx)tst-gnu2-tls2mod2.so - --ifeq (yes,$(have-mtls-dialect-gnu2)) --CFLAGS-tst-tlsgap-mod0.c += -mtls-dialect=gnu2 --CFLAGS-tst-tlsgap-mod1.c += -mtls-dialect=gnu2 --CFLAGS-tst-tlsgap-mod2.c += -mtls-dialect=gnu2 --CFLAGS-tst-gnu2-tls2mod0.c += -mtls-dialect=gnu2 --CFLAGS-tst-gnu2-tls2mod1.c += -mtls-dialect=gnu2 --CFLAGS-tst-gnu2-tls2mod2.c += -mtls-dialect=gnu2 -+ifneq (no,$(have-mtls-descriptor)) -+CFLAGS-tst-tlsgap-mod0.c += -mtls-dialect=$(have-mtls-descriptor) -+CFLAGS-tst-tlsgap-mod1.c += -mtls-dialect=$(have-mtls-descriptor) -+CFLAGS-tst-tlsgap-mod2.c += -mtls-dialect=$(have-mtls-descriptor) -+CFLAGS-tst-gnu2-tls2mod0.c += -mtls-dialect=$(have-mtls-descriptor) -+CFLAGS-tst-gnu2-tls2mod1.c += -mtls-dialect=$(have-mtls-descriptor) -+CFLAGS-tst-gnu2-tls2mod2.c += -mtls-dialect=$(have-mtls-descriptor) - endif -diff --git a/sysdeps/aarch64/preconfigure b/sysdeps/aarch64/preconfigure -index d9bd1f8558..19657b627b 100644 ---- a/sysdeps/aarch64/preconfigure -+++ b/sysdeps/aarch64/preconfigure -@@ -2,5 +2,6 @@ case "$machine" in - aarch64*) - base_machine=aarch64 - machine=aarch64 -+ mtls_descriptor=desc - ;; - esac -diff --git a/sysdeps/arm/Makefile b/sysdeps/arm/Makefile -index d5cea717a9..619474eca9 100644 ---- a/sysdeps/arm/Makefile -+++ b/sysdeps/arm/Makefile -@@ -13,15 +13,15 @@ $(objpfx)libgcc-stubs.a: $(objpfx)aeabi_unwind_cpp_pr1.os - lib-noranlib: $(objpfx)libgcc-stubs.a - - ifeq ($(build-shared),yes) --ifeq (yes,$(have-mtls-dialect-gnu2)) -+ifneq (no,$(have-mtls-descriptor)) - tests += tst-armtlsdescloc tst-armtlsdescextnow tst-armtlsdescextlazy - modules-names += tst-armtlsdesclocmod - modules-names += tst-armtlsdescextlazymod tst-armtlsdescextnowmod - CPPFLAGS-tst-armtlsdescextnowmod.c += -Dstatic= - CPPFLAGS-tst-armtlsdescextlazymod.c += -Dstatic= --CFLAGS-tst-armtlsdesclocmod.c += -mtls-dialect=gnu2 --CFLAGS-tst-armtlsdescextnowmod.c += -mtls-dialect=gnu2 --CFLAGS-tst-armtlsdescextlazymod.c += -mtls-dialect=gnu2 -+CFLAGS-tst-armtlsdesclocmod.c += -mtls-dialect=$(have-mtls-descriptor) -+CFLAGS-tst-armtlsdescextnowmod.c += -mtls-dialect=$(have-mtls-descriptor) -+CFLAGS-tst-armtlsdescextlazymod.c += -mtls-dialect=$(have-mtls-descriptor) - LDFLAGS-tst-armtlsdescextnowmod.so += -Wl,-z,now - tst-armtlsdescloc-ENV = LD_BIND_NOW=1 - tst-armtlsdescextnow-ENV = LD_BIND_NOW=1 - -commit 5a461f2949ded98d8211939f84988bc464c7b4fe -Author: Andreas Schwab -Date: Tue Mar 19 13:49:50 2024 +0100 - - Add tst-gnu2-tls2mod1 to test-internal-extras - - That allows sysdeps/x86_64/tst-gnu2-tls2mod1.S to use internal headers. - - Fixes: 717ebfa85c ("x86-64: Allocate state buffer space for RDI, RSI and RBX") - (cherry picked from commit fd7ee2e6c5eb49e4a630a9978b4d668bff6354ee) - -diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile -index e8babc9a4e..9d374a3299 100644 ---- a/sysdeps/x86_64/Makefile -+++ b/sysdeps/x86_64/Makefile -@@ -210,6 +210,8 @@ tst-plt-rewrite2-ENV = GLIBC_TUNABLES=glibc.cpu.plt_rewrite=2 - $(objpfx)tst-plt-rewrite2: $(objpfx)tst-plt-rewritemod2.so - endif - -+test-internal-extras += tst-gnu2-tls2mod1 -+ - endif # $(subdir) == elf - - ifeq ($(subdir),csu) - -commit aa4249266e9906c4bc833e4847f4d8feef59504f -Author: Adhemerval Zanella -Date: Thu Feb 8 10:08:38 2024 -0300 - - x86: Fix Zen3/Zen4 ERMS selection (BZ 30994) - - The REP MOVSB usage on memcpy/memmove does not show much performance - improvement on Zen3/Zen4 cores compared to the vectorized loops. Also, - as from BZ 30994, if the source is aligned and the destination is not - the performance can be 20x slower. - - The performance difference is noticeable with small buffer sizes, closer - to the lower bounds limits when memcpy/memmove starts to use ERMS. The - performance of REP MOVSB is similar to vectorized instruction on the - size limit (the L2 cache). Also, there is no drawback to multiple cores - sharing the cache. - - Checked on x86_64-linux-gnu on Zen3. - Reviewed-by: H.J. Lu - - (cherry picked from commit 0c0d39fe4aeb0f69b26e76337c5dfd5530d5d44e) - -diff --git a/sysdeps/x86/dl-cacheinfo.h b/sysdeps/x86/dl-cacheinfo.h -index d5101615e3..f34d12846c 100644 ---- a/sysdeps/x86/dl-cacheinfo.h -+++ b/sysdeps/x86/dl-cacheinfo.h -@@ -791,7 +791,6 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) - long int data = -1; - long int shared = -1; - long int shared_per_thread = -1; -- long int core = -1; - unsigned int threads = 0; - unsigned long int level1_icache_size = -1; - unsigned long int level1_icache_linesize = -1; -@@ -809,7 +808,6 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) - if (cpu_features->basic.kind == arch_kind_intel) - { - data = handle_intel (_SC_LEVEL1_DCACHE_SIZE, cpu_features); -- core = handle_intel (_SC_LEVEL2_CACHE_SIZE, cpu_features); - shared = handle_intel (_SC_LEVEL3_CACHE_SIZE, cpu_features); - shared_per_thread = shared; - -@@ -822,7 +820,8 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) - = handle_intel (_SC_LEVEL1_DCACHE_ASSOC, cpu_features); - level1_dcache_linesize - = handle_intel (_SC_LEVEL1_DCACHE_LINESIZE, cpu_features); -- level2_cache_size = core; -+ level2_cache_size -+ = handle_intel (_SC_LEVEL2_CACHE_SIZE, cpu_features); - level2_cache_assoc - = handle_intel (_SC_LEVEL2_CACHE_ASSOC, cpu_features); - level2_cache_linesize -@@ -835,12 +834,12 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) - level4_cache_size - = handle_intel (_SC_LEVEL4_CACHE_SIZE, cpu_features); - -- get_common_cache_info (&shared, &shared_per_thread, &threads, core); -+ get_common_cache_info (&shared, &shared_per_thread, &threads, -+ level2_cache_size); - } - else if (cpu_features->basic.kind == arch_kind_zhaoxin) - { - data = handle_zhaoxin (_SC_LEVEL1_DCACHE_SIZE); -- core = handle_zhaoxin (_SC_LEVEL2_CACHE_SIZE); - shared = handle_zhaoxin (_SC_LEVEL3_CACHE_SIZE); - shared_per_thread = shared; - -@@ -849,19 +848,19 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) - level1_dcache_size = data; - level1_dcache_assoc = handle_zhaoxin (_SC_LEVEL1_DCACHE_ASSOC); - level1_dcache_linesize = handle_zhaoxin (_SC_LEVEL1_DCACHE_LINESIZE); -- level2_cache_size = core; -+ level2_cache_size = handle_zhaoxin (_SC_LEVEL2_CACHE_SIZE); - level2_cache_assoc = handle_zhaoxin (_SC_LEVEL2_CACHE_ASSOC); - level2_cache_linesize = handle_zhaoxin (_SC_LEVEL2_CACHE_LINESIZE); - level3_cache_size = shared; - level3_cache_assoc = handle_zhaoxin (_SC_LEVEL3_CACHE_ASSOC); - level3_cache_linesize = handle_zhaoxin (_SC_LEVEL3_CACHE_LINESIZE); - -- get_common_cache_info (&shared, &shared_per_thread, &threads, core); -+ get_common_cache_info (&shared, &shared_per_thread, &threads, -+ level2_cache_size); - } - else if (cpu_features->basic.kind == arch_kind_amd) - { - data = handle_amd (_SC_LEVEL1_DCACHE_SIZE); -- core = handle_amd (_SC_LEVEL2_CACHE_SIZE); - shared = handle_amd (_SC_LEVEL3_CACHE_SIZE); - - level1_icache_size = handle_amd (_SC_LEVEL1_ICACHE_SIZE); -@@ -869,7 +868,7 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) - level1_dcache_size = data; - level1_dcache_assoc = handle_amd (_SC_LEVEL1_DCACHE_ASSOC); - level1_dcache_linesize = handle_amd (_SC_LEVEL1_DCACHE_LINESIZE); -- level2_cache_size = core; -+ level2_cache_size = handle_amd (_SC_LEVEL2_CACHE_SIZE);; - level2_cache_assoc = handle_amd (_SC_LEVEL2_CACHE_ASSOC); - level2_cache_linesize = handle_amd (_SC_LEVEL2_CACHE_LINESIZE); - level3_cache_size = shared; -@@ -880,12 +879,12 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) - if (shared <= 0) - { - /* No shared L3 cache. All we have is the L2 cache. */ -- shared = core; -+ shared = level2_cache_size; - } - else if (cpu_features->basic.family < 0x17) - { - /* Account for exclusive L2 and L3 caches. */ -- shared += core; -+ shared += level2_cache_size; - } - - shared_per_thread = shared; -@@ -987,6 +986,12 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) - if (CPU_FEATURE_USABLE_P (cpu_features, FSRM)) - rep_movsb_threshold = 2112; - -+ /* For AMD CPUs that support ERMS (Zen3+), REP MOVSB is in a lot of -+ cases slower than the vectorized path (and for some alignments, -+ it is really slow, check BZ #30994). */ -+ if (cpu_features->basic.kind == arch_kind_amd) -+ rep_movsb_threshold = non_temporal_threshold; -+ - /* The default threshold to use Enhanced REP STOSB. */ - unsigned long int rep_stosb_threshold = 2048; - -@@ -1028,16 +1033,9 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) - SIZE_MAX); - - unsigned long int rep_movsb_stop_threshold; -- /* ERMS feature is implemented from AMD Zen3 architecture and it is -- performing poorly for data above L2 cache size. Henceforth, adding -- an upper bound threshold parameter to limit the usage of Enhanced -- REP MOVSB operations and setting its value to L2 cache size. */ -- if (cpu_features->basic.kind == arch_kind_amd) -- rep_movsb_stop_threshold = core; - /* Setting the upper bound of ERMS to the computed value of -- non-temporal threshold for architectures other than AMD. */ -- else -- rep_movsb_stop_threshold = non_temporal_threshold; -+ non-temporal threshold for all architectures. */ -+ rep_movsb_stop_threshold = non_temporal_threshold; - - cpu_features->data_cache_size = data; - cpu_features->shared_cache_size = shared; - -commit 6484a92698039c4a7a510f0214e22d067b0d78b3 -Author: Adhemerval Zanella -Date: Thu Feb 8 10:08:39 2024 -0300 - - x86: Do not prefer ERMS for memset on Zen3+ - - For AMD Zen3+ architecture, the performance of the vectorized loop is - slightly better than ERMS. - - Checked on x86_64-linux-gnu on Zen3. - Reviewed-by: H.J. Lu - - (cherry picked from commit 272708884cb750f12f5c74a00e6620c19dc6d567) - -diff --git a/sysdeps/x86/dl-cacheinfo.h b/sysdeps/x86/dl-cacheinfo.h -index f34d12846c..5a98f70364 100644 ---- a/sysdeps/x86/dl-cacheinfo.h -+++ b/sysdeps/x86/dl-cacheinfo.h -@@ -1021,6 +1021,11 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) - minimum value is fixed. */ - rep_stosb_threshold = TUNABLE_GET (x86_rep_stosb_threshold, - long int, NULL); -+ if (cpu_features->basic.kind == arch_kind_amd -+ && !TUNABLE_IS_INITIALIZED (x86_rep_stosb_threshold)) -+ /* For AMD Zen3+ architecture, the performance of the vectorized loop is -+ slightly better than ERMS. */ -+ rep_stosb_threshold = SIZE_MAX; - - TUNABLE_SET_WITH_BOUNDS (x86_data_cache_size, data, 0, SIZE_MAX); - TUNABLE_SET_WITH_BOUNDS (x86_shared_cache_size, shared, 0, SIZE_MAX); - -commit 5d070d12b3a52bc44dd1b71743abc4b6243862ae -Author: Adhemerval Zanella -Date: Thu Feb 8 10:08:40 2024 -0300 - - x86: Expand the comment on when REP STOSB is used on memset - - Reviewed-by: H.J. Lu - (cherry picked from commit 491e55beab7457ed310a4a47496f4a333c5d1032) - -diff --git a/sysdeps/x86_64/multiarch/memset-vec-unaligned-erms.S b/sysdeps/x86_64/multiarch/memset-vec-unaligned-erms.S -index 9984c3ca0f..97839a2248 100644 ---- a/sysdeps/x86_64/multiarch/memset-vec-unaligned-erms.S -+++ b/sysdeps/x86_64/multiarch/memset-vec-unaligned-erms.S -@@ -21,7 +21,9 @@ - 2. If size is less than VEC, use integer register stores. - 3. If size is from VEC_SIZE to 2 * VEC_SIZE, use 2 VEC stores. - 4. If size is from 2 * VEC_SIZE to 4 * VEC_SIZE, use 4 VEC stores. -- 5. If size is more to 4 * VEC_SIZE, align to 4 * VEC_SIZE with -+ 5. On machines ERMS feature, if size is greater or equal than -+ __x86_rep_stosb_threshold then REP STOSB will be used. -+ 6. If size is more to 4 * VEC_SIZE, align to 4 * VEC_SIZE with - 4 VEC stores and store 4 * VEC at a time until done. */ - - #include - -commit 31c7d69af59da0da80caa74b2ec6ae149013384d -Author: Florian Weimer -Date: Fri Feb 16 07:40:37 2024 +0100 - - i386: Use generic memrchr in libc (bug 31316) - - Before this change, we incorrectly used the SSE2 variant in the - implementation, without checking that the system actually supports - SSE2. - - Tested-by: Sam James - (cherry picked from commit 0d9166c2245cad4ac520b337dee40c9a583872b6) - -diff --git a/sysdeps/i386/i686/multiarch/memrchr-c.c b/sysdeps/i386/i686/multiarch/memrchr-c.c -index ef7bbbe792..20bfdf3af3 100644 ---- a/sysdeps/i386/i686/multiarch/memrchr-c.c -+++ b/sysdeps/i386/i686/multiarch/memrchr-c.c -@@ -5,3 +5,4 @@ extern void *__memrchr_ia32 (const void *, int, size_t); - #endif - - #include "string/memrchr.c" -+strong_alias (__memrchr_ia32, __GI___memrchr) -diff --git a/sysdeps/i386/i686/multiarch/memrchr-sse2.S b/sysdeps/i386/i686/multiarch/memrchr-sse2.S -index d9dae04171..e123f87435 100644 ---- a/sysdeps/i386/i686/multiarch/memrchr-sse2.S -+++ b/sysdeps/i386/i686/multiarch/memrchr-sse2.S -@@ -720,5 +720,4 @@ L(ret_null): - ret - - END (__memrchr_sse2) --strong_alias (__memrchr_sse2, __GI___memrchr) - #endif - -commit b0e0a07018098c2c5927796be5681a298c312626 -Author: Joe Ramsay -Date: Tue Feb 20 16:44:13 2024 +0000 - - aarch64/fpu: Sync libmvec routines from 2.39 and before with AOR - - This includes a fix for big-endian in AdvSIMD log, some cosmetic - changes, and numerous small optimisations mainly around inlining and - using indexed variants of MLA intrinsics. - Reviewed-by: Adhemerval Zanella - - (cherry picked from commit e302e1021391d13a9611ba3a910df128830bd19e) - -diff --git a/sysdeps/aarch64/fpu/acos_advsimd.c b/sysdeps/aarch64/fpu/acos_advsimd.c -index a8eabb5e71..0a86c9823a 100644 ---- a/sysdeps/aarch64/fpu/acos_advsimd.c -+++ b/sysdeps/aarch64/fpu/acos_advsimd.c -@@ -40,8 +40,8 @@ static const struct data - }; - - #define AllMask v_u64 (0xffffffffffffffff) --#define Oneu (0x3ff0000000000000) --#define Small (0x3e50000000000000) /* 2^-53. */ -+#define Oneu 0x3ff0000000000000 -+#define Small 0x3e50000000000000 /* 2^-53. */ - - #if WANT_SIMD_EXCEPT - static float64x2_t VPCS_ATTR NOINLINE -diff --git a/sysdeps/aarch64/fpu/asin_advsimd.c b/sysdeps/aarch64/fpu/asin_advsimd.c -index 141646e954..2de6eff407 100644 ---- a/sysdeps/aarch64/fpu/asin_advsimd.c -+++ b/sysdeps/aarch64/fpu/asin_advsimd.c -@@ -39,8 +39,8 @@ static const struct data - }; - - #define AllMask v_u64 (0xffffffffffffffff) --#define One (0x3ff0000000000000) --#define Small (0x3e50000000000000) /* 2^-12. */ -+#define One 0x3ff0000000000000 -+#define Small 0x3e50000000000000 /* 2^-12. */ - - #if WANT_SIMD_EXCEPT - static float64x2_t VPCS_ATTR NOINLINE -diff --git a/sysdeps/aarch64/fpu/atan2_sve.c b/sysdeps/aarch64/fpu/atan2_sve.c -index 09a4c559b8..04fa71fa37 100644 ---- a/sysdeps/aarch64/fpu/atan2_sve.c -+++ b/sysdeps/aarch64/fpu/atan2_sve.c -@@ -37,9 +37,6 @@ static const struct data - .pi_over_2 = 0x1.921fb54442d18p+0, - }; - --/* Useful constants. */ --#define SignMask sv_u64 (0x8000000000000000) -- - /* Special cases i.e. 0, infinity, nan (fall back to scalar calls). */ - static svfloat64_t NOINLINE - special_case (svfloat64_t y, svfloat64_t x, svfloat64_t ret, -@@ -72,14 +69,15 @@ svfloat64_t SV_NAME_D2 (atan2) (svfloat64_t y, svfloat64_t x, const svbool_t pg) - svbool_t cmp_y = zeroinfnan (iy, pg); - svbool_t cmp_xy = svorr_z (pg, cmp_x, cmp_y); - -- svuint64_t sign_x = svand_x (pg, ix, SignMask); -- svuint64_t sign_y = svand_x (pg, iy, SignMask); -- svuint64_t sign_xy = sveor_x (pg, sign_x, sign_y); -- - svfloat64_t ax = svabs_x (pg, x); - svfloat64_t ay = svabs_x (pg, y); -+ svuint64_t iax = svreinterpret_u64 (ax); -+ svuint64_t iay = svreinterpret_u64 (ay); -+ -+ svuint64_t sign_x = sveor_x (pg, ix, iax); -+ svuint64_t sign_y = sveor_x (pg, iy, iay); -+ svuint64_t sign_xy = sveor_x (pg, sign_x, sign_y); - -- svbool_t pred_xlt0 = svcmplt (pg, x, 0.0); - svbool_t pred_aygtax = svcmpgt (pg, ay, ax); - - /* Set up z for call to atan. */ -@@ -88,8 +86,9 @@ svfloat64_t SV_NAME_D2 (atan2) (svfloat64_t y, svfloat64_t x, const svbool_t pg) - svfloat64_t z = svdiv_x (pg, n, d); - - /* Work out the correct shift. */ -- svfloat64_t shift = svsel (pred_xlt0, sv_f64 (-2.0), sv_f64 (0.0)); -- shift = svsel (pred_aygtax, svadd_x (pg, shift, 1.0), shift); -+ svfloat64_t shift = svreinterpret_f64 (svlsr_x (pg, sign_x, 1)); -+ shift = svsel (pred_aygtax, sv_f64 (1.0), shift); -+ shift = svreinterpret_f64 (svorr_x (pg, sign_x, svreinterpret_u64 (shift))); - shift = svmul_x (pg, shift, data_ptr->pi_over_2); - - /* Use split Estrin scheme for P(z^2) with deg(P)=19. */ -@@ -109,10 +108,10 @@ svfloat64_t SV_NAME_D2 (atan2) (svfloat64_t y, svfloat64_t x, const svbool_t pg) - ret = svadd_m (pg, ret, shift); - - /* Account for the sign of x and y. */ -- ret = svreinterpret_f64 (sveor_x (pg, svreinterpret_u64 (ret), sign_xy)); -- - if (__glibc_unlikely (svptest_any (pg, cmp_xy))) -- return special_case (y, x, ret, cmp_xy); -- -- return ret; -+ return special_case ( -+ y, x, -+ svreinterpret_f64 (sveor_x (pg, svreinterpret_u64 (ret), sign_xy)), -+ cmp_xy); -+ return svreinterpret_f64 (sveor_x (pg, svreinterpret_u64 (ret), sign_xy)); - } -diff --git a/sysdeps/aarch64/fpu/atan2f_sve.c b/sysdeps/aarch64/fpu/atan2f_sve.c -index b92f83cdea..9ea197147c 100644 ---- a/sysdeps/aarch64/fpu/atan2f_sve.c -+++ b/sysdeps/aarch64/fpu/atan2f_sve.c -@@ -32,10 +32,8 @@ static const struct data - .pi_over_2 = 0x1.921fb6p+0f, - }; - --#define SignMask sv_u32 (0x80000000) -- - /* Special cases i.e. 0, infinity, nan (fall back to scalar calls). */ --static inline svfloat32_t -+static svfloat32_t NOINLINE - special_case (svfloat32_t y, svfloat32_t x, svfloat32_t ret, - const svbool_t cmp) - { -@@ -67,14 +65,15 @@ svfloat32_t SV_NAME_F2 (atan2) (svfloat32_t y, svfloat32_t x, const svbool_t pg) - svbool_t cmp_y = zeroinfnan (iy, pg); - svbool_t cmp_xy = svorr_z (pg, cmp_x, cmp_y); - -- svuint32_t sign_x = svand_x (pg, ix, SignMask); -- svuint32_t sign_y = svand_x (pg, iy, SignMask); -- svuint32_t sign_xy = sveor_x (pg, sign_x, sign_y); -- - svfloat32_t ax = svabs_x (pg, x); - svfloat32_t ay = svabs_x (pg, y); -+ svuint32_t iax = svreinterpret_u32 (ax); -+ svuint32_t iay = svreinterpret_u32 (ay); -+ -+ svuint32_t sign_x = sveor_x (pg, ix, iax); -+ svuint32_t sign_y = sveor_x (pg, iy, iay); -+ svuint32_t sign_xy = sveor_x (pg, sign_x, sign_y); - -- svbool_t pred_xlt0 = svcmplt (pg, x, 0.0); - svbool_t pred_aygtax = svcmpgt (pg, ay, ax); - - /* Set up z for call to atan. */ -@@ -83,11 +82,12 @@ svfloat32_t SV_NAME_F2 (atan2) (svfloat32_t y, svfloat32_t x, const svbool_t pg) - svfloat32_t z = svdiv_x (pg, n, d); - - /* Work out the correct shift. */ -- svfloat32_t shift = svsel (pred_xlt0, sv_f32 (-2.0), sv_f32 (0.0)); -- shift = svsel (pred_aygtax, svadd_x (pg, shift, 1.0), shift); -+ svfloat32_t shift = svreinterpret_f32 (svlsr_x (pg, sign_x, 1)); -+ shift = svsel (pred_aygtax, sv_f32 (1.0), shift); -+ shift = svreinterpret_f32 (svorr_x (pg, sign_x, svreinterpret_u32 (shift))); - shift = svmul_x (pg, shift, sv_f32 (data_ptr->pi_over_2)); - -- /* Use split Estrin scheme for P(z^2) with deg(P)=7. */ -+ /* Use pure Estrin scheme for P(z^2) with deg(P)=7. */ - svfloat32_t z2 = svmul_x (pg, z, z); - svfloat32_t z4 = svmul_x (pg, z2, z2); - svfloat32_t z8 = svmul_x (pg, z4, z4); -@@ -101,10 +101,12 @@ svfloat32_t SV_NAME_F2 (atan2) (svfloat32_t y, svfloat32_t x, const svbool_t pg) - ret = svadd_m (pg, ret, shift); - - /* Account for the sign of x and y. */ -- ret = svreinterpret_f32 (sveor_x (pg, svreinterpret_u32 (ret), sign_xy)); - - if (__glibc_unlikely (svptest_any (pg, cmp_xy))) -- return special_case (y, x, ret, cmp_xy); -+ return special_case ( -+ y, x, -+ svreinterpret_f32 (sveor_x (pg, svreinterpret_u32 (ret), sign_xy)), -+ cmp_xy); - -- return ret; -+ return svreinterpret_f32 (sveor_x (pg, svreinterpret_u32 (ret), sign_xy)); - } -diff --git a/sysdeps/aarch64/fpu/cos_advsimd.c b/sysdeps/aarch64/fpu/cos_advsimd.c -index 2897e8b909..3924c9ce44 100644 ---- a/sysdeps/aarch64/fpu/cos_advsimd.c -+++ b/sysdeps/aarch64/fpu/cos_advsimd.c -@@ -63,8 +63,7 @@ float64x2_t VPCS_ATTR V_NAME_D1 (cos) (float64x2_t x) - special-case handler later. */ - r = vbslq_f64 (cmp, v_f64 (1.0), r); - #else -- cmp = vcageq_f64 (d->range_val, x); -- cmp = vceqzq_u64 (cmp); /* cmp = ~cmp. */ -+ cmp = vcageq_f64 (x, d->range_val); - r = x; - #endif - -diff --git a/sysdeps/aarch64/fpu/cosf_advsimd.c b/sysdeps/aarch64/fpu/cosf_advsimd.c -index 60abc8dfcf..d0c285b03a 100644 ---- a/sysdeps/aarch64/fpu/cosf_advsimd.c -+++ b/sysdeps/aarch64/fpu/cosf_advsimd.c -@@ -64,8 +64,7 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (cos) (float32x4_t x) - special-case handler later. */ - r = vbslq_f32 (cmp, v_f32 (1.0f), r); - #else -- cmp = vcageq_f32 (d->range_val, x); -- cmp = vceqzq_u32 (cmp); /* cmp = ~cmp. */ -+ cmp = vcageq_f32 (x, d->range_val); - r = x; - #endif - -diff --git a/sysdeps/aarch64/fpu/exp10_advsimd.c b/sysdeps/aarch64/fpu/exp10_advsimd.c -index fe7149b191..eeb31ca839 100644 ---- a/sysdeps/aarch64/fpu/exp10_advsimd.c -+++ b/sysdeps/aarch64/fpu/exp10_advsimd.c -@@ -57,7 +57,7 @@ const static struct data - # define BigBound v_u64 (0x4070000000000000) /* asuint64 (0x1p8). */ - # define Thres v_u64 (0x2070000000000000) /* BigBound - TinyBound. */ - --static inline float64x2_t VPCS_ATTR -+static float64x2_t VPCS_ATTR NOINLINE - special_case (float64x2_t x, float64x2_t y, uint64x2_t cmp) - { - /* If fenv exceptions are to be triggered correctly, fall back to the scalar -@@ -72,7 +72,7 @@ special_case (float64x2_t x, float64x2_t y, uint64x2_t cmp) - # define SpecialBias1 v_u64 (0x7000000000000000) /* 0x1p769. */ - # define SpecialBias2 v_u64 (0x3010000000000000) /* 0x1p-254. */ - --static float64x2_t VPCS_ATTR NOINLINE -+static inline float64x2_t VPCS_ATTR - special_case (float64x2_t s, float64x2_t y, float64x2_t n, - const struct data *d) - { -diff --git a/sysdeps/aarch64/fpu/exp10f_advsimd.c b/sysdeps/aarch64/fpu/exp10f_advsimd.c -index 7ee0c90948..ab117b69da 100644 ---- a/sysdeps/aarch64/fpu/exp10f_advsimd.c -+++ b/sysdeps/aarch64/fpu/exp10f_advsimd.c -@@ -25,7 +25,8 @@ - static const struct data - { - float32x4_t poly[5]; -- float32x4_t shift, log10_2, log2_10_hi, log2_10_lo; -+ float32x4_t log10_2_and_inv, shift; -+ - #if !WANT_SIMD_EXCEPT - float32x4_t scale_thresh; - #endif -@@ -38,9 +39,9 @@ static const struct data - .poly = { V4 (0x1.26bb16p+1f), V4 (0x1.5350d2p+1f), V4 (0x1.04744ap+1f), - V4 (0x1.2d8176p+0f), V4 (0x1.12b41ap-1f) }, - .shift = V4 (0x1.8p23f), -- .log10_2 = V4 (0x1.a934fp+1), -- .log2_10_hi = V4 (0x1.344136p-2), -- .log2_10_lo = V4 (-0x1.ec10cp-27), -+ -+ /* Stores constants 1/log10(2), log10(2)_high, log10(2)_low, 0. */ -+ .log10_2_and_inv = { 0x1.a934fp+1, 0x1.344136p-2, -0x1.ec10cp-27, 0 }, - #if !WANT_SIMD_EXCEPT - .scale_thresh = V4 (ScaleBound) - #endif -@@ -98,24 +99,22 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (exp10) (float32x4_t x) - #if WANT_SIMD_EXCEPT - /* asuint(x) - TinyBound >= BigBound - TinyBound. */ - uint32x4_t cmp = vcgeq_u32 ( -- vsubq_u32 (vandq_u32 (vreinterpretq_u32_f32 (x), v_u32 (0x7fffffff)), -- TinyBound), -- Thres); -+ vsubq_u32 (vreinterpretq_u32_f32 (vabsq_f32 (x)), TinyBound), Thres); - float32x4_t xm = x; - /* If any lanes are special, mask them with 1 and retain a copy of x to allow - special case handler to fix special lanes later. This is only necessary if - fenv exceptions are to be triggered correctly. */ - if (__glibc_unlikely (v_any_u32 (cmp))) -- x = vbslq_f32 (cmp, v_f32 (1), x); -+ x = v_zerofy_f32 (x, cmp); - #endif - - /* exp10(x) = 2^n * 10^r = 2^n * (1 + poly (r)), - with poly(r) in [1/sqrt(2), sqrt(2)] and - x = r + n * log10 (2), with r in [-log10(2)/2, log10(2)/2]. */ -- float32x4_t z = vfmaq_f32 (d->shift, x, d->log10_2); -+ float32x4_t z = vfmaq_laneq_f32 (d->shift, x, d->log10_2_and_inv, 0); - float32x4_t n = vsubq_f32 (z, d->shift); -- float32x4_t r = vfmsq_f32 (x, n, d->log2_10_hi); -- r = vfmsq_f32 (r, n, d->log2_10_lo); -+ float32x4_t r = vfmsq_laneq_f32 (x, n, d->log10_2_and_inv, 1); -+ r = vfmsq_laneq_f32 (r, n, d->log10_2_and_inv, 2); - uint32x4_t e = vshlq_n_u32 (vreinterpretq_u32_f32 (z), 23); - - float32x4_t scale = vreinterpretq_f32_u32 (vaddq_u32 (e, ExponentBias)); -diff --git a/sysdeps/aarch64/fpu/exp2_advsimd.c b/sysdeps/aarch64/fpu/exp2_advsimd.c -index 391a93180c..ae1e63d503 100644 ---- a/sysdeps/aarch64/fpu/exp2_advsimd.c -+++ b/sysdeps/aarch64/fpu/exp2_advsimd.c -@@ -24,6 +24,7 @@ - #define IndexMask (N - 1) - #define BigBound 1022.0 - #define UOFlowBound 1280.0 -+#define TinyBound 0x2000000000000000 /* asuint64(0x1p-511). */ - - static const struct data - { -@@ -48,14 +49,13 @@ lookup_sbits (uint64x2_t i) - - #if WANT_SIMD_EXCEPT - --# define TinyBound 0x2000000000000000 /* asuint64(0x1p-511). */ - # define Thres 0x2080000000000000 /* asuint64(512.0) - TinyBound. */ - - /* Call scalar exp2 as a fallback. */ - static float64x2_t VPCS_ATTR NOINLINE --special_case (float64x2_t x) -+special_case (float64x2_t x, float64x2_t y, uint64x2_t is_special) - { -- return v_call_f64 (exp2, x, x, v_u64 (0xffffffffffffffff)); -+ return v_call_f64 (exp2, x, y, is_special); - } - - #else -@@ -65,7 +65,7 @@ special_case (float64x2_t x) - # define SpecialBias1 0x7000000000000000 /* 0x1p769. */ - # define SpecialBias2 0x3010000000000000 /* 0x1p-254. */ - --static float64x2_t VPCS_ATTR -+static inline float64x2_t VPCS_ATTR - special_case (float64x2_t s, float64x2_t y, float64x2_t n, - const struct data *d) - { -@@ -94,10 +94,10 @@ float64x2_t V_NAME_D1 (exp2) (float64x2_t x) - #if WANT_SIMD_EXCEPT - uint64x2_t ia = vreinterpretq_u64_f64 (vabsq_f64 (x)); - cmp = vcgeq_u64 (vsubq_u64 (ia, v_u64 (TinyBound)), v_u64 (Thres)); -- /* If any special case (inf, nan, small and large x) is detected, -- fall back to scalar for all lanes. */ -- if (__glibc_unlikely (v_any_u64 (cmp))) -- return special_case (x); -+ /* Mask special lanes and retain a copy of x for passing to special-case -+ handler. */ -+ float64x2_t xc = x; -+ x = v_zerofy_f64 (x, cmp); - #else - cmp = vcagtq_f64 (x, d->scale_big_bound); - #endif -@@ -120,9 +120,11 @@ float64x2_t V_NAME_D1 (exp2) (float64x2_t x) - float64x2_t y = v_pairwise_poly_3_f64 (r, r2, d->poly); - y = vmulq_f64 (r, y); - --#if !WANT_SIMD_EXCEPT - if (__glibc_unlikely (v_any_u64 (cmp))) -+#if !WANT_SIMD_EXCEPT - return special_case (s, y, n, d); -+#else -+ return special_case (xc, vfmaq_f64 (s, s, y), cmp); - #endif - return vfmaq_f64 (s, s, y); - } -diff --git a/sysdeps/aarch64/fpu/exp2f_sve.c b/sysdeps/aarch64/fpu/exp2f_sve.c -index 9a5a523a10..8a686e3e05 100644 ---- a/sysdeps/aarch64/fpu/exp2f_sve.c -+++ b/sysdeps/aarch64/fpu/exp2f_sve.c -@@ -20,6 +20,8 @@ - #include "sv_math.h" - #include "poly_sve_f32.h" - -+#define Thres 0x1.5d5e2ap+6f -+ - static const struct data - { - float poly[5]; -@@ -33,7 +35,7 @@ static const struct data - .shift = 0x1.903f8p17f, - /* Roughly 87.3. For x < -Thres, the result is subnormal and not handled - correctly by FEXPA. */ -- .thres = 0x1.5d5e2ap+6f, -+ .thres = Thres, - }; - - static svfloat32_t NOINLINE -diff --git a/sysdeps/aarch64/fpu/exp_advsimd.c b/sysdeps/aarch64/fpu/exp_advsimd.c -index fd215f1d2c..5e3a9a0d44 100644 ---- a/sysdeps/aarch64/fpu/exp_advsimd.c -+++ b/sysdeps/aarch64/fpu/exp_advsimd.c -@@ -54,7 +54,7 @@ const static volatile struct - # define BigBound v_u64 (0x4080000000000000) /* asuint64 (0x1p9). */ - # define SpecialBound v_u64 (0x2080000000000000) /* BigBound - TinyBound. */ - --static inline float64x2_t VPCS_ATTR -+static float64x2_t VPCS_ATTR NOINLINE - special_case (float64x2_t x, float64x2_t y, uint64x2_t cmp) - { - /* If fenv exceptions are to be triggered correctly, fall back to the scalar -@@ -69,7 +69,7 @@ special_case (float64x2_t x, float64x2_t y, uint64x2_t cmp) - # define SpecialBias1 v_u64 (0x7000000000000000) /* 0x1p769. */ - # define SpecialBias2 v_u64 (0x3010000000000000) /* 0x1p-254. */ - --static float64x2_t VPCS_ATTR NOINLINE -+static inline float64x2_t VPCS_ATTR - special_case (float64x2_t s, float64x2_t y, float64x2_t n) - { - /* 2^(n/N) may overflow, break it up into s1*s2. */ -diff --git a/sysdeps/aarch64/fpu/expm1_advsimd.c b/sysdeps/aarch64/fpu/expm1_advsimd.c -index 0b85bd06f3..3628398674 100644 ---- a/sysdeps/aarch64/fpu/expm1_advsimd.c -+++ b/sysdeps/aarch64/fpu/expm1_advsimd.c -@@ -23,7 +23,7 @@ - static const struct data - { - float64x2_t poly[11]; -- float64x2_t invln2, ln2_lo, ln2_hi, shift; -+ float64x2_t invln2, ln2, shift; - int64x2_t exponent_bias; - #if WANT_SIMD_EXCEPT - uint64x2_t thresh, tiny_bound; -@@ -38,8 +38,7 @@ static const struct data - V2 (0x1.71ddf82db5bb4p-19), V2 (0x1.27e517fc0d54bp-22), - V2 (0x1.af5eedae67435p-26), V2 (0x1.1f143d060a28ap-29) }, - .invln2 = V2 (0x1.71547652b82fep0), -- .ln2_hi = V2 (0x1.62e42fefa39efp-1), -- .ln2_lo = V2 (0x1.abc9e3b39803fp-56), -+ .ln2 = { 0x1.62e42fefa39efp-1, 0x1.abc9e3b39803fp-56 }, - .shift = V2 (0x1.8p52), - .exponent_bias = V2 (0x3ff0000000000000), - #if WANT_SIMD_EXCEPT -@@ -83,7 +82,7 @@ float64x2_t VPCS_ATTR V_NAME_D1 (expm1) (float64x2_t x) - x = v_zerofy_f64 (x, special); - #else - /* Large input, NaNs and Infs. */ -- uint64x2_t special = vceqzq_u64 (vcaltq_f64 (x, d->oflow_bound)); -+ uint64x2_t special = vcageq_f64 (x, d->oflow_bound); - #endif - - /* Reduce argument to smaller range: -@@ -93,8 +92,8 @@ float64x2_t VPCS_ATTR V_NAME_D1 (expm1) (float64x2_t x) - where 2^i is exact because i is an integer. */ - float64x2_t n = vsubq_f64 (vfmaq_f64 (d->shift, d->invln2, x), d->shift); - int64x2_t i = vcvtq_s64_f64 (n); -- float64x2_t f = vfmsq_f64 (x, n, d->ln2_hi); -- f = vfmsq_f64 (f, n, d->ln2_lo); -+ float64x2_t f = vfmsq_laneq_f64 (x, n, d->ln2, 0); -+ f = vfmsq_laneq_f64 (f, n, d->ln2, 1); - - /* Approximate expm1(f) using polynomial. - Taylor expansion for expm1(x) has the form: -diff --git a/sysdeps/aarch64/fpu/expm1f_advsimd.c b/sysdeps/aarch64/fpu/expm1f_advsimd.c -index 8d4c9a2193..93db200f61 100644 ---- a/sysdeps/aarch64/fpu/expm1f_advsimd.c -+++ b/sysdeps/aarch64/fpu/expm1f_advsimd.c -@@ -23,7 +23,8 @@ - static const struct data - { - float32x4_t poly[5]; -- float32x4_t invln2, ln2_lo, ln2_hi, shift; -+ float32x4_t invln2_and_ln2; -+ float32x4_t shift; - int32x4_t exponent_bias; - #if WANT_SIMD_EXCEPT - uint32x4_t thresh; -@@ -34,9 +35,8 @@ static const struct data - /* Generated using fpminimax with degree=5 in [-log(2)/2, log(2)/2]. */ - .poly = { V4 (0x1.fffffep-2), V4 (0x1.5554aep-3), V4 (0x1.555736p-5), - V4 (0x1.12287cp-7), V4 (0x1.6b55a2p-10) }, -- .invln2 = V4 (0x1.715476p+0f), -- .ln2_hi = V4 (0x1.62e4p-1f), -- .ln2_lo = V4 (0x1.7f7d1cp-20f), -+ /* Stores constants: invln2, ln2_hi, ln2_lo, 0. */ -+ .invln2_and_ln2 = { 0x1.715476p+0f, 0x1.62e4p-1f, 0x1.7f7d1cp-20f, 0 }, - .shift = V4 (0x1.8p23f), - .exponent_bias = V4 (0x3f800000), - #if !WANT_SIMD_EXCEPT -@@ -80,7 +80,7 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (expm1) (float32x4_t x) - x = v_zerofy_f32 (x, special); - #else - /* Handles very large values (+ve and -ve), +/-NaN, +/-Inf. */ -- uint32x4_t special = vceqzq_u32 (vcaltq_f32 (x, d->oflow_bound)); -+ uint32x4_t special = vcagtq_f32 (x, d->oflow_bound); - #endif - - /* Reduce argument to smaller range: -@@ -88,10 +88,11 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (expm1) (float32x4_t x) - and f = x - i * ln2, then f is in [-ln2/2, ln2/2]. - exp(x) - 1 = 2^i * (expm1(f) + 1) - 1 - where 2^i is exact because i is an integer. */ -- float32x4_t j = vsubq_f32 (vfmaq_f32 (d->shift, d->invln2, x), d->shift); -+ float32x4_t j = vsubq_f32 ( -+ vfmaq_laneq_f32 (d->shift, x, d->invln2_and_ln2, 0), d->shift); - int32x4_t i = vcvtq_s32_f32 (j); -- float32x4_t f = vfmsq_f32 (x, j, d->ln2_hi); -- f = vfmsq_f32 (f, j, d->ln2_lo); -+ float32x4_t f = vfmsq_laneq_f32 (x, j, d->invln2_and_ln2, 1); -+ f = vfmsq_laneq_f32 (f, j, d->invln2_and_ln2, 2); - - /* Approximate expm1(f) using polynomial. - Taylor expansion for expm1(x) has the form: -diff --git a/sysdeps/aarch64/fpu/log_advsimd.c b/sysdeps/aarch64/fpu/log_advsimd.c -index 067ae79613..21df61728c 100644 ---- a/sysdeps/aarch64/fpu/log_advsimd.c -+++ b/sysdeps/aarch64/fpu/log_advsimd.c -@@ -58,8 +58,13 @@ lookup (uint64x2_t i) - uint64_t i1 = (i[1] >> (52 - V_LOG_TABLE_BITS)) & IndexMask; - float64x2_t e0 = vld1q_f64 (&__v_log_data.table[i0].invc); - float64x2_t e1 = vld1q_f64 (&__v_log_data.table[i1].invc); -+#if __BYTE_ORDER == __LITTLE_ENDIAN - e.invc = vuzp1q_f64 (e0, e1); - e.logc = vuzp2q_f64 (e0, e1); -+#else -+ e.invc = vuzp1q_f64 (e1, e0); -+ e.logc = vuzp2q_f64 (e1, e0); -+#endif - return e; - } - -diff --git a/sysdeps/aarch64/fpu/sin_advsimd.c b/sysdeps/aarch64/fpu/sin_advsimd.c -index efce183e86..a0d9d3b819 100644 ---- a/sysdeps/aarch64/fpu/sin_advsimd.c -+++ b/sysdeps/aarch64/fpu/sin_advsimd.c -@@ -75,8 +75,7 @@ float64x2_t VPCS_ATTR V_NAME_D1 (sin) (float64x2_t x) - r = vbslq_f64 (cmp, vreinterpretq_f64_u64 (cmp), x); - #else - r = x; -- cmp = vcageq_f64 (d->range_val, x); -- cmp = vceqzq_u64 (cmp); /* cmp = ~cmp. */ -+ cmp = vcageq_f64 (x, d->range_val); - #endif - - /* n = rint(|x|/pi). */ -diff --git a/sysdeps/aarch64/fpu/sinf_advsimd.c b/sysdeps/aarch64/fpu/sinf_advsimd.c -index 60cf3f2ca1..375dfc3331 100644 ---- a/sysdeps/aarch64/fpu/sinf_advsimd.c -+++ b/sysdeps/aarch64/fpu/sinf_advsimd.c -@@ -67,8 +67,7 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (sin) (float32x4_t x) - r = vbslq_f32 (cmp, vreinterpretq_f32_u32 (cmp), x); - #else - r = x; -- cmp = vcageq_f32 (d->range_val, x); -- cmp = vceqzq_u32 (cmp); /* cmp = ~cmp. */ -+ cmp = vcageq_f32 (x, d->range_val); - #endif - - /* n = rint(|x|/pi) */ -diff --git a/sysdeps/aarch64/fpu/tan_advsimd.c b/sysdeps/aarch64/fpu/tan_advsimd.c -index d7e5ba7b1a..0459821ab2 100644 ---- a/sysdeps/aarch64/fpu/tan_advsimd.c -+++ b/sysdeps/aarch64/fpu/tan_advsimd.c -@@ -23,7 +23,7 @@ - static const struct data - { - float64x2_t poly[9]; -- float64x2_t half_pi_hi, half_pi_lo, two_over_pi, shift; -+ float64x2_t half_pi, two_over_pi, shift; - #if !WANT_SIMD_EXCEPT - float64x2_t range_val; - #endif -@@ -34,8 +34,7 @@ static const struct data - V2 (0x1.226e5e5ecdfa3p-7), V2 (0x1.d6c7ddbf87047p-9), - V2 (0x1.7ea75d05b583ep-10), V2 (0x1.289f22964a03cp-11), - V2 (0x1.4e4fd14147622p-12) }, -- .half_pi_hi = V2 (0x1.921fb54442d18p0), -- .half_pi_lo = V2 (0x1.1a62633145c07p-54), -+ .half_pi = { 0x1.921fb54442d18p0, 0x1.1a62633145c07p-54 }, - .two_over_pi = V2 (0x1.45f306dc9c883p-1), - .shift = V2 (0x1.8p52), - #if !WANT_SIMD_EXCEPT -@@ -56,15 +55,15 @@ special_case (float64x2_t x) - - /* Vector approximation for double-precision tan. - Maximum measured error is 3.48 ULP: -- __v_tan(0x1.4457047ef78d8p+20) got -0x1.f6ccd8ecf7dedp+37 -- want -0x1.f6ccd8ecf7deap+37. */ -+ _ZGVnN2v_tan(0x1.4457047ef78d8p+20) got -0x1.f6ccd8ecf7dedp+37 -+ want -0x1.f6ccd8ecf7deap+37. */ - float64x2_t VPCS_ATTR V_NAME_D1 (tan) (float64x2_t x) - { - const struct data *dat = ptr_barrier (&data); -- /* Our argument reduction cannot calculate q with sufficient accuracy for very -- large inputs. Fall back to scalar routine for all lanes if any are too -- large, or Inf/NaN. If fenv exceptions are expected, also fall back for tiny -- input to avoid underflow. */ -+ /* Our argument reduction cannot calculate q with sufficient accuracy for -+ very large inputs. Fall back to scalar routine for all lanes if any are -+ too large, or Inf/NaN. If fenv exceptions are expected, also fall back for -+ tiny input to avoid underflow. */ - #if WANT_SIMD_EXCEPT - uint64x2_t iax = vreinterpretq_u64_f64 (vabsq_f64 (x)); - /* iax - tiny_bound > range_val - tiny_bound. */ -@@ -82,8 +81,8 @@ float64x2_t VPCS_ATTR V_NAME_D1 (tan) (float64x2_t x) - /* Use q to reduce x to r in [-pi/4, pi/4], by: - r = x - q * pi/2, in extended precision. */ - float64x2_t r = x; -- r = vfmsq_f64 (r, q, dat->half_pi_hi); -- r = vfmsq_f64 (r, q, dat->half_pi_lo); -+ r = vfmsq_laneq_f64 (r, q, dat->half_pi, 0); -+ r = vfmsq_laneq_f64 (r, q, dat->half_pi, 1); - /* Further reduce r to [-pi/8, pi/8], to be reconstructed using double angle - formula. */ - r = vmulq_n_f64 (r, 0.5); -@@ -106,14 +105,15 @@ float64x2_t VPCS_ATTR V_NAME_D1 (tan) (float64x2_t x) - and reciprocity around pi/2: - tan(x) = 1 / (tan(pi/2 - x)) - to assemble result using change-of-sign and conditional selection of -- numerator/denominator, dependent on odd/even-ness of q (hence quadrant). */ -+ numerator/denominator, dependent on odd/even-ness of q (hence quadrant). -+ */ - float64x2_t n = vfmaq_f64 (v_f64 (-1), p, p); - float64x2_t d = vaddq_f64 (p, p); - - uint64x2_t no_recip = vtstq_u64 (vreinterpretq_u64_s64 (qi), v_u64 (1)); - - #if !WANT_SIMD_EXCEPT -- uint64x2_t special = vceqzq_u64 (vcaleq_f64 (x, dat->range_val)); -+ uint64x2_t special = vcageq_f64 (x, dat->range_val); - if (__glibc_unlikely (v_any_u64 (special))) - return special_case (x); - #endif -diff --git a/sysdeps/aarch64/fpu/tanf_advsimd.c b/sysdeps/aarch64/fpu/tanf_advsimd.c -index 1f16103f8a..5a7489390a 100644 ---- a/sysdeps/aarch64/fpu/tanf_advsimd.c -+++ b/sysdeps/aarch64/fpu/tanf_advsimd.c -@@ -23,7 +23,8 @@ - static const struct data - { - float32x4_t poly[6]; -- float32x4_t neg_half_pi_1, neg_half_pi_2, neg_half_pi_3, two_over_pi, shift; -+ float32x4_t pi_consts; -+ float32x4_t shift; - #if !WANT_SIMD_EXCEPT - float32x4_t range_val; - #endif -@@ -31,10 +32,9 @@ static const struct data - /* Coefficients generated using FPMinimax. */ - .poly = { V4 (0x1.55555p-2f), V4 (0x1.11166p-3f), V4 (0x1.b88a78p-5f), - V4 (0x1.7b5756p-6f), V4 (0x1.4ef4cep-8f), V4 (0x1.0e1e74p-7f) }, -- .neg_half_pi_1 = V4 (-0x1.921fb6p+0f), -- .neg_half_pi_2 = V4 (0x1.777a5cp-25f), -- .neg_half_pi_3 = V4 (0x1.ee59dap-50f), -- .two_over_pi = V4 (0x1.45f306p-1f), -+ /* Stores constants: (-pi/2)_high, (-pi/2)_mid, (-pi/2)_low, and 2/pi. */ -+ .pi_consts -+ = { -0x1.921fb6p+0f, 0x1.777a5cp-25f, 0x1.ee59dap-50f, 0x1.45f306p-1f }, - .shift = V4 (0x1.8p+23f), - #if !WANT_SIMD_EXCEPT - .range_val = V4 (0x1p15f), -@@ -58,10 +58,11 @@ eval_poly (float32x4_t z, const struct data *d) - { - float32x4_t z2 = vmulq_f32 (z, z); - #if WANT_SIMD_EXCEPT -- /* Tiny z (<= 0x1p-31) will underflow when calculating z^4. If fp exceptions -- are to be triggered correctly, sidestep this by fixing such lanes to 0. */ -+ /* Tiny z (<= 0x1p-31) will underflow when calculating z^4. -+ If fp exceptions are to be triggered correctly, -+ sidestep this by fixing such lanes to 0. */ - uint32x4_t will_uflow -- = vcleq_u32 (vreinterpretq_u32_f32 (vabsq_f32 (z)), TinyBound); -+ = vcleq_u32 (vreinterpretq_u32_f32 (vabsq_f32 (z)), TinyBound); - if (__glibc_unlikely (v_any_u32 (will_uflow))) - z2 = vbslq_f32 (will_uflow, v_f32 (0), z2); - #endif -@@ -94,16 +95,16 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (tan) (float32x4_t x) - #endif - - /* n = rint(x/(pi/2)). */ -- float32x4_t q = vfmaq_f32 (d->shift, d->two_over_pi, x); -+ float32x4_t q = vfmaq_laneq_f32 (d->shift, x, d->pi_consts, 3); - float32x4_t n = vsubq_f32 (q, d->shift); - /* Determine if x lives in an interval, where |tan(x)| grows to infinity. */ - uint32x4_t pred_alt = vtstq_u32 (vreinterpretq_u32_f32 (q), v_u32 (1)); - - /* r = x - n * (pi/2) (range reduction into -pi./4 .. pi/4). */ - float32x4_t r; -- r = vfmaq_f32 (x, d->neg_half_pi_1, n); -- r = vfmaq_f32 (r, d->neg_half_pi_2, n); -- r = vfmaq_f32 (r, d->neg_half_pi_3, n); -+ r = vfmaq_laneq_f32 (x, n, d->pi_consts, 0); -+ r = vfmaq_laneq_f32 (r, n, d->pi_consts, 1); -+ r = vfmaq_laneq_f32 (r, n, d->pi_consts, 2); - - /* If x lives in an interval, where |tan(x)| - - is finite, then use a polynomial approximation of the form - -commit 395a89f61e19fa916ae4cc93fc10d81a28ce3039 -Author: Szabolcs Nagy -Date: Wed Mar 13 14:34:14 2024 +0000 - - aarch64: fix check for SVE support in assembler - - Due to GCC bug 110901 -mcpu can override -march setting when compiling - asm code and thus a compiler targetting a specific cpu can fail the - configure check even when binutils gas supports SVE. - - The workaround is that explicit .arch directive overrides both -mcpu - and -march, and since that's what the actual SVE memcpy uses the - configure check should use that too even if the GCC issue is fixed - independently. - - Reviewed-by: Florian Weimer - (cherry picked from commit 73c26018ed0ecd9c807bb363cc2c2ab4aca66a82) - -diff --git a/sysdeps/aarch64/configure b/sysdeps/aarch64/configure -old mode 100644 -new mode 100755 -index ca57edce47..9606137e8d ---- a/sysdeps/aarch64/configure -+++ b/sysdeps/aarch64/configure -@@ -325,9 +325,10 @@ then : - printf %s "(cached) " >&6 - else $as_nop - cat > conftest.s <<\EOF -- ptrue p0.b -+ .arch armv8.2-a+sve -+ ptrue p0.b - EOF --if { ac_try='${CC-cc} -c -march=armv8.2-a+sve conftest.s 1>&5' -+if { ac_try='${CC-cc} -c conftest.s 1>&5' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 - (eval $ac_try) 2>&5 - ac_status=$? -diff --git a/sysdeps/aarch64/configure.ac b/sysdeps/aarch64/configure.ac -index 27874eceb4..56d12d661d 100644 ---- a/sysdeps/aarch64/configure.ac -+++ b/sysdeps/aarch64/configure.ac -@@ -90,9 +90,10 @@ LIBC_CONFIG_VAR([aarch64-variant-pcs], [$libc_cv_aarch64_variant_pcs]) - # Check if asm support armv8.2-a+sve - AC_CACHE_CHECK([for SVE support in assembler], [libc_cv_aarch64_sve_asm], [dnl - cat > conftest.s <<\EOF -- ptrue p0.b -+ .arch armv8.2-a+sve -+ ptrue p0.b - EOF --if AC_TRY_COMMAND(${CC-cc} -c -march=armv8.2-a+sve conftest.s 1>&AS_MESSAGE_LOG_FD); then -+if AC_TRY_COMMAND(${CC-cc} -c conftest.s 1>&AS_MESSAGE_LOG_FD); then - libc_cv_aarch64_sve_asm=yes - else - libc_cv_aarch64_sve_asm=no - -commit 9d92452c70805a2e2dbbdb2b1ffc34bd86e1c8df -Author: Wilco Dijkstra -Date: Thu Mar 21 16:48:33 2024 +0000 - - AArch64: Check kernel version for SVE ifuncs - - Old Linux kernels disable SVE after every system call. Calling the - SVE-optimized memcpy afterwards will then cause a trap to reenable SVE. - As a result, applications with a high use of syscalls may run slower with - the SVE memcpy. This is true for kernels between 4.15.0 and before 6.2.0, - except for 5.14.0 which was patched. Avoid this by checking the kernel - version and selecting the SVE ifunc on modern kernels. - - Parse the kernel version reported by uname() into a 24-bit kernel.major.minor - value without calling any library functions. If uname() is not supported or - if the version format is not recognized, assume the kernel is modern. - - Tested-by: Florian Weimer - Reviewed-by: Szabolcs Nagy - (cherry picked from commit 2e94e2f5d2bf2de124c8ad7da85463355e54ccb2) - -diff --git a/sysdeps/aarch64/cpu-features.h b/sysdeps/aarch64/cpu-features.h -index 77a782422a..5f2da91ebb 100644 ---- a/sysdeps/aarch64/cpu-features.h -+++ b/sysdeps/aarch64/cpu-features.h -@@ -71,6 +71,7 @@ struct cpu_features - /* Currently, the GLIBC memory tagging tunable only defines 8 bits. */ - uint8_t mte_state; - bool sve; -+ bool prefer_sve_ifuncs; - bool mops; - }; - -diff --git a/sysdeps/aarch64/multiarch/init-arch.h b/sysdeps/aarch64/multiarch/init-arch.h -index c52860efb2..61dc40088f 100644 ---- a/sysdeps/aarch64/multiarch/init-arch.h -+++ b/sysdeps/aarch64/multiarch/init-arch.h -@@ -36,5 +36,7 @@ - MTE_ENABLED (); \ - bool __attribute__((unused)) sve = \ - GLRO(dl_aarch64_cpu_features).sve; \ -+ bool __attribute__((unused)) prefer_sve_ifuncs = \ -+ GLRO(dl_aarch64_cpu_features).prefer_sve_ifuncs; \ - bool __attribute__((unused)) mops = \ - GLRO(dl_aarch64_cpu_features).mops; -diff --git a/sysdeps/aarch64/multiarch/memcpy.c b/sysdeps/aarch64/multiarch/memcpy.c -index d12eccfca5..ce53567dab 100644 ---- a/sysdeps/aarch64/multiarch/memcpy.c -+++ b/sysdeps/aarch64/multiarch/memcpy.c -@@ -47,7 +47,7 @@ select_memcpy_ifunc (void) - { - if (IS_A64FX (midr)) - return __memcpy_a64fx; -- return __memcpy_sve; -+ return prefer_sve_ifuncs ? __memcpy_sve : __memcpy_generic; - } - - if (IS_THUNDERX (midr)) -diff --git a/sysdeps/aarch64/multiarch/memmove.c b/sysdeps/aarch64/multiarch/memmove.c -index 2081eeb4d4..fe95037be3 100644 ---- a/sysdeps/aarch64/multiarch/memmove.c -+++ b/sysdeps/aarch64/multiarch/memmove.c -@@ -47,7 +47,7 @@ select_memmove_ifunc (void) - { - if (IS_A64FX (midr)) - return __memmove_a64fx; -- return __memmove_sve; -+ return prefer_sve_ifuncs ? __memmove_sve : __memmove_generic; - } - - if (IS_THUNDERX (midr)) -diff --git a/sysdeps/unix/sysv/linux/aarch64/cpu-features.c b/sysdeps/unix/sysv/linux/aarch64/cpu-features.c -index b1a3f673f0..c0b047bc0d 100644 ---- a/sysdeps/unix/sysv/linux/aarch64/cpu-features.c -+++ b/sysdeps/unix/sysv/linux/aarch64/cpu-features.c -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include - - #define DCZID_DZP_MASK (1 << 4) -@@ -62,6 +63,46 @@ get_midr_from_mcpu (const struct tunable_str_t *mcpu) - return UINT64_MAX; - } - -+#if __LINUX_KERNEL_VERSION < 0x060200 -+ -+/* Return true if we prefer using SVE in string ifuncs. Old kernels disable -+ SVE after every system call which results in unnecessary traps if memcpy -+ uses SVE. This is true for kernels between 4.15.0 and before 6.2.0, except -+ for 5.14.0 which was patched. For these versions return false to avoid using -+ SVE ifuncs. -+ Parse the kernel version into a 24-bit kernel.major.minor value without -+ calling any library functions. If uname() is not supported or if the version -+ format is not recognized, assume the kernel is modern and return true. */ -+ -+static inline bool -+prefer_sve_ifuncs (void) -+{ -+ struct utsname buf; -+ const char *p = &buf.release[0]; -+ int kernel = 0; -+ int val; -+ -+ if (__uname (&buf) < 0) -+ return true; -+ -+ for (int shift = 16; shift >= 0; shift -= 8) -+ { -+ for (val = 0; *p >= '0' && *p <= '9'; p++) -+ val = val * 10 + *p - '0'; -+ kernel |= (val & 255) << shift; -+ if (*p++ != '.') -+ break; -+ } -+ -+ if (kernel >= 0x060200 || kernel == 0x050e00) -+ return true; -+ if (kernel >= 0x040f00) -+ return false; -+ return true; -+} -+ -+#endif -+ - static inline void - init_cpu_features (struct cpu_features *cpu_features) - { -@@ -126,6 +167,13 @@ init_cpu_features (struct cpu_features *cpu_features) - /* Check if SVE is supported. */ - cpu_features->sve = GLRO (dl_hwcap) & HWCAP_SVE; - -+ cpu_features->prefer_sve_ifuncs = cpu_features->sve; -+ -+#if __LINUX_KERNEL_VERSION < 0x060200 -+ if (cpu_features->sve) -+ cpu_features->prefer_sve_ifuncs = prefer_sve_ifuncs (); -+#endif -+ - /* Check if MOPS is supported. */ - cpu_features->mops = GLRO (dl_hwcap2) & HWCAP2_MOPS; - } - -commit 9883f4304cfb1558d0f1e6d9f48c4ab0a35355fe -Author: H.J. Lu -Date: Wed Feb 28 09:51:14 2024 -0800 - - x86-64: Don't use SSE resolvers for ISA level 3 or above - - When glibc is built with ISA level 3 or above enabled, SSE resolvers - aren't available and glibc fails to build: - - ld: .../elf/librtld.os: in function `init_cpu_features': - .../elf/../sysdeps/x86/cpu-features.c:1200:(.text+0x1445f): undefined reference to `_dl_runtime_resolve_fxsave' - ld: .../elf/librtld.os: relocation R_X86_64_PC32 against undefined hidden symbol `_dl_runtime_resolve_fxsave' can not be used when making a shared object - /usr/local/bin/ld: final link failed: bad value - - For ISA level 3 or above, don't use _dl_runtime_resolve_fxsave nor - _dl_tlsdesc_dynamic_fxsave. - - This fixes BZ #31429. - Reviewed-by: Noah Goldstein - - (cherry picked from commit befe2d3c4dec8be2cdd01a47132e47bdb7020922) - -diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c -index 6fe1b728c6..b8abe733ab 100644 ---- a/sysdeps/x86/cpu-features.c -+++ b/sysdeps/x86/cpu-features.c -@@ -18,6 +18,7 @@ - - #include - #include -+#include - #include - #include - #include -@@ -1198,7 +1199,9 @@ no_cpuid: - TUNABLE_CALLBACK (set_x86_shstk)); - #endif - -+#if MINIMUM_X86_ISA_LEVEL < AVX_X86_ISA_LEVEL - if (GLRO(dl_x86_cpu_features).xsave_state_size != 0) -+#endif - { - if (CPU_FEATURE_USABLE_P (cpu_features, XSAVEC)) - { -@@ -1219,22 +1222,24 @@ no_cpuid: - #endif - } - } -+#if MINIMUM_X86_ISA_LEVEL < AVX_X86_ISA_LEVEL - else - { --#ifdef __x86_64__ -+# ifdef __x86_64__ - GLRO(dl_x86_64_runtime_resolve) = _dl_runtime_resolve_fxsave; --# ifdef SHARED -+# ifdef SHARED - GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fxsave; --# endif --#else --# ifdef SHARED -+# endif -+# else -+# ifdef SHARED - if (CPU_FEATURE_USABLE_P (cpu_features, FXSR)) - GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fxsave; - else - GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fnsave; -+# endif - # endif --#endif - } -+#endif - - #ifdef SHARED - # ifdef __x86_64__ -diff --git a/sysdeps/x86_64/dl-tlsdesc.S b/sysdeps/x86_64/dl-tlsdesc.S -index ea69f5223a..057a10862a 100644 ---- a/sysdeps/x86_64/dl-tlsdesc.S -+++ b/sysdeps/x86_64/dl-tlsdesc.S -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - #include "tlsdesc.h" - #include "dl-trampoline-save.h" - -@@ -79,12 +80,14 @@ _dl_tlsdesc_undefweak: - .size _dl_tlsdesc_undefweak, .-_dl_tlsdesc_undefweak - - #ifdef SHARED --# define USE_FXSAVE --# define STATE_SAVE_ALIGNMENT 16 --# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_fxsave --# include "dl-tlsdesc-dynamic.h" --# undef _dl_tlsdesc_dynamic --# undef USE_FXSAVE -+# if MINIMUM_X86_ISA_LEVEL < AVX_X86_ISA_LEVEL -+# define USE_FXSAVE -+# define STATE_SAVE_ALIGNMENT 16 -+# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_fxsave -+# include "dl-tlsdesc-dynamic.h" -+# undef _dl_tlsdesc_dynamic -+# undef USE_FXSAVE -+# endif - - # define USE_XSAVE - # define STATE_SAVE_ALIGNMENT 64 - -commit 7b92f46f04c6cbce19d19ae1099628431858996c -Author: Sunil K Pandey -Date: Thu Feb 29 17:57:02 2024 -0800 - - x86-64: Simplify minimum ISA check ifdef conditional with if - - Replace minimum ISA check ifdef conditional with if. Since - MINIMUM_X86_ISA_LEVEL and AVX_X86_ISA_LEVEL are compile time constants, - compiler will perform constant folding optimization, getting same - results. - - Reviewed-by: H.J. Lu - (cherry picked from commit b6e3898194bbae78910bbe9cd086937014961e45) - -diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c -index b8abe733ab..3d7c2819d7 100644 ---- a/sysdeps/x86/cpu-features.c -+++ b/sysdeps/x86/cpu-features.c -@@ -1199,9 +1199,8 @@ no_cpuid: - TUNABLE_CALLBACK (set_x86_shstk)); - #endif - --#if MINIMUM_X86_ISA_LEVEL < AVX_X86_ISA_LEVEL -- if (GLRO(dl_x86_cpu_features).xsave_state_size != 0) --#endif -+ if (MINIMUM_X86_ISA_LEVEL >= AVX_X86_ISA_LEVEL -+ || (GLRO(dl_x86_cpu_features).xsave_state_size != 0)) - { - if (CPU_FEATURE_USABLE_P (cpu_features, XSAVEC)) - { -@@ -1222,24 +1221,22 @@ no_cpuid: - #endif - } - } --#if MINIMUM_X86_ISA_LEVEL < AVX_X86_ISA_LEVEL - else - { --# ifdef __x86_64__ -+#ifdef __x86_64__ - GLRO(dl_x86_64_runtime_resolve) = _dl_runtime_resolve_fxsave; --# ifdef SHARED -+# ifdef SHARED - GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fxsave; --# endif --# else --# ifdef SHARED -+# endif -+#else -+# ifdef SHARED - if (CPU_FEATURE_USABLE_P (cpu_features, FXSR)) - GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fxsave; - else - GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fnsave; --# endif - # endif -- } - #endif -+ } - - #ifdef SHARED - # ifdef __x86_64__ - -commit edb9a76e3008725e9dc035d38a58e849a3bde0f1 -Author: Florian Weimer -Date: Sun Apr 14 08:24:51 2024 +0200 - - powerpc: Fix ld.so address determination for PCREL mode (bug 31640) - - This seems to have stopped working with some GCC 14 versions, - which clobber r2. With other compilers, the kernel-provided - r2 value is still available at this point. - - Reviewed-by: Peter Bergner - (cherry picked from commit 14e56bd4ce15ac2d1cc43f762eb2e6b83fec1afe) - -diff --git a/sysdeps/powerpc/powerpc64/dl-machine.h b/sysdeps/powerpc/powerpc64/dl-machine.h -index c6682f3445..2b6f5d2b08 100644 ---- a/sysdeps/powerpc/powerpc64/dl-machine.h -+++ b/sysdeps/powerpc/powerpc64/dl-machine.h -@@ -78,6 +78,7 @@ elf_host_tolerates_class (const Elf64_Ehdr *ehdr) - static inline Elf64_Addr - elf_machine_load_address (void) __attribute__ ((const)); - -+#ifndef __PCREL__ - static inline Elf64_Addr - elf_machine_load_address (void) - { -@@ -105,6 +106,24 @@ elf_machine_dynamic (void) - /* Then subtract off the load address offset. */ - return runtime_dynamic - elf_machine_load_address() ; - } -+#else /* __PCREL__ */ -+/* In PCREL mode, r2 may have been clobbered. Rely on relative -+ relocations instead. */ -+ -+static inline ElfW(Addr) -+elf_machine_load_address (void) -+{ -+ extern const ElfW(Ehdr) __ehdr_start attribute_hidden; -+ return (ElfW(Addr)) &__ehdr_start; -+} -+ -+static inline ElfW(Addr) -+elf_machine_dynamic (void) -+{ -+ extern ElfW(Dyn) _DYNAMIC[] attribute_hidden; -+ return (ElfW(Addr)) _DYNAMIC - elf_machine_load_address (); -+} -+#endif /* __PCREL__ */ - - /* The PLT uses Elf64_Rela relocs. */ - #define elf_machine_relplt elf_machine_rela - -commit 04df8652eb1919da18d54b3dcd6db1675993d45d -Author: H.J. Lu -Date: Thu Feb 15 11:19:56 2024 -0800 - - Apply the Makefile sorting fix - - Apply the Makefile sorting fix generated by sort-makefile-lines.py. - - (cherry picked from commit ef7f4b1fef67430a8f3cfc77fa6aada2add851d7) - -diff --git a/sysdeps/loongarch/lp64/multiarch/Makefile b/sysdeps/loongarch/lp64/multiarch/Makefile -index fe863e1ba4..01762ef526 100644 ---- a/sysdeps/loongarch/lp64/multiarch/Makefile -+++ b/sysdeps/loongarch/lp64/multiarch/Makefile -@@ -1,52 +1,52 @@ - ifeq ($(subdir),string) - sysdep_routines += \ -- strlen-aligned \ -- strlen-lsx \ -- strlen-lasx \ -- strnlen-aligned \ -- strnlen-lsx \ -- strnlen-lasx \ -+ memchr-aligned \ -+ memchr-lasx \ -+ memchr-lsx \ -+ memcmp-aligned \ -+ memcmp-lasx \ -+ memcmp-lsx \ -+ memcpy-aligned \ -+ memcpy-unaligned \ -+ memmove-lasx \ -+ memmove-lsx \ -+ memmove-unaligned \ -+ memrchr-generic \ -+ memrchr-lasx \ -+ memrchr-lsx \ -+ memset-aligned \ -+ memset-lasx \ -+ memset-lsx \ -+ memset-unaligned \ -+ rawmemchr-aligned \ -+ rawmemchr-lasx \ -+ rawmemchr-lsx \ -+ stpcpy-aligned \ -+ stpcpy-lasx \ -+ stpcpy-lsx \ -+ stpcpy-unaligned \ - strchr-aligned \ -- strchr-lsx \ - strchr-lasx \ -- strrchr-aligned \ -- strrchr-lsx \ -- strrchr-lasx \ -+ strchr-lsx \ - strchrnul-aligned \ -- strchrnul-lsx \ - strchrnul-lasx \ -+ strchrnul-lsx \ - strcmp-aligned \ - strcmp-lsx \ -- strncmp-aligned \ -- strncmp-lsx \ - strcpy-aligned \ -- strcpy-unaligned \ -- strcpy-lsx \ - strcpy-lasx \ -- stpcpy-aligned \ -- stpcpy-unaligned \ -- stpcpy-lsx \ -- stpcpy-lasx \ -- memcpy-aligned \ -- memcpy-unaligned \ -- memmove-unaligned \ -- memmove-lsx \ -- memmove-lasx \ -- rawmemchr-aligned \ -- rawmemchr-lsx \ -- rawmemchr-lasx \ -- memchr-aligned \ -- memchr-lsx \ -- memchr-lasx \ -- memrchr-generic \ -- memrchr-lsx \ -- memrchr-lasx \ -- memset-aligned \ -- memset-unaligned \ -- memset-lsx \ -- memset-lasx \ -- memcmp-aligned \ -- memcmp-lsx \ -- memcmp-lasx \ -+ strcpy-lsx \ -+ strcpy-unaligned \ -+ strlen-aligned \ -+ strlen-lasx \ -+ strlen-lsx \ -+ strncmp-aligned \ -+ strncmp-lsx \ -+ strnlen-aligned \ -+ strnlen-lasx \ -+ strnlen-lsx \ -+ strrchr-aligned \ -+ strrchr-lasx \ -+ strrchr-lsx \ - # sysdep_routines - endif -diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile -index 992aabe43e..5311b594af 100644 ---- a/sysdeps/x86/Makefile -+++ b/sysdeps/x86/Makefile -@@ -15,18 +15,18 @@ CFLAGS-dl-get-cpu-features.os += $(rtld-early-cflags) - CFLAGS-get-cpuid-feature-leaf.o += $(no-stack-protector) - - tests += \ -- tst-get-cpu-features \ -- tst-get-cpu-features-static \ - tst-cpu-features-cpuinfo \ - tst-cpu-features-cpuinfo-static \ - tst-cpu-features-supports \ - tst-cpu-features-supports-static \ -+ tst-get-cpu-features \ -+ tst-get-cpu-features-static \ - tst-hwcap-tunables \ - # tests - tests-static += \ -- tst-get-cpu-features-static \ - tst-cpu-features-cpuinfo-static \ - tst-cpu-features-supports-static \ -+ tst-get-cpu-features-static \ - # tests-static - ifeq (yes,$(have-ifunc)) - ifeq (yes,$(have-gcc-ifunc)) -diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile -index 9d374a3299..0ede447405 100644 ---- a/sysdeps/x86_64/Makefile -+++ b/sysdeps/x86_64/Makefile -@@ -252,6 +252,10 @@ sysdep-dl-routines += dl-cet - - tests += \ - tst-cet-legacy-1 \ -+ tst-cet-legacy-10 \ -+ tst-cet-legacy-10-static \ -+ tst-cet-legacy-10a \ -+ tst-cet-legacy-10a-static \ - tst-cet-legacy-1a \ - tst-cet-legacy-2 \ - tst-cet-legacy-2a \ -@@ -263,15 +267,11 @@ tests += \ - tst-cet-legacy-8 \ - tst-cet-legacy-9 \ - tst-cet-legacy-9-static \ -- tst-cet-legacy-10 \ -- tst-cet-legacy-10-static \ -- tst-cet-legacy-10a \ -- tst-cet-legacy-10a-static \ - # tests - tests-static += \ -- tst-cet-legacy-9-static \ - tst-cet-legacy-10-static \ - tst-cet-legacy-10a-static \ -+ tst-cet-legacy-9-static \ - # tests-static - tst-cet-legacy-1a-ARGS = -- $(host-test-program-cmd) - -diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile -index ea81753b70..e1a490dd98 100644 ---- a/sysdeps/x86_64/fpu/multiarch/Makefile -+++ b/sysdeps/x86_64/fpu/multiarch/Makefile -@@ -4,10 +4,10 @@ libm-sysdep_routines += \ - s_ceilf-c \ - s_floor-c \ - s_floorf-c \ -- s_rint-c \ -- s_rintf-c \ - s_nearbyint-c \ - s_nearbyintf-c \ -+ s_rint-c \ -+ s_rintf-c \ - s_roundeven-c \ - s_roundevenf-c \ - s_trunc-c \ -@@ -21,10 +21,10 @@ libm-sysdep_routines += \ - s_floorf-sse4_1 \ - s_nearbyint-sse4_1 \ - s_nearbyintf-sse4_1 \ -- s_roundeven-sse4_1 \ -- s_roundevenf-sse4_1 \ - s_rint-sse4_1 \ - s_rintf-sse4_1 \ -+ s_roundeven-sse4_1 \ -+ s_roundevenf-sse4_1 \ - s_trunc-sse4_1 \ - s_truncf-sse4_1 \ - # libm-sysdep_routines -@@ -84,12 +84,12 @@ CFLAGS-s_cosf-fma.c = -mfma -mavx2 - CFLAGS-s_sincosf-fma.c = -mfma -mavx2 - - libm-sysdep_routines += \ -+ e_asin-fma4 \ -+ e_atan2-fma4 \ - e_exp-fma4 \ - e_log-fma4 \ - e_pow-fma4 \ -- e_asin-fma4 \ - s_atan-fma4 \ -- e_atan2-fma4 \ - s_sin-fma4 \ - s_sincos-fma4 \ - s_tan-fma4 \ -@@ -106,10 +106,10 @@ CFLAGS-s_tan-fma4.c = -mfma4 - CFLAGS-s_sincos-fma4.c = -mfma4 - - libm-sysdep_routines += \ -+ e_atan2-avx \ - e_exp-avx \ - e_log-avx \ - s_atan-avx \ -- e_atan2-avx \ - s_sin-avx \ - s_sincos-avx \ - s_tan-avx \ -diff --git a/sysdeps/x86_64/multiarch/Makefile b/sysdeps/x86_64/multiarch/Makefile -index e1e894c963..d3d2270394 100644 ---- a/sysdeps/x86_64/multiarch/Makefile -+++ b/sysdeps/x86_64/multiarch/Makefile -@@ -4,8 +4,8 @@ sysdep_routines += \ - memchr-avx2 \ - memchr-avx2-rtm \ - memchr-evex \ -- memchr-evex512 \ - memchr-evex-rtm \ -+ memchr-evex512 \ - memchr-sse2 \ - memcmp-avx2-movbe \ - memcmp-avx2-movbe-rtm \ -@@ -37,8 +37,8 @@ sysdep_routines += \ - rawmemchr-avx2 \ - rawmemchr-avx2-rtm \ - rawmemchr-evex \ -- rawmemchr-evex512 \ - rawmemchr-evex-rtm \ -+ rawmemchr-evex512 \ - rawmemchr-sse2 \ - stpcpy-avx2 \ - stpcpy-avx2-rtm \ - -commit 423099a03264ea28298f47355d7811b8efe03c97 -Author: Sunil K Pandey -Date: Tue Feb 13 12:23:14 2024 -0800 - - x86_64: Exclude SSE, AVX and FMA4 variants in libm multiarch - - When glibc is built with ISA level 3 or higher by default, the resulting - glibc binaries won't run on SSE or FMA4 processors. Exclude SSE, AVX and - FMA4 variants in libm multiarch when ISA level 3 or higher is enabled by - default. - - When glibc is built with ISA level 2 enabled by default, only keep SSE4.1 - variant. - - Fixes BZ 31335. - - NB: elf/tst-valgrind-smoke test fails with ISA level 4, because valgrind - doesn't support AVX512 instructions: - - https://bugs.kde.org/show_bug.cgi?id=383010 - - Reviewed-by: H.J. Lu - (cherry picked from commit 9f78a7c1d0963282608da836b840f0d5ae1c478e) - -diff --git a/sysdeps/x86/configure b/sysdeps/x86/configure -index 1f4c2d67fd..2a5421bb31 100644 ---- a/sysdeps/x86/configure -+++ b/sysdeps/x86/configure -@@ -98,6 +98,7 @@ printf "%s\n" "$libc_cv_have_x86_lahf_sahf" >&6; } - if test $libc_cv_have_x86_lahf_sahf = yes; then - printf "%s\n" "#define HAVE_X86_LAHF_SAHF 1" >>confdefs.h - -+ ISAFLAG="-DHAVE_X86_LAHF_SAHF" - fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MOVBE instruction support" >&5 - printf %s "checking for MOVBE instruction support... " >&6; } -@@ -120,9 +121,41 @@ printf "%s\n" "$libc_cv_have_x86_movbe" >&6; } - if test $libc_cv_have_x86_movbe = yes; then - printf "%s\n" "#define HAVE_X86_MOVBE 1" >>confdefs.h - -+ ISAFLAG="$ISAFLAG -DHAVE_X86_MOVBE" - fi -+ -+ # Check for ISA level support. -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ISA level support" >&5 -+printf %s "checking for ISA level support... " >&6; } -+if test ${libc_cv_have_x86_isa_level+y} -+then : -+ printf %s "(cached) " >&6 -+else $as_nop -+ cat > conftest.c < -+#if MINIMUM_X86_ISA_LEVEL >= 4 -+libc_cv_have_x86_isa_level=4 -+#elif MINIMUM_X86_ISA_LEVEL == 3 -+libc_cv_have_x86_isa_level=3 -+#elif MINIMUM_X86_ISA_LEVEL == 2 -+libc_cv_have_x86_isa_level=2 -+#else -+libc_cv_have_x86_isa_level=baseline -+#endif -+EOF -+ eval `${CC-cc} $CFLAGS $CPPFLAGS $ISAFLAG -I$srcdir -E conftest.c | grep libc_cv_have_x86_isa_level` -+ rm -rf conftest* -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_have_x86_isa_level" >&5 -+printf "%s\n" "$libc_cv_have_x86_isa_level" >&6; } -+else -+ libc_cv_have_x86_isa_level=baseline - fi - config_vars="$config_vars -+have-x86-isa-level = $libc_cv_have_x86_isa_level" -+config_vars="$config_vars -+x86-isa-level-3-or-above = 3 4" -+config_vars="$config_vars - enable-x86-isa-level = $libc_cv_include_x86_isa_level" - - printf "%s\n" "#define SUPPORT_STATIC_PIE 1" >>confdefs.h -diff --git a/sysdeps/x86/configure.ac b/sysdeps/x86/configure.ac -index 437a50623b..78ff7c8f41 100644 ---- a/sysdeps/x86/configure.ac -+++ b/sysdeps/x86/configure.ac -@@ -72,6 +72,7 @@ if test $libc_cv_include_x86_isa_level = yes; then - fi]) - if test $libc_cv_have_x86_lahf_sahf = yes; then - AC_DEFINE(HAVE_X86_LAHF_SAHF) -+ ISAFLAG="-DHAVE_X86_LAHF_SAHF" - fi - AC_CACHE_CHECK([for MOVBE instruction support], - libc_cv_have_x86_movbe, [dnl -@@ -81,8 +82,31 @@ if test $libc_cv_include_x86_isa_level = yes; then - fi]) - if test $libc_cv_have_x86_movbe = yes; then - AC_DEFINE(HAVE_X86_MOVBE) -+ ISAFLAG="$ISAFLAG -DHAVE_X86_MOVBE" - fi -+ -+ # Check for ISA level support. -+ AC_CACHE_CHECK([for ISA level support], -+ libc_cv_have_x86_isa_level, [dnl -+cat > conftest.c < -+#if MINIMUM_X86_ISA_LEVEL >= 4 -+libc_cv_have_x86_isa_level=4 -+#elif MINIMUM_X86_ISA_LEVEL == 3 -+libc_cv_have_x86_isa_level=3 -+#elif MINIMUM_X86_ISA_LEVEL == 2 -+libc_cv_have_x86_isa_level=2 -+#else -+libc_cv_have_x86_isa_level=baseline -+#endif -+EOF -+ eval `${CC-cc} $CFLAGS $CPPFLAGS $ISAFLAG -I$srcdir -E conftest.c | grep libc_cv_have_x86_isa_level` -+ rm -rf conftest*]) -+else -+ libc_cv_have_x86_isa_level=baseline - fi -+LIBC_CONFIG_VAR([have-x86-isa-level], [$libc_cv_have_x86_isa_level]) -+LIBC_CONFIG_VAR([x86-isa-level-3-or-above], [3 4]) - LIBC_CONFIG_VAR([enable-x86-isa-level], [$libc_cv_include_x86_isa_level]) - - dnl Static PIE is supported. -diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile -index e1a490dd98..6ddd50240c 100644 ---- a/sysdeps/x86_64/fpu/multiarch/Makefile -+++ b/sysdeps/x86_64/fpu/multiarch/Makefile -@@ -1,49 +1,4 @@ - ifeq ($(subdir),math) --libm-sysdep_routines += \ -- s_ceil-c \ -- s_ceilf-c \ -- s_floor-c \ -- s_floorf-c \ -- s_nearbyint-c \ -- s_nearbyintf-c \ -- s_rint-c \ -- s_rintf-c \ -- s_roundeven-c \ -- s_roundevenf-c \ -- s_trunc-c \ -- s_truncf-c \ --# libm-sysdep_routines -- --libm-sysdep_routines += \ -- s_ceil-sse4_1 \ -- s_ceilf-sse4_1 \ -- s_floor-sse4_1 \ -- s_floorf-sse4_1 \ -- s_nearbyint-sse4_1 \ -- s_nearbyintf-sse4_1 \ -- s_rint-sse4_1 \ -- s_rintf-sse4_1 \ -- s_roundeven-sse4_1 \ -- s_roundevenf-sse4_1 \ -- s_trunc-sse4_1 \ -- s_truncf-sse4_1 \ --# libm-sysdep_routines -- --libm-sysdep_routines += \ -- e_asin-fma \ -- e_atan2-fma \ -- e_exp-fma \ -- e_log-fma \ -- e_log2-fma \ -- e_pow-fma \ -- s_atan-fma \ -- s_expm1-fma \ -- s_log1p-fma \ -- s_sin-fma \ -- s_sincos-fma \ -- s_tan-fma \ --# libm-sysdep_routines -- - CFLAGS-e_asin-fma.c = -mfma -mavx2 - CFLAGS-e_atan2-fma.c = -mfma -mavx2 - CFLAGS-e_exp-fma.c = -mfma -mavx2 -@@ -57,23 +12,6 @@ CFLAGS-s_sin-fma.c = -mfma -mavx2 - CFLAGS-s_tan-fma.c = -mfma -mavx2 - CFLAGS-s_sincos-fma.c = -mfma -mavx2 - --libm-sysdep_routines += \ -- s_cosf-sse2 \ -- s_sincosf-sse2 \ -- s_sinf-sse2 \ --# libm-sysdep_routines -- --libm-sysdep_routines += \ -- e_exp2f-fma \ -- e_expf-fma \ -- e_log2f-fma \ -- e_logf-fma \ -- e_powf-fma \ -- s_cosf-fma \ -- s_sincosf-fma \ -- s_sinf-fma \ --# libm-sysdep_routines -- - CFLAGS-e_exp2f-fma.c = -mfma -mavx2 - CFLAGS-e_expf-fma.c = -mfma -mavx2 - CFLAGS-e_log2f-fma.c = -mfma -mavx2 -@@ -83,17 +21,93 @@ CFLAGS-s_sinf-fma.c = -mfma -mavx2 - CFLAGS-s_cosf-fma.c = -mfma -mavx2 - CFLAGS-s_sincosf-fma.c = -mfma -mavx2 - -+# Check if ISA level is 3 or above. -+ifneq (,$(filter $(have-x86-isa-level),$(x86-isa-level-3-or-above))) - libm-sysdep_routines += \ -+ s_ceil-avx \ -+ s_ceilf-avx \ -+ s_floor-avx \ -+ s_floorf-avx \ -+ s_nearbyint-avx \ -+ s_nearbyintf-avx \ -+ s_rint-avx \ -+ s_rintf-avx \ -+ s_roundeven-avx \ -+ s_roundevenf-avx \ -+ s_trunc-avx \ -+ s_truncf-avx \ -+# libm-sysdep_routines -+else -+libm-sysdep_routines += \ -+ e_asin-fma \ - e_asin-fma4 \ -+ e_atan2-avx \ -+ e_atan2-fma \ - e_atan2-fma4 \ -+ e_exp-avx \ -+ e_exp-fma \ - e_exp-fma4 \ -+ e_exp2f-fma \ -+ e_expf-fma \ -+ e_log-avx \ -+ e_log-fma \ - e_log-fma4 \ -+ e_log2-fma \ -+ e_log2f-fma \ -+ e_logf-fma \ -+ e_pow-fma \ - e_pow-fma4 \ -+ e_powf-fma \ -+ s_atan-avx \ -+ s_atan-fma \ - s_atan-fma4 \ -+ s_ceil-sse4_1 \ -+ s_ceilf-sse4_1 \ -+ s_cosf-fma \ -+ s_cosf-sse2 \ -+ s_expm1-fma \ -+ s_floor-sse4_1 \ -+ s_floorf-sse4_1 \ -+ s_log1p-fma \ -+ s_nearbyint-sse4_1 \ -+ s_nearbyintf-sse4_1 \ -+ s_rint-sse4_1 \ -+ s_rintf-sse4_1 \ -+ s_roundeven-sse4_1 \ -+ s_roundevenf-sse4_1 \ -+ s_sin-avx \ -+ s_sin-fma \ - s_sin-fma4 \ -+ s_sincos-avx \ -+ s_sincos-fma \ - s_sincos-fma4 \ -+ s_sincosf-fma \ -+ s_sincosf-sse2 \ -+ s_sinf-fma \ -+ s_sinf-sse2 \ -+ s_tan-avx \ -+ s_tan-fma \ - s_tan-fma4 \ -+ s_trunc-sse4_1 \ -+ s_truncf-sse4_1 \ - # libm-sysdep_routines -+ifeq ($(have-x86-isa-level),baseline) -+libm-sysdep_routines += \ -+ s_ceil-c \ -+ s_ceilf-c \ -+ s_floor-c \ -+ s_floorf-c \ -+ s_nearbyint-c \ -+ s_nearbyintf-c \ -+ s_rint-c \ -+ s_rintf-c \ -+ s_roundeven-c \ -+ s_roundevenf-c \ -+ s_trunc-c \ -+ s_truncf-c \ -+# libm-sysdep_routines -+endif -+endif - - CFLAGS-e_asin-fma4.c = -mfma4 - CFLAGS-e_atan2-fma4.c = -mfma4 -@@ -105,16 +119,6 @@ CFLAGS-s_sin-fma4.c = -mfma4 - CFLAGS-s_tan-fma4.c = -mfma4 - CFLAGS-s_sincos-fma4.c = -mfma4 - --libm-sysdep_routines += \ -- e_atan2-avx \ -- e_exp-avx \ -- e_log-avx \ -- s_atan-avx \ -- s_sin-avx \ -- s_sincos-avx \ -- s_tan-avx \ --# libm-sysdep_routines -- - CFLAGS-e_atan2-avx.c = -msse2avx -DSSE2AVX - CFLAGS-e_exp-avx.c = -msse2avx -DSSE2AVX - CFLAGS-e_log-avx.c = -msse2avx -DSSE2AVX -diff --git a/sysdeps/x86_64/fpu/multiarch/e_asin.c b/sysdeps/x86_64/fpu/multiarch/e_asin.c -index 2eaa6c2c04..d64fca2586 100644 ---- a/sysdeps/x86_64/fpu/multiarch/e_asin.c -+++ b/sysdeps/x86_64/fpu/multiarch/e_asin.c -@@ -16,26 +16,29 @@ - License along with the GNU C Library; if not, see - . */ - --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include - - extern double __redirect_ieee754_asin (double); - extern double __redirect_ieee754_acos (double); - --#define SYMBOL_NAME ieee754_asin --#include "ifunc-fma4.h" -+# define SYMBOL_NAME ieee754_asin -+# include "ifunc-fma4.h" - - libc_ifunc_redirected (__redirect_ieee754_asin, __ieee754_asin, - IFUNC_SELECTOR ()); - libm_alias_finite (__ieee754_asin, __asin) - --#undef SYMBOL_NAME --#define SYMBOL_NAME ieee754_acos --#include "ifunc-fma4.h" -+# undef SYMBOL_NAME -+# define SYMBOL_NAME ieee754_acos -+# include "ifunc-fma4.h" - - libc_ifunc_redirected (__redirect_ieee754_acos, __ieee754_acos, - IFUNC_SELECTOR ()); - libm_alias_finite (__ieee754_acos, __acos) - --#define __ieee754_acos __ieee754_acos_sse2 --#define __ieee754_asin __ieee754_asin_sse2 -+# define __ieee754_acos __ieee754_acos_sse2 -+# define __ieee754_asin __ieee754_asin_sse2 -+#endif - #include -diff --git a/sysdeps/x86_64/fpu/multiarch/e_atan2.c b/sysdeps/x86_64/fpu/multiarch/e_atan2.c -index 17ee4f3c36..8a86c14ded 100644 ---- a/sysdeps/x86_64/fpu/multiarch/e_atan2.c -+++ b/sysdeps/x86_64/fpu/multiarch/e_atan2.c -@@ -16,16 +16,19 @@ - License along with the GNU C Library; if not, see - . */ - --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include - - extern double __redirect_ieee754_atan2 (double, double); - --#define SYMBOL_NAME ieee754_atan2 --#include "ifunc-avx-fma4.h" -+# define SYMBOL_NAME ieee754_atan2 -+# include "ifunc-avx-fma4.h" - - libc_ifunc_redirected (__redirect_ieee754_atan2, - __ieee754_atan2, IFUNC_SELECTOR ()); - libm_alias_finite (__ieee754_atan2, __atan2) - --#define __ieee754_atan2 __ieee754_atan2_sse2 -+# define __ieee754_atan2 __ieee754_atan2_sse2 -+#endif - #include -diff --git a/sysdeps/x86_64/fpu/multiarch/e_exp.c b/sysdeps/x86_64/fpu/multiarch/e_exp.c -index 406b7ebd44..d56329291a 100644 ---- a/sysdeps/x86_64/fpu/multiarch/e_exp.c -+++ b/sysdeps/x86_64/fpu/multiarch/e_exp.c -@@ -16,17 +16,20 @@ - License along with the GNU C Library; if not, see - . */ - --#include --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include -+# include - - extern double __redirect_ieee754_exp (double); - --#define SYMBOL_NAME ieee754_exp --#include "ifunc-avx-fma4.h" -+# define SYMBOL_NAME ieee754_exp -+# include "ifunc-avx-fma4.h" - - libc_ifunc_redirected (__redirect_ieee754_exp, __ieee754_exp, - IFUNC_SELECTOR ()); - libm_alias_finite (__ieee754_exp, __exp) - --#define __exp __ieee754_exp_sse2 -+# define __exp __ieee754_exp_sse2 -+#endif - #include -diff --git a/sysdeps/x86_64/fpu/multiarch/e_exp2f.c b/sysdeps/x86_64/fpu/multiarch/e_exp2f.c -index 804fd6be85..06fe5028d6 100644 ---- a/sysdeps/x86_64/fpu/multiarch/e_exp2f.c -+++ b/sysdeps/x86_64/fpu/multiarch/e_exp2f.c -@@ -16,25 +16,28 @@ - License along with the GNU C Library; if not, see - . */ - --#include --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include -+# include - - extern float __redirect_exp2f (float); - --#define SYMBOL_NAME exp2f --#include "ifunc-fma.h" -+# define SYMBOL_NAME exp2f -+# include "ifunc-fma.h" - - libc_ifunc_redirected (__redirect_exp2f, __exp2f, IFUNC_SELECTOR ()); - --#ifdef SHARED -+# ifdef SHARED - versioned_symbol (libm, __ieee754_exp2f, exp2f, GLIBC_2_27); - libm_alias_float_other (__exp2, exp2) --#else -+# else - libm_alias_float (__exp2, exp2) --#endif -+# endif - - strong_alias (__exp2f, __ieee754_exp2f) - libm_alias_finite (__exp2f, __exp2f) - --#define __exp2f __exp2f_sse2 -+# define __exp2f __exp2f_sse2 -+#endif - #include -diff --git a/sysdeps/x86_64/fpu/multiarch/e_expf.c b/sysdeps/x86_64/fpu/multiarch/e_expf.c -index 4a7e2a5bce..19d767f636 100644 ---- a/sysdeps/x86_64/fpu/multiarch/e_expf.c -+++ b/sysdeps/x86_64/fpu/multiarch/e_expf.c -@@ -16,28 +16,31 @@ - License along with the GNU C Library; if not, see - . */ - --#include --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include -+# include - - extern float __redirect_expf (float); - --#define SYMBOL_NAME expf --#include "ifunc-fma.h" -+# define SYMBOL_NAME expf -+# include "ifunc-fma.h" - - libc_ifunc_redirected (__redirect_expf, __expf, IFUNC_SELECTOR ()); - --#ifdef SHARED -+# ifdef SHARED - __hidden_ver1 (__expf, __GI___expf, __redirect_expf) - __attribute__ ((visibility ("hidden"))); - - versioned_symbol (libm, __ieee754_expf, expf, GLIBC_2_27); - libm_alias_float_other (__exp, exp) --#else -+# else - libm_alias_float (__exp, exp) --#endif -+# endif - - strong_alias (__expf, __ieee754_expf) - libm_alias_finite (__expf, __expf) - --#define __expf __expf_sse2 -+# define __expf __expf_sse2 -+#endif - #include -diff --git a/sysdeps/x86_64/fpu/multiarch/e_log.c b/sysdeps/x86_64/fpu/multiarch/e_log.c -index 067fbf58c3..d80c1b1463 100644 ---- a/sysdeps/x86_64/fpu/multiarch/e_log.c -+++ b/sysdeps/x86_64/fpu/multiarch/e_log.c -@@ -16,17 +16,20 @@ - License along with the GNU C Library; if not, see - . */ - --#include --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include -+# include - - extern double __redirect_ieee754_log (double); - --#define SYMBOL_NAME ieee754_log --#include "ifunc-avx-fma4.h" -+# define SYMBOL_NAME ieee754_log -+# include "ifunc-avx-fma4.h" - - libc_ifunc_redirected (__redirect_ieee754_log, __ieee754_log, - IFUNC_SELECTOR ()); - libm_alias_finite (__ieee754_log, __log) - --#define __log __ieee754_log_sse2 -+# define __log __ieee754_log_sse2 -+#endif - #include -diff --git a/sysdeps/x86_64/fpu/multiarch/e_log2.c b/sysdeps/x86_64/fpu/multiarch/e_log2.c -index 9c57a2f6cc..9686782c09 100644 ---- a/sysdeps/x86_64/fpu/multiarch/e_log2.c -+++ b/sysdeps/x86_64/fpu/multiarch/e_log2.c -@@ -16,28 +16,31 @@ - License along with the GNU C Library; if not, see - . */ - --#include --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include -+# include - - extern double __redirect_log2 (double); - --#define SYMBOL_NAME log2 --#include "ifunc-fma.h" -+# define SYMBOL_NAME log2 -+# include "ifunc-fma.h" - - libc_ifunc_redirected (__redirect_log2, __log2, IFUNC_SELECTOR ()); - --#ifdef SHARED -+# ifdef SHARED - __hidden_ver1 (__log2, __GI___log2, __redirect_log2) - __attribute__ ((visibility ("hidden"))); - - versioned_symbol (libm, __ieee754_log2, log2, GLIBC_2_29); - libm_alias_double_other (__log2, log2) --#else -+# else - libm_alias_double (__log2, log2) --#endif -+# endif - - strong_alias (__log2, __ieee754_log2) - libm_alias_finite (__log2, __log2) - --#define __log2 __log2_sse2 -+# define __log2 __log2_sse2 -+#endif - #include -diff --git a/sysdeps/x86_64/fpu/multiarch/e_log2f.c b/sysdeps/x86_64/fpu/multiarch/e_log2f.c -index 2b45c87f38..8ada46e11e 100644 ---- a/sysdeps/x86_64/fpu/multiarch/e_log2f.c -+++ b/sysdeps/x86_64/fpu/multiarch/e_log2f.c -@@ -16,28 +16,31 @@ - License along with the GNU C Library; if not, see - . */ - --#include --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include -+# include - - extern float __redirect_log2f (float); - --#define SYMBOL_NAME log2f --#include "ifunc-fma.h" -+# define SYMBOL_NAME log2f -+# include "ifunc-fma.h" - - libc_ifunc_redirected (__redirect_log2f, __log2f, IFUNC_SELECTOR ()); - --#ifdef SHARED -+# ifdef SHARED - __hidden_ver1 (__log2f, __GI___log2f, __redirect_log2f) - __attribute__ ((visibility ("hidden"))); - - versioned_symbol (libm, __ieee754_log2f, log2f, GLIBC_2_27); - libm_alias_float_other (__log2, log2) --#else -+# else - libm_alias_float (__log2, log2) --#endif -+# endif - - strong_alias (__log2f, __ieee754_log2f) - libm_alias_finite (__log2f, __log2f) - --#define __log2f __log2f_sse2 -+# define __log2f __log2f_sse2 -+#endif - #include -diff --git a/sysdeps/x86_64/fpu/multiarch/e_logf.c b/sysdeps/x86_64/fpu/multiarch/e_logf.c -index 97e23c8fea..a3978d9a8e 100644 ---- a/sysdeps/x86_64/fpu/multiarch/e_logf.c -+++ b/sysdeps/x86_64/fpu/multiarch/e_logf.c -@@ -16,28 +16,31 @@ - License along with the GNU C Library; if not, see - . */ - --#include --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include -+# include - - extern float __redirect_logf (float); - --#define SYMBOL_NAME logf --#include "ifunc-fma.h" -+# define SYMBOL_NAME logf -+# include "ifunc-fma.h" - - libc_ifunc_redirected (__redirect_logf, __logf, IFUNC_SELECTOR ()); - --#ifdef SHARED -+# ifdef SHARED - __hidden_ver1 (__logf, __GI___logf, __redirect_logf) - __attribute__ ((visibility ("hidden"))); - - versioned_symbol (libm, __ieee754_logf, logf, GLIBC_2_27); - libm_alias_float_other (__log, log) --#else -+# else - libm_alias_float (__log, log) --#endif -+# endif - - strong_alias (__logf, __ieee754_logf) - libm_alias_finite (__logf, __logf) - --#define __logf __logf_sse2 -+# define __logf __logf_sse2 -+#endif - #include -diff --git a/sysdeps/x86_64/fpu/multiarch/e_pow.c b/sysdeps/x86_64/fpu/multiarch/e_pow.c -index 42618e7112..f8f17aff9f 100644 ---- a/sysdeps/x86_64/fpu/multiarch/e_pow.c -+++ b/sysdeps/x86_64/fpu/multiarch/e_pow.c -@@ -16,17 +16,20 @@ - License along with the GNU C Library; if not, see - . */ - --#include --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include -+# include - - extern double __redirect_ieee754_pow (double, double); - --#define SYMBOL_NAME ieee754_pow --#include "ifunc-fma4.h" -+# define SYMBOL_NAME ieee754_pow -+# include "ifunc-fma4.h" - - libc_ifunc_redirected (__redirect_ieee754_pow, - __ieee754_pow, IFUNC_SELECTOR ()); - libm_alias_finite (__ieee754_pow, __pow) - --#define __pow __ieee754_pow_sse2 -+# define __pow __ieee754_pow_sse2 -+#endif - #include -diff --git a/sysdeps/x86_64/fpu/multiarch/e_powf.c b/sysdeps/x86_64/fpu/multiarch/e_powf.c -index 8e6ce13cc1..8b1a4c7d04 100644 ---- a/sysdeps/x86_64/fpu/multiarch/e_powf.c -+++ b/sysdeps/x86_64/fpu/multiarch/e_powf.c -@@ -16,31 +16,34 @@ - License along with the GNU C Library; if not, see - . */ - --#include --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include -+# include - --#define powf __redirect_powf --#define __DECL_SIMD___redirect_powf --#include --#undef powf -+# define powf __redirect_powf -+# define __DECL_SIMD___redirect_powf -+# include -+# undef powf - --#define SYMBOL_NAME powf --#include "ifunc-fma.h" -+# define SYMBOL_NAME powf -+# include "ifunc-fma.h" - - libc_ifunc_redirected (__redirect_powf, __powf, IFUNC_SELECTOR ()); - --#ifdef SHARED -+# ifdef SHARED - __hidden_ver1 (__powf, __GI___powf, __redirect_powf) - __attribute__ ((visibility ("hidden"))); - - versioned_symbol (libm, __ieee754_powf, powf, GLIBC_2_27); - libm_alias_float_other (__pow, pow) --#else -+# else - libm_alias_float (__pow, pow) --#endif -+# endif - - strong_alias (__powf, __ieee754_powf) - libm_alias_finite (__powf, __powf) - --#define __powf __powf_sse2 -+# define __powf __powf_sse2 -+#endif - #include -diff --git a/sysdeps/x86_64/fpu/multiarch/s_atan.c b/sysdeps/x86_64/fpu/multiarch/s_atan.c -index 71bad096a9..4d2c6ce006 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_atan.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_atan.c -@@ -16,15 +16,18 @@ - License along with the GNU C Library; if not, see - . */ - --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include - - extern double __redirect_atan (double); - --#define SYMBOL_NAME atan --#include "ifunc-avx-fma4.h" -+# define SYMBOL_NAME atan -+# include "ifunc-avx-fma4.h" - - libc_ifunc_redirected (__redirect_atan, __atan, IFUNC_SELECTOR ()); - libm_alias_double (__atan, atan) - --#define __atan __atan_sse2 -+# define __atan __atan_sse2 -+#endif - #include -diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil-avx.S b/sysdeps/x86_64/fpu/multiarch/s_ceil-avx.S -new file mode 100644 -index 0000000000..e6c1106753 ---- /dev/null -+++ b/sysdeps/x86_64/fpu/multiarch/s_ceil-avx.S -@@ -0,0 +1,28 @@ -+/* AVX implementation of ceil function. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#include -+#include -+ -+ .text -+ENTRY(__ceil) -+ vroundsd $10, %xmm0, %xmm0, %xmm0 -+ ret -+END(__ceil) -+ -+libm_alias_double (__ceil, ceil) -diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_ceil-sse4_1.S -index 64119011ad..dba756c38f 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_ceil-sse4_1.S -+++ b/sysdeps/x86_64/fpu/multiarch/s_ceil-sse4_1.S -@@ -17,8 +17,20 @@ - - #include - -+#include -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+# include -+# define __ceil_sse41 __ceil -+ .text -+#else - .section .text.sse4.1,"ax",@progbits -+#endif -+ - ENTRY(__ceil_sse41) - roundsd $10, %xmm0, %xmm0 - ret - END(__ceil_sse41) -+ -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+libm_alias_double (__ceil, ceil) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil.c b/sysdeps/x86_64/fpu/multiarch/s_ceil.c -index cc028addee..46c8e91e19 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_ceil.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_ceil.c -@@ -16,17 +16,20 @@ - License along with the GNU C Library; if not, see - . */ - --#define NO_MATH_REDIRECT --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL -+# define NO_MATH_REDIRECT -+# include - --#define ceil __redirect_ceil --#define __ceil __redirect___ceil --#include --#undef ceil --#undef __ceil -+# define ceil __redirect_ceil -+# define __ceil __redirect___ceil -+# include -+# undef ceil -+# undef __ceil - --#define SYMBOL_NAME ceil --#include "ifunc-sse4_1.h" -+# define SYMBOL_NAME ceil -+# include "ifunc-sse4_1.h" - - libc_ifunc_redirected (__redirect_ceil, __ceil, IFUNC_SELECTOR ()); - libm_alias_double (__ceil, ceil) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceilf-avx.S b/sysdeps/x86_64/fpu/multiarch/s_ceilf-avx.S -new file mode 100644 -index 0000000000..b4d8ac0455 ---- /dev/null -+++ b/sysdeps/x86_64/fpu/multiarch/s_ceilf-avx.S -@@ -0,0 +1,28 @@ -+/* AVX implementation of ceilf function. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#include -+#include -+ -+ .text -+ENTRY(__ceilf) -+ vroundss $10, %xmm0, %xmm0, %xmm0 -+ ret -+END(__ceilf) -+ -+libm_alias_float (__ceil, ceil) -diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceilf-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_ceilf-sse4_1.S -index dd9a9f6b71..9abc87b91a 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_ceilf-sse4_1.S -+++ b/sysdeps/x86_64/fpu/multiarch/s_ceilf-sse4_1.S -@@ -17,8 +17,20 @@ - - #include - -+#include -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+# include -+# define __ceilf_sse41 __ceilf -+ .text -+#else - .section .text.sse4.1,"ax",@progbits -+#endif -+ - ENTRY(__ceilf_sse41) - roundss $10, %xmm0, %xmm0 - ret - END(__ceilf_sse41) -+ -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+libm_alias_float (__ceil, ceil) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceilf.c b/sysdeps/x86_64/fpu/multiarch/s_ceilf.c -index 97a0ca7d19..bb53108f73 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_ceilf.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_ceilf.c -@@ -16,17 +16,20 @@ - License along with the GNU C Library; if not, see - . */ - --#define NO_MATH_REDIRECT --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL -+# define NO_MATH_REDIRECT -+# include - --#define ceilf __redirect_ceilf --#define __ceilf __redirect___ceilf --#include --#undef ceilf --#undef __ceilf -+# define ceilf __redirect_ceilf -+# define __ceilf __redirect___ceilf -+# include -+# undef ceilf -+# undef __ceilf - --#define SYMBOL_NAME ceilf --#include "ifunc-sse4_1.h" -+# define SYMBOL_NAME ceilf -+# include "ifunc-sse4_1.h" - - libc_ifunc_redirected (__redirect_ceilf, __ceilf, IFUNC_SELECTOR ()); - libm_alias_float (__ceil, ceil) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_cosf.c b/sysdeps/x86_64/fpu/multiarch/s_cosf.c -index 2703c576df..8a02e04538 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_cosf.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_cosf.c -@@ -16,13 +16,18 @@ - License along with the GNU C Library; if not, see - . */ - --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include - - extern float __redirect_cosf (float); - --#define SYMBOL_NAME cosf --#include "ifunc-fma.h" -+# define SYMBOL_NAME cosf -+# include "ifunc-fma.h" - - libc_ifunc_redirected (__redirect_cosf, __cosf, IFUNC_SELECTOR ()); - - libm_alias_float (__cos, cos) -+#else -+# include -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_expm1.c b/sysdeps/x86_64/fpu/multiarch/s_expm1.c -index 8a2d69f9b2..d58ef3d8f5 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_expm1.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_expm1.c -@@ -16,21 +16,24 @@ - License along with the GNU C Library; if not, see - . */ - --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include - - extern double __redirect_expm1 (double); - --#define SYMBOL_NAME expm1 --#include "ifunc-fma.h" -+# define SYMBOL_NAME expm1 -+# include "ifunc-fma.h" - - libc_ifunc_redirected (__redirect_expm1, __expm1, IFUNC_SELECTOR ()); - libm_alias_double (__expm1, expm1) - --#define __expm1 __expm1_sse2 -+# define __expm1 __expm1_sse2 - - /* NB: __expm1 may be expanded to __expm1_sse2 in the following - prototypes. */ - extern long double __expm1l (long double); - extern long double __expm1f128 (long double); - -+#endif - #include -diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor-avx.S b/sysdeps/x86_64/fpu/multiarch/s_floor-avx.S -new file mode 100644 -index 0000000000..ff74b5a8bf ---- /dev/null -+++ b/sysdeps/x86_64/fpu/multiarch/s_floor-avx.S -@@ -0,0 +1,28 @@ -+/* AVX implementation of floor function. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#include -+#include -+ -+ .text -+ENTRY(__floor) -+ vroundsd $9, %xmm0, %xmm0, %xmm0 -+ ret -+END(__floor) -+ -+libm_alias_double (__floor, floor) -diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_floor-sse4_1.S -index 2f7521f39f..c9b9b0639b 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_floor-sse4_1.S -+++ b/sysdeps/x86_64/fpu/multiarch/s_floor-sse4_1.S -@@ -17,8 +17,20 @@ - - #include - -+#include -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+# include -+# define __floor_sse41 __floor -+ .text -+#else - .section .text.sse4.1,"ax",@progbits -+#endif -+ - ENTRY(__floor_sse41) - roundsd $9, %xmm0, %xmm0 - ret - END(__floor_sse41) -+ -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+libm_alias_double (__floor, floor) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor.c b/sysdeps/x86_64/fpu/multiarch/s_floor.c -index 8cebd48e10..2c87dd0056 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_floor.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_floor.c -@@ -16,17 +16,20 @@ - License along with the GNU C Library; if not, see - . */ - --#define NO_MATH_REDIRECT --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL -+# define NO_MATH_REDIRECT -+# include - --#define floor __redirect_floor --#define __floor __redirect___floor --#include --#undef floor --#undef __floor -+# define floor __redirect_floor -+# define __floor __redirect___floor -+# include -+# undef floor -+# undef __floor - --#define SYMBOL_NAME floor --#include "ifunc-sse4_1.h" -+# define SYMBOL_NAME floor -+# include "ifunc-sse4_1.h" - - libc_ifunc_redirected (__redirect_floor, __floor, IFUNC_SELECTOR ()); - libm_alias_double (__floor, floor) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_floorf-avx.S b/sysdeps/x86_64/fpu/multiarch/s_floorf-avx.S -new file mode 100644 -index 0000000000..c378baae8e ---- /dev/null -+++ b/sysdeps/x86_64/fpu/multiarch/s_floorf-avx.S -@@ -0,0 +1,28 @@ -+/* AVX implementation of floorf function. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#include -+#include -+ -+ .text -+ENTRY(__floorf) -+ vroundss $9, %xmm0, %xmm0, %xmm0 -+ ret -+END(__floorf) -+ -+libm_alias_float (__floor, floor) -diff --git a/sysdeps/x86_64/fpu/multiarch/s_floorf-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_floorf-sse4_1.S -index 5f6020d27d..c2216899db 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_floorf-sse4_1.S -+++ b/sysdeps/x86_64/fpu/multiarch/s_floorf-sse4_1.S -@@ -17,8 +17,20 @@ - - #include - -+#include -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+# include -+# define __floorf_sse41 __floorf -+ .text -+#else - .section .text.sse4.1,"ax",@progbits -+#endif -+ - ENTRY(__floorf_sse41) - roundss $9, %xmm0, %xmm0 - ret - END(__floorf_sse41) -+ -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+libm_alias_float (__floor, floor) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_floorf.c b/sysdeps/x86_64/fpu/multiarch/s_floorf.c -index a14e18b03c..a277802b6d 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_floorf.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_floorf.c -@@ -16,17 +16,20 @@ - License along with the GNU C Library; if not, see - . */ - --#define NO_MATH_REDIRECT --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL -+# define NO_MATH_REDIRECT -+# include - --#define floorf __redirect_floorf --#define __floorf __redirect___floorf --#include --#undef floorf --#undef __floorf -+# define floorf __redirect_floorf -+# define __floorf __redirect___floorf -+# include -+# undef floorf -+# undef __floorf - --#define SYMBOL_NAME floorf --#include "ifunc-sse4_1.h" -+# define SYMBOL_NAME floorf -+# include "ifunc-sse4_1.h" - - libc_ifunc_redirected (__redirect_floorf, __floorf, IFUNC_SELECTOR ()); - libm_alias_float (__floor, floor) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_log1p.c b/sysdeps/x86_64/fpu/multiarch/s_log1p.c -index a8e1a3f21b..3fa1185d81 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_log1p.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_log1p.c -@@ -16,14 +16,17 @@ - License along with the GNU C Library; if not, see - . */ - --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include - - extern double __redirect_log1p (double); - --#define SYMBOL_NAME log1p --#include "ifunc-fma.h" -+# define SYMBOL_NAME log1p -+# include "ifunc-fma.h" - - libc_ifunc_redirected (__redirect_log1p, __log1p, IFUNC_SELECTOR ()); - --#define __log1p __log1p_sse2 -+# define __log1p __log1p_sse2 -+#endif - #include -diff --git a/sysdeps/x86_64/fpu/multiarch/s_nearbyint-avx.S b/sysdeps/x86_64/fpu/multiarch/s_nearbyint-avx.S -new file mode 100644 -index 0000000000..5bfdf73c28 ---- /dev/null -+++ b/sysdeps/x86_64/fpu/multiarch/s_nearbyint-avx.S -@@ -0,0 +1,28 @@ -+/* AVX implementation of nearbyint function. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#include -+#include -+ -+ .text -+ENTRY(__nearbyint) -+ vroundsd $0xc, %xmm0, %xmm0, %xmm0 -+ ret -+END(__nearbyint) -+ -+libm_alias_double (__nearbyint, nearbyint) -diff --git a/sysdeps/x86_64/fpu/multiarch/s_nearbyint-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_nearbyint-sse4_1.S -index 674f7eb40a..9d84410a1f 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_nearbyint-sse4_1.S -+++ b/sysdeps/x86_64/fpu/multiarch/s_nearbyint-sse4_1.S -@@ -17,8 +17,20 @@ - - #include - -+#include -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+# include -+# define __nearbyint_sse41 __nearbyint -+ .text -+#else - .section .text.sse4.1,"ax",@progbits -+#endif -+ - ENTRY(__nearbyint_sse41) - roundsd $0xc, %xmm0, %xmm0 - ret - END(__nearbyint_sse41) -+ -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+libm_alias_double (__nearbyint, nearbyint) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_nearbyint.c b/sysdeps/x86_64/fpu/multiarch/s_nearbyint.c -index 693e42dd4e..057a7ca60f 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_nearbyint.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_nearbyint.c -@@ -16,17 +16,20 @@ - License along with the GNU C Library; if not, see - . */ - --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL -+# include - --#define nearbyint __redirect_nearbyint --#define __nearbyint __redirect___nearbyint --#include --#undef nearbyint --#undef __nearbyint -+# define nearbyint __redirect_nearbyint -+# define __nearbyint __redirect___nearbyint -+# include -+# undef nearbyint -+# undef __nearbyint - --#define SYMBOL_NAME nearbyint --#include "ifunc-sse4_1.h" -+# define SYMBOL_NAME nearbyint -+# include "ifunc-sse4_1.h" - - libc_ifunc_redirected (__redirect_nearbyint, __nearbyint, - IFUNC_SELECTOR ()); - libm_alias_double (__nearbyint, nearbyint) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_nearbyintf-avx.S b/sysdeps/x86_64/fpu/multiarch/s_nearbyintf-avx.S -new file mode 100644 -index 0000000000..1dbaed0324 ---- /dev/null -+++ b/sysdeps/x86_64/fpu/multiarch/s_nearbyintf-avx.S -@@ -0,0 +1,28 @@ -+/* AVX implmentation of nearbyintf function. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#include -+#include -+ -+ .text -+ENTRY(__nearbyintf) -+ vroundss $0xc, %xmm0, %xmm0, %xmm0 -+ ret -+END(__nearbyintf) -+ -+libm_alias_float (__nearbyint, nearbyint) -diff --git a/sysdeps/x86_64/fpu/multiarch/s_nearbyintf-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_nearbyintf-sse4_1.S -index 5892bd7563..3cf35f92d6 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_nearbyintf-sse4_1.S -+++ b/sysdeps/x86_64/fpu/multiarch/s_nearbyintf-sse4_1.S -@@ -17,8 +17,20 @@ - - #include - -+#include -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+# include -+# define __nearbyintf_sse41 __nearbyintf -+ .text -+#else - .section .text.sse4.1,"ax",@progbits -+#endif -+ - ENTRY(__nearbyintf_sse41) - roundss $0xc, %xmm0, %xmm0 - ret - END(__nearbyintf_sse41) -+ -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+libm_alias_float (__nearbyint, nearbyint) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_nearbyintf.c b/sysdeps/x86_64/fpu/multiarch/s_nearbyintf.c -index a0ac009f4b..41f374ba72 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_nearbyintf.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_nearbyintf.c -@@ -16,17 +16,20 @@ - License along with the GNU C Library; if not, see - . */ - --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL -+# include - --#define nearbyintf __redirect_nearbyintf --#define __nearbyintf __redirect___nearbyintf --#include --#undef nearbyintf --#undef __nearbyintf -+# define nearbyintf __redirect_nearbyintf -+# define __nearbyintf __redirect___nearbyintf -+# include -+# undef nearbyintf -+# undef __nearbyintf - --#define SYMBOL_NAME nearbyintf --#include "ifunc-sse4_1.h" -+# define SYMBOL_NAME nearbyintf -+# include "ifunc-sse4_1.h" - - libc_ifunc_redirected (__redirect_nearbyintf, __nearbyintf, - IFUNC_SELECTOR ()); - libm_alias_float (__nearbyint, nearbyint) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_rint-avx.S b/sysdeps/x86_64/fpu/multiarch/s_rint-avx.S -new file mode 100644 -index 0000000000..2b403b331f ---- /dev/null -+++ b/sysdeps/x86_64/fpu/multiarch/s_rint-avx.S -@@ -0,0 +1,28 @@ -+/* AVX implementation of rint function. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#include -+#include -+ -+ .text -+ENTRY(__rint) -+ vroundsd $4, %xmm0, %xmm0, %xmm0 -+ ret -+END(__rint) -+ -+libm_alias_double (__rint, rint) -diff --git a/sysdeps/x86_64/fpu/multiarch/s_rint-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_rint-sse4_1.S -index 405372991b..8cd9cf759f 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_rint-sse4_1.S -+++ b/sysdeps/x86_64/fpu/multiarch/s_rint-sse4_1.S -@@ -17,8 +17,20 @@ - - #include - -+#include -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+# include -+# define __rint_sse41 __rint -+ .text -+#else - .section .text.sse4.1,"ax",@progbits -+#endif -+ - ENTRY(__rint_sse41) - roundsd $4, %xmm0, %xmm0 - ret - END(__rint_sse41) -+ -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+libm_alias_double (__rint, rint) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_rint.c b/sysdeps/x86_64/fpu/multiarch/s_rint.c -index 754c87e004..18623b7d99 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_rint.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_rint.c -@@ -16,17 +16,20 @@ - License along with the GNU C Library; if not, see - . */ - --#define NO_MATH_REDIRECT --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL -+# define NO_MATH_REDIRECT -+# include - --#define rint __redirect_rint --#define __rint __redirect___rint --#include --#undef rint --#undef __rint -+# define rint __redirect_rint -+# define __rint __redirect___rint -+# include -+# undef rint -+# undef __rint - --#define SYMBOL_NAME rint --#include "ifunc-sse4_1.h" -+# define SYMBOL_NAME rint -+# include "ifunc-sse4_1.h" - - libc_ifunc_redirected (__redirect_rint, __rint, IFUNC_SELECTOR ()); - libm_alias_double (__rint, rint) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_rintf-avx.S b/sysdeps/x86_64/fpu/multiarch/s_rintf-avx.S -new file mode 100644 -index 0000000000..171c2867f4 ---- /dev/null -+++ b/sysdeps/x86_64/fpu/multiarch/s_rintf-avx.S -@@ -0,0 +1,28 @@ -+/* AVX implementation of rintf function. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#include -+#include -+ -+ .text -+ENTRY(__rintf) -+ vroundss $4, %xmm0, %xmm0, %xmm0 -+ ret -+END(__rintf) -+ -+libm_alias_float (__rint, rint) -diff --git a/sysdeps/x86_64/fpu/multiarch/s_rintf-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_rintf-sse4_1.S -index 8ac67ce767..fc1e70f0c9 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_rintf-sse4_1.S -+++ b/sysdeps/x86_64/fpu/multiarch/s_rintf-sse4_1.S -@@ -17,8 +17,20 @@ - - #include - -+#include -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+# include -+# define __rintf_sse41 __rintf -+ .text -+#else - .section .text.sse4.1,"ax",@progbits -+#endif -+ - ENTRY(__rintf_sse41) - roundss $4, %xmm0, %xmm0 - ret - END(__rintf_sse41) -+ -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+libm_alias_float (__rint, rint) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_rintf.c b/sysdeps/x86_64/fpu/multiarch/s_rintf.c -index e9d6b7a5f2..e275368dec 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_rintf.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_rintf.c -@@ -16,17 +16,20 @@ - License along with the GNU C Library; if not, see - . */ - --#define NO_MATH_REDIRECT --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL -+# define NO_MATH_REDIRECT -+# include - --#define rintf __redirect_rintf --#define __rintf __redirect___rintf --#include --#undef rintf --#undef __rintf -+# define rintf __redirect_rintf -+# define __rintf __redirect___rintf -+# include -+# undef rintf -+# undef __rintf - --#define SYMBOL_NAME rintf --#include "ifunc-sse4_1.h" -+# define SYMBOL_NAME rintf -+# include "ifunc-sse4_1.h" - - libc_ifunc_redirected (__redirect_rintf, __rintf, IFUNC_SELECTOR ()); - libm_alias_float (__rint, rint) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_roundeven-avx.S b/sysdeps/x86_64/fpu/multiarch/s_roundeven-avx.S -new file mode 100644 -index 0000000000..576790355c ---- /dev/null -+++ b/sysdeps/x86_64/fpu/multiarch/s_roundeven-avx.S -@@ -0,0 +1,28 @@ -+/* AVX implementation of roundeven function. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#include -+#include -+ -+ .text -+ENTRY(__roundeven) -+ vroundsd $8, %xmm0, %xmm0, %xmm0 -+ ret -+END(__roundeven) -+ -+libm_alias_double (__roundeven, roundeven) -diff --git a/sysdeps/x86_64/fpu/multiarch/s_roundeven-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_roundeven-sse4_1.S -index 5ef102336b..f00be56c59 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_roundeven-sse4_1.S -+++ b/sysdeps/x86_64/fpu/multiarch/s_roundeven-sse4_1.S -@@ -17,8 +17,20 @@ - - #include - -+#include -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+# include -+# define __roundeven_sse41 __roundeven -+ .text -+#else - .section .text.sse4.1,"ax",@progbits -+#endif -+ - ENTRY(__roundeven_sse41) - roundsd $8, %xmm0, %xmm0 - ret - END(__roundeven_sse41) -+ -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+libm_alias_double (__roundeven, roundeven) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_roundeven.c b/sysdeps/x86_64/fpu/multiarch/s_roundeven.c -index 8737b32e26..139aad088f 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_roundeven.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_roundeven.c -@@ -16,16 +16,19 @@ - License along with the GNU C Library; if not, see - . */ - --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL -+# include - --#define roundeven __redirect_roundeven --#define __roundeven __redirect___roundeven --#include --#undef roundeven --#undef __roundeven -+# define roundeven __redirect_roundeven -+# define __roundeven __redirect___roundeven -+# include -+# undef roundeven -+# undef __roundeven - --#define SYMBOL_NAME roundeven --#include "ifunc-sse4_1.h" -+# define SYMBOL_NAME roundeven -+# include "ifunc-sse4_1.h" - - libc_ifunc_redirected (__redirect_roundeven, __roundeven, IFUNC_SELECTOR ()); - libm_alias_double (__roundeven, roundeven) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_roundevenf-avx.S b/sysdeps/x86_64/fpu/multiarch/s_roundevenf-avx.S -new file mode 100644 -index 0000000000..42c359f4cd ---- /dev/null -+++ b/sysdeps/x86_64/fpu/multiarch/s_roundevenf-avx.S -@@ -0,0 +1,28 @@ -+/* AVX implementation of roundevenf function. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#include -+#include -+ -+ .text -+ENTRY(__roundevenf) -+ vroundss $8, %xmm0, %xmm0, %xmm0 -+ ret -+END(__roundevenf) -+ -+libm_alias_float (__roundeven, roundeven) -diff --git a/sysdeps/x86_64/fpu/multiarch/s_roundevenf-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_roundevenf-sse4_1.S -index 792c90ba07..6b148e4353 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_roundevenf-sse4_1.S -+++ b/sysdeps/x86_64/fpu/multiarch/s_roundevenf-sse4_1.S -@@ -17,8 +17,20 @@ - - #include - -+#include -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+# include -+# define __roundevenf_sse41 __roundevenf -+ .text -+#else - .section .text.sse4.1,"ax",@progbits -+#endif -+ - ENTRY(__roundevenf_sse41) - roundss $8, %xmm0, %xmm0 - ret - END(__roundevenf_sse41) -+ -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+libm_alias_float (__roundeven, roundeven) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_roundevenf.c b/sysdeps/x86_64/fpu/multiarch/s_roundevenf.c -index e96016a4d5..2fb090075d 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_roundevenf.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_roundevenf.c -@@ -16,16 +16,19 @@ - License along with the GNU C Library; if not, see - . */ - --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL -+# include - --#define roundevenf __redirect_roundevenf --#define __roundevenf __redirect___roundevenf --#include --#undef roundevenf --#undef __roundevenf -+# define roundevenf __redirect_roundevenf -+# define __roundevenf __redirect___roundevenf -+# include -+# undef roundevenf -+# undef __roundevenf - --#define SYMBOL_NAME roundevenf --#include "ifunc-sse4_1.h" -+# define SYMBOL_NAME roundevenf -+# include "ifunc-sse4_1.h" - - libc_ifunc_redirected (__redirect_roundevenf, __roundevenf, IFUNC_SELECTOR ()); - libm_alias_float (__roundeven, roundeven) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_sin.c b/sysdeps/x86_64/fpu/multiarch/s_sin.c -index 355cc0092e..21e77943a3 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_sin.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_sin.c -@@ -16,24 +16,27 @@ - License along with the GNU C Library; if not, see - . */ - --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include - - extern double __redirect_sin (double); - extern double __redirect_cos (double); - --#define SYMBOL_NAME sin --#include "ifunc-avx-fma4.h" -+# define SYMBOL_NAME sin -+# include "ifunc-avx-fma4.h" - - libc_ifunc_redirected (__redirect_sin, __sin, IFUNC_SELECTOR ()); - libm_alias_double (__sin, sin) - --#undef SYMBOL_NAME --#define SYMBOL_NAME cos --#include "ifunc-avx-fma4.h" -+# undef SYMBOL_NAME -+# define SYMBOL_NAME cos -+# include "ifunc-avx-fma4.h" - - libc_ifunc_redirected (__redirect_cos, __cos, IFUNC_SELECTOR ()); - libm_alias_double (__cos, cos) - --#define __cos __cos_sse2 --#define __sin __sin_sse2 -+# define __cos __cos_sse2 -+# define __sin __sin_sse2 -+#endif - #include -diff --git a/sysdeps/x86_64/fpu/multiarch/s_sincos.c b/sysdeps/x86_64/fpu/multiarch/s_sincos.c -index 70107e999c..b35757f8de 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_sincos.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_sincos.c -@@ -16,15 +16,18 @@ - License along with the GNU C Library; if not, see - . */ - --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include - - extern void __redirect_sincos (double, double *, double *); - --#define SYMBOL_NAME sincos --#include "ifunc-fma4.h" -+# define SYMBOL_NAME sincos -+# include "ifunc-fma4.h" - - libc_ifunc_redirected (__redirect_sincos, __sincos, IFUNC_SELECTOR ()); - libm_alias_double (__sincos, sincos) - --#define __sincos __sincos_sse2 -+# define __sincos __sincos_sse2 -+#endif - #include -diff --git a/sysdeps/x86_64/fpu/multiarch/s_sincosf.c b/sysdeps/x86_64/fpu/multiarch/s_sincosf.c -index 80bc028451..0ea9b40e84 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_sincosf.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_sincosf.c -@@ -16,13 +16,18 @@ - License along with the GNU C Library; if not, see - . */ - --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include - - extern void __redirect_sincosf (float, float *, float *); - --#define SYMBOL_NAME sincosf --#include "ifunc-fma.h" -+# define SYMBOL_NAME sincosf -+# include "ifunc-fma.h" - - libc_ifunc_redirected (__redirect_sincosf, __sincosf, IFUNC_SELECTOR ()); - - libm_alias_float (__sincos, sincos) -+#else -+# include -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_sinf.c b/sysdeps/x86_64/fpu/multiarch/s_sinf.c -index a32b9e9550..c61624e3ee 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_sinf.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_sinf.c -@@ -16,13 +16,18 @@ - License along with the GNU C Library; if not, see - . */ - --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include - - extern float __redirect_sinf (float); - --#define SYMBOL_NAME sinf --#include "ifunc-fma.h" -+# define SYMBOL_NAME sinf -+# include "ifunc-fma.h" - - libc_ifunc_redirected (__redirect_sinf, __sinf, IFUNC_SELECTOR ()); - - libm_alias_float (__sin, sin) -+#else -+# include -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_tan.c b/sysdeps/x86_64/fpu/multiarch/s_tan.c -index f9a2474a13..125d992ba1 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_tan.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_tan.c -@@ -16,15 +16,18 @@ - License along with the GNU C Library; if not, see - . */ - --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include - - extern double __redirect_tan (double); - --#define SYMBOL_NAME tan --#include "ifunc-avx-fma4.h" -+# define SYMBOL_NAME tan -+# include "ifunc-avx-fma4.h" - - libc_ifunc_redirected (__redirect_tan, __tan, IFUNC_SELECTOR ()); - libm_alias_double (__tan, tan) - --#define __tan __tan_sse2 -+# define __tan __tan_sse2 -+#endif - #include -diff --git a/sysdeps/x86_64/fpu/multiarch/s_trunc-avx.S b/sysdeps/x86_64/fpu/multiarch/s_trunc-avx.S -new file mode 100644 -index 0000000000..b3e87e9606 ---- /dev/null -+++ b/sysdeps/x86_64/fpu/multiarch/s_trunc-avx.S -@@ -0,0 +1,28 @@ -+/* AVX implementation of trunc function. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#include -+#include -+ -+ .text -+ENTRY(__trunc) -+ vroundsd $11, %xmm0, %xmm0, %xmm0 -+ ret -+END(__trunc) -+ -+libm_alias_double (__trunc, trunc) -diff --git a/sysdeps/x86_64/fpu/multiarch/s_trunc-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_trunc-sse4_1.S -index b496a6ef49..2b79174eed 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_trunc-sse4_1.S -+++ b/sysdeps/x86_64/fpu/multiarch/s_trunc-sse4_1.S -@@ -18,8 +18,20 @@ - - #include - -+#include -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+# include -+# define __trunc_sse41 __trunc -+ .text -+#else - .section .text.sse4.1,"ax",@progbits -+#endif -+ - ENTRY(__trunc_sse41) - roundsd $11, %xmm0, %xmm0 - ret - END(__trunc_sse41) -+ -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+libm_alias_double (__trunc, trunc) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_trunc.c b/sysdeps/x86_64/fpu/multiarch/s_trunc.c -index 9bc9df8744..ea89c4f85d 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_trunc.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_trunc.c -@@ -16,17 +16,20 @@ - License along with the GNU C Library; if not, see - . */ - --#define NO_MATH_REDIRECT --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL -+# define NO_MATH_REDIRECT -+# include - --#define trunc __redirect_trunc --#define __trunc __redirect___trunc --#include --#undef trunc --#undef __trunc -+# define trunc __redirect_trunc -+# define __trunc __redirect___trunc -+# include -+# undef trunc -+# undef __trunc - --#define SYMBOL_NAME trunc --#include "ifunc-sse4_1.h" -+# define SYMBOL_NAME trunc -+# include "ifunc-sse4_1.h" - - libc_ifunc_redirected (__redirect_trunc, __trunc, IFUNC_SELECTOR ()); - libm_alias_double (__trunc, trunc) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_truncf-avx.S b/sysdeps/x86_64/fpu/multiarch/s_truncf-avx.S -new file mode 100644 -index 0000000000..f31ac7d7f7 ---- /dev/null -+++ b/sysdeps/x86_64/fpu/multiarch/s_truncf-avx.S -@@ -0,0 +1,28 @@ -+/* AVX implementation of truncf function. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#include -+#include -+ -+ .text -+ENTRY(__truncf) -+ vroundss $11, %xmm0, %xmm0, %xmm0 -+ ret -+END(__truncf) -+ -+libm_alias_float (__trunc, trunc) -diff --git a/sysdeps/x86_64/fpu/multiarch/s_truncf-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_truncf-sse4_1.S -index 22e9a83307..60498b2cb2 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_truncf-sse4_1.S -+++ b/sysdeps/x86_64/fpu/multiarch/s_truncf-sse4_1.S -@@ -18,8 +18,20 @@ - - #include - -+#include -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+# include -+# define __truncf_sse41 __truncf -+ .text -+#else - .section .text.sse4.1,"ax",@progbits -+#endif -+ - ENTRY(__truncf_sse41) - roundss $11, %xmm0, %xmm0 - ret - END(__truncf_sse41) -+ -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+libm_alias_float (__trunc, trunc) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_truncf.c b/sysdeps/x86_64/fpu/multiarch/s_truncf.c -index dae01d166a..92435ce39d 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_truncf.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_truncf.c -@@ -16,17 +16,20 @@ - License along with the GNU C Library; if not, see - . */ - --#define NO_MATH_REDIRECT --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL -+# define NO_MATH_REDIRECT -+# include - --#define truncf __redirect_truncf --#define __truncf __redirect___truncf --#include --#undef truncf --#undef __truncf -+# define truncf __redirect_truncf -+# define __truncf __redirect___truncf -+# include -+# undef truncf -+# undef __truncf - --#define SYMBOL_NAME truncf --#include "ifunc-sse4_1.h" -+# define SYMBOL_NAME truncf -+# include "ifunc-sse4_1.h" - - libc_ifunc_redirected (__redirect_truncf, __truncf, IFUNC_SELECTOR ()); - libm_alias_float (__trunc, trunc) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/w_exp.c b/sysdeps/x86_64/fpu/multiarch/w_exp.c -index 27eee98a0a..3584187e0e 100644 ---- a/sysdeps/x86_64/fpu/multiarch/w_exp.c -+++ b/sysdeps/x86_64/fpu/multiarch/w_exp.c -@@ -1 +1,6 @@ --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL >= AVX2_X86_ISA_LEVEL -+# include -+#else -+# include -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/w_log.c b/sysdeps/x86_64/fpu/multiarch/w_log.c -index 9b2b018711..414ca3ca3d 100644 ---- a/sysdeps/x86_64/fpu/multiarch/w_log.c -+++ b/sysdeps/x86_64/fpu/multiarch/w_log.c -@@ -1 +1,6 @@ --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL >= AVX2_X86_ISA_LEVEL -+# include -+#else -+# include -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/w_pow.c b/sysdeps/x86_64/fpu/multiarch/w_pow.c -index b50c1988de..d5fcc4f871 100644 ---- a/sysdeps/x86_64/fpu/multiarch/w_pow.c -+++ b/sysdeps/x86_64/fpu/multiarch/w_pow.c -@@ -1 +1,6 @@ --#include -+#include -+#if MINIMUM_X86_ISA_LEVEL >= AVX2_X86_ISA_LEVEL -+# include -+#else -+# include -+#endif - -commit 31da30f23cddd36db29d5b6a1c7619361b271fb4 -Author: Charles Fol -Date: Thu Mar 28 12:25:38 2024 -0300 - - iconv: ISO-2022-CN-EXT: fix out-of-bound writes when writing escape sequence (CVE-2024-2961) - - ISO-2022-CN-EXT uses escape sequences to indicate character set changes - (as specified by RFC 1922). While the SOdesignation has the expected - bounds checks, neither SS2designation nor SS3designation have its; - allowing a write overflow of 1, 2, or 3 bytes with fixed values: - '$+I', '$+J', '$+K', '$+L', '$+M', or '$*H'. - - Checked on aarch64-linux-gnu. - - Co-authored-by: Adhemerval Zanella - Reviewed-by: Carlos O'Donell - Tested-by: Carlos O'Donell - - (cherry picked from commit f9dc609e06b1136bb0408be9605ce7973a767ada) - -diff --git a/iconvdata/Makefile b/iconvdata/Makefile -index ea019ce5c0..7196a8744b 100644 ---- a/iconvdata/Makefile -+++ b/iconvdata/Makefile -@@ -75,7 +75,8 @@ ifeq (yes,$(build-shared)) - tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4 \ - tst-iconv6 bug-iconv5 bug-iconv6 tst-iconv7 bug-iconv8 bug-iconv9 \ - bug-iconv10 bug-iconv11 bug-iconv12 tst-iconv-big5-hkscs-to-2ucs4 \ -- bug-iconv13 bug-iconv14 bug-iconv15 -+ bug-iconv13 bug-iconv14 bug-iconv15 \ -+ tst-iconv-iso-2022-cn-ext - ifeq ($(have-thread-library),yes) - tests += bug-iconv3 - endif -@@ -330,6 +331,8 @@ $(objpfx)bug-iconv14.out: $(addprefix $(objpfx), $(gconv-modules)) \ - $(addprefix $(objpfx),$(modules.so)) - $(objpfx)bug-iconv15.out: $(addprefix $(objpfx), $(gconv-modules)) \ - $(addprefix $(objpfx),$(modules.so)) -+$(objpfx)tst-iconv-iso-2022-cn-ext.out: $(addprefix $(objpfx), $(gconv-modules)) \ -+ $(addprefix $(objpfx),$(modules.so)) - - $(objpfx)iconv-test.out: run-iconv-test.sh \ - $(addprefix $(objpfx), $(gconv-modules)) \ -diff --git a/iconvdata/iso-2022-cn-ext.c b/iconvdata/iso-2022-cn-ext.c -index b34c8a36f4..cce29b1969 100644 ---- a/iconvdata/iso-2022-cn-ext.c -+++ b/iconvdata/iso-2022-cn-ext.c -@@ -574,6 +574,12 @@ DIAG_IGNORE_Os_NEEDS_COMMENT (5, "-Wmaybe-uninitialized"); - { \ - const char *escseq; \ - \ -+ if (outptr + 4 > outend) \ -+ { \ -+ result = __GCONV_FULL_OUTPUT; \ -+ break; \ -+ } \ -+ \ - assert (used == CNS11643_2_set); /* XXX */ \ - escseq = "*H"; \ - *outptr++ = ESC; \ -@@ -587,6 +593,12 @@ DIAG_IGNORE_Os_NEEDS_COMMENT (5, "-Wmaybe-uninitialized"); - { \ - const char *escseq; \ - \ -+ if (outptr + 4 > outend) \ -+ { \ -+ result = __GCONV_FULL_OUTPUT; \ -+ break; \ -+ } \ -+ \ - assert ((used >> 5) >= 3 && (used >> 5) <= 7); \ - escseq = "+I+J+K+L+M" + ((used >> 5) - 3) * 2; \ - *outptr++ = ESC; \ -diff --git a/iconvdata/tst-iconv-iso-2022-cn-ext.c b/iconvdata/tst-iconv-iso-2022-cn-ext.c -new file mode 100644 -index 0000000000..96a8765fd5 ---- /dev/null -+++ b/iconvdata/tst-iconv-iso-2022-cn-ext.c -@@ -0,0 +1,128 @@ -+/* Verify ISO-2022-CN-EXT does not write out of the bounds. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#include -+#include -+ -+#include -+#include -+#include -+ -+#include -+#include -+#include -+ -+/* The test sets up a two memory page buffer with the second page marked -+ PROT_NONE to trigger a fault if the conversion writes beyond the exact -+ expected amount. Then we carry out various conversions and precisely -+ place the start of the output buffer in order to trigger a SIGSEGV if the -+ process writes anywhere between 1 and page sized bytes more (only one -+ PROT_NONE page is setup as a canary) than expected. These tests exercise -+ all three of the cases in ISO-2022-CN-EXT where the converter must switch -+ character sets and may run out of buffer space while doing the -+ operation. */ -+ -+static int -+do_test (void) -+{ -+ iconv_t cd = iconv_open ("ISO-2022-CN-EXT", "UTF-8"); -+ TEST_VERIFY_EXIT (cd != (iconv_t) -1); -+ -+ char *ntf; -+ size_t ntfsize; -+ char *outbufbase; -+ { -+ int pgz = getpagesize (); -+ TEST_VERIFY_EXIT (pgz > 0); -+ ntfsize = 2 * pgz; -+ -+ ntf = xmmap (NULL, ntfsize, PROT_READ | PROT_WRITE, MAP_PRIVATE -+ | MAP_ANONYMOUS, -1); -+ xmprotect (ntf + pgz, pgz, PROT_NONE); -+ -+ outbufbase = ntf + pgz; -+ } -+ -+ /* Check if SOdesignation escape sequence does not trigger an OOB write. */ -+ { -+ char inbuf[] = "\xe4\xba\xa4\xe6\x8d\xa2"; -+ -+ for (int i = 0; i < 9; i++) -+ { -+ char *inp = inbuf; -+ size_t inleft = sizeof (inbuf) - 1; -+ -+ char *outp = outbufbase - i; -+ size_t outleft = i; -+ -+ TEST_VERIFY_EXIT (iconv (cd, &inp, &inleft, &outp, &outleft) -+ == (size_t) -1); -+ TEST_COMPARE (errno, E2BIG); -+ -+ TEST_VERIFY_EXIT (iconv (cd, NULL, NULL, NULL, NULL) == 0); -+ } -+ } -+ -+ /* Same as before for SS2designation. */ -+ { -+ char inbuf[] = "㴽 \xe3\xb4\xbd"; -+ -+ for (int i = 0; i < 14; i++) -+ { -+ char *inp = inbuf; -+ size_t inleft = sizeof (inbuf) - 1; -+ -+ char *outp = outbufbase - i; -+ size_t outleft = i; -+ -+ TEST_VERIFY_EXIT (iconv (cd, &inp, &inleft, &outp, &outleft) -+ == (size_t) -1); -+ TEST_COMPARE (errno, E2BIG); -+ -+ TEST_VERIFY_EXIT (iconv (cd, NULL, NULL, NULL, NULL) == 0); -+ } -+ } -+ -+ /* Same as before for SS3designation. */ -+ { -+ char inbuf[] = "劄 \xe5\x8a\x84"; -+ -+ for (int i = 0; i < 14; i++) -+ { -+ char *inp = inbuf; -+ size_t inleft = sizeof (inbuf) - 1; -+ -+ char *outp = outbufbase - i; -+ size_t outleft = i; -+ -+ TEST_VERIFY_EXIT (iconv (cd, &inp, &inleft, &outp, &outleft) -+ == (size_t) -1); -+ TEST_COMPARE (errno, E2BIG); -+ -+ TEST_VERIFY_EXIT (iconv (cd, NULL, NULL, NULL, NULL) == 0); -+ } -+ } -+ -+ TEST_VERIFY_EXIT (iconv_close (cd) != -1); -+ -+ xmunmap (ntf, ntfsize); -+ -+ return 0; -+} -+ -+#include - -commit e828914cf9f2fc2caa5bced0fc6a03cb78324979 -Author: Florian Weimer -Date: Tue Apr 23 21:16:32 2024 +0200 - - nptl: Fix tst-cancel30 on kernels without ppoll_time64 support - - Fall back to ppoll if ppoll_time64 fails with ENOSYS. - Fixes commit 370da8a121c3ba9eeb2f13da15fc0f21f4136b25 ("nptl: Fix - tst-cancel30 on sparc64"). - - Reviewed-by: Adhemerval Zanella - (cherry picked from commit f4724843ada64a51d66f65d3199fe431f9d4c254) - -diff --git a/sysdeps/pthread/tst-cancel30.c b/sysdeps/pthread/tst-cancel30.c -index 3030660e5f..94ad6281bc 100644 ---- a/sysdeps/pthread/tst-cancel30.c -+++ b/sysdeps/pthread/tst-cancel30.c -@@ -18,6 +18,7 @@ - License along with the GNU C Library; if not, see - . */ - -+#include - #include - #include - #include -@@ -46,13 +47,19 @@ tf (void *arg) - - /* Wait indefinitely for cancellation, which only works if asynchronous - cancellation is enabled. */ --#if defined SYS_ppoll || defined SYS_ppoll_time64 --# ifndef SYS_ppoll_time64 --# define SYS_ppoll_time64 SYS_ppoll -+#ifdef SYS_ppoll_time64 -+ long int ret = syscall (SYS_ppoll_time64, NULL, 0, NULL, NULL); -+ (void) ret; -+# ifdef SYS_ppoll -+ if (ret == -1 && errno == ENOSYS) -+ syscall (SYS_ppoll, NULL, 0, NULL, NULL); - # endif -- syscall (SYS_ppoll_time64, NULL, 0, NULL, NULL); - #else -+# ifdef SYS_ppoll -+ syscall (SYS_ppoll, NULL, 0, NULL, NULL); -+# else - for (;;); -+# endif - #endif - - return 0; - -commit e701c7d761f6e5c48d8e9dd5da88cbe2e94943f4 -Author: Florian Weimer -Date: Thu Apr 25 12:56:48 2024 +0200 - - i386: ulp update for SSE2 --disable-multi-arch configurations - - (cherry picked from commit 3a3a4497421422aa854c855cbe5110ca7d598ffc) - -diff --git a/sysdeps/i386/fpu/libm-test-ulps b/sysdeps/i386/fpu/libm-test-ulps -index 84e6686eba..f2139fc172 100644 ---- a/sysdeps/i386/fpu/libm-test-ulps -+++ b/sysdeps/i386/fpu/libm-test-ulps -@@ -1232,6 +1232,7 @@ ldouble: 6 - - Function: "hypot": - double: 1 -+float: 1 - float128: 1 - ldouble: 1 - - -commit 2f8f157eb0cc7f1d8d9a3fcaa8c55bed53b092a8 -Author: H.J. Lu -Date: Tue Apr 23 13:59:50 2024 -0700 - - x86: Define MINIMUM_X86_ISA_LEVEL in config.h [BZ #31676] - - Define MINIMUM_X86_ISA_LEVEL at configure time to avoid - - /usr/bin/ld: …/build/elf/librtld.os: in function `init_cpu_features': - …/git/elf/../sysdeps/x86/cpu-features.c:1202: undefined reference to `_dl_runtime_resolve_fxsave' - /usr/bin/ld: …/build/elf/librtld.os: relocation R_X86_64_PC32 against undefined hidden symbol `_dl_runtime_resolve_fxsave' can not be used when making a shared object - /usr/bin/ld: final link failed: bad value - collect2: error: ld returned 1 exit status - - when glibc is built with -march=x86-64-v3 and configured with - --with-rtld-early-cflags=-march=x86-64, which is used to allow ld.so to - print an error message on unsupported CPUs: - - Fatal glibc error: CPU does not support x86-64-v3 - - This fixes BZ #31676. - Reviewed-by: Sunil K Pandey - - (cherry picked from commit 46c999741340ea559784c20a45077955b50aca43) - -diff --git a/config.h.in b/config.h.in -index 4d33c63a84..1e647de585 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -286,6 +286,9 @@ - /* Define if x86 ISA level should be included in shared libraries. */ - #undef INCLUDE_X86_ISA_LEVEL - -+/* The x86 ISA level. 1 for baseline. Undefined on non-x86. */ -+#undef MINIMUM_X86_ISA_LEVEL -+ - /* Define if -msahf is enabled by default on x86. */ - #undef HAVE_X86_LAHF_SAHF - -diff --git a/sysdeps/x86/configure b/sysdeps/x86/configure -index 2a5421bb31..d28d9bcb29 100644 ---- a/sysdeps/x86/configure -+++ b/sysdeps/x86/configure -@@ -151,6 +151,13 @@ printf "%s\n" "$libc_cv_have_x86_isa_level" >&6; } - else - libc_cv_have_x86_isa_level=baseline - fi -+if test $libc_cv_have_x86_isa_level = baseline; then -+ printf "%s\n" "#define MINIMUM_X86_ISA_LEVEL 1" >>confdefs.h -+ -+else -+ printf "%s\n" "#define MINIMUM_X86_ISA_LEVEL $libc_cv_have_x86_isa_level" >>confdefs.h -+ -+fi - config_vars="$config_vars - have-x86-isa-level = $libc_cv_have_x86_isa_level" - config_vars="$config_vars -diff --git a/sysdeps/x86/configure.ac b/sysdeps/x86/configure.ac -index 78ff7c8f41..5b0acd03d2 100644 ---- a/sysdeps/x86/configure.ac -+++ b/sysdeps/x86/configure.ac -@@ -105,6 +105,11 @@ EOF - else - libc_cv_have_x86_isa_level=baseline - fi -+if test $libc_cv_have_x86_isa_level = baseline; then -+ AC_DEFINE_UNQUOTED(MINIMUM_X86_ISA_LEVEL, 1) -+else -+ AC_DEFINE_UNQUOTED(MINIMUM_X86_ISA_LEVEL, $libc_cv_have_x86_isa_level) -+fi - LIBC_CONFIG_VAR([have-x86-isa-level], [$libc_cv_have_x86_isa_level]) - LIBC_CONFIG_VAR([x86-isa-level-3-or-above], [3 4]) - LIBC_CONFIG_VAR([enable-x86-isa-level], [$libc_cv_include_x86_isa_level]) -diff --git a/sysdeps/x86/isa-level.h b/sysdeps/x86/isa-level.h -index 11fe1ca90c..2c7f74212b 100644 ---- a/sysdeps/x86/isa-level.h -+++ b/sysdeps/x86/isa-level.h -@@ -61,8 +61,10 @@ - # define __X86_ISA_V4 0 - #endif - --#define MINIMUM_X86_ISA_LEVEL \ -+#ifndef MINIMUM_X86_ISA_LEVEL -+# define MINIMUM_X86_ISA_LEVEL \ - (__X86_ISA_V1 + __X86_ISA_V2 + __X86_ISA_V3 + __X86_ISA_V4) -+#endif - - /* Depending on the minimum ISA level, a feature check result can be a - compile-time constant.. */ - -commit 1263d583d2e28afb8be53f8d6922f0842036f35d -Author: Florian Weimer -Date: Thu Apr 25 15:00:45 2024 +0200 - - CVE-2024-33599: nscd: Stack-based buffer overflow in netgroup cache (bug 31677) - - Using alloca matches what other caches do. The request length is - bounded by MAXKEYLEN. - - Reviewed-by: Carlos O'Donell - (cherry picked from commit 87801a8fd06db1d654eea3e4f7626ff476a9bdaa) - -diff --git a/nscd/netgroupcache.c b/nscd/netgroupcache.c -index 0c6e46f15c..f227dc7fa2 100644 ---- a/nscd/netgroupcache.c -+++ b/nscd/netgroupcache.c -@@ -502,12 +502,13 @@ addinnetgrX (struct database_dyn *db, int fd, request_header *req, - = (struct indataset *) mempool_alloc (db, - sizeof (*dataset) + req->key_len, - 1); -- struct indataset dataset_mem; - bool cacheable = true; - if (__glibc_unlikely (dataset == NULL)) - { - cacheable = false; -- dataset = &dataset_mem; -+ /* The alloca is safe because nscd_run_worker verfies that -+ key_len is not larger than MAXKEYLEN. */ -+ dataset = alloca (sizeof (*dataset) + req->key_len); - } - - datahead_init_pos (&dataset->head, sizeof (*dataset) + req->key_len, - -commit 5a508e0b508c8ad53bd0d2fb48fd71b242626341 -Author: Florian Weimer -Date: Thu Apr 25 15:01:07 2024 +0200 - - CVE-2024-33600: nscd: Do not send missing not-found response in addgetnetgrentX (bug 31678) - - If we failed to add a not-found response to the cache, the dataset - point can be null, resulting in a null pointer dereference. - - Reviewed-by: Siddhesh Poyarekar - (cherry picked from commit 7835b00dbce53c3c87bbbb1754a95fb5e58187aa) - -diff --git a/nscd/netgroupcache.c b/nscd/netgroupcache.c -index f227dc7fa2..c18fe111f3 100644 ---- a/nscd/netgroupcache.c -+++ b/nscd/netgroupcache.c -@@ -147,7 +147,7 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req, - /* No such service. */ - cacheable = do_notfound (db, fd, req, key, &dataset, &total, &timeout, - &key_copy); -- goto writeout; -+ goto maybe_cache_add; - } - - memset (&data, '\0', sizeof (data)); -@@ -348,7 +348,7 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req, - { - cacheable = do_notfound (db, fd, req, key, &dataset, &total, &timeout, - &key_copy); -- goto writeout; -+ goto maybe_cache_add; - } - - total = buffilled; -@@ -410,14 +410,12 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req, - } - - if (he == NULL && fd != -1) -- { -- /* We write the dataset before inserting it to the database -- since while inserting this thread might block and so would -- unnecessarily let the receiver wait. */ -- writeout: -+ /* We write the dataset before inserting it to the database since -+ while inserting this thread might block and so would -+ unnecessarily let the receiver wait. */ - writeall (fd, &dataset->resp, dataset->head.recsize); -- } - -+ maybe_cache_add: - if (cacheable) - { - /* If necessary, we also propagate the data to disk. */ - -commit c99f886de54446cd4447db6b44be93dabbdc2f8b -Author: Florian Weimer -Date: Thu Apr 25 15:01:07 2024 +0200 - - CVE-2024-33600: nscd: Avoid null pointer crashes after notfound response (bug 31678) - - The addgetnetgrentX call in addinnetgrX may have failed to produce - a result, so the result variable in addinnetgrX can be NULL. - Use db->negtimeout as the fallback value if there is no result data; - the timeout is also overwritten below. - - Also avoid sending a second not-found response. (The client - disconnects after receiving the first response, so the data stream did - not go out of sync even without this fix.) It is still beneficial to - add the negative response to the mapping, so that the client can get - it from there in the future, instead of going through the socket. - - Reviewed-by: Siddhesh Poyarekar - (cherry picked from commit b048a482f088e53144d26a61c390bed0210f49f2) - -diff --git a/nscd/netgroupcache.c b/nscd/netgroupcache.c -index c18fe111f3..e22ffa5884 100644 ---- a/nscd/netgroupcache.c -+++ b/nscd/netgroupcache.c -@@ -511,14 +511,15 @@ addinnetgrX (struct database_dyn *db, int fd, request_header *req, - - datahead_init_pos (&dataset->head, sizeof (*dataset) + req->key_len, - sizeof (innetgroup_response_header), -- he == NULL ? 0 : dh->nreloads + 1, result->head.ttl); -+ he == NULL ? 0 : dh->nreloads + 1, -+ result == NULL ? db->negtimeout : result->head.ttl); - /* Set the notfound status and timeout based on the result from - getnetgrent. */ -- dataset->head.notfound = result->head.notfound; -+ dataset->head.notfound = result == NULL || result->head.notfound; - dataset->head.timeout = timeout; - - dataset->resp.version = NSCD_VERSION; -- dataset->resp.found = result->resp.found; -+ dataset->resp.found = result != NULL && result->resp.found; - /* Until we find a matching entry the result is 0. */ - dataset->resp.result = 0; - -@@ -566,7 +567,9 @@ addinnetgrX (struct database_dyn *db, int fd, request_header *req, - goto out; - } - -- if (he == NULL) -+ /* addgetnetgrentX may have already sent a notfound response. Do -+ not send another one. */ -+ if (he == NULL && dataset->resp.found) - { - /* We write the dataset before inserting it to the database - since while inserting this thread might block and so would - -commit a9a8d3eebb145779a18d90e3966009a1daa63cd8 -Author: Florian Weimer -Date: Thu Apr 25 15:01:07 2024 +0200 - - CVE-2024-33601, CVE-2024-33602: nscd: netgroup: Use two buffers in addgetnetgrentX (bug 31680) - - This avoids potential memory corruption when the underlying NSS - callback function does not use the buffer space to store all strings - (e.g., for constant strings). - - Instead of custom buffer management, two scratch buffers are used. - This increases stack usage somewhat. - - Scratch buffer allocation failure is handled by return -1 - (an invalid timeout value) instead of terminating the process. - This fixes bug 31679. - - Reviewed-by: Siddhesh Poyarekar - (cherry picked from commit c04a21e050d64a1193a6daab872bca2528bda44b) - -diff --git a/nscd/netgroupcache.c b/nscd/netgroupcache.c -index e22ffa5884..e8fe041846 100644 ---- a/nscd/netgroupcache.c -+++ b/nscd/netgroupcache.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - #include "../nss/netgroup.h" - #include "nscd.h" -@@ -65,6 +66,16 @@ struct dataset - char strdata[0]; - }; - -+/* Send a notfound response to FD. Always returns -1 to indicate an -+ ephemeral error. */ -+static time_t -+send_notfound (int fd) -+{ -+ if (fd != -1) -+ TEMP_FAILURE_RETRY (send (fd, ¬found, sizeof (notfound), MSG_NOSIGNAL)); -+ return -1; -+} -+ - /* Sends a notfound message and prepares a notfound dataset to write to the - cache. Returns true if there was enough memory to allocate the dataset and - returns the dataset in DATASETP, total bytes to write in TOTALP and the -@@ -83,8 +94,7 @@ do_notfound (struct database_dyn *db, int fd, request_header *req, - total = sizeof (notfound); - timeout = time (NULL) + db->negtimeout; - -- if (fd != -1) -- TEMP_FAILURE_RETRY (send (fd, ¬found, total, MSG_NOSIGNAL)); -+ send_notfound (fd); - - dataset = mempool_alloc (db, sizeof (struct dataset) + req->key_len, 1); - /* If we cannot permanently store the result, so be it. */ -@@ -109,11 +119,78 @@ do_notfound (struct database_dyn *db, int fd, request_header *req, - return cacheable; - } - -+struct addgetnetgrentX_scratch -+{ -+ /* This is the result that the caller should use. It can be NULL, -+ point into buffer, or it can be in the cache. */ -+ struct dataset *dataset; -+ -+ struct scratch_buffer buffer; -+ -+ /* Used internally in addgetnetgrentX as a staging area. */ -+ struct scratch_buffer tmp; -+ -+ /* Number of bytes in buffer that are actually used. */ -+ size_t buffer_used; -+}; -+ -+static void -+addgetnetgrentX_scratch_init (struct addgetnetgrentX_scratch *scratch) -+{ -+ scratch->dataset = NULL; -+ scratch_buffer_init (&scratch->buffer); -+ scratch_buffer_init (&scratch->tmp); -+ -+ /* Reserve space for the header. */ -+ scratch->buffer_used = sizeof (struct dataset); -+ static_assert (sizeof (struct dataset) < sizeof (scratch->tmp.__space), -+ "initial buffer space"); -+ memset (scratch->tmp.data, 0, sizeof (struct dataset)); -+} -+ -+static void -+addgetnetgrentX_scratch_free (struct addgetnetgrentX_scratch *scratch) -+{ -+ scratch_buffer_free (&scratch->buffer); -+ scratch_buffer_free (&scratch->tmp); -+} -+ -+/* Copy LENGTH bytes from S into SCRATCH. Returns NULL if SCRATCH -+ could not be resized, otherwise a pointer to the copy. */ -+static char * -+addgetnetgrentX_append_n (struct addgetnetgrentX_scratch *scratch, -+ const char *s, size_t length) -+{ -+ while (true) -+ { -+ size_t remaining = scratch->buffer.length - scratch->buffer_used; -+ if (remaining >= length) -+ break; -+ if (!scratch_buffer_grow_preserve (&scratch->buffer)) -+ return NULL; -+ } -+ char *copy = scratch->buffer.data + scratch->buffer_used; -+ memcpy (copy, s, length); -+ scratch->buffer_used += length; -+ return copy; -+} -+ -+/* Copy S into SCRATCH, including its null terminator. Returns false -+ if SCRATCH could not be resized. */ -+static bool -+addgetnetgrentX_append (struct addgetnetgrentX_scratch *scratch, const char *s) -+{ -+ if (s == NULL) -+ s = ""; -+ return addgetnetgrentX_append_n (scratch, s, strlen (s) + 1) != NULL; -+} -+ -+/* Caller must initialize and free *SCRATCH. If the return value is -+ negative, this function has sent a notfound response. */ - static time_t - addgetnetgrentX (struct database_dyn *db, int fd, request_header *req, - const char *key, uid_t uid, struct hashentry *he, -- struct datahead *dh, struct dataset **resultp, -- void **tofreep) -+ struct datahead *dh, struct addgetnetgrentX_scratch *scratch) - { - if (__glibc_unlikely (debug_level > 0)) - { -@@ -132,14 +209,10 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req, - - char *key_copy = NULL; - struct __netgrent data; -- size_t buflen = MAX (1024, sizeof (*dataset) + req->key_len); -- size_t buffilled = sizeof (*dataset); -- char *buffer = NULL; - size_t nentries = 0; - size_t group_len = strlen (key) + 1; - struct name_list *first_needed - = alloca (sizeof (struct name_list) + group_len); -- *tofreep = NULL; - - if (netgroup_database == NULL - && !__nss_database_get (nss_database_netgroup, &netgroup_database)) -@@ -151,8 +224,6 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req, - } - - memset (&data, '\0', sizeof (data)); -- buffer = xmalloc (buflen); -- *tofreep = buffer; - first_needed->next = first_needed; - memcpy (first_needed->name, key, group_len); - data.needed_groups = first_needed; -@@ -195,8 +266,8 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req, - while (1) - { - int e; -- status = getfct.f (&data, buffer + buffilled, -- buflen - buffilled - req->key_len, &e); -+ status = getfct.f (&data, scratch->tmp.data, -+ scratch->tmp.length, &e); - if (status == NSS_STATUS_SUCCESS) - { - if (data.type == triple_val) -@@ -204,68 +275,10 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req, - const char *nhost = data.val.triple.host; - const char *nuser = data.val.triple.user; - const char *ndomain = data.val.triple.domain; -- -- size_t hostlen = strlen (nhost ?: "") + 1; -- size_t userlen = strlen (nuser ?: "") + 1; -- size_t domainlen = strlen (ndomain ?: "") + 1; -- -- if (nhost == NULL || nuser == NULL || ndomain == NULL -- || nhost > nuser || nuser > ndomain) -- { -- const char *last = nhost; -- if (last == NULL -- || (nuser != NULL && nuser > last)) -- last = nuser; -- if (last == NULL -- || (ndomain != NULL && ndomain > last)) -- last = ndomain; -- -- size_t bufused -- = (last == NULL -- ? buffilled -- : last + strlen (last) + 1 - buffer); -- -- /* We have to make temporary copies. */ -- size_t needed = hostlen + userlen + domainlen; -- -- if (buflen - req->key_len - bufused < needed) -- { -- buflen += MAX (buflen, 2 * needed); -- /* Save offset in the old buffer. We don't -- bother with the NULL check here since -- we'll do that later anyway. */ -- size_t nhostdiff = nhost - buffer; -- size_t nuserdiff = nuser - buffer; -- size_t ndomaindiff = ndomain - buffer; -- -- char *newbuf = xrealloc (buffer, buflen); -- /* Fix up the triplet pointers into the new -- buffer. */ -- nhost = (nhost ? newbuf + nhostdiff -- : NULL); -- nuser = (nuser ? newbuf + nuserdiff -- : NULL); -- ndomain = (ndomain ? newbuf + ndomaindiff -- : NULL); -- *tofreep = buffer = newbuf; -- } -- -- nhost = memcpy (buffer + bufused, -- nhost ?: "", hostlen); -- nuser = memcpy ((char *) nhost + hostlen, -- nuser ?: "", userlen); -- ndomain = memcpy ((char *) nuser + userlen, -- ndomain ?: "", domainlen); -- } -- -- char *wp = buffer + buffilled; -- wp = memmove (wp, nhost ?: "", hostlen); -- wp += hostlen; -- wp = memmove (wp, nuser ?: "", userlen); -- wp += userlen; -- wp = memmove (wp, ndomain ?: "", domainlen); -- wp += domainlen; -- buffilled = wp - buffer; -+ if (!(addgetnetgrentX_append (scratch, nhost) -+ && addgetnetgrentX_append (scratch, nuser) -+ && addgetnetgrentX_append (scratch, ndomain))) -+ return send_notfound (fd); - ++nentries; - } - else -@@ -317,8 +330,8 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req, - } - else if (status == NSS_STATUS_TRYAGAIN && e == ERANGE) - { -- buflen *= 2; -- *tofreep = buffer = xrealloc (buffer, buflen); -+ if (!scratch_buffer_grow (&scratch->tmp)) -+ return send_notfound (fd); - } - else if (status == NSS_STATUS_RETURN - || status == NSS_STATUS_NOTFOUND -@@ -351,10 +364,17 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req, - goto maybe_cache_add; - } - -- total = buffilled; -+ /* Capture the result size without the key appended. */ -+ total = scratch->buffer_used; -+ -+ /* Make a copy of the key. The scratch buffer must not move after -+ this point. */ -+ key_copy = addgetnetgrentX_append_n (scratch, key, req->key_len); -+ if (key_copy == NULL) -+ return send_notfound (fd); - - /* Fill in the dataset. */ -- dataset = (struct dataset *) buffer; -+ dataset = scratch->buffer.data; - timeout = datahead_init_pos (&dataset->head, total + req->key_len, - total - offsetof (struct dataset, resp), - he == NULL ? 0 : dh->nreloads + 1, -@@ -363,11 +383,7 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req, - dataset->resp.version = NSCD_VERSION; - dataset->resp.found = 1; - dataset->resp.nresults = nentries; -- dataset->resp.result_len = buffilled - sizeof (*dataset); -- -- assert (buflen - buffilled >= req->key_len); -- key_copy = memcpy (buffer + buffilled, key, req->key_len); -- buffilled += req->key_len; -+ dataset->resp.result_len = total - sizeof (*dataset); - - /* Now we can determine whether on refill we have to create a new - record or not. */ -@@ -398,7 +414,7 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req, - if (__glibc_likely (newp != NULL)) - { - /* Adjust pointer into the memory block. */ -- key_copy = (char *) newp + (key_copy - buffer); -+ key_copy = (char *) newp + (key_copy - (char *) dataset); - - dataset = memcpy (newp, dataset, total + req->key_len); - cacheable = true; -@@ -439,7 +455,7 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req, - } - - out: -- *resultp = dataset; -+ scratch->dataset = dataset; - - return timeout; - } -@@ -460,6 +476,9 @@ addinnetgrX (struct database_dyn *db, int fd, request_header *req, - if (user != NULL) - key = strchr (key, '\0') + 1; - const char *domain = *key++ ? key : NULL; -+ struct addgetnetgrentX_scratch scratch; -+ -+ addgetnetgrentX_scratch_init (&scratch); - - if (__glibc_unlikely (debug_level > 0)) - { -@@ -475,12 +494,8 @@ addinnetgrX (struct database_dyn *db, int fd, request_header *req, - group, group_len, - db, uid); - time_t timeout; -- void *tofree; - if (result != NULL) -- { -- timeout = result->head.timeout; -- tofree = NULL; -- } -+ timeout = result->head.timeout; - else - { - request_header req_get = -@@ -489,7 +504,10 @@ addinnetgrX (struct database_dyn *db, int fd, request_header *req, - .key_len = group_len - }; - timeout = addgetnetgrentX (db, -1, &req_get, group, uid, NULL, NULL, -- &result, &tofree); -+ &scratch); -+ result = scratch.dataset; -+ if (timeout < 0) -+ goto out; - } - - struct indataset -@@ -603,7 +621,7 @@ addinnetgrX (struct database_dyn *db, int fd, request_header *req, - } - - out: -- free (tofree); -+ addgetnetgrentX_scratch_free (&scratch); - return timeout; - } - -@@ -613,11 +631,12 @@ addgetnetgrentX_ignore (struct database_dyn *db, int fd, request_header *req, - const char *key, uid_t uid, struct hashentry *he, - struct datahead *dh) - { -- struct dataset *ignore; -- void *tofree; -- time_t timeout = addgetnetgrentX (db, fd, req, key, uid, he, dh, -- &ignore, &tofree); -- free (tofree); -+ struct addgetnetgrentX_scratch scratch; -+ addgetnetgrentX_scratch_init (&scratch); -+ time_t timeout = addgetnetgrentX (db, fd, req, key, uid, he, dh, &scratch); -+ addgetnetgrentX_scratch_free (&scratch); -+ if (timeout < 0) -+ timeout = 0; - return timeout; - } - -@@ -661,5 +680,9 @@ readdinnetgr (struct database_dyn *db, struct hashentry *he, - .key_len = he->len - }; - -- return addinnetgrX (db, -1, &req, db->data + he->key, he->owner, he, dh); -+ int timeout = addinnetgrX (db, -1, &req, db->data + he->key, he->owner, -+ he, dh); -+ if (timeout < 0) -+ timeout = 0; -+ return timeout; - } - -commit fd658f026f25cf59e8db243bc3b3e09cd5a20ba0 -Author: H.J. Lu -Date: Thu Apr 25 08:06:52 2024 -0700 - - elf: Also compile dl-misc.os with $(rtld-early-cflags) - - Also compile dl-misc.os with $(rtld-early-cflags) to avoid - - Program received signal SIGILL, Illegal instruction. - 0x00007ffff7fd36ea in _dl_strtoul (nptr=nptr@entry=0x7fffffffe2c9 "2", - endptr=endptr@entry=0x7fffffffd728) at dl-misc.c:156 - 156 bool positive = true; - (gdb) bt - #0 0x00007ffff7fd36ea in _dl_strtoul (nptr=nptr@entry=0x7fffffffe2c9 "2", - endptr=endptr@entry=0x7fffffffd728) at dl-misc.c:156 - #1 0x00007ffff7fdb1a9 in tunable_initialize ( - cur=cur@entry=0x7ffff7ffbc00 , - strval=strval@entry=0x7fffffffe2c9 "2", len=len@entry=1) - at dl-tunables.c:131 - #2 0x00007ffff7fdb3a2 in parse_tunables (valstring=) - at dl-tunables.c:258 - #3 0x00007ffff7fdb5d9 in __GI___tunables_init (envp=0x7fffffffdd58) - at dl-tunables.c:288 - #4 0x00007ffff7fe44c3 in _dl_sysdep_start ( - start_argptr=start_argptr@entry=0x7fffffffdcb0, - dl_main=dl_main@entry=0x7ffff7fe5f80 ) - at ../sysdeps/unix/sysv/linux/dl-sysdep.c:110 - #5 0x00007ffff7fe5cae in _dl_start_final (arg=0x7fffffffdcb0) at rtld.c:494 - #6 _dl_start (arg=0x7fffffffdcb0) at rtld.c:581 - #7 0x00007ffff7fe4b38 in _start () - (gdb) - - when setting GLIBC_TUNABLES in glibc compiled with APX. - Reviewed-by: Florian Weimer - - (cherry picked from commit 049b7684c912dd32b67b1b15b0f43bf07d5f512e) - -diff --git a/elf/Makefile b/elf/Makefile -index 69aa423c4b..a50a988e73 100644 ---- a/elf/Makefile -+++ b/elf/Makefile -@@ -170,6 +170,7 @@ CFLAGS-.op += $(call elide-stack-protector,.op,$(elide-routines.os)) - CFLAGS-.os += $(call elide-stack-protector,.os,$(all-rtld-routines)) - - # Add the requested compiler flags to the early startup code. -+CFLAGS-dl-misc.os += $(rtld-early-cflags) - CFLAGS-dl-printf.os += $(rtld-early-cflags) - CFLAGS-dl-setup_hash.os += $(rtld-early-cflags) - CFLAGS-dl-sysdep.os += $(rtld-early-cflags) - -commit 9831f98c266a8d56d1bf729b709c08e40375540c -Author: Florian Weimer -Date: Fri Apr 19 14:38:17 2024 +0200 - - login: Check default sizes of structs utmp, utmpx, lastlog - - The default is for ports with a 64-bit time_t. - Ports with a 32-bit time_t or with __WORDSIZE_TIME64_COMPAT32=1 - need to override it. - - Reviewed-by: Adhemerval Zanella - (cherry picked from commit 4d4da5aab936504b2d3eca3146e109630d9093c4) - -diff --git a/login/Makefile b/login/Makefile -index 1e22008a61..b26ac42bfc 100644 ---- a/login/Makefile -+++ b/login/Makefile -@@ -44,7 +44,7 @@ subdir-dirs = programs - vpath %.c programs - - tests := tst-utmp tst-utmpx tst-grantpt tst-ptsname tst-getlogin tst-updwtmpx \ -- tst-pututxline-lockfail tst-pututxline-cache -+ tst-pututxline-lockfail tst-pututxline-cache tst-utmp-size - - # Empty compatibility library for old binaries. - extra-libs := libutil -diff --git a/login/tst-utmp-size.c b/login/tst-utmp-size.c -new file mode 100644 -index 0000000000..1b7f7ff042 ---- /dev/null -+++ b/login/tst-utmp-size.c -@@ -0,0 +1,33 @@ -+/* Check expected sizes of struct utmp, struct utmpx, struct lastlog. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#include -+#include -+#include -+ -+static int -+do_test (void) -+{ -+ _Static_assert (sizeof (struct utmp) == UTMP_SIZE, "struct utmp size"); -+ _Static_assert (sizeof (struct utmpx) == UTMP_SIZE, "struct utmpx size"); -+ _Static_assert (sizeof (struct lastlog) == LASTLOG_SIZE, -+ "struct lastlog size"); -+ return 0; -+} -+ -+#include -diff --git a/sysdeps/arc/utmp-size.h b/sysdeps/arc/utmp-size.h -new file mode 100644 -index 0000000000..a247fcd3da ---- /dev/null -+++ b/sysdeps/arc/utmp-size.h -@@ -0,0 +1,3 @@ -+/* arc has less padding than other architectures with 64-bit time_t. */ -+#define UTMP_SIZE 392 -+#define LASTLOG_SIZE 296 -diff --git a/sysdeps/arm/utmp-size.h b/sysdeps/arm/utmp-size.h -new file mode 100644 -index 0000000000..8f21ebe1b6 ---- /dev/null -+++ b/sysdeps/arm/utmp-size.h -@@ -0,0 +1,2 @@ -+#define UTMP_SIZE 384 -+#define LASTLOG_SIZE 292 -diff --git a/sysdeps/csky/utmp-size.h b/sysdeps/csky/utmp-size.h -new file mode 100644 -index 0000000000..8f21ebe1b6 ---- /dev/null -+++ b/sysdeps/csky/utmp-size.h -@@ -0,0 +1,2 @@ -+#define UTMP_SIZE 384 -+#define LASTLOG_SIZE 292 -diff --git a/sysdeps/generic/utmp-size.h b/sysdeps/generic/utmp-size.h -new file mode 100644 -index 0000000000..89dbe878b0 ---- /dev/null -+++ b/sysdeps/generic/utmp-size.h -@@ -0,0 +1,23 @@ -+/* Expected sizes of utmp-related structures stored in files. 64-bit version. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+/* Expected size, in bytes, of struct utmp and struct utmpx. */ -+#define UTMP_SIZE 400 -+ -+/* Expected size, in bytes, of struct lastlog. */ -+#define LASTLOG_SIZE 296 -diff --git a/sysdeps/hppa/utmp-size.h b/sysdeps/hppa/utmp-size.h -new file mode 100644 -index 0000000000..8f21ebe1b6 ---- /dev/null -+++ b/sysdeps/hppa/utmp-size.h -@@ -0,0 +1,2 @@ -+#define UTMP_SIZE 384 -+#define LASTLOG_SIZE 292 -diff --git a/sysdeps/m68k/utmp-size.h b/sysdeps/m68k/utmp-size.h -new file mode 100644 -index 0000000000..5946685819 ---- /dev/null -+++ b/sysdeps/m68k/utmp-size.h -@@ -0,0 +1,3 @@ -+/* m68k has 2-byte alignment. */ -+#define UTMP_SIZE 382 -+#define LASTLOG_SIZE 292 -diff --git a/sysdeps/microblaze/utmp-size.h b/sysdeps/microblaze/utmp-size.h -new file mode 100644 -index 0000000000..8f21ebe1b6 ---- /dev/null -+++ b/sysdeps/microblaze/utmp-size.h -@@ -0,0 +1,2 @@ -+#define UTMP_SIZE 384 -+#define LASTLOG_SIZE 292 -diff --git a/sysdeps/mips/utmp-size.h b/sysdeps/mips/utmp-size.h -new file mode 100644 -index 0000000000..8f21ebe1b6 ---- /dev/null -+++ b/sysdeps/mips/utmp-size.h -@@ -0,0 +1,2 @@ -+#define UTMP_SIZE 384 -+#define LASTLOG_SIZE 292 -diff --git a/sysdeps/nios2/utmp-size.h b/sysdeps/nios2/utmp-size.h -new file mode 100644 -index 0000000000..8f21ebe1b6 ---- /dev/null -+++ b/sysdeps/nios2/utmp-size.h -@@ -0,0 +1,2 @@ -+#define UTMP_SIZE 384 -+#define LASTLOG_SIZE 292 -diff --git a/sysdeps/or1k/utmp-size.h b/sysdeps/or1k/utmp-size.h -new file mode 100644 -index 0000000000..6b3653aa4d ---- /dev/null -+++ b/sysdeps/or1k/utmp-size.h -@@ -0,0 +1,3 @@ -+/* or1k has less padding than other architectures with 64-bit time_t. */ -+#define UTMP_SIZE 392 -+#define LASTLOG_SIZE 296 -diff --git a/sysdeps/powerpc/utmp-size.h b/sysdeps/powerpc/utmp-size.h -new file mode 100644 -index 0000000000..8f21ebe1b6 ---- /dev/null -+++ b/sysdeps/powerpc/utmp-size.h -@@ -0,0 +1,2 @@ -+#define UTMP_SIZE 384 -+#define LASTLOG_SIZE 292 -diff --git a/sysdeps/riscv/utmp-size.h b/sysdeps/riscv/utmp-size.h -new file mode 100644 -index 0000000000..8f21ebe1b6 ---- /dev/null -+++ b/sysdeps/riscv/utmp-size.h -@@ -0,0 +1,2 @@ -+#define UTMP_SIZE 384 -+#define LASTLOG_SIZE 292 -diff --git a/sysdeps/sh/utmp-size.h b/sysdeps/sh/utmp-size.h -new file mode 100644 -index 0000000000..8f21ebe1b6 ---- /dev/null -+++ b/sysdeps/sh/utmp-size.h -@@ -0,0 +1,2 @@ -+#define UTMP_SIZE 384 -+#define LASTLOG_SIZE 292 -diff --git a/sysdeps/sparc/utmp-size.h b/sysdeps/sparc/utmp-size.h -new file mode 100644 -index 0000000000..8f21ebe1b6 ---- /dev/null -+++ b/sysdeps/sparc/utmp-size.h -@@ -0,0 +1,2 @@ -+#define UTMP_SIZE 384 -+#define LASTLOG_SIZE 292 -diff --git a/sysdeps/x86/utmp-size.h b/sysdeps/x86/utmp-size.h -new file mode 100644 -index 0000000000..8f21ebe1b6 ---- /dev/null -+++ b/sysdeps/x86/utmp-size.h -@@ -0,0 +1,2 @@ -+#define UTMP_SIZE 384 -+#define LASTLOG_SIZE 292 - -commit 836d43b98973e0845b739ff5d3aad3af09dc7d0f -Author: Florian Weimer -Date: Fri Apr 19 14:38:17 2024 +0200 - - login: structs utmp, utmpx, lastlog _TIME_BITS independence (bug 30701) - - These structs describe file formats under /var/log, and should not - depend on the definition of _TIME_BITS. This is achieved by - defining __WORDSIZE_TIME64_COMPAT32 to 1 on 32-bit ports that - support 32-bit time_t values (where __time_t is 32 bits). - - Reviewed-by: Adhemerval Zanella - (cherry picked from commit 9abdae94c7454c45e02e97e4ed1eb1b1915d13d8) - -diff --git a/bits/wordsize.h b/bits/wordsize.h -index 14edae3a11..53013a9275 100644 ---- a/bits/wordsize.h -+++ b/bits/wordsize.h -@@ -21,7 +21,9 @@ - #define __WORDSIZE32_PTRDIFF_LONG - - /* Set to 1 in order to force time types to be 32 bits instead of 64 bits in -- struct lastlog and struct utmp{,x} on 64-bit ports. This may be done in -+ struct lastlog and struct utmp{,x}. This may be done in - order to make 64-bit ports compatible with 32-bit ports. Set to 0 for -- 64-bit ports where the time types are 64-bits or for any 32-bit ports. */ -+ 64-bit ports where the time types are 64-bits and new 32-bit ports -+ where time_t is 64 bits, and there is no companion architecture with -+ 32-bit time_t. */ - #define __WORDSIZE_TIME64_COMPAT32 -diff --git a/login/Makefile b/login/Makefile -index b26ac42bfc..f91190e3dc 100644 ---- a/login/Makefile -+++ b/login/Makefile -@@ -44,7 +44,9 @@ subdir-dirs = programs - vpath %.c programs - - tests := tst-utmp tst-utmpx tst-grantpt tst-ptsname tst-getlogin tst-updwtmpx \ -- tst-pututxline-lockfail tst-pututxline-cache tst-utmp-size -+ tst-pututxline-lockfail tst-pututxline-cache tst-utmp-size tst-utmp-size-64 -+ -+CFLAGS-tst-utmp-size-64.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 - - # Empty compatibility library for old binaries. - extra-libs := libutil -diff --git a/login/tst-utmp-size-64.c b/login/tst-utmp-size-64.c -new file mode 100644 -index 0000000000..7a581a4c12 ---- /dev/null -+++ b/login/tst-utmp-size-64.c -@@ -0,0 +1,2 @@ -+/* The on-disk layout must not change in time64 mode. */ -+#include "tst-utmp-size.c" -diff --git a/sysdeps/arm/bits/wordsize.h b/sysdeps/arm/bits/wordsize.h -new file mode 100644 -index 0000000000..6ecbfe7c86 ---- /dev/null -+++ b/sysdeps/arm/bits/wordsize.h -@@ -0,0 +1,21 @@ -+/* Copyright (C) 1999-2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#define __WORDSIZE 32 -+#define __WORDSIZE_TIME64_COMPAT32 1 -+#define __WORDSIZE32_SIZE_ULONG 0 -+#define __WORDSIZE32_PTRDIFF_LONG 0 -diff --git a/sysdeps/csky/bits/wordsize.h b/sysdeps/csky/bits/wordsize.h -new file mode 100644 -index 0000000000..6ecbfe7c86 ---- /dev/null -+++ b/sysdeps/csky/bits/wordsize.h -@@ -0,0 +1,21 @@ -+/* Copyright (C) 1999-2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#define __WORDSIZE 32 -+#define __WORDSIZE_TIME64_COMPAT32 1 -+#define __WORDSIZE32_SIZE_ULONG 0 -+#define __WORDSIZE32_PTRDIFF_LONG 0 -diff --git a/sysdeps/m68k/bits/wordsize.h b/sysdeps/m68k/bits/wordsize.h -new file mode 100644 -index 0000000000..6ecbfe7c86 ---- /dev/null -+++ b/sysdeps/m68k/bits/wordsize.h -@@ -0,0 +1,21 @@ -+/* Copyright (C) 1999-2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#define __WORDSIZE 32 -+#define __WORDSIZE_TIME64_COMPAT32 1 -+#define __WORDSIZE32_SIZE_ULONG 0 -+#define __WORDSIZE32_PTRDIFF_LONG 0 -diff --git a/sysdeps/microblaze/bits/wordsize.h b/sysdeps/microblaze/bits/wordsize.h -new file mode 100644 -index 0000000000..6ecbfe7c86 ---- /dev/null -+++ b/sysdeps/microblaze/bits/wordsize.h -@@ -0,0 +1,21 @@ -+/* Copyright (C) 1999-2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#define __WORDSIZE 32 -+#define __WORDSIZE_TIME64_COMPAT32 1 -+#define __WORDSIZE32_SIZE_ULONG 0 -+#define __WORDSIZE32_PTRDIFF_LONG 0 -diff --git a/sysdeps/mips/bits/wordsize.h b/sysdeps/mips/bits/wordsize.h -index 57f0f2a22f..30dd3fd85d 100644 ---- a/sysdeps/mips/bits/wordsize.h -+++ b/sysdeps/mips/bits/wordsize.h -@@ -19,11 +19,7 @@ - - #define __WORDSIZE _MIPS_SZPTR - --#if _MIPS_SIM == _ABI64 --# define __WORDSIZE_TIME64_COMPAT32 1 --#else --# define __WORDSIZE_TIME64_COMPAT32 0 --#endif -+#define __WORDSIZE_TIME64_COMPAT32 1 - - #if __WORDSIZE == 32 - #define __WORDSIZE32_SIZE_ULONG 0 -diff --git a/sysdeps/nios2/bits/wordsize.h b/sysdeps/nios2/bits/wordsize.h -new file mode 100644 -index 0000000000..6ecbfe7c86 ---- /dev/null -+++ b/sysdeps/nios2/bits/wordsize.h -@@ -0,0 +1,21 @@ -+/* Copyright (C) 1999-2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#define __WORDSIZE 32 -+#define __WORDSIZE_TIME64_COMPAT32 1 -+#define __WORDSIZE32_SIZE_ULONG 0 -+#define __WORDSIZE32_PTRDIFF_LONG 0 -diff --git a/sysdeps/powerpc/powerpc32/bits/wordsize.h b/sysdeps/powerpc/powerpc32/bits/wordsize.h -index 04ca9debf0..6993fb6b29 100644 ---- a/sysdeps/powerpc/powerpc32/bits/wordsize.h -+++ b/sysdeps/powerpc/powerpc32/bits/wordsize.h -@@ -2,10 +2,9 @@ - - #if defined __powerpc64__ - # define __WORDSIZE 64 --# define __WORDSIZE_TIME64_COMPAT32 1 - #else - # define __WORDSIZE 32 --# define __WORDSIZE_TIME64_COMPAT32 0 - # define __WORDSIZE32_SIZE_ULONG 0 - # define __WORDSIZE32_PTRDIFF_LONG 0 - #endif -+#define __WORDSIZE_TIME64_COMPAT32 1 -diff --git a/sysdeps/powerpc/powerpc64/bits/wordsize.h b/sysdeps/powerpc/powerpc64/bits/wordsize.h -index 04ca9debf0..6993fb6b29 100644 ---- a/sysdeps/powerpc/powerpc64/bits/wordsize.h -+++ b/sysdeps/powerpc/powerpc64/bits/wordsize.h -@@ -2,10 +2,9 @@ - - #if defined __powerpc64__ - # define __WORDSIZE 64 --# define __WORDSIZE_TIME64_COMPAT32 1 - #else - # define __WORDSIZE 32 --# define __WORDSIZE_TIME64_COMPAT32 0 - # define __WORDSIZE32_SIZE_ULONG 0 - # define __WORDSIZE32_PTRDIFF_LONG 0 - #endif -+#define __WORDSIZE_TIME64_COMPAT32 1 -diff --git a/sysdeps/sh/bits/wordsize.h b/sysdeps/sh/bits/wordsize.h -new file mode 100644 -index 0000000000..6ecbfe7c86 ---- /dev/null -+++ b/sysdeps/sh/bits/wordsize.h -@@ -0,0 +1,21 @@ -+/* Copyright (C) 1999-2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#define __WORDSIZE 32 -+#define __WORDSIZE_TIME64_COMPAT32 1 -+#define __WORDSIZE32_SIZE_ULONG 0 -+#define __WORDSIZE32_PTRDIFF_LONG 0 -diff --git a/sysdeps/sparc/sparc32/bits/wordsize.h b/sysdeps/sparc/sparc32/bits/wordsize.h -index 4bbd2e63b4..a2e79e0fa9 100644 ---- a/sysdeps/sparc/sparc32/bits/wordsize.h -+++ b/sysdeps/sparc/sparc32/bits/wordsize.h -@@ -1,6 +1,6 @@ - /* Determine the wordsize from the preprocessor defines. */ - - #define __WORDSIZE 32 --#define __WORDSIZE_TIME64_COMPAT32 0 -+#define __WORDSIZE_TIME64_COMPAT32 1 - #define __WORDSIZE32_SIZE_ULONG 0 - #define __WORDSIZE32_PTRDIFF_LONG 0 -diff --git a/sysdeps/sparc/sparc64/bits/wordsize.h b/sysdeps/sparc/sparc64/bits/wordsize.h -index 2f66f10d72..ea103e5970 100644 ---- a/sysdeps/sparc/sparc64/bits/wordsize.h -+++ b/sysdeps/sparc/sparc64/bits/wordsize.h -@@ -2,10 +2,9 @@ - - #if defined __arch64__ || defined __sparcv9 - # define __WORDSIZE 64 --# define __WORDSIZE_TIME64_COMPAT32 1 - #else - # define __WORDSIZE 32 --# define __WORDSIZE_TIME64_COMPAT32 0 - # define __WORDSIZE32_SIZE_ULONG 0 - # define __WORDSIZE32_PTRDIFF_LONG 0 - #endif -+#define __WORDSIZE_TIME64_COMPAT32 1 -diff --git a/sysdeps/unix/sysv/linux/hppa/bits/wordsize.h b/sysdeps/unix/sysv/linux/hppa/bits/wordsize.h -new file mode 100644 -index 0000000000..6ecbfe7c86 ---- /dev/null -+++ b/sysdeps/unix/sysv/linux/hppa/bits/wordsize.h -@@ -0,0 +1,21 @@ -+/* Copyright (C) 1999-2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#define __WORDSIZE 32 -+#define __WORDSIZE_TIME64_COMPAT32 1 -+#define __WORDSIZE32_SIZE_ULONG 0 -+#define __WORDSIZE32_PTRDIFF_LONG 0 -diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h b/sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h -index 04ca9debf0..6993fb6b29 100644 ---- a/sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h -+++ b/sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h -@@ -2,10 +2,9 @@ - - #if defined __powerpc64__ - # define __WORDSIZE 64 --# define __WORDSIZE_TIME64_COMPAT32 1 - #else - # define __WORDSIZE 32 --# define __WORDSIZE_TIME64_COMPAT32 0 - # define __WORDSIZE32_SIZE_ULONG 0 - # define __WORDSIZE32_PTRDIFF_LONG 0 - #endif -+#define __WORDSIZE_TIME64_COMPAT32 1 -diff --git a/sysdeps/unix/sysv/linux/sparc/bits/wordsize.h b/sysdeps/unix/sysv/linux/sparc/bits/wordsize.h -index 7562875ee2..ea103e5970 100644 ---- a/sysdeps/unix/sysv/linux/sparc/bits/wordsize.h -+++ b/sysdeps/unix/sysv/linux/sparc/bits/wordsize.h -@@ -2,10 +2,9 @@ - - #if defined __arch64__ || defined __sparcv9 - # define __WORDSIZE 64 --# define __WORDSIZE_TIME64_COMPAT32 1 - #else - # define __WORDSIZE 32 - # define __WORDSIZE32_SIZE_ULONG 0 - # define __WORDSIZE32_PTRDIFF_LONG 0 --# define __WORDSIZE_TIME64_COMPAT32 0 - #endif -+#define __WORDSIZE_TIME64_COMPAT32 1 -diff --git a/sysdeps/x86/bits/wordsize.h b/sysdeps/x86/bits/wordsize.h -index 70f652bca1..3f40aa76f9 100644 ---- a/sysdeps/x86/bits/wordsize.h -+++ b/sysdeps/x86/bits/wordsize.h -@@ -8,10 +8,9 @@ - #define __WORDSIZE32_PTRDIFF_LONG 0 - #endif - -+#define __WORDSIZE_TIME64_COMPAT32 1 -+ - #ifdef __x86_64__ --# define __WORDSIZE_TIME64_COMPAT32 1 - /* Both x86-64 and x32 use the 64-bit system call interface. */ - # define __SYSCALL_WORDSIZE 64 --#else --# define __WORDSIZE_TIME64_COMPAT32 0 - #endif - -commit acc56074b0a5127631a64640aef1b7c5c103ebd8 -Author: Florian Weimer -Date: Thu May 2 17:06:19 2024 +0200 - - nscd: Use time_t for return type of addgetnetgrentX - - Using int may give false results for future dates (timeouts after the - year 2028). - - Fixes commit 04a21e050d64a1193a6daab872bca2528bda44b ("CVE-2024-33601, - CVE-2024-33602: nscd: netgroup: Use two buffers in addgetnetgrentX - (bug 31680)"). - - Reviewed-by: Carlos O'Donell - (cherry picked from commit 4bbca1a44691a6e9adcee5c6798a707b626bc331) - -diff --git a/nscd/netgroupcache.c b/nscd/netgroupcache.c -index e8fe041846..01d554af9c 100644 ---- a/nscd/netgroupcache.c -+++ b/nscd/netgroupcache.c -@@ -680,8 +680,8 @@ readdinnetgr (struct database_dyn *db, struct hashentry *he, - .key_len = he->len - }; - -- int timeout = addinnetgrX (db, -1, &req, db->data + he->key, he->owner, -- he, dh); -+ time_t timeout = addinnetgrX (db, -1, &req, db->data + he->key, he->owner, -+ he, dh); - if (timeout < 0) - timeout = 0; - return timeout; - -commit 273a835fe7c685cc54266bb8b502787bad5e9bae -Author: Carlos O'Donell -Date: Tue Apr 23 13:30:37 2024 -0400 - - time: Allow later version licensing. - - The FSF's Licensing and Compliance Lab noted a discrepancy in the - licensing of several files in the glibc package. - - When timespect_get.c was impelemented the license did not include - the standard ", or (at your option) any later version." text. - - Change the license in timespec_get.c and all copied files to match - the expected license. - - This change was previously approved in principle by the FSF in - RT ticket #1316403. And a similar instance was fixed in - commit 46703efa02f6ddebce5ee54c92f7c32598de0de6. - - (cherry picked from commit 91695ee4598b39d181ab8df579b888a8863c4cab) - -diff --git a/sysdeps/unix/sysv/linux/timespec_get.c b/sysdeps/unix/sysv/linux/timespec_get.c -index c6e5e66289..778d1e3354 100644 ---- a/sysdeps/unix/sysv/linux/timespec_get.c -+++ b/sysdeps/unix/sysv/linux/timespec_get.c -@@ -5,7 +5,7 @@ - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either -- version 2.1 of the License. -+ version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of -diff --git a/sysdeps/unix/sysv/linux/timespec_getres.c b/sysdeps/unix/sysv/linux/timespec_getres.c -index 5acebe2a2c..2eef9e512c 100644 ---- a/sysdeps/unix/sysv/linux/timespec_getres.c -+++ b/sysdeps/unix/sysv/linux/timespec_getres.c -@@ -5,7 +5,7 @@ - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either -- version 2.1 of the License. -+ version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of -diff --git a/time/timespec_get.c b/time/timespec_get.c -index b031e42ca2..26a044bca6 100644 ---- a/time/timespec_get.c -+++ b/time/timespec_get.c -@@ -4,7 +4,7 @@ - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either -- version 2.1 of the License. -+ version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of -diff --git a/time/timespec_getres.c b/time/timespec_getres.c -index edb397507c..2e18b8bcac 100644 ---- a/time/timespec_getres.c -+++ b/time/timespec_getres.c -@@ -5,7 +5,7 @@ - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either -- version 2.1 of the License. -+ version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - -commit 3148714ab61ad61281bae5a30f530d637034ac3b -Author: Gabi Falk -Date: Tue Apr 30 20:05:02 2024 +0000 - - i586: Fix multiple definitions of __memcpy_chk and __mempcpy_chk - - /home/bmg/install/compilers/x86_64-linux-gnu/lib/gcc/x86_64-glibc-linux-gnu/13.2.1/../../../../x86_64-glibc-linux-gnu/bin/ld: /home/bmg/build/glibcs/i586-linux-gnu/glibc/libc.a(memcpy_chk.o): in function `__memcpy_chk': - /home/bmg/src/glibc/debug/../sysdeps/i386/memcpy_chk.S:29: multiple definition of `__memcpy_chk';/home/bmg/build/glibcs/i586-linux-gnu/glibc/libc.a(memcpy.o):/home/bmg/src/glibc/string/../sysdeps/i386/i586/memcpy.S:31: first defined here /home/bmg/install/compilers/x86_64-linux-gnu/lib/gcc/x86_64-glibc-linux-gnu/13.2.1/../../../../x86_64-glibc-linux-gnu/bin/ld: /home/bmg/build/glibcs/i586-linux-gnu/glibc/libc.a(mempcpy_chk.o): in function `__mempcpy_chk': /home/bmg/src/glibc/debug/../sysdeps/i386/mempcpy_chk.S:28: multiple definition of `__mempcpy_chk'; /home/bmg/build/glibcs/i586-linux-gnu/glibc/libc.a(mempcpy.o):/home/bmg/src/glibc/string/../sysdeps/i386/i586/memcpy.S:31: first defined here - - After this change, the static library built for i586, regardless of PIC - options, contains implementations of these functions respectively from - sysdeps/i386/memcpy_chk.S and sysdeps/i386/mempcpy_chk.S. This ensures - that memcpy and mempcpy won't pull in __chk_fail and the routines it - calls. - - Reported-by: Florian Weimer - Signed-off-by: Gabi Falk - Reviewed-by: H.J. Lu - Reviewed-by: Dmitry V. Levin - (cherry picked from commit 789894a2f554d4503ecb2f13b2b4e93e43414f33) - -diff --git a/sysdeps/i386/i586/memcpy.S b/sysdeps/i386/i586/memcpy.S -index 3e26f112d6..79856d498a 100644 ---- a/sysdeps/i386/i586/memcpy.S -+++ b/sysdeps/i386/i586/memcpy.S -@@ -26,7 +26,7 @@ - #define LEN SRC+4 - - .text --#if defined PIC && IS_IN (libc) -+#if defined SHARED && IS_IN (libc) - ENTRY (__memcpy_chk) - movl 12(%esp), %eax - cmpl %eax, 16(%esp) - -commit ad92c483a4bd34db1cfb3eb625212ea64848244f -Author: Gabi Falk -Date: Tue Apr 30 20:05:03 2024 +0000 - - i686: Fix multiple definitions of __memmove_chk and __memset_chk - - Commit c73c96a4a1af1326df7f96eec58209e1e04066d8 updated memcpy.S and - mempcpy.S, but omitted memmove.S and memset.S. As a result, the static - library built as PIC, whether with or without multiarch support, - contains two definitions for each of the __memmove_chk and __memset_chk - symbols. - - /usr/lib/gcc/i686-pc-linux-gnu/14/../../../../i686-pc-linux-gnu/bin/ld: /usr/lib/gcc/i686-pc-linux-gnu/14/../../../../lib/libc.a(memset-ia32.o): in function `__memset_chk': - /var/tmp/portage/sys-libs/glibc-2.39-r3/work/glibc-2.39/string/../sysdeps/i386/i686/memset.S:32: multiple definition of `__memset_chk'; /usr/lib/gcc/i686-pc-linux-gnu/14/../../../../lib/libc.a(memset_chk.o):/var/tmp/portage/sys-libs/glibc-2.39-r3/work/glibc-2.39/debug/../sysdeps/i386/i686/multiarch/memset_chk.c:24: first defined here - - After this change, regardless of PIC options, the static library, built - for i686 with multiarch contains implementations of these functions - respectively from debug/memmove_chk.c and debug/memset_chk.c, and - without multiarch contains implementations of these functions - respectively from sysdeps/i386/memmove_chk.S and - sysdeps/i386/memset_chk.S. This ensures that memmove and memset won't - pull in __chk_fail and the routines it calls. - - Reported-by: Sam James - Tested-by: Sam James - Fixes: c73c96a4a1 ("i686: Fix build with --disable-multiarch") - Signed-off-by: Gabi Falk - Reviewed-by: H.J. Lu - Reviewed-by: Dmitry V. Levin - (cherry picked from commit 5a2cf833f5772d6c37c7adac388dd9af9cc1c4b9) - -diff --git a/sysdeps/i386/i686/memmove.S b/sysdeps/i386/i686/memmove.S -index f230359ad6..effd958120 100644 ---- a/sysdeps/i386/i686/memmove.S -+++ b/sysdeps/i386/i686/memmove.S -@@ -29,7 +29,7 @@ - #define SRC DEST+4 - #define LEN SRC+4 - --#if defined PIC && IS_IN (libc) -+#if defined SHARED && IS_IN (libc) - ENTRY_CHK (__memmove_chk) - movl 12(%esp), %eax - cmpl %eax, 16(%esp) -diff --git a/sysdeps/i386/i686/memset.S b/sysdeps/i386/i686/memset.S -index f02f5a6df7..ab06771ea0 100644 ---- a/sysdeps/i386/i686/memset.S -+++ b/sysdeps/i386/i686/memset.S -@@ -27,7 +27,7 @@ - #define LEN CHR+4 - - .text --#if defined PIC && IS_IN (libc) -+#if defined SHARED && IS_IN (libc) - ENTRY_CHK (__memset_chk) - movl 12(%esp), %eax - cmpl %eax, 16(%esp) - -commit ff110b2591f0bdeccd121c3726af19c62d6fb184 -Author: Gabi Falk -Date: Tue Apr 30 20:05:04 2024 +0000 - - Add a test to check for duplicate definitions in the static library - - This change follows two previous fixes addressing multiple definitions - of __memcpy_chk and __mempcpy_chk functions on i586, and __memmove_chk - and __memset_chk functions on i686. The test is intended to prevent - such issues from occurring in the future. - - Signed-off-by: Gabi Falk - Reviewed-by: H.J. Lu - Reviewed-by: Dmitry V. Levin - (cherry picked from commit ded2e0753e9c46debeb2e0d26c5e560d2581d314) - -diff --git a/Makefile b/Makefile -index 7052b46df8..2e351c0321 100644 ---- a/Makefile -+++ b/Makefile -@@ -577,6 +577,13 @@ $(objpfx)lint-makefiles.out: scripts/lint-makefiles.sh - $(SHELL) $< "$(PYTHON)" `pwd` > $@ ; \ - $(evaluate-test) - -+# Link libc.a as a whole to verify that it does not contain multiple -+# definitions of any symbols. -+tests-special += $(objpfx)link-static-libc.out -+$(objpfx)link-static-libc.out: -+ $(LINK.o) $(whole-archive) -r $(objpfx)libc.a -o /dev/null > $@ 2>&1; \ -+ $(evaluate-test) -+ - # Print test summary for tests in $1 .sum file; - # $2 is optional test identifier. - # Fail if there are unexpected failures in the test results. - -commit fa616ea3730cb42046d19f28d611be0bc390af7c -Author: Sam James -Date: Sat May 4 13:28:13 2024 +0100 - - Revert "Add a test to check for duplicate definitions in the static library" - - This reverts commit ff110b2591f0bdeccd121c3726af19c62d6fb184. - - I had the wrong cherry-pick reference (the commit content is right; it's - just referring to a base that isn't upstream), but let's revert and reapply - for clarity. - - Signed-off-by: Sam James - -diff --git a/Makefile b/Makefile -index 2e351c0321..7052b46df8 100644 ---- a/Makefile -+++ b/Makefile -@@ -577,13 +577,6 @@ $(objpfx)lint-makefiles.out: scripts/lint-makefiles.sh - $(SHELL) $< "$(PYTHON)" `pwd` > $@ ; \ - $(evaluate-test) - --# Link libc.a as a whole to verify that it does not contain multiple --# definitions of any symbols. --tests-special += $(objpfx)link-static-libc.out --$(objpfx)link-static-libc.out: -- $(LINK.o) $(whole-archive) -r $(objpfx)libc.a -o /dev/null > $@ 2>&1; \ -- $(evaluate-test) -- - # Print test summary for tests in $1 .sum file; - # $2 is optional test identifier. - # Fail if there are unexpected failures in the test results. - -commit c16871e662cd0f3370173d916864b19e69f1bc9a -Author: Sam James -Date: Sat May 4 13:28:51 2024 +0100 - - Revert "i686: Fix multiple definitions of __memmove_chk and __memset_chk" - - This reverts commit ad92c483a4bd34db1cfb3eb625212ea64848244f. - - I had the wrong cherry-pick reference (the commit content is right; it's - just referring to a base that isn't upstream), but let's revert and reapply - for clarity. - - Signed-off-by: Sam James - -diff --git a/sysdeps/i386/i686/memmove.S b/sysdeps/i386/i686/memmove.S -index effd958120..f230359ad6 100644 ---- a/sysdeps/i386/i686/memmove.S -+++ b/sysdeps/i386/i686/memmove.S -@@ -29,7 +29,7 @@ - #define SRC DEST+4 - #define LEN SRC+4 - --#if defined SHARED && IS_IN (libc) -+#if defined PIC && IS_IN (libc) - ENTRY_CHK (__memmove_chk) - movl 12(%esp), %eax - cmpl %eax, 16(%esp) -diff --git a/sysdeps/i386/i686/memset.S b/sysdeps/i386/i686/memset.S -index ab06771ea0..f02f5a6df7 100644 ---- a/sysdeps/i386/i686/memset.S -+++ b/sysdeps/i386/i686/memset.S -@@ -27,7 +27,7 @@ - #define LEN CHR+4 - - .text --#if defined SHARED && IS_IN (libc) -+#if defined PIC && IS_IN (libc) - ENTRY_CHK (__memset_chk) - movl 12(%esp), %eax - cmpl %eax, 16(%esp) - -commit 5141d4d83c17406f0eaea3e345ef2b52e10f386e -Author: Sam James -Date: Sat May 4 13:28:54 2024 +0100 - - Revert "i586: Fix multiple definitions of __memcpy_chk and __mempcpy_chk" - - This reverts commit 3148714ab61ad61281bae5a30f530d637034ac3b. - - I had the wrong cherry-pick reference (the commit content is right; it's - just referring to a base that isn't upstream), but let's revert and reapply - for clarity. - - Signed-off-by: Sam James - -diff --git a/sysdeps/i386/i586/memcpy.S b/sysdeps/i386/i586/memcpy.S -index 79856d498a..3e26f112d6 100644 ---- a/sysdeps/i386/i586/memcpy.S -+++ b/sysdeps/i386/i586/memcpy.S -@@ -26,7 +26,7 @@ - #define LEN SRC+4 - - .text --#if defined SHARED && IS_IN (libc) -+#if defined PIC && IS_IN (libc) - ENTRY (__memcpy_chk) - movl 12(%esp), %eax - cmpl %eax, 16(%esp) - -commit 8323a83abd73446dc434aceff66219712c09140b -Author: Gabi Falk -Date: Tue Apr 30 20:05:02 2024 +0000 - - i586: Fix multiple definitions of __memcpy_chk and __mempcpy_chk - - /home/bmg/install/compilers/x86_64-linux-gnu/lib/gcc/x86_64-glibc-linux-gnu/13.2.1/../../../../x86_64-glibc-linux-gnu/bin/ld: /home/bmg/build/glibcs/i586-linux-gnu/glibc/libc.a(memcpy_chk.o): in function `__memcpy_chk': - /home/bmg/src/glibc/debug/../sysdeps/i386/memcpy_chk.S:29: multiple definition of `__memcpy_chk';/home/bmg/build/glibcs/i586-linux-gnu/glibc/libc.a(memcpy.o):/home/bmg/src/glibc/string/../sysdeps/i386/i586/memcpy.S:31: first defined here /home/bmg/install/compilers/x86_64-linux-gnu/lib/gcc/x86_64-glibc-linux-gnu/13.2.1/../../../../x86_64-glibc-linux-gnu/bin/ld: /home/bmg/build/glibcs/i586-linux-gnu/glibc/libc.a(mempcpy_chk.o): in function `__mempcpy_chk': /home/bmg/src/glibc/debug/../sysdeps/i386/mempcpy_chk.S:28: multiple definition of `__mempcpy_chk'; /home/bmg/build/glibcs/i586-linux-gnu/glibc/libc.a(mempcpy.o):/home/bmg/src/glibc/string/../sysdeps/i386/i586/memcpy.S:31: first defined here - - After this change, the static library built for i586, regardless of PIC - options, contains implementations of these functions respectively from - sysdeps/i386/memcpy_chk.S and sysdeps/i386/mempcpy_chk.S. This ensures - that memcpy and mempcpy won't pull in __chk_fail and the routines it - calls. - - Reported-by: Florian Weimer - Signed-off-by: Gabi Falk - Reviewed-by: H.J. Lu - Reviewed-by: Dmitry V. Levin - (cherry picked from commit 0fdf4ba48ccce5abf567340b0ab8fa8ed8a9bc6e) - -diff --git a/sysdeps/i386/i586/memcpy.S b/sysdeps/i386/i586/memcpy.S -index 3e26f112d6..79856d498a 100644 ---- a/sysdeps/i386/i586/memcpy.S -+++ b/sysdeps/i386/i586/memcpy.S -@@ -26,7 +26,7 @@ - #define LEN SRC+4 - - .text --#if defined PIC && IS_IN (libc) -+#if defined SHARED && IS_IN (libc) - ENTRY (__memcpy_chk) - movl 12(%esp), %eax - cmpl %eax, 16(%esp) - -commit 8b005d7869debac4d5cd67f65e49a0fad89da9ad -Author: Gabi Falk -Date: Tue Apr 30 20:05:03 2024 +0000 - - i686: Fix multiple definitions of __memmove_chk and __memset_chk - - Commit c73c96a4a1af1326df7f96eec58209e1e04066d8 updated memcpy.S and - mempcpy.S, but omitted memmove.S and memset.S. As a result, the static - library built as PIC, whether with or without multiarch support, - contains two definitions for each of the __memmove_chk and __memset_chk - symbols. - - /usr/lib/gcc/i686-pc-linux-gnu/14/../../../../i686-pc-linux-gnu/bin/ld: /usr/lib/gcc/i686-pc-linux-gnu/14/../../../../lib/libc.a(memset-ia32.o): in function `__memset_chk': - /var/tmp/portage/sys-libs/glibc-2.39-r3/work/glibc-2.39/string/../sysdeps/i386/i686/memset.S:32: multiple definition of `__memset_chk'; /usr/lib/gcc/i686-pc-linux-gnu/14/../../../../lib/libc.a(memset_chk.o):/var/tmp/portage/sys-libs/glibc-2.39-r3/work/glibc-2.39/debug/../sysdeps/i386/i686/multiarch/memset_chk.c:24: first defined here - - After this change, regardless of PIC options, the static library, built - for i686 with multiarch contains implementations of these functions - respectively from debug/memmove_chk.c and debug/memset_chk.c, and - without multiarch contains implementations of these functions - respectively from sysdeps/i386/memmove_chk.S and - sysdeps/i386/memset_chk.S. This ensures that memmove and memset won't - pull in __chk_fail and the routines it calls. - - Reported-by: Sam James - Tested-by: Sam James - Fixes: c73c96a4a1 ("i686: Fix build with --disable-multiarch") - Signed-off-by: Gabi Falk - Reviewed-by: H.J. Lu - Reviewed-by: Dmitry V. Levin - (cherry picked from commit 5a2cf833f5772d6c37c7adac388dd9af9cc1c4b9) - -diff --git a/sysdeps/i386/i686/memmove.S b/sysdeps/i386/i686/memmove.S -index f230359ad6..effd958120 100644 ---- a/sysdeps/i386/i686/memmove.S -+++ b/sysdeps/i386/i686/memmove.S -@@ -29,7 +29,7 @@ - #define SRC DEST+4 - #define LEN SRC+4 - --#if defined PIC && IS_IN (libc) -+#if defined SHARED && IS_IN (libc) - ENTRY_CHK (__memmove_chk) - movl 12(%esp), %eax - cmpl %eax, 16(%esp) -diff --git a/sysdeps/i386/i686/memset.S b/sysdeps/i386/i686/memset.S -index f02f5a6df7..ab06771ea0 100644 ---- a/sysdeps/i386/i686/memset.S -+++ b/sysdeps/i386/i686/memset.S -@@ -27,7 +27,7 @@ - #define LEN CHR+4 - - .text --#if defined PIC && IS_IN (libc) -+#if defined SHARED && IS_IN (libc) - ENTRY_CHK (__memset_chk) - movl 12(%esp), %eax - cmpl %eax, 16(%esp) - -commit f8e462342189525e4605cf233b8f798d1c7f398d -Author: Gabi Falk -Date: Tue Apr 30 20:05:04 2024 +0000 - - Add a test to check for duplicate definitions in the static library - - This change follows two previous fixes addressing multiple definitions - of __memcpy_chk and __mempcpy_chk functions on i586, and __memmove_chk - and __memset_chk functions on i686. The test is intended to prevent - such issues from occurring in the future. - - Signed-off-by: Gabi Falk - Reviewed-by: H.J. Lu - Reviewed-by: Dmitry V. Levin - (cherry picked from commit ded2e0753e9c46debeb2e0d26c5e560d2581d314) - -diff --git a/Makefile b/Makefile -index 7052b46df8..2e351c0321 100644 ---- a/Makefile -+++ b/Makefile -@@ -577,6 +577,13 @@ $(objpfx)lint-makefiles.out: scripts/lint-makefiles.sh - $(SHELL) $< "$(PYTHON)" `pwd` > $@ ; \ - $(evaluate-test) - -+# Link libc.a as a whole to verify that it does not contain multiple -+# definitions of any symbols. -+tests-special += $(objpfx)link-static-libc.out -+$(objpfx)link-static-libc.out: -+ $(LINK.o) $(whole-archive) -r $(objpfx)libc.a -o /dev/null > $@ 2>&1; \ -+ $(evaluate-test) -+ - # Print test summary for tests in $1 .sum file; - # $2 is optional test identifier. - # Fail if there are unexpected failures in the test results. diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/2.40-master.patch b/third_party/nixpkgs/pkgs/development/libraries/glibc/2.40-master.patch new file mode 100644 index 0000000000..0b418d1dbe --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/glibc/2.40-master.patch @@ -0,0 +1,5127 @@ +commit 6daa77104520ca992a9369bd01cccd4d98c82984 +Author: Andreas K. Hüttel +Date: Sun Jul 21 19:02:10 2024 +0200 + + Replace advisories directory + + Signed-off-by: Andreas K. Hüttel + +diff --git a/advisories/GLIBC-SA-2023-0001 b/advisories/GLIBC-SA-2023-0001 +deleted file mode 100644 +index 3d19c91b6a..0000000000 +--- a/advisories/GLIBC-SA-2023-0001 ++++ /dev/null +@@ -1,14 +0,0 @@ +-printf: incorrect output for integers with thousands separator and width field +- +-When the printf family of functions is called with a format specifier +-that uses an (enable grouping) and a minimum width +-specifier, the resulting output could be larger than reasonably expected +-by a caller that computed a tight bound on the buffer size. The +-resulting larger than expected output could result in a buffer overflow +-in the printf family of functions. +- +-CVE-Id: CVE-2023-25139 +-Public-Date: 2023-02-02 +-Vulnerable-Commit: e88b9f0e5cc50cab57a299dc7efe1a4eb385161d (2.37) +-Fix-Commit: c980549cc6a1c03c23cc2fe3e7b0fe626a0364b0 (2.38) +-Fix-Commit: 07b9521fc6369d000216b96562ff7c0ed32a16c4 (2.37-4) +diff --git a/advisories/GLIBC-SA-2023-0002 b/advisories/GLIBC-SA-2023-0002 +deleted file mode 100644 +index 5122669a64..0000000000 +--- a/advisories/GLIBC-SA-2023-0002 ++++ /dev/null +@@ -1,15 +0,0 @@ +-getaddrinfo: Stack read overflow in no-aaaa mode +- +-If the system is configured in no-aaaa mode via /etc/resolv.conf, +-getaddrinfo is called for the AF_UNSPEC address family, and a DNS +-response is received over TCP that is larger than 2048 bytes, +-getaddrinfo may potentially disclose stack contents via the returned +-address data, or crash. +- +-CVE-Id: CVE-2023-4527 +-Public-Date: 2023-09-12 +-Vulnerable-Commit: f282cdbe7f436c75864e5640a409a10485e9abb2 (2.36) +-Fix-Commit: bd77dd7e73e3530203be1c52c8a29d08270cb25d (2.39) +-Fix-Commit: 4ea972b7edd7e36610e8cde18bf7a8149d7bac4f (2.36-113) +-Fix-Commit: b7529346025a130fee483d42178b5c118da971bb (2.37-38) +-Fix-Commit: b25508dd774b617f99419bdc3cf2ace4560cd2d6 (2.38-19) +diff --git a/advisories/GLIBC-SA-2023-0003 b/advisories/GLIBC-SA-2023-0003 +deleted file mode 100644 +index d3aef80348..0000000000 +--- a/advisories/GLIBC-SA-2023-0003 ++++ /dev/null +@@ -1,15 +0,0 @@ +-getaddrinfo: Potential use-after-free +- +-When an NSS plugin only implements the _gethostbyname2_r and +-_getcanonname_r callbacks, getaddrinfo could use memory that was freed +-during buffer resizing, potentially causing a crash or read or write to +-arbitrary memory. +- +-CVE-Id: CVE-2023-4806 +-Public-Date: 2023-09-12 +-Fix-Commit: 973fe93a5675c42798b2161c6f29c01b0e243994 (2.39) +-Fix-Commit: e09ee267c03e3150c2c9ba28625ab130705a485e (2.34-420) +-Fix-Commit: e3ccb230a961b4797510e6a1f5f21fd9021853e7 (2.35-270) +-Fix-Commit: a9728f798ec7f05454c95637ee6581afaa9b487d (2.36-115) +-Fix-Commit: 6529a7466c935f36e9006b854d6f4e1d4876f942 (2.37-39) +-Fix-Commit: 00ae4f10b504bc4564e9f22f00907093f1ab9338 (2.38-20) +diff --git a/advisories/GLIBC-SA-2023-0004 b/advisories/GLIBC-SA-2023-0004 +deleted file mode 100644 +index 5286a7aa54..0000000000 +--- a/advisories/GLIBC-SA-2023-0004 ++++ /dev/null +@@ -1,16 +0,0 @@ +-tunables: local privilege escalation through buffer overflow +- +-If a tunable of the form NAME=NAME=VAL is passed in the environment of a +-setuid program and NAME is valid, it may result in a buffer overflow, +-which could be exploited to achieve escalated privileges. This flaw was +-introduced in glibc 2.34. +- +-CVE-Id: CVE-2023-4911 +-Public-Date: 2023-10-03 +-Vulnerable-Commit: 2ed18c5b534d9e92fc006202a5af0df6b72e7aca (2.34) +-Fix-Commit: 1056e5b4c3f2d90ed2b4a55f96add28da2f4c8fa (2.39) +-Fix-Commit: dcc367f148bc92e7f3778a125f7a416b093964d9 (2.34-423) +-Fix-Commit: c84018a05aec80f5ee6f682db0da1130b0196aef (2.35-274) +-Fix-Commit: 22955ad85186ee05834e47e665056148ca07699c (2.36-118) +-Fix-Commit: b4e23c75aea756b4bddc4abcf27a1c6dca8b6bd3 (2.37-45) +-Fix-Commit: 750a45a783906a19591fb8ff6b7841470f1f5701 (2.38-27) +diff --git a/advisories/GLIBC-SA-2023-0005 b/advisories/GLIBC-SA-2023-0005 +deleted file mode 100644 +index cc4eb90b82..0000000000 +--- a/advisories/GLIBC-SA-2023-0005 ++++ /dev/null +@@ -1,18 +0,0 @@ +-getaddrinfo: DoS due to memory leak +- +-The fix for CVE-2023-4806 introduced a memory leak when an application +-calls getaddrinfo for AF_INET6 with AI_CANONNAME, AI_ALL and AI_V4MAPPED +-flags set. +- +-CVE-Id: CVE-2023-5156 +-Public-Date: 2023-09-25 +-Vulnerable-Commit: e09ee267c03e3150c2c9ba28625ab130705a485e (2.34-420) +-Vulnerable-Commit: e3ccb230a961b4797510e6a1f5f21fd9021853e7 (2.35-270) +-Vulnerable-Commit: a9728f798ec7f05454c95637ee6581afaa9b487d (2.36-115) +-Vulnerable-Commit: 6529a7466c935f36e9006b854d6f4e1d4876f942 (2.37-39) +-Vulnerable-Commit: 00ae4f10b504bc4564e9f22f00907093f1ab9338 (2.38-20) +-Fix-Commit: 8006457ab7e1cd556b919f477348a96fe88f2e49 (2.34-421) +-Fix-Commit: 17092c0311f954e6f3c010f73ce3a78c24ac279a (2.35-272) +-Fix-Commit: 856bac55f98dc840e7c27cfa82262b933385de90 (2.36-116) +-Fix-Commit: 4473d1b87d04b25cdd0e0354814eeaa421328268 (2.37-42) +-Fix-Commit: 5ee59ca371b99984232d7584fe2b1a758b4421d3 (2.38-24) +diff --git a/advisories/GLIBC-SA-2024-0001 b/advisories/GLIBC-SA-2024-0001 +deleted file mode 100644 +index 28931c75ae..0000000000 +--- a/advisories/GLIBC-SA-2024-0001 ++++ /dev/null +@@ -1,15 +0,0 @@ +-syslog: Heap buffer overflow in __vsyslog_internal +- +-__vsyslog_internal did not handle a case where printing a SYSLOG_HEADER +-containing a long program name failed to update the required buffer +-size, leading to the allocation and overflow of a too-small buffer on +-the heap. +- +-CVE-Id: CVE-2023-6246 +-Public-Date: 2024-01-30 +-Vulnerable-Commit: 52a5be0df411ef3ff45c10c7c308cb92993d15b1 (2.37) +-Fix-Commit: 6bd0e4efcc78f3c0115e5ea9739a1642807450da (2.39) +-Fix-Commit: 23514c72b780f3da097ecf33a793b7ba9c2070d2 (2.38-42) +-Fix-Commit: 97a4292aa4a2642e251472b878d0ec4c46a0e59a (2.37-57) +-Vulnerable-Commit: b0e7888d1fa2dbd2d9e1645ec8c796abf78880b9 (2.36-16) +-Fix-Commit: d1a83b6767f68b3cb5b4b4ea2617254acd040c82 (2.36-126) +diff --git a/advisories/GLIBC-SA-2024-0002 b/advisories/GLIBC-SA-2024-0002 +deleted file mode 100644 +index 940bfcf2fc..0000000000 +--- a/advisories/GLIBC-SA-2024-0002 ++++ /dev/null +@@ -1,15 +0,0 @@ +-syslog: Heap buffer overflow in __vsyslog_internal +- +-__vsyslog_internal used the return value of snprintf/vsnprintf to +-calculate buffer sizes for memory allocation. If these functions (for +-any reason) failed and returned -1, the resulting buffer would be too +-small to hold output. +- +-CVE-Id: CVE-2023-6779 +-Public-Date: 2024-01-30 +-Vulnerable-Commit: 52a5be0df411ef3ff45c10c7c308cb92993d15b1 (2.37) +-Fix-Commit: 7e5a0c286da33159d47d0122007aac016f3e02cd (2.39) +-Fix-Commit: d0338312aace5bbfef85e03055e1212dd0e49578 (2.38-43) +-Fix-Commit: 67062eccd9a65d7fda9976a56aeaaf6c25a80214 (2.37-58) +-Vulnerable-Commit: b0e7888d1fa2dbd2d9e1645ec8c796abf78880b9 (2.36-16) +-Fix-Commit: 2bc9d7c002bdac38b5c2a3f11b78e309d7765b83 (2.36-127) +diff --git a/advisories/GLIBC-SA-2024-0003 b/advisories/GLIBC-SA-2024-0003 +deleted file mode 100644 +index b43a5150ab..0000000000 +--- a/advisories/GLIBC-SA-2024-0003 ++++ /dev/null +@@ -1,13 +0,0 @@ +-syslog: Integer overflow in __vsyslog_internal +- +-__vsyslog_internal calculated a buffer size by adding two integers, but +-did not first check if the addition would overflow. +- +-CVE-Id: CVE-2023-6780 +-Public-Date: 2024-01-30 +-Vulnerable-Commit: 52a5be0df411ef3ff45c10c7c308cb92993d15b1 (2.37) +-Fix-Commit: ddf542da94caf97ff43cc2875c88749880b7259b (2.39) +-Fix-Commit: d37c2b20a4787463d192b32041c3406c2bd91de0 (2.38-44) +-Fix-Commit: 2b58cba076e912961ceaa5fa58588e4b10f791c0 (2.37-59) +-Vulnerable-Commit: b0e7888d1fa2dbd2d9e1645ec8c796abf78880b9 (2.36-16) +-Fix-Commit: b9b7d6a27aa0632f334352fa400771115b3c69b7 (2.36-128) +diff --git a/advisories/GLIBC-SA-2024-0004 b/advisories/GLIBC-SA-2024-0004 +deleted file mode 100644 +index 08df2b3118..0000000000 +--- a/advisories/GLIBC-SA-2024-0004 ++++ /dev/null +@@ -1,28 +0,0 @@ +-ISO-2022-CN-EXT: fix out-of-bound writes when writing escape sequence +- +-The iconv() function in the GNU C Library versions 2.39 and older may +-overflow the output buffer passed to it by up to 4 bytes when converting +-strings to the ISO-2022-CN-EXT character set, which may be used to +-crash an application or overwrite a neighbouring variable. +- +-ISO-2022-CN-EXT uses escape sequences to indicate character set changes +-(as specified by RFC 1922). While the SOdesignation has the expected +-bounds checks, neither SS2designation nor SS3designation have its; +-allowing a write overflow of 1, 2, or 3 bytes with fixed values: +-'$+I', '$+J', '$+K', '$+L', '$+M', or '$*H'. +- +-CVE-Id: CVE-2024-2961 +-Public-Date: 2024-04-17 +-Vulnerable-Commit: 755104edc75c53f4a0e7440334e944ad3c6b32fc (2.1.93-169) +-Fix-Commit: f9dc609e06b1136bb0408be9605ce7973a767ada (2.40) +-Fix-Commit: 31da30f23cddd36db29d5b6a1c7619361b271fb4 (2.39-31) +-Fix-Commit: e1135387deded5d73924f6ca20c72a35dc8e1bda (2.38-66) +-Fix-Commit: 89ce64b269a897a7780e4c73a7412016381c6ecf (2.37-89) +-Fix-Commit: 4ed98540a7fd19f458287e783ae59c41e64df7b5 (2.36-164) +-Fix-Commit: 36280d1ce5e245aabefb877fe4d3c6cff95dabfa (2.35-315) +-Fix-Commit: a8b0561db4b9847ebfbfec20075697d5492a363c (2.34-459) +-Fix-Commit: ed4f16ff6bed3037266f1fa682ebd32a18fce29c (2.33-263) +-Fix-Commit: 682ad4c8623e611a971839990ceef00346289cc9 (2.32-140) +-Fix-Commit: 3703c32a8d304c1ee12126134ce69be965f38000 (2.31-154) +- +-Reported-By: Charles Fol +diff --git a/advisories/GLIBC-SA-2024-0005 b/advisories/GLIBC-SA-2024-0005 +deleted file mode 100644 +index a59596610a..0000000000 +--- a/advisories/GLIBC-SA-2024-0005 ++++ /dev/null +@@ -1,22 +0,0 @@ +-nscd: Stack-based buffer overflow in netgroup cache +- +-If the Name Service Cache Daemon's (nscd) fixed size cache is exhausted +-by client requests then a subsequent client request for netgroup data +-may result in a stack-based buffer overflow. This flaw was introduced +-in glibc 2.15 when the cache was added to nscd. +- +-This vulnerability is only present in the nscd binary. +- +-CVE-Id: CVE-2024-33599 +-Public-Date: 2024-04-23 +-Vulnerable-Commit: 684ae515993269277448150a1ca70db3b94aa5bd (2.15) +-Fix-Commit: 69c58d5ef9f584ea198bd00f7964d364d0e6b921 (2.31-155) +-Fix-Commit: a77064893bfe8a701770e2f53a4d33805bc47a5a (2.32-141) +-Fix-Commit: 5c75001a96abcd50cbdb74df24c3f013188d076e (2.33-264) +-Fix-Commit: 52f73e5c4e29b14e79167272297977f360ae1e97 (2.34-460) +-Fix-Commit: 7a95873543ce225376faf13bb71c43dea6d24f86 (2.35-316) +-Fix-Commit: caa3151ca460bdd9330adeedd68c3112d97bffe4 (2.36-165) +-Fix-Commit: f75c298e747b2b8b41b1c2f551c011a52c41bfd1 (2.37-91) +-Fix-Commit: 5968aebb86164034b8f8421b4abab2f837a5bdaf (2.38-72) +-Fix-Commit: 1263d583d2e28afb8be53f8d6922f0842036f35d (2.39-35) +-Fix-Commit: 87801a8fd06db1d654eea3e4f7626ff476a9bdaa (2.40) +diff --git a/advisories/GLIBC-SA-2024-0006 b/advisories/GLIBC-SA-2024-0006 +deleted file mode 100644 +index d44148d3d9..0000000000 +--- a/advisories/GLIBC-SA-2024-0006 ++++ /dev/null +@@ -1,32 +0,0 @@ +-nscd: Null pointer crash after notfound response +- +-If the Name Service Cache Daemon's (nscd) cache fails to add a not-found +-netgroup response to the cache, the client request can result in a null +-pointer dereference. This flaw was introduced in glibc 2.15 when the +-cache was added to nscd. +- +-This vulnerability is only present in the nscd binary. +- +-CVE-Id: CVE-2024-33600 +-Public-Date: 2024-04-24 +-Vulnerable-Commit: 684ae515993269277448150a1ca70db3b94aa5bd (2.15) +-Fix-Commit: b048a482f088e53144d26a61c390bed0210f49f2 (2.40) +-Fix-Commit: 7835b00dbce53c3c87bbbb1754a95fb5e58187aa (2.40) +-Fix-Commit: c99f886de54446cd4447db6b44be93dabbdc2f8b (2.39-37) +-Fix-Commit: 5a508e0b508c8ad53bd0d2fb48fd71b242626341 (2.39-36) +-Fix-Commit: 2ae9446c1b7a3064743b4a51c0bbae668ee43e4c (2.38-74) +-Fix-Commit: 541ea5172aa658c4bd5c6c6d6fd13903c3d5bb0a (2.38-73) +-Fix-Commit: a8070b31043c7585c36ba68a74298c4f7af075c3 (2.37-93) +-Fix-Commit: 5eea50c4402e39588de98aa1d4469a79774703d4 (2.37-92) +-Fix-Commit: f205b3af56740e3b014915b1bd3b162afe3407ef (2.36-167) +-Fix-Commit: c34f470a615b136170abd16142da5dd0c024f7d1 (2.36-166) +-Fix-Commit: bafadc589fbe21ae330e8c2af74db9da44a17660 (2.35-318) +-Fix-Commit: 4370bef52b0f3f3652c6aa13d7a9bb3ac079746d (2.35-317) +-Fix-Commit: 1f94122289a9bf7dba573f5d60327aaa2b85cf2e (2.34-462) +-Fix-Commit: 966d6ac9e40222b84bb21674cc4f83c8d72a5a26 (2.34-461) +-Fix-Commit: e3eef1b8fbdd3a7917af466ca9c4b7477251ca79 (2.33-266) +-Fix-Commit: f20a8d696b13c6261b52a6434899121f8b19d5a7 (2.33-265) +-Fix-Commit: be602180146de37582a3da3a0caa4b719645de9c (2.32-143) +-Fix-Commit: 394eae338199078b7961b051c191539870742d7b (2.32-142) +-Fix-Commit: 8d7949183760170c61e55def723c1d8050187874 (2.31-157) +-Fix-Commit: 304ce5fe466c4762b21b36c26926a4657b59b53e (2.31-156) +diff --git a/advisories/GLIBC-SA-2024-0007 b/advisories/GLIBC-SA-2024-0007 +deleted file mode 100644 +index b6928fa27a..0000000000 +--- a/advisories/GLIBC-SA-2024-0007 ++++ /dev/null +@@ -1,28 +0,0 @@ +-nscd: netgroup cache may terminate daemon on memory allocation failure +- +-The Name Service Cache Daemon's (nscd) netgroup cache uses xmalloc or +-xrealloc and these functions may terminate the process due to a memory +-allocation failure resulting in a denial of service to the clients. The +-flaw was introduced in glibc 2.15 when the cache was added to nscd. +- +-This vulnerability is only present in the nscd binary. +- +-Subsequent refactoring of the netgroup cache only added more uses of +-xmalloc and xrealloc. Uses of xmalloc and xrealloc in other parts of +-nscd only occur during startup of the daemon and so are not affected by +-client requests that could trigger an out of memory followed by +-termination. +- +-CVE-Id: CVE-2024-33601 +-Public-Date: 2024-04-24 +-Vulnerable-Commit: 684ae515993269277448150a1ca70db3b94aa5bd (2.15) +-Fix-Commit: c04a21e050d64a1193a6daab872bca2528bda44b (2.40) +-Fix-Commit: a9a8d3eebb145779a18d90e3966009a1daa63cd8 (2.39-38) +-Fix-Commit: 71af8ca864345d39b746d5cee84b94b430fad5db (2.38-75) +-Fix-Commit: 6e106dc214d6a033a4e945d1c6cf58061f1c5f1f (2.37-94) +-Fix-Commit: b6742463694b1dfdd5120b91ee21cf05d15ec2e2 (2.36-168) +-Fix-Commit: 7a5864cac60e06000394128a5a2817b03542f5a3 (2.35-319) +-Fix-Commit: 86f1d5f4129c373ac6fb6df5bcf38273838843cb (2.34-463) +-Fix-Commit: 4d27d4b9a188786fc6a56745506cec2acfc51f83 (2.33-267) +-Fix-Commit: 3ed195a8ec89da281e3c4bf887a13d281b72d8f4 (2.32-144) +-Fix-Commit: bbf5a58ccb55679217f94de706164d15372fbbc0 (2.31-158) +diff --git a/advisories/GLIBC-SA-2024-0008 b/advisories/GLIBC-SA-2024-0008 +deleted file mode 100644 +index d93e2a6f0b..0000000000 +--- a/advisories/GLIBC-SA-2024-0008 ++++ /dev/null +@@ -1,26 +0,0 @@ +-nscd: netgroup cache assumes NSS callback uses in-buffer strings +- +-The Name Service Cache Daemon's (nscd) netgroup cache can corrupt memory +-when the NSS callback does not store all strings in the provided buffer. +-The flaw was introduced in glibc 2.15 when the cache was added to nscd. +- +-This vulnerability is only present in the nscd binary. +- +-There is no guarantee from the NSS callback API that the returned +-strings are all within the buffer. However, the netgroup cache code +-assumes that the NSS callback uses in-buffer strings and if it doesn't +-the buffer resizing logic could lead to potential memory corruption. +- +-CVE-Id: CVE-2024-33602 +-Public-Date: 2024-04-24 +-Vulnerable-Commit: 684ae515993269277448150a1ca70db3b94aa5bd (2.15) +-Fix-Commit: c04a21e050d64a1193a6daab872bca2528bda44b (2.40) +-Fix-Commit: a9a8d3eebb145779a18d90e3966009a1daa63cd8 (2.39-38) +-Fix-Commit: 71af8ca864345d39b746d5cee84b94b430fad5db (2.38-75) +-Fix-Commit: 6e106dc214d6a033a4e945d1c6cf58061f1c5f1f (2.37-94) +-Fix-Commit: b6742463694b1dfdd5120b91ee21cf05d15ec2e2 (2.36-168) +-Fix-Commit: 7a5864cac60e06000394128a5a2817b03542f5a3 (2.35-319) +-Fix-Commit: 86f1d5f4129c373ac6fb6df5bcf38273838843cb (2.34-463) +-Fix-Commit: 4d27d4b9a188786fc6a56745506cec2acfc51f83 (2.33-267) +-Fix-Commit: 3ed195a8ec89da281e3c4bf887a13d281b72d8f4 (2.32-144) +-Fix-Commit: bbf5a58ccb55679217f94de706164d15372fbbc0 (2.31-158) +diff --git a/advisories/README b/advisories/README +deleted file mode 100644 +index b8f8a829ca..0000000000 +--- a/advisories/README ++++ /dev/null +@@ -1,77 +0,0 @@ +-GNU C Library Security Advisory Format +-====================================== +- +-Security advisories in this directory follow a simple git commit log +-format, with a heading and free-format description augmented with tags +-to allow parsing key information. References to code changes are +-specific to the glibc repository and follow a specific format: +- +- Tag-name: (release-version) +- +-The indicates a specific commit in the repository. The +-release-version indicates the publicly consumable release in which this +-commit is known to exist. The release-version is derived from the +-git-describe format, (i.e. stripped out from glibc-2.34.NNN-gxxxx) and +-is of the form 2.34-NNN. If the -NNN suffix is absent, it means that +-the change is in that release tarball, otherwise the change is on the +-release/2.YY/master branch and not in any released tarball. +- +-The following tags are currently being used: +- +-CVE-Id: +-This is the CVE-Id assigned under the CVE Program +-(https://www.cve.org/). +- +-Public-Date: +-The date this issue became publicly known. +- +-Vulnerable-Commit: +-The commit that introduced this vulnerability. There could be multiple +-entries, one for each release branch in the glibc repository; the +-release-version portion of this tag should tell you which branch this is +-on. +- +-Fix-Commit: +-The commit that fixed this vulnerability. There could be multiple +-entries for each release branch in the glibc repository, indicating that +-all of those commits contributed to fixing that issue in each of those +-branches. +- +-Reported-By: +-The entity that reported this issue. There could be multiple entries, one for +-each reporter. +- +-Adding an Advisory +------------------- +- +-An advisory for a CVE needs to be added on the master branch in two steps: +- +-1. Add the text of the advisory without any Fix-Commit tags along with +- the fix for the CVE. Add the Vulnerable-Commit tag, if applicable. +- The advisories directory does not exist in release branches, so keep +- the advisory text commit distinct from the code changes, to ease +- backports. Ask for the GLIBC-SA advisory number from the security +- team. +- +-2. Finish all backports on release branches and then back on the msater +- branch, add all commit refs to the advisory using the Fix-Commit +- tags. Don't bother adding the release-version subscript since the +- next step will overwrite it. +- +-3. Run the process-advisories.sh script in the scripts directory on the +- advisory: +- +- scripts/process-advisories.sh update GLIBC-SA-YYYY-NNNN +- +- (replace YYYY-NNNN with the actual advisory number). +- +-4. Verify the updated advisory and push the result. +- +-Getting a NEWS snippet from advisories +--------------------------------------- +- +-Run: +- +- scripts/process-advisories.sh news +- +-and copy the content into the NEWS file. + +commit 8bbb8d7b16cae777eed06bc9d2e059fc00be24e9 +Author: Florian Weimer +Date: Wed Jul 24 12:06:47 2024 +0200 + + resolv: Allow short error responses to match any query (bug 31890) + + Reviewed-by: DJ Delorie + (cherry picked from commit 691a3b2e9bfaba842e46a5ccb7f5e6ea144c3ade) + +diff --git a/NEWS b/NEWS +index 31281ac408..66b755ed34 100644 +--- a/NEWS ++++ b/NEWS +@@ -5,6 +5,12 @@ See the end for copying conditions. + Please send GNU C library bug reports via + using `glibc' in the "product" field. + ++Version 2.41 ++ ++The following bugs are resolved with this release: ++ ++ [31890] resolv: Allow short error responses to match any DNS query ++ + Version 2.40 + + Major new features: +diff --git a/resolv/Makefile b/resolv/Makefile +index 5f44f5896b..d927e337d9 100644 +--- a/resolv/Makefile ++++ b/resolv/Makefile +@@ -106,6 +106,7 @@ tests += \ + tst-resolv-nondecimal \ + tst-resolv-res_init-multi \ + tst-resolv-search \ ++ tst-resolv-short-response \ + tst-resolv-trailing \ + + # This test calls __res_context_send directly, which is not exported +@@ -299,6 +300,8 @@ $(objpfx)tst-resolv-nondecimal: $(objpfx)libresolv.so $(shared-thread-library) + $(objpfx)tst-resolv-qtypes: $(objpfx)libresolv.so $(shared-thread-library) + $(objpfx)tst-resolv-rotate: $(objpfx)libresolv.so $(shared-thread-library) + $(objpfx)tst-resolv-search: $(objpfx)libresolv.so $(shared-thread-library) ++$(objpfx)tst-resolv-short-response: $(objpfx)libresolv.so \ ++ $(shared-thread-library) + $(objpfx)tst-resolv-trailing: $(objpfx)libresolv.so $(shared-thread-library) + $(objpfx)tst-resolv-threads: $(objpfx)libresolv.so $(shared-thread-library) + $(objpfx)tst-resolv-txnid-collision: $(objpfx)libresolv.a \ +diff --git a/resolv/res_send.c b/resolv/res_send.c +index ea7cf192b2..572e72c32f 100644 +--- a/resolv/res_send.c ++++ b/resolv/res_send.c +@@ -1199,19 +1199,30 @@ send_dg(res_state statp, + } + + /* Check for the correct header layout and a matching +- question. */ ++ question. Some recursive resolvers send REFUSED ++ without copying back the question section ++ (producing a response that is only HFIXEDSZ bytes ++ long). Skip query matching in this case. */ ++ bool thisansp_error = (anhp->rcode == SERVFAIL || ++ anhp->rcode == NOTIMP || ++ anhp->rcode == REFUSED); ++ bool skip_query_match = (*thisresplenp == HFIXEDSZ ++ && ntohs (anhp->qdcount) == 0 ++ && thisansp_error); + int matching_query = 0; /* Default to no matching query. */ + if (!recvresp1 + && anhp->id == hp->id +- && __libc_res_queriesmatch (buf, buf + buflen, +- *thisansp, +- *thisansp + *thisanssizp)) ++ && (skip_query_match ++ || __libc_res_queriesmatch (buf, buf + buflen, ++ *thisansp, ++ *thisansp + *thisanssizp))) + matching_query = 1; + if (!recvresp2 + && anhp->id == hp2->id +- && __libc_res_queriesmatch (buf2, buf2 + buflen2, +- *thisansp, +- *thisansp + *thisanssizp)) ++ && (skip_query_match ++ || __libc_res_queriesmatch (buf2, buf2 + buflen2, ++ *thisansp, ++ *thisansp + *thisanssizp))) + matching_query = 2; + if (matching_query == 0) + /* Spurious UDP packet. Drop it and continue +@@ -1221,9 +1232,7 @@ send_dg(res_state statp, + goto wait; + } + +- if (anhp->rcode == SERVFAIL || +- anhp->rcode == NOTIMP || +- anhp->rcode == REFUSED) { ++ if (thisansp_error) { + next_ns: + if (recvresp1 || (buf2 != NULL && recvresp2)) { + *resplen2 = 0; +diff --git a/resolv/tst-resolv-short-response.c b/resolv/tst-resolv-short-response.c +new file mode 100644 +index 0000000000..cf1e39876f +--- /dev/null ++++ b/resolv/tst-resolv-short-response.c +@@ -0,0 +1,112 @@ ++/* Test for spurious timeouts with short 12-byte responses (bug 31890). ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include ++ ++/* The rcode in the initial response. */ ++static volatile int rcode; ++ ++static void ++response (const struct resolv_response_context *ctx, ++ struct resolv_response_builder *b, ++ const char *qname, uint16_t qclass, uint16_t qtype) ++{ ++ switch (ctx->server_index) ++ { ++ case 0: ++ /* First server times out. */ ++ struct resolv_response_flags flags = {.rcode = rcode}; ++ resolv_response_init (b, flags); ++ break; ++ case 1: ++ /* Second server sends reply. */ ++ resolv_response_init (b, (struct resolv_response_flags) {}); ++ resolv_response_add_question (b, qname, qclass, qtype); ++ resolv_response_section (b, ns_s_an); ++ resolv_response_open_record (b, qname, qclass, qtype, 0); ++ switch (qtype) ++ { ++ case T_A: ++ { ++ char ipv4[4] = {192, 0, 2, 17}; ++ resolv_response_add_data (b, &ipv4, sizeof (ipv4)); ++ } ++ break; ++ case T_AAAA: ++ { ++ char ipv6[16] ++ = {0x20, 0x01, 0xd, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}; ++ resolv_response_add_data (b, &ipv6, sizeof (ipv6)); ++ } ++ break; ++ default: ++ FAIL_EXIT1 ("unexpected TYPE%d query", qtype); ++ } ++ resolv_response_close_record (b); ++ break; ++ default: ++ FAIL_EXIT1 ("unexpected query to server %d", ctx->server_index); ++ } ++} ++ ++static void ++check_one (void) ++{ ++ ++ /* The buggy 1-second query timeout results in 30 seconds of delay, ++ which triggers a test timeout failure. */ ++ for (int i = 0; i < 10; ++i) ++ { ++ check_hostent ("www.example", gethostbyname ("www.example"), ++ "name: www.example\n" ++ "address: 192.0.2.17\n"); ++ check_hostent ("www.example", gethostbyname2 ("www.example", AF_INET6), ++ "name: www.example\n" ++ "address: 2001:db8::1\n"); ++ } ++} ++ ++static int ++do_test (void) ++{ ++ struct resolv_test *aux = resolv_test_start ++ ((struct resolv_redirect_config) ++ { ++ .response_callback = response, ++ }); ++ ++ _res.options |= RES_SNGLKUP; ++ ++ rcode = 2; /* SERVFAIL. */ ++ check_one (); ++ ++ rcode = 4; /* NOTIMP. */ ++ check_one (); ++ ++ rcode = 5; /* REFUSED. */ ++ check_one (); ++ ++ resolv_test_end (aux); ++ ++ return 0; ++} ++ ++#include + +commit ef141426630da0946f0af8732eddce9b9a52b2d3 +Author: Florian Weimer +Date: Wed Jul 24 12:06:47 2024 +0200 + + resolv: Do not wait for non-existing second DNS response after error (bug 30081) + + In single-request mode, there is no second response after an error + because the second query has not been sent yet. Waiting for it + introduces an unnecessary timeout. + + Reviewed-by: DJ Delorie + (cherry picked from commit af625987d619388a100b153520d3ee308bda9889) + +diff --git a/NEWS b/NEWS +index 66b755ed34..4d7100b21c 100644 +--- a/NEWS ++++ b/NEWS +@@ -9,6 +9,7 @@ Version 2.41 + + The following bugs are resolved with this release: + ++ [30081] resolv: Do not wait for non-existing second DNS response after error + [31890] resolv: Allow short error responses to match any DNS query + + Version 2.40 +diff --git a/resolv/Makefile b/resolv/Makefile +index d927e337d9..abff7fc007 100644 +--- a/resolv/Makefile ++++ b/resolv/Makefile +@@ -106,6 +106,7 @@ tests += \ + tst-resolv-nondecimal \ + tst-resolv-res_init-multi \ + tst-resolv-search \ ++ tst-resolv-semi-failure \ + tst-resolv-short-response \ + tst-resolv-trailing \ + +@@ -300,6 +301,8 @@ $(objpfx)tst-resolv-nondecimal: $(objpfx)libresolv.so $(shared-thread-library) + $(objpfx)tst-resolv-qtypes: $(objpfx)libresolv.so $(shared-thread-library) + $(objpfx)tst-resolv-rotate: $(objpfx)libresolv.so $(shared-thread-library) + $(objpfx)tst-resolv-search: $(objpfx)libresolv.so $(shared-thread-library) ++$(objpfx)tst-resolv-semi-failure: $(objpfx)libresolv.so \ ++ $(shared-thread-library) + $(objpfx)tst-resolv-short-response: $(objpfx)libresolv.so \ + $(shared-thread-library) + $(objpfx)tst-resolv-trailing: $(objpfx)libresolv.so $(shared-thread-library) +diff --git a/resolv/res_send.c b/resolv/res_send.c +index 572e72c32f..9c77613f37 100644 +--- a/resolv/res_send.c ++++ b/resolv/res_send.c +@@ -1238,7 +1238,7 @@ send_dg(res_state statp, + *resplen2 = 0; + return resplen; + } +- if (buf2 != NULL) ++ if (buf2 != NULL && !single_request) + { + /* No data from the first reply. */ + resplen = 0; +diff --git a/resolv/tst-resolv-semi-failure.c b/resolv/tst-resolv-semi-failure.c +new file mode 100644 +index 0000000000..aa9798b5a7 +--- /dev/null ++++ b/resolv/tst-resolv-semi-failure.c +@@ -0,0 +1,133 @@ ++/* Test parallel failure/success responses (bug 30081). ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include ++ ++/* The rcode in the initial response. */ ++static volatile int rcode; ++ ++/* Whether to fail the initial A query (!fail_aaaa) or the initial ++ AAAA query (fail_aaaa). */ ++static volatile bool fail_aaaa; ++ ++static void ++response (const struct resolv_response_context *ctx, ++ struct resolv_response_builder *b, ++ const char *qname, uint16_t qclass, uint16_t qtype) ++{ ++ /* Handle the failing query. */ ++ if ((fail_aaaa && qtype == T_AAAA) && ctx->server_index == 0) ++ { ++ struct resolv_response_flags flags = {.rcode = rcode}; ++ resolv_response_init (b, flags); ++ return; ++ } ++ ++ /* Otherwise produce a response. */ ++ resolv_response_init (b, (struct resolv_response_flags) {}); ++ resolv_response_add_question (b, qname, qclass, qtype); ++ resolv_response_section (b, ns_s_an); ++ resolv_response_open_record (b, qname, qclass, qtype, 0); ++ switch (qtype) ++ { ++ case T_A: ++ { ++ char ipv4[4] = {192, 0, 2, 17}; ++ resolv_response_add_data (b, &ipv4, sizeof (ipv4)); ++ } ++ break; ++ case T_AAAA: ++ { ++ char ipv6[16] ++ = {0x20, 0x01, 0xd, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}; ++ resolv_response_add_data (b, &ipv6, sizeof (ipv6)); ++ } ++ break; ++ default: ++ FAIL_EXIT1 ("unexpected TYPE%d query", qtype); ++ } ++ resolv_response_close_record (b); ++} ++ ++static void ++check_one (void) ++{ ++ ++ /* The buggy 1-second query timeout results in 30 seconds of delay, ++ which triggers are test timeout failure. */ ++ for (int i = 0; i < 30; ++i) ++ { ++ static const struct addrinfo hints = ++ { ++ .ai_family = AF_UNSPEC, ++ .ai_socktype = SOCK_STREAM, ++ }; ++ struct addrinfo *ai; ++ int ret = getaddrinfo ("www.example", "80", &hints, &ai); ++ const char *expected; ++ if (ret == 0 && ai->ai_next != NULL) ++ expected = ("address: STREAM/TCP 192.0.2.17 80\n" ++ "address: STREAM/TCP 2001:db8::1 80\n"); ++ else ++ /* Only one response because the AAAA lookup failure is ++ treated as an ignoreable error. */ ++ expected = "address: STREAM/TCP 192.0.2.17 80\n"; ++ check_addrinfo ("www.example", ai, ret, expected); ++ if (ret == 0) ++ freeaddrinfo (ai); ++ } ++} ++ ++static int ++do_test (void) ++{ ++ for (int do_single_lookup = 0; do_single_lookup < 2; ++do_single_lookup) ++ { ++ struct resolv_test *aux = resolv_test_start ++ ((struct resolv_redirect_config) ++ { ++ .response_callback = response, ++ }); ++ ++ if (do_single_lookup) ++ _res.options |= RES_SNGLKUP; ++ ++ for (int do_fail_aaaa = 0; do_fail_aaaa < 2; ++do_fail_aaaa) ++ { ++ fail_aaaa = do_fail_aaaa; ++ ++ rcode = 2; /* SERVFAIL. */ ++ check_one (); ++ ++ rcode = 4; /* NOTIMP. */ ++ check_one (); ++ ++ rcode = 5; /* REFUSED. */ ++ check_one (); ++ } ++ ++ resolv_test_end (aux); ++ } ++ ++ return 0; ++} ++ ++#include +diff --git a/resolv/tst-resolv-short-response.c b/resolv/tst-resolv-short-response.c +index cf1e39876f..be354ae1c7 100644 +--- a/resolv/tst-resolv-short-response.c ++++ b/resolv/tst-resolv-short-response.c +@@ -81,6 +81,18 @@ check_one (void) + check_hostent ("www.example", gethostbyname2 ("www.example", AF_INET6), + "name: www.example\n" + "address: 2001:db8::1\n"); ++ static const struct addrinfo hints = ++ { ++ .ai_family = AF_UNSPEC, ++ .ai_socktype = SOCK_STREAM, ++ }; ++ struct addrinfo *ai; ++ int ret = getaddrinfo ("www.example", "80", &hints, &ai); ++ check_addrinfo ("www.example", ai, ret, ++ "address: STREAM/TCP 192.0.2.17 80\n" ++ "address: STREAM/TCP 2001:db8::1 80\n"); ++ if (ret == 0) ++ freeaddrinfo (ai); + } + } + + +commit b6aeba2de157ba0cdc8fb0aed67b632b3490f383 +Author: Florian Weimer +Date: Wed Jul 24 12:50:17 2024 +0200 + + manual: Do not mention STATIC_TLS in dynamic linker hardening recommendations + + The current toolchain does not consistently generate it, and + glibc does not use it. + + Reviewed-by: Szabolcs Nagy + (cherry picked from commit 90842d3980064ef410b998b22170ad409b76b9fd) + +diff --git a/manual/dynlink.texi b/manual/dynlink.texi +index 03565d4fb0..1500a53de6 100644 +--- a/manual/dynlink.texi ++++ b/manual/dynlink.texi +@@ -993,21 +993,21 @@ The dynamic segment should also mention @code{BIND_NOW} on the + enough). + + @item +-For shared objects (not main programs), if the program header has a +-@code{PT_TLS} segment, the dynamic segment (as shown by @samp{readelf +--dW}) should contain the @code{STATIC_TLS} flag on the @code{FLAGS} +-line. +- +-If @code{STATIC_TLS} is missing in shared objects, ensure that the +-appropriate relocations for GNU2 TLS descriptors are used (for example, ++Ensure that only static TLS relocations (thread-pointer relative offset ++locations) are used, for example @code{R_AARCH64_TLS_TPREL} and ++@code{X86_64_TPOFF64}. As the second-best option, and only if ++compatibility with non-hardened applications using @code{dlopen} is ++needed, GNU2 TLS descriptor relocations can be used (for example, + @code{R_AARCH64_TLSDESC} or @code{R_X86_64_TLSDESC}). + + @item +-There should not be a reference to the symbols @code{__tls_get_addr}, +-@code{__tls_get_offset}, @code{__tls_get_addr_opt} in the dynamic symbol +-table (in the @samp{readelf -sDW} output). Thread-local storage must be +-accessed using the initial-exec (static) model, or using GNU2 TLS +-descriptors. ++There should not be references to the traditional TLS function symbols ++@code{__tls_get_addr}, @code{__tls_get_offset}, ++@code{__tls_get_addr_opt} in the dynamic symbol table (in the ++@samp{readelf -sDW} output). Supporting global dynamic TLS relocations ++(such as @code{R_AARCH64_TLS_DTPMOD}, @code{R_AARCH64_TLS_DTPREL}, ++@code{R_X86_64_DTPMOD64}, @code{R_X86_64_DTPOFF64}) should not be used, ++either. + + @item + Likewise, the functions @code{dlopen}, @code{dlmopen}, @code{dlclose} + +commit 145b5886379c8de4f0a1bca3556a4c3d7b6c24b2 +Author: Florian Weimer +Date: Wed Jul 24 13:42:16 2024 +0200 + + Fix version number in NEWS file + +diff --git a/NEWS b/NEWS +index 4d7100b21c..6b62f55658 100644 +--- a/NEWS ++++ b/NEWS +@@ -5,7 +5,7 @@ See the end for copying conditions. + Please send GNU C library bug reports via + using `glibc' in the "product" field. + +-Version 2.41 ++Version 2.40.1 + + The following bugs are resolved with this release: + + +commit 2aebac5e158277d852b87b0cbd4af2b2d10ac387 +Author: Miguel Martín +Date: Tue Jul 16 17:14:56 2024 +0200 + + malloc: avoid global locks in tst-aligned_alloc-lib.c + + Make sure the DSO used by aligned_alloc/calloc/malloc tests does not get + a global lock on multithreaded tests. + Reviewed-by: Arjun Shankar + + (cherry picked from commit 9a27b566b2048f599048f2f4afe1cce06c4ef43d) + +diff --git a/malloc/tst-aligned_alloc-lib.c b/malloc/tst-aligned_alloc-lib.c +index 0205df5acf..9ef1f839c1 100644 +--- a/malloc/tst-aligned_alloc-lib.c ++++ b/malloc/tst-aligned_alloc-lib.c +@@ -17,37 +17,38 @@ + License along with the GNU C Library; see the file COPYING.LIB. If + not, see . */ + +-#include + #include + #include ++#include + + extern void *__libc_malloc (size_t size); + extern void *__libc_calloc (size_t n, size_t size); + ++__thread unsigned int seed = 0; ++ + int aligned_alloc_count = 0; + int libc_malloc_count = 0; + int libc_calloc_count = 0; + +-/* Get a random alignment value. Biased towards the smaller values. Must be +- a power of 2. */ +-static size_t get_random_alignment (void) +-{ +- size_t aligns[] = { +- 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384 +- }; +- +- return aligns[random () % array_length (aligns)]; +-} +- +-static void *get_random_alloc (size_t size) ++static void * ++get_random_alloc (size_t size) + { + void *retval; + size_t align; ++ struct timespec tp; ++ ++ if (seed == 0) ++ { ++ clock_gettime (CLOCK_REALTIME, &tp); ++ seed = tp.tv_nsec; ++ } + +- switch (random() % 3) +- { ++ switch (rand_r (&seed) % 3) ++ { + case 1: +- align = get_random_alignment (); ++ /* Get a random alignment value. Biased towards the smaller ++ * values up to 16384. Must be a power of 2. */ ++ align = 1 << rand_r (&seed) % 15; + retval = aligned_alloc (align, size); + aligned_alloc_count++; + break; +@@ -59,13 +60,13 @@ static void *get_random_alloc (size_t size) + retval = __libc_malloc (size); + libc_malloc_count++; + break; +- } ++ } + + return retval; + } + +- +-void * __random_malloc (size_t size) ++void * ++__random_malloc (size_t size) + { + return get_random_alloc (size); + } + +commit 5d2a931a8167a288374c3a38dc10fe0492ab5ffe +Author: Miguel Martín +Date: Tue Jul 16 17:14:57 2024 +0200 + + malloc: add multi-threaded tests for aligned_alloc/calloc/malloc + + Improve aligned_alloc/calloc/malloc test coverage by adding + multi-threaded tests with random memory allocations and with/without + cross-thread memory deallocations. + + Perform a number of memory allocation calls with random sizes limited + to 0xffff. + + Use the existing DSO ('malloc/tst-aligned_alloc-lib.c') to randomize + allocator selection. + + The multi-threaded allocation/deallocation is staged as described below: + + - Stage 1: Half of the threads will be allocating memory and the + other half will be waiting for them to finish the allocation. + - Stage 2: Half of the threads will be allocating memory and the + other half will be deallocating memory. + - Stage 3: Half of the threads will be deallocating memory and the + second half waiting on them to finish. + + Add 'malloc/tst-aligned-alloc-random-thread.c' where each thread will + deallocate only the memory that was previously allocated by itself. + + Add 'malloc/tst-aligned-alloc-random-thread-cross.c' where each thread + will deallocate memory that was previously allocated by another thread. + + The intention is to be able to utilize existing malloc testing to ensure + that similar allocation APIs are also exposed to the same rigors. + Reviewed-by: Arjun Shankar + + (cherry picked from commit b0fbcb7d0051a68baf26b2aed51a8a31c34d68e5) + +diff --git a/malloc/Makefile b/malloc/Makefile +index 02aff1bd1d..98d507a6eb 100644 +--- a/malloc/Makefile ++++ b/malloc/Makefile +@@ -28,6 +28,8 @@ tests := \ + mallocbug \ + tst-aligned-alloc \ + tst-aligned-alloc-random \ ++ tst-aligned-alloc-random-thread \ ++ tst-aligned-alloc-random-thread-cross \ + tst-alloc_buffer \ + tst-calloc \ + tst-free-errno \ +@@ -151,6 +153,8 @@ ifeq ($(have-GLIBC_2.23)$(build-shared),yesyes) + # the tests expect specific internal behavior that is changed due to linking to + # libmcheck.a. + tests-exclude-mcheck = \ ++ tst-aligned-alloc-random-thread \ ++ tst-aligned-alloc-random-thread-cross \ + tst-compathooks-off \ + tst-compathooks-on \ + tst-malloc-backtrace \ +@@ -415,7 +419,11 @@ $(objpfx)tst-mallocstate: $(objpfx)libc_malloc_debug.so + $(objpfx)tst-mallocstate-malloc-check: $(objpfx)libc_malloc_debug.so + + $(objpfx)tst-aligned-alloc-random.out: $(objpfx)tst-aligned_alloc-lib.so ++$(objpfx)tst-aligned-alloc-random-thread.out: $(objpfx)tst-aligned_alloc-lib.so ++$(objpfx)tst-aligned-alloc-random-thread-cross.out: $(objpfx)tst-aligned_alloc-lib.so + $(objpfx)tst-malloc-random.out: $(objpfx)tst-aligned_alloc-lib.so + + tst-aligned-alloc-random-ENV = LD_PRELOAD=$(objpfx)tst-aligned_alloc-lib.so ++tst-aligned-alloc-random-thread-ENV = LD_PRELOAD=$(objpfx)tst-aligned_alloc-lib.so ++tst-aligned-alloc-random-thread-cross-ENV = LD_PRELOAD=$(objpfx)tst-aligned_alloc-lib.so + tst-malloc-random-ENV = LD_PRELOAD=$(objpfx)tst-aligned_alloc-lib.so +diff --git a/malloc/tst-aligned-alloc-random-thread-cross.c b/malloc/tst-aligned-alloc-random-thread-cross.c +new file mode 100644 +index 0000000000..360ecc56ee +--- /dev/null ++++ b/malloc/tst-aligned-alloc-random-thread-cross.c +@@ -0,0 +1,19 @@ ++/* multi-threaded memory allocation and cross-thread deallocation test. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; see the file COPYING.LIB. If ++ not, see . */ ++#define CROSS_THREAD_DEALLOC ++#include "tst-aligned-alloc-random-thread.c" +diff --git a/malloc/tst-aligned-alloc-random-thread.c b/malloc/tst-aligned-alloc-random-thread.c +new file mode 100644 +index 0000000000..e95f79250a +--- /dev/null ++++ b/malloc/tst-aligned-alloc-random-thread.c +@@ -0,0 +1,145 @@ ++/* multi-threaded memory allocation/deallocation test. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; see the file COPYING.LIB. If ++ not, see . */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#ifndef ITERATIONS ++# define ITERATIONS 16 ++#endif ++ ++#ifndef NUM_THREADS ++# define NUM_THREADS 8 ++#endif ++ ++#ifndef NUM_ALLOCATIONS ++# define NUM_ALLOCATIONS 2048 ++#endif ++ ++static pthread_barrier_t barrier; ++ ++__thread unsigned int seed; ++ ++typedef struct ++{ ++ int id; ++ pthread_t thread; ++} thread; ++ ++thread threads[NUM_THREADS]; ++ ++void *allocations[NUM_THREADS][NUM_ALLOCATIONS]; ++ ++void ++run_thread_dealloc (int id) ++{ ++ for (int i = 0; i < NUM_ALLOCATIONS; i++) ++ { ++ free (allocations[id][i]); ++ allocations[id][i] = NULL; ++ } ++} ++ ++void ++run_thread_alloc (int id) ++{ ++ size_t msb, size; ++ for (int i = 0; i < NUM_ALLOCATIONS; i++) ++ { ++ msb = 1 << rand_r (&seed) % 16; ++ size = msb + rand_r (&seed) % msb; ++ allocations[id][i] = malloc (size); ++ TEST_VERIFY_EXIT (allocations[id][i] != NULL); ++ } ++} ++ ++void * ++run_allocations (void *arg) ++{ ++ int id = *((int *) arg); ++ seed = time (NULL) + id; ++ ++ /* Stage 1: First half o the threads allocating memory and the second ++ * half waiting for them to finish ++ */ ++ if (id < NUM_THREADS / 2) ++ run_thread_alloc (id); ++ ++ xpthread_barrier_wait (&barrier); ++ ++ /* Stage 2: Half of the threads allocationg memory and the other ++ * half deallocating: ++ * - In the non cross-thread dealloc scenario the first half will be ++ * deallocating the memory allocated by themselves in stage 1 and the ++ * second half will be allocating memory. ++ * - In the cross-thread dealloc scenario the first half will continue ++ * to allocate memory and the second half will deallocate the memory ++ * allocated by the first half in stage 1. ++ */ ++ if (id < NUM_THREADS / 2) ++#ifndef CROSS_THREAD_DEALLOC ++ run_thread_dealloc (id); ++#else ++ run_thread_alloc (id + NUM_THREADS / 2); ++#endif ++ else ++#ifndef CROSS_THREAD_DEALLOC ++ run_thread_alloc (id); ++#else ++ run_thread_dealloc (id - NUM_THREADS / 2); ++#endif ++ ++ xpthread_barrier_wait (&barrier); ++ ++ // Stage 3: Second half of the threads deallocating and the first half ++ // waiting for them to finish. ++ if (id >= NUM_THREADS / 2) ++ run_thread_dealloc (id); ++ ++ return NULL; ++} ++ ++static int ++do_test (void) ++{ ++ xpthread_barrier_init (&barrier, NULL, NUM_THREADS); ++ ++ for (int i = 0; i < ITERATIONS; i++) ++ { ++ for (int t = 0; t < NUM_THREADS; t++) ++ { ++ threads[t].id = t; ++ threads[t].thread ++ = xpthread_create (NULL, run_allocations, &threads[t].id); ++ } ++ ++ for (int t = 0; t < NUM_THREADS; t++) ++ xpthread_join (threads[t].thread); ++ } ++ ++ return 0; ++} ++ ++#include + +commit 65fbcfe58991194301a7e4fb9c53ab936573e711 +Author: Arjun Shankar +Date: Mon Jul 29 14:30:59 2024 +0200 + + manual/stdio: Clarify putc and putwc + + The manual entry for `putc' described what "most systems" do instead of + describing the glibc implementation and its guarantees. This commit + fixes that by warning that putc may be implemented as a macro that + double-evaluates `stream', and removing the performance claim. + + Even though the current `putc' implementation does not double-evaluate + `stream', offering this obscure guarantee as an extension to what + POSIX allows does not seem very useful. + + The entry for `putwc' is also edited to bring it in line with `putc'. + Reviewed-by: Florian Weimer + + (cherry picked from commit 10de4a47ef3f481592e3c62eb07bcda23e9fde4d) + +diff --git a/manual/stdio.texi b/manual/stdio.texi +index f5e289d58a..f9529a098d 100644 +--- a/manual/stdio.texi ++++ b/manual/stdio.texi +@@ -903,21 +903,21 @@ This function is a GNU extension. + @deftypefun int putc (int @var{c}, FILE *@var{stream}) + @standards{ISO, stdio.h} + @safety{@prelim{}@mtsafe{}@asunsafe{@asucorrupt{}}@acunsafe{@acucorrupt{} @aculock{}}} +-This is just like @code{fputc}, except that most systems implement it as ++This is just like @code{fputc}, except that it may be implemented as + a macro, making it faster. One consequence is that it may evaluate the + @var{stream} argument more than once, which is an exception to the +-general rule for macros. @code{putc} is usually the best function to +-use for writing a single character. ++general rule for macros. Therefore, @var{stream} should never be an ++expression with side-effects. + @end deftypefun + + @deftypefun wint_t putwc (wchar_t @var{wc}, FILE *@var{stream}) + @standards{ISO, wchar.h} + @safety{@prelim{}@mtsafe{}@asunsafe{@asucorrupt{}}@acunsafe{@acucorrupt{} @aculock{}}} +-This is just like @code{fputwc}, except that it can be implement as ++This is just like @code{fputwc}, except that it may be implemented as + a macro, making it faster. One consequence is that it may evaluate the + @var{stream} argument more than once, which is an exception to the +-general rule for macros. @code{putwc} is usually the best function to +-use for writing a single wide character. ++general rule for macros. Therefore, @var{stream} should never be an ++expression with side-effects. + @end deftypefun + + @deftypefun int putc_unlocked (int @var{c}, FILE *@var{stream}) + +commit 132a72f93cb4ad9f16b8469dc061de5f75f6a44e +Author: Lukas Bulwahn +Date: Mon Jul 29 11:08:17 2024 +0200 + + manual: make setrlimit() description less ambiguous + + The existing description for setrlimit() has some ambiguity. It could be + understood to have the semantics of getrlimit(), i.e., the limits from the + process are stored in the provided rlp pointer. + + Make the description more explicit that rlp are the input values, and that + the limits of the process is changed with this function. + + Reviewed-by: Florian Weimer + (cherry picked from commit aedbf08891069fc029ed021e4dba933eb877b394) + +diff --git a/manual/resource.texi b/manual/resource.texi +index c9b21dedeb..25966bcb64 100644 +--- a/manual/resource.texi ++++ b/manual/resource.texi +@@ -192,8 +192,8 @@ If the sources are compiled with @code{_FILE_OFFSET_BITS == 64} on a + @standards{BSD, sys/resource.h} + @safety{@prelim{}@mtsafe{}@assafe{}@acsafe{}} + @c Direct syscall on most systems; lock-taking critical section on HURD. +-Store the current and maximum limits for the resource @var{resource} +-in @code{*@var{rlp}}. ++Change the current and maximum limits of the process for the resource ++@var{resource} to the values provided in @code{*@var{rlp}}. + + The return value is @code{0} on success and @code{-1} on failure. The + following @code{errno} error condition is possible: + +commit 509166c9a53ad81217a28cc67ba2a688f02fc477 +Author: Florian Weimer +Date: Wed Jun 26 11:27:54 2024 +0200 + + Enhance test coverage for strnlen, wcsnlen + + This commit adds string/test-strnlen-nonarray and + wcsmbs/test-wcsnlen-nonarray. + + Reviewed-by: Noah Goldstein + (cherry picked from commit 783d4c0b81889c39a9ddf13b60d0fde4040fb1c0) + +diff --git a/string/Makefile b/string/Makefile +index 8f31fa49e6..2e20fc00fd 100644 +--- a/string/Makefile ++++ b/string/Makefile +@@ -184,6 +184,7 @@ tests := \ + test-strncpy \ + test-strndup \ + test-strnlen \ ++ test-strnlen-nonarray \ + test-strpbrk \ + test-strrchr \ + test-strspn \ +diff --git a/string/test-Xnlen-nonarray.c b/string/test-Xnlen-nonarray.c +new file mode 100644 +index 0000000000..499bef2041 +--- /dev/null ++++ b/string/test-Xnlen-nonarray.c +@@ -0,0 +1,133 @@ ++/* Test non-array inputs to string length functions. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++/* This skeleton file is included from string/test-strnlen-nonarray.c ++ and wcsmbs/test-wcsnlen-nonarray.c to test that reading of the array ++ stops at the first null character. ++ ++ TEST_IDENTIFIER must be the test function identifier. TEST_NAME is ++ the same as a string. ++ ++ CHAR must be defined as the character type. */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++typedef __typeof (TEST_IDENTIFIER) *proto_t; ++ ++#define TEST_MAIN ++#include "test-string.h" ++ ++IMPL (TEST_IDENTIFIER, 1) ++ ++static int ++test_main (void) ++{ ++ enum { buffer_length = 256 }; ++ TEST_VERIFY_EXIT (sysconf (_SC_PAGESIZE) >= buffer_length); ++ ++ test_init (); ++ ++ /* Buffer layout: There are a_count 'A' character followed by ++ zero_count null character, for a total of buffer_length ++ character: ++ ++ AAAAA...AAAAA 00000 ... 00000 (unmapped page follows) ++ \ / \ / ++ (a_count) (zero_count) ++ \___ (buffer_length) ___/ ++ ^ ++ | ++ start_offset ++ ++ The buffer length does not change, but a_count (and thus _zero) ++ and start_offset vary. ++ ++ If start_offset == buffer_length, only 0 is a valid length ++ argument. The result is 0. ++ ++ Otherwwise, if zero_count > 0 (if there a null characters in the ++ buffer), then any length argument is valid. If start_offset < ++ a_count (i.e., there is a non-null character at start_offset), the ++ result is the minimum of a_count - start_offset and the length ++ argument. Otherwise the result is 0. ++ ++ Otherwise, there are no null characters before the unmapped page. ++ The length argument must not be greater than buffer_length - ++ start_offset, and the result is the length argument. */ ++ ++ struct support_next_to_fault ntf ++ = support_next_to_fault_allocate (buffer_length * sizeof (CHAR)); ++ CHAR *buffer = (CHAR *) ntf.buffer; ++ ++ FOR_EACH_IMPL (impl, 0) ++ { ++ printf ("info: testing %s\n", impl->name); ++ for (size_t i = 0; i < buffer_length; ++i) ++ buffer[i] = 'A'; ++ ++ for (int zero_count = 0; zero_count <= buffer_length; ++zero_count) ++ { ++ if (zero_count > 0) ++ buffer[buffer_length - zero_count] = 0; ++ int a_count = buffer_length - zero_count; ++ for (int start_offset = 0; start_offset <= buffer_length; ++ ++start_offset) ++ { ++ CHAR *start_pointer = buffer + start_offset; ++ if (start_offset == buffer_length) ++ TEST_COMPARE (CALL (impl, buffer + start_offset, 0), 0); ++ else if (zero_count > 0) ++ for (int length_argument = 0; ++ length_argument <= 2 * buffer_length; ++ ++length_argument) ++ { ++ if (test_verbose) ++ printf ("zero_count=%d a_count=%d start_offset=%d" ++ " length_argument=%d\n", ++ zero_count, a_count, start_offset, ++ length_argument); ++ if (start_offset < a_count) ++ TEST_COMPARE (CALL (impl, start_pointer, length_argument), ++ MIN (a_count - start_offset, ++ length_argument)); ++ else ++ TEST_COMPARE (CALL (impl, start_pointer, length_argument), ++ 0); ++ } ++ else ++ for (int length_argument = 0; ++ length_argument <= buffer_length - start_offset; ++ ++length_argument) ++ TEST_COMPARE (CALL (impl, start_pointer, length_argument), ++ length_argument); ++ } ++ } ++ } ++ ++ support_next_to_fault_free (&ntf); ++ ++ return 0; ++} ++ ++#include +diff --git a/string/test-strnlen-nonarray.c b/string/test-strnlen-nonarray.c +new file mode 100644 +index 0000000000..0ad05756d9 +--- /dev/null ++++ b/string/test-strnlen-nonarray.c +@@ -0,0 +1,4 @@ ++#define TEST_IDENTIFIER strnlen ++#define TEST_NAME "strnlen" ++typedef char CHAR; ++#include "test-Xnlen-nonarray.c" +diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile +index 1cddd8cc6d..c51c9b4f1f 100644 +--- a/wcsmbs/Makefile ++++ b/wcsmbs/Makefile +@@ -160,6 +160,7 @@ tests := \ + test-wcsncmp \ + test-wcsncpy \ + test-wcsnlen \ ++ test-wcsnlen-nonarray \ + test-wcspbrk \ + test-wcsrchr \ + test-wcsspn \ +diff --git a/wcsmbs/test-wcsnlen-nonarray.c b/wcsmbs/test-wcsnlen-nonarray.c +new file mode 100644 +index 0000000000..a4b21fecd3 +--- /dev/null ++++ b/wcsmbs/test-wcsnlen-nonarray.c +@@ -0,0 +1,5 @@ ++#include ++#define TEST_IDENTIFIER wcsnlen ++#define TEST_NAME "wcsnlen" ++typedef wchar_t CHAR; ++#include "../string/test-Xnlen-nonarray.c" + +commit 46f19b234244f4654b9e3898ac1c27de86068222 +Author: Florian Weimer +Date: Thu Jun 27 16:26:56 2024 +0200 + + Enhanced test coverage for strncmp, wcsncmp + + Add string/test-strncmp-nonarray and + wcsmbs/test-wcsncmp-nonarray. + + This is the test that uncovered bug 31934. Test run time + is more than one minute on a fairly current system, so turn + these into xtests that do not run automatically. + + Reviewed-by: Noah Goldstein + (cherry picked from commit 54252394c25ddf0062e288d4a6ab7a885f8ae009) + +diff --git a/string/Makefile b/string/Makefile +index 2e20fc00fd..1dff405c27 100644 +--- a/string/Makefile ++++ b/string/Makefile +@@ -236,7 +236,10 @@ tests-unsupported += $(tests-translation) + endif + + # This test allocates a lot of memory and can run for a long time. +-xtests = tst-strcoll-overflow ++xtests += tst-strcoll-overflow ++ ++# This test runs for a long time. ++xtests += test-strncmp-nonarray + + # This test needs libdl. + ifeq (yes,$(build-shared)) +diff --git a/string/test-Xncmp-nonarray.c b/string/test-Xncmp-nonarray.c +new file mode 100644 +index 0000000000..9f3a3ca75d +--- /dev/null ++++ b/string/test-Xncmp-nonarray.c +@@ -0,0 +1,183 @@ ++/* Test non-array inputs to string comparison functions. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++/* This skeleton file is included from string/test-strncmp-nonarray.c and ++ wcsmbs/test-wcsncmp-nonarray.c to test that reading of the arrays stops ++ at the first null character. ++ ++ TEST_IDENTIFIER must be the test function identifier. TEST_NAME is ++ the same as a string. ++ ++ CHAR must be defined as the character type. */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++/* Much shorter than test-Xnlen-nonarray.c because of deeply nested loops. */ ++enum { buffer_length = 80 }; ++ ++/* The test buffer layout follows what is described test-Xnlen-nonarray.c, ++ except that there two buffers, left and right. The variables ++ a_count, zero_count, start_offset are all duplicated. */ ++ ++/* Return the maximum string length for a string that starts at ++ start_offset. */ ++static int ++string_length (int a_count, int start_offset) ++{ ++ if (start_offset == buffer_length || start_offset >= a_count) ++ return 0; ++ else ++ return a_count - start_offset; ++} ++ ++/* This is the valid maximum length argument computation for ++ strnlen/wcsnlen. See text-Xnlen-nonarray.c. */ ++static int ++maximum_length (int start_offset, int zero_count) ++{ ++ if (start_offset == buffer_length) ++ return 0; ++ else if (zero_count > 0) ++ /* Effectively unbounded, but we need to stop fairly low, ++ otherwise testing takes too long. */ ++ return buffer_length + 32; ++ else ++ return buffer_length - start_offset; ++} ++ ++typedef __typeof (TEST_IDENTIFIER) *proto_t; ++ ++#define TEST_MAIN ++#include "test-string.h" ++ ++IMPL (TEST_IDENTIFIER, 1) ++ ++static int ++test_main (void) ++{ ++ TEST_VERIFY_EXIT (sysconf (_SC_PAGESIZE) >= buffer_length); ++ test_init (); ++ ++ struct support_next_to_fault left_ntf ++ = support_next_to_fault_allocate (buffer_length * sizeof (CHAR)); ++ CHAR *left_buffer = (CHAR *) left_ntf.buffer; ++ struct support_next_to_fault right_ntf ++ = support_next_to_fault_allocate (buffer_length * sizeof (CHAR)); ++ CHAR *right_buffer = (CHAR *) right_ntf.buffer; ++ ++ FOR_EACH_IMPL (impl, 0) ++ { ++ printf ("info: testing %s\n", impl->name); ++ for (size_t i = 0; i < buffer_length; ++i) ++ left_buffer[i] = 'A'; ++ ++ for (int left_zero_count = 0; left_zero_count <= buffer_length; ++ ++left_zero_count) ++ { ++ if (left_zero_count > 0) ++ left_buffer[buffer_length - left_zero_count] = 0; ++ int left_a_count = buffer_length - left_zero_count; ++ for (size_t i = 0; i < buffer_length; ++i) ++ right_buffer[i] = 'A'; ++ for (int right_zero_count = 0; right_zero_count <= buffer_length; ++ ++right_zero_count) ++ { ++ if (right_zero_count > 0) ++ right_buffer[buffer_length - right_zero_count] = 0; ++ int right_a_count = buffer_length - right_zero_count; ++ for (int left_start_offset = 0; ++ left_start_offset <= buffer_length; ++ ++left_start_offset) ++ { ++ CHAR *left_start_pointer = left_buffer + left_start_offset; ++ int left_maxlen ++ = maximum_length (left_start_offset, left_zero_count); ++ int left_length ++ = string_length (left_a_count, left_start_offset); ++ for (int right_start_offset = 0; ++ right_start_offset <= buffer_length; ++ ++right_start_offset) ++ { ++ CHAR *right_start_pointer ++ = right_buffer + right_start_offset; ++ int right_maxlen ++ = maximum_length (right_start_offset, right_zero_count); ++ int right_length ++ = string_length (right_a_count, right_start_offset); ++ ++ /* Maximum length is modelled after strnlen/wcsnlen, ++ and must be valid for both pointer arguments at ++ the same time. */ ++ int maxlen = MIN (left_maxlen, right_maxlen); ++ ++ for (int length_argument = 0; length_argument <= maxlen; ++ ++length_argument) ++ { ++ if (test_verbose) ++ { ++ printf ("left: zero_count=%d" ++ " a_count=%d start_offset=%d\n", ++ left_zero_count, left_a_count, ++ left_start_offset); ++ printf ("right: zero_count=%d" ++ " a_count=%d start_offset=%d\n", ++ right_zero_count, right_a_count, ++ right_start_offset); ++ printf ("length argument: %d\n", ++ length_argument); ++ } ++ ++ /* Effective lengths bounded by length argument. ++ The effective length determines the ++ outcome of the comparison. */ ++ int left_effective ++ = MIN (left_length, length_argument); ++ int right_effective ++ = MIN (right_length, length_argument); ++ if (left_effective == right_effective) ++ TEST_COMPARE (CALL (impl, ++ left_start_pointer, ++ right_start_pointer, ++ length_argument), 0); ++ else if (left_effective < right_effective) ++ TEST_COMPARE (CALL (impl, ++ left_start_pointer, ++ right_start_pointer, ++ length_argument) < 0, 1); ++ else ++ TEST_COMPARE (CALL (impl, ++ left_start_pointer, ++ right_start_pointer, ++ length_argument) > 0, 1); ++ } ++ } ++ } ++ } ++ } ++ } ++ ++ return 0; ++} ++ ++#include +diff --git a/string/test-strncmp-nonarray.c b/string/test-strncmp-nonarray.c +new file mode 100644 +index 0000000000..581e52d01b +--- /dev/null ++++ b/string/test-strncmp-nonarray.c +@@ -0,0 +1,4 @@ ++#define TEST_IDENTIFIER strncmp ++#define TEST_NAME "strncmp" ++typedef char CHAR; ++#include "test-Xncmp-nonarray.c" +diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile +index c51c9b4f1f..63adf0e8ef 100644 +--- a/wcsmbs/Makefile ++++ b/wcsmbs/Makefile +@@ -206,6 +206,10 @@ tests := \ + wcsmbs-tst1 \ + # tests + ++# This test runs for a long time. ++xtests += test-wcsncmp-nonarray ++ ++ + include ../Rules + + ifeq ($(run-built-tests),yes) +diff --git a/wcsmbs/test-wcsncmp-nonarray.c b/wcsmbs/test-wcsncmp-nonarray.c +new file mode 100644 +index 0000000000..1ad9ebd8fd +--- /dev/null ++++ b/wcsmbs/test-wcsncmp-nonarray.c +@@ -0,0 +1,5 @@ ++#include ++#define TEST_IDENTIFIER wcsncmp ++#define TEST_NAME "wcsncmp" ++typedef wchar_t CHAR; ++#include "../string/test-Xncmp-nonarray.c" + +commit 3433a358428bcec2d203fa408b85f442c9a465ca +Author: H.J. Lu +Date: Wed Jul 24 14:05:13 2024 -0700 + + linux: Update the mremap C implementation [BZ #31968] + + Update the mremap C implementation to support the optional argument for + MREMAP_DONTUNMAP added in Linux 5.7 since it may not always be correct + to implement a variadic function as a non-variadic function on all Linux + targets. Return MAP_FAILED and set errno to EINVAL for unknown flag bits. + This fixes BZ #31968. + + Note: A test must be added when a new flag bit is introduced. + + Signed-off-by: H.J. Lu + Reviewed-by: Adhemerval Zanella + (cherry picked from commit 6c40cb0e9f893d49dc7caee580a055de53562206) + +diff --git a/NEWS b/NEWS +index 6b62f55658..5948704ef9 100644 +--- a/NEWS ++++ b/NEWS +@@ -11,6 +11,7 @@ The following bugs are resolved with this release: + + [30081] resolv: Do not wait for non-existing second DNS response after error + [31890] resolv: Allow short error responses to match any DNS query ++ [31968] mremap implementation in C does not handle arguments correctly + + Version 2.40 + +diff --git a/sysdeps/unix/sysv/linux/mremap.c b/sysdeps/unix/sysv/linux/mremap.c +index 4f770799c4..1ada5c1f40 100644 +--- a/sysdeps/unix/sysv/linux/mremap.c ++++ b/sysdeps/unix/sysv/linux/mremap.c +@@ -20,6 +20,12 @@ + #include + #include + #include ++#include ++ ++#define MREMAP_KNOWN_BITS \ ++ (MREMAP_MAYMOVE \ ++ | MREMAP_FIXED \ ++ | MREMAP_DONTUNMAP) + + void * + __mremap (void *addr, size_t old_len, size_t new_len, int flags, ...) +@@ -27,7 +33,13 @@ __mremap (void *addr, size_t old_len, size_t new_len, int flags, ...) + va_list va; + void *new_addr = NULL; + +- if (flags & MREMAP_FIXED) ++ if (flags & ~(MREMAP_KNOWN_BITS)) ++ { ++ __set_errno (EINVAL); ++ return MAP_FAILED; ++ } ++ ++ if (flags & (MREMAP_FIXED | MREMAP_DONTUNMAP)) + { + va_start (va, flags); + new_addr = va_arg (va, void *); + +commit 2eb2d78ca75d7432bd1d11d227f4c899554ea02e +Author: H.J. Lu +Date: Wed Jul 24 14:05:14 2024 -0700 + + mremap: Update manual entry + + Update mremap manual entry: + + 1. Change mremap to variadic. + 2. Document MREMAP_FIXED and MREMAP_DONTUNMAP. + + Signed-off-by: H.J. Lu + Reviewed-by: Adhemerval Zanella + (cherry picked from commit cb2dee4eccf46642eef588bee64f9c875c408f1c) + +diff --git a/NEWS b/NEWS +index 5948704ef9..8da0408ad9 100644 +--- a/NEWS ++++ b/NEWS +@@ -10,6 +10,7 @@ Version 2.40.1 + The following bugs are resolved with this release: + + [30081] resolv: Do not wait for non-existing second DNS response after error ++ [31968] mremap implementation in C does not handle arguments correctly + [31890] resolv: Allow short error responses to match any DNS query + [31968] mremap implementation in C does not handle arguments correctly + +diff --git a/manual/llio.texi b/manual/llio.texi +index 6f0a48609b..ea84196abd 100644 +--- a/manual/llio.texi ++++ b/manual/llio.texi +@@ -1892,7 +1892,7 @@ There is no existing mapping in at least part of the given region. + + @end deftypefun + +-@deftypefun {void *} mremap (void *@var{address}, size_t @var{length}, size_t @var{new_length}, int @var{flag}) ++@deftypefun {void *} mremap (void *@var{address}, size_t @var{length}, size_t @var{new_length}, int @var{flag}, ... /* void *@var{new_address} */) + @standards{GNU, sys/mman.h} + @safety{@prelim{}@mtsafe{}@assafe{}@acsafe{}} + +@@ -1901,12 +1901,40 @@ area. @var{address} and @var{length} must cover a region entirely mapped + in the same @code{mmap} statement. A new mapping with the same + characteristics will be returned with the length @var{new_length}. + +-One option is possible, @code{MREMAP_MAYMOVE}. If it is given in +-@var{flags}, the system may remove the existing mapping and create a new +-one of the desired length in another location. ++Possible flags are + +-The address of the resulting mapping is returned, or @math{-1}. Possible +-error codes include: ++@table @code ++ ++@item MREMAP_MAYMOVE ++If it is given in @var{flags}, the system may remove the existing mapping ++and create a new one of the desired length in another location. ++ ++@item MREMAP_FIXED ++If it is given in @var{flags}, @code{mremap} accepts a fifth argument, ++@code{void *new_address}, which specifies a page-aligned address to ++which the mapping must be moved. Any previous mapping at the address ++range specified by @var{new_address} and @var{new_size} is unmapped. ++ ++@code{MREMAP_FIXED} must be used together with @code{MREMAP_MAYMOVE}. ++ ++@item MREMAP_DONTUNMAP ++If it is given in @var{flags}, @code{mremap} accepts a fifth argument, ++@code{void *new_address}, which specifies a page-aligned address. Any ++previous mapping at the address range specified by @var{new_address} and ++@var{new_size} is unmapped. If @var{new_address} is @code{NULL}, the ++kernel chooses the page-aligned address at which to create the mapping. ++Otherwise, the kernel takes it as a hint about where to place the mapping. ++The mapping at the address range specified by @var{old_address} and ++@var{old_size} isn't unmapped. ++ ++@code{MREMAP_DONTUNMAP} must be used together with @code{MREMAP_MAYMOVE}. ++@var{old_size} must be the same as @var{new_size}. This flag bit is ++Linux-specific. ++ ++@end table ++ ++The address of the resulting mapping is returned, or @code{MAP_FAILED}. ++Possible error codes include: + + @table @code + +@@ -1915,7 +1943,7 @@ There is no existing mapping in at least part of the original region, or + the region covers two or more distinct mappings. + + @item EINVAL +-The address given is misaligned or inappropriate. ++Any arguments are inappropriate, including unknown @var{flags} values. + + @item EAGAIN + The region has pages locked, and if extended it would exceed the + +commit ca53bc68ab92ab413a7d53e951227d380a85ebd8 +Author: H.J. Lu +Date: Wed Jul 24 14:05:15 2024 -0700 + + Add mremap tests + + Add tests for MREMAP_MAYMOVE and MREMAP_FIXED. On Linux, also test + MREMAP_DONTUNMAP. + + Signed-off-by: H.J. Lu + Reviewed-by: Adhemerval Zanella + (cherry picked from commit ff0320bec2810192d453c579623482fab87bfa01) + +diff --git a/misc/Makefile b/misc/Makefile +index 5d17c562fe..7b7f8351bf 100644 +--- a/misc/Makefile ++++ b/misc/Makefile +@@ -257,6 +257,8 @@ tests := \ + tst-mntent-blank-passno \ + tst-mntent-escape \ + tst-mntent2 \ ++ tst-mremap1 \ ++ tst-mremap2 \ + tst-preadvwritev \ + tst-preadvwritev2 \ + tst-preadvwritev64 \ +diff --git a/misc/tst-mremap1.c b/misc/tst-mremap1.c +new file mode 100644 +index 0000000000..0469991a6c +--- /dev/null ++++ b/misc/tst-mremap1.c +@@ -0,0 +1,46 @@ ++/* Test mremap with MREMAP_MAYMOVE. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++static int ++do_test (void) ++{ ++ size_t old_size = getpagesize (); ++ char *old_addr = xmmap (NULL, old_size, PROT_READ | PROT_WRITE, ++ MAP_PRIVATE | MAP_ANONYMOUS, -1); ++ old_addr[0] = 1; ++ old_addr[old_size - 1] = 2; ++ ++ /* Test MREMAP_MAYMOVE. */ ++ size_t new_size = old_size + old_size; ++ char *new_addr = mremap (old_addr, old_size, new_size, MREMAP_MAYMOVE); ++ TEST_VERIFY_EXIT (new_addr != MAP_FAILED); ++ new_addr[0] = 1; ++ new_addr[new_size - 1] = 2; ++ xmunmap (new_addr, new_size); ++ ++ return 0; ++} ++ ++#include +diff --git a/misc/tst-mremap2.c b/misc/tst-mremap2.c +new file mode 100644 +index 0000000000..45be7f0369 +--- /dev/null ++++ b/misc/tst-mremap2.c +@@ -0,0 +1,54 @@ ++/* Test mremap with MREMAP_FIXED. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++static int ++do_test (void) ++{ ++ size_t old_size = getpagesize (); ++ size_t new_size = old_size + old_size; ++ char *old_addr = xmmap (NULL, old_size, PROT_READ | PROT_WRITE, ++ MAP_PRIVATE | MAP_ANONYMOUS, -1); ++ old_addr[0] = 1; ++ old_addr[old_size - 1] = 2; ++ ++ char *fixed_addr = xmmap (NULL, new_size, PROT_READ | PROT_WRITE, ++ MAP_PRIVATE | MAP_ANONYMOUS, -1); ++ fixed_addr[0] = 1; ++ fixed_addr[new_size - 1] = 2; ++ ++ /* Test MREMAP_FIXED. */ ++ char *new_addr = mremap (old_addr, old_size, new_size, ++ MREMAP_FIXED | MREMAP_MAYMOVE, ++ fixed_addr); ++ if (new_addr == MAP_FAILED) ++ return mremap_failure_exit (errno); ++ new_addr[0] = 1; ++ new_addr[new_size - 1] = 2; ++ xmunmap (new_addr, new_size); ++ ++ return 0; ++} ++ ++#include +diff --git a/sysdeps/generic/mremap-failure.h b/sysdeps/generic/mremap-failure.h +new file mode 100644 +index 0000000000..bc0d476368 +--- /dev/null ++++ b/sysdeps/generic/mremap-failure.h +@@ -0,0 +1,25 @@ ++/* mremap failure handling. Generic version. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++/* Return exit value on mremap failure with errno ERR. */ ++ ++static int ++mremap_failure_exit (int err) ++{ ++ return EXIT_FAILURE; ++} +diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile +index 097b5a26fc..59998c7af4 100644 +--- a/sysdeps/unix/sysv/linux/Makefile ++++ b/sysdeps/unix/sysv/linux/Makefile +@@ -206,6 +206,7 @@ tests += \ + tst-getauxval \ + tst-gettid \ + tst-gettid-kill \ ++ tst-linux-mremap1 \ + tst-memfd_create \ + tst-misalign-clone \ + tst-mlock2 \ +diff --git a/sysdeps/unix/sysv/linux/mremap-failure.h b/sysdeps/unix/sysv/linux/mremap-failure.h +new file mode 100644 +index 0000000000..c99ab30ca9 +--- /dev/null ++++ b/sysdeps/unix/sysv/linux/mremap-failure.h +@@ -0,0 +1,30 @@ ++/* mremap failure handling. Linux version. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++ ++/* Return exit value on mremap failure with errno ERR. */ ++ ++static int ++mremap_failure_exit (int err) ++{ ++ if (err != EINVAL) ++ return EXIT_FAILURE; ++ ++ return EXIT_UNSUPPORTED; ++} +diff --git a/sysdeps/unix/sysv/linux/tst-linux-mremap1.c b/sysdeps/unix/sysv/linux/tst-linux-mremap1.c +new file mode 100644 +index 0000000000..408e8af2ab +--- /dev/null ++++ b/sysdeps/unix/sysv/linux/tst-linux-mremap1.c +@@ -0,0 +1,63 @@ ++/* Test mremap with MREMAP_DONTUNMAP. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++static int ++do_test (void) ++{ ++ size_t old_size = getpagesize (); ++ size_t new_size = old_size; ++ char *old_addr = xmmap (NULL, old_size, PROT_READ | PROT_WRITE, ++ MAP_PRIVATE | MAP_ANONYMOUS, -1); ++ old_addr[0] = 1; ++ old_addr[old_size - 1] = 2; ++ ++ /* Create an available 64-page mmap region. */ ++ size_t fixed_size = old_size * 64; ++ char *fixed_addr = xmmap (NULL, fixed_size, PROT_READ | PROT_WRITE, ++ MAP_PRIVATE | MAP_ANONYMOUS, -1); ++ xmunmap (fixed_addr, fixed_size); ++ ++ /* Add 3 * pagesize. */ ++ fixed_size += 3 * old_size; ++ ++ /* Test MREMAP_DONTUNMAP. It should return FIXED_ADDR created above. */ ++ char *new_addr = mremap (old_addr, old_size, new_size, ++ MREMAP_DONTUNMAP | MREMAP_MAYMOVE, ++ fixed_addr); ++ if (new_addr == MAP_FAILED) ++ return mremap_failure_exit (errno); ++ TEST_VERIFY_EXIT (fixed_addr == new_addr); ++ old_addr[0] = 3; ++ old_addr[old_size - 1] = 4; ++ new_addr[0] = 1; ++ new_addr[new_size - 1] = 2; ++ xmunmap (new_addr, new_size); ++ xmunmap (old_addr, old_size); ++ ++ return 0; ++} ++ ++#include + +commit 928769737c8f0cbb51dfa2a02de0594c2395d802 +Author: Florian Weimer +Date: Thu Aug 1 10:46:10 2024 +0200 + + resolv: Fix tst-resolv-short-response for older GCC (bug 32042) + + Previous GCC versions do not support the C23 change that + allows labels on declarations. + + Reviewed-by: Adhemerval Zanella + (cherry picked from commit ec119972cb2598c04ec7d4219e20506006836f64) + +diff --git a/resolv/tst-resolv-short-response.c b/resolv/tst-resolv-short-response.c +index be354ae1c7..9b06b0c176 100644 +--- a/resolv/tst-resolv-short-response.c ++++ b/resolv/tst-resolv-short-response.c +@@ -33,8 +33,10 @@ response (const struct resolv_response_context *ctx, + { + case 0: + /* First server times out. */ +- struct resolv_response_flags flags = {.rcode = rcode}; +- resolv_response_init (b, flags); ++ { ++ struct resolv_response_flags flags = {.rcode = rcode}; ++ resolv_response_init (b, flags); ++ } + break; + case 1: + /* Second server sends reply. */ + +commit aa533d58ff12e27771d9c960a727d74992a3f2a3 +Author: Florian Weimer +Date: Fri Aug 2 15:22:14 2024 +0200 + + x86: Tunables may incorrectly set Prefer_PMINUB_for_stringop (bug 32047) + + Fixes commit 5bcf6265f215326d14dfacdce8532792c2c7f8f8 ("x86: + Disable non-temporal memset on Skylake Server"). + + Reviewed-by: Noah Goldstein + (cherry picked from commit 7a630f7d3392ca391a399486ce2846f9e4b4ee63) + +diff --git a/sysdeps/x86/cpu-tunables.c b/sysdeps/x86/cpu-tunables.c +index ae9dcd6180..ccc6b64dc2 100644 +--- a/sysdeps/x86/cpu-tunables.c ++++ b/sysdeps/x86/cpu-tunables.c +@@ -248,6 +248,7 @@ TUNABLE_CALLBACK (set_hwcaps) (tunable_val_t *valp) + CHECK_GLIBC_IFUNC_PREFERRED_BOTH (n, cpu_features, + Avoid_Non_Temporal_Memset, 25); + } ++ break; + case 26: + { + CHECK_GLIBC_IFUNC_PREFERRED_NEED_BOTH + +commit 6a97e2ba144a554809161d488f25e4bae07c9405 +Author: Andreas Schwab +Date: Mon Aug 5 10:55:51 2024 +0200 + + Fix name space violation in fortify wrappers (bug 32052) + + Rename the identifier sz to __sz everywhere. + + Fixes: a643f60c53 ("Make sure that the fortified function conditionals are constant") + (cherry picked from commit 39ca997ab378990d5ac1aadbaa52aaf1db6d526f) + +diff --git a/NEWS b/NEWS +index 8da0408ad9..b9eb4a558b 100644 +--- a/NEWS ++++ b/NEWS +@@ -13,6 +13,7 @@ The following bugs are resolved with this release: + [31968] mremap implementation in C does not handle arguments correctly + [31890] resolv: Allow short error responses to match any DNS query + [31968] mremap implementation in C does not handle arguments correctly ++ [32052] Name space violation in fortify wrappers + + Version 2.40 + +diff --git a/libio/bits/stdio2.h b/libio/bits/stdio2.h +index 91a80dd7c6..4b8bc35bdf 100644 +--- a/libio/bits/stdio2.h ++++ b/libio/bits/stdio2.h +@@ -308,14 +308,14 @@ fgets (__fortify_clang_overload_arg (char *, __restrict, __s), int __n, + "fgets called with bigger size than length of " + "destination buffer") + { +- size_t sz = __glibc_objsize (__s); +- if (__glibc_safe_or_unknown_len (__n, sizeof (char), sz)) ++ size_t __sz = __glibc_objsize (__s); ++ if (__glibc_safe_or_unknown_len (__n, sizeof (char), __sz)) + return __fgets_alias (__s, __n, __stream); + #if !__fortify_use_clang +- if (__glibc_unsafe_len (__n, sizeof (char), sz)) +- return __fgets_chk_warn (__s, sz, __n, __stream); ++ if (__glibc_unsafe_len (__n, sizeof (char), __sz)) ++ return __fgets_chk_warn (__s, __sz, __n, __stream); + #endif +- return __fgets_chk (__s, sz, __n, __stream); ++ return __fgets_chk (__s, __sz, __n, __stream); + } + + __fortify_function __wur __nonnull ((4)) __attribute_overloadable__ size_t +@@ -326,14 +326,14 @@ fread (__fortify_clang_overload_arg (void *, __restrict, __ptr), + "fread called with bigger size * n than length " + "of destination buffer") + { +- size_t sz = __glibc_objsize0 (__ptr); +- if (__glibc_safe_or_unknown_len (__n, __size, sz)) ++ size_t __sz = __glibc_objsize0 (__ptr); ++ if (__glibc_safe_or_unknown_len (__n, __size, __sz)) + return __fread_alias (__ptr, __size, __n, __stream); + #if !__fortify_use_clang +- if (__glibc_unsafe_len (__n, __size, sz)) +- return __fread_chk_warn (__ptr, sz, __size, __n, __stream); ++ if (__glibc_unsafe_len (__n, __size, __sz)) ++ return __fread_chk_warn (__ptr, __sz, __size, __n, __stream); + #endif +- return __fread_chk (__ptr, sz, __size, __n, __stream); ++ return __fread_chk (__ptr, __sz, __size, __n, __stream); + } + + #ifdef __USE_GNU +@@ -345,14 +345,14 @@ fgets_unlocked (__fortify_clang_overload_arg (char *, __restrict, __s), + "fgets called with bigger size than length of " + "destination buffer") + { +- size_t sz = __glibc_objsize (__s); +- if (__glibc_safe_or_unknown_len (__n, sizeof (char), sz)) ++ size_t __sz = __glibc_objsize (__s); ++ if (__glibc_safe_or_unknown_len (__n, sizeof (char), __sz)) + return __fgets_unlocked_alias (__s, __n, __stream); + #if !__fortify_use_clang +- if (__glibc_unsafe_len (__n, sizeof (char), sz)) +- return __fgets_unlocked_chk_warn (__s, sz, __n, __stream); ++ if (__glibc_unsafe_len (__n, sizeof (char), __sz)) ++ return __fgets_unlocked_chk_warn (__s, __sz, __n, __stream); + #endif +- return __fgets_unlocked_chk (__s, sz, __n, __stream); ++ return __fgets_unlocked_chk (__s, __sz, __n, __stream); + } + #endif + +@@ -366,8 +366,8 @@ fread_unlocked (__fortify_clang_overload_arg0 (void *, __restrict, __ptr), + "fread_unlocked called with bigger size * n than " + "length of destination buffer") + { +- size_t sz = __glibc_objsize0 (__ptr); +- if (__glibc_safe_or_unknown_len (__n, __size, sz)) ++ size_t __sz = __glibc_objsize0 (__ptr); ++ if (__glibc_safe_or_unknown_len (__n, __size, __sz)) + { + # ifdef __USE_EXTERN_INLINES + if (__builtin_constant_p (__size) +@@ -393,10 +393,10 @@ fread_unlocked (__fortify_clang_overload_arg0 (void *, __restrict, __ptr), + return __fread_unlocked_alias (__ptr, __size, __n, __stream); + } + # if !__fortify_use_clang +- if (__glibc_unsafe_len (__n, __size, sz)) +- return __fread_unlocked_chk_warn (__ptr, sz, __size, __n, __stream); ++ if (__glibc_unsafe_len (__n, __size, __sz)) ++ return __fread_unlocked_chk_warn (__ptr, __sz, __size, __n, __stream); + # endif +- return __fread_unlocked_chk (__ptr, sz, __size, __n, __stream); ++ return __fread_unlocked_chk (__ptr, __sz, __size, __n, __stream); + + } + #endif +diff --git a/socket/bits/socket2.h b/socket/bits/socket2.h +index 04780f320e..bd91647f37 100644 +--- a/socket/bits/socket2.h ++++ b/socket/bits/socket2.h +@@ -37,14 +37,14 @@ recv (int __fd, __fortify_clang_overload_arg0 (void *, ,__buf), size_t __n, + "recv called with bigger length than " + "size of destination buffer") + { +- size_t sz = __glibc_objsize0 (__buf); +- if (__glibc_safe_or_unknown_len (__n, sizeof (char), sz)) ++ size_t __sz = __glibc_objsize0 (__buf); ++ if (__glibc_safe_or_unknown_len (__n, sizeof (char), __sz)) + return __recv_alias (__fd, __buf, __n, __flags); + #if !__fortify_use_clang +- if (__glibc_unsafe_len (__n, sizeof (char), sz)) +- return __recv_chk_warn (__fd, __buf, __n, sz, __flags); ++ if (__glibc_unsafe_len (__n, sizeof (char), __sz)) ++ return __recv_chk_warn (__fd, __buf, __n, __sz, __flags); + #endif +- return __recv_chk (__fd, __buf, __n, sz, __flags); ++ return __recv_chk (__fd, __buf, __n, __sz, __flags); + } + + extern ssize_t __recvfrom_chk (int __fd, void *__restrict __buf, size_t __n, +@@ -71,13 +71,13 @@ recvfrom (int __fd, __fortify_clang_overload_arg0 (void *, __restrict, __buf), + "recvfrom called with bigger length " + "than size of destination buffer") + { +- size_t sz = __glibc_objsize0 (__buf); +- if (__glibc_safe_or_unknown_len (__n, sizeof (char), sz)) ++ size_t __sz = __glibc_objsize0 (__buf); ++ if (__glibc_safe_or_unknown_len (__n, sizeof (char), __sz)) + return __recvfrom_alias (__fd, __buf, __n, __flags, __addr, __addr_len); + #if !__fortify_use_clang +- if (__glibc_unsafe_len (__n, sizeof (char), sz)) +- return __recvfrom_chk_warn (__fd, __buf, __n, sz, __flags, __addr, ++ if (__glibc_unsafe_len (__n, sizeof (char), __sz)) ++ return __recvfrom_chk_warn (__fd, __buf, __n, __sz, __flags, __addr, + __addr_len); + #endif +- return __recvfrom_chk (__fd, __buf, __n, sz, __flags, __addr, __addr_len); ++ return __recvfrom_chk (__fd, __buf, __n, __sz, __flags, __addr, __addr_len); + } +diff --git a/stdlib/bits/stdlib.h b/stdlib/bits/stdlib.h +index 1557b862b1..9c78ecf458 100644 +--- a/stdlib/bits/stdlib.h ++++ b/stdlib/bits/stdlib.h +@@ -43,16 +43,16 @@ __NTH (realpath (const char *__restrict __name, + "bytes long buffer") + #endif + { +- size_t sz = __glibc_objsize (__resolved); ++ size_t __sz = __glibc_objsize (__resolved); + +- if (sz == (size_t) -1) ++ if (__sz == (size_t) -1) + return __realpath_alias (__name, __resolved); + + #if !__fortify_use_clang && defined _LIBC_LIMITS_H_ && defined PATH_MAX +- if (__glibc_unsafe_len (PATH_MAX, sizeof (char), sz)) +- return __realpath_chk_warn (__name, __resolved, sz); ++ if (__glibc_unsafe_len (PATH_MAX, sizeof (char), __sz)) ++ return __realpath_chk_warn (__name, __resolved, __sz); + #endif +- return __realpath_chk (__name, __resolved, sz); ++ return __realpath_chk (__name, __resolved, __sz); + } + + +diff --git a/wcsmbs/bits/wchar2.h b/wcsmbs/bits/wchar2.h +index 9fdff47ee2..43c6b63027 100644 +--- a/wcsmbs/bits/wchar2.h ++++ b/wcsmbs/bits/wchar2.h +@@ -74,9 +74,9 @@ __fortify_function __attribute_overloadable__ wchar_t * + __NTH (wcscpy (__fortify_clang_overload_arg (wchar_t *, __restrict, __dest), + const wchar_t *__restrict __src)) + { +- size_t sz = __glibc_objsize (__dest); +- if (sz != (size_t) -1) +- return __wcscpy_chk (__dest, __src, sz / sizeof (wchar_t)); ++ size_t __sz = __glibc_objsize (__dest); ++ if (__sz != (size_t) -1) ++ return __wcscpy_chk (__dest, __src, __sz / sizeof (wchar_t)); + return __wcscpy_alias (__dest, __src); + } + +@@ -84,9 +84,9 @@ __fortify_function __attribute_overloadable__ wchar_t * + __NTH (wcpcpy (__fortify_clang_overload_arg (wchar_t *, __restrict, __dest), + const wchar_t *__restrict __src)) + { +- size_t sz = __glibc_objsize (__dest); +- if (sz != (size_t) -1) +- return __wcpcpy_chk (__dest, __src, sz / sizeof (wchar_t)); ++ size_t __sz = __glibc_objsize (__dest); ++ if (__sz != (size_t) -1) ++ return __wcpcpy_chk (__dest, __src, __sz / sizeof (wchar_t)); + return __wcpcpy_alias (__dest, __src); + } + +@@ -118,9 +118,9 @@ __fortify_function __attribute_overloadable__ wchar_t * + __NTH (wcscat (__fortify_clang_overload_arg (wchar_t *, __restrict, __dest), + const wchar_t *__restrict __src)) + { +- size_t sz = __glibc_objsize (__dest); +- if (sz != (size_t) -1) +- return __wcscat_chk (__dest, __src, sz / sizeof (wchar_t)); ++ size_t __sz = __glibc_objsize (__dest); ++ if (__sz != (size_t) -1) ++ return __wcscat_chk (__dest, __src, __sz / sizeof (wchar_t)); + return __wcscat_alias (__dest, __src); + } + +@@ -128,9 +128,9 @@ __fortify_function __attribute_overloadable__ wchar_t * + __NTH (wcsncat (__fortify_clang_overload_arg (wchar_t *, __restrict, __dest), + const wchar_t *__restrict __src, size_t __n)) + { +- size_t sz = __glibc_objsize (__dest); +- if (sz != (size_t) -1) +- return __wcsncat_chk (__dest, __src, __n, sz / sizeof (wchar_t)); ++ size_t __sz = __glibc_objsize (__dest); ++ if (__sz != (size_t) -1) ++ return __wcsncat_chk (__dest, __src, __n, __sz / sizeof (wchar_t)); + return __wcsncat_alias (__dest, __src, __n); + } + +@@ -170,10 +170,10 @@ __fortify_function int + __NTH (swprintf (wchar_t *__restrict __s, size_t __n, + const wchar_t *__restrict __fmt, ...)) + { +- size_t sz = __glibc_objsize (__s); +- if (sz != (size_t) -1 || __USE_FORTIFY_LEVEL > 1) ++ size_t __sz = __glibc_objsize (__s); ++ if (__sz != (size_t) -1 || __USE_FORTIFY_LEVEL > 1) + return __swprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1, +- sz / sizeof (wchar_t), __fmt, __va_arg_pack ()); ++ __sz / sizeof (wchar_t), __fmt, __va_arg_pack ()); + return __swprintf_alias (__s, __n, __fmt, __va_arg_pack ()); + } + #elif __fortify_use_clang +@@ -206,10 +206,10 @@ __fortify_function int + __NTH (vswprintf (wchar_t *__restrict __s, size_t __n, + const wchar_t *__restrict __fmt, __gnuc_va_list __ap)) + { +- size_t sz = __glibc_objsize (__s); +- if (sz != (size_t) -1 || __USE_FORTIFY_LEVEL > 1) ++ size_t __sz = __glibc_objsize (__s); ++ if (__sz != (size_t) -1 || __USE_FORTIFY_LEVEL > 1) + return __vswprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1, +- sz / sizeof (wchar_t), __fmt, __ap); ++ __sz / sizeof (wchar_t), __fmt, __ap); + return __vswprintf_alias (__s, __n, __fmt, __ap); + } + +@@ -257,14 +257,14 @@ fgetws (__fortify_clang_overload_arg (wchar_t *, __restrict, __s), int __n, + "fgetws called with length bigger " + "than size of destination buffer") + { +- size_t sz = __glibc_objsize (__s); +- if (__glibc_safe_or_unknown_len (__n, sizeof (wchar_t), sz)) ++ size_t __sz = __glibc_objsize (__s); ++ if (__glibc_safe_or_unknown_len (__n, sizeof (wchar_t), __sz)) + return __fgetws_alias (__s, __n, __stream); + #if !__fortify_use_clang +- if (__glibc_unsafe_len (__n, sizeof (wchar_t), sz)) +- return __fgetws_chk_warn (__s, sz / sizeof (wchar_t), __n, __stream); ++ if (__glibc_unsafe_len (__n, sizeof (wchar_t), __sz)) ++ return __fgetws_chk_warn (__s, __sz / sizeof (wchar_t), __n, __stream); + #endif +- return __fgetws_chk (__s, sz / sizeof (wchar_t), __n, __stream); ++ return __fgetws_chk (__s, __sz / sizeof (wchar_t), __n, __stream); + } + + #ifdef __USE_GNU +@@ -275,15 +275,15 @@ fgetws_unlocked (__fortify_clang_overload_arg (wchar_t *, __restrict, __s), + "fgetws_unlocked called with length bigger " + "than size of destination buffer") + { +- size_t sz = __glibc_objsize (__s); +- if (__glibc_safe_or_unknown_len (__n, sizeof (wchar_t), sz)) ++ size_t __sz = __glibc_objsize (__s); ++ if (__glibc_safe_or_unknown_len (__n, sizeof (wchar_t), __sz)) + return __fgetws_unlocked_alias (__s, __n, __stream); + # if !__fortify_use_clang +- if (__glibc_unsafe_len (__n, sizeof (wchar_t), sz)) +- return __fgetws_unlocked_chk_warn (__s, sz / sizeof (wchar_t), __n, ++ if (__glibc_unsafe_len (__n, sizeof (wchar_t), __sz)) ++ return __fgetws_unlocked_chk_warn (__s, __sz / sizeof (wchar_t), __n, + __stream); + # endif +- return __fgetws_unlocked_chk (__s, sz / sizeof (wchar_t), __n, __stream); ++ return __fgetws_unlocked_chk (__s, __sz / sizeof (wchar_t), __n, __stream); + } + #endif + + +commit 5641780762723156b0d20a0b9f7df1d76831bab0 +Author: Arjun Shankar +Date: Tue Jul 30 11:37:57 2024 +0200 + + manual/stdio: Further clarify putc, putwc, getc, and getwc + + This is a follow-up to 10de4a47ef3f481592e3c62eb07bcda23e9fde4d that + reworded the manual entries for putc and putwc and removed any + performance claims. + + This commit further clarifies these entries and brings getc and getwc in + line with the descriptions of putc and putwc, removing any performance + claims from them as well. + Reviewed-by: Florian Weimer + + (cherry picked from commit 942670c81dc8071dd75d6213e771daa5d2084cb6) + +diff --git a/manual/stdio.texi b/manual/stdio.texi +index f9529a098d..8517653507 100644 +--- a/manual/stdio.texi ++++ b/manual/stdio.texi +@@ -904,20 +904,16 @@ This function is a GNU extension. + @standards{ISO, stdio.h} + @safety{@prelim{}@mtsafe{}@asunsafe{@asucorrupt{}}@acunsafe{@acucorrupt{} @aculock{}}} + This is just like @code{fputc}, except that it may be implemented as +-a macro, making it faster. One consequence is that it may evaluate the +-@var{stream} argument more than once, which is an exception to the +-general rule for macros. Therefore, @var{stream} should never be an +-expression with side-effects. ++a macro and may evaluate the @var{stream} argument more than once. ++Therefore, @var{stream} should never be an expression with side-effects. + @end deftypefun + + @deftypefun wint_t putwc (wchar_t @var{wc}, FILE *@var{stream}) + @standards{ISO, wchar.h} + @safety{@prelim{}@mtsafe{}@asunsafe{@asucorrupt{}}@acunsafe{@acucorrupt{} @aculock{}}} + This is just like @code{fputwc}, except that it may be implemented as +-a macro, making it faster. One consequence is that it may evaluate the +-@var{stream} argument more than once, which is an exception to the +-general rule for macros. Therefore, @var{stream} should never be an +-expression with side-effects. ++a macro and may evaluate the @var{stream} argument more than once. ++Therefore, @var{stream} should never be an expression with side-effects. + @end deftypefun + + @deftypefun int putc_unlocked (int @var{c}, FILE *@var{stream}) +@@ -1110,20 +1106,17 @@ This function is a GNU extension. + @deftypefun int getc (FILE *@var{stream}) + @standards{ISO, stdio.h} + @safety{@prelim{}@mtsafe{}@asunsafe{@asucorrupt{}}@acunsafe{@aculock{} @acucorrupt{}}} +-This is just like @code{fgetc}, except that it is permissible (and +-typical) for it to be implemented as a macro that evaluates the +-@var{stream} argument more than once. @code{getc} is often highly +-optimized, so it is usually the best function to use to read a single +-character. ++This is just like @code{fgetc}, except that it may be implemented as ++a macro and may evaluate the @var{stream} argument more than once. ++Therefore, @var{stream} should never be an expression with side-effects. + @end deftypefun + + @deftypefun wint_t getwc (FILE *@var{stream}) + @standards{ISO, wchar.h} + @safety{@prelim{}@mtsafe{}@asunsafe{@asucorrupt{}}@acunsafe{@aculock{} @acucorrupt{}}} +-This is just like @code{fgetwc}, except that it is permissible for it to +-be implemented as a macro that evaluates the @var{stream} argument more +-than once. @code{getwc} can be highly optimized, so it is usually the +-best function to use to read a single wide character. ++This is just like @code{fgetwc}, except that it may be implemented as ++a macro and may evaluate the @var{stream} argument more than once. ++Therefore, @var{stream} should never be an expression with side-effects. + @end deftypefun + + @deftypefun int getc_unlocked (FILE *@var{stream}) + +commit 39ee60a719eb6ffde76ccc232d79273c473d7a93 +Author: Florian Weimer +Date: Fri Aug 9 17:01:17 2024 +0200 + + support: Add options list terminator to the test driver + + This avoids crashes if a test is passed unknown options. + + Reviewed-by: Adhemerval Zanella + (cherry picked from commit c2a474f4617ede7a8bf56b7257acb37dc757b2d1) + +diff --git a/support/test-driver.c b/support/test-driver.c +index f4c3e4d666..04ceebc08f 100644 +--- a/support/test-driver.c ++++ b/support/test-driver.c +@@ -155,6 +155,7 @@ main (int argc, char **argv) + { + CMDLINE_OPTIONS + TEST_DEFAULT_OPTIONS ++ { 0, } + }; + test_config.options = &options; + #endif + +commit e3556937c2402b8acf2e586bf53168e9f482ba91 +Author: H.J. Lu +Date: Mon Jul 22 17:47:21 2024 -0700 + + x86-64: Remove sysdeps/x86_64/x32/dl-machine.h + + Remove sysdeps/x86_64/x32/dl-machine.h by folding x32 ARCH_LA_PLTENTER, + ARCH_LA_PLTEXIT and RTLD_START into sysdeps/x86_64/dl-machine.h. There + are no regressions on x86-64 nor x32. There are no changes in x86-64 + _dl_start_user. On x32, _dl_start_user changes are + + <_dl_start_user>: + mov %eax,%r12d + + mov %esp,%r13d + mov (%rsp),%edx + mov %edx,%esi + - mov %esp,%r13d + and $0xfffffff0,%esp + mov 0x0(%rip),%edi # <_dl_start_user+0x14> + lea 0x8(%r13,%rdx,4),%ecx + + Signed-off-by: H.J. Lu + Reviewed-by: Noah Goldstein + (cherry picked from commit 652c6cf26927352fc0e37e4e60c6fc98ddf6d3b4) + +diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h +index a6de3793e4..4f12955875 100644 +--- a/sysdeps/x86_64/dl-machine.h ++++ b/sysdeps/x86_64/dl-machine.h +@@ -139,37 +139,37 @@ elf_machine_runtime_setup (struct link_map *l, struct r_scope_elem *scope[], + .globl _start\n\ + .globl _dl_start_user\n\ + _start:\n\ +- movq %rsp, %rdi\n\ ++ mov %" RSP_LP ", %" RDI_LP "\n\ + call _dl_start\n\ + _dl_start_user:\n\ + # Save the user entry point address in %r12.\n\ +- movq %rax, %r12\n\ ++ mov %" RAX_LP ", %" R12_LP "\n\ + # Save %rsp value in %r13.\n\ +- movq %rsp, %r13\n\ ++ mov %" RSP_LP ", % " R13_LP "\n\ + "\ + RTLD_START_ENABLE_X86_FEATURES \ + "\ + # Read the original argument count.\n\ +- movq (%rsp), %rdx\n\ ++ mov (%rsp), %" RDX_LP "\n\ + # Call _dl_init (struct link_map *main_map, int argc, char **argv, char **env)\n\ + # argc -> rsi\n\ +- movq %rdx, %rsi\n\ ++ mov %" RDX_LP ", %" RSI_LP "\n\ + # And align stack for the _dl_init call. \n\ +- andq $-16, %rsp\n\ ++ and $-16, %" RSP_LP "\n\ + # _dl_loaded -> rdi\n\ +- movq _rtld_local(%rip), %rdi\n\ ++ mov _rtld_local(%rip), %" RDI_LP "\n\ + # env -> rcx\n\ +- leaq 16(%r13,%rdx,8), %rcx\n\ ++ lea 2*" LP_SIZE "(%r13,%rdx," LP_SIZE "), %" RCX_LP "\n\ + # argv -> rdx\n\ +- leaq 8(%r13), %rdx\n\ ++ lea " LP_SIZE "(%r13), %" RDX_LP "\n\ + # Clear %rbp to mark outermost frame obviously even for constructors.\n\ + xorl %ebp, %ebp\n\ + # Call the function to run the initializers.\n\ + call _dl_init\n\ + # Pass our finalizer function to the user in %rdx, as per ELF ABI.\n\ +- leaq _dl_fini(%rip), %rdx\n\ ++ lea _dl_fini(%rip), %" RDX_LP "\n\ + # And make sure %rsp points to argc stored on the stack.\n\ +- movq %r13, %rsp\n\ ++ mov %" R13_LP ", %" RSP_LP "\n\ + # Jump to the user's entry point.\n\ + jmp *%r12\n\ + .previous\n\ +@@ -234,8 +234,13 @@ elf_machine_plt_value (struct link_map *map, const ElfW(Rela) *reloc, + + + /* Names of the architecture-specific auditing callback functions. */ ++#ifdef __LP64__ + #define ARCH_LA_PLTENTER x86_64_gnu_pltenter + #define ARCH_LA_PLTEXIT x86_64_gnu_pltexit ++#else ++#define ARCH_LA_PLTENTER x32_gnu_pltenter ++#define ARCH_LA_PLTEXIT x32_gnu_pltexit ++#endif + + #endif /* !dl_machine_h */ + +diff --git a/sysdeps/x86_64/x32/dl-machine.h b/sysdeps/x86_64/x32/dl-machine.h +deleted file mode 100644 +index c35cee9261..0000000000 +--- a/sysdeps/x86_64/x32/dl-machine.h ++++ /dev/null +@@ -1,76 +0,0 @@ +-/* Machine-dependent ELF dynamic relocation inline functions. x32 version. +- Copyright (C) 2012-2024 Free Software Foundation, Inc. +- This file is part of the GNU C Library. +- +- The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Lesser General Public +- License as published by the Free Software Foundation; either +- version 2.1 of the License, or (at your option) any later version. +- +- The GNU C Library is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Lesser General Public License for more details. +- +- You should have received a copy of the GNU Lesser General Public +- License along with the GNU C Library; if not, see +- . */ +- +-/* Must allow to be included more than once. +- See #ifdef RESOLVE_MAP in sysdeps/x86_64/dl-machine.h. */ +-#include +- +-#ifndef _X32_DL_MACHINE_H +-#define _X32_DL_MACHINE_H +- +-#undef ARCH_LA_PLTENTER +-#undef ARCH_LA_PLTEXIT +-#undef RTLD_START +- +-/* Names of the architecture-specific auditing callback functions. */ +-#define ARCH_LA_PLTENTER x32_gnu_pltenter +-#define ARCH_LA_PLTEXIT x32_gnu_pltexit +- +-/* Initial entry point code for the dynamic linker. +- The C function `_dl_start' is the real entry point; +- its return value is the user program's entry point. */ +-#define RTLD_START asm ("\n\ +-.text\n\ +- .p2align 4\n\ +-.globl _start\n\ +-.globl _dl_start_user\n\ +-_start:\n\ +- movl %esp, %edi\n\ +- call _dl_start\n\ +-_dl_start_user:\n\ +- # Save the user entry point address in %r12.\n\ +- movl %eax, %r12d\n\ +- # Read the original argument count.\n\ +- movl (%rsp), %edx\n\ +- # Call _dl_init (struct link_map *main_map, int argc, char **argv, char **env)\n\ +- # argc -> rsi\n\ +- movl %edx, %esi\n\ +- # Save %rsp value in %r13.\n\ +- movl %esp, %r13d\n\ +- # And align stack for the _dl_init call.\n\ +- and $-16, %esp\n\ +- # _dl_loaded -> rdi\n\ +- movl _rtld_local(%rip), %edi\n\ +- # env -> rcx\n\ +- lea 8(%r13,%rdx,4), %ecx\n\ +- # argv -> rdx\n\ +- lea 4(%r13), %edx\n\ +- # Clear %rbp to mark outermost frame obviously even for constructors.\n\ +- xorl %ebp, %ebp\n\ +- # Call the function to run the initializers.\n\ +- call _dl_init\n\ +- # Pass our finalizer function to the user in %rdx, as per ELF ABI.\n\ +- lea _dl_fini(%rip), %edx\n\ +- # And make sure %rsp points to argc stored on the stack.\n\ +- movl %r13d, %esp\n\ +- # Jump to the user's entry point.\n\ +- jmp *%r12\n\ +-.previous\n\ +-"); +- +-#endif /* !_X32_DL_MACHINE_H */ + +commit 898f25e0b1026be5701d05715600be646e9d0714 +Author: H.J. Lu +Date: Mon Jul 22 17:47:22 2024 -0700 + + x32/cet: Support shadow stack during startup for Linux 6.10 + + Use RXX_LP in RTLD_START_ENABLE_X86_FEATURES. Support shadow stack during + startup for Linux 6.10: + + commit 2883f01ec37dd8668e7222dfdb5980c86fdfe277 + Author: H.J. Lu + Date: Fri Mar 15 07:04:33 2024 -0700 + + x86/shstk: Enable shadow stacks for x32 + + 1. Add shadow stack support to x32 signal. + 2. Use the 64-bit map_shadow_stack syscall for x32. + 3. Set up shadow stack for x32. + + Add the map_shadow_stack system call to and regenerate + arch-syscall.h. Tested on Intel Tiger Lake with CET enabled x32. There + are no regressions with CET enabled x86-64. There are no changes in CET + enabled x86-64 _dl_start_user. + + Signed-off-by: H.J. Lu + Reviewed-by: Noah Goldstein + (cherry picked from commit 8344c1f5514b1b5b1c8c6e48f4b802653bd23b71) + +diff --git a/sysdeps/unix/sysv/linux/x86_64/dl-cet.h b/sysdeps/unix/sysv/linux/x86_64/dl-cet.h +index 1fe3133406..b4f7e6c9cd 100644 +--- a/sysdeps/unix/sysv/linux/x86_64/dl-cet.h ++++ b/sysdeps/unix/sysv/linux/x86_64/dl-cet.h +@@ -92,9 +92,9 @@ dl_cet_ibt_enabled (void) + # Pass GL(dl_x86_feature_1) to _dl_cet_setup_features.\n\ + movl %edx, %edi\n\ + # Align stack for the _dl_cet_setup_features call.\n\ +- andq $-16, %rsp\n\ ++ and $-16, %" RSP_LP "\n\ + call _dl_cet_setup_features\n\ + # Restore %rax and %rsp from %r12 and %r13.\n\ +- movq %r12, %rax\n\ +- movq %r13, %rsp\n\ ++ mov %" R12_LP ", %" RAX_LP "\n\ ++ mov %" R13_LP ", %" RSP_LP "\n\ + " +diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/arch-syscall.h b/sysdeps/unix/sysv/linux/x86_64/x32/arch-syscall.h +index 3040a47d72..df3e22236d 100644 +--- a/sysdeps/unix/sysv/linux/x86_64/x32/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/x86_64/x32/arch-syscall.h +@@ -155,6 +155,7 @@ + #define __NR_lsm_set_self_attr 1073742284 + #define __NR_lstat 1073741830 + #define __NR_madvise 1073741852 ++#define __NR_map_shadow_stack 1073742277 + #define __NR_mbind 1073742061 + #define __NR_membarrier 1073742148 + #define __NR_memfd_create 1073742143 +diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/fixup-asm-unistd.h b/sysdeps/unix/sysv/linux/x86_64/x32/fixup-asm-unistd.h +index 98124169e6..47fa8af4ce 100644 +--- a/sysdeps/unix/sysv/linux/x86_64/x32/fixup-asm-unistd.h ++++ b/sysdeps/unix/sysv/linux/x86_64/x32/fixup-asm-unistd.h +@@ -15,6 +15,10 @@ + License along with the GNU C Library; if not, see + . */ + ++#ifndef __NR_map_shadow_stack ++# define __NR_map_shadow_stack 1073742277 ++#endif ++ + /* X32 uses the same 64-bit syscall interface for set_thread_area. */ + #ifndef __NR_set_thread_area + # define __NR_set_thread_area 1073742029 + +commit c0af0c2ba016030c778bc22c55f5f9498f96b8b9 +Author: Noah Goldstein +Date: Tue Aug 13 23:29:14 2024 +0800 + + x86: Fix bug in strchrnul-evex512 [BZ #32078] + + Issue was we were expecting not matches with CHAR before the start of + the string in the page cross case. + + The check code in the page cross case: + ``` + and $0xffffffffffffffc0,%rax + vmovdqa64 (%rax),%zmm17 + vpcmpneqb %zmm17,%zmm16,%k1 + vptestmb %zmm17,%zmm17,%k0{%k1} + kmovq %k0,%rax + inc %rax + shr %cl,%rax + je L(continue) + ``` + + expects that all characters that neither match null nor CHAR will be + 1s in `rax` prior to the `inc`. Then the `inc` will overflow all of + the 1s where no relevant match was found. + + This is incorrect in the page-cross case, as the + `vmovdqa64 (%rax),%zmm17` loads from before the start of the input + string. + + If there are matches with CHAR before the start of the string, `rax` + won't properly overflow. + + The fix is quite simple. Just replace: + + ``` + inc %rax + shr %cl,%rax + ``` + With: + ``` + sar %cl,%rax + inc %rax + ``` + + The arithmetic shift will clear any matches prior to the start of the + string while maintaining the signbit so the 1s can properly overflow + to zero in the case of no matches. + Reviewed-by: H.J. Lu + + (cherry picked from commit 7da08862471dfec6fdae731c2a5f351ad485c71f) + +diff --git a/string/test-strchr.c b/string/test-strchr.c +index c795eac6fa..72b17af687 100644 +--- a/string/test-strchr.c ++++ b/string/test-strchr.c +@@ -255,6 +255,69 @@ check1 (void) + check_result (impl, s, c, exp_result); + } + ++static void ++check2 (void) ++{ ++ CHAR *s = (CHAR *) (buf1 + getpagesize () - 4 * sizeof (CHAR)); ++ CHAR *s_begin = (CHAR *) (buf1 + getpagesize () - 64); ++#ifndef USE_FOR_STRCHRNUL ++ CHAR *exp_result = NULL; ++#else ++ CHAR *exp_result = s + 1; ++#endif ++ CHAR val = 0x12; ++ for (; s_begin != s; ++s_begin) ++ *s_begin = val; ++ ++ s[0] = val + 1; ++ s[1] = 0; ++ s[2] = val + 1; ++ s[3] = val + 1; ++ ++ { ++ FOR_EACH_IMPL (impl, 0) ++ check_result (impl, s, val, exp_result); ++ } ++ s[3] = val; ++ { ++ FOR_EACH_IMPL (impl, 0) ++ check_result (impl, s, val, exp_result); ++ } ++ exp_result = s; ++ s[0] = val; ++ { ++ FOR_EACH_IMPL (impl, 0) ++ check_result (impl, s, val, exp_result); ++ } ++ ++ s[3] = val + 1; ++ { ++ FOR_EACH_IMPL (impl, 0) ++ check_result (impl, s, val, exp_result); ++ } ++ ++ s[0] = val + 1; ++ s[1] = val + 1; ++ s[2] = val + 1; ++ s[3] = val + 1; ++ s[4] = val; ++ exp_result = s + 4; ++ { ++ FOR_EACH_IMPL (impl, 0) ++ check_result (impl, s, val, exp_result); ++ } ++ s[4] = 0; ++#ifndef USE_FOR_STRCHRNUL ++ exp_result = NULL; ++#else ++ exp_result = s + 4; ++#endif ++ { ++ FOR_EACH_IMPL (impl, 0) ++ check_result (impl, s, val, exp_result); ++ } ++} ++ + int + test_main (void) + { +@@ -263,7 +326,7 @@ test_main (void) + test_init (); + + check1 (); +- ++ check2 (); + printf ("%20s", ""); + FOR_EACH_IMPL (impl, 0) + printf ("\t%s", impl->name); +diff --git a/sysdeps/x86_64/multiarch/strchr-evex-base.S b/sysdeps/x86_64/multiarch/strchr-evex-base.S +index 04e2c0e79e..3a0b7c9d64 100644 +--- a/sysdeps/x86_64/multiarch/strchr-evex-base.S ++++ b/sysdeps/x86_64/multiarch/strchr-evex-base.S +@@ -124,13 +124,13 @@ L(page_cross): + VPCMPNE %VMM(1), %VMM(0), %k1 + VPTEST %VMM(1), %VMM(1), %k0{%k1} + KMOV %k0, %VRAX +-# ifdef USE_AS_WCSCHR ++ sar %cl, %VRAX ++#ifdef USE_AS_WCSCHR + sub $VEC_MATCH_MASK, %VRAX +-# else ++#else + inc %VRAX +-# endif ++#endif + /* Ignore number of character for alignment adjustment. */ +- shr %cl, %VRAX + jz L(align_more) + + bsf %VRAX, %VRAX + +commit 586e4cd8c67df95ebb0bfecea3d007bff618d6d9 +Author: Florian Weimer +Date: Fri Aug 9 16:17:14 2024 +0200 + + Define __libc_initial for the static libc + + Reviewed-by: Adhemerval Zanella + (cherry picked from commit eb0e50e9a1cf80a2ba6f33f990a08ef37a3267fb) + +diff --git a/include/libc-internal.h b/include/libc-internal.h +index 87ac591835..1ef43ffe67 100644 +--- a/include/libc-internal.h ++++ b/include/libc-internal.h +@@ -53,6 +53,9 @@ extern __typeof (__profile_frequency) __profile_frequency attribute_hidden; + is not for an audit module, not loaded via dlmopen, and not loaded + via static dlopen either). */ + extern _Bool __libc_initial attribute_hidden; ++#else ++/* The static libc is always the initial namespace. */ ++# define __libc_initial ((_Bool) 1) + #endif + + #endif /* _LIBC_INTERNAL */ + +commit 709319f9de6f976f9feceb623cb2c96769e9d78b +Author: Florian Weimer +Date: Mon Aug 19 15:48:03 2024 +0200 + + string: strerror, strsignal cannot use buffer after dlmopen (bug 32026) + + Secondary namespaces have a different malloc. Allocating the + buffer in one namespace and freeing it another results in + heap corruption. Fix this by using a static string (potentially + translated) in secondary namespaces. It would also be possible + to use the malloc from the initial namespace to manage the + buffer, but these functions would still not be safe to use in + auditors etc. because a call to strerror could still free a + buffer while it is used by the application. Another approach + could use proper initial-exec TLS, duplicated in secondary + namespaces, but that would need a callback interface for freeing + libc resources in namespaces on thread exit, which does not exist + today. + + Reviewed-by: Adhemerval Zanella + (cherry picked from commit 25a5eb4010df94b412c67db9e346029de316d06b) + +diff --git a/NEWS b/NEWS +index b9eb4a558b..10a125bc66 100644 +--- a/NEWS ++++ b/NEWS +@@ -13,6 +13,7 @@ The following bugs are resolved with this release: + [31968] mremap implementation in C does not handle arguments correctly + [31890] resolv: Allow short error responses to match any DNS query + [31968] mremap implementation in C does not handle arguments correctly ++ [32026] strerror/strsignal TLS not handled correctly for secondary namespaces + [32052] Name space violation in fortify wrappers + + Version 2.40 +diff --git a/string/strerror_l.c b/string/strerror_l.c +index 15cce261e6..70456e5bb4 100644 +--- a/string/strerror_l.c ++++ b/string/strerror_l.c +@@ -20,7 +20,7 @@ + #include + #include + #include +- ++#include + + static const char * + translate (const char *str, locale_t loc) +@@ -31,6 +31,12 @@ translate (const char *str, locale_t loc) + return res; + } + ++static char * ++unknown_error (locale_t loc) ++{ ++ return (char *) translate ("Unknown error", loc); ++} ++ + + /* Return a string describing the errno code in ERRNUM. */ + char * +@@ -40,18 +46,25 @@ __strerror_l (int errnum, locale_t loc) + char *err = (char *) __get_errlist (errnum); + if (__glibc_unlikely (err == NULL)) + { +- struct tls_internal_t *tls_internal = __glibc_tls_internal (); +- free (tls_internal->strerror_l_buf); +- if (__asprintf (&tls_internal->strerror_l_buf, "%s%d", +- translate ("Unknown error ", loc), errnum) > 0) +- err = tls_internal->strerror_l_buf; +- else ++ if (__libc_initial) + { +- /* The memory was freed above. */ +- tls_internal->strerror_l_buf = NULL; +- /* Provide a fallback translation. */ +- err = (char *) translate ("Unknown error", loc); ++ struct tls_internal_t *tls_internal = __glibc_tls_internal (); ++ free (tls_internal->strerror_l_buf); ++ if (__asprintf (&tls_internal->strerror_l_buf, "%s%d", ++ translate ("Unknown error ", loc), errnum) > 0) ++ err = tls_internal->strerror_l_buf; ++ else ++ { ++ /* The memory was freed above. */ ++ tls_internal->strerror_l_buf = NULL; ++ /* Provide a fallback translation. */ ++ err = unknown_error (loc); ++ } + } ++ else ++ /* Secondary namespaces use a different malloc, so cannot ++ participate in the buffer management. */ ++ err = unknown_error (loc); + } + else + err = (char *) translate (err, loc); +diff --git a/string/strsignal.c b/string/strsignal.c +index 3114601564..d9b0365468 100644 +--- a/string/strsignal.c ++++ b/string/strsignal.c +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + /* Return a string describing the meaning of the signal number SIGNUM. */ + char * +@@ -30,21 +31,28 @@ strsignal (int signum) + if (desc != NULL) + return _(desc); + +- struct tls_internal_t *tls_internal = __glibc_tls_internal (); +- free (tls_internal->strsignal_buf); ++ if (__libc_initial) ++ { ++ struct tls_internal_t *tls_internal = __glibc_tls_internal (); ++ free (tls_internal->strsignal_buf); + +- int r; ++ int r; + #ifdef SIGRTMIN +- if (signum >= SIGRTMIN && signum <= SIGRTMAX) +- r = __asprintf (&tls_internal->strsignal_buf, _("Real-time signal %d"), +- signum - SIGRTMIN); +- else ++ if (signum >= SIGRTMIN && signum <= SIGRTMAX) ++ r = __asprintf (&tls_internal->strsignal_buf, _("Real-time signal %d"), ++ signum - SIGRTMIN); ++ else + #endif +- r = __asprintf (&tls_internal->strsignal_buf, _("Unknown signal %d"), +- signum); +- +- if (r == -1) +- tls_internal->strsignal_buf = NULL; +- +- return tls_internal->strsignal_buf; ++ r = __asprintf (&tls_internal->strsignal_buf, _("Unknown signal %d"), ++ signum); ++ ++ if (r >= 0) ++ return tls_internal->strsignal_buf; ++ else ++ tls_internal->strsignal_buf = NULL; ++ } ++ /* Fall through on asprintf error, and for !__libc_initial: ++ secondary namespaces use a different malloc and cannot ++ participate in the buffer management. */ ++ return _("Unknown signal"); + } + +commit bc240ba7c86a74bc64d4234feadb49bb8e36e1c9 +Author: Maciej W. Rozycki +Date: Fri Jul 26 13:21:34 2024 +0100 + + support: Add FAIL test failure helper + + Add a FAIL test failure helper analogous to FAIL_RET, that does not + cause the current function to return, providing a standardized way to + report a test failure with a message supplied while permitting the + caller to continue executing, for further reporting, cleaning up, etc. + + Update existing test cases that provide a conflicting definition of FAIL + by removing the local FAIL definition and then as follows: + + - tst-fortify-syslog: provide a meaningful message in addition to the + file name already added by ; 'support_record_failure' + is already called by 'support_print_failure_impl' invoked by the new + FAIL test failure helper. + + - tst-ctype: no update to FAIL calls required, with the name of the file + and the line number within of the failure site additionally included + by the new FAIL test failure helper, and error counting plus count + reporting upon test program termination also already provided by + 'support_record_failure' and 'support_report_failure' respectively, + called by 'support_print_failure_impl' and 'adjust_exit_status' also + respectively. However in a number of places 'printf' is called and + the error count adjusted by hand, so update these places to make use + of FAIL instead. And last but not least adjust the final summary just + to report completion, with any error count following as reported by + the test driver. + + - test-tgmath2: no update to FAIL calls required, with the name of the + file of the failure site additionally included by the new FAIL test + failure helper. Also there is no need to track the return status by + hand as any call to FAIL will eventually cause the test case to return + an unsuccesful exit status regardless of the return status from the + test function, via a call to 'adjust_exit_status' made by the test + driver. + + Reviewed-by: DJ Delorie + (cherry picked from commit 1b97a9f23bf605ca608162089c94187573fb2a9e) + +diff --git a/debug/tst-fortify-syslog.c b/debug/tst-fortify-syslog.c +index a7ddbf7c6b..2712acf689 100644 +--- a/debug/tst-fortify-syslog.c ++++ b/debug/tst-fortify-syslog.c +@@ -22,7 +22,6 @@ + #include + #include + #include +-#include + + #include + #include +@@ -46,18 +45,13 @@ handler (int sig) + _exit (127); + } + +-#define FAIL() \ +- do { \ +- printf ("Failure on line %d\n", __LINE__); \ +- support_record_failure (); \ +- } while (0) + #define CHK_FAIL_START \ + chk_fail_ok = 1; \ + if (! setjmp (chk_fail_buf)) \ + { + #define CHK_FAIL_END \ + chk_fail_ok = 0; \ +- FAIL (); \ ++ FAIL ("not supposed to reach here"); \ + } + + static void +diff --git a/localedata/tst-ctype.c b/localedata/tst-ctype.c +index 9de979a2d7..a23689719c 100644 +--- a/localedata/tst-ctype.c ++++ b/localedata/tst-ctype.c +@@ -21,6 +21,8 @@ + #include + #include + ++#include ++ + + static const char lower[] = "abcdefghijklmnopqrstuvwxyz"; + static const char upper[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; +@@ -53,19 +55,11 @@ static struct classes + #define nclasses (sizeof (classes) / sizeof (classes[0])) + + +-#define FAIL(str, args...) \ +- { \ +- printf (" " str "\n", ##args); \ +- ++errors; \ +- } +- +- + static int + do_test (void) + { + const char *cp; + const char *cp2; +- int errors = 0; + char *inpline = NULL; + size_t inplinelen = 0; + char *resline = NULL; +@@ -394,11 +388,8 @@ punct = %04x alnum = %04x\n", + { + if (((__ctype_b[(unsigned int) *inp] & classes[n].mask) != 0) + != (*resp != '0')) +- { +- printf (" is%s('%c' = '\\x%02x') %s true\n", inpline, +- *inp, *inp, *resp == '1' ? "not" : "is"); +- ++errors; +- } ++ FAIL (" is%s('%c' = '\\x%02x') %s true\n", inpline, ++ *inp, *inp, *resp == '1' ? "not" : "is"); + ++inp; + ++resp; + } +@@ -408,11 +399,8 @@ punct = %04x alnum = %04x\n", + while (*inp != '\0') + { + if (tolower (*inp) != *resp) +- { +- printf (" tolower('%c' = '\\x%02x') != '%c'\n", +- *inp, *inp, *resp); +- ++errors; +- } ++ FAIL (" tolower('%c' = '\\x%02x') != '%c'\n", ++ *inp, *inp, *resp); + ++inp; + ++resp; + } +@@ -422,11 +410,8 @@ punct = %04x alnum = %04x\n", + while (*inp != '\0') + { + if (toupper (*inp) != *resp) +- { +- printf (" toupper('%c' = '\\x%02x') != '%c'\n", +- *inp, *inp, *resp); +- ++errors; +- } ++ FAIL (" toupper('%c' = '\\x%02x') != '%c'\n", ++ *inp, *inp, *resp); + ++inp; + ++resp; + } +@@ -436,14 +421,7 @@ punct = %04x alnum = %04x\n", + } + + +- if (errors != 0) +- { +- printf (" %d error%s for `%s' locale\n\n\n", errors, +- errors == 1 ? "" : "s", setlocale (LC_ALL, NULL)); +- return 1; +- } +- +- printf (" No errors for `%s' locale\n\n\n", setlocale (LC_ALL, NULL)); ++ printf ("Completed testing for `%s' locale\n\n\n", setlocale (LC_ALL, NULL)); + return 0; + } + +diff --git a/math/test-tgmath2.c b/math/test-tgmath2.c +index 37afa8a08a..4aeb877b8e 100644 +--- a/math/test-tgmath2.c ++++ b/math/test-tgmath2.c +@@ -24,6 +24,8 @@ + #include + #include + ++#include ++ + //#define DEBUG + + typedef complex float cfloat; +@@ -87,13 +89,6 @@ enum + int count; + int counts[Tlast][C_last]; + +-#define FAIL(str) \ +- do \ +- { \ +- printf ("%s failure on line %d\n", (str), __LINE__); \ +- result = 1; \ +- } \ +- while (0) + #define TEST_TYPE_ONLY(expr, rettype) \ + do \ + { \ +@@ -133,8 +128,6 @@ int counts[Tlast][C_last]; + int + test_cos (const int Vint4, const long long int Vllong4) + { +- int result = 0; +- + TEST (cos (vfloat1), float, cos); + TEST (cos (vdouble1), double, cos); + TEST (cos (vldouble1), ldouble, cos); +@@ -152,7 +145,7 @@ test_cos (const int Vint4, const long long int Vllong4) + TEST (cos (Vcdouble1), cdouble, cos); + TEST (cos (Vcldouble1), cldouble, cos); + +- return result; ++ return 0; + } + + int +diff --git a/support/check.h b/support/check.h +index 711f34b83b..7ea22c7a2c 100644 +--- a/support/check.h ++++ b/support/check.h +@@ -24,6 +24,11 @@ + + __BEGIN_DECLS + ++/* Record a test failure, print the failure message to standard output ++ and pass the result of 1 through. */ ++#define FAIL(...) \ ++ support_print_failure_impl (__FILE__, __LINE__, __VA_ARGS__) ++ + /* Record a test failure, print the failure message to standard output + and return 1. */ + #define FAIL_RET(...) \ + +commit 27fb563bfee521239316142fa4968282bffa86a6 +Author: Maciej W. Rozycki +Date: Fri Jul 26 13:21:34 2024 +0100 + + stdio-common: Add test for vfscanf with matches longer than INT_MAX [BZ #27650] + + Complement commit b03e4d7bd25b ("stdio: fix vfscanf with matches longer + than INT_MAX (bug 27650)") and add a test case for the issue, inspired + by the reproducer provided with the bug report. + + This has been verified to succeed as from the commit referred and fail + beforehand. + + As the test requires 2GiB of data to be passed around its performance + has been evaluated using a choice of systems and the execution time + determined to be respectively in the range of 9s for POWER9@2.166GHz, + 24s for FU740@1.2GHz, and 40s for 74Kf@950MHz. As this is on the verge + of and beyond the default timeout it has been increased by the factor of + 8. Regardless, following recent practice the test has been added to the + standard rather than extended set. + + Reviewed-by: DJ Delorie + (cherry picked from commit 89cddc8a7096f3d9225868304d2bc0a1aaf07d63) + +diff --git a/stdio-common/Makefile b/stdio-common/Makefile +index a63c05a120..e4f0146d2c 100644 +--- a/stdio-common/Makefile ++++ b/stdio-common/Makefile +@@ -240,6 +240,7 @@ tests := \ + tst-scanf-binary-c23 \ + tst-scanf-binary-gnu11 \ + tst-scanf-binary-gnu89 \ ++ tst-scanf-bz27650 \ + tst-scanf-intn \ + tst-scanf-round \ + tst-scanf-to_inpunct \ +@@ -328,6 +329,7 @@ generated += \ + tst-printf-fp-free.mtrace \ + tst-printf-fp-leak-mem.out \ + tst-printf-fp-leak.mtrace \ ++ tst-scanf-bz27650.mtrace \ + tst-vfprintf-width-prec-mem.out \ + tst-vfprintf-width-prec.mtrace \ + # generated +@@ -419,6 +421,9 @@ tst-printf-fp-free-ENV = \ + tst-printf-fp-leak-ENV = \ + MALLOC_TRACE=$(objpfx)tst-printf-fp-leak.mtrace \ + LD_PRELOAD=$(common-objpfx)/malloc/libc_malloc_debug.so ++tst-scanf-bz27650-ENV = \ ++ MALLOC_TRACE=$(objpfx)tst-scanf-bz27650.mtrace \ ++ LD_PRELOAD=$(common-objpfx)malloc/libc_malloc_debug.so + + $(objpfx)tst-unbputc.out: tst-unbputc.sh $(objpfx)tst-unbputc + $(SHELL) $< $(common-objpfx) '$(test-program-prefix)'; \ +diff --git a/stdio-common/tst-scanf-bz27650.c b/stdio-common/tst-scanf-bz27650.c +new file mode 100644 +index 0000000000..3a742bc865 +--- /dev/null ++++ b/stdio-common/tst-scanf-bz27650.c +@@ -0,0 +1,108 @@ ++/* Test for BZ #27650, formatted input matching beyond INT_MAX. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++ ++#include ++#include ++ ++/* Produce a stream of more than INT_MAX characters via buffer BUF of ++ size SIZE according to bookkeeping in COOKIE and then return EOF. */ ++ ++static ssize_t ++io_read (void *cookie, char *buf, size_t size) ++{ ++ unsigned int *written = cookie; ++ unsigned int w = *written; ++ ++ if (w > INT_MAX) ++ return 0; ++ ++ memset (buf, 'a', size); ++ *written = w + size; ++ return size; ++} ++ ++/* Consume a stream of more than INT_MAX characters from an artificial ++ input stream of which none is the new line character. The call to ++ fscanf is supposed to complete upon the EOF condition of input, ++ however in the presence of BZ #27650 it will terminate prematurely ++ with characters still outstanding in input. Diagnose the condition ++ and return status accordingly. */ ++ ++int ++do_test (void) ++{ ++ static cookie_io_functions_t io_funcs = { .read = io_read }; ++ unsigned int written = 0; ++ FILE *in; ++ int v; ++ ++ mtrace (); ++ ++ in = fopencookie (&written, "r", io_funcs); ++ if (in == NULL) ++ { ++ FAIL ("fopencookie: %m"); ++ goto out; ++ } ++ ++ v = fscanf (in, "%*[^\n]"); ++ if (ferror (in)) ++ { ++ FAIL ("fscanf: input failure, at %u: %m", written); ++ goto out_close; ++ } ++ else if (v == EOF) ++ { ++ FAIL ("fscanf: unexpected end of file, at %u", written); ++ goto out_close; ++ } ++ ++ if (!feof (in)) ++ { ++ v = fgetc (in); ++ if (ferror (in)) ++ FAIL ("fgetc: input failure: %m"); ++ else if (v == EOF) ++ FAIL ("fgetc: unexpected end of file after missing end of file"); ++ else if (v == '\n') ++ FAIL ("unexpected new line character received"); ++ else ++ FAIL ("character received after end of file expected: \\x%02x", v); ++ } ++ ++out_close: ++ if (fclose (in) != 0) ++ FAIL ("fclose: %m"); ++ ++out: ++ return EXIT_SUCCESS; ++} ++ ++#define TIMEOUT (DEFAULT_TIMEOUT * 8) ++#include + +commit 2f749d2b15cbc82268d7f8735f21ae1e3b68754f +Author: Siddhesh Poyarekar +Date: Wed Aug 14 19:20:04 2024 -0400 + + Make tst-ungetc use libsupport + + Signed-off-by: Siddhesh Poyarekar + Reviewed-by: Carlos O'Donell + (cherry picked from commit 3f7df7e757f4efec38e45d4068e5492efcac4856) + +diff --git a/stdio-common/tst-ungetc.c b/stdio-common/tst-ungetc.c +index 1344b2b591..5c808f0734 100644 +--- a/stdio-common/tst-ungetc.c ++++ b/stdio-common/tst-ungetc.c +@@ -1,70 +1,72 @@ +-/* Test for ungetc bugs. */ ++/* Test for ungetc bugs. ++ Copyright (C) 1996-2024 Free Software Foundation, Inc. ++ Copyright The GNU Toolchain Authors. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ + + #include + #include +-#include +- +-#undef assert +-#define assert(x) \ +- if (!(x)) \ +- { \ +- fputs ("test failed: " #x "\n", stderr); \ +- retval = 1; \ +- goto the_end; \ +- } ++#include ++#include ++#include ++#include ++#include + +-int +-main (int argc, char *argv[]) ++static int ++do_test (void) + { +- char name[] = "/tmp/tst-ungetc.XXXXXX"; ++ char *name = NULL; + FILE *fp = NULL; +- int retval = 0; + int c; + char buffer[64]; + +- int fd = mkstemp (name); ++ int fd = create_temp_file ("tst-ungetc.", &name); + if (fd == -1) +- { +- printf ("mkstemp failed: %m\n"); +- return 1; +- } +- close (fd); +- fp = fopen (name, "w"); +- assert (fp != NULL) +- fputs ("bla", fp); +- fclose (fp); +- fp = NULL; ++ FAIL_EXIT1 ("cannot create temporary file: %m"); ++ xclose (fd); + +- fp = fopen (name, "r"); +- assert (fp != NULL); +- assert (ungetc ('z', fp) == 'z'); +- assert (getc (fp) == 'z'); +- assert (getc (fp) == 'b'); +- assert (getc (fp) == 'l'); +- assert (ungetc ('m', fp) == 'm'); +- assert (getc (fp) == 'm'); +- assert ((c = getc (fp)) == 'a'); +- assert (getc (fp) == EOF); +- assert (ungetc (c, fp) == c); +- assert (feof (fp) == 0); +- assert (getc (fp) == c); +- assert (getc (fp) == EOF); +- fclose (fp); +- fp = NULL; ++ fp = xfopen (name, "w"); ++ fputs ("bla", fp); ++ xfclose (fp); + +- fp = fopen (name, "r"); +- assert (fp != NULL); +- assert (getc (fp) == 'b'); +- assert (getc (fp) == 'l'); +- assert (ungetc ('b', fp) == 'b'); +- assert (fread (buffer, 1, 64, fp) == 2); +- assert (buffer[0] == 'b'); +- assert (buffer[1] == 'a'); ++ fp = xfopen (name, "r"); ++ TEST_VERIFY_EXIT (ungetc ('z', fp) == 'z'); ++ TEST_VERIFY_EXIT (getc (fp) == 'z'); ++ TEST_VERIFY_EXIT (getc (fp) == 'b'); ++ TEST_VERIFY_EXIT (getc (fp) == 'l'); ++ TEST_VERIFY_EXIT (ungetc ('m', fp) == 'm'); ++ TEST_VERIFY_EXIT (getc (fp) == 'm'); ++ TEST_VERIFY_EXIT ((c = getc (fp)) == 'a'); ++ TEST_VERIFY_EXIT (getc (fp) == EOF); ++ TEST_VERIFY_EXIT (ungetc (c, fp) == c); ++ TEST_VERIFY_EXIT (feof (fp) == 0); ++ TEST_VERIFY_EXIT (getc (fp) == c); ++ TEST_VERIFY_EXIT (getc (fp) == EOF); ++ xfclose (fp); + +-the_end: +- if (fp != NULL) +- fclose (fp); +- unlink (name); ++ fp = xfopen (name, "r"); ++ TEST_VERIFY_EXIT (getc (fp) == 'b'); ++ TEST_VERIFY_EXIT (getc (fp) == 'l'); ++ TEST_VERIFY_EXIT (ungetc ('b', fp) == 'b'); ++ TEST_VERIFY_EXIT (fread (buffer, 1, 64, fp) == 2); ++ TEST_VERIFY_EXIT (buffer[0] == 'b'); ++ TEST_VERIFY_EXIT (buffer[1] == 'a'); ++ xfclose (fp); + +- return retval; ++ return 0; + } ++ ++#include + +commit dac7a0694b5e853f08be518cd5a133ac5804666d +Author: Siddhesh Poyarekar +Date: Tue Aug 13 21:00:06 2024 -0400 + + ungetc: Fix uninitialized read when putting into unused streams [BZ #27821] + + When ungetc is called on an unused stream, the backup buffer is + allocated without the main get area being present. This results in + every subsequent ungetc (as the stream remains in the backup area) + checking uninitialized memory in the backup buffer when trying to put a + character back into the stream. + + Avoid comparing the input character with buffer contents when in backup + to avoid this uninitialized read. The uninitialized read is harmless in + this context since the location is promptly overwritten with the input + character, thus fulfilling ungetc functionality. + + Also adjust wording in the manual to drop the paragraph that says glibc + cannot do multiple ungetc back to back since with this change, ungetc + can actually do this. + + Signed-off-by: Siddhesh Poyarekar + Reviewed-by: Carlos O'Donell + (cherry picked from commit cdf0f88f97b0aaceb894cc02b21159d148d7065c) + +diff --git a/libio/genops.c b/libio/genops.c +index 99f5e80f20..b012fa33d2 100644 +--- a/libio/genops.c ++++ b/libio/genops.c +@@ -662,7 +662,7 @@ _IO_sputbackc (FILE *fp, int c) + { + int result; + +- if (fp->_IO_read_ptr > fp->_IO_read_base ++ if (fp->_IO_read_ptr > fp->_IO_read_base && !_IO_in_backup (fp) + && (unsigned char)fp->_IO_read_ptr[-1] == (unsigned char)c) + { + fp->_IO_read_ptr--; +diff --git a/manual/stdio.texi b/manual/stdio.texi +index 8517653507..92614775fa 100644 +--- a/manual/stdio.texi ++++ b/manual/stdio.texi +@@ -1467,11 +1467,9 @@ program; usually @code{ungetc} is used only to unread a character that + was just read from the same stream. @Theglibc{} supports this + even on files opened in binary mode, but other systems might not. + +-@Theglibc{} only supports one character of pushback---in other +-words, it does not work to call @code{ungetc} twice without doing input +-in between. Other systems might let you push back multiple characters; +-then reading from the stream retrieves the characters in the reverse +-order that they were pushed. ++@Theglibc{} supports pushing back multiple characters; subsequently ++reading from the stream retrieves the characters in the reverse order ++that they were pushed. + + Pushing back characters doesn't alter the file; only the internal + buffering for the stream is affected. If a file positioning function +diff --git a/stdio-common/tst-ungetc.c b/stdio-common/tst-ungetc.c +index 5c808f0734..388b202493 100644 +--- a/stdio-common/tst-ungetc.c ++++ b/stdio-common/tst-ungetc.c +@@ -48,6 +48,8 @@ do_test (void) + TEST_VERIFY_EXIT (getc (fp) == 'b'); + TEST_VERIFY_EXIT (getc (fp) == 'l'); + TEST_VERIFY_EXIT (ungetc ('m', fp) == 'm'); ++ TEST_VERIFY_EXIT (ungetc ('n', fp) == 'n'); ++ TEST_VERIFY_EXIT (getc (fp) == 'n'); + TEST_VERIFY_EXIT (getc (fp) == 'm'); + TEST_VERIFY_EXIT ((c = getc (fp)) == 'a'); + TEST_VERIFY_EXIT (getc (fp) == EOF); + +commit e24902f409994f226dbc6fde2476009df452a18f +Author: Siddhesh Poyarekar +Date: Tue Aug 13 21:08:49 2024 -0400 + + ungetc: Fix backup buffer leak on program exit [BZ #27821] + + If a file descriptor is left unclosed and is cleaned up by _IO_cleanup + on exit, its backup buffer remains unfreed, registering as a leak in + valgrind. This is not strictly an issue since (1) the program should + ideally be closing the stream once it's not in use and (2) the program + is about to exit anyway, so keeping the backup buffer around a wee bit + longer isn't a real problem. Free it anyway to keep valgrind happy + when the streams in question are the standard ones, i.e. stdout, stdin + or stderr. + + Also, the _IO_have_backup macro checks for _IO_save_base, + which is a roundabout way to check for a backup buffer instead of + directly looking for _IO_backup_base. The roundabout check breaks when + the main get area has not been used and user pushes a char into the + backup buffer with ungetc. Fix this to use the _IO_backup_base + directly. + + Signed-off-by: Siddhesh Poyarekar + Reviewed-by: Carlos O'Donell + (cherry picked from commit 3e1d8d1d1dca24ae90df2ea826a8916896fc7e77) + +diff --git a/libio/genops.c b/libio/genops.c +index b012fa33d2..35d8b30710 100644 +--- a/libio/genops.c ++++ b/libio/genops.c +@@ -816,6 +816,12 @@ _IO_unbuffer_all (void) + legacy = 1; + #endif + ++ /* Free up the backup area if it was ever allocated. */ ++ if (_IO_have_backup (fp)) ++ _IO_free_backup_area (fp); ++ if (fp->_mode > 0 && _IO_have_wbackup (fp)) ++ _IO_free_wbackup_area (fp); ++ + if (! (fp->_flags & _IO_UNBUFFERED) + /* Iff stream is un-orientated, it wasn't used. */ + && (legacy || fp->_mode != 0)) +diff --git a/libio/libioP.h b/libio/libioP.h +index 1af287b19f..616253fcd0 100644 +--- a/libio/libioP.h ++++ b/libio/libioP.h +@@ -577,8 +577,8 @@ extern void _IO_old_init (FILE *fp, int flags) __THROW; + ((__fp)->_wide_data->_IO_write_base \ + = (__fp)->_wide_data->_IO_write_ptr = __p, \ + (__fp)->_wide_data->_IO_write_end = (__ep)) +-#define _IO_have_backup(fp) ((fp)->_IO_save_base != NULL) +-#define _IO_have_wbackup(fp) ((fp)->_wide_data->_IO_save_base != NULL) ++#define _IO_have_backup(fp) ((fp)->_IO_backup_base != NULL) ++#define _IO_have_wbackup(fp) ((fp)->_wide_data->_IO_backup_base != NULL) + #define _IO_in_backup(fp) ((fp)->_flags & _IO_IN_BACKUP) + #define _IO_have_markers(fp) ((fp)->_markers != NULL) + #define _IO_blen(fp) ((fp)->_IO_buf_end - (fp)->_IO_buf_base) +diff --git a/stdio-common/Makefile b/stdio-common/Makefile +index e4f0146d2c..a91754f52d 100644 +--- a/stdio-common/Makefile ++++ b/stdio-common/Makefile +@@ -254,6 +254,7 @@ tests := \ + tst-swscanf \ + tst-tmpnam \ + tst-ungetc \ ++ tst-ungetc-leak \ + tst-unlockedio \ + tst-vfprintf-mbs-prec \ + tst-vfprintf-user-type \ +@@ -316,6 +317,7 @@ tests-special += \ + $(objpfx)tst-printf-bz25691-mem.out \ + $(objpfx)tst-printf-fp-free-mem.out \ + $(objpfx)tst-printf-fp-leak-mem.out \ ++ $(objpfx)tst-ungetc-leak-mem.out \ + $(objpfx)tst-vfprintf-width-prec-mem.out \ + # tests-special + +@@ -330,6 +332,8 @@ generated += \ + tst-printf-fp-leak-mem.out \ + tst-printf-fp-leak.mtrace \ + tst-scanf-bz27650.mtrace \ ++ tst-ungetc-leak-mem.out \ ++ tst-ungetc-leak.mtrace \ + tst-vfprintf-width-prec-mem.out \ + tst-vfprintf-width-prec.mtrace \ + # generated +@@ -424,6 +428,9 @@ tst-printf-fp-leak-ENV = \ + tst-scanf-bz27650-ENV = \ + MALLOC_TRACE=$(objpfx)tst-scanf-bz27650.mtrace \ + LD_PRELOAD=$(common-objpfx)malloc/libc_malloc_debug.so ++tst-ungetc-leak-ENV = \ ++ MALLOC_TRACE=$(objpfx)tst-ungetc-leak.mtrace \ ++ LD_PRELOAD=$(common-objpfx)malloc/libc_malloc_debug.so + + $(objpfx)tst-unbputc.out: tst-unbputc.sh $(objpfx)tst-unbputc + $(SHELL) $< $(common-objpfx) '$(test-program-prefix)'; \ +diff --git a/stdio-common/tst-ungetc-leak.c b/stdio-common/tst-ungetc-leak.c +new file mode 100644 +index 0000000000..6c5152b43f +--- /dev/null ++++ b/stdio-common/tst-ungetc-leak.c +@@ -0,0 +1,32 @@ ++/* Test for memory leak with ungetc when stream is unused. ++ Copyright The GNU Toolchain Authors. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include ++ ++static int ++do_test (void) ++{ ++ mtrace (); ++ TEST_COMPARE (ungetc('y', stdin), 'y'); ++ return 0; ++} ++ ++#include + +commit 3b3350d7baa8de70b71c02e964d5b8343749ebf8 +Author: Maciej W. Rozycki +Date: Fri Jul 26 13:21:34 2024 +0100 + + posix: Use facilities in tst-truncate and tst-truncate64 + + Remove local FAIL macro in favor to FAIL_RET from , + which provides equivalent reporting, with the name of the file of the + failure site additionally included, for the tst-truncate-common core + shared between the tst-truncate and tst-truncate64 tests. + + Reviewed-by: DJ Delorie + (cherry picked from commit fe47595504a55e7bb992f8928533df154b510383) + +diff --git a/posix/tst-truncate-common.c b/posix/tst-truncate-common.c +index b774fa46b8..b8c561ffdb 100644 +--- a/posix/tst-truncate-common.c ++++ b/posix/tst-truncate-common.c +@@ -21,6 +21,8 @@ + #include + #include + ++#include ++ + static void do_prepare (void); + #define PREPARE(argc, argv) do_prepare () + static int do_test (void); +@@ -42,9 +44,6 @@ do_prepare (void) + } + } + +-#define FAIL(str) \ +- do { printf ("error: %s (line %d)\n", str, __LINE__); return 1; } while (0) +- + static int + do_test_with_offset (off_t offset) + { +@@ -54,35 +53,35 @@ do_test_with_offset (off_t offset) + memset (buf, 0xcf, sizeof (buf)); + + if (pwrite (temp_fd, buf, sizeof (buf), offset) != sizeof (buf)) +- FAIL ("write failed"); ++ FAIL_RET ("write failed"); + if (fstat (temp_fd, &st) < 0 || st.st_size != (offset + sizeof (buf))) +- FAIL ("initial size wrong"); ++ FAIL_RET ("initial size wrong"); + + if (ftruncate (temp_fd, offset + 800) < 0) +- FAIL ("size reduction with ftruncate failed"); ++ FAIL_RET ("size reduction with ftruncate failed"); + if (fstat (temp_fd, &st) < 0 || st.st_size != (offset + 800)) +- FAIL ("size after reduction with ftruncate is incorrect"); ++ FAIL_RET ("size after reduction with ftruncate is incorrect"); + + /* The following test covers more than POSIX. POSIX does not require + that ftruncate() can increase the file size. But we are testing + Unix systems. */ + if (ftruncate (temp_fd, offset + 1200) < 0) +- FAIL ("size increate with ftruncate failed"); ++ FAIL_RET ("size increate with ftruncate failed"); + if (fstat (temp_fd, &st) < 0 || st.st_size != (offset + 1200)) +- FAIL ("size after increase is incorrect"); ++ FAIL_RET ("size after increase is incorrect"); + + if (truncate (temp_filename, offset + 800) < 0) +- FAIL ("size reduction with truncate failed"); ++ FAIL_RET ("size reduction with truncate failed"); + if (fstat (temp_fd, &st) < 0 || st.st_size != (offset + 800)) +- FAIL ("size after reduction with truncate incorrect"); ++ FAIL_RET ("size after reduction with truncate incorrect"); + + /* The following test covers more than POSIX. POSIX does not require + that truncate() can increase the file size. But we are testing + Unix systems. */ + if (truncate (temp_filename, (offset + 1200)) < 0) +- FAIL ("size increase with truncate failed"); ++ FAIL_RET ("size increase with truncate failed"); + if (fstat (temp_fd, &st) < 0 || st.st_size != (offset + 1200)) +- FAIL ("size increase with truncate is incorrect"); ++ FAIL_RET ("size increase with truncate is incorrect"); + + return 0; + } + +commit 3414b17e9db16c3bc0de5b49555c4f94f155ffc8 +Author: Maciej W. Rozycki +Date: Fri Jul 26 13:21:34 2024 +0100 + + nptl: Use facilities in tst-setuid3 + + Remove local FAIL macro in favor to FAIL_EXIT1 from , + which provides equivalent reporting, with the name of the file and the + line number within of the failure site additionally included. Remove + FAIL_ERR altogether and include ": %m" explicitly with the format string + supplied to FAIL_EXIT1 as there seems little value to have a separate + macro just for this. + + Reviewed-by: DJ Delorie + (cherry picked from commit 8c98195af6e6f1ce21743fc26c723e0f7e45bcf2) + +diff --git a/sysdeps/pthread/tst-setuid3.c b/sysdeps/pthread/tst-setuid3.c +index 83f42a0ae5..3845ab03d3 100644 +--- a/sysdeps/pthread/tst-setuid3.c ++++ b/sysdeps/pthread/tst-setuid3.c +@@ -15,24 +15,19 @@ + License along with the GNU C Library; if not, see + . */ + +-#include + #include + #include + #include + #include + ++#include ++ + /* The test must run under a non-privileged user ID. */ + static const uid_t test_uid = 1; + + static pthread_barrier_t barrier1; + static pthread_barrier_t barrier2; + +-#define FAIL(fmt, ...) \ +- do { printf ("FAIL: " fmt "\n", __VA_ARGS__); _exit (1); } while (0) +- +-#define FAIL_ERR(fmt, ...) \ +- do { printf ("FAIL: " fmt ": %m\n", __VA_ARGS__); _exit (1); } while (0) +- + /* True if x is not a successful return code from pthread_barrier_wait. */ + static inline bool + is_invalid_barrier_ret (int x) +@@ -45,10 +40,10 @@ thread_func (void *ctx __attribute__ ((unused))) + { + int ret = pthread_barrier_wait (&barrier1); + if (is_invalid_barrier_ret (ret)) +- FAIL ("pthread_barrier_wait (barrier1) (on thread): %d", ret); ++ FAIL_EXIT1 ("pthread_barrier_wait (barrier1) (on thread): %d", ret); + ret = pthread_barrier_wait (&barrier2); + if (is_invalid_barrier_ret (ret)) +- FAIL ("pthread_barrier_wait (barrier2) (on thread): %d", ret); ++ FAIL_EXIT1 ("pthread_barrier_wait (barrier2) (on thread): %d", ret); + return NULL; + } + +@@ -59,13 +54,13 @@ setuid_failure (int phase) + switch (ret) + { + case 0: +- FAIL ("setuid succeeded unexpectedly in phase %d", phase); ++ FAIL_EXIT1 ("setuid succeeded unexpectedly in phase %d", phase); + case -1: + if (errno != EPERM) +- FAIL_ERR ("setuid phase %d", phase); ++ FAIL_EXIT1 ("setuid phase %d: %m", phase); + break; + default: +- FAIL ("invalid setuid return value in phase %d: %d", phase, ret); ++ FAIL_EXIT1 ("invalid setuid return value in phase %d: %d", phase, ret); + } + } + +@@ -74,42 +69,42 @@ do_test (void) + { + if (getuid () == 0) + if (setuid (test_uid) != 0) +- FAIL_ERR ("setuid (%u)", (unsigned) test_uid); ++ FAIL_EXIT1 ("setuid (%u): %m", (unsigned) test_uid); + if (setuid (getuid ())) +- FAIL_ERR ("setuid (%s)", "getuid ()"); ++ FAIL_EXIT1 ("setuid (%s): %m", "getuid ()"); + setuid_failure (1); + + int ret = pthread_barrier_init (&barrier1, NULL, 2); + if (ret != 0) +- FAIL ("pthread_barrier_init (barrier1): %d", ret); ++ FAIL_EXIT1 ("pthread_barrier_init (barrier1): %d", ret); + ret = pthread_barrier_init (&barrier2, NULL, 2); + if (ret != 0) +- FAIL ("pthread_barrier_init (barrier2): %d", ret); ++ FAIL_EXIT1 ("pthread_barrier_init (barrier2): %d", ret); + + pthread_t thread; + ret = pthread_create (&thread, NULL, thread_func, NULL); + if (ret != 0) +- FAIL ("pthread_create: %d", ret); ++ FAIL_EXIT1 ("pthread_create: %d", ret); + + /* Ensure that the thread is running properly. */ + ret = pthread_barrier_wait (&barrier1); + if (is_invalid_barrier_ret (ret)) +- FAIL ("pthread_barrier_wait (barrier1): %d", ret); ++ FAIL_EXIT1 ("pthread_barrier_wait (barrier1): %d", ret); + + setuid_failure (2); + + /* Check success case. */ + if (setuid (getuid ()) != 0) +- FAIL_ERR ("setuid (%s)", "getuid ()"); ++ FAIL_EXIT1 ("setuid (%s): %m", "getuid ()"); + + /* Shutdown. */ + ret = pthread_barrier_wait (&barrier2); + if (is_invalid_barrier_ret (ret)) +- FAIL ("pthread_barrier_wait (barrier2): %d", ret); ++ FAIL_EXIT1 ("pthread_barrier_wait (barrier2): %d", ret); + + ret = pthread_join (thread, NULL); + if (ret != 0) +- FAIL ("pthread_join: %d", ret); ++ FAIL_EXIT1 ("pthread_join: %d", ret); + + return 0; + } + +commit b7edcfa0f41ccfaeb665a661d3a6a594c8d95848 +Author: Florian Weimer +Date: Thu Aug 1 23:31:23 2024 +0200 + + elf: Clarify and invert second argument of _dl_allocate_tls_init + + Also remove an outdated comment: _dl_allocate_tls_init is + called as part of pthread_create. + + Reviewed-by: Carlos O'Donell + (cherry picked from commit fe06fb313bddf7e4530056897d4a706606e49377) + +diff --git a/elf/dl-tls.c b/elf/dl-tls.c +index 3d221273f1..ecb966d282 100644 +--- a/elf/dl-tls.c ++++ b/elf/dl-tls.c +@@ -552,9 +552,14 @@ _dl_resize_dtv (dtv_t *dtv, size_t max_modid) + /* Allocate initial TLS. RESULT should be a non-NULL pointer to storage + for the TLS space. The DTV may be resized, and so this function may + call malloc to allocate that space. The loader's GL(dl_load_tls_lock) +- is taken when manipulating global TLS-related data in the loader. */ ++ is taken when manipulating global TLS-related data in the loader. ++ ++ If MAIN_THREAD, this is the first call during process ++ initialization. In this case, TLS initialization for secondary ++ (audit) namespaces is skipped because that has already been handled ++ by dlopen. */ + void * +-_dl_allocate_tls_init (void *result, bool init_tls) ++_dl_allocate_tls_init (void *result, bool main_thread) + { + if (result == NULL) + /* The memory allocation failed. */ +@@ -633,7 +638,7 @@ _dl_allocate_tls_init (void *result, bool init_tls) + because it would already be set by the audit setup. However, + subsequent thread creation would need to follow the default + behaviour. */ +- if (map->l_ns != LM_ID_BASE && !init_tls) ++ if (map->l_ns != LM_ID_BASE && main_thread) + continue; + memset (__mempcpy (dest, map->l_tls_initimage, + map->l_tls_initimage_size), '\0', +@@ -661,7 +666,7 @@ _dl_allocate_tls (void *mem) + { + return _dl_allocate_tls_init (mem == NULL + ? _dl_allocate_tls_storage () +- : allocate_dtv (mem), true); ++ : allocate_dtv (mem), false); + } + rtld_hidden_def (_dl_allocate_tls) + +diff --git a/elf/rtld.c b/elf/rtld.c +index bfdf632e77..09b9c9993b 100644 +--- a/elf/rtld.c ++++ b/elf/rtld.c +@@ -2338,7 +2338,7 @@ dl_main (const ElfW(Phdr) *phdr, + into the main thread's TLS area, which we allocated above. + Note: thread-local variables must only be accessed after completing + the next step. */ +- _dl_allocate_tls_init (tcbp, false); ++ _dl_allocate_tls_init (tcbp, true); + + /* And finally install it for the main thread. */ + if (! __rtld_tls_init_tp_called) +diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c +index f35a8369bd..2cb562f8ea 100644 +--- a/nptl/allocatestack.c ++++ b/nptl/allocatestack.c +@@ -139,7 +139,7 @@ get_cached_stack (size_t *sizep, void **memp) + memset (dtv, '\0', (dtv[-1].counter + 1) * sizeof (dtv_t)); + + /* Re-initialize the TLS. */ +- _dl_allocate_tls_init (TLS_TPADJ (result), true); ++ _dl_allocate_tls_init (TLS_TPADJ (result), false); + + return result; + } +diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h +index 656e8a3fa0..154efb0e19 100644 +--- a/sysdeps/generic/ldsodefs.h ++++ b/sysdeps/generic/ldsodefs.h +@@ -1200,10 +1200,8 @@ extern void _dl_get_tls_static_info (size_t *sizep, size_t *alignp); + + extern void _dl_allocate_static_tls (struct link_map *map) attribute_hidden; + +-/* These are internal entry points to the two halves of _dl_allocate_tls, +- only used within rtld.c itself at startup time. */ + extern void *_dl_allocate_tls_storage (void) attribute_hidden; +-extern void *_dl_allocate_tls_init (void *, bool); ++extern void *_dl_allocate_tls_init (void *result, bool main_thread); + rtld_hidden_proto (_dl_allocate_tls_init) + + /* True if the TCB has been set up. */ + +commit f496b750f135e57da921e975835c44bd199246dd +Author: Florian Weimer +Date: Thu Aug 1 23:31:30 2024 +0200 + + elf: Avoid re-initializing already allocated TLS in dlopen (bug 31717) + + The old code used l_init_called as an indicator for whether TLS + initialization was complete. However, it is possible that + TLS for an object is initialized, written to, and then dlopen + for this object is called again, and l_init_called is not true at + this point. Previously, this resulted in TLS being initialized + twice, discarding any interim writes (technically introducing a + use-after-free bug even). + + This commit introduces an explicit per-object flag, l_tls_in_slotinfo. + It indicates whether _dl_add_to_slotinfo has been called for this + object. This flag is used to avoid double-initialization of TLS. + In update_tls_slotinfo, the first_static_tls micro-optimization + is removed because preserving the initalization flag for subsequent + use by the second loop for static TLS is a bit complicated, and + another per-object flag does not seem to be worth it. Furthermore, + the l_init_called flag is dropped from the second loop (for static + TLS initialization) because l_need_tls_init on its own prevents + double-initialization. + + The remaining l_init_called usage in resize_scopes and update_scopes + is just an optimization due to the use of scope_has_map, so it is + not changed in this commit. + + The isupper check ensures that libc.so.6 is TLS is not reverted. + Such a revert happens if l_need_tls_init is not cleared in + _dl_allocate_tls_init for the main_thread case, now that + l_init_called is not checked anymore in update_tls_slotinfo + in elf/dl-open.c. + + Reported-by: Jonathon Anderson + Reviewed-by: Carlos O'Donell + (cherry picked from commit 5097cd344fd243fb8deb6dec96e8073753f962f9) + +diff --git a/NEWS b/NEWS +index 10a125bc66..5b20efbf6c 100644 +--- a/NEWS ++++ b/NEWS +@@ -10,7 +10,7 @@ Version 2.40.1 + The following bugs are resolved with this release: + + [30081] resolv: Do not wait for non-existing second DNS response after error +- [31968] mremap implementation in C does not handle arguments correctly ++ [31717] elf: Avoid re-initializing already allocated TLS in dlopen + [31890] resolv: Allow short error responses to match any DNS query + [31968] mremap implementation in C does not handle arguments correctly + [32026] strerror/strsignal TLS not handled correctly for secondary namespaces +diff --git a/elf/Makefile b/elf/Makefile +index a3475f3fb5..a03c6520d8 100644 +--- a/elf/Makefile ++++ b/elf/Makefile +@@ -416,6 +416,10 @@ tests += \ + tst-dlmopen4 \ + tst-dlopen-self \ + tst-dlopen-tlsmodid \ ++ tst-dlopen-tlsreinit1 \ ++ tst-dlopen-tlsreinit2 \ ++ tst-dlopen-tlsreinit3 \ ++ tst-dlopen-tlsreinit4 \ + tst-dlopenfail \ + tst-dlopenfail-2 \ + tst-dlopenrpath \ +@@ -853,6 +857,9 @@ modules-names += \ + tst-dlmopen-twice-mod1 \ + tst-dlmopen-twice-mod2 \ + tst-dlmopen1mod \ ++ tst-dlopen-tlsreinitmod1 \ ++ tst-dlopen-tlsreinitmod2 \ ++ tst-dlopen-tlsreinitmod3 \ + tst-dlopenfaillinkmod \ + tst-dlopenfailmod1 \ + tst-dlopenfailmod2 \ +@@ -3118,3 +3125,26 @@ $(objpfx)tst-recursive-tls.out: \ + 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15) + $(objpfx)tst-recursive-tlsmod%.os: tst-recursive-tlsmodN.c + $(compile-command.c) -DVAR=thread_$* -DFUNC=get_threadvar_$* ++ ++# Order matters here. The test needs the constructor for ++# tst-dlopen-tlsreinitmod2.so to be called first. ++LDFLAGS-tst-dlopen-tlsreinitmod1.so = -Wl,--no-as-needed ++$(objpfx)tst-dlopen-tlsreinitmod1.so: \ ++ $(objpfx)tst-dlopen-tlsreinitmod3.so $(objpfx)tst-dlopen-tlsreinitmod2.so ++LDFLAGS-tst-dlopen-tlsreinit2 = -Wl,--no-as-needed ++$(objpfx)tst-dlopen-tlsreinit2: \ ++ $(objpfx)tst-dlopen-tlsreinitmod3.so $(objpfx)tst-dlopen-tlsreinitmod2.so ++LDFLAGS-tst-dlopen-tlsreinit4 = -Wl,--no-as-needed ++$(objpfx)tst-dlopen-tlsreinit4: \ ++ $(objpfx)tst-dlopen-tlsreinitmod3.so $(objpfx)tst-dlopen-tlsreinitmod2.so ++# tst-dlopen-tlsreinitmod2.so is underlinked and refers to ++# tst-dlopen-tlsreinitmod3.so. The dependency is provided via ++# $(objpfx)tst-dlopen-tlsreinitmod1.so. ++tst-dlopen-tlsreinitmod2.so-no-z-defs = yes ++$(objpfx)tst-dlopen-tlsreinit.out: $(objpfx)tst-dlopen-tlsreinitmod1.so \ ++ $(objpfx)tst-dlopen-tlsreinitmod2.so $(objpfx)tst-dlopen-tlsreinitmod3.so ++# Reuse an audit module which provides ample debug logging. ++$(objpfx)tst-dlopen-tlsreinit3.out: $(objpfx)tst-auditmod1.so ++tst-dlopen-tlsreinit3-ENV = LD_AUDIT=$(objpfx)tst-auditmod1.so ++$(objpfx)tst-dlopen-tlsreinit4.out: $(objpfx)tst-auditmod1.so ++tst-dlopen-tlsreinit4-ENV = LD_AUDIT=$(objpfx)tst-auditmod1.so +diff --git a/elf/dl-open.c b/elf/dl-open.c +index c378da16c0..8556e7bd2f 100644 +--- a/elf/dl-open.c ++++ b/elf/dl-open.c +@@ -363,17 +363,8 @@ resize_tls_slotinfo (struct link_map *new) + { + bool any_tls = false; + for (unsigned int i = 0; i < new->l_searchlist.r_nlist; ++i) +- { +- struct link_map *imap = new->l_searchlist.r_list[i]; +- +- /* Only add TLS memory if this object is loaded now and +- therefore is not yet initialized. */ +- if (! imap->l_init_called && imap->l_tls_blocksize > 0) +- { +- _dl_add_to_slotinfo (imap, false); +- any_tls = true; +- } +- } ++ if (_dl_add_to_slotinfo (new->l_searchlist.r_list[i], false)) ++ any_tls = true; + return any_tls; + } + +@@ -383,22 +374,8 @@ resize_tls_slotinfo (struct link_map *new) + static void + update_tls_slotinfo (struct link_map *new) + { +- unsigned int first_static_tls = new->l_searchlist.r_nlist; + for (unsigned int i = 0; i < new->l_searchlist.r_nlist; ++i) +- { +- struct link_map *imap = new->l_searchlist.r_list[i]; +- +- /* Only add TLS memory if this object is loaded now and +- therefore is not yet initialized. */ +- if (! imap->l_init_called && imap->l_tls_blocksize > 0) +- { +- _dl_add_to_slotinfo (imap, true); +- +- if (imap->l_need_tls_init +- && first_static_tls == new->l_searchlist.r_nlist) +- first_static_tls = i; +- } +- } ++ _dl_add_to_slotinfo (new->l_searchlist.r_list[i], true); + + size_t newgen = GL(dl_tls_generation) + 1; + if (__glibc_unlikely (newgen == 0)) +@@ -410,13 +387,11 @@ TLS generation counter wrapped! Please report this.")); + /* We need a second pass for static tls data, because + _dl_update_slotinfo must not be run while calls to + _dl_add_to_slotinfo are still pending. */ +- for (unsigned int i = first_static_tls; i < new->l_searchlist.r_nlist; ++i) ++ for (unsigned int i = 0; i < new->l_searchlist.r_nlist; ++i) + { + struct link_map *imap = new->l_searchlist.r_list[i]; + +- if (imap->l_need_tls_init +- && ! imap->l_init_called +- && imap->l_tls_blocksize > 0) ++ if (imap->l_need_tls_init && imap->l_tls_blocksize > 0) + { + /* For static TLS we have to allocate the memory here and + now, but we can delay updating the DTV. */ +diff --git a/elf/dl-tls.c b/elf/dl-tls.c +index ecb966d282..3d529b722c 100644 +--- a/elf/dl-tls.c ++++ b/elf/dl-tls.c +@@ -632,17 +632,21 @@ _dl_allocate_tls_init (void *result, bool main_thread) + some platforms use in static programs requires it. */ + dtv[map->l_tls_modid].pointer.val = dest; + +- /* Copy the initialization image and clear the BSS part. For +- audit modules or dependencies with initial-exec TLS, we can not +- set the initial TLS image on default loader initialization +- because it would already be set by the audit setup. However, +- subsequent thread creation would need to follow the default +- behaviour. */ ++ /* Copy the initialization image and clear the BSS part. ++ For audit modules or dependencies with initial-exec TLS, ++ we can not set the initial TLS image on default loader ++ initialization because it would already be set by the ++ audit setup, which uses the dlopen code and already ++ clears l_need_tls_init. Calls with !main_thread from ++ pthread_create need to initialze TLS for the current ++ thread regardless of namespace. */ + if (map->l_ns != LM_ID_BASE && main_thread) + continue; + memset (__mempcpy (dest, map->l_tls_initimage, + map->l_tls_initimage_size), '\0', + map->l_tls_blocksize - map->l_tls_initimage_size); ++ if (main_thread) ++ map->l_need_tls_init = 0; + } + + total += cnt; +@@ -1099,9 +1103,32 @@ _dl_tls_initial_modid_limit_setup (void) + } + + +-void ++/* Add module to slot information data. If DO_ADD is false, only the ++ required memory is allocated. Must be called with ++ GL (dl_load_tls_lock) acquired. If the function has already been ++ called for the link map L with !DO_ADD, then this function will not ++ raise an exception, otherwise it is possible that it encounters a ++ memory allocation failure. ++ ++ Return false if L has already been added to the slotinfo data, or ++ if L has no TLS data. If the returned value is true, L has been ++ added with this call (DO_ADD), or has been added in a previous call ++ (!DO_ADD). ++ ++ The expected usage is as follows: Call _dl_add_to_slotinfo for ++ several link maps with DO_ADD set to false, and record if any calls ++ result in a true result. If there was a true result, call ++ _dl_add_to_slotinfo again, this time with DO_ADD set to true. (For ++ simplicity, it's possible to call the function for link maps where ++ the previous result was false.) The return value from the second ++ round of calls can be ignored. If there was true result initially, ++ call _dl_update_slotinfo to update the TLS generation counter. */ ++bool + _dl_add_to_slotinfo (struct link_map *l, bool do_add) + { ++ if (l->l_tls_blocksize == 0 || l->l_tls_in_slotinfo) ++ return false; ++ + /* Now that we know the object is loaded successfully add + modules containing TLS data to the dtv info table. We + might have to increase its size. */ +@@ -1157,7 +1184,10 @@ cannot create TLS data structures")); + atomic_store_relaxed (&listp->slotinfo[idx].map, l); + atomic_store_relaxed (&listp->slotinfo[idx].gen, + GL(dl_tls_generation) + 1); ++ l->l_tls_in_slotinfo = true; + } ++ ++ return true; + } + + #if PTHREAD_IN_LIBC +diff --git a/elf/tst-dlopen-tlsreinit1.c b/elf/tst-dlopen-tlsreinit1.c +new file mode 100644 +index 0000000000..2016b9b0c6 +--- /dev/null ++++ b/elf/tst-dlopen-tlsreinit1.c +@@ -0,0 +1,40 @@ ++/* Test that dlopen preserves already accessed TLS (bug 31717). ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include ++ ++static int ++do_test (void) ++{ ++ void *handle = xdlopen ("tst-dlopen-tlsreinitmod1.so", RTLD_NOW); ++ ++ bool *tlsreinitmod3_tested = xdlsym (handle, "tlsreinitmod3_tested"); ++ TEST_VERIFY (*tlsreinitmod3_tested); ++ ++ xdlclose (handle); ++ ++ /* This crashes if the libc.so.6 TLS image has been reverted. */ ++ TEST_VERIFY (!isupper ('@')); ++ ++ return 0; ++} ++ ++#include +diff --git a/elf/tst-dlopen-tlsreinit2.c b/elf/tst-dlopen-tlsreinit2.c +new file mode 100644 +index 0000000000..90ad2c7713 +--- /dev/null ++++ b/elf/tst-dlopen-tlsreinit2.c +@@ -0,0 +1,39 @@ ++/* Test that dlopen preserves already accessed TLS (bug 31717). ++ Variant with initially-linked modules. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include ++ ++ ++static int ++do_test (void) ++{ ++ /* Defined in tst-dlopen-tlsreinitmod3.so. */ ++ extern bool tlsreinitmod3_tested; ++ TEST_VERIFY (tlsreinitmod3_tested); ++ ++ /* This crashes if the libc.so.6 TLS image has been reverted. */ ++ TEST_VERIFY (!isupper ('@')); ++ ++ return 0; ++} ++ ++#include +diff --git a/elf/tst-dlopen-tlsreinit3.c b/elf/tst-dlopen-tlsreinit3.c +new file mode 100644 +index 0000000000..79bd585aff +--- /dev/null ++++ b/elf/tst-dlopen-tlsreinit3.c +@@ -0,0 +1,2 @@ ++/* Same code, but run with LD_AUDIT=tst-auditmod1.so. */ ++#include "tst-dlopen-tlsreinit1.c" +diff --git a/elf/tst-dlopen-tlsreinit4.c b/elf/tst-dlopen-tlsreinit4.c +new file mode 100644 +index 0000000000..344c9211ab +--- /dev/null ++++ b/elf/tst-dlopen-tlsreinit4.c +@@ -0,0 +1,2 @@ ++/* Same code, but run with LD_AUDIT=tst-auditmod1.so. */ ++#include "tst-dlopen-tlsreinit2.c" +diff --git a/elf/tst-dlopen-tlsreinitmod1.c b/elf/tst-dlopen-tlsreinitmod1.c +new file mode 100644 +index 0000000000..354cc3de51 +--- /dev/null ++++ b/elf/tst-dlopen-tlsreinitmod1.c +@@ -0,0 +1,20 @@ ++/* Test that dlopen preserves already accessed TLS (bug 31717), module 1. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++/* This module triggers loading of tst-dlopen-tlsreinitmod2.so and ++ tst-dlopen-tlsreinitmod3.so. */ +diff --git a/elf/tst-dlopen-tlsreinitmod2.c b/elf/tst-dlopen-tlsreinitmod2.c +new file mode 100644 +index 0000000000..677e69bd35 +--- /dev/null ++++ b/elf/tst-dlopen-tlsreinitmod2.c +@@ -0,0 +1,30 @@ ++/* Test that dlopen preserves already accessed TLS (bug 31717), module 2. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++ ++/* Defined in tst-dlopen-tlsreinitmod3.so. This an underlinked symbol ++ dependency. */ ++extern void call_tlsreinitmod3 (void); ++ ++static void __attribute__ ((constructor)) ++tlsreinitmod2_init (void) ++{ ++ puts ("info: constructor of tst-dlopen-tlsreinitmod2.so invoked"); ++ call_tlsreinitmod3 (); ++} +diff --git a/elf/tst-dlopen-tlsreinitmod3.c b/elf/tst-dlopen-tlsreinitmod3.c +new file mode 100644 +index 0000000000..ef769c5131 +--- /dev/null ++++ b/elf/tst-dlopen-tlsreinitmod3.c +@@ -0,0 +1,102 @@ ++/* Test that dlopen preserves already accessed TLS (bug 31717), module 3. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include ++ ++/* Used to verify from the main program that the test ran. */ ++bool tlsreinitmod3_tested; ++ ++/* This TLS variable must not revert back to the initial state after ++ dlopen. */ ++static __thread int tlsreinitmod3_state = 1; ++ ++/* Set from the ELF constructor during dlopen. */ ++static bool tlsreinitmod3_constructed; ++ ++/* Second half of test, behind a compiler barrier. The compiler ++ barrier is necessary to prevent carrying over TLS address ++ information from call_tlsreinitmod3 to call_tlsreinitmod3_tail. */ ++void call_tlsreinitmod3_tail (void *self) __attribute__ ((weak)); ++ ++/* Called from tst-dlopen-tlsreinitmod2.so. */ ++void ++call_tlsreinitmod3 (void) ++{ ++ printf ("info: call_tlsreinitmod3 invoked (state=%d)\n", ++ tlsreinitmod3_state); ++ ++ if (tlsreinitmod3_constructed) ++ { ++ puts ("error: call_tlsreinitmod3 called after ELF constructor"); ++ fflush (stdout); ++ /* Cannot rely on test harness due to dynamic linking. */ ++ _exit (1); ++ } ++ ++ tlsreinitmod3_state = 2; ++ ++ /* Self-dlopen. This will run the ELF constructor. */ ++ void *self = dlopen ("tst-dlopen-tlsreinitmod3.so", RTLD_NOW); ++ if (self == NULL) ++ { ++ printf ("error: dlopen: %s\n", dlerror ()); ++ fflush (stdout); ++ /* Cannot rely on test harness due to dynamic linking. */ ++ _exit (1); ++ } ++ ++ call_tlsreinitmod3_tail (self); ++} ++ ++void ++call_tlsreinitmod3_tail (void *self) ++{ ++ printf ("info: dlopen returned in tlsreinitmod3 (state=%d)\n", ++ tlsreinitmod3_state); ++ ++ if (!tlsreinitmod3_constructed) ++ { ++ puts ("error: dlopen did not call tlsreinitmod3 ELF constructor"); ++ fflush (stdout); ++ /* Cannot rely on test harness due to dynamic linking. */ ++ _exit (1); ++ } ++ ++ if (tlsreinitmod3_state != 2) ++ { ++ puts ("error: TLS state reverted in tlsreinitmod3"); ++ fflush (stdout); ++ /* Cannot rely on test harness due to dynamic linking. */ ++ _exit (1); ++ } ++ ++ dlclose (self); ++ ++ /* Signal test completion to the main program. */ ++ tlsreinitmod3_tested = true; ++} ++ ++static void __attribute__ ((constructor)) ++tlsreinitmod3_init (void) ++{ ++ puts ("info: constructor of tst-dlopen-tlsreinitmod3.so invoked"); ++ tlsreinitmod3_constructed = true; ++} +diff --git a/include/link.h b/include/link.h +index cb0d7d8e2f..5ed445d5a6 100644 +--- a/include/link.h ++++ b/include/link.h +@@ -212,6 +212,7 @@ struct link_map + unsigned int l_find_object_processed:1; /* Zero if _dl_find_object_update + needs to process this + lt_library map. */ ++ unsigned int l_tls_in_slotinfo:1; /* TLS slotinfo updated in dlopen. */ + + /* NODELETE status of the map. Only valid for maps of type + lt_loaded. Lazy binding sets l_nodelete_active directly, +diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h +index 154efb0e19..259ce2e7d6 100644 +--- a/sysdeps/generic/ldsodefs.h ++++ b/sysdeps/generic/ldsodefs.h +@@ -1239,13 +1239,7 @@ extern void *_dl_open (const char *name, int mode, const void *caller, + extern int _dl_scope_free (void *) attribute_hidden; + + +-/* Add module to slot information data. If DO_ADD is false, only the +- required memory is allocated. Must be called with GL +- (dl_load_tls_lock) acquired. If the function has already been called +- for the link map L with !do_add, then this function will not raise +- an exception, otherwise it is possible that it encounters a memory +- allocation failure. */ +-extern void _dl_add_to_slotinfo (struct link_map *l, bool do_add) ++extern bool _dl_add_to_slotinfo (struct link_map *l, bool do_add) + attribute_hidden; + + /* Update slot information data for at least the generation of the + +commit f4a9b6e97bf05cf5a41907e55901f7e9afaafd4d +Author: Florian Weimer +Date: Mon Sep 9 21:10:23 2024 +0200 + + elf: Fix tst-dlopen-tlsreinit1.out test dependency + + Fixes commit 5097cd344fd243fb8deb6dec96e8073753f962f9 + ("elf: Avoid re-initializing already allocated TLS in dlopen + (bug 31717)"). + + Reported-by: Patsy Griffin + Reviewed-by: Patsy Griffin + (cherry picked from commit e82a7cb1622bff08d8e3a144d7c5516a088f1cbc) + +diff --git a/elf/Makefile b/elf/Makefile +index a03c6520d8..dc686c3bff 100644 +--- a/elf/Makefile ++++ b/elf/Makefile +@@ -3141,7 +3141,7 @@ $(objpfx)tst-dlopen-tlsreinit4: \ + # tst-dlopen-tlsreinitmod3.so. The dependency is provided via + # $(objpfx)tst-dlopen-tlsreinitmod1.so. + tst-dlopen-tlsreinitmod2.so-no-z-defs = yes +-$(objpfx)tst-dlopen-tlsreinit.out: $(objpfx)tst-dlopen-tlsreinitmod1.so \ ++$(objpfx)tst-dlopen-tlsreinit1.out: $(objpfx)tst-dlopen-tlsreinitmod1.so \ + $(objpfx)tst-dlopen-tlsreinitmod2.so $(objpfx)tst-dlopen-tlsreinitmod3.so + # Reuse an audit module which provides ample debug logging. + $(objpfx)tst-dlopen-tlsreinit3.out: $(objpfx)tst-auditmod1.so + +commit adfb14e71f240a6bc2a4cbd6e6c50cc3fa1bcc3b +Author: Florian Weimer +Date: Tue Sep 10 12:40:27 2024 +0200 + + debug: Fix read error handling in pcprofiledump + + The reading loops did not check for read failures. Addresses + a static analysis report. + + Manually tested by compiling a program with the GCC's + -finstrument-functions option, running it with + “LD_PRELOAD=debug/libpcprofile.so PCPROFILE_OUTPUT=output-file”, + and reviewing the output of “debug/pcprofiledump output-file”. + + (cherry picked from commit 89b088bf70c651c231bf27e644270d093b8f144a) + +diff --git a/debug/pcprofiledump.c b/debug/pcprofiledump.c +index 049a9c2744..94530f0cf9 100644 +--- a/debug/pcprofiledump.c ++++ b/debug/pcprofiledump.c +@@ -75,6 +75,44 @@ static struct argp argp = + options, parse_opt, args_doc, doc, NULL, more_help + }; + ++/* Try to read SIZE bytes from FD and store them on BUF. Terminate ++ the process upon read error. Also terminate the process if less ++ than SIZE bytes are remaining in the file. If !IN_HEADER, do not ++ terminate the process if the end of the file is encountered ++ immediately, before any bytes are read. ++ ++ Returns true if SIZE bytes have been read, and false if no bytes ++ have been read due to an end-of-file condition. */ ++static bool ++read_exactly (int fd, void *buffer, size_t size, bool in_header) ++{ ++ char *p = buffer; ++ char *end = p + size; ++ while (p < end) ++ { ++ ssize_t ret = TEMP_FAILURE_RETRY (read (fd, p, end - p)); ++ if (ret < 0) ++ { ++ if (in_header) ++ error (EXIT_FAILURE, errno, _("cannot read header")); ++ else ++ error (EXIT_FAILURE, errno, _("cannot read pointer pair")); ++ } ++ if (ret == 0) ++ { ++ if (p == buffer && !in_header) ++ /* Nothing has been read. */ ++ return false; ++ if (in_header) ++ error (EXIT_FAILURE, 0, _("unexpected end of file in header")); ++ else ++ error (EXIT_FAILURE, 0, ++ _("unexpected end of file in pointer pair")); ++ } ++ p += ret; ++ } ++ return true; ++} + + int + main (int argc, char *argv[]) +@@ -110,8 +148,7 @@ main (int argc, char *argv[]) + /* Read the first 4-byte word. It contains the information about + the word size and the endianness. */ + uint32_t word; +- if (TEMP_FAILURE_RETRY (read (fd, &word, 4)) != 4) +- error (EXIT_FAILURE, errno, _("cannot read header")); ++ read_exactly (fd, &word, sizeof (word), true); + + /* Check whether we have to swap the byte order. */ + int must_swap = (word & 0x0fffffff) == bswap_32 (0xdeb00000); +@@ -121,56 +158,30 @@ main (int argc, char *argv[]) + /* We have two loops, one for 32 bit pointers, one for 64 bit pointers. */ + if (word == 0xdeb00004) + { +- union +- { +- uint32_t ptrs[2]; +- char bytes[8]; +- } pair; ++ uint32_t ptrs[2]; + + while (1) + { +- size_t len = sizeof (pair); +- size_t n; +- +- while (len > 0 +- && (n = TEMP_FAILURE_RETRY (read (fd, &pair.bytes[8 - len], +- len))) != 0) +- len -= n; +- +- if (len != 0) +- /* Nothing to read. */ ++ if (!read_exactly (fd, ptrs, sizeof (ptrs), false)) + break; + + printf ("this = %#010" PRIx32 ", caller = %#010" PRIx32 "\n", +- must_swap ? bswap_32 (pair.ptrs[0]) : pair.ptrs[0], +- must_swap ? bswap_32 (pair.ptrs[1]) : pair.ptrs[1]); ++ must_swap ? bswap_32 (ptrs[0]) : ptrs[0], ++ must_swap ? bswap_32 (ptrs[1]) : ptrs[1]); + } + } + else if (word == 0xdeb00008) + { +- union +- { +- uint64_t ptrs[2]; +- char bytes[16]; +- } pair; ++ uint64_t ptrs[2]; + + while (1) + { +- size_t len = sizeof (pair); +- size_t n; +- +- while (len > 0 +- && (n = TEMP_FAILURE_RETRY (read (fd, &pair.bytes[8 - len], +- len))) != 0) +- len -= n; +- +- if (len != 0) +- /* Nothing to read. */ ++ if (!read_exactly (fd, ptrs, sizeof (ptrs), false)) + break; + + printf ("this = %#018" PRIx64 ", caller = %#018" PRIx64 "\n", +- must_swap ? bswap_64 (pair.ptrs[0]) : pair.ptrs[0], +- must_swap ? bswap_64 (pair.ptrs[1]) : pair.ptrs[1]); ++ must_swap ? bswap_64 (ptrs[0]) : ptrs[0], ++ must_swap ? bswap_64 (ptrs[1]) : ptrs[1]); + } + } + else + +commit 7073164add3b874cf0c19ca0fb84236f6bb0985d +Author: Siddhesh Poyarekar +Date: Tue Sep 3 14:58:33 2024 -0400 + + libio: Attempt wide backup free only for non-legacy code + + _wide_data and _mode are not available in legacy code, so do not attempt + to free the wide backup buffer in legacy code. + + Resolves: BZ #32137 and BZ #27821 + + Signed-off-by: Siddhesh Poyarekar + Reviewed-by: Florian Weimer + (cherry picked from commit ae4d44b1d501421ad9a3af95279b8f4d1546f1ce) + +diff --git a/NEWS b/NEWS +index 5b20efbf6c..9033335db1 100644 +--- a/NEWS ++++ b/NEWS +@@ -9,12 +9,14 @@ Version 2.40.1 + + The following bugs are resolved with this release: + ++ [27821] ungetc: Fix backup buffer leak on program exit + [30081] resolv: Do not wait for non-existing second DNS response after error + [31717] elf: Avoid re-initializing already allocated TLS in dlopen + [31890] resolv: Allow short error responses to match any DNS query + [31968] mremap implementation in C does not handle arguments correctly + [32026] strerror/strsignal TLS not handled correctly for secondary namespaces + [32052] Name space violation in fortify wrappers ++ [32137] libio: Attempt wide backup free only for non-legacy code + + Version 2.40 + +diff --git a/libio/genops.c b/libio/genops.c +index 35d8b30710..6f20d49669 100644 +--- a/libio/genops.c ++++ b/libio/genops.c +@@ -819,7 +819,7 @@ _IO_unbuffer_all (void) + /* Free up the backup area if it was ever allocated. */ + if (_IO_have_backup (fp)) + _IO_free_backup_area (fp); +- if (fp->_mode > 0 && _IO_have_wbackup (fp)) ++ if (!legacy && fp->_mode > 0 && _IO_have_wbackup (fp)) + _IO_free_wbackup_area (fp); + + if (! (fp->_flags & _IO_UNBUFFERED) diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix b/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix index 6ab9d2bed5..a611cb38d8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix @@ -44,9 +44,9 @@ } @ args: let - version = "2.39"; - patchSuffix = "-52"; - sha256 = "sha256-93vUfPgXDFc2Wue/hmlsEYrbOxINMlnGTFAtPcHi2SY="; + version = "2.40"; + patchSuffix = "-36"; + sha256 = "sha256-GaiQF16SY9dI9ieZPeb0sa+c0h4D8IDkv7Oh+sECBaI="; in assert withLinuxHeaders -> linuxHeaders != null; @@ -62,17 +62,17 @@ stdenv.mkDerivation ({ [ /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. $ git fetch --all -p && git checkout origin/release/2.39/master && git describe - glibc-2.39-52-gf8e4623421 - $ git show --minimal --reverse glibc-2.39.. ':!ADVISORIES' > 2.39-master.patch + glibc-2.40-36-g7073164add + $ git show --minimal --reverse glibc-2.40.. ':!ADVISORIES' > 2.40-master.patch To compare the archive contents zdiff can be used. - $ diff -u 2.39-master.patch ../nixpkgs/pkgs/development/libraries/glibc/2.39-master.patch + $ diff -u 2.40-master.patch ../nixpkgs/pkgs/development/libraries/glibc/2.40-master.patch Please note that each commit has changes to the file ADVISORIES excluded since that conflicts with the directory advisories/ making cross-builds from hosts with case-insensitive file-systems impossible. */ - ./2.39-master.patch + ./2.40-master.patch /* Allow NixOS and Nix to handle the locale-archive. */ ./nix-locale-archive.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/gnome-desktop/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gnome-desktop/default.nix index 381da5b8f9..d565b6ab79 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gnome-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gnome-desktop/default.nix @@ -18,11 +18,13 @@ , wayland , libseccomp , systemd +, udev , bubblewrap , gobject-introspection , gtk-doc , docbook-xsl-nons , gsettings-desktop-schemas +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd }: stdenv.mkDerivation rec { @@ -64,11 +66,13 @@ stdenv.mkDerivation rec { gtk3 gtk4 glib + ] ++ lib.optionals withSystemd [ + systemd ] ++ lib.optionals stdenv.hostPlatform.isLinux [ bubblewrap wayland libseccomp - systemd + udev ]; propagatedBuildInputs = [ @@ -78,8 +82,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=true" "-Ddesktop_docs=false" + (lib.mesonEnable "systemd" withSystemd) ] ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ - "-Dsystemd=disabled" "-Dudev=disabled" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix index 2bc678e8b4..af00bc1690 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch +, substituteAll , c-ares , cmake , crc32c @@ -14,47 +14,40 @@ , openssl , pkg-config , protobuf +, pkgsBuildHost # default list of APIs: https://github.com/googleapis/google-cloud-cpp/blob/v1.32.1/CMakeLists.txt#L173 , apis ? [ "*" ] , staticOnly ? stdenv.hostPlatform.isStatic }: let # defined in cmake/GoogleapisConfig.cmake - googleapisRev = "85f8c758016c279fb7fa8f0d51ddc7ccc0dd5e05"; + googleapisRev = "6a474b31c53cc1797710206824a17b364a835d2d"; googleapis = fetchFromGitHub { name = "googleapis-src"; owner = "googleapis"; repo = "googleapis"; rev = googleapisRev; - hash = "sha256-4Qiz0pBgW3OZi+Z8Zq6k9E94+8q6/EFMwPh8eQxDjdI="; + hash = "sha256-t5oX6Gc1WSMSBDftXA9RZulckUenxOEHBYeq2qf8jnY="; }; in stdenv.mkDerivation rec { pname = "google-cloud-cpp"; - version = "2.14.0"; + version = "2.29.0"; src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-cpp"; rev = "v${version}"; - sha256 = "sha256-0SoOaAqvk8cVC5W3ejTfe4O/guhrro3uAzkeIpAkCpg="; + sha256 = "sha256-gCq8Uc+s/rnJWsGlI7f+tvAZHH8K69+H/leUOKE2GCY="; }; patches = [ - # https://github.com/googleapis/google-cloud-cpp/pull/12554, tagged in 2.16.0 - (fetchpatch { - name = "prepare-for-GCC-13.patch"; - url = "https://github.com/googleapis/google-cloud-cpp/commit/ae30135c86982c36e82bb0f45f99baa48c6a780b.patch"; - hash = "sha256-L0qZfdhP8Zt/gYBWvJafteVgBHR8Kup49RoOrLDtj3k="; + (substituteAll { + src = ./hardcode-googleapis-path.patch; + url = googleapis; }) ]; - postPatch = '' - substituteInPlace external/googleapis/CMakeLists.txt \ - --replace "https://github.com/googleapis/googleapis/archive/\''${_GOOGLE_CLOUD_CPP_GOOGLEAPIS_COMMIT_SHA}.tar.gz" "file://${googleapis}" - sed -i '/https:\/\/storage.googleapis.com\/cloud-cpp-community-archive\/com_google_googleapis/d' external/googleapis/CMakeLists.txt - ''; - nativeBuildInputs = [ cmake ninja @@ -78,9 +71,6 @@ stdenv.mkDerivation rec { protobuf ]; - # https://hydra.nixos.org/build/222679737/nixlog/3/tail - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch64 "-Wno-error=maybe-uninitialized"; - doInstallCheck = true; preInstallCheck = @@ -108,14 +98,21 @@ stdenv.mkDerivation rec { '' ); - installCheckPhase = lib.optionalString doInstallCheck '' + installCheckPhase = let + disabledTests = lib.optionalString stdenv.hostPlatform.isDarwin '' + common_internal_async_connection_ready_test + bigtable_async_read_stream_test + bigtable_metadata_update_policy_test + bigtable_bigtable_benchmark_test + bigtable_embedded_server_test + ''; + in '' runHook preInstallCheck # Disable any integration tests, which need to contact the internet. - # Also disable the `storage_benchmark_*` tests. - # With Protobuf < 23.x they require -DGOOGLE_CLOUD_CPP_ENABLE_CTYPE_WORKAROUND=ON. - # With Protobuf >= 23.x they require They require setting -DGOOGLE_CLOUD_CPP_ENABLE_CTYPE_WORKAROUND=OFF - ctest --label-exclude integration-test --exclude-regex storage_benchmarks_ + ctest \ + --label-exclude integration-test \ + --exclude-from-file <(echo '${disabledTests}') runHook postInstallCheck ''; @@ -133,6 +130,8 @@ stdenv.mkDerivation rec { "-DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES:BOOL=OFF" ] ++ lib.optionals (apis != [ "*" ]) [ "-DGOOGLE_CLOUD_CPP_ENABLE=${lib.concatStringsSep ";" apis}" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-DGOOGLE_CLOUD_CPP_GRPC_PLUGIN_EXECUTABLE=${lib.getBin pkgsBuildHost.grpc}/bin/grpc_cpp_plugin" ]; requiredSystemFeatures = [ "big-parallel" ]; @@ -141,7 +140,7 @@ stdenv.mkDerivation rec { license = with licenses; [ asl20 ]; homepage = "https://github.com/googleapis/google-cloud-cpp"; description = "C++ Idiomatic Clients for Google Cloud Platform services"; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with maintainers; [ cpcloud ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/hardcode-googleapis-path.patch b/third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/hardcode-googleapis-path.patch new file mode 100644 index 0000000000..9e1affcfe0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/hardcode-googleapis-path.patch @@ -0,0 +1,14 @@ +--- a/external/googleapis/CMakeLists.txt ++++ b/external/googleapis/CMakeLists.txt +@@ -20,10 +20,7 @@ endif () + + include(GoogleapisConfig) + +-set(GOOGLE_CLOUD_CPP_GOOGLEAPIS_URL +- "https://github.com/googleapis/googleapis/archive/${_GOOGLE_CLOUD_CPP_GOOGLEAPIS_COMMIT_SHA}.tar.gz" +- "https://storage.googleapis.com/cloud-cpp-community-archive/github.com/googleapis/googleapis/archive/${_GOOGLE_CLOUD_CPP_GOOGLEAPIS_COMMIT_SHA}.tar.gz" +-) ++set(GOOGLE_CLOUD_CPP_GOOGLEAPIS_URL @url@) + set(GOOGLE_CLOUD_CPP_GOOGLEAPIS_URL_HASH + "${_GOOGLE_CLOUD_CPP_GOOGLEAPIS_SHA256}") + if (GOOGLE_CLOUD_CPP_OVERRIDE_GOOGLEAPIS_URL) diff --git a/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix index 35ae5284af..9480488957 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "grpc"; - version = "1.62.1"; # N.B: if you change this, please update: + version = "1.66.1"; # N.B: if you change this, please update: # pythonPackages.grpcio-tools # pythonPackages.grpcio-status @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-L0bn6Bg36UKIRxznH9o4T7WXUqMwFjr8ybeQfbUi8xM="; + hash = "sha256-CmQUUbIYPWRS7q7OX+TmkTvoqtJAUEwhL/lev8JdB8U="; fetchSubmodules = true; }; @@ -40,7 +40,8 @@ stdenv.mkDerivation rec { url = "https://github.com/lopsided98/grpc/commit/a9b917666234f5665c347123d699055d8c2537b2.patch"; hash = "sha256-Lm0GQsz/UjBbXXEE14lT0dcRzVmCKycrlrdBJj+KLu8="; }) - ]; + # fix build of 1.63.0 and newer on darwin: https://github.com/grpc/grpc/issues/36654 + ] ++ (lib.optional stdenv.hostPlatform.isDarwin ./dynamic-lookup-darwin.patch); nativeBuildInputs = [ cmake pkg-config ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) grpc; @@ -96,7 +97,7 @@ stdenv.mkDerivation rec { "-Wno-elaborated-enum-base" ]); - enableParallelBuilds = true; + enableParallelBuilding = true; passthru.tests = { inherit (python3.pkgs) grpcio-status grpcio-tools jaxlib; diff --git a/third_party/nixpkgs/pkgs/development/libraries/grpc/dynamic-lookup-darwin.patch b/third_party/nixpkgs/pkgs/development/libraries/grpc/dynamic-lookup-darwin.patch new file mode 100644 index 0000000000..d72ffcc721 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/grpc/dynamic-lookup-darwin.patch @@ -0,0 +1,11 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 053b9e3784..0979b504da 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -38083,3 +38083,6 @@ generate_pkgconfig( + "-lgrpcpp_otel_plugin" + "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_wire_lib -lupb_message_lib -lutf8_range_lib -lupb_mini_descriptor_lib -lupb_mem_lib -lupb_base_lib" + "grpcpp_otel_plugin.pc") ++ ++target_link_options(upb_textformat_lib PRIVATE -Wl,-undefined,dynamic_lookup) ++target_link_options(upb_json_lib PRIVATE -Wl,-undefined,dynamic_lookup) diff --git a/third_party/nixpkgs/pkgs/development/libraries/gsasl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gsasl/default.nix index b9b57de427..8b90892730 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gsasl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gsasl/default.nix @@ -11,12 +11,6 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-1FtWLhO9E7n8ILNy9LUyaXQM9iefg28JzhG50yvO4HU="; }; - # This is actually bug in musl. It is already fixed in trunc and - # this patch won't be necessary with musl > 1.2.3. - # - # https://git.musl-libc.org/cgit/musl/commit/?id=b50eb8c36c20f967bd0ed70c0b0db38a450886ba - patches = lib.optional stdenv.hostPlatform.isMusl ./gsasl.patch; - buildInputs = [ libidn libkrb5 ]; configureFlags = [ "--with-gssapi-impl=mit" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gsasl/gsasl.patch b/third_party/nixpkgs/pkgs/development/libraries/gsasl/gsasl.patch deleted file mode 100644 index 572d303496..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/gsasl/gsasl.patch +++ /dev/null @@ -1,21 +0,0 @@ -GNU libc and Musl libc have different ideas what - - strverscmp("UNKNOWN", "2.2.0") - -should return. Hopefully nobody depend on this particular behaviour in -practice. - ---- a/tests/version.c 1970-01-01 00:00:00.000000000 -0000 -+++ b/tests/version.c 1970-01-01 00:00:00.000000000 -0000 -@@ -111,11 +111,5 @@ - exit_code = EXIT_FAILURE; - } - -- if (gsasl_check_version ("UNKNOWN")) -- { -- printf ("FAIL: gsasl_check_version (UNKNOWN)\n"); -- exit_code = EXIT_FAILURE; -- } -- - return exit_code; - } diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix index 3ab9c896b8..7d8df7c8a4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix @@ -114,13 +114,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-bad"; - version = "1.24.3"; + version = "1.24.7"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-6Q8mx9ycdvSqWZt1jP1tjBDWoLnLJluiw8m984iFWPg="; + hash = "sha256-ddUT/AumNfsfOXhtiQtz+6xfS8iP858qn/YvS49CjyI="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix index 9932c37a72..459c14beb0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix @@ -19,6 +19,8 @@ , libvisual , tremor # provides 'virbisidec' , libGL +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages +, buildPackages , gobject-introspection , enableX11 ? stdenv.hostPlatform.isLinux , libXext @@ -47,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gst-plugins-base"; - version = "1.24.3"; + version = "1.24.7"; outputs = [ "out" "dev" ]; @@ -57,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-8QlDl+qnky8G5X67sHWqM6osduS3VjChawLI1K9Ggy4="; + hash = "sha256-FSjRdGo5Mpn1rBfr8ToypmAgLx4p0KhSoiUPagWaL9o="; }; strictDeps = true; @@ -73,6 +75,7 @@ stdenv.mkDerivation (finalAttrs: { orc glib gstreamer + ] ++ lib.optionals withIntrospection [ gobject-introspection ] ++ lib.optionals enableDocumentation [ hotdoc @@ -119,6 +122,7 @@ stdenv.mkDerivation (finalAttrs: { "-Dexamples=disabled" # requires many dependencies and probably not useful for our users # See https://github.com/GStreamer/gst-plugins-base/blob/d64a4b7a69c3462851ff4dcfa97cc6f94cd64aef/meson_options.txt#L15 for a list of choices "-Dgl_winsys=${lib.concatStringsSep "," (lib.optional enableX11 "x11" ++ lib.optional enableWayland "wayland" ++ lib.optional enableCocoa "cocoa")}" + (lib.mesonEnable "introspection" withIntrospection) (lib.mesonEnable "doc" enableDocumentation) ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "-Dtests=disabled" diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix index 7eba093ab9..487f665905 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix @@ -15,8 +15,12 @@ , lib , Cocoa , CoreServices -, rustc +, xpc , testers +, rustc +, withRust ? + lib.any (lib.meta.platformMatch stdenv.hostPlatform) rustc.targetPlatforms && + lib.all (p: !lib.meta.platformMatch stdenv.hostPlatform p) rustc.badTargetPlatforms , gobject-introspection , buildPackages , withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages @@ -30,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gstreamer"; - version = "1.24.3"; + version = "1.24.7"; outputs = [ "bin" @@ -44,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-EiXvSjKfrhytxexyfaskmtVn6AcoeUk1Yc65HtNKpBQ="; + hash = "sha256-wOdbEkxSu3oMPc23NLKtJg6nKGqHRc8upinUyEnmqVg="; }; depsBuildBuild = [ @@ -63,11 +67,12 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper glib bash-completion - rustc ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap # for setcap binary ] ++ lib.optionals withIntrospection [ gobject-introspection + ] ++ lib.optionals withRust [ + rustc ] ++ lib.optionals enableDocumentation [ hotdoc ]; @@ -83,6 +88,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa CoreServices + xpc ]; propagatedBuildInputs = [ @@ -92,6 +98,7 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Ddbghelp=disabled" # not needed as we already provide libunwind and libdw, and dbghelp is a fallback to those "-Dexamples=disabled" # requires many dependencies and probably not useful for our users + (lib.mesonEnable "ptp-helper" withRust) (lib.mesonEnable "introspection" withIntrospection) (lib.mesonEnable "doc" enableDocumentation) (lib.mesonEnable "libunwind" withLibunwind) diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/default.nix index 4020193e0a..cee836e86a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/default.nix @@ -1,4 +1,5 @@ -{ callPackage +{ stdenv +, callPackage , AVFoundation , AudioToolbox , Cocoa @@ -14,12 +15,15 @@ , Security , SystemConfiguration , VideoToolbox +, xpc , ipu6ep-camera-hal , ipu6epmtl-camera-hal }: { - gstreamer = callPackage ./core { inherit Cocoa CoreServices; }; + inherit stdenv; + + gstreamer = callPackage ./core { inherit Cocoa CoreServices xpc; }; gstreamermm = callPackage ./gstreamermm { }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix index 1232224faa..99991bbaca 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "gst-devtools"; - version = "1.24.3"; + version = "1.24.7"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-uREUov2Vj0Ks9EEYbofivsk1OO81qfgkgREZc2D/sjc="; + hash = "sha256-56p6I/pYfVjcWnu1Hvta159vKkxZh1ZMZvYztbvTixc="; }; outputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix index 89830f3aed..df6c944de8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "gst-editing-services"; - version = "1.24.3"; + version = "1.24.7"; outputs = [ "out" @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-z3QyFWiLATkFzSyff+3aIeLTTIRDQJkMbqJdEKA3KT8="; + hash = "sha256-sjzDEqI/q3F+S2A/ByvkIJhPucndIHfiBraqmxHfKdg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix index ec474972ef..4bb334e2e7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix @@ -58,13 +58,13 @@ assert raspiCameraSupport -> (stdenv.hostPlatform.isLinux && stdenv.hostPlatform stdenv.mkDerivation rec { pname = "gst-plugins-good"; - version = "1.24.3"; + version = "1.24.7"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-FQ+RTmHcBWALaLiMoQPHzCJxMBWOOJ6p6hWfQFCi67A="; + hash = "sha256-dZrLEebeg3P/jLteerjrmjhjG+gc8kIgJnsAHrVVk8E="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/icamerasrc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/icamerasrc/default.nix index 68485f7e74..4bbb20c6e4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/icamerasrc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/icamerasrc/default.nix @@ -6,17 +6,18 @@ , gst_all_1 , ipu6-camera-hal , libdrm +, libva }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "icamerasrc-${ipu6-camera-hal.ipuVersion}"; - version = "unstable-2023-10-23"; + version = "unstable-2024-09-29"; src = fetchFromGitHub { owner = "intel"; repo = "icamerasrc"; - rev = "528a6f177732def4d5ebc17927220d8823bc8fdc"; - hash = "sha256-Ezcm5OpF/NKvJf5sFeJyvNc2Uq0166GukC9MuNUV2Fs="; + rev = "refs/tags/20240926_1446"; + hash = "sha256-BpIZxkPmSVKqPntwBJjGmCaMSYFCEZHJa4soaMAJRWE="; }; nativeBuildInputs = [ @@ -34,8 +35,10 @@ stdenv.mkDerivation { buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-bad ipu6-camera-hal libdrm + libva ]; NIX_CFLAGS_COMPILE = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix index 38a553ec86..06cd16b05c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "gst-libav"; - version = "1.24.3"; + version = "1.24.7"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-2cWxUkaKRcH6g1FBBCIJCnGScHrXTS4aQ2f1JU4YjZE="; + hash = "sha256-w+QXm6GDwtMQHt+H/3DdB+cox2al/uNObs3tdspYAt8="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index b6d2b6464e..58c9486d98 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "gst-rtsp-server"; - version = "1.24.3"; + version = "1.24.7"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-YmKOzKeLj1tRxZpNYCxl6SBf/FDDyDzWH6sfY0i2NWU="; + hash = "sha256-2ceOXNC+rTC/XnSvgOQefVAGGUYX/b9EuIvibla76Pk="; }; outputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix index f6a0ee93d8..b94f6daa91 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-ugly"; - version = "1.24.3"; + version = "1.24.7"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-TJUTQcTGSGMLb+EjTsET2B3S0khSm/K1R44K0HfIDtM="; + hash = "sha256-PclU/FP+GIg2cDIqHCFePGUpA24KabMPZHgc1AwmhZM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix index d7d788787a..2b9c02bbeb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "gstreamer-vaapi"; - version = "1.24.3"; + version = "1.24.7"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-hF8u/g3KjasjTd6PsJHaLNBqnSpoNCK1bctoiVT5Bw4="; + hash = "sha256-OqXtnX9LWny2DYsDcNmD1ZOV3lRu52cEQBGA/Q/V7oY="; }; outputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtest/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gtest/default.nix index 7e44794620..f9465c4e35 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtest/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtest/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "gtest"; - version = "1.14.0"; + version = "1.15.2"; outputs = [ "out" "dev" ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "google"; repo = "googletest"; rev = "v${version}"; - hash = "sha256-t0RchAHTJbuI5YW4uyBPykTvcjy90JW9AOPNjIhwh6U="; + hash = "sha256-1OJ2SeSscRBNr7zZ/a8bJGIqAnhkg45re0j3DtPfcXM="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch b/third_party/nixpkgs/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch index 6d29e04b25..269e437cbc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch @@ -1,8 +1,8 @@ diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt -index 428bd9f8..04b84539 100644 +index 99b2411f..33ec9636 100644 --- a/googlemock/CMakeLists.txt +++ b/googlemock/CMakeLists.txt -@@ -104,10 +104,10 @@ endif() +@@ -105,10 +105,10 @@ endif() string(REPLACE ";" "$" dirs "${gmock_build_include_dirs}") target_include_directories(gmock SYSTEM INTERFACE "$" @@ -16,7 +16,7 @@ index 428bd9f8..04b84539 100644 ######################################################################## # diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt -index 51a67c91..fb09e978 100644 +index dce6a7c9..f1da42ff 100644 --- a/googletest/CMakeLists.txt +++ b/googletest/CMakeLists.txt @@ -143,10 +143,10 @@ set_target_properties(gtest_main PROPERTIES VERSION ${GOOGLETEST_VERSION}) @@ -29,6 +29,6 @@ index 51a67c91..fb09e978 100644 "$" - "$/${CMAKE_INSTALL_INCLUDEDIR}>") + "$") - if(CMAKE_SYSTEM_NAME MATCHES "QNX") + if(CMAKE_SYSTEM_NAME MATCHES "QNX" AND CMAKE_SYSTEM_VERSION VERSION_GREATER_EQUAL 7.1) target_link_libraries(gtest PUBLIC regex) endif() diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix index cb4b6955de..7d11b671b1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix @@ -116,6 +116,13 @@ stdenv.mkDerivation (finalAttrs: { "ac_cv_path_GDK_PIXBUF_CSOURCE=${buildPackages.gdk-pixbuf.dev}/bin/gdk-pixbuf-csource" ]; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-int" + "-Wno-error=incompatible-pointer-types" + ]; + }; + enableParallelBuilding = true; installFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix index 41999f5538..9defccd8de 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix @@ -35,6 +35,10 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./3.x-nix_share_path.patch ]; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + }; + enableParallelBuilding = true; doCheck = stdenv.hostPlatform.isLinux; diff --git a/third_party/nixpkgs/pkgs/development/libraries/howard-hinnant-date/default.nix b/third_party/nixpkgs/pkgs/development/libraries/howard-hinnant-date/default.nix index 953dd47221..3f7210df56 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/howard-hinnant-date/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/howard-hinnant-date/default.nix @@ -61,11 +61,17 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + # fixes "cycle detected in build" + postInstall = lib.optionalString stdenv.hostPlatform.isWindows '' + mkdir $dev/lib + mv $out/CMake $dev/lib/cmake + ''; + meta = with lib; { license = licenses.mit; description = "Date and time library based on the C++11/14/17 header"; homepage = "https://github.com/HowardHinnant/date"; - platforms = platforms.unix; + platforms = with platforms; unix ++ windows; maintainers = with maintainers; [ r-burns ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix b/third_party/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix index c26f6d3aa7..c7c07998f8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix @@ -980,7 +980,7 @@ rec { readmeFile = "README"; src = fetchurl { - url = "https://downloads.sourceforge.net/rospell/${fileName}"; + url = "mirror://sourceforge/rospell/${fileName}"; hash = "sha256-fxKNZOoGyeZxHDCxGMCv7vsBTY8zyS2szfRVq6LQRRk="; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/icu/make-icu.nix b/third_party/nixpkgs/pkgs/development/libraries/icu/make-icu.nix index 52b083995e..09e7bb3c96 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/icu/make-icu.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/icu/make-icu.nix @@ -59,7 +59,7 @@ let }; realAttrs = baseAttrs // { - name = pname + "-" + version; + inherit pname version; outputs = [ "out" "dev" ] ++ lib.optional withStatic "static"; outputBin = "dev"; @@ -93,7 +93,8 @@ let }; buildRootOnlyAttrs = baseAttrs // { - name = pname + "-build-root-" + version; + pname = pname + "-build-root"; + inherit version; preConfigure = baseAttrs.preConfigure + '' mkdir build diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix index a54872d6c2..15bce8e5cd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.5.1"; + version = "22.5.2"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - hash = "sha256-YHloVW5TtNI583GOEhx7S27jzHEVTSdbJSDOzv7KZiI="; + hash = "sha256-vc4Jk+XAXf/lq5ouCP+04YBuyeypl0XSOPUT1YkL+7A="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ipu6-camera-hal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ipu6-camera-hal/default.nix index 9c6cc585f9..0bbed96ca3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ipu6-camera-hal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ipu6-camera-hal/default.nix @@ -11,6 +11,7 @@ , ipu6-camera-bins , libtool , gst_all_1 +, libdrm # Pick one of # - ipu6 (Tiger Lake) @@ -27,13 +28,13 @@ let in stdenv.mkDerivation { pname = "${ipuVersion}-camera-hal"; - version = "unstable-2023-09-25"; + version = "unstable-2024-09-29"; src = fetchFromGitHub { owner = "intel"; repo = "ipu6-camera-hal"; - rev = "9fa05a90886d399ad3dda4c2ddc990642b3d20c9"; - hash = "sha256-yS1D7o6dsQ4FQkjfwcisOxcP7Majb+4uQ/iW5anMb5c="; + rev = "f98f72b156563fe8373e4f8d017a9f609676bb33"; + hash = "sha256-zVcgKW7/GHYd1oMvsaI77cPyj3G68dL+OXBJDz5+Td4="; }; nativeBuildInputs = [ @@ -41,12 +42,16 @@ stdenv.mkDerivation { pkg-config ]; - PKG_CONFIG_PATH = "${lib.makeLibraryPath [ ipu6-camera-bins ]}/${ipuTarget}/pkgconfig"; cmakeFlags = [ "-DIPU_VER=${ipuVersion}" + "-DTARGET_SUFFIX=-${ipuVersion}" # missing libiacss "-DUSE_PG_LITE_PIPE=ON" + "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" + "-DCMAKE_INSTALL_SUB_PATH=${ipuTarget}" + "-DCMAKE_INSTALL_LIBDIR=lib" ]; NIX_CFLAGS_COMPILE = [ @@ -61,21 +66,28 @@ stdenv.mkDerivation { libtool gst_all_1.gstreamer gst_all_1.gst-plugins-base + libdrm ]; postPatch = '' substituteInPlace src/platformdata/PlatformData.h \ - --replace '/usr/share/' "${placeholder "out"}/share/" + --replace '/usr/share/' "${placeholder "out"}/share/" \ + --replace '#define CAMERA_DEFAULT_CFG_PATH "/etc/camera/"' '#define CAMERA_DEFAULT_CFG_PATH "${placeholder "out"}/etc/camera/"' + ''; + + postInstall = '' + mkdir -p $out/include/${ipuTarget}/ + cp -r $src/include $out/include/${ipuTarget}/libcamhal ''; postFixup = '' for lib in $out/lib/*.so; do - patchelf --add-rpath "${lib.makeLibraryPath [ ipu6-camera-bins ]}/${ipuTarget}" $lib + patchelf --add-rpath "${ipu6-camera-bins}/lib" $lib done ''; passthru = { - inherit ipuVersion; + inherit ipuVersion ipuTarget; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/lucene/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/lucene/default.nix index 9791c0ee45..d4ab4e464e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/java/lucene/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/java/lucene/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.4.3"; src = fetchurl { - url = "https://archive.apache.org/dist/jakarta/lucene/lucene-${version}.tar.gz"; + url = "mirror://apache/jakarta/lucene/lucene-${version}.tar.gz"; sha256 = "1mxaxg65f7v8n60irjwm24v7hcisbl0srmpvcy1l4scs6rjj1awh"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix index f7b6d1c4ba..4999fce4fd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "jsoncpp"; - version = "1.9.5"; + version = "1.9.6"; outputs = ["out" "dev"]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "open-source-parsers"; repo = "jsoncpp"; rev = version; - sha256 = "sha256-OyfJD19g8cT9wOD0hyJyEw4TbaxZ9eY04396U/7R+hs="; + sha256 = "sha256-3msc3B8NyF8PUlNaAHdUDfCpcUmz8JVW2X58USJ5HRw="; }; /* During darwin bootstrap, we have a cp that doesn't understand the diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh index 8d86ab1d54..e576dbb4ec 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh @@ -6,53 +6,53 @@ addEnvHooks "$targetOffset" ecmEnvHook ecmPostHook() { # Because we need to use absolute paths here, we must set *all* the paths. - cmakeFlags+=" -DKDE_INSTALL_EXECROOTDIR=${!outputBin}" - cmakeFlags+=" -DKDE_INSTALL_BINDIR=${!outputBin}/bin" - cmakeFlags+=" -DKDE_INSTALL_SBINDIR=${!outputBin}/sbin" - cmakeFlags+=" -DKDE_INSTALL_LIBDIR=${!outputLib}/lib" - cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputLib}/libexec" - cmakeFlags+=" -DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake" - cmakeFlags+=" -DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include" - cmakeFlags+=" -DKDE_INSTALL_LOCALSTATEDIR=/var" - cmakeFlags+=" -DKDE_INSTALL_DATAROOTDIR=${!outputBin}/share" - cmakeFlags+=" -DKDE_INSTALL_DATADIR=${!outputBin}/share" - cmakeFlags+=" -DKDE_INSTALL_DOCBUNDLEDIR=${!outputBin}/share/doc/HTML" - cmakeFlags+=" -DKDE_INSTALL_KCFGDIR=${!outputBin}/share/config.kcfg" - cmakeFlags+=" -DKDE_INSTALL_KCONFUPDATEDIR=${!outputBin}/share/kconf_update" - cmakeFlags+=" -DKDE_INSTALL_KSERVICES5DIR=${!outputBin}/share/kservices5" - cmakeFlags+=" -DKDE_INSTALL_KSERVICETYPES5DIR=${!outputBin}/share/kservicetypes5" - cmakeFlags+=" -DKDE_INSTALL_KXMLGUI5DIR=${!outputBin}/share/kxmlgui5" - cmakeFlags+=" -DKDE_INSTALL_KNOTIFY5RCDIR=${!outputBin}/share/knotifications5" - cmakeFlags+=" -DKDE_INSTALL_ICONDIR=${!outputBin}/share/icons" - cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputLib}/share/locale" - cmakeFlags+=" -DKDE_INSTALL_SOUNDDIR=${!outputBin}/share/sounds" - cmakeFlags+=" -DKDE_INSTALL_TEMPLATEDIR=${!outputBin}/share/templates" - cmakeFlags+=" -DKDE_INSTALL_WALLPAPERDIR=${!outputBin}/share/wallpapers" - cmakeFlags+=" -DKDE_INSTALL_APPDIR=${!outputBin}/share/applications" - cmakeFlags+=" -DKDE_INSTALL_DESKTOPDIR=${!outputBin}/share/desktop-directories" - cmakeFlags+=" -DKDE_INSTALL_MIMEDIR=${!outputBin}/share/mime/packages" - cmakeFlags+=" -DKDE_INSTALL_METAINFODIR=${!outputBin}/share/appdata" - cmakeFlags+=" -DKDE_INSTALL_MANDIR=${!outputBin}/share/man" - cmakeFlags+=" -DKDE_INSTALL_INFODIR=${!outputBin}/share/info" - cmakeFlags+=" -DKDE_INSTALL_DBUSDIR=${!outputBin}/share/dbus-1" - cmakeFlags+=" -DKDE_INSTALL_DBUSINTERFACEDIR=${!outputBin}/share/dbus-1/interfaces" - cmakeFlags+=" -DKDE_INSTALL_DBUSSERVICEDIR=${!outputBin}/share/dbus-1/services" - cmakeFlags+=" -DKDE_INSTALL_DBUSSYSTEMSERVICEDIR=${!outputBin}/share/dbus-1/system-services" - cmakeFlags+=" -DKDE_INSTALL_SYSCONFDIR=${!outputBin}/etc" - cmakeFlags+=" -DKDE_INSTALL_CONFDIR=${!outputBin}/etc/xdg" - cmakeFlags+=" -DKDE_INSTALL_AUTOSTARTDIR=${!outputBin}/etc/xdg/autostart" + appendToVar cmakeFlags "-DKDE_INSTALL_EXECROOTDIR=${!outputBin}" + appendToVar cmakeFlags "-DKDE_INSTALL_BINDIR=${!outputBin}/bin" + appendToVar cmakeFlags "-DKDE_INSTALL_SBINDIR=${!outputBin}/sbin" + appendToVar cmakeFlags "-DKDE_INSTALL_LIBDIR=${!outputLib}/lib" + appendToVar cmakeFlags "-DKDE_INSTALL_LIBEXECDIR=${!outputLib}/libexec" + appendToVar cmakeFlags "-DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake" + appendToVar cmakeFlags "-DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include" + appendToVar cmakeFlags "-DKDE_INSTALL_LOCALSTATEDIR=/var" + appendToVar cmakeFlags "-DKDE_INSTALL_DATAROOTDIR=${!outputBin}/share" + appendToVar cmakeFlags "-DKDE_INSTALL_DATADIR=${!outputBin}/share" + appendToVar cmakeFlags "-DKDE_INSTALL_DOCBUNDLEDIR=${!outputBin}/share/doc/HTML" + appendToVar cmakeFlags "-DKDE_INSTALL_KCFGDIR=${!outputBin}/share/config.kcfg" + appendToVar cmakeFlags "-DKDE_INSTALL_KCONFUPDATEDIR=${!outputBin}/share/kconf_update" + appendToVar cmakeFlags "-DKDE_INSTALL_KSERVICES5DIR=${!outputBin}/share/kservices5" + appendToVar cmakeFlags "-DKDE_INSTALL_KSERVICETYPES5DIR=${!outputBin}/share/kservicetypes5" + appendToVar cmakeFlags "-DKDE_INSTALL_KXMLGUI5DIR=${!outputBin}/share/kxmlgui5" + appendToVar cmakeFlags "-DKDE_INSTALL_KNOTIFY5RCDIR=${!outputBin}/share/knotifications5" + appendToVar cmakeFlags "-DKDE_INSTALL_ICONDIR=${!outputBin}/share/icons" + appendToVar cmakeFlags "-DKDE_INSTALL_LOCALEDIR=${!outputLib}/share/locale" + appendToVar cmakeFlags "-DKDE_INSTALL_SOUNDDIR=${!outputBin}/share/sounds" + appendToVar cmakeFlags "-DKDE_INSTALL_TEMPLATEDIR=${!outputBin}/share/templates" + appendToVar cmakeFlags "-DKDE_INSTALL_WALLPAPERDIR=${!outputBin}/share/wallpapers" + appendToVar cmakeFlags "-DKDE_INSTALL_APPDIR=${!outputBin}/share/applications" + appendToVar cmakeFlags "-DKDE_INSTALL_DESKTOPDIR=${!outputBin}/share/desktop-directories" + appendToVar cmakeFlags "-DKDE_INSTALL_MIMEDIR=${!outputBin}/share/mime/packages" + appendToVar cmakeFlags "-DKDE_INSTALL_METAINFODIR=${!outputBin}/share/appdata" + appendToVar cmakeFlags "-DKDE_INSTALL_MANDIR=${!outputBin}/share/man" + appendToVar cmakeFlags "-DKDE_INSTALL_INFODIR=${!outputBin}/share/info" + appendToVar cmakeFlags "-DKDE_INSTALL_DBUSDIR=${!outputBin}/share/dbus-1" + appendToVar cmakeFlags "-DKDE_INSTALL_DBUSINTERFACEDIR=${!outputBin}/share/dbus-1/interfaces" + appendToVar cmakeFlags "-DKDE_INSTALL_DBUSSERVICEDIR=${!outputBin}/share/dbus-1/services" + appendToVar cmakeFlags "-DKDE_INSTALL_DBUSSYSTEMSERVICEDIR=${!outputBin}/share/dbus-1/system-services" + appendToVar cmakeFlags "-DKDE_INSTALL_SYSCONFDIR=${!outputBin}/etc" + appendToVar cmakeFlags "-DKDE_INSTALL_CONFDIR=${!outputBin}/etc/xdg" + appendToVar cmakeFlags "-DKDE_INSTALL_AUTOSTARTDIR=${!outputBin}/etc/xdg/autostart" if [ "$(uname)" = "Darwin" ]; then - cmakeFlags+=" -DKDE_INSTALL_BUNDLEDIR=${!outputBin}/Applications/KDE" + appendToVar cmakeFlags "-DKDE_INSTALL_BUNDLEDIR=${!outputBin}/Applications/KDE" fi if [ -n "${qtPluginPrefix-}" ]; then - cmakeFlags+=" -DKDE_INSTALL_QTPLUGINDIR=${!outputBin}/$qtPluginPrefix" - cmakeFlags+=" -DKDE_INSTALL_PLUGINDIR=${!outputBin}/$qtPluginPrefix" + appendToVar cmakeFlags "-DKDE_INSTALL_QTPLUGINDIR=${!outputBin}/$qtPluginPrefix" + appendToVar cmakeFlags "-DKDE_INSTALL_PLUGINDIR=${!outputBin}/$qtPluginPrefix" fi if [ -n "${qtQmlPrefix-}" ]; then - cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputBin}/$qtQmlPrefix" + appendToVar cmakeFlags "-DKDE_INSTALL_QMLDIR=${!outputBin}/$qtQmlPrefix" fi } postHooks+=(ecmPostHook) diff --git a/third_party/nixpkgs/pkgs/development/libraries/kerberos/0001-Define-HAVE_DB_185_H.patch b/third_party/nixpkgs/pkgs/development/libraries/kerberos/0001-Define-HAVE_DB_185_H.patch new file mode 100644 index 0000000000..f6e2c428c6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/kerberos/0001-Define-HAVE_DB_185_H.patch @@ -0,0 +1,26 @@ +From 08d719e96214f648ae95043acc308deca36e1f7a Mon Sep 17 00:00:00 2001 +From: Ihar Hrachyshka +Date: Tue, 15 Oct 2024 13:52:39 -0400 +Subject: [PATCH] Define HAVE_DB_185_H + +--- + cf/db.m4 | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/cf/db.m4 b/cf/db.m4 +index c0b4510b6..c95a9dee9 100644 +--- a/cf/db.m4 ++++ b/cf/db.m4 +@@ -57,6 +57,9 @@ AS_IF([test "x$with_berkeley_db" != xno], + db.h \ + ])]) + ++dnl detect if compat db_185.h is present ++AC_CHECK_HEADERS([db_185.h]) ++ + dnl db_create is used by db3 and db4 and db5 and db6 + + AC_FIND_FUNC_NO_LIBS(db_create, [$dbheader] db-6 db-5 db4 db3 db, [ +-- +2.46.0 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/kerberos/0001-Include-db.h-for-nbdb-compat-mode.patch b/third_party/nixpkgs/pkgs/development/libraries/kerberos/0001-Include-db.h-for-nbdb-compat-mode.patch new file mode 100644 index 0000000000..e939332783 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/kerberos/0001-Include-db.h-for-nbdb-compat-mode.patch @@ -0,0 +1,25 @@ +From 749d9451293f9d9f8a3f506401cae369003aeebf Mon Sep 17 00:00:00 2001 +From: Ihar Hrachyshka +Date: Sun, 13 Oct 2024 17:16:13 -0400 +Subject: [PATCH] Include db.h for nbdb compat mode + +--- + lib/otp/otp_db.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/otp/otp_db.c b/lib/otp/otp_db.c +index 036359c1d..32c04bc8c 100644 +--- a/lib/otp/otp_db.c ++++ b/lib/otp/otp_db.c +@@ -39,7 +39,7 @@ RCSID("$Id$"); + #include "otp_locl.h" + + #if defined(HAVE_DB_NDBM) +-# include ++# include + #elif !defined(HAVE_NDBM) + # include "ndbm_wrap.h" + #endif +-- +2.46.0 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/kerberos/0001-Link-tests-with-libresolv.patch b/third_party/nixpkgs/pkgs/development/libraries/kerberos/0001-Link-tests-with-libresolv.patch new file mode 100644 index 0000000000..f20128df9e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/kerberos/0001-Link-tests-with-libresolv.patch @@ -0,0 +1,51 @@ +From 862900febaec4a2c70257a39374b81138ee9f168 Mon Sep 17 00:00:00 2001 +From: Ihar Hrachyshka +Date: Tue, 15 Oct 2024 16:06:33 -0400 +Subject: [PATCH] Link tests with libresolv + +--- + lib/gssapi/Makefile.am | 1 + + lib/krb5/Makefile.am | 2 ++ + lib/roken/Makefile.am | 1 + + 3 files changed, 4 insertions(+) + +diff --git a/lib/gssapi/Makefile.am b/lib/gssapi/Makefile.am +index 3254866dc..db967e586 100644 +--- a/lib/gssapi/Makefile.am ++++ b/lib/gssapi/Makefile.am +@@ -403,6 +403,7 @@ LDADD = libgssapi.la \ + $(top_builddir)/lib/krb5/libkrb5.la \ + $(LIB_roken) + ++test_names_LDFLAGS = -lresolv + test_names_LDADD = $(LDADD) $(top_builddir)/lib/asn1/libasn1.la + test_context_LDADD = $(LDADD) $(top_builddir)/lib/asn1/libasn1.la $(top_builddir)/lib/wind/libwind.la + +diff --git a/lib/krb5/Makefile.am b/lib/krb5/Makefile.am +index ecce461dd..e22cfe87c 100644 +--- a/lib/krb5/Makefile.am ++++ b/lib/krb5/Makefile.am +@@ -330,6 +330,8 @@ test_rfc3961_LDADD = \ + $(LIB_hcrypto) \ + $(LIB_roken) + ++test_plugin_LDFLAGS = -lresolv ++ + if DEVELOPER_MODE + headerdeps = $(dist_libkrb5_la_SOURCES) + endif +diff --git a/lib/roken/Makefile.am b/lib/roken/Makefile.am +index 1f530c7ae..8350d7034 100644 +--- a/lib/roken/Makefile.am ++++ b/lib/roken/Makefile.am +@@ -54,6 +54,7 @@ libtest_la_CFLAGS = -DTEST_SNPRINTF -DTEST_STRPFTIME + + parse_reply_test_SOURCES = parse_reply-test.c resolve.c + parse_reply_test_CFLAGS = -DTEST_RESOLVE ++parse_reply_test_LDFLAGS = -lresolv + + test_readenv_SOURCES = test-readenv.c test-mem.c + test_auxval_SOURCES = test-auxval.c +-- +2.46.0 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix b/third_party/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix index 4d9c34d728..4b28f52f11 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix @@ -66,9 +66,9 @@ stdenv.mkDerivation { perl bison flex + perlPackages.JSON texinfo - ] - ++ (with perlPackages; [ JSON ]); + ]; buildInputs = [ db libedit pam ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ CoreFoundation Security SystemConfiguration ] @@ -109,6 +109,15 @@ stdenv.mkDerivation { "--with-sqlite3=${sqlite.dev}" ]; + patches = [ + # Proposed @ https://github.com/heimdal/heimdal/pull/1262 + ./0001-Include-db.h-for-nbdb-compat-mode.patch + # Proposed @ https://github.com/heimdal/heimdal/pull/1264 + ./0001-Define-HAVE_DB_185_H.patch + # Proposed @ https://github.com/heimdal/heimdal/pull/1265 + ./0001-Link-tests-with-libresolv.patch + ]; + # (check-ldap) slapd resides within ${openldap}/libexec, # which is not part of $PATH by default. # (check-ldap) prepending ${openldap}/bin to the path to avoid @@ -117,17 +126,15 @@ stdenv.mkDerivation { # (check-ldap) the bdb backend got deprecated in favour of mdb in openldap 2.5.0, # but the heimdal tests still seem to expect bdb as the openldap backend. # This might be fixed upstream in a future update. - patchPhase = '' - runHook prePatch - + postPatch = '' substituteInPlace tests/ldap/slapd-init.in \ - --replace 'SCHEMA_PATHS="' 'SCHEMA_PATHS="${openldap}/etc/schema ' + --replace-fail 'SCHEMA_PATHS="' 'SCHEMA_PATHS="${openldap}/etc/schema ' substituteInPlace tests/ldap/check-ldap.in \ - --replace 'PATH=' 'PATH=${openldap}/libexec:${openldap}/bin:' + --replace-fail 'PATH=' 'PATH=${openldap}/libexec:${openldap}/bin:' substituteInPlace tests/ldap/slapd.conf \ - --replace 'database bdb' 'database mdb' - - runHook postPatch + --replace-fail 'database bdb' 'database mdb' + substituteInPlace tests/kdc/check-iprop.in \ + --replace-fail '/bin/pwd' 'pwd' ''; # (test_cc) heimdal uses librokens implementation of `secure_getenv` on darwin, diff --git a/third_party/nixpkgs/pkgs/development/libraries/lcms/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lcms/default.nix index 9a957a1192..cdb994578b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lcms/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lcms/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { patches = [ ./cve-2013-4276.patch ]; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + outputs = [ "bin" "dev" "out" "man" ]; doCheck = false; # fails with "Error in Linear interpolation (2p): Must be i=8000, But is n=8001" diff --git a/third_party/nixpkgs/pkgs/development/libraries/ldns/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ldns/default.nix index 1e696b1175..96e6b7d54d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ldns/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ldns/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ldns"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/ldns/${pname}-${version}.tar.gz"; - sha256 = "sha256-w/ct0QNrKQfjpW5qz537LlUSVrPBu9l4eULe7rcOeGA="; + sha256 = "sha256-g4uQdZS6r/HNdn6VRmp3RZmK5kvHS+A43Mxi4t4uQkc="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix b/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix index 8b87f0af9f..e0d130d80f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.17.42"; + version = "1.17.45"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; rev = "refs/tags/v${version}"; - hash = "sha256-IjYRzjC7CUPDdVBVoWSZtUQaY7QtSfS/Nej/2BdVziY="; + hash = "sha256-2uWZsy8aIV/ToDVuVxpyXoI1GbwZ9IxeLh+1hgjlfEM="; }; nativeBuildInputs = [ cmake addDriverRunpath ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix index 01f361d054..8b8362d6c1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, yasm, perl, cmake, pkg-config, python3 +{ lib, stdenv, fetchurl, fetchzip, yasm, perl, cmake, pkg-config, python3 , enableVmaf ? true, libvmaf , gitUpdater @@ -13,15 +13,25 @@ let in stdenv.mkDerivation rec { pname = "libaom"; - version = "3.9.1"; + version = "3.10.0"; src = fetchzip { url = "https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz"; - hash = "sha256-XQ1sekNZDUAiYP/HriYRj4+40PAvE/OiyG9bbrdg63I="; + hash = "sha256-7xtIT8zalh1XJfVKWeC/+jAkhOuFHw6Q0+c2YMtDark="; stripRoot = false; }; - patches = [ ./outputs.patch ]; + patches = [ + ./outputs.patch + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + # This patch defines `_POSIX_C_SOURCE`, which breaks system headers + # on Darwin. + (fetchurl { + name = "musl.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libaom/files/libaom-3.4.0-posix-c-source-ftello.patch?id=50c7c4021e347ee549164595280cf8a23c960959"; + hash = "sha256-6+u7GTxZcSNJgN7D+s+XAVwbMnULufkTcQ0s7l+Ydl0="; + }) + ]; nativeBuildInputs = [ yasm perl cmake pkg-config python3 diff --git a/third_party/nixpkgs/pkgs/development/libraries/libavif/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libavif/default.nix index 8e7ebeb0a2..060d653bdb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libavif/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libavif/default.nix @@ -19,13 +19,13 @@ in stdenv.mkDerivation rec { pname = "libavif"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "AOMediaCodec"; repo = pname; rev = "v${version}"; - hash = "sha256-yNJiMTWgOKR1c2pxTkLY/uPWGIY4xgH+Ee0r15oroDU="; + hash = "sha256-kop1S4A/+hP2YdgoMXP7OMVPc2eoRnHpoBrPnW6KWyM="; }; # reco: encode libaom slowest but best, decode dav1d fastest diff --git a/third_party/nixpkgs/pkgs/development/libraries/libblocksruntime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libblocksruntime/default.nix index 0ab3800644..7485e230d6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libblocksruntime/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libblocksruntime/default.nix @@ -1,31 +1,42 @@ -{ lib, stdenv, fetchFromGitHub, clang }: +{ + lib, + stdenv, + fetchFromGitHub, +}: stdenv.mkDerivation { pname = "blocksruntime"; - version = "unstable-2014-06-24"; + version = "unstable-2017-10-28"; src = fetchFromGitHub { owner = "mackyle"; repo = "blocksruntime"; - rev = "b5c5274daf1e0e46ecc9ad8f6f69889bce0a0a5d"; - sha256 = "0ic4lagagkylcvwgf10mg0s1i57h4i25ds2fzvms22xj4zwzk1sd"; + rev = "9cc93ae2b58676c23fd02cf0c686fa15b7a3ff81"; + sha256 = "sha256-pQMNZBgkF4uADOVCWXB5J3qQt8JMe8vo6ZmbtSVA5Xo="; }; - buildInputs = [ clang ]; - - configurePhase = '' - export CC=clang - export CXX=clang++ + buildPhase = '' + runHook preBuild + ./buildlib ${lib.optionalString (!stdenv.hostPlatform.isStatic) "-shared"} + runHook postBuild ''; - buildPhase = "./buildlib"; + installPhase = '' + runHook preInstall + prefix="/" DESTDIR=$out ./installlib ${ + if stdenv.hostPlatform.isStatic then "-static" else "-shared" + } + runHook postInstall + ''; - checkPhase = "./checktests"; + checkPhase = '' + runHook preCheck + ./checktests + runHook postChck + ''; doCheck = false; # hasdescriptor.c test fails, hrm. - installPhase = ''prefix="/" DESTDIR=$out ./installlib''; - meta = with lib; { description = "Installs the BlocksRuntime library from the compiler-rt"; homepage = "https://github.com/mackyle/blocksruntime"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcdada/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcdada/default.nix index 8b1e4e0c7a..bb0593c1bf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcdada/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcdada/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libcdada"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "msune"; repo = "libcdada"; rev = "v${version}"; - hash = "sha256-fgH4gl8Uq8mY9gxa968suU66VJYnFzpSLj4JGpJcJA4="; + hash = "sha256-x//22FvgxIGL9H2whMAVCTyI9gAjlMWkEmpOAcoeOgE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcddb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcddb/default.nix index 11a0c259df..56459fe07d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcddb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcddb/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { "ac_cv_func_realloc_0_nonnull=yes" ]; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + }; + doCheck = false; # fails 3 of 5 tests with locale errors meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcdio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcdio/default.nix index 9f0d8689f3..62eb37e34a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcdio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcdio/default.nix @@ -35,6 +35,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdeflate/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdeflate/default.nix index c59ace0aa2..5f62f8b706 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdeflate/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdeflate/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libdeflate"; - version = "1.20"; + version = "1.21"; src = fetchFromGitHub { owner = "ebiggers"; repo = "libdeflate"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-kHLdu/Pb94+arj98Jjp57FpvWbAXW49s9cxCA1cf898="; + sha256 = "sha256-JsPvftpl9drmhlNdqorr92q7dnYzXpIIO8prMPPGHFk="; }; cmakeFlags = lib.optionals stdenv.hostPlatform.isStatic [ "-DLIBDEFLATE_BUILD_SHARED_LIB=OFF" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdrm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdrm/default.nix index f4d5472232..bb81836e13 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdrm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdrm/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "libdrm"; - version = "2.4.122"; + version = "2.4.123"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-2fUHm3d9/8qTAMzFaxCpNYjN+8nd4vrhEZQN+2KS8lE="; + hash = "sha256-ormFZ6FJp0sPUOkegl+cAxXYbnvpt0OU2uiymMqtt54="; }; outputs = [ "out" "dev" "bin" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgee/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgee/default.nix index 4cbaf91689..60696e3822 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgee/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgee/default.nix @@ -37,6 +37,8 @@ stdenv.mkDerivation (finalAttrs: { NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0"; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; + } // lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix index c196b13755..31f4130d66 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix @@ -47,6 +47,10 @@ stdenv.mkDerivation rec { # These are mentioned in the Requires line of libgphoto's pkg-config file. propagatedBuildInputs = [ libexif ]; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + }; + hardeningDisable = [ "format" ]; postInstall = diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgpod/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgpod/default.nix index a81f9587b3..5d4e0253be 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgpod/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgpod/default.nix @@ -67,6 +67,13 @@ stdenv.mkDerivation rec { libimobiledevice ]; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-int" + "-Wno-error=incompatible-pointer-types" + ]; + }; + meta = with lib; { homepage = "https://sourceforge.net/projects/gtkpod/"; description = "Library used by gtkpod to access the contents of an ipod"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libime/default.nix index a1f7f50a25..c7bd59d016 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libime/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libime/default.nix @@ -13,29 +13,29 @@ let tableVer = "20240108"; table = fetchurl { - url = "https://download.fcitx-im.org/data/table-${tableVer}.tar.gz"; - hash = "sha256-cpxZbYaQfecnx00Pw/0kHEBsXevStMt07v4CI4funa4="; + url = "https://download.fcitx-im.org/data/table-${tableVer}.tar.zst"; + hash = "sha256-Pp2HsEo5PxMXI0csjqqGDdI8N4o9T2qQBVE7KpWzYUs="; }; - arpaVer = "20230712"; + arpaVer = "20241001"; arpa = fetchurl { - url = "https://download.fcitx-im.org/data/lm_sc.arpa-${arpaVer}.tar.xz"; - hash = "sha256-ut1iwWxjc3h6D9qPCc1FLRL2DVhohW9lHO7PGge6ujI="; + url = "https://download.fcitx-im.org/data/lm_sc.arpa-${arpaVer}.tar.zst"; + hash = "sha256-VJNOc5Zus46k/o6unGHf5IavN9octTFqBrGcfSieMGM="; }; - dictVer = "20240416"; + dictVer = "20241001"; dict = fetchurl { url = "https://download.fcitx-im.org/data/dict-${dictVer}.tar.zst"; - hash = "sha256-nCYsv6MGy0w7BVmRt+IrRT4PJn8gzrXZ2eX4++Ty02c="; + hash = "sha256-0zE7iKaGIKI7yNX5VkzxtniEjcevVBxPXwIZjlo2hr8="; }; in stdenv.mkDerivation rec { pname = "libime"; - version = "1.1.8"; + version = "1.1.9"; src = fetchFromGitHub { owner = "fcitx"; repo = "libime"; rev = version; - hash = "sha256-uT0V1CXPaF2FctsndxVszS7Qske6vObbOA4aOnmbdQY="; + hash = "sha256-Ky4ERYQRUiPn+EYrgfmfHxdVp31a1oD4nevDniPOT20="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libinput/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libinput/default.nix index 0021f08aa5..bc8977c708 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libinput/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libinput/default.nix @@ -22,6 +22,7 @@ , valgrind , python3 , nixosTests +, wayland-scanner }: let @@ -86,6 +87,7 @@ stdenv.mkDerivation rec { cairo glib gtk3 + wayland-scanner ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libirecovery/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libirecovery/default.nix index 45a4a2b93a..c58287aeda 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libirecovery/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libirecovery/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "libirecovery"; - version = "1.2.0"; + version = "1.2.1"; outputs = [ "out" "dev" ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "libimobiledevice"; repo = pname; rev = version; - hash = "sha256-3C66oNjIZA6Byf1Y2cVQUSLz6Css1y4xFZuQmo7QxMo="; + hash = "sha256-R+oBC7F4op0qoIk3d/WqS4MwzZY3WMAMIqlJfJb188Q="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libkrunfw/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libkrunfw/default.nix index f0341685b5..e56cf67073 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libkrunfw/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libkrunfw/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { }; kernelSrc = fetchurl { - url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.6.52.tar.xz"; + url = "mirror://kernel/linux/kernel/v6.x/linux-6.6.52.tar.xz"; hash = "sha256-FZGrNIOZ1KpTEhFYUlBWppyM8P4OkJNbAJXppY43tLg="; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix index 9a944abbb1..f86e7d2560 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmaxminddb"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { url = meta.homepage + "/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-Xm23LfQjriJb/oiXBp9t70D6qJMfRWuZ15uLTWZMZnE="; + sha256 = "sha256-su6nmpb+13rU1sOew0/tg9Rfy3WjHFiVaBPVjc8wsZ8="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index 21e648e5a9..6eb9ff06f2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "9.0.0"; src = fetchurl { - url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz"; + url = "mirror://mysql/Connector-C++/mysql-connector-c++-${version}-src.tar.gz"; hash = "sha256-7XEbT3sf/fyadgSOGVr/KH4tFd3evgvKhRsJ4UFCKzA="; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libndp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libndp/default.nix index 17831d646c..a8df26fbb9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libndp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libndp/default.nix @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { hash = "sha256-qKshTgHcOpthUnaQU5VjfzkSmMhNd2UfDL8LEILdLdQ="; }; + patches = [ + (fetchurl { + name = "musl.patch"; + url = "https://git.alpinelinux.org/aports/plain/community/libndp/0001-Patch-libndp.c.patch?id=00406a9c697d88f531962cb63e5343488a959b93"; + hash = "sha256-1ZcXgZv3mYtt5NaK4rUMnScWVajlWQ+anzBDS5IfgJI="; + }) + ]; + nativeBuildInputs = [ autoreconfHook ]; configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libogg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libogg/default.nix index ba0338ffd9..ae104d5f8d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libogg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libogg/default.nix @@ -1,17 +1,34 @@ -{ lib, stdenv, fetchurl }: +{ + lib, + stdenv, + fetchurl, + cmake, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libogg"; version = "1.3.5"; src = fetchurl { - url = "http://downloads.xiph.org/releases/ogg/${pname}-${version}.tar.xz"; + url = "http://downloads.xiph.org/releases/ogg/libogg-${finalAttrs.version}.tar.xz"; sha256 = "01b7050bghdvbxvw0gzv588fn4a27zh42ljpwzm4vrf8dziipnf4"; }; - outputs = [ "out" "dev" "doc" ]; + outputs = [ + "out" + "dev" + "doc" + ]; - meta = with lib; { + nativeBuildInputs = [ + # Can also be built with the `./configure` script available in the release, + # however using cmake makes sure the resulting tree would include + # `OggConfig.cmake` and other cmake files useful when packages try to look it + # up with cmake. + cmake + ]; + + meta = { description = "Media container library to manipulate Ogg files"; longDescription = '' Library to work with Ogg multimedia container format. @@ -19,8 +36,8 @@ stdenv.mkDerivation rec { plethora of codecs. Open format free for anyone to use. ''; homepage = "https://xiph.org/ogg/"; - license = licenses.bsd3; - maintainers = [ maintainers.ehmry ]; - platforms = platforms.all; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ ehmry ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpcap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpcap/default.nix index bfc2e3af7b..0825ea3681 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpcap/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpcap/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "libpcap"; - version = "1.10.4"; + version = "1.10.5"; src = fetchurl { url = "https://www.tcpdump.org/release/${pname}-${version}.tar.gz"; - hash = "sha256-7RmgOD+tcuOtQ1/SOdfNgNZJFrhyaVUBWdIORxYOvl8="; + hash = "sha256-N87ZChmjAqfzLkWCJKAMNlwReQXCzTWsVEtogKgUiPA="; }; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libnl ] @@ -54,6 +54,8 @@ stdenv.mkDerivation rec { fi ''; + enableParallelBuilding = true; + passthru.tests = { inherit ettercap nmap ostinato tcpreplay vde2 wireshark; inherit (python3.pkgs) pcapy-ng scapy; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpipeline/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpipeline/default.nix index 885c904433..36ce1ceea9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpipeline/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpipeline/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libpipeline"; - version = "1.5.7"; + version = "1.5.8"; src = fetchurl { url = "mirror://savannah/libpipeline/libpipeline-${version}.tar.gz"; - sha256 = "sha256-uLRRlJiQIqeewTF/ZKKnWxVRsqVb6gb2dwTLKi5GkLA="; + hash = "sha256-GxIDyhUszWOYPD8hEvf+b6Wv1FMhjt5RU9GzHhG7hAU="; }; patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./fix-on-osx.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpwquality/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpwquality/default.nix index fade2a9194..08454fe94d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpwquality/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpwquality/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , autoreconfHook , perl , cracklib @@ -29,6 +30,12 @@ stdenv.mkDerivation rec { patches = [ # ensure python site-packages goes in $py output ./python-binding-prefix.patch + + (fetchpatch { + name = "musl.patch"; + url = "https://github.com/libpwquality/libpwquality/commit/b0fcd96954be89e8c318e5328dd27c40b401de96.patch"; + hash = "sha256-ykN1hcRKyX3QAqWTH54kUjOxN6+IwRpqQVsujTd9XWs="; + }) ]; nativeBuildInputs = [ autoreconfHook perl ] ++ lib.optionals enablePython [ python ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix b/third_party/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix index a747ad8eb8..eace8af815 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix @@ -15,13 +15,14 @@ stdenv.mkDerivation rec { pname = "raptor2"; - version = "unstable-2022-06-06"; + version = "2.0.16"; + underscoredVersion = lib.strings.replaceStrings ["."] ["_"] version; src = fetchFromGitHub { owner = "dajobe"; repo = "raptor"; - rev = "3cca62a33da68143b687c9e486eefc7c7cbb4586"; - sha256 = "sha256-h03IyFH1GHPqajfHBBTb19lCEu+VXzQLGC1wiEGVvgY="; + rev = "${pname}_${underscoredVersion}"; + sha256 = "sha256-Eic63pV2p154YkSmkqWr86fGTr+XmVGy5l5/6q14LQM="; }; cmakeFlags = [ @@ -30,13 +31,7 @@ stdenv.mkDerivation rec { ]; patches = [ - # https://github.com/dajobe/raptor/pull/52 - (fetchpatch { - name = "fix-cmake-generated-pc-file"; - url = "https://github.com/dajobe/raptor/commit/fa1ef9a27d8762f5588ac2e92554a188e73dee9f.diff"; - sha256 = "sha256-zXIbrYGgC9oTpiD0WUikT4vRdc9b6bsyfnDkwUSlqao="; - }) - # pull upstream fix for libxml2-2.11 API compatibility: + # pull upstream fix for libxml2-2.11 API compatibility, part of unreleased 2.0.17 # https://github.com/dajobe/raptor/pull/58 (fetchpatch { name = "libxml2-2.11.patch"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix index 932d0f19a7..5024f36ff2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "librsvg"; - version = "2.58.2"; + version = "2.58.3"; outputs = [ "out" "dev" ] ++ lib.optionals withIntrospection [ "devdoc" @@ -50,13 +50,13 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/librsvg/${lib.versions.majorMinor finalAttrs.version}/librsvg-${finalAttrs.version}.tar.xz"; - hash = "sha256-GOnXDAjPJfUNYQ1tWvVxVh1nz0F5+WLgQmZHXfbi4iQ="; + hash = "sha256-SfKaCpL0wtGaLLQelqsvzn61veQYUMipFPz2VeMRCUQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) src; name = "librsvg-deps-${finalAttrs.version}"; - hash = "sha256-E0bXSxWI0MkJmNvl8gxklXHgy4zlkiee59+s0h4Gw5s="; + hash = "sha256-pTd3H4ZYwsCb4C6gijE0gRWZ4Mq6gGGmwXE3nKGILhw="; # TODO: move this to fetchCargoTarball dontConfigure = true; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsass/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsass/default.nix index aedcafd4ce..c63dd35097 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsass/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsass/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook ]; + enableParallelBuilding = true; + passthru.tests = { inherit gtk3 gtk4 sassc; pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libserialport/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libserialport/default.nix index 0b3314d9b0..4f36267400 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libserialport/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libserialport/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libserialport"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { url = "https://sigrok.org/download/source/libserialport/${pname}-${version}.tar.gz"; - sha256 = "17ajlwgvyyrap8z7f16zcs59pksvncwbmd3mzf98wj7zqgczjaja"; + sha256 = "sha256-XeuStcpywDR7B7eGhINQ3sotz9l1zmE7jg4dlHpLTKk="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libssh/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libssh/default.nix index 15f8fab508..ad6a4322bc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libssh/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libssh/default.nix @@ -15,18 +15,14 @@ stdenv.mkDerivation rec { pname = "libssh"; - version = "0.10.6"; + version = "0.11.1"; src = fetchurl { url = "https://www.libssh.org/files/${lib.versions.majorMinor version}/libssh-${version}.tar.xz"; - hash = "sha256-GGHUmPW28XQbarxz5ghHhJHtz5ydS2Yw7vbnRZbencE="; + hash = "sha256-FLfcxy6R4IFRxYuYGntXCrJmP2MOfSg3ZF1anGEsG3k="; }; - # Do not split 'dev' output until lib/cmake/libssh/libssh-config.cmake - # is fixed to point INTERFACE_INCLUDE_DIRECTORIES to .dev output. - # Otherwise it breaks `plasma5Packages.kio-extras`: - # https://hydra.nixos.org/build/221540008/nixlog/3/tail - #outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" ]; postPatch = '' # Fix headers to use libsodium instead of NaCl @@ -37,13 +33,15 @@ stdenv.mkDerivation rec { # included in `buildInputs` such as libX11. cmakeFlags = [ "-DWITH_EXAMPLES=OFF" ]; - # single output, otherwise cmake and .pc files point to the wrong directory - # outputs = [ "out" "dev" ]; - buildInputs = [ zlib openssl libsodium ]; nativeBuildInputs = [ cmake pkg-config ]; + postFixup = '' + substituteInPlace $dev/lib/cmake/libssh/libssh-config.cmake \ + --replace-fail "set(_IMPORT_PREFIX \"$out\")" "set(_IMPORT_PREFIX \"$dev\")" + ''; + passthru.tests = { inherit ffmpeg sshping wireshark; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtasn1/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtasn1/default.nix index 069d8706e7..9d3e181701 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libtasn1/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libtasn1/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , perl , texinfo @@ -20,14 +19,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-FhPwrBz0hNbsDOO4wG1WJjzHJC8cI7MNgtI940WmP3o="; }; - # Patch borrowed from alpine to work around a specific test failure with musl libc - # Upstream is patching this test in their own CI because that CI is using alpine and thus musl - # https://github.com/gnutls/libtasn1/commit/06e7433c4e587e2ba6df521264138585a63d07c7#diff-037ea159eb0a7cb0ac23b851e66bee30fb838ee8d0d99fa331a1ba65283d37f7R293 - patches = lib.optional stdenv.hostPlatform.isMusl (fetchpatch { - url = "https://git.alpinelinux.org/aports/plain/main/libtasn1/failed-test.patch?id=aaed9995acc1511d54d5d93e1ea3776caf4aa488"; - sha256 = "sha256-GTfwqEelEsGtLEcBwGRfBZZz1vKXRfWXtMx/409YqX8="; - }); - outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtiff/libtiff_t.nix b/third_party/nixpkgs/pkgs/development/libraries/libtiff/libtiff_t.nix deleted file mode 100644 index 37e48f6ea1..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/libtiff/libtiff_t.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib -, stdenv -, fetchzip - -, autoreconfHook -, pkg-config -, sphinx - -, libdeflate -, libjpeg -, xz -, zlib -}: - -# This is a fork created by the hylafaxplus developer to -# restore tools dropped by original libtiff in version 4.6.0. - -stdenv.mkDerivation (finalAttrs: { - pname = "libtiff_t"; - version = "4.6.0t"; - - src = fetchzip { - url = "http://www.libtiff.org/downloads/tiff-${finalAttrs.version}.tar.xz"; - hash = "sha256-9ov4w2jw4LtKr82/4jWMAGhc5GEdviJ7bT+y0+U/Ac4="; - }; - - patches = [ - # FreeImage needs this patch - ./headers.patch - # libc++abi 11 has an `#include `, this picks up files name - # `version` in the project's include paths - ./rename-version.patch - ]; - - postPatch = '' - mv VERSION VERSION.txt - ''; - - outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ]; - - postFixup = '' - moveToOutput include/tif_config.h $dev_private - moveToOutput include/tif_dir.h $dev_private - moveToOutput include/tif_hash_set.h $dev_private - moveToOutput include/tiffiop.h $dev_private - ''; - - # If you want to change to a different build system, please make - # sure cross-compilation works first! - nativeBuildInputs = [ autoreconfHook pkg-config sphinx ]; - - # TODO: opengl support (bogus configure detection) - propagatedBuildInputs = [ - libdeflate - libjpeg - xz - zlib - ]; - - enableParallelBuilding = true; - - doCheck = true; - - meta = with lib; { - description = "Library and utilities for working with the TIFF image file format (fork containing tools dropped in original libtiff version)"; - homepage = "http://www.libtiff.org"; - changelog = "http://www.libtiff.org/releases/v${finalAttrs.version}.html"; - maintainers = with maintainers; [ yarny ]; - license = licenses.libtiff; - platforms = platforms.unix ++ platforms.windows; - pkgConfigModules = [ "libtiff-4" ]; - }; -}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libudev-zero/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libudev-zero/default.nix index ffacc906b4..82bc25cca5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libudev-zero/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libudev-zero/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libudev-zero"; version = "1.0.3"; src = fetchFromGitHub { owner = "illiliti"; repo = "libudev-zero"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-NXDof1tfr66ywYhCBDlPa+8DUfFj6YH0dvSaxHFqsXI="; }; @@ -19,12 +19,17 @@ stdenv.mkDerivation rec { installTargets = lib.optionals stdenv.hostPlatform.isStatic "install-static"; + passthru.tests = { + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + meta = with lib; { homepage = "https://github.com/illiliti/libudev-zero"; description = "Daemonless replacement for libudev"; changelog = "https://github.com/illiliti/libudev-zero/releases/tag/${version}"; maintainers = with maintainers; [ qyliss shamilton ]; license = licenses.isc; + pkgConfigModules = [ "libudev" ]; platforms = platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/liburcu/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liburcu/default.nix index b1a091d12b..1759fab7d3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liburcu/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liburcu/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - version = "0.14.0"; + version = "0.14.1"; pname = "liburcu"; src = fetchurl { url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; - sha256 = "sha256-ykO/Jh1NOSz/IN+uRAg2YDvwCfziT9ybJpfYN6IjnU8="; + hash = "sha256-IxrLE9xuwCPoNqDwZm9qq0fcYh7LHSzZ2cIvkiZ4q8A="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libx86/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libx86/default.nix index 69b4ec4a32..0c7c981f82 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libx86/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libx86/default.nix @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { sed -e s@/usr@@ -i Makefile ''; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + }; + meta = with lib; { description = "Real-mode x86 code emulator"; maintainers = with maintainers; [ raskin ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxml2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxml2/default.nix index 66f16b11a7..6924c71fab 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxml2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxml2/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libxml2"; - version = "2.13.3"; + version = "2.13.4"; outputs = [ "bin" "dev" "out" "devdoc" ] ++ lib.optional pythonSupport "py" @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor finalAttrs.version}/libxml2-${finalAttrs.version}.tar.xz"; - hash = "sha256-CAXXwYDPCcqtcWZsekWKdPBBVhpTKQJFTaUEfYOUgTg="; + hash = "sha256-ZdBC4cgBAkPmF++wKv2iC4XCFgrNv7y1smuAzsZRVlA="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/lief/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lief/default.nix index 1e9a95bc4e..1cb0da7007 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lief/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lief/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ninja ]; - # Not a propagatedBuildInput because only the $py output needs it; $out is + # Not in propagatedBuildInputs because only the $py output needs it; $out is # just the library itself (e.g. C/C++ headers). buildInputs = with python.pkgs; [ python diff --git a/third_party/nixpkgs/pkgs/development/libraries/liquidfun/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liquidfun/default.nix index 6ab138016d..2e12f59034 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liquidfun/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liquidfun/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sourceRoot = "liquidfun/Box2D"; - preConfigurePhases = "preConfigure"; + preConfigurePhases = [ "preConfigure" ]; preConfigure = '' sed -i Box2D/Common/b2Settings.h -e 's@b2_maxPolygonVertices .*@b2_maxPolygonVertices 15@' diff --git a/third_party/nixpkgs/pkgs/development/libraries/mathgl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mathgl/default.nix index e2dc599c4f..c5cddcc46c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mathgl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mathgl/default.nix @@ -8,11 +8,11 @@ }: stdenv.mkDerivation rec { pname = "mathgl"; - version = "8.0.1"; + version = "8.0.2"; src = fetchurl { url = "mirror://sourceforge/mathgl/mathgl-${version}.tar.gz"; - sha256 = "sha256-yoS/lIDDntMRLpIMFs49jyiYaY9iiW86V3FBKGIqVao="; + sha256 = "sha256-cWYJlWhKawooI/Z49sQ4q6ukdKEVJGzfX5sLRgq/ysE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/mbedtls/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/mbedtls/generic.nix index e87a133eb2..14545a2710 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mbedtls/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mbedtls/generic.nix @@ -47,6 +47,10 @@ stdenv.mkDerivation rec { "-DGEN_FILES=off" ]; + env = lib.optionalAttrs (stdenv.cc.isGNU && (lib.versionAtLeast (lib.getVersion stdenv.cc.cc) "14")) { + NIX_CFLAGS_COMPILE = "-Wno-error=calloc-transposed-args"; + }; + doCheck = true; # Parallel checking causes test failures diff --git a/third_party/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix index cdd1eb3bdb..03efb5d57a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix @@ -3,7 +3,7 @@ , cmake , fetchFromGitLab , fetchpatch2 -, ffmpeg_7 +, ffmpeg , glew , gsm , lib @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { bzrtp ortp - ffmpeg_7 + ffmpeg glew libX11 libXext diff --git a/third_party/nixpkgs/pkgs/development/libraries/mesa/common.nix b/third_party/nixpkgs/pkgs/development/libraries/mesa/common.nix index c78a3c31e0..0261d48390 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mesa/common.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mesa/common.nix @@ -5,14 +5,14 @@ # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa rec { pname = "mesa"; - version = "24.2.2"; + version = "24.2.4"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "mesa"; rev = "mesa-${version}"; - hash = "sha256-1aRnG5BnFDuBOnGIb7X3yDk4PkhpBbMpp+IjfpmgtkM="; + hash = "sha256-pgyvgMHImWO+b4vpCCe4+zOI98XCqcG8NRWpIcImGUk="; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/msgpack-c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/msgpack-c/default.nix index 3d8cae18ac..103831e7c0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/msgpack-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/msgpack-c/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "msgpack-c"; - version = "6.0.2"; + version = "6.1.0"; src = fetchFromGitHub { owner = "msgpack"; repo = "msgpack-c"; rev = "refs/tags/c-${finalAttrs.version}"; - hash = "sha256-Tjgn9ayyPK1mKA4OBr7/VogSzJwh5RZR5BrMNadfqak="; + hash = "sha256-yL1+6w9l1Ccgrh8WXqvHv2yrb9QH+TrHIAFLXGoVuT0="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nghttp2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nghttp2/default.nix index 19265cbe16..77de8633b9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nghttp2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nghttp2/default.nix @@ -32,11 +32,11 @@ assert enableJemalloc -> enableApp; stdenv.mkDerivation rec { pname = "nghttp2"; - version = "1.62.1"; + version = "1.63.0"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-OWbsgv2n/DgFBtNyomDY2bbpRr5N6u8f7MGnS0gJrj0="; + sha256 = "sha256-YHsXRVTSKoKLxTLR1zT+D3KbXV7SB/LxLpamLoPynFU="; }; outputs = [ "out" "dev" "lib" "doc" "man" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nix-plugins/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nix-plugins/default.nix index 8714c6b403..0da1d1d917 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nix-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nix-plugins/default.nix @@ -2,18 +2,21 @@ stdenv.mkDerivation rec { pname = "nix-plugins"; - version = "14.0.0"; + version = "15.0.0"; src = fetchFromGitHub { owner = "shlevy"; repo = "nix-plugins"; rev = version; - hash = "sha256-RDKAuLwcZ3Pbn5JUDmGBcfD0xbM6Jud2ouXh/YKpfS8="; + hash = "sha256-C4VqKHi6nVAHuXVhqvTRRyn0Bb619ez4LzgUWPH1cbM="; }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ nix boost ]; + buildInputs = [ + nix + boost + ]; meta = { description = "Collection of miscellaneous plugins for the nix expression language"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nng/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nng/default.nix index 612f8e3845..9016424d4b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nng/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nng/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nng"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "nanomsg"; repo = "nng"; rev = "v${version}"; - hash = "sha256-E2uosZrmxO3fqwlLuu5e36P70iGj5xUlvhEb+1aSvOA="; + hash = "sha256-N1ZMILrFhdkwU4PK/zlSCgGjOm0748fgvZRrk7I9YVg="; }; nativeBuildInputs = [ cmake ninja ] diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix index e9f3e0794d..5b84417830 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { libXi ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Cocoa; + NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; + meta = with lib; { description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; homepage = "https://www.opencascade.org/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openssl/3.3/CVE-2024-5535.patch b/third_party/nixpkgs/pkgs/development/libraries/openssl/3.3/CVE-2024-5535.patch deleted file mode 100644 index 2d0f822b25..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/openssl/3.3/CVE-2024-5535.patch +++ /dev/null @@ -1,108 +0,0 @@ -From e86ac436f0bd54d4517745483e2315650fae7b2c Mon Sep 17 00:00:00 2001 -From: Matt Caswell -Date: Fri, 31 May 2024 11:14:33 +0100 -Subject: [PATCH] Fix SSL_select_next_proto - -Ensure that the provided client list is non-NULL and starts with a valid -entry. When called from the ALPN callback the client list should already -have been validated by OpenSSL so this should not cause a problem. When -called from the NPN callback the client list is locally configured and -will not have already been validated. Therefore SSL_select_next_proto -should not assume that it is correctly formatted. - -We implement stricter checking of the client protocol list. We also do the -same for the server list while we are about it. - -CVE-2024-5535 - -Reviewed-by: Tomas Mraz -Reviewed-by: Neil Horman -(Merged from https://github.com/openssl/openssl/pull/24716) - -(cherry picked from commit 2ebbe2d7ca8551c4cb5fbb391ab9af411708090e) ---- - ssl/ssl_lib.c | 63 ++++++++++++++++++++++++++++++++------------------- - 1 file changed, 40 insertions(+), 23 deletions(-) - -diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c -index 5ec6ac4b63dc5..4c20ac4bf1fe7 100644 ---- a/ssl/ssl_lib.c -+++ b/ssl/ssl_lib.c -@@ -3530,37 +3530,54 @@ int SSL_select_next_proto(unsigned char **out, unsigned char *outlen, - unsigned int server_len, - const unsigned char *client, unsigned int client_len) - { -- unsigned int i, j; -- const unsigned char *result; -- int status = OPENSSL_NPN_UNSUPPORTED; -+ PACKET cpkt, csubpkt, spkt, ssubpkt; -+ -+ if (!PACKET_buf_init(&cpkt, client, client_len) -+ || !PACKET_get_length_prefixed_1(&cpkt, &csubpkt) -+ || PACKET_remaining(&csubpkt) == 0) { -+ *out = NULL; -+ *outlen = 0; -+ return OPENSSL_NPN_NO_OVERLAP; -+ } -+ -+ /* -+ * Set the default opportunistic protocol. Will be overwritten if we find -+ * a match. -+ */ -+ *out = (unsigned char *)PACKET_data(&csubpkt); -+ *outlen = (unsigned char)PACKET_remaining(&csubpkt); - - /* - * For each protocol in server preference order, see if we support it. - */ -- for (i = 0; i < server_len;) { -- for (j = 0; j < client_len;) { -- if (server[i] == client[j] && -- memcmp(&server[i + 1], &client[j + 1], server[i]) == 0) { -- /* We found a match */ -- result = &server[i]; -- status = OPENSSL_NPN_NEGOTIATED; -- goto found; -+ if (PACKET_buf_init(&spkt, server, server_len)) { -+ while (PACKET_get_length_prefixed_1(&spkt, &ssubpkt)) { -+ if (PACKET_remaining(&ssubpkt) == 0) -+ continue; /* Invalid - ignore it */ -+ if (PACKET_buf_init(&cpkt, client, client_len)) { -+ while (PACKET_get_length_prefixed_1(&cpkt, &csubpkt)) { -+ if (PACKET_equal(&csubpkt, PACKET_data(&ssubpkt), -+ PACKET_remaining(&ssubpkt))) { -+ /* We found a match */ -+ *out = (unsigned char *)PACKET_data(&ssubpkt); -+ *outlen = (unsigned char)PACKET_remaining(&ssubpkt); -+ return OPENSSL_NPN_NEGOTIATED; -+ } -+ } -+ /* Ignore spurious trailing bytes in the client list */ -+ } else { -+ /* This should never happen */ -+ return OPENSSL_NPN_NO_OVERLAP; - } -- j += client[j]; -- j++; - } -- i += server[i]; -- i++; -+ /* Ignore spurious trailing bytes in the server list */ - } - -- /* There's no overlap between our protocols and the server's list. */ -- result = client; -- status = OPENSSL_NPN_NO_OVERLAP; -- -- found: -- *out = (unsigned char *)result + 1; -- *outlen = result[0]; -- return status; -+ /* -+ * There's no overlap between our protocols and the server's list. We use -+ * the default opportunistic protocol selected earlier -+ */ -+ return OPENSSL_NPN_NO_OVERLAP; - } - - #ifndef OPENSSL_NO_NEXTPROTONEG diff --git a/third_party/nixpkgs/pkgs/development/libraries/openssl/3.2/use-etc-ssl-certs-darwin.patch b/third_party/nixpkgs/pkgs/development/libraries/openssl/3.3/use-etc-ssl-certs-darwin.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/openssl/3.2/use-etc-ssl-certs-darwin.patch rename to third_party/nixpkgs/pkgs/development/libraries/openssl/3.3/use-etc-ssl-certs-darwin.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/openssl/3.2/use-etc-ssl-certs.patch b/third_party/nixpkgs/pkgs/development/libraries/openssl/3.3/use-etc-ssl-certs.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/openssl/3.2/use-etc-ssl-certs.patch rename to third_party/nixpkgs/pkgs/development/libraries/openssl/3.3/use-etc-ssl-certs.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix index 40edcdee6b..3dee6474ad 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, buildPackages, perl, coreutils, writeShellScript -, makeWrapper +, makeBinaryWrapper , withCryptodev ? false, cryptodev , withZlib ? false, zlib , enableSSL2 ? false @@ -25,7 +25,13 @@ let inherit version; src = fetchurl { - url = "https://www.openssl.org/source/openssl-${version}.tar.gz"; + url = if lib.versionOlder version "3.0" then + let + versionFixed = builtins.replaceStrings ["."] ["_"] version; + in + "https://github.com/openssl/openssl/releases/download/OpenSSL_${versionFixed}/openssl-${version}.tar.gz" + else + "https://github.com/openssl/openssl/releases/download/openssl-${version}/openssl-${version}.tar.gz"; inherit hash; }; @@ -71,7 +77,7 @@ let stdenv.cc.isGNU; nativeBuildInputs = - lib.optional (!stdenv.hostPlatform.isWindows) makeWrapper + lib.optional (!stdenv.hostPlatform.isWindows) makeBinaryWrapper ++ [ perl ] ++ lib.optionals static [ removeReferencesTo ]; buildInputs = lib.optional withCryptodev cryptodev @@ -216,8 +222,8 @@ let rm -r $etc/etc/ssl/misc rmdir $etc/etc/ssl/{certs,private} - - ${lib.optionalString (conf != null) "cat ${conf} > $etc/etc/ssl/openssl.cnf"} + '' + lib.optionalString (conf != null) '' + cat ${conf} > $etc/etc/ssl/openssl.cnf ''; postFixup = lib.optionalString (!stdenv.hostPlatform.isWindows) '' @@ -227,6 +233,10 @@ let echo "Found an erroneous dependency on perl ^^^" >&2 exit 1 fi + '' + lib.optionalString (lib.versionAtLeast version "3.3.0") '' + # cleanup cmake helpers for now (for OpenSSL >= 3.3), only rely on pkg-config. + # pkg-config gets its paths fixed correctly + rm -rf $dev/lib/cmake ''; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -280,8 +290,8 @@ in { }; openssl_3 = common { - version = "3.0.14"; - hash = "sha256-7soDXU3U6E/CWEbZUtpil0hK+gZQpvhMaC453zpBI8o="; + version = "3.0.15"; + hash = "sha256-I8Zm0O3yDxQkmz2PA2isrumrWFsJ4d6CEHxm4fPslTM="; patches = [ ./3.0/nix-ssl-cert-file.patch @@ -290,8 +300,6 @@ in { # This patch disables build-time detection. ./3.0/openssl-disable-kernel-detection.patch - ./3.3/CVE-2024-5535.patch - (if stdenv.hostPlatform.isDarwin then ./use-etc-ssl-certs-darwin.patch else ./use-etc-ssl-certs.patch) @@ -304,34 +312,9 @@ in { }; }; - openssl_3_2 = common { - version = "3.2.2"; - hash = "sha256-GXFJwY2enyksQ/BACsq6EuX1LKz+BQ89GZJ36nOOwuc="; - - patches = [ - ./3.0/nix-ssl-cert-file.patch - - # openssl will only compile in KTLS if the current kernel supports it. - # This patch disables build-time detection. - ./3.0/openssl-disable-kernel-detection.patch - - ./3.3/CVE-2024-5535.patch - - (if stdenv.hostPlatform.isDarwin - then ./3.2/use-etc-ssl-certs-darwin.patch - else ./3.2/use-etc-ssl-certs.patch) - ]; - - withDocs = true; - - extraMeta = { - license = lib.licenses.asl20; - }; - }; - openssl_3_3 = common { - version = "3.3.1"; - hash = "sha256-d3zVlihMiDN1oqehG/XSeG/FQTJV76sgxQ1v/m0CC34="; + version = "3.3.2"; + hash = "sha256-LopAsBl5r+i+C7+z3l3BxnCf7bRtbInBDaEUq1/D0oE="; patches = [ ./3.0/nix-ssl-cert-file.patch @@ -340,11 +323,9 @@ in { # This patch disables build-time detection. ./3.0/openssl-disable-kernel-detection.patch - ./3.3/CVE-2024-5535.patch - (if stdenv.hostPlatform.isDarwin - then ./3.2/use-etc-ssl-certs-darwin.patch - else ./3.2/use-etc-ssl-certs.patch) + then ./3.3/use-etc-ssl-certs-darwin.patch + else ./3.3/use-etc-ssl-certs.patch) ]; withDocs = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pangolin/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pangolin/default.nix index 1dd52ab7ff..7b26f3f12f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pangolin/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pangolin/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen, libGL, glew -, xorg, ffmpeg_7, libjpeg, libpng, libtiff, eigen +, xorg, ffmpeg, libjpeg, libpng, libtiff, eigen , Carbon, Cocoa }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { libGL glew xorg.libX11 - ffmpeg_7 + ffmpeg libjpeg libpng libtiff diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix index 9a42e693da..e4cf47683e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fastjet-contrib"; - version = "1.053"; + version = "1.055"; src = fetchurl { url = "https://fastjet.hepforge.org/contrib/downloads/fjcontrib-${version}.tar.gz"; - sha256 = "sha256-sSokjgsUOTTJnjt8jdgyZRIvbGwJUzwqA99E9e/x5vo="; + sha256 = "sha256-2apGVg/f2FCC8gKlqc5kdo/gxZhmDwEyBqjJwX7NDzY="; }; buildInputs = [ fastjet ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix index 2ffd9eb2bf..84be326dd5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation(finalAttrs: { pname = "pipewire"; - version = "1.2.3"; + version = "1.2.5"; outputs = [ "out" @@ -74,7 +74,7 @@ stdenv.mkDerivation(finalAttrs: { owner = "pipewire"; repo = "pipewire"; rev = finalAttrs.version; - sha256 = "sha256-sdbv1PqLMGlRXe42pgNW5tNtQ3tEYWCwndZQQQEM6ig="; + sha256 = "sha256-cYzcEit5zW29GYhvH/pTXqnYFi6AEaS5wl8nD74eWVY="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/plasma-wayland-protocols/default.nix b/third_party/nixpkgs/pkgs/development/libraries/plasma-wayland-protocols/default.nix index 99e8b3fd9d..e0121a04e3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/plasma-wayland-protocols/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/plasma-wayland-protocols/default.nix @@ -7,11 +7,11 @@ mkDerivation rec { pname = "plasma-wayland-protocols"; - version = "1.13.0"; + version = "1.14.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-3Ud+NS9f9uasaGKGxLIrGb9aSSG4XuWn2gK7eqEV1X4="; + hash = "sha256-GkOF7Px591ifBzgcqxHD/1H24vpLc7eGANatCWOUv4E="; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix index 17b325f52d..80a966f035 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix @@ -116,6 +116,17 @@ stdenv.mkDerivation rec { env = { PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; PKG_CONFIG_SYSTEMD_SYSUSERS_DIR = "${placeholder "out"}/lib/sysusers.d"; + + # HACK: We want to install policy files files to $out/share but polkit + # should read them from /run/current-system/sw/share on a NixOS system. + # Similarly for config files in /etc. + # With autotools, it was possible to override Make variables + # at install time but Meson does not support this + # so we need to convince it to install all files to a temporary + # location using DESTDIR and then move it to proper one in postInstall. + DESTDIR = "dest"; + } // lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; }; mesonFlags = [ @@ -131,14 +142,6 @@ stdenv.mkDerivation rec { "-Dsession_tracking=${if useSystemd then "libsystemd-login" else "libelogind"}" ]; - # HACK: We want to install policy files files to $out/share but polkit - # should read them from /run/current-system/sw/share on a NixOS system. - # Similarly for config files in /etc. - # With autotools, it was possible to override Make variables - # at install time but Meson does not support this - # so we need to convince it to install all files to a temporary - # location using DESTDIR and then move it to proper one in postInstall. - env.DESTDIR = "dest"; inherit doCheck; diff --git a/third_party/nixpkgs/pkgs/development/libraries/protobuf/28.nix b/third_party/nixpkgs/pkgs/development/libraries/protobuf/28.nix index 215182b3f4..340bac0ffe 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/protobuf/28.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/protobuf/28.nix @@ -2,8 +2,8 @@ callPackage ./generic.nix ( { - version = "28.0"; - hash = "sha256-dAyXtBPeZAhmAOWbG1Phh57fqMmkH2AbDUr+8A+irJQ="; + version = "28.2"; + hash = "sha256-+ogjfmsbPUhqETJyHxoc1gYW/7a/JMc5l1gb/7WDqLE="; } // args ) diff --git a/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic.nix index 0b52ea7de2..5e212e7f6f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic.nix @@ -18,6 +18,8 @@ , grpc , enableShared ? !stdenv.hostPlatform.isStatic +, testers +, protobuf , ... }: @@ -28,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "protocolbuffers"; repo = "protobuf"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; inherit hash; }; @@ -44,8 +46,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/protocolbuffers/protobuf/commit/a7324f88e92bc16b57f3683403b6c993bf68070b.patch"; hash = "sha256-SmwaUjOjjZulg/wgNmR/F5b8rhYA2wkKAjHIOxjcQdQ="; }) - ] ++ lib.optionals stdenv.hostPlatform.isStatic [ - ./static-executables-have-no-rpath.patch ]; nativeBuildInputs = [ @@ -74,25 +74,26 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals enableShared [ "-Dprotobuf_BUILD_SHARED_LIBS=ON" ] - # Tests fail to build on 32-bit platforms; fixed in 22.x - # https://github.com/protocolbuffers/protobuf/issues/10418 - ++ lib.optionals (stdenv.hostPlatform.is32bit && lib.versionOlder version "22") [ + ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [ "-Dprotobuf_BUILD_TESTS=OFF" ]; - # FIXME: investigate. 24.x and 23.x have different errors. - # At least some of it is not reproduced on some other machine; example: - # https://hydra.nixos.org/build/235677717/nixlog/4/tail - # Also AnyTest.TestPackFromSerializationExceedsSizeLimit fails on 32-bit platforms - # https://github.com/protocolbuffers/protobuf/issues/8460 - doCheck = !(stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "23") && !stdenv.hostPlatform.is32bit; + doCheck = + # FIXME: investigate. 24.x and 23.x have different errors. + # At least some of it is not reproduced on some other machine; example: + # https://hydra.nixos.org/build/235677717/nixlog/4/tail + !(stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "23") + # Tests fail to build on 32-bit platforms; fixed in 22.x + # https://github.com/protocolbuffers/protobuf/issues/10418 + # Also AnyTest.TestPackFromSerializationExceedsSizeLimit fails on 32-bit platforms + # https://github.com/protocolbuffers/protobuf/issues/8460 + && !stdenv.hostPlatform.is32bit; passthru = { tests = { - pythonProtobuf = python3.pkgs.protobuf.override (_: { - protobuf = finalAttrs.finalPackage; - }); + pythonProtobuf = python3.pkgs.protobuf; inherit grpc; + version = testers.testVersion { package = protobuf; }; }; inherit abseil-cpp; @@ -108,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd3; platforms = lib.platforms.all; homepage = "https://protobuf.dev/"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ GaetanLepage ]; mainProgram = "protoc"; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/protobuf/static-executables-have-no-rpath.patch b/third_party/nixpkgs/pkgs/development/libraries/protobuf/static-executables-have-no-rpath.patch deleted file mode 100644 index cd2474e145..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/protobuf/static-executables-have-no-rpath.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/cmake/install.cmake b/cmake/install.cmake -index 26a55be8b..b6823c3f9 100644 ---- a/cmake/install.cmake -+++ b/cmake/install.cmake -@@ -32,13 +32,6 @@ if (protobuf_BUILD_PROTOC_BINARIES) - install(TARGETS protoc EXPORT protobuf-targets - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc - BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc) -- if (UNIX AND NOT APPLE) -- set_property(TARGET protoc -- PROPERTY INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}") -- elseif (APPLE) -- set_property(TARGET protoc -- PROPERTY INSTALL_RPATH "@loader_path/../lib") -- endif() - endif (protobuf_BUILD_PROTOC_BINARIES) - - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/protobuf.pc ${CMAKE_CURRENT_BINARY_DIR}/protobuf-lite.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") diff --git a/third_party/nixpkgs/pkgs/development/libraries/protobufc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/protobufc/default.nix index 5a39725275..7681c5b259 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/protobufc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/protobufc/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , autoreconfHook , pkg-config -, protobuf +, protobuf_25 , zlib , buildPackages }: @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ protobuf zlib ]; + buildInputs = [ protobuf_25 zlib ]; - env.PROTOC = lib.getExe buildPackages.protobuf; + env.PROTOC = lib.getExe buildPackages.protobuf_25; meta = with lib; { homepage = "https://github.com/protobuf-c/protobuf-c/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/psqlodbc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/psqlodbc/default.nix index 18e6bc3b0f..1b162d2393 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/psqlodbc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/psqlodbc/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "16.00.0000"; src = fetchurl { - url = "https://ftp.postgresql.org/pub/odbc/versions.old/src/${pname}-${version}.tar.gz"; + url = "mirror://postgresql/odbc/versions.old/src/${pname}-${version}.tar.gz"; hash = "sha256-r9iS+J0uzujT87IxTxvVvy0CIBhyxuNDHlwxCW7KTIs="; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs-generated.json b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs-generated.json index 96c3621307..7949a05a61 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs-generated.json +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs-generated.json @@ -1,202 +1,202 @@ { "qt3d": { "url": "https://invent.kde.org/qt/qt/qt3d.git", - "rev": "9bf4d03e2515f7c454647d54542330b6e90f8191", - "sha256": "1w1lq332q270vld7sz0xqpa0f7mvi5gizycfsx9zz9c73qy4idlp" + "rev": "84b2eae328fdff5d633af0a9563272c93f6ec074", + "sha256": "0h5jmm02xyfzq9pkba3xl3kw6710azj1plshm4v9brgjq524vkpj" }, "qtactiveqt": { "url": "https://invent.kde.org/qt/qt/qtactiveqt.git", - "rev": "91bfd21f86c450b129ac2dde9d33b32e140d8a0c", - "sha256": "06fbiggjq1c1z1wgx63ir8rj1ppd1c046xwz4nzsrf1pi8dqcyl7" + "rev": "8f8e9fcc03f506cf27b0bb090c5120eaa15c6e19", + "sha256": "10ihi1m6ysqd5mig4bmiv2hq9qs06j9xrc6sx0iy1w0ihnhclzyx" }, "qtandroidextras": { "url": "https://invent.kde.org/qt/qt/qtandroidextras.git", - "rev": "197a7e05cda87a4645f30c8ef5044b342442ebd1", - "sha256": "0j5al7h2gy67cb2lj4yymdsidr1dcvvahqfysbdl2lwz3zzpdql1" + "rev": "305cce86cb62c0d2cac1209dd50f15caf2f21c2a", + "sha256": "1rdlxzr7ld6i0j3xwxwxhf467z46zaycynqhim4mfhi76fi309vz" }, "qtbase": { "url": "https://invent.kde.org/qt/qt/qtbase.git", - "rev": "2b9835f5c9bcfe3105b60a8dd33c1db7d8611378", - "sha256": "1yms1r42yps06bg8gjbzb5y7x03ks11vg97s2j7r1aplp7kjf7wm" + "rev": "ab13e81917207959785ad0185a3a9974e552a7f5", + "sha256": "0p6xymjvhwiqvyh7pn1zkglfjnmhb3c0xfb62xnsd0rbp0xaw7ws" }, "qtcharts": { "url": "https://invent.kde.org/qt/qt/qtcharts.git", - "rev": "7315c48bcec88014e78165bbda54abfcd557e0af", - "sha256": "043lbxkaw53qah9ny4nbpp8g7q4rq9x2k21vkprk7nim66d6pmy3" + "rev": "0c97aae7dc242ac0710e09397672ad878761157a", + "sha256": "1zivl0gzbbfxa2hq4vwi2yc6k9hl9aln4aw96hd9jb7pw2n03crx" }, "qtconnectivity": { "url": "https://invent.kde.org/qt/qt/qtconnectivity.git", - "rev": "99f30db37c63447c59d5fac15bc8feb832a7fd04", - "sha256": "09v76kb7fx7bq4vplyk3cf7il3a6f9p673z1l28nrv4w308bhqfy" + "rev": "f2a9c5d1235d88cc26f2cfa348a037b65e31a5ae", + "sha256": "0r9c7f9g4l4dik1kvs239ahm8hx20kfj2lcd946fn71cz0fqri9z" }, "qtdatavis3d": { "url": "https://invent.kde.org/qt/qt/qtdatavis3d.git", - "rev": "79cd0fb6cafcd42e4037ae1363fda3bc2cec934a", - "sha256": "19y33v3l4crzrk7qf5qhx7phxkiax14c2q4xjd1klw7n333d43cq" + "rev": "e5c03e4431eed6c4654c20fb2d2a20485cff522d", + "sha256": "0s6b3sclyyq6hmmn535ksdkckfw02yqbqzrd502p7fb2cakynhjc" }, "qtdeclarative": { "url": "https://invent.kde.org/qt/qt/qtdeclarative.git", - "rev": "50c8def854806485d66aabcf6918e8b987032e55", - "sha256": "0qvw72w0m1q4yg4l35rh7ydqgp35xqfwpq0pc7q5578n1xspihhn" + "rev": "310c124dac82d711ab15309a9cb0b9d95db9ea8f", + "sha256": "082hp6brizrfr90vla315kjri4ym9vkd1qnjlyx8f9p3sgdmplyn" }, "qtdoc": { "url": "https://invent.kde.org/qt/qt/qtdoc.git", - "rev": "bc4503b8b70f4cd435d6e64a9e6c623ca44b9fcd", - "sha256": "0pvimmw5c6gh6xi2iblzyikgaw7cr8gqjdvyappcahjpalxxsjbw" + "rev": "7c8712064b1aefcf880bbc82138e96bd4909b36e", + "sha256": "06n8mn0y0sjq2znd0k2m5slaf2rcj4p8pxwayp7pyfig3mj9qf34" }, "qtgamepad": { "url": "https://invent.kde.org/qt/qt/qtgamepad.git", - "rev": "b1c2f272f69e222a532485e6f820776c220b3535", - "sha256": "1zga6sa901g0fpqyjlyj73s2f94yjm0z3599gngnlvvd7jsnlgnv" + "rev": "e9109dadba5c8f2419af67139106b4c30f90332e", + "sha256": "1xk42wbpl83rywjscw0kriw4vap2xv41p17pcr8pagrhijnhhjpg" }, "qtgraphicaleffects": { "url": "https://invent.kde.org/qt/qt/qtgraphicaleffects.git", - "rev": "2c39e673d6c15a84dcc7882d3772fa04cc79f9ed", - "sha256": "177xkhi3syx6r3my5rly5bncgjfhdvgrhf6fw5ajqplik6yln4pq" + "rev": "4d3d395d14d4a956ac5b30afa859321c1e1934e4", + "sha256": "1xwq8n2h5079xm1zbyg7nk4ln53pmbjp0s35a6clhcx40mrw9b80" }, "qtimageformats": { "url": "https://invent.kde.org/qt/qt/qtimageformats.git", - "rev": "4e4f5fc6bdac96f5281a3ebeb0fee78df7b1a498", - "sha256": "1w68v55y1l1biv7krzv9vmi2czz84jk89f4pymq3ri1w3y4rc1id" + "rev": "9f658c2093e81d1dc3333e594cc1aa4b0990e221", + "sha256": "13h43hc9yzskqi30yx1wi9ia4nbrgxlwk0zh4dprcwc7p8sgwz76" }, "qtlocation": { "url": "https://invent.kde.org/qt/qt/qtlocation.git", - "rev": "3beb9c810611337fde61d89aa981e9f177a9ede9", - "sha256": "1fwn9x3n01dlkhw53n12z5kb06qj2lmangzvj3fjr5ff0yy47df9" + "rev": "e0a477d04f35495ba6eeda8578d1311dba623270", + "sha256": "104x4drmfxx2d599hzsigiy6m69y0b7n811wgm3wyhqmiay85jvl" }, "qtlottie": { "url": "https://invent.kde.org/qt/qt/qtlottie.git", - "rev": "b8c1fa109dce6f8bff9f55738d2f1e21ff677796", - "sha256": "0qydaqj8945hikby7a9529i0g5ycpvhws6y0zc566jv50qida725" + "rev": "bdbd77ef5529b894699fe8d01642e75230e59f24", + "sha256": "13b4hfnvl9as1bwn2zaw3nlxkd8yg0phssnahc5hw07xm8z11vsm" }, "qtmacextras": { "url": "https://invent.kde.org/qt/qt/qtmacextras.git", - "rev": "e66cba7cf02aa8aecce03540cd167621f2cda5f0", - "sha256": "0q7d3lh3fpkrakxx1sqx9csa7l7rxzskcavbidxb5298jxn49wn8" + "rev": "3ffd97b730fb635e0ada0b5b6f4894a128286cb1", + "sha256": "1fgpm2aa8wc65bq426xckkrwgb2h1c9hl9d454rgl5sl3xg4r61w" }, "qtmultimedia": { "url": "https://invent.kde.org/qt/qt/qtmultimedia.git", - "rev": "53069c9c6eb52b744333812f42aed36c3db6e752", - "sha256": "0y8km2mp5mj1zw1v3acsdvzrc1jyiwpxy3rmif5ssn40wwxifilp" + "rev": "85fe63b98703ced6c5568c52af77b50e6ddf1edc", + "sha256": "129pdvhrahi2r30lfhqjvyird2pb9z58xc807wab779cqi5l2v5g" }, "qtnetworkauth": { "url": "https://invent.kde.org/qt/qt/qtnetworkauth.git", - "rev": "28180f28c98e329676463e24cef0097cba45bc00", - "sha256": "1g6clwmrpdvl9m6flyrk4vlckjnjv3phqhy1xbxlra3zcfn3357r" + "rev": "17d6ed940cea4ead62f4055184d4fc69bf06b789", + "sha256": "0w5225fj5rhzz2jq8qpbaajg011j9xpxb3w83sn9zgnr39jgknl2" }, "qtpurchasing": { "url": "https://invent.kde.org/qt/qt/qtpurchasing.git", - "rev": "d4903bf08c576a6c085278c1960a2676cd83dca7", - "sha256": "04bry3ys15bd6kaiwyb8fh037s50mcplircpzvrwdc1h8milx7y7" + "rev": "6922c0e403e94ac9c2336706bc3df1e2da217a1f", + "sha256": "0jg6z309dj0lm4gdbvqiyprkrqiwr9cg9qhrni2q4dimg7ywci31" }, "qtquick3d": { "url": "https://invent.kde.org/qt/qt/qtquick3d.git", - "rev": "ad229f0c135f74801fba2bcd22c78abc0e3cf1d2", - "sha256": "17jdsahdw72l5lpbng8733qv2fp2qkfzlzrayzigz2slfdqgjxnk" + "rev": "880d7aa04f3cc331c9bc7ba4ca71d7091480ea6d", + "sha256": "1gwsba3zkal7cjninridxvvilrh2iqc2qsrn9izha7m51li1kc7a" }, "qtquickcontrols": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols.git", - "rev": "9325659ec390eda5b160736a926ba58ccb445cce", - "sha256": "0r1kkn6pr6yynk8x2ggkfqqrh27g1qra102ilglj7chsmrp92xgc" + "rev": "fe98f874f89abe9b96edadb812cfa9b1488679f0", + "sha256": "1j843wfhm9xn0sd86faxg0aabdsxyjjvfrq9nfx00r7a0sb1giga" }, "qtquickcontrols2": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git", - "rev": "69fea340f8f4c483a9b2889e4e24a4b1b52ebc87", - "sha256": "0v6g146ryabks0sff5dgyx42690xckaqpx44c6g7x0b0w24lj6ws" + "rev": "d0537c14e71d0959f96592b20103033b128f9c0b", + "sha256": "123njm1ph04l7842c1q01737xfk4hfwpcdlk7pipyfvyjgpyq7bb" }, "qtquicktimeline": { "url": "https://invent.kde.org/qt/qt/qtquicktimeline.git", - "rev": "bf6c73064c82b07fcb1f7e72c263b249e137e224", - "sha256": "0pnn5ds6sxls8i6pzzmraalvln2pabgga3gnv761b2skgkv26gnq" + "rev": "a0a95b50f2477823f9400b07e76e516555f16dc0", + "sha256": "0kcxjgcqs7l5yvxl53a7sr7sk959r3wcwyg6w5krbk0sf9sdf48b" }, "qtremoteobjects": { "url": "https://invent.kde.org/qt/qt/qtremoteobjects.git", - "rev": "3873bdc809ca8d58d91968cb0de34da26646bc79", - "sha256": "0bncsi45zjwd6q3g40gxdqxqq4zhjrgw7xnxj1v53npbyw4vd0h5" + "rev": "289bbabdff28b4362351f3d91abf75130c9cf666", + "sha256": "11x172lkajaqq2d7hyd30wny5mi6hw4p78nqhj0j2gh3kpw6x06c" }, "qtscxml": { "url": "https://invent.kde.org/qt/qt/qtscxml.git", - "rev": "6834b183966d08d9f061642ee7ea2d482cbbf073", - "sha256": "1h88idcfcsbpx2x2djcg1lzazadm676miz19x6n0n6n4gwp46738" + "rev": "02e1e963ec9492bb1620b3ac3fc6ffc2ff280778", + "sha256": "01m13rz3df05n2c44a16l532faj3516903p1zhp0b3hlgy2jw6k9" }, "qtsensors": { "url": "https://invent.kde.org/qt/qt/qtsensors.git", - "rev": "bf0b718cd0b6c7823e9d2037d3bdece44185f444", - "sha256": "1my7ls1nsaf26kh3hn75jjnxp6gm0ilyfzcczqps0xj7xj9bzwzd" + "rev": "b97c60bee7505eb3901579abc4751f35ba7b303e", + "sha256": "0i60av9ykbsgxizw9i31mnfr87fm4kygwdmcxk4829pmscvcv91s" }, "qtserialbus": { "url": "https://invent.kde.org/qt/qt/qtserialbus.git", - "rev": "616bc5b962cdcacb1c1ba985d7236392e9cadb8c", - "sha256": "0njahb52kshci23xw89j1rgffmrmric8kz54dzmqsmlcqp181qkh" + "rev": "77dae896b13e36969fefdfa25d711e455d58597b", + "sha256": "08yr35mzzyqianhi66bd3iaw48yynrfv6izqsp23s5bggh5arh9r" }, "qtserialport": { "url": "https://invent.kde.org/qt/qt/qtserialport.git", - "rev": "34c19c6441cd440dc65b59ae7670eadf099d51f8", - "sha256": "0hiqfvz5jc6ha6ln8jl8vv4ijsdz55f3zp801dbh2r68cmf9qsrm" + "rev": "aa2ffdbd7295db9e5814070d1432a0b77c59cfce", + "sha256": "08lqzygmb40b060g47zqfxs87s1s0946xy18c7jsqy0i6cl6wl1k" }, "qtspeech": { "url": "https://invent.kde.org/qt/qt/qtspeech.git", - "rev": "8ad0f08ad7e2a8d27dc5e69806812c6a3f298946", - "sha256": "0pyiiqj18c2gvbqvgnaki2hzcizi1lam82x761y2lp717sgb09v9" + "rev": "71574a57103f0da64ce5e4c0ac6d70141496d5e8", + "sha256": "1kjpx8v80r9hp2ispgz2gxrhs8l09zpq09ylwc69gxqr6y7xrjj8" }, "qtsvg": { "url": "https://invent.kde.org/qt/qt/qtsvg.git", - "rev": "690128b2b8fb6d6fbdc43b2b2633f0f1de3f0638", - "sha256": "1iiml673isnqakjzspq5gf6818zmmd7pj6z9y2jwxb2xkkn8ahpc" + "rev": "26fdcaff0d3d6bf6f5c847e833006577a6e8ba7d", + "sha256": "0n4m6a6v66fdx4cyiyzaqqgyryf4n350xzxmibr7rrbzz7z8afrz" }, "qttools": { "url": "https://invent.kde.org/qt/qt/qttools.git", - "rev": "f82ed367d1b80b69d738cfcde534b75854a45476", - "sha256": "1pv7af4z3f9d1ifqjwbf7fhgglpnjfby8h2fg5h114mpils661bn" + "rev": "0378d3e541f40bc9c5433eac70d3949ddff9cfc4", + "sha256": "0jzncvjp07gwykfxp9nrp2nbcrfpjlpy6r2cgb8wqq1pkjy0nkg4" }, "qttranslations": { "url": "https://invent.kde.org/qt/qt/qttranslations.git", - "rev": "c601106c8b5d5495f951c8ea0ad6a9e171416ae0", - "sha256": "0w8ggzc4sxfa1y3n40m24zxp59c2y1mfb2c7zdd8nmlrg7xnqsf0" + "rev": "07ae7ea7c94225e73c8eddc9f3f89edc863e83e0", + "sha256": "177g0iavfk5kim8wibfa5d4h23cf0kfhx7hmaz20afwf5cwxb47z" }, "qtvirtualkeyboard": { "url": "https://invent.kde.org/qt/qt/qtvirtualkeyboard.git", - "rev": "7389450a5de5fdd210f1459abcf73621ec0496bd", - "sha256": "1hv8yi4lq3mdxqkcln2b75drdyfiaqj63khzvy09gdf1x6fyjnn5" + "rev": "e62c1219caef25182ba85383834be04eefce12bf", + "sha256": "09rhxkycz4w5k800sd88mzg8dd0gjbry4ylcj1pbhvnm6xrzw6fz" }, "qtwayland": { "url": "https://invent.kde.org/qt/qt/qtwayland.git", - "rev": "75f434f14499eb47ede2cb66f0946527bf555791", - "sha256": "17d7bcc3v55ywakaybp88c493bfx63vyiz7n8f5kcijj5q5hdf1r" + "rev": "6b1ba1cd0e1389d13e59b94e65da8f20a89ba03f", + "sha256": "127s7b76f7k1iha3crdv0z5gvm65g3lk97jzp7wl1afmv2vnfq7v" }, "qtwebchannel": { "url": "https://invent.kde.org/qt/qt/qtwebchannel.git", - "rev": "fca83088ef430f96257d2014e77d08bd350259af", - "sha256": "1jc7myns24mzfnfybzzjqkpnl235c0fm0zqkai55xwi3vcv9xyr5" + "rev": "ad85920e02049bf7ba06366046498e8366a98e8e", + "sha256": "1z28ass00f7jm2wq5kb3rkx6q861092gvpb58ivnqn753jd95ban" }, "qtwebglplugin": { "url": "https://invent.kde.org/qt/qt/qtwebglplugin.git", - "rev": "3681356904277e055759693551357e7e488d1be9", - "sha256": "14v9r4mhqq453dzkc5gvv660gq11zsmzngvwgi44srhzcx7k1qqv" + "rev": "0d29f1cd46331caf1b5169eb037d573680454348", + "sha256": "1ar4fs9c5av8zy19k05ygkzwcsv131c561z349wzxbj9j5qyzb6d" }, "qtwebsockets": { "url": "https://invent.kde.org/qt/qt/qtwebsockets.git", - "rev": "dbbdc64b804f7c4d0ed92198aaab49b07fa15e7f", - "sha256": "1gbgga8qy26nxxq0537hm3h6la04xb6m4cc2aifjhhhj8py95170" + "rev": "0231c7c3a17c0320601e7766e7e701db5b9eb0dc", + "sha256": "020lynaz4aw84y2dkc72nckhlpmv41nwfdssr1s8a27r4dk58p5a" }, "qtwebview": { "url": "https://invent.kde.org/qt/qt/qtwebview.git", - "rev": "bbb1891595aba23ff3c6d137aa74442f9e54479b", - "sha256": "0j59r6dj4wvassng39whnidd6nzhndwssfwjppppqbs5xy57zh2z" + "rev": "70030514bdaf993517556209503075db15bd1c61", + "sha256": "1cj0fqk41nb63as1br6zkwgpxxznc29hp5xlv2hnlcwc2mbfh2c4" }, "qtwinextras": { "url": "https://invent.kde.org/qt/qt/qtwinextras.git", - "rev": "907009a4f7e5d2b99805547caf4b901bdbb0d4d6", - "sha256": "0aam2imp4rkbrjir5gsk4ja7vf7vv68ybsh7qchavb3zdmjsvxcd" + "rev": "e1773a917239c5b548ebd9e2ab34a687ffb949e4", + "sha256": "1rvv9cpgfy62j1l15lz7p65g00jmy9k0gcmn5i0xlx9dgs35yw6b" }, "qtx11extras": { "url": "https://invent.kde.org/qt/qt/qtx11extras.git", - "rev": "6c3605fcb3b34e55951f597e06c135d97dfa6cd7", - "sha256": "0dqmw2yqh5b5ayq93px2na50ghfk55y55zsgwraxglly0zgm39w9" + "rev": "ff2cc0065a3504e6043b47b1b4601fcdce62eefb", + "sha256": "16m05j8iznjlsvp41pzm0yqfji42ryw5r6ypzy5avij0by0wdkir" }, "qtxmlpatterns": { "url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git", - "rev": "087f6f35bd027f940818b1696d0aad822e034377", - "sha256": "0y3hkz7ss6iibpfr7dc855bzhdanz79ix0jm6b28viqjy3bdzgar" + "rev": "330c47bab8333d6dc7d4ab838afb81f29b6a32d0", + "sha256": "10slr93nfc53pzv94xw2h7wzcvzbgbr72yj06jvjr9q6jfv3qgkk" } } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix index 60ce4e4daf..8de92625f8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix @@ -1,7 +1,7 @@ { lib, fetchgit, fetchFromGitHub }: let - version = "5.15.14"; + version = "5.15.15"; mk = name: args: { diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh b/third_party/nixpkgs/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh index f52de4e51d..855efb5e6c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh @@ -20,7 +20,7 @@ qmakePrePhase() { # do the stripping ourselves (needed for separateDebugInfo) prependToVar qmakeFlags "CONFIG+=nostrip" } -prePhases+=" qmakePrePhase" +appendToVar prePhases qmakePrePhase qmakeConfigurePhase() { runHook preConfigure diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh b/third_party/nixpkgs/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh index 1b57d676e1..1b189d24d9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh @@ -97,7 +97,7 @@ postPatchMkspecs() { fi } if [ -z "${dontPatchMkspecs-}" ]; then - postPhases="${postPhases-}${postPhases:+ }postPatchMkspecs" + appendToVar postPhases postPatchMkspecs fi qtPreHook() { @@ -107,6 +107,6 @@ qtPreHook() { exit 1 fi } -prePhases+=" qtPreHook" +appendToVar prePhases qtPreHook fi diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools-QT_HOST_DATA-refs.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools-QT_HOST_DATA-refs.patch new file mode 100644 index 0000000000..6247cc971b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools-QT_HOST_DATA-refs.patch @@ -0,0 +1,53 @@ +From b54dd2923448f2ae7402cf2364f40337d6c3cb6d Mon Sep 17 00:00:00 2001 +From: OPNA2608 +Date: Wed, 7 Aug 2024 22:47:00 +0200 +Subject: [PATCH] Patch QT_HOST_DATA references + +--- + src/linguist/linguist.pro | 2 +- + src/qdoc/qdoc.pro | 2 +- + src/qtattributionsscanner/qtattributionsscanner.pro | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro +index 7638c7710..bd8798818 100644 +--- a/src/linguist/linguist.pro ++++ b/src/linguist/linguist.pro +@@ -47,7 +47,7 @@ contains(CMAKE_BIN_DIR, "^\\.\\./.*") { + load(qt_build_paths) + + cmake_linguist_config_file.input = $$PWD/Qt5LinguistToolsConfig.cmake.in +-cmake_linguist_config_version_file.input = $$[QT_HOST_DATA/src]/mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in ++cmake_linguist_config_version_file.input = @qtbaseDev@/mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in + cmake_linguist_macros_file.input = $$PWD/Qt5LinguistToolsMacros.cmake + CMAKE_PACKAGE_VERSION = $$MODULE_VERSION + cmake_linguist_config_file.output = $$MODULE_BASE_OUTDIR/lib/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig.cmake +diff --git a/src/qdoc/qdoc.pro b/src/qdoc/qdoc.pro +index db4b25cf1..19592d50b 100644 +--- a/src/qdoc/qdoc.pro ++++ b/src/qdoc/qdoc.pro +@@ -151,7 +151,7 @@ load(qt_build_paths) + equals(QMAKE_HOST.os, Windows): CMAKE_BIN_SUFFIX = ".exe" + + cmake_qdoc_config_file.input = $$PWD/Qt5DocToolsConfig.cmake.in +-cmake_qdoc_config_version_file.input = $$[QT_HOST_DATA/src]/mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in ++cmake_qdoc_config_version_file.input = @qtbaseDev@/mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in + CMAKE_PACKAGE_VERSION = $$MODULE_VERSION + cmake_qdoc_config_file.output = $$MODULE_BASE_OUTDIR/lib/cmake/Qt5DocTools/Qt5DocToolsConfig.cmake + cmake_qdoc_config_version_file.output = $$MODULE_BASE_OUTDIR/lib/cmake/Qt5DocTools/Qt5DocToolsConfigVersion.cmake +diff --git a/src/qtattributionsscanner/qtattributionsscanner.pro b/src/qtattributionsscanner/qtattributionsscanner.pro +index d645a22a9..5d4239f83 100644 +--- a/src/qtattributionsscanner/qtattributionsscanner.pro ++++ b/src/qtattributionsscanner/qtattributionsscanner.pro +@@ -51,7 +51,7 @@ load(qt_build_paths) + equals(QMAKE_HOST.os, Windows): CMAKE_BIN_SUFFIX = ".exe" + + cmake_qattributionsscanner_config_file.input = $$PWD/Qt5AttributionsScannerTools.cmake.in +-cmake_qattributionsscanner_config_version_file.input = $$[QT_HOST_DATA/src]/mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in ++cmake_qattributionsscanner_config_version_file.input = @qtbaseDev@/mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in + CMAKE_PACKAGE_VERSION = $$MODULE_VERSION + cmake_qattributionsscanner_config_file.output = $$MODULE_BASE_OUTDIR/lib/cmake/Qt5AttributionsScannerTools/Qt5AttributionsScannerToolsConfig.cmake + cmake_qattributionsscanner_config_version_file.output = $$MODULE_BASE_OUTDIR/lib/cmake/Qt5AttributionsScannerTools/Qt5AttributionsScannerToolsConfigVersion.cmake +-- +2.44.1 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools-libclang-main-header.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools-libclang-main-header.patch new file mode 100644 index 0000000000..2f042d69c6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools-libclang-main-header.patch @@ -0,0 +1,34 @@ +From a1fb301a0b9b59f420454be1ebeb05ce0547da2c Mon Sep 17 00:00:00 2001 +From: OPNA2608 +Date: Fri, 6 Sep 2024 14:20:05 +0200 +Subject: [PATCH] Patch includedir for libclang main header + +--- + src/qdoc/configure.pri | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/qdoc/configure.pri b/src/qdoc/configure.pri +index 4f3d77603..8fe8bc439 100644 +--- a/src/qdoc/configure.pri ++++ b/src/qdoc/configure.pri +@@ -71,7 +71,7 @@ defineTest(qtConfTest_libclang) { + LLVM_INSTALL_DIR = $$system("$$candidate --prefix 2>$$QMAKE_SYSTEM_NULL_DEVICE") + !isEmpty(LLVM_INSTALL_DIR) { + CLANG_INCLUDEPATH = $$system("$$candidate --includedir 2>/dev/null") +- LIBCLANG_MAIN_HEADER = $$CLANG_INCLUDEPATH/clang-c/Index.h ++ LIBCLANG_MAIN_HEADER = @libclangDev@/include/clang-c/Index.h + !exists($$LIBCLANG_MAIN_HEADER) { + !isEmpty(LLVM_INSTALL_DIR): \ + qtLog("Cannot find libclang's main header file, candidate: $${LIBCLANG_MAIN_HEADER}.") +@@ -121,7 +121,7 @@ defineTest(qtConfTest_libclang) { + return(false) + } + +- LIBCLANG_MAIN_HEADER = $$CLANG_INCLUDEPATH/clang-c/Index.h ++ LIBCLANG_MAIN_HEADER = @libclangDev@/include/clang-c/Index.h + !exists($$LIBCLANG_MAIN_HEADER) { + !isEmpty(LLVM_INSTALL_DIR): \ + qtLog("Cannot find libclang's main header file, candidate: $${LIBCLANG_MAIN_HEADER}.") +-- +2.44.1 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix index b728620362..52be15d64e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix @@ -1,17 +1,44 @@ -{ qtModule, stdenv, lib, qtbase, qtdeclarative }: +{ + qtModule, + stdenv, + lib, + qtbase, + qtdeclarative, + substituteAll, + llvmPackages, +}: qtModule { pname = "qttools"; - propagatedBuildInputs = [ qtbase qtdeclarative ]; - outputs = [ "out" "dev" "bin" ]; - # fixQtBuiltinPaths overwrites a builtin path we should keep - postPatch = '' - sed -i "src/linguist/linguist.pro" \ - -e '/^cmake_linguist_config_version_file.input =/ s|$$\[QT_HOST_DATA.*\]|${lib.getDev qtbase}|' - sed -i "src/qtattributionsscanner/qtattributionsscanner.pro" \ - -e '/^cmake_qattributionsscanner_config_version_file.input =/ s|$$\[QT_HOST_DATA.*\]|${lib.getDev qtbase}|' - ''; + outputs = [ + "out" + "dev" + "bin" + ]; + + buildInputs = with llvmPackages; [ + libclang + libllvm + ]; + + propagatedBuildInputs = [ + qtbase + qtdeclarative + ]; + + patches = [ + # fixQtBuiltinPaths overwrites builtin paths we should keep + (substituteAll { + src = ./qttools-QT_HOST_DATA-refs.patch; + qtbaseDev = lib.getDev qtbase; + }) + + (substituteAll { + src = ./qttools-libclang-main-header.patch; + libclangDev = lib.getDev llvmPackages.libclang; + }) + ]; devTools = [ "bin/qcollectiongenerator" @@ -32,11 +59,11 @@ qtModule { "bin/qthelpconverter" "bin/lprodump" "bin/qdistancefieldgenerator" - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "bin/macdeployqt" - ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "bin/macdeployqt" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && qtdeclarative != null) ''-DNIXPKGS_QMLIMPORTSCANNER="${qtdeclarative.dev}/bin/qmlimportscanner"''; + env.NIX_CFLAGS_COMPILE = lib.optionalString ( + stdenv.hostPlatform.isDarwin && qtdeclarative != null + ) ''-DNIXPKGS_QMLIMPORTSCANNER="${qtdeclarative.dev}/bin/qmlimportscanner"''; setupHook = ../hooks/qttools-setup-hook.sh; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 75149cfb5a..787c0632ea 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -25,7 +25,7 @@ , ImageCaptureCore, CoreBluetooth, IOBluetooth, CoreWLAN, Quartz, Cocoa, LocalAuthentication , MediaPlayer, MediaAccessibility, SecurityInterface, Vision, CoreML, OpenDirectory, Accelerate , cups, openbsm, xcbuild, writeScriptBin -, ffmpeg_7 ? null +, ffmpeg ? null , lib, stdenv , version ? null , qtCompatVersion @@ -232,7 +232,7 @@ qtModule ({ harfbuzz icu libevent - ffmpeg_7 + ffmpeg ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ dbus zlib minizip snappy nss protobuf jsoncpp diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-6/default.nix index 8625dadf52..1ee93acfe4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/default.nix @@ -29,7 +29,7 @@ let inherit srcs python3; stdenv = if stdenv.hostPlatform.isDarwin - then overrideSDK stdenv { darwinMinVersion = "11.0"; darwinSdkVersion = "11.0"; } + then overrideSDK stdenv { darwinMinVersion = "11.0"; darwinSdkVersion = "12.3"; } else stdenv; }); in @@ -42,7 +42,7 @@ let qtbase = callPackage ./modules/qtbase.nix { withGtk3 = !stdenv.hostPlatform.isMinGW; inherit (srcs.qtbase) src version; - inherit (darwin.apple_sdk_11_0.frameworks) + inherit (darwin.apple_sdk_12_3.frameworks) AGL AVFoundation AppKit Contacts CoreBluetooth EventKit GSS MetalKit; patches = [ ./patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch @@ -62,6 +62,13 @@ let revert = true; hash = "sha256-cjB2sC4cvZn0UEc+sm6ZpjyC78ssqB1Kb5nlZQ15M4A="; }) + + # Backport patch for https://bugs.kde.org/show_bug.cgi?id=493116 + # FIXME: remove for 6.8.1 + (fetchpatch2 { + url = "https://github.com/qt/qtbase/commit/2ea3abed0125d81ca4f3bacb9650db7314657332.patch"; + hash = "sha256-mdTdwhJtebuLUQRo+y1XUrrzgqG9G7GvPQwvrXLycJI="; + }) ]; }; env = callPackage ./qt-env.nix { }; @@ -113,7 +120,7 @@ let qt5compat = callPackage ./modules/qt5compat.nix { }; qtcharts = callPackage ./modules/qtcharts.nix { }; qtconnectivity = callPackage ./modules/qtconnectivity.nix { - inherit (darwin.apple_sdk_11_0.frameworks) IOBluetooth PCSC; + inherit (darwin.apple_sdk_12_3.frameworks) IOBluetooth PCSC; }; qtdatavis3d = callPackage ./modules/qtdatavis3d.nix { }; qtdeclarative = callPackage ./modules/qtdeclarative.nix { }; @@ -127,7 +134,7 @@ let qtlottie = callPackage ./modules/qtlottie.nix { }; qtmultimedia = callPackage ./modules/qtmultimedia.nix { inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi; - inherit (darwin.apple_sdk_11_0.frameworks) VideoToolbox; + inherit (darwin.apple_sdk_12_3.frameworks) VideoToolbox; }; qtmqtt = callPackage ./modules/qtmqtt.nix { }; qtnetworkauth = callPackage ./modules/qtnetworkauth.nix { }; @@ -137,7 +144,7 @@ let qtserialport = callPackage ./modules/qtserialport.nix { }; qtshadertools = callPackage ./modules/qtshadertools.nix { }; qtspeech = callPackage ./modules/qtspeech.nix { - inherit (darwin.apple_sdk_11_0.frameworks) Cocoa; + inherit (darwin.apple_sdk_12_3.frameworks) Cocoa; }; qtquick3d = callPackage ./modules/qtquick3d.nix { }; qtquick3dphysics = callPackage ./modules/qtquick3dphysics.nix { }; @@ -153,9 +160,9 @@ let qtwebchannel = callPackage ./modules/qtwebchannel.nix { }; qtwebengine = callPackage ./modules/qtwebengine.nix { inherit (darwin) autoSignDarwinBinariesHook bootstrap_cmds xnu; - inherit (darwin.apple_sdk_11_0) libpm libunwind; - inherit (darwin.apple_sdk_11_0.libs) sandbox; - inherit (darwin.apple_sdk_11_0.frameworks) + inherit (darwin.apple_sdk_12_3) libpm libunwind; + inherit (darwin.apple_sdk_12_3.libs) sandbox; + inherit (darwin.apple_sdk_12_3.frameworks) AGL AVFoundation Accelerate Cocoa CoreLocation CoreML ForceFeedback GameController ImageCaptureCore LocalAuthentication MediaAccessibility MediaPlayer MetalKit Network OpenDirectory Quartz @@ -174,7 +181,7 @@ let }; qtwebsockets = callPackage ./modules/qtwebsockets.nix { }; qtwebview = callPackage ./modules/qtwebview.nix { - inherit (darwin.apple_sdk_11_0.frameworks) WebKit; + inherit (darwin.apple_sdk_12_3.frameworks) WebKit; }; wrapQtAppsHook = callPackage 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 79c95c4d89..8ae22eecfa 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.2/submodules/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.qt.io/official_releases/qt/6.8/6.8.0/submodules/ -A '*.tar.xz' ) diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/hooks/qmake-hook.sh b/third_party/nixpkgs/pkgs/development/libraries/qt-6/hooks/qmake-hook.sh index 84b2fb153d..1f696be3e7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/hooks/qmake-hook.sh +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/hooks/qmake-hook.sh @@ -13,7 +13,7 @@ qmakePrePhase() { "NIX_OUTPUT_QML=${!outputBin}/${qtQmlPrefix:?}" \ "NIX_OUTPUT_PLUGIN=${!outputBin}/${qtPluginPrefix:?}" } -prePhases+=" qmakePrePhase" +appendToVar prePhases qmakePrePhase qmakeConfigurePhase() { runHook preConfigure diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh b/third_party/nixpkgs/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh index 5006d6b655..1ccfbd0cba 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh @@ -71,7 +71,7 @@ else # Only set up Qt once. fi } if [ -z "${dontPatchMkspecs-}" ]; then - postPhases="${postPhases-}${postPhases:+ }postPatchMkspecs" + appendToVar postPhases postPatchMkspecs fi qtPreHook() { @@ -81,7 +81,7 @@ else # Only set up Qt once. exit 1 fi } - prePhases+=" qtPreHook" + appendToVar prePhases qtPreHook addQtModulePrefix() { addToSearchPath QT_ADDITIONAL_PACKAGES_PREFIX_PATH $1 diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix index 68ef06921a..f9c36c4311 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -175,7 +175,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ vulkan-headers vulkan-loader - ]; + ] ++ lib.optional (cups != null && lib.meta.availableOn stdenv.hostPlatform cups) cups; buildInputs = lib.optionals (lib.meta.availableOn stdenv.hostPlatform at-spi2-core) [ at-spi2-core @@ -186,7 +186,6 @@ stdenv.mkDerivation rec { CoreBluetooth ] ++ lib.optional withGtk3 gtk3 - ++ lib.optional (cups != null && lib.meta.availableOn stdenv.hostPlatform cups) cups ++ lib.optional (libmysqlclient != null && !stdenv.hostPlatform.isMinGW) libmysqlclient ++ lib.optional (postgresql != null && lib.meta.availableOn stdenv.hostPlatform postgresql) postgresql; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix index 2a377d481c..1472aff537 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix @@ -6,6 +6,7 @@ , stdenv , lib , pkgsBuildBuild +, fetchpatch2 }: qtModule { @@ -19,6 +20,17 @@ qtModule { ../patches/0001-qtdeclarative-disable-qml-disk-cache.patch # add version specific QML import path ../patches/0002-qtdeclarative-also-use-versioned-qml-paths.patch + + # Backport patches for https://bugs.kde.org/show_bug.cgi?id=493116 + # FIXME: remove for 6.8.1 + (fetchpatch2 { + url = "https://github.com/qt/qtdeclarative/commit/3330731d0cb221477ab3d856db032126403ae6a0.patch"; + hash = "sha256-XXXGJ7nVDpEG/6nr16L89J87tvutyc+YnQPQx9cRU+w="; + }) + (fetchpatch2 { + url = "https://github.com/qt/qtdeclarative/commit/2aefbca84d2f3dca2c2697f13710b6907c0c7e59.patch"; + hash = "sha256-a/BX0gpW6juJbjDRo8OleMahOC6WWqreURmYZNiGm5c="; + }) ]; cmakeFlags = [ 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 0475a67d56..80eef14870 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.2"; + version = "6.8.0"; src = fetchFromGitHub { owner = "qt"; repo = "qtmqtt"; rev = "v${version}"; - hash = "sha256-5OvU8I7hSnbBbu8OTrd0o2KSOyIMVfGGUSy4IsA85fA="; + hash = "sha256-WvqBEq7Zv1CONMMuDHdj8/nJHoY4y7ysrqliTZHi7x8="; }; propagatedBuildInputs = [ qtbase ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix index 83bcb4c2a0..8cdabc32b6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix @@ -13,7 +13,7 @@ , gst-plugins-good , gst-libav , gst-vaapi -, ffmpeg_7 +, ffmpeg , libva , libpulseaudio , wayland @@ -28,7 +28,7 @@ qtModule { pname = "qtmultimedia"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ffmpeg_7 ] + buildInputs = [ ffmpeg ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ libunwind orc ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio alsa-lib wayland libXrandr libva ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ elfutils ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwayland.nix index 17679c83a2..54346345e4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwayland.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwayland.nix @@ -5,7 +5,6 @@ , wayland-scanner , pkg-config , libdrm -, fetchpatch }: qtModule { @@ -18,32 +17,9 @@ qtModule { buildInputs = [ wayland libdrm ]; nativeBuildInputs = [ pkg-config ]; - patches = [ - # Included in qtwayland 6.7.3 - # Fixes https://bugs.kde.org/show_bug.cgi?id=489259 - (fetchpatch { - url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/92bcb8f6b7a852c7a5d662fc34de561692a7a454.diff"; - sha256 = "sha256-XgGO8VnmQHLhUxTGf9CniwkCr5FsFiuUbnVP0NLNekI="; - }) - - # Included in qtwayland 6.7.3 - # Fixes https://bugs.kde.org/show_bug.cgi?id=489072 - (fetchpatch { - url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/c4f91b479303dda2e49499de249018d7c66c5f99.diff"; - sha256 = "sha256-4rUdl6WuJHONW0Uy2wjTvyvDY3bJWeRvhk3tCkaOOro="; - }) - - # Included in qtwayland 6.7.3 - # Fixes https://bugs.kde.org/show_bug.cgi?id=489180 - (fetchpatch { - url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/632127d7f1d86cba4dd17361f24f9fd70a0ae44c.diff"; - sha256 = "sha256-1EIcMj6+yIpqXAGZB3ZbrwRkl4n1o7TVP2SC1Nu1t78="; - }) - - # Update wayland.xml to version 1.23.0 - (fetchpatch { - url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/c2f61bc47baacf2e6a44c6c3c4e4cbf0abfa4095.diff"; - sha256 = "sha256-ZcK/LT65oFvTzCukZB8aDYWH5L6RK5MOPs8VtpYQpq0="; - }) - ]; + # Replace vendored wayland.xml with our matching version + # FIXME: remove when upstream updates past 1.23 + postPatch = '' + cp ${wayland-scanner}/share/wayland/wayland.xml src/3rdparty/protocol/wayland/wayland.xml + ''; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index 08c061e10d..11a70e53bf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -3,7 +3,6 @@ , qtwebchannel , qtpositioning , qtwebsockets -, fetchpatch2 , buildPackages , bison , coreutils @@ -50,7 +49,7 @@ , systemd , pipewire , gn -, ffmpeg_7 +, ffmpeg , lib , stdenv , glib @@ -132,14 +131,6 @@ qtModule { # Override locales install path so they go to QtWebEngine's $out ../patches/qtwebengine-locales-path.patch - - # Support FFmpeg 7 - (fetchpatch2 { - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-webengine/-/raw/6bee5464ac6340e925e08c7ed023026e727ae9d5/qtwebengine-ffmpeg-7.patch"; - hash = "sha256-OdCIu1KMW3YcpCnfUP1uD7OJRl6Iwap9X4aJhGpoaNs="; - stripLen = 1; - extraPrefix = "src/3rdparty/chromium/"; - }) ]; postPatch = '' @@ -237,7 +228,7 @@ qtModule { lcms2 libevent - ffmpeg_7 + ffmpeg ] ++ lib.optionals stdenv.hostPlatform.isLinux [ dbus zlib diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch index a8bb8f71cd..94ae308c1c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch @@ -1,23 +1,8 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nick Cao -Date: Thu, 13 Apr 2023 23:42:29 +0800 -Subject: [PATCH] qtbase: qmake: always use libname instead of absolute path in - qmake files - -In generated qmake files, absolute paths to qt libraries are embedded -and then used in linker flags. However as the libraries can be provided -by qt modules other than the one currently being built, the ebedded -paths can be incorrect. ---- - cmake/QtFinishPrlFile.cmake | 7 ++++--- - cmake/QtGenerateLibHelpers.cmake | 3 --- - 2 files changed, 4 insertions(+), 6 deletions(-) - diff --git a/cmake/QtFinishPrlFile.cmake b/cmake/QtFinishPrlFile.cmake -index 1cf9377e6ce..ac4428bd7a1 100644 +index 0cef22617c..232d92bc62 100644 --- a/cmake/QtFinishPrlFile.cmake +++ b/cmake/QtFinishPrlFile.cmake -@@ -64,9 +64,10 @@ foreach(line ${lines}) +@@ -69,9 +69,10 @@ foreach(line ${lines}) endif() list(APPEND adjusted_libs "-framework" "${CMAKE_MATCH_1}") else() @@ -32,16 +17,16 @@ index 1cf9377e6ce..ac4428bd7a1 100644 endif() else() diff --git a/cmake/QtGenerateLibHelpers.cmake b/cmake/QtGenerateLibHelpers.cmake -index 3ffe354fd8d..441332d4582 100644 +index 96675267d2..c9d4a69497 100644 --- a/cmake/QtGenerateLibHelpers.cmake +++ b/cmake/QtGenerateLibHelpers.cmake -@@ -73,9 +73,6 @@ function(qt_transform_absolute_library_paths_to_link_flags out_var library_path_ - string(TOLOWER "${dir}" dir_lower) - # If library_path isn't in default link directories, we should add it to link flags. - list(FIND IMPLICIT_LINK_DIRECTORIES_LOWER "${dir_lower}" index) -- if(${index} EQUAL -1) -- list(APPEND out_list "-L\"${dir}\"") -- endif() +@@ -82,9 +82,6 @@ function(qt_transform_absolute_library_paths_to_link_flags out_var library_path_ + # If library_path isn't in default link directories, we should add it to link flags. + # But we shouldn't add it duplicately. + list(FIND IMPLICIT_LINK_DIRECTORIES_LOWER "${dir_lower}" index) +- if(index EQUAL -1 AND NOT "-L\"${dir}\"" IN_LIST out_list) +- list(APPEND out_list "-L\"${dir}\"") +- endif() + endif() list(APPEND out_list "${lib_name_with_link_flag}") else() - list(APPEND out_list "${library_path}") diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch index 1e548950a2..fbe4937953 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch @@ -1,19 +1,5 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nick Cao -Date: Fri, 14 Apr 2023 21:43:04 +0800 -Subject: [PATCH] qtbase: qmake: fix mkspecs for darwin - ---- - mkspecs/common/mac.conf | 2 +- - mkspecs/features/mac/default_post.prf | 264 -------------------------- - mkspecs/features/mac/default_pre.prf | 58 ------ - mkspecs/features/mac/sdk.mk | 27 --- - mkspecs/features/mac/sdk.prf | 61 ------ - mkspecs/features/mac/toolchain.prf | 5 - - 6 files changed, 1 insertion(+), 416 deletions(-) - diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf -index 61bea952b22..9909dae7260 100644 +index 61bea952b2..9909dae726 100644 --- a/mkspecs/common/mac.conf +++ b/mkspecs/common/mac.conf @@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \ @@ -26,20 +12,10 @@ index 61bea952b22..9909dae7260 100644 QMAKE_LFLAGS_REL_RPATH = diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index 0b64a586b93..3b40328304d 100644 +index 22c84d6473..4d46762bec 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf -@@ -1,9 +1,5 @@ - load(default_post) - --# Recompute SDK version in case the user set it explicitly --sdk_version = $$QMAKE_MAC_SDK_VERSION --QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) -- - contains(TEMPLATE, .*app) { - !macx-xcode:if(isEmpty(BUILDS)|build_pass) { - # Detect changes to the platform SDK -@@ -15,270 +11,10 @@ contains(TEMPLATE, .*app) { +@@ -15,278 +15,10 @@ contains(TEMPLATE, .*app) { QMAKE_EXTRA_INCLUDES += $$shell_quote($$PWD/sdk.mk) } @@ -148,10 +124,12 @@ index 0b64a586b93..3b40328304d 100644 - - QMAKE_XCODE_ARCHS = - -- arch_device.name = "ARCHS[sdk=$${device.sdk}*]" -- arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS -- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS -- QMAKE_MAC_XCODE_SETTINGS += arch_device +- !isEmpty(QMAKE_APPLE_DEVICE_ARCHS) { +- arch_device.name = "ARCHS[sdk=$${device.sdk}*]" +- arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS +- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS +- QMAKE_MAC_XCODE_SETTINGS += arch_device +- } - - ios:simulator { - arch_simulator.name = "ARCHS[sdk=$${simulator.sdk}*]" @@ -252,10 +230,16 @@ index 0b64a586b93..3b40328304d 100644 - platform_identifier = $$device.sdk - sysroot_path = $$xcodeSDKInfo(Path, $$device.sdk) - } -- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target -- QMAKE_CFLAGS += -isysroot $$sysroot_path $$version_min_flag -- QMAKE_CXXFLAGS += -isysroot $$sysroot_path $$version_min_flag -- QMAKE_LFLAGS += -isysroot $$sysroot_path $$version_min_flag +- QMAKE_CFLAGS += -isysroot $$sysroot_path +- QMAKE_CXXFLAGS += -isysroot $$sysroot_path +- QMAKE_LFLAGS += -isysroot $$sysroot_path +- +- !isEmpty(version_identifier):!isEmpty(deployment_target) { +- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target +- QMAKE_CFLAGS += $$version_min_flag +- QMAKE_CXXFLAGS += $$version_min_flag +- QMAKE_LFLAGS += $$version_min_flag +- } - } - - # Enable precompiled headers for multiple architectures @@ -311,7 +295,7 @@ index 0b64a586b93..3b40328304d 100644 generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS generate_xcode_project.target = xcodeproj diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index e3534561a56..3b01424e67b 100644 +index e3534561a5..3b01424e67 100644 --- a/mkspecs/features/mac/default_pre.prf +++ b/mkspecs/features/mac/default_pre.prf @@ -1,60 +1,2 @@ @@ -376,7 +360,7 @@ index e3534561a56..3b01424e67b 100644 -xcode_copy_phase_strip_setting.value = NO -QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk -index a32ceacb6ce..e69de29bb2d 100644 +index a32ceacb6c..e69de29bb2 100644 --- a/mkspecs/features/mac/sdk.mk +++ b/mkspecs/features/mac/sdk.mk @@ -1,27 +0,0 @@ @@ -408,7 +392,7 @@ index a32ceacb6ce..e69de29bb2d 100644 - endif -endif diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf -index 3a9c2778bbe..e69de29bb2d 100644 +index 3a9c2778bb..e69de29bb2 100644 --- a/mkspecs/features/mac/sdk.prf +++ b/mkspecs/features/mac/sdk.prf @@ -1,61 +0,0 @@ @@ -474,7 +458,7 @@ index 3a9c2778bbe..e69de29bb2d 100644 - cache($$tool_variable, set stash, $$tool) -} diff --git a/mkspecs/features/mac/toolchain.prf b/mkspecs/features/mac/toolchain.prf -index df191eb13c4..e69de29bb2d 100644 +index df191eb13c..e69de29bb2 100644 --- a/mkspecs/features/mac/toolchain.prf +++ b/mkspecs/features/mac/toolchain.prf @@ -1,5 +0,0 @@ diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0007-qtbase-allow-translations-outside-prefix.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0007-qtbase-allow-translations-outside-prefix.patch index d8061f1610..c7c097cce3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0007-qtbase-allow-translations-outside-prefix.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0007-qtbase-allow-translations-outside-prefix.patch @@ -1,22 +1,13 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nick Cao -Date: Tue, 10 Oct 2023 10:14:40 -0400 -Subject: [PATCH] qtbase: allow translations outside prefix - ---- - cmake/QtBuildPathsHelpers.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - diff --git a/cmake/QtBuildPathsHelpers.cmake b/cmake/QtBuildPathsHelpers.cmake -index 18082ac6a5f..e16aea7d7c6 100644 +index bf28d1e9ee..08e64a2092 100644 --- a/cmake/QtBuildPathsHelpers.cmake +++ b/cmake/QtBuildPathsHelpers.cmake -@@ -134,7 +134,7 @@ function(qt_configure_process_path name default docstring) - set(rel_path ".") - elseif(rel_path MATCHES "^\.\./") - # INSTALL_SYSCONFDIR is allowed to be outside the prefix. -- if(NOT name STREQUAL "INSTALL_SYSCONFDIR") -+ if(NOT (name STREQUAL "INSTALL_SYSCONFDIR" OR name STREQUAL "INSTALL_TRANSLATIONSDIR")) - message(FATAL_ERROR - "Path component '${name}' is outside computed install prefix: ${rel_path} ") - return() +@@ -140,7 +140,7 @@ function(qt_configure_process_path name default docstring) + set(new_value ".") + elseif(rel_path MATCHES "^\.\./") + # INSTALL_SYSCONFDIR is allowed to be outside the prefix. +- if(NOT name STREQUAL "INSTALL_SYSCONFDIR") ++ if(NOT (name STREQUAL "INSTALL_SYSCONFDIR" OR name STREQUAL "INSTALL_TRANSLATIONSDIR")) + message(FATAL_ERROR + "Path component '${name}' is outside computed install prefix: ${rel_path} ") + endif() diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/fix-qtgui-include-incorrect-case.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/fix-qtgui-include-incorrect-case.patch index 563906fb31..5540ed8d77 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/fix-qtgui-include-incorrect-case.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/fix-qtgui-include-incorrect-case.patch @@ -1,11 +1,11 @@ diff --git a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp -index affa52d..b71b461 100644 +index c90dabb53..12557976d 100644 --- a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp +++ b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp @@ -7,7 +7,7 @@ - #include #include #include + #include -#include +#include #include "qvideoframe.h" diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-link-pulseaudio.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-link-pulseaudio.patch index c430211378..a48bb2c37e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-link-pulseaudio.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-link-pulseaudio.patch @@ -1,24 +1,12 @@ -From da66a74e8b8e57b4a60b2cd0d18ef3bebb15509c Mon Sep 17 00:00:00 2001 -From: Nick Cao -Date: Tue, 10 Oct 2023 11:45:24 -0400 -Subject: [PATCH 1/2] qtwebengine: link pulseaudio - ---- - src/core/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index 4153ce180..e89f41798 100644 +index de5222645..bddb2322a 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt -@@ -340,6 +340,7 @@ foreach(arch ${archs}) - use_static_angle=true - chrome_root_store_supported=false - trial_comparison_cert_verifier_supported=false +@@ -366,6 +366,7 @@ foreach(arch ${archs}) + content_enable_legacy_ipc=true + enable_extensions_legacy_ipc=true + enable_bound_session_credentials=false + link_pulseaudio=true ) extend_gn_list(gnArgArg ARGS use_v8_context_snapshot v8_use_external_startup_data --- -2.42.0 - 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 aeca3be253..1bf3d1a649 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: /home/k900/gh/NixOS/nixpkgs/./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-6 +# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-6 { fetchurl, mirror }: { qt3d = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qt3d-everywhere-src-6.8.0.tar.xz"; + sha256 = "0zbv1j0i9bla73b4v15skjballff2l0lxgrdfhdkaz232ng9249s"; + name = "qt3d-everywhere-src-6.8.0.tar.xz"; }; }; qt5compat = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qt5compat-everywhere-src-6.8.0.tar.xz"; + sha256 = "0c2yhgsn63a5m0pxchmkkqfb7izllpr46srf2pndcsqbszyhb6rw"; + name = "qt5compat-everywhere-src-6.8.0.tar.xz"; }; }; qtactiveqt = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtactiveqt-everywhere-src-6.8.0.tar.xz"; + sha256 = "0nycsn0yim01cvinfaljwmx8rllll6xw62cywqhbz61fqlsdy693"; + name = "qtactiveqt-everywhere-src-6.8.0.tar.xz"; }; }; qtbase = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtbase-everywhere-src-6.8.0.tar.xz"; + sha256 = "0x9wp9fd37ycpw73s03p01zi19l93xjp57vcvrrgh9xa20blib8v"; + name = "qtbase-everywhere-src-6.8.0.tar.xz"; }; }; qtcharts = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtcharts-everywhere-src-6.8.0.tar.xz"; + sha256 = "0bqkbd31lxyqiw4nbwrach7hixg3q93v26di9hxb0s8s1nndl8qr"; + name = "qtcharts-everywhere-src-6.8.0.tar.xz"; }; }; qtconnectivity = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtconnectivity-everywhere-src-6.8.0.tar.xz"; + sha256 = "120pq8yvm4v72800cj0mm8069fiyan036arnc74zq1vmq1ngpgmv"; + name = "qtconnectivity-everywhere-src-6.8.0.tar.xz"; }; }; qtdatavis3d = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtdatavis3d-everywhere-src-6.8.0.tar.xz"; + sha256 = "1zscaf1f4dfc5v8w8bivac5hnbq4j6j70vf78b5dcy5h2dfrdwim"; + name = "qtdatavis3d-everywhere-src-6.8.0.tar.xz"; }; }; qtdeclarative = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtdeclarative-everywhere-src-6.8.0.tar.xz"; + sha256 = "1hj4asdzkm78v0mfwyvh847j010mb43i3xx11nma66g989ms6h9v"; + name = "qtdeclarative-everywhere-src-6.8.0.tar.xz"; }; }; qtdoc = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtdoc-everywhere-src-6.8.0.tar.xz"; + sha256 = "0mqjki77cbm14jxxh750p6h7kixkma1nsimdl97b4lslcrs3mj1x"; + name = "qtdoc-everywhere-src-6.8.0.tar.xz"; }; }; qtgraphs = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtgraphs-everywhere-src-6.8.0.tar.xz"; + sha256 = "0hnb1nb8bdhjkrr3b64dk9wgkdgnrb8bxdafvizy2gsr0rd4m9ab"; + name = "qtgraphs-everywhere-src-6.8.0.tar.xz"; }; }; qtgrpc = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtgrpc-everywhere-src-6.8.0.tar.xz"; + sha256 = "0zgli0y52n5ahiahkmr1439c5vmjjv69f1x6vw4jbhc3xkp4lnvx"; + name = "qtgrpc-everywhere-src-6.8.0.tar.xz"; }; }; qthttpserver = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qthttpserver-everywhere-src-6.8.0.tar.xz"; + sha256 = "0zvrmqdch8mgpz3xbql3qy6zivyg8f0h10h86di90p1ssb40ihw1"; + name = "qthttpserver-everywhere-src-6.8.0.tar.xz"; }; }; qtimageformats = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtimageformats-everywhere-src-6.8.0.tar.xz"; + sha256 = "1m55966458jf5n7hciahzw8fdix3d2cf1w96qzmziqcigdazhnsr"; + name = "qtimageformats-everywhere-src-6.8.0.tar.xz"; }; }; qtlanguageserver = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtlanguageserver-everywhere-src-6.8.0.tar.xz"; + sha256 = "1vsw0q0pb7dbxhpg1df0bandfy7k62l68pi063fxpld4ihn1bxzv"; + name = "qtlanguageserver-everywhere-src-6.8.0.tar.xz"; }; }; qtlocation = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtlocation-everywhere-src-6.8.0.tar.xz"; + sha256 = "181ijzpx4xav5j282w2ppa9g5wdc4z13q0r7269flrb9ngs8gi50"; + name = "qtlocation-everywhere-src-6.8.0.tar.xz"; }; }; qtlottie = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtlottie-everywhere-src-6.8.0.tar.xz"; + sha256 = "15kw2cgxqh8mhip0838yalbpfnp4pd000sdalgxvc53bd8wycsfb"; + name = "qtlottie-everywhere-src-6.8.0.tar.xz"; }; }; qtmultimedia = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtmultimedia-everywhere-src-6.8.0.tar.xz"; + sha256 = "1kfgfcnihn0rqnjdif4n0hd8j2p9xkbfy3a2m3gsfypscajnlxi8"; + name = "qtmultimedia-everywhere-src-6.8.0.tar.xz"; }; }; qtnetworkauth = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtnetworkauth-everywhere-src-6.8.0.tar.xz"; + sha256 = "0j6ch2p6c2b6akg0hq7iy96v118rypz77573bf4mvcy68ijmcpdr"; + name = "qtnetworkauth-everywhere-src-6.8.0.tar.xz"; }; }; qtpositioning = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtpositioning-everywhere-src-6.8.0.tar.xz"; + sha256 = "0fgbgsg1hnwnm7bbp0j41nlpmz9g65nwj48v2c8mjiq15cz4d0gc"; + name = "qtpositioning-everywhere-src-6.8.0.tar.xz"; }; }; qtquick3d = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtquick3d-everywhere-src-6.8.0.tar.xz"; + sha256 = "0gr2y030phghpniw7flr90f4kckiksq39y53dwddncysw970959y"; + name = "qtquick3d-everywhere-src-6.8.0.tar.xz"; }; }; qtquick3dphysics = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtquick3dphysics-everywhere-src-6.8.0.tar.xz"; + sha256 = "07wmy546hwavbpy368pyk0qgj79sqykqkcsnmv802qp7kwi5rcqk"; + name = "qtquick3dphysics-everywhere-src-6.8.0.tar.xz"; }; }; qtquickeffectmaker = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtquickeffectmaker-everywhere-src-6.8.0.tar.xz"; + sha256 = "1x3lijsfd8pv74sgyjc7cj9s0c2q9bf49r44aa2d0zdjs3rxg8ca"; + name = "qtquickeffectmaker-everywhere-src-6.8.0.tar.xz"; }; }; qtquicktimeline = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtquicktimeline-everywhere-src-6.8.0.tar.xz"; + sha256 = "020zv4fnx37k8nm0c462bk8r9ma7l6ivr8j7i82h6688v0ds81hi"; + name = "qtquicktimeline-everywhere-src-6.8.0.tar.xz"; }; }; qtremoteobjects = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtremoteobjects-everywhere-src-6.8.0.tar.xz"; + sha256 = "123mkiak4xj05yg6sg86z1hixp8vycj0yks1fj1yk5lpdl65gpzi"; + name = "qtremoteobjects-everywhere-src-6.8.0.tar.xz"; }; }; qtscxml = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtscxml-everywhere-src-6.8.0.tar.xz"; + sha256 = "0fxl6yc03z43x49nskm2r1wa7vq9zg6dv1hl74nipc21yi7amadv"; + name = "qtscxml-everywhere-src-6.8.0.tar.xz"; }; }; qtsensors = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtsensors-everywhere-src-6.8.0.tar.xz"; + sha256 = "0yg6vn1yk4k962bff33pk9pjzyw3rskqcqfnadfvgyh5zb2l8dbj"; + name = "qtsensors-everywhere-src-6.8.0.tar.xz"; }; }; qtserialbus = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtserialbus-everywhere-src-6.8.0.tar.xz"; + sha256 = "1ynsy0xkjdp5d3rii0ch540n8cs07dzwd66cxw59gh9j92839676"; + name = "qtserialbus-everywhere-src-6.8.0.tar.xz"; }; }; qtserialport = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtserialport-everywhere-src-6.8.0.tar.xz"; + sha256 = "1hz7fynpa6z0x206g920xfk45hi74fahpcyha1f09cddrwpdfrvp"; + name = "qtserialport-everywhere-src-6.8.0.tar.xz"; }; }; qtshadertools = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtshadertools-everywhere-src-6.8.0.tar.xz"; + sha256 = "1jy4siv6ny9wgs5bcn19z05my9q8za0wi5lyngrlndw26k4jssa4"; + name = "qtshadertools-everywhere-src-6.8.0.tar.xz"; }; }; qtspeech = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtspeech-everywhere-src-6.8.0.tar.xz"; + sha256 = "0rb52qbwjkxlncz28rcjapi059b8px3i5haq71gm7f1pph90l8vm"; + name = "qtspeech-everywhere-src-6.8.0.tar.xz"; }; }; qtsvg = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtsvg-everywhere-src-6.8.0.tar.xz"; + sha256 = "16b1ckqpfhzn9xaqbwz5gy4b0xavbpjxj4064ivq23sjbqymjyng"; + name = "qtsvg-everywhere-src-6.8.0.tar.xz"; }; }; qttools = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qttools-everywhere-src-6.8.0.tar.xz"; + sha256 = "1xw1k7rnm2yylbj08p9a0w2ydfcfwa50qca3dv6cc0w54vc1aca0"; + name = "qttools-everywhere-src-6.8.0.tar.xz"; }; }; qttranslations = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qttranslations-everywhere-src-6.8.0.tar.xz"; + sha256 = "1dkw8f3hcnmnnv0ia62i5189dcgjkpx7pkcal180rka3q9kjpgw4"; + name = "qttranslations-everywhere-src-6.8.0.tar.xz"; }; }; qtvirtualkeyboard = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtvirtualkeyboard-everywhere-src-6.8.0.tar.xz"; + sha256 = "1q0cdmxm4j9w6lhm1k1ayjykknl6kmzr415qc14znr87ykbh4rcg"; + name = "qtvirtualkeyboard-everywhere-src-6.8.0.tar.xz"; }; }; qtwayland = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtwayland-everywhere-src-6.8.0.tar.xz"; + sha256 = "02h6lak0cp87b76474ifsm78vsx0gwfc2smnzg3g3srq2rcmhmqp"; + name = "qtwayland-everywhere-src-6.8.0.tar.xz"; }; }; qtwebchannel = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtwebchannel-everywhere-src-6.8.0.tar.xz"; + sha256 = "1h30mzmhkbcjaj4wivway0ldrdidqyg2b79313v2m3capwjhs9fn"; + name = "qtwebchannel-everywhere-src-6.8.0.tar.xz"; }; }; qtwebengine = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtwebengine-everywhere-src-6.8.0.tar.xz"; + sha256 = "0lklgz5i3ryl6d1ghy11rvmg9isbzvrvx007nwb4qqm89294b114"; + name = "qtwebengine-everywhere-src-6.8.0.tar.xz"; }; }; qtwebsockets = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtwebsockets-everywhere-src-6.8.0.tar.xz"; + sha256 = "0vxgbqxahay0gz5cv3fl075qw3flm3hgz1srhs4jl75p8rff0jy1"; + name = "qtwebsockets-everywhere-src-6.8.0.tar.xz"; }; }; qtwebview = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - 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"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtwebview-everywhere-src-6.8.0.tar.xz"; + sha256 = "1wvrq7lf688hqvq102kyvx7kqnixxp6w25cb6rvb2xiqb50rvf3w"; + name = "qtwebview-everywhere-src-6.8.0.tar.xz"; }; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/quictls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/quictls/default.nix index 1e3cb69d1f..63ddc6313d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/quictls/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/quictls/default.nix @@ -13,15 +13,15 @@ , withCryptodev ? false }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation rec { pname = "quictls"; - version = "3.1.5-quic1"; + version = "3.3.0-quic1"; src = fetchFromGitHub { owner = "quictls"; repo = "openssl"; - rev = "cb6841b741544bfd8868c1641ce96a934985509e"; - hash = "sha256-oR46jefarUGmBYjjpEvtKFzIOgSXSy58cLdX+P5ocA8="; + rev = "openssl-${version}"; + hash = "sha256-kBPwldTJbJSuvBVylJNcLSJvF/Hbqh0mfT4Ub5Xc6dk="; }; patches = [ @@ -32,8 +32,8 @@ stdenv.mkDerivation (finalAttrs: { ../openssl/3.0/openssl-disable-kernel-detection.patch (if stdenv.hostPlatform.isDarwin - then ../openssl/use-etc-ssl-certs-darwin.patch - else ../openssl/use-etc-ssl-certs.patch) + then ../openssl/3.3/use-etc-ssl-certs-darwin.patch + else ../openssl/3.3/use-etc-ssl-certs.patch) ]; postPatch = '' @@ -119,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional enableSSL3 "enable-ssl3" # We select KTLS here instead of the configure-time detection (which we patch out). # KTLS should work on FreeBSD 13+ as well, so we could enable it if someone tests it. - ++ lib.optional (stdenv.hostPlatform.isLinux && lib.versionAtLeast finalAttrs.version "3.0.0") "enable-ktls" + ++ lib.optional (stdenv.hostPlatform.isLinux && lib.versionAtLeast version "3.0.0") "enable-ktls" ++ lib.optional stdenv.hostPlatform.isAarch64 "no-afalgeng" # OpenSSL needs a specific `no-shared` configure flag. # See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options @@ -176,11 +176,11 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - changelog = "https://github.com/quictls/openssl/blob/${finalAttrs.src.rev}/CHANGES.md"; + changelog = "https://github.com/quictls/openssl/blob/openssl-${version}/CHANGES.md"; description = "TLS/SSL and crypto library with QUIC APIs"; homepage = "https://quictls.github.io"; license = lib.licenses.openssl; maintainers = with lib.maintainers; [ izorkin ]; platforms = lib.platforms.all; }; -}) +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/range-v3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/range-v3/default.nix index a7e5fe6eb2..b3b4635d47 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/range-v3/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/range-v3/default.nix @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { doCheck = !stdenv.hostPlatform.isAarch64; checkTarget = "test"; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-std=c++17"; + }; + meta = with lib; { description = "Experimental range library for C++11/14/17"; homepage = "https://github.com/ericniebler/range-v3"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix index a748f3a86c..0f9cf44662 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, zlib, zstd, pkg-config, python3, openssl, which }: +{ lib, stdenv, fetchFromGitHub, zlib, zstd, pkg-config, python3, openssl, which, curl }: stdenv.mkDerivation rec { pname = "rdkafka"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config python3 which ]; - buildInputs = [ zlib zstd openssl ]; + buildInputs = [ zlib zstd openssl curl ]; env.NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/readline/readline-8.2-patches.nix b/third_party/nixpkgs/pkgs/development/libraries/readline/readline-8.2-patches.nix index 77d5c495ba..37f9aeb8f7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/readline/readline-8.2-patches.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/readline/readline-8.2-patches.nix @@ -11,4 +11,7 @@ patch: [ (patch "008" "0smjjzhwxi2ibpdisnk53lh1pzgka6rhlqyh3662xy69v34ysxx1") (patch "009" "05m1fwbs7mbs3pz3pg87gbbayandrrcgaqawzliqb6g1jbk8b61x") (patch "010" "0k3vyrjs2g6y2cfs03l2gp37fhxgqpiwvxb1c7z4q88cbb32x3km") +(patch "011" "1msdahvz56l9m5m69a87zp2c7qrfv0dxwd09rj1697isgy83s0g0") +(patch "012" "1lybzig73pqpcbw79im0kn6299lkcbnh24yigygn5jm2sj7dz2kc") +(patch "013" "1a48lyrhvn6nbj5qhradfpbbs3md5maz7wb32yvaghvfgnak990y") ] diff --git a/third_party/nixpkgs/pkgs/development/libraries/redis-plus-plus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/redis-plus-plus/default.nix index bd40330194..e2ead01372 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/redis-plus-plus/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/redis-plus-plus/default.nix @@ -8,13 +8,13 @@ assert enableShared || enableStatic; stdenv.mkDerivation rec { pname = "redis-plus-plus"; - version = "1.3.12"; + version = "1.3.13"; src = fetchFromGitHub { owner = "sewenew"; repo = "redis-plus-plus"; rev = version; - sha256 = "sha256-RI7lLvRmS5BglvwRQ8OzSpYIyaKkf/DKrJ3fn1mWYfs="; + sha256 = "sha256-bZxs1qnVAkh0BO0CyP1zL/+K3NZYmFy9ryg1QcRLcmg="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/rnnoise-plugin/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rnnoise-plugin/default.nix index 13107bfcb1..4cf983add4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rnnoise-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rnnoise-plugin/default.nix @@ -6,7 +6,7 @@ , gtk3-x11 , pcre , pkg-config -, webkitgtk +, webkitgtk_4_0 , xorg , WebKit , MetalKit @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { xorg.libX11 xorg.libXrandr ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - webkitgtk + webkitgtk_4_0 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ WebKit MetalKit diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/amd-blis/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/amd-blis/default.nix index 17838ab373..cbbdc52ce4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/amd-blis/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/amd-blis/default.nix @@ -1,33 +1,36 @@ -{ lib, stdenv -, fetchFromGitHub -, perl -, python3 +{ + lib, + stdenv, + fetchFromGitHub, + perl, + python3, -# Enable BLAS interface with 64-bit integer width. -, blas64 ? false + # Enable BLAS interface with 64-bit integer width. + blas64 ? false, -# Target architecture. "amdzen" compiles kernels for all Zen -# generations. To build kernels for specific Zen generations, -# use "zen", "zen2", "zen3", or "zen4". -, withArchitecture ? "amdzen" + # Target architecture. "amdzen" compiles kernels for all Zen + # generations. To build kernels for specific Zen generations, + # use "zen", "zen2", "zen3", or "zen4". + withArchitecture ? "amdzen", -# Enable OpenMP-based threading. -, withOpenMP ? true + # Enable OpenMP-based threading. + withOpenMP ? true, }: let threadingSuffix = lib.optionalString withOpenMP "-mt"; blasIntSize = if blas64 then "64" else "32"; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "amd-blis"; - version = "4.2"; + version = "5.0"; src = fetchFromGitHub { owner = "amd"; repo = "blis"; rev = version; - hash = "sha256-mLigzaA2S7qFCQT8UWC6bHWAvBjgpqvtgabPyFWBYT0="; + hash = "sha256-E6JmV4W0plFJfOAPK1Vn7qkmFalwl6OjqSpxYnhAPmw="; }; inherit blas64; @@ -47,8 +50,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--enable-cblas" "--blas-int-size=${blasIntSize}" - ] ++ lib.optionals withOpenMP [ "--enable-threading=openmp" ] - ++ [ withArchitecture ]; + ] ++ lib.optionals withOpenMP [ "--enable-threading=openmp" ] ++ [ withArchitecture ]; postPatch = '' patchShebangs configure build/flatten-headers.py diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/amd-libflame/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/amd-libflame/default.nix index 0ca1c49505..6022742e05 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/amd-libflame/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/amd-libflame/default.nix @@ -1,26 +1,27 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, gfortran -, python3 -, amd-blis -, aocl-utils +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + gfortran, + python3, + amd-blis, + aocl-utils, -, withOpenMP ? true -, blas64 ? false -, withAMDOpt ? true + withOpenMP ? true, + blas64 ? false, + withAMDOpt ? true, }: stdenv.mkDerivation rec { pname = "amd-libflame"; - version = "4.2"; + version = "5.0"; src = fetchFromGitHub { owner = "amd"; repo = "libflame"; rev = version; - hash = "sha256-eiH2eq+nKUjlB1bZTZNRW1+efCHZ68UOSFy0NpcY1FI="; + hash = "sha256-Shsv5Zd59FN5tq1LY7QqPRtAHEysHIVbPeKIIZ/2eMw="; }; postPatch = '' @@ -30,22 +31,32 @@ stdenv.mkDerivation rec { substituteInPlace CMakeLists.txt --replace '-mtune=native' "" ''; - passthru = { inherit blas64; }; + passthru = { + inherit blas64; + }; - nativeBuildInputs = [ cmake gfortran python3 ]; + nativeBuildInputs = [ + cmake + gfortran + python3 + ]; - buildInputs = [ amd-blis aocl-utils ]; + buildInputs = [ + amd-blis + aocl-utils + ]; - cmakeFlags = [ - "-DLIBAOCLUTILS_LIBRARY_PATH=${lib.getLib aocl-utils}/lib/libaoclutils${stdenv.hostPlatform.extensions.sharedLibrary}" - "-DLIBAOCLUTILS_INCLUDE_PATH=${lib.getDev aocl-utils}/include" - "-DENABLE_BUILTIN_LAPACK2FLAME=ON" - "-DENABLE_CBLAS_INTERFACES=ON" - "-DENABLE_EXT_LAPACK_INTERFACE=ON" - ] - ++ lib.optional (!withOpenMP) "-DENABLE_MULTITHREADING=OFF" - ++ lib.optional blas64 "-DENABLE_ILP64=ON" - ++ lib.optional withAMDOpt "-DENABLE_AMD_OPT=ON"; + cmakeFlags = + [ + "-DLIBAOCLUTILS_LIBRARY_PATH=${lib.getLib aocl-utils}/lib/libaoclutils${stdenv.hostPlatform.extensions.sharedLibrary}" + "-DLIBAOCLUTILS_INCLUDE_PATH=${lib.getDev aocl-utils}/include" + "-DENABLE_BUILTIN_LAPACK2FLAME=ON" + "-DENABLE_CBLAS_INTERFACES=ON" + "-DENABLE_EXT_LAPACK_INTERFACE=ON" + ] + ++ lib.optional (!withOpenMP) "-DENABLE_MULTITHREADING=OFF" + ++ lib.optional blas64 "-DENABLE_ILP64=ON" + ++ lib.optional withAMDOpt "-DENABLE_AMD_OPT=ON"; postInstall = '' ln -s $out/lib/libflame.so $out/lib/liblapack.so.3 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 a8e697132e..750735ba67 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 @@ -21,13 +21,11 @@ in # Choose the maximum available optimization level builtins.head optLevels, - faiss, # To run demos in the tests - runCommand, }@inputs: let pname = "faiss"; - version = "1.8.0"; + version = "1.9.0"; inherit (cudaPackages) flags backendStdenv; @@ -46,25 +44,20 @@ in stdenv.mkDerivation { inherit pname version; - outputs = [ - "out" - "demos" - ] ++ lib.optionals pythonSupport [ "dist" ]; + outputs = [ "out" ] ++ lib.optionals pythonSupport [ "dist" ]; src = fetchFromGitHub { owner = "facebookresearch"; - repo = pname; - rev = "v${version}"; - hash = "sha256-nS8nhkNGGb2oAJKfr/MIAZjAwMxBGbNd16/CkEtv67I="; + repo = "faiss"; + rev = "refs/tags/v${version}"; + hash = "sha256-P8TynU6jz5NbcWLdI7n4LX5Gdz0Ks72bmOzQ3LGjQCQ="; }; - # Remove the following substituteInPlace when updating - # to a release that contains change from PR - # https://github.com/facebookresearch/faiss/issues/3239 - # that fixes building faiss with swig 4.2.x - postPatch = '' - substituteInPlace faiss/python/swigfaiss.swig \ - --replace-fail '#ifdef SWIGWORDSIZE64' '#if (__SIZEOF_LONG__ == 8)' + postPatch = lib.optionalString pythonSupport '' + substituteInPlace faiss/python/loader.py \ + --replace-fail \ + "# platform-dependent legacy fallback using numpy.distutils.cpuinfo" \ + "return False" ''; nativeBuildInputs = @@ -77,7 +70,6 @@ stdenv.mkDerivation { pythonPackages.python pythonPackages.setuptools pythonPackages.pip - pythonPackages.wheel ]; buildInputs = @@ -99,13 +91,7 @@ stdenv.mkDerivation { (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" flags.cmakeCudaArchitecturesString) ]; - buildFlags = - [ "faiss" ] - # This is just a demo app used as a test. - # Disabled because linkage fails: - # https://github.com/facebookresearch/faiss/issues/3484 - ++ lib.optionals (!cudaSupport) [ "demo_ivfpq_indexing" ] - ++ lib.optionals pythonSupport [ "swigfaiss" ]; + buildFlags = [ "faiss" ] ++ lib.optionals pythonSupport [ "swigfaiss" ]; # pip wheel->pip install commands copied over from opencv4 @@ -114,31 +100,13 @@ stdenv.mkDerivation { python -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist .) ''; - postInstall = - '' - mkdir -p $demos/bin - if [[ "$buildInputs" == *demo_ivfpq_indexing* ]] ; then - cp ./demos/demo_ivfpq_indexing $demos/bin/ - fi - '' - + lib.optionalString pythonSupport '' - mkdir "$dist" - cp faiss/python/dist/*.whl "$dist/" - ''; + postInstall = lib.optionalString pythonSupport '' + mkdir "$dist" + cp faiss/python/dist/*.whl "$dist/" + ''; passthru = { inherit cudaSupport cudaPackages pythonSupport; - - tests = { - runDemos = - runCommand "${pname}-run-demos" { buildInputs = [ faiss.demos ]; } - # There are more demos, we run just the one that documentation mentions - '' - demo_ivfpq_indexing && touch $out - ''; - pythonFaiss = pythonPackages.faiss; - pytest = pythonPackages.faiss.tests.pytest; - }; }; meta = { @@ -148,7 +116,5 @@ stdenv.mkDerivation { license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ SomeoneSerge ]; - # error: use of undeclared identifier 'SWIGTYPE_p_long' - broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix index a0f599f5d7..4589f6f1ec 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ abseil-cpp protobuf - (python.pkgs.protobuf.override { protobuf = protobuf; }) + (python.pkgs.protobuf4.override { protobuf = protobuf; }) python.pkgs.numpy ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix index ed1499abe6..ecc0982f2b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix @@ -16,13 +16,13 @@ in stdenv.mkDerivation rec { pname = "sqlite${lib.optionalString interactive "-interactive"}"; - version = "3.46.0"; + version = "3.46.1"; # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2024/sqlite-autoconf-${archiveVersion version}.tar.gz"; - hash = "sha256-b45qezNSc3SIFvmztiu9w3Koid6HgtfwSMZTpEdBen0="; + hash = "sha256-Z9P+bSaObq3crjcn/OWPzI6cU4ab3Qegxh443fKWUHE="; }; outputs = [ "bin" "dev" "out" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix index 1c8ab1f346..863a1f668c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix @@ -4,12 +4,12 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec { inherit pname; - version = "3.46.0"; + version = "3.46.1"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2024/sqlite-src-${archiveVersion version}.zip"; - hash = "sha256-BwNiEJvraJn2V5dXG5i4gkyPQ39bKSb4juBo2Y7zaOw="; + hash = "sha256-3vP8KS657MRE9sGVDlx52EYu1eez1gX9YVLRReHVq7Q="; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tdlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tdlib/default.nix index f9a87aa73b..e328a4c0f6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tdlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tdlib/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "tdlib"; - version = "1.8.35"; + version = "1.8.37"; src = fetchFromGitHub { owner = "tdlib"; @@ -11,8 +11,8 @@ stdenv.mkDerivation { # The tdlib authors do not set tags for minor versions, but # external programs depending on tdlib constrain the minor # version, hence we set a specific commit with a known version. - rev = "8d08b34e22a08e58db8341839c4e18ee06c516c5"; - hash = "sha256-RxFiOp3QDpLeikPqd8vstvhdglFLtOmwpcfGvvdgI5Y="; + rev = "21e5ce0e977fe012e0cee4e6fcfe704b47b00774"; + hash = "sha256-gQFsdc/FXjuA1WdZ6iF7KxLQX/7+r1I5FcdEAyJSaqU="; }; buildInputs = [ gperf openssl readline zlib ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tezos-rust-libs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tezos-rust-libs/default.nix index 85ac4b0266..36923aa802 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tezos-rust-libs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tezos-rust-libs/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ llvmPackages_12.llvm cargo ]; - propagatedBuildDeps = [ llvmPackages_12.libllvm ]; + propagatedBuildInputs = [ llvmPackages_12.libllvm ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; buildPhase = '' @@ -48,4 +48,11 @@ stdenv.mkDerivation rec { ''; cargoVendorDir = "./vendor"; + + meta = { + homepage = "https://gitlab.com/tezos/tezos-rust-libs"; + description = "Tezos: all rust dependencies and their dependencies"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix index 34b37d1c74..79abe0f827 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub , autoreconfHook, autoconf-archive, pkg-config, doxygen, perl , openssl, json_c, curl, libgcrypt -, cmocka, uthash, ibm-sw-tpm2, iproute2, procps, which +, cmocka, uthash, swtpm, iproute2, procps, which , libuuid }: let @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ++ lib.optional doInstallCheck cmocka; nativeInstallCheckInputs = [ - cmocka which openssl procps_pkg iproute2 ibm-sw-tpm2 + cmocka which openssl procps_pkg iproute2 swtpm ]; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix b/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix index 38b36267ef..662a1237e4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "umockdev"; - version = "0.18.3"; + version = "0.18.4"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://github.com/martinpitt/umockdev/releases/download/${finalAttrs.version}/umockdev-${finalAttrs.version}.tar.xz"; - hash = "sha256-q6lcMjA3yELxYXkxJgIxuFV9EZqiiRy8qLgR/MVZKUo="; + hash = "sha256-EVMG8Xvnj4yZ4gZS4t7M3UjfOHNr8A609D/vw4CaMZw="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix b/third_party/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix index bd27a36d66..b5b7e78e32 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -52,6 +52,10 @@ buildFlags = if stdenv.hostPlatform.isDarwin then [ "maodbc" ] else null; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + }; + installTargets = if stdenv.hostPlatform.isDarwin then [ "install/fast" ] else null; # see the top of the file for an explanation diff --git a/third_party/nixpkgs/pkgs/development/libraries/volume-key/default.nix b/third_party/nixpkgs/pkgs/development/libraries/volume-key/default.nix index 1991f2d6d7..931eaf1d67 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/volume-key/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/volume-key/default.nix @@ -35,6 +35,13 @@ stdenv.mkDerivation rec { "pythondir=$(py)/${python3.sitePackages}" ]; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=int-conversion" + ]; + }; + doCheck = false; # fails 1 out of 1 tests, needs `certutil` meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix index 3a0d14eb9b..647fac3bb5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,9 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake, ninja }: stdenv.mkDerivation rec { pname = "vulkan-headers"; version = "1.3.290.0"; - nativeBuildInputs = [ cmake ]; + # Adding `ninja` here to enable Ninja backend. Otherwise on gcc-14 or + # later the build fails as: + # modules are not supported by this generator: Unix Makefiles + nativeBuildInputs = [ cmake ninja ]; # TODO: investigate why isn't found cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DVULKAN_HEADERS_ENABLE_MODULE=OFF" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix b/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix index 1be88f3a6d..79aaa69696 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "wayland-protocols"; - version = "1.36"; + version = "1.37"; doCheck = stdenv.hostPlatform == stdenv.buildPlatform && # https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/48 @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/${finalAttrs.pname}/-/releases/${finalAttrs.version}/downloads/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - hash = "sha256-cf1N4F55+aHKVZ+sMMH4Nl+hA0ZCL5/nlfdNd7nvfpI="; + hash = "sha256-pw6b6STy6GiOaCTc6vYYj6rNWuIY36yNCj0JdiEe8yY="; }; postPatch = lib.optionalString finalAttrs.doCheck '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK31.nix index 21333afe5e..1379a15801 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK31.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK31.nix @@ -20,7 +20,7 @@ , withEGL ? true , withMesa ? !stdenv.hostPlatform.isDarwin , withWebKit ? stdenv.hostPlatform.isDarwin -, webkitgtk +, webkitgtk_4_0 , setfile , AGL , Carbon @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional withCurl curl ++ lib.optional withMesa libGLU - ++ lib.optional (withWebKit && !stdenv.hostPlatform.isDarwin) webkitgtk + ++ lib.optional (withWebKit && !stdenv.hostPlatform.isDarwin) webkitgtk_4_0 ++ lib.optional (withWebKit && stdenv.hostPlatform.isDarwin) WebKit ++ lib.optionals stdenv.hostPlatform.isDarwin [ setfile diff --git a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK32.nix b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK32.nix index 055000cfa6..33351e28a7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK32.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK32.nix @@ -22,7 +22,7 @@ , unicode ? true , withMesa ? !stdenv.hostPlatform.isDarwin , withWebKit ? true -, webkitgtk +, webkitgtk_4_0 , setfile , AGL , Carbon @@ -50,13 +50,13 @@ let in stdenv.mkDerivation rec { pname = "wxwidgets"; - version = "3.2.5"; + version = "3.2.6"; src = fetchFromGitHub { owner = "wxWidgets"; repo = "wxWidgets"; rev = "v${version}"; - hash = "sha256-ibkXs693xO+z3JuMvlG4b/+A8f4Lf5TYqdDa67fb9ck="; + hash = "sha256-7dc7NGiKSonFFaWp3UxLYqDc1Cc6no1Eba0QmtzX5mM="; }; nativeBuildInputs = [ pkg-config ]; @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { xorgproto ] ++ lib.optional withMesa libGLU - ++ lib.optional (withWebKit && stdenv.hostPlatform.isLinux) webkitgtk + ++ lib.optional (withWebKit && stdenv.hostPlatform.isLinux) webkitgtk_4_0 ++ lib.optional (withWebKit && stdenv.hostPlatform.isDarwin) WebKit ++ lib.optionals stdenv.hostPlatform.isDarwin [ expat diff --git a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix index f1dea3ab64..6275dafd6b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -27,6 +27,7 @@ , runCommand , wrapGAppsHook3 , xmlto +, bash , enableGeoLocation ? true , enableSystemd ? true }: @@ -63,6 +64,10 @@ stdenv.mkDerivation (finalAttrs: { # test tries to read /proc/cmdline, which is not intended to be accessible in the sandbox ./trash-test.patch + + # Install files required to be in XDG_DATA_DIR of the installed tests + # Merged PR https://github.com/flatpak/xdg-desktop-portal/pull/1444 + ./installed-tests-share.patch ]; # until/unless bubblewrap ships a pkg-config file, meson has no way to find it when cross-compiling. @@ -102,6 +107,7 @@ stdenv.mkDerivation (finalAttrs: { (python3.withPackages (pp: with pp; [ pygobject3 ])) + bash ] ++ lib.optionals enableGeoLocation [ geoclue2 ] ++ lib.optionals enableSystemd [ @@ -142,6 +148,21 @@ stdenv.mkDerivation (finalAttrs: { export TEST_IN_CI=1 ''; + postFixup = let + documentFuse = "${placeholder "installedTests"}/libexec/installed-tests/xdg-desktop-portal/test-document-fuse.py"; + testPortals = "${placeholder "installedTests"}/libexec/installed-tests/xdg-desktop-portal/test-portals"; + + in '' + if [ -x '${documentFuse}' ] ; then + wrapGApp '${documentFuse}' + wrapGApp '${testPortals}' + # (xdg-desktop-portal:995): xdg-desktop-portal-WARNING **: 21:21:55.673: Failed to get GeoClue client: Timeout was reached + # xdg-desktop-portal:ERROR:../tests/location.c:22:location_cb: 'res' should be TRUE + # https://github.com/flatpak/xdg-desktop-portal/blob/1d6dfb57067dec182b546dfb60c87aa3452c77ed/tests/location.c#L21 + rm $installedTests/share/installed-tests/xdg-desktop-portal/test-portals-location.test + fi + ''; + passthru = { tests = { installedTests = nixosTests.installed-tests.xdg-desktop-portal; diff --git a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/installed-tests-share.patch b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/installed-tests-share.patch new file mode 100644 index 0000000000..ba9a3822e5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/installed-tests-share.patch @@ -0,0 +1,9 @@ +diff --git a/tests/share/applications/meson.build b/tests/share/applications/meson.build +index d56b633..3ad3371 100644 +--- a/tests/share/applications/meson.build ++++ b/tests/share/applications/meson.build +@@ -1,2 +1,2 @@ +-configure_file(input: 'furrfix.desktop', output: '@PLAINNAME@', copy: true) +-configure_file(input: 'mimeinfo.cache', output: '@PLAINNAME@', copy: true) ++configure_file(input: 'furrfix.desktop', output: '@PLAINNAME@', copy: true, install: enable_installed_tests, install_dir: installed_tests_data_dir / 'share' / 'applications') ++configure_file(input: 'mimeinfo.cache', output: '@PLAINNAME@', copy: true, install: enable_installed_tests, install_dir: installed_tests_data_dir / 'share' / 'applications') diff --git a/third_party/nixpkgs/pkgs/development/libraries/xmake-core-sv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xmake-core-sv/default.nix deleted file mode 100644 index 83442a8d48..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/xmake-core-sv/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -}: - -stdenv.mkDerivation rec { - pname = "xmake-core-sv"; - version = "1.1"; - - src = fetchFromGitHub { - owner = "xmake-io"; - repo = pname; - rev = "v${version}"; - hash = "sha256-icvGQi6FNSZXNGs2oLiUKu6rrVsWcXh1r91kycGjnwY="; - }; - - nativeBuildInputs = [ - autoreconfHook - ]; - - meta = with lib; { - description = "Public domain cross-platform semantic versioning in c99"; - homepage = "https://github.com/xmake-io/xmake-core-sv"; - license = licenses.unlicense; - platforms = platforms.linux; - maintainers = with maintainers; [ rewine ]; - }; -} - diff --git a/third_party/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix index d8509c8fc3..6801eddc17 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix @@ -1,30 +1,49 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, asciidoc -, pkg-config -, libsodium -, enableDrafts ? false +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + libsodium, + asciidoc, + xmlto, + enableDrafts ? false, + # for passthru.tests + azmq, + cppzmq, + czmq, + zmqpp, + ffmpeg, + python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zeromq"; version = "4.3.5"; src = fetchFromGitHub { owner = "zeromq"; repo = "libzmq"; - rev = "v${version}"; - sha256 = "sha256-q2h5y0Asad+fGB9haO4Vg7a1ffO2JSb7czzlhmT3VmI="; + rev = "v${finalAttrs.version}"; + hash = "sha256-q2h5y0Asad+fGB9haO4Vg7a1ffO2JSb7czzlhmT3VmI="; }; - nativeBuildInputs = [ cmake asciidoc pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + asciidoc + xmlto + ]; + buildInputs = [ libsodium ]; doCheck = false; # fails all the tests (ctest) - cmakeFlags = lib.optional enableDrafts "-DENABLE_DRAFTS=ON"; + cmakeFlags = [ + (lib.cmakeBool "WITH_LIBSODIUM" true) + (lib.cmakeBool "ENABLE_CURVE" true) + (lib.cmakeBool "ENABLE_DRAFTS" enableDrafts) + ]; postPatch = '' substituteInPlace CMakeLists.txt \ @@ -32,12 +51,46 @@ stdenv.mkDerivation rec { --replace '$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} ''; - meta = with lib; { + postBuild = '' + # From https://gitlab.archlinux.org/archlinux/packaging/packages/zeromq/-/blob/main/PKGBUILD + # man pages aren't created when using cmake + # https://github.com/zeromq/libzmq/issues/4160 + pushd ../doc + for FILE in *.txt; do + asciidoc \ + -d manpage \ + -b docbook \ + -f asciidoc.conf \ + -a zmq_version="${finalAttrs.version}" \ + "''${FILE}" + xmlto --skip-validation man "''${FILE%.txt}.xml" + done + popd + ''; + + postInstall = '' + # Install manually created man pages + install -vDm644 -t "$out/share/man/man3" ../doc/*.3 + install -vDm644 -t "$out/share/man/man7" ../doc/*.7 + ''; + + passthru.tests = { + inherit + azmq + cppzmq + czmq + zmqpp + ; + pyzmq = python3.pkgs.pyzmq; + ffmpeg = ffmpeg.override { withZmq = true; }; + }; + + meta = { branch = "4"; homepage = "http://www.zeromq.org"; description = "Intelligent Transport Layer"; - license = licenses.mpl20; - platforms = platforms.all; - maintainers = with maintainers; [ fpletz ]; + license = lib.licenses.mpl20; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ fpletz ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix index 6abb1b160c..add675efae 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "zlib-ng"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "zlib-ng"; repo = "zlib-ng"; rev = version; - hash = "sha256-XTu4Wo9wQOvXrjDxo3KTpCiy0NsqVnYtCuYsCHP5LFc="; + hash = "sha256-FeOIFlFMDDd+5EDyr8KKW3G03UDM2xx4QF/wyKyDjq4="; }; outputs = [ "out" "dev" "bin" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/zmusic/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zmusic/default.nix index 1b504515f9..6c7c04f4a6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zmusic/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zmusic/default.nix @@ -1,37 +1,36 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, alsa-lib -, cmake -, fluidsynth -, libsndfile -, mpg123 -, ninja -, pkg-config -, soundfont-fluid -, zlib +{ + lib, + stdenv, + fetchFromGitHub, + alsa-lib, + cmake, + fluidsynth, + libsndfile, + mpg123, + ninja, + pkg-config, + soundfont-fluid, + zlib, }: stdenv.mkDerivation rec { pname = "zmusic"; - version = "1.1.13"; + version = "1.1.14"; src = fetchFromGitHub { owner = "ZDoom"; repo = "ZMusic"; rev = version; - hash = "sha256-rvvMS5KciHEvoY4hSfgAEyWJiDMqBto4o09oIpQIGTQ="; + hash = "sha256-rEE3MZLwqnvn5MqbSTCErbsGRjKMK8cC3wTJxtf8WaU="; }; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; patches = [ - (fetchpatch { - name = "system-fluidsynth.patch"; - url = "https://git.alpinelinux.org/aports/plain/community/zmusic/system-fluidsynth.patch?id=ca353107ef4f2e5c55c3cc824b0840e2838fb894"; - hash = "sha256-xKaqiNk1Kt9yNLB22IVmSEtGeOtxrCi7YtFCmhNr0MI="; - }) + ./fluidsynth.patch ]; postPatch = '' @@ -54,16 +53,20 @@ stdenv.mkDerivation rec { zlib ]; - meta = with lib; { + meta = { description = "GZDoom's music system as a standalone library"; homepage = "https://github.com/ZDoom/ZMusic"; - license = with licenses; [ + license = with lib.licenses; [ free gpl3Plus lgpl21Plus lgpl3Plus ]; - platforms = platforms.unix; - maintainers = with maintainers; [ azahi lassulus ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ + azahi + lassulus + Gliczy + ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/zmusic/fluidsynth.patch b/third_party/nixpkgs/pkgs/development/libraries/zmusic/fluidsynth.patch new file mode 100644 index 0000000000..20f97accdd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/zmusic/fluidsynth.patch @@ -0,0 +1,22 @@ +diff --git a/source/mididevices/music_fluidsynth_mididevice.cpp b/source/mididevices/music_fluidsynth_mididevice.cpp +index 1a33d3c..496d842 100644 +--- a/source/mididevices/music_fluidsynth_mididevice.cpp ++++ b/source/mididevices/music_fluidsynth_mididevice.cpp +@@ -47,7 +47,7 @@ + + FluidConfig fluidConfig; + +-#include "../thirdparty/fluidsynth/include/fluidsynth.h" ++#include + + class FluidSynthMIDIDevice : public SoftSynthMIDIDevice + { +diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt +index dd791db..c59b40d 100644 +--- a/thirdparty/CMakeLists.txt ++++ b/thirdparty/CMakeLists.txt +@@ -28,4 +28,3 @@ add_subdirectory(timidityplus) + add_subdirectory(wildmidi) + add_subdirectory(oplsynth) + add_subdirectory(libxmp) +-add_subdirectory(fluidsynth/src) diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/ql.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/ql.nix index af63346712..9ce7655903 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/ql.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/ql.nix @@ -65,7 +65,7 @@ let nativeLibs = [ pkgs.sqlite ]; }); cl-webkit2 = super.cl-webkit2.overrideLispAttrs (o: { - nativeLibs = [ pkgs.webkitgtk ]; + nativeLibs = [ pkgs.webkitgtk_4_0 ]; }); dbd-mysql = super.dbd-mysql.overrideLispAttrs (o: { nativeLibs = [ pkgs.mariadb.client ]; 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 05aaec8821..b44528cdc6 100644 --- a/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix +++ b/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix @@ -2492,14 +2492,14 @@ buildLuarocksPackage { lz-n = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "lz.n"; - version = "2.8.0-1"; + version = "2.8.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lz.n-2.8.0-1.rockspec"; - sha256 = "0mkplfgsnlsc1xjcxxx349bi0h28rgri46hb514xicaqi48jvd8q"; + url = "mirror://luarocks/lz.n-2.8.1-1.rockspec"; + sha256 = "0i3iwzzsm66fgy9cak8b6hq36cfhywqdngwzxdyj9k03bpzhdiyc"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/lz.n/archive/v2.8.0.zip"; - sha256 = "18p7zwns44b29pkm3iwh0wsdx1227ja1vww6g13m7gcsvn0h2pgw"; + url = "https://github.com/nvim-neorocks/lz.n/archive/v2.8.1.zip"; + sha256 = "1qwzxl8lzf6gh66zhfbi7q6wav00vnvai0sz8w7aiix7q1jrsl1q"; }; 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 51b8a30584..dd8e975d32 100644 --- a/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix +++ b/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix @@ -246,7 +246,7 @@ in if luaAtLeast "5.1" && luaOlder "5.2" then { version = "20120430.51-1"; knownRockspec = (fetchurl { - url = "https://luarocks.org/lmathx-20120430.51-1.rockspec"; + url = "mirror://luarocks/lmathx-20120430.51-1.rockspec"; sha256 = "148vbv2g3z5si2db7rqg5bdily7m4sjyh9w6r3jnx3csvfaxyhp0"; }).outPath; src = fetchurl { @@ -257,7 +257,7 @@ in if luaAtLeast "5.2" && luaOlder "5.3" then { version = "20120430.52-1"; knownRockspec = (fetchurl { - url = "https://luarocks.org/lmathx-20120430.52-1.rockspec"; + url = "mirror://luarocks/lmathx-20120430.52-1.rockspec"; sha256 = "14rd625sipakm72wg6xqsbbglaxyjba9nsajsfyvhg0sz8qjgdya"; }).outPath; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/development/misc/gokrazy/default.nix b/third_party/nixpkgs/pkgs/development/misc/gokrazy/default.nix index dfc29a0af0..ce6dd7b5f0 100644 --- a/third_party/nixpkgs/pkgs/development/misc/gokrazy/default.nix +++ b/third_party/nixpkgs/pkgs/development/misc/gokrazy/default.nix @@ -1,19 +1,27 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ + lib, + buildGoModule, + fetchFromGitHub, +}: buildGoModule rec { pname = "gokrazy"; - version = "unstable-2023-08-12"; + version = "0-unstable-2024-09-27"; src = fetchFromGitHub { owner = "gokrazy"; repo = "tools"; - rev = "23cde3b0d858497a63c21e93ad30859bf197995f"; - hash = "sha256-oqtkC04TaOkcXkGAZzATCBA0XnFsx7bSGP9ODyhgAxQ="; + rev = "6bec690fe5cdabca7aeec52257118d4ff7d7b060"; + hash = "sha256-EJ0qEsXhBssWUrzyhtL0So0Yaxzr843QNwoE0tppeuk="; }; - vendorHash = "sha256-rIIMqYMgLNCMYEH+44v79i8yGbHDmUY21X3h1E2jP9Q="; + vendorHash = "sha256-B/46VGCbLE/6LgW2wfKoHI9cyveE6hE/AfAZzIG5J+g="; - ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X=main.Version=${version}" + ]; subPackages = [ "cmd/gok" ]; diff --git a/third_party/nixpkgs/pkgs/development/misc/juce/default.nix b/third_party/nixpkgs/pkgs/development/misc/juce/default.nix index cbb5411314..610434dfe6 100644 --- a/third_party/nixpkgs/pkgs/development/misc/juce/default.nix +++ b/third_party/nixpkgs/pkgs/development/misc/juce/default.nix @@ -13,7 +13,7 @@ , freetype , curl , libglvnd -, webkitgtk +, webkitgtk_4_0 , pcre , darwin }: @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib # libasound.so libglvnd # libGL.so - webkitgtk # webkit2gtk-4.0 + webkitgtk_4_0 # webkit2gtk-4.0 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.MetalKit diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix index a880c8fc91..ff9e591330 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -4,8 +4,8 @@ { cmdLineToolsVersion ? "13.0" , toolsVersion ? "26.1.1" -, platformToolsVersion ? "35.0.1" -, buildToolsVersions ? [ "34.0.0" ] +, platformToolsVersion ? "35.0.2" +, buildToolsVersions ? [ "35.0.0" ] , includeEmulator ? false , emulatorVersion ? "35.1.4" , platformVersions ? [] @@ -15,7 +15,7 @@ , abiVersions ? [ "x86" "x86_64" "armeabi-v7a" "arm64-v8a" ] , cmakeVersions ? [ ] , includeNDK ? false -, ndkVersion ? "26.3.11579264" +, ndkVersion ? "27.0.12077973" , ndkVersions ? [ndkVersion] , useGoogleAPIs ? false , useGoogleTVAddOns ? false diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/default.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/default.nix index 6c6f974be7..fbababf9af 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/default.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/default.nix @@ -16,11 +16,17 @@ rec { }; androidPkgs = composeAndroidPackages { - platformVersions = [ "28" "29" "30" "31" "32" "33" "34" ]; + platformVersions = [ "28" "29" "30" "31" "32" "33" "34" "35" ]; includeEmulator = true; includeSystemImages = true; includeNDK = true; }; test-suite = pkgs.callPackage ./test-suite.nix {}; + + meta = with pkgs.lib; { + description = "Android SDK & sdkmanager"; + homepage = "https://developer.android.com/tools/sdkmanager"; + maintainers = with maintainers; [ numinit hadilq ]; + }; } diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/emulate-app.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/emulate-app.nix index e4b3af304f..94bf0084ed 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/emulate-app.nix @@ -1,8 +1,8 @@ { composeAndroidPackages, stdenv, lib, runtimeShell }: { name , app ? null -, platformVersion ? "33" -, abiVersion ? "armeabi-v7a" +, platformVersion ? "35" +, abiVersion ? "x86" , systemImageType ? "default" , enableGPU ? false # Enable GPU acceleration. It's deprecated, instead use `configOptions` below. , configOptions ? ( diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix index 637dbc58f4..0a710e4584 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix @@ -26,9 +26,9 @@ let # Declaration of versions for everything. This is useful since these # versions may be used in multiple places in this Nix expression. android = { - platforms = [ "34" ]; + platforms = [ "35" ]; systemImageTypes = [ "google_apis" ]; - abis = [ "arm64-v8a" "x86_64" ]; + abis = [ "x86_64" ]; }; # If you copy this example out of nixpkgs, something like this will work: @@ -116,10 +116,9 @@ pkgs.mkShell rec { echo "installed_packages_section: ''${installed_packages_section}" packages=( - "build-tools;34.0.0" "cmdline-tools;11.0" \ - "emulator" "patcher;v4" "platform-tools" "platforms;android-34" \ - "system-images;android-34;google_apis;arm64-v8a" \ - "system-images;android-34;google_apis;x86_64" + "build-tools;35.0.0" "cmdline-tools;13.0" \ + "emulator" "patcher;v4" "platform-tools" "platforms;android-35" \ + "system-images;android-35;google_apis;x86_64" ) for package in "''${packages[@]}"; do @@ -142,7 +141,7 @@ pkgs.mkShell rec { excluded_packages=( "platforms;android-23" "platforms;android-24" "platforms;android-25" "platforms;android-26" \ "platforms;android-27" "platforms;android-28" "platforms;android-29" "platforms;android-30" \ - "platforms;android-31" "platforms;android-32" "platforms;android-33" \ + "platforms;android-31" "platforms;android-32" "platforms;android-33" "platforms;android-34" \ "sources;android-23" "sources;android-24" "sources;android-25" "sources;android-26" \ "sources;android-27" "sources;android-28" "sources;android-29" "sources;android-30" \ "sources;android-31" "sources;android-32" "sources;android-33" "sources;android-34" \ @@ -169,7 +168,7 @@ pkgs.mkShell rec { nativeBuildInputs = [ androidSdk androidEmulator jdk ]; } '' avdmanager delete avd -n testAVD || true - echo "" | avdmanager create avd --force --name testAVD --package 'system-images;android-34;google_apis;x86_64' + echo "" | avdmanager create avd --force --name testAVD --package 'system-images;android-35;google_apis;x86_64' result=$(avdmanager list avd) if [[ ! $result =~ "Name: testAVD" ]]; then diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix index a1308a9c10..25b90e6d21 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix @@ -26,11 +26,11 @@ let # versions may be used in multiple places in this Nix expression. android = { versions = { - cmdLineToolsVersion = "11.0"; - platformTools = "34.0.5"; - buildTools = "34.0.0"; + cmdLineToolsVersion = "13.0"; + platformTools = "35.0.2"; + buildTools = "35.0.0"; }; - platforms = [ "34" ]; + platforms = [ "35" ]; }; # If you copy this example out of nixpkgs, something like this will work: @@ -113,8 +113,8 @@ pkgs.mkShell rec { echo "installed_packages_section: ''${installed_packages_section}" packages=( - "build-tools;34.0.0" "cmdline-tools;11.0" \ - "patcher;v4" "platform-tools" "platforms;android-34" + "build-tools;35.0.0" "cmdline-tools;13.0" \ + "patcher;v4" "platform-tools" "platforms;android-35" ) for package in "''${packages[@]}"; do diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/examples/shell.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/examples/shell.nix index 0f4c0589ad..7f08389e7e 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/examples/shell.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/examples/shell.nix @@ -26,17 +26,17 @@ let android = { versions = { cmdLineToolsVersion = "13.0"; - platformTools = "35.0.1"; - buildTools = "34.0.0"; + platformTools = "35.0.2"; + buildTools = "35.0.0"; ndk = [ - "26.3.11579264" + "27.0.12077973" ]; cmake = "3.6.4111459"; emulator = "35.1.4"; }; - platforms = [ "23" "24" "25" "26" "27" "28" "29" "30" "31" "32" "33" "34" ]; - abis = ["armeabi-v7a" "arm64-v8a"]; + platforms = [ "23" "24" "25" "26" "27" "28" "29" "30" "31" "32" "33" "34" "35" ]; + abis = [ "x86_64" ]; extras = ["extras;google;gcm"]; }; @@ -163,21 +163,24 @@ pkgs.mkShell rec { output="$(sdkmanager --list)" installed_packages_section=$(echo "''${output%%Available Packages*}" | awk 'NR>4 {print $1}') + # FIXME couldn't find platforms;android-34, even though it's in the correct directory!! sdkmanager's bug?! packages=( - "build-tools;34.0.0" "platform-tools" \ + "build-tools;35.0.0" "platform-tools" \ "platforms;android-23" "platforms;android-24" "platforms;android-25" "platforms;android-26" \ "platforms;android-27" "platforms;android-28" "platforms;android-29" "platforms;android-30" \ - "platforms;android-31" "platforms;android-32" "platforms;android-33" "platforms;android-34" \ + "platforms;android-31" "platforms;android-32" "platforms;android-33" "platforms;android-35" \ "sources;android-23" "sources;android-24" "sources;android-25" "sources;android-26" \ "sources;android-27" "sources;android-28" "sources;android-29" "sources;android-30" \ "sources;android-31" "sources;android-32" "sources;android-33" "sources;android-34" \ - "system-images;android-28;google_apis_playstore;arm64-v8a" \ - "system-images;android-29;google_apis_playstore;arm64-v8a" \ - "system-images;android-30;google_apis_playstore;arm64-v8a" \ - "system-images;android-31;google_apis_playstore;arm64-v8a" \ - "system-images;android-32;google_apis_playstore;arm64-v8a" \ - "system-images;android-33;google_apis_playstore;arm64-v8a" \ - "system-images;android-34;google_apis_playstore;arm64-v8a" + "sources;android-35" \ + "system-images;android-28;google_apis_playstore;x86_64" \ + "system-images;android-29;google_apis_playstore;x86_64" \ + "system-images;android-30;google_apis_playstore;x86_64" \ + "system-images;android-31;google_apis_playstore;x86_64" \ + "system-images;android-32;google_apis_playstore;x86_64" \ + "system-images;android-33;google_apis_playstore;x86_64" \ + "system-images;android-34;google_apis;x86_64" \ + "system-images;android-35;google_apis_playstore_ps16k;x86_64" ) for package in "''${packages[@]}"; do diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/repo.json b/third_party/nixpkgs/pkgs/development/mobile/androidenv/repo.json index 0cf9ea53ce..82f7c5f484 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/repo.json +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/repo.json @@ -11,7 +11,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-10", @@ -64,7 +64,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-11", @@ -110,7 +110,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-12", @@ -161,7 +161,7 @@ } ], "displayName": "Google TV Addon", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-googletv-license", "name": "google_tv_addon", "path": "add-ons/addon-google_tv_addon-google-12", @@ -198,7 +198,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-13", @@ -249,7 +249,7 @@ } ], "displayName": "Google TV Addon", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-googletv-license", "name": "google_tv_addon", "path": "add-ons/addon-google_tv_addon-google-13", @@ -286,7 +286,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-14", @@ -339,7 +339,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-15", @@ -399,7 +399,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-16", @@ -459,7 +459,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-17", @@ -519,7 +519,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-18", @@ -579,7 +579,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-19", @@ -639,7 +639,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-21", @@ -699,7 +699,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-22", @@ -759,7 +759,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-23", @@ -819,7 +819,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-24", @@ -879,7 +879,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-25", @@ -939,7 +939,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-3", @@ -985,7 +985,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-4", @@ -1031,7 +1031,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-5", @@ -1077,7 +1077,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-6", @@ -1123,7 +1123,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-7", @@ -1169,7 +1169,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-8", @@ -1215,7 +1215,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-9", @@ -1262,7 +1262,7 @@ } ], "displayName": "Android Support Repository", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "extras-android-m2repository", "path": "extras/android/m2repository", @@ -1292,7 +1292,7 @@ } ], "displayName": "Android Emulator hypervisor driver (installer)", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "extras-google-Android_Emulator_Hypervisor_Driver", "path": "extras/google/Android_Emulator_Hypervisor_Driver", @@ -1322,7 +1322,7 @@ } ], "displayName": "Google AdMob Ads SDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "extras-google-admob_ads_sdk", "path": "extras/google/admob_ads_sdk", @@ -1350,7 +1350,7 @@ } ], "displayName": "Google Analytics App Tracking SDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "extras-google-analytics_sdk_v2", "path": "extras/google/analytics_sdk_v2", @@ -1378,7 +1378,7 @@ } ], "displayName": "Google Cloud Messaging for Android Library", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "extras-google-gcm", "path": "extras/google/gcm", @@ -1413,7 +1413,7 @@ } }, "displayName": "Google Play services", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "extras-google-google_play_services", "path": "extras/google/google_play_services", @@ -1441,7 +1441,7 @@ } ], "displayName": "Google Play services for Froyo", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "extras-google-google_play_services_froyo", "path": "extras/google/google_play_services_froyo", @@ -1469,7 +1469,7 @@ } ], "displayName": "Google Play Instant Development SDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "extras-google-instantapps", "path": "extras/google/instantapps", @@ -1506,7 +1506,7 @@ } }, "displayName": "Google Repository", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "extras-google-m2repository", "path": "extras/google/m2repository", @@ -1534,7 +1534,7 @@ } ], "displayName": "Google Play APK Expansion library", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "extras-google-market_apk_expansion", "path": "extras/google/market_apk_expansion", @@ -1562,7 +1562,7 @@ } ], "displayName": "Google Play Licensing Library", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "extras-google-market_licensing", "path": "extras/google/market_licensing", @@ -1591,7 +1591,7 @@ } ], "displayName": "Android Auto API Simulators", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "extras-google-simulators", "path": "extras/google/simulators", @@ -1619,7 +1619,7 @@ } ], "displayName": "Google USB Driver", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "extras-google-usb_driver", "path": "extras/google/usb_driver", @@ -1647,7 +1647,7 @@ } ], "displayName": "Google Web Driver", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "extras-google-webdriver", "path": "extras/google/webdriver", @@ -2316,7 +2316,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-10-default-armeabi-v7a", "path": "system-images/android-10/default/armeabi-v7a", @@ -2354,7 +2354,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-10-default-x86", "path": "system-images/android-10/default/x86", @@ -2394,7 +2394,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-10-google_apis-armeabi-v7a", "path": "system-images/android-10/google_apis/armeabi-v7a", @@ -2435,7 +2435,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-10-google_apis-x86", "path": "system-images/android-10/google_apis/x86", @@ -2473,7 +2473,7 @@ } ], "displayName": "ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-14-default-armeabi-v7a", "path": "system-images/android-14/default/armeabi-v7a", @@ -2515,7 +2515,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-15-default-armeabi-v7a", "path": "system-images/android-15/default/armeabi-v7a", @@ -2553,7 +2553,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-15-default-x86", "path": "system-images/android-15/default/x86", @@ -2593,7 +2593,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-15-google_apis-armeabi-v7a", "path": "system-images/android-15/google_apis/armeabi-v7a", @@ -2634,7 +2634,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-15-google_apis-x86", "path": "system-images/android-15/google_apis/x86", @@ -2679,7 +2679,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-16-default-armeabi-v7a", "path": "system-images/android-16/default/armeabi-v7a", @@ -2710,7 +2710,7 @@ } ], "displayName": "MIPS System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "mips-android-sysimage-license", "name": "system-image-16-default-mips", "path": "system-images/android-16/default/mips", @@ -2748,7 +2748,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-16-default-x86", "path": "system-images/android-16/default/x86", @@ -2788,7 +2788,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-16-google_apis-armeabi-v7a", "path": "system-images/android-16/google_apis/armeabi-v7a", @@ -2829,7 +2829,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-16-google_apis-x86", "path": "system-images/android-16/google_apis/x86", @@ -2874,7 +2874,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-17-default-armeabi-v7a", "path": "system-images/android-17/default/armeabi-v7a", @@ -2905,7 +2905,7 @@ } ], "displayName": "MIPS System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "mips-android-sysimage-license", "name": "system-image-17-default-mips", "path": "system-images/android-17/default/mips", @@ -2943,7 +2943,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-17-default-x86", "path": "system-images/android-17/default/x86", @@ -2986,7 +2986,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-17-google_apis-armeabi-v7a", "path": "system-images/android-17/google_apis/armeabi-v7a", @@ -3027,7 +3027,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-17-google_apis-x86", "path": "system-images/android-17/google_apis/x86", @@ -3072,7 +3072,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-18-default-armeabi-v7a", "path": "system-images/android-18/default/armeabi-v7a", @@ -3110,7 +3110,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-18-default-x86", "path": "system-images/android-18/default/x86", @@ -3150,7 +3150,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-18-google_apis-armeabi-v7a", "path": "system-images/android-18/google_apis/armeabi-v7a", @@ -3191,7 +3191,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-18-google_apis-x86", "path": "system-images/android-18/google_apis/x86", @@ -3236,7 +3236,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-19-default-armeabi-v7a", "path": "system-images/android-19/default/armeabi-v7a", @@ -3274,7 +3274,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-19-default-x86", "path": "system-images/android-19/default/x86", @@ -3314,7 +3314,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-19-google_apis-armeabi-v7a", "path": "system-images/android-19/google_apis/armeabi-v7a", @@ -3355,7 +3355,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-19-google_apis-x86", "path": "system-images/android-19/google_apis/x86", @@ -3393,7 +3393,7 @@ } ], "displayName": "Android TV ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-21-android-tv-armeabi-v7a", "path": "system-images/android-21/android-tv/armeabi-v7a", @@ -3423,7 +3423,7 @@ } ], "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-21-android-tv-x86", "path": "system-images/android-21/android-tv/x86", @@ -3455,7 +3455,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-21-default-arm64-v8a", "path": "system-images/android-21/default/arm64-v8a", @@ -3493,7 +3493,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-21-default-armeabi-v7a", "path": "system-images/android-21/default/armeabi-v7a", @@ -3531,7 +3531,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-21-default-x86", "path": "system-images/android-21/default/x86", @@ -3569,7 +3569,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-21-default-x86_64", "path": "system-images/android-21/default/x86_64", @@ -3602,7 +3602,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-21-google_apis-arm64-v8a", "path": "system-images/android-21/google_apis/arm64-v8a", @@ -3643,7 +3643,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-21-google_apis-armeabi-v7a", "path": "system-images/android-21/google_apis/armeabi-v7a", @@ -3684,7 +3684,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-21-google_apis-x86", "path": "system-images/android-21/google_apis/x86", @@ -3725,7 +3725,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-21-google_apis-x86_64", "path": "system-images/android-21/google_apis/x86_64", @@ -3763,7 +3763,7 @@ } ], "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-22-android-tv-x86", "path": "system-images/android-22/android-tv/x86", @@ -3795,7 +3795,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-22-default-arm64-v8a", "path": "system-images/android-22/default/arm64-v8a", @@ -3833,7 +3833,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-22-default-armeabi-v7a", "path": "system-images/android-22/default/armeabi-v7a", @@ -3871,7 +3871,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-22-default-x86", "path": "system-images/android-22/default/x86", @@ -3909,7 +3909,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-22-default-x86_64", "path": "system-images/android-22/default/x86_64", @@ -3942,7 +3942,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-22-google_apis-arm64-v8a", "path": "system-images/android-22/google_apis/arm64-v8a", @@ -3983,7 +3983,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-22-google_apis-armeabi-v7a", "path": "system-images/android-22/google_apis/armeabi-v7a", @@ -4024,7 +4024,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-22-google_apis-x86", "path": "system-images/android-22/google_apis/x86", @@ -4065,7 +4065,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-22-google_apis-x86_64", "path": "system-images/android-22/google_apis/x86_64", @@ -4103,7 +4103,7 @@ } ], "displayName": "Android TV ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-23-android-tv-armeabi-v7a", "path": "system-images/android-23/android-tv/armeabi-v7a", @@ -4140,7 +4140,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-23-android-tv-x86", "path": "system-images/android-23/android-tv/x86", @@ -4172,7 +4172,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-23-default-arm64-v8a", "path": "system-images/android-23/default/arm64-v8a", @@ -4210,7 +4210,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-23-default-armeabi-v7a", "path": "system-images/android-23/default/armeabi-v7a", @@ -4248,7 +4248,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-23-default-x86", "path": "system-images/android-23/default/x86", @@ -4286,7 +4286,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-23-default-x86_64", "path": "system-images/android-23/default/x86_64", @@ -4319,7 +4319,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-23-google_apis-arm64-v8a", "path": "system-images/android-23/google_apis/arm64-v8a", @@ -4360,7 +4360,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-23-google_apis-armeabi-v7a", "path": "system-images/android-23/google_apis/armeabi-v7a", @@ -4401,7 +4401,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-23-google_apis-x86", "path": "system-images/android-23/google_apis/x86", @@ -4442,7 +4442,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-23-google_apis-x86_64", "path": "system-images/android-23/google_apis/x86_64", @@ -4487,7 +4487,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-24-android-tv-x86", "path": "system-images/android-24/android-tv/x86", @@ -4519,7 +4519,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-24-default-arm64-v8a", "path": "system-images/android-24/default/arm64-v8a", @@ -4557,7 +4557,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-24-default-armeabi-v7a", "path": "system-images/android-24/default/armeabi-v7a", @@ -4595,7 +4595,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-24-default-x86", "path": "system-images/android-24/default/x86", @@ -4633,7 +4633,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-24-default-x86_64", "path": "system-images/android-24/default/x86_64", @@ -4673,7 +4673,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-24-google_apis-arm64-v8a", "path": "system-images/android-24/google_apis/arm64-v8a", @@ -4714,7 +4714,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-24-google_apis-x86", "path": "system-images/android-24/google_apis/x86", @@ -4755,7 +4755,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-24-google_apis-x86_64", "path": "system-images/android-24/google_apis/x86_64", @@ -4798,7 +4798,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-24-google_apis_playstore-x86", "path": "system-images/android-24/google_apis_playstore/x86", @@ -4843,7 +4843,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-25-android-tv-x86", "path": "system-images/android-25/android-tv/x86", @@ -4882,7 +4882,7 @@ } }, "displayName": "Android Wear ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-25-android-wear-armeabi-v7a", "path": "system-images/android-25/android-wear/armeabi-v7a", @@ -4919,7 +4919,7 @@ } }, "displayName": "Android Wear Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-25-android-wear-x86", "path": "system-images/android-25/android-wear/x86", @@ -4951,7 +4951,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-25-default-arm64-v8a", "path": "system-images/android-25/default/arm64-v8a", @@ -4989,7 +4989,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-25-default-x86", "path": "system-images/android-25/default/x86", @@ -5027,7 +5027,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-25-default-x86_64", "path": "system-images/android-25/default/x86_64", @@ -5060,7 +5060,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-25-google_apis-arm64-v8a", "path": "system-images/android-25/google_apis/arm64-v8a", @@ -5101,7 +5101,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-25-google_apis-armeabi-v7a", "path": "system-images/android-25/google_apis/armeabi-v7a", @@ -5142,7 +5142,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-25-google_apis-x86", "path": "system-images/android-25/google_apis/x86", @@ -5183,7 +5183,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-25-google_apis-x86_64", "path": "system-images/android-25/google_apis/x86_64", @@ -5226,7 +5226,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-25-google_apis_playstore-x86", "path": "system-images/android-25/google_apis_playstore/x86", @@ -5286,7 +5286,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "system-image-26-android-tv-x86", "path": "system-images/android-26/android-tv/x86", @@ -5325,7 +5325,7 @@ } }, "displayName": "Android Wear Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-26-android-wear-x86", "path": "system-images/android-26/android-wear/x86", @@ -5369,7 +5369,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-26-default-arm64-v8a", "path": "system-images/android-26/default/arm64-v8a", @@ -5406,7 +5406,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-26-default-x86", "path": "system-images/android-26/default/x86", @@ -5443,7 +5443,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-26-default-x86_64", "path": "system-images/android-26/default/x86_64", @@ -5487,7 +5487,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-26-google_apis-arm64-v8a", "path": "system-images/android-26/google_apis/arm64-v8a", @@ -5543,7 +5543,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-26-google_apis-x86", "path": "system-images/android-26/google_apis/x86", @@ -5599,7 +5599,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-26-google_apis-x86_64", "path": "system-images/android-26/google_apis/x86_64", @@ -5657,7 +5657,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "system-image-26-google_apis_playstore-x86", "path": "system-images/android-26/google_apis_playstore/x86", @@ -5702,7 +5702,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "system-image-27-android-tv-x86", "path": "system-images/android-27/android-tv/x86", @@ -5746,7 +5746,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-27-default-arm64-v8a", "path": "system-images/android-27/default/arm64-v8a", @@ -5783,7 +5783,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-27-default-x86", "path": "system-images/android-27/default/x86", @@ -5820,7 +5820,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-27-default-x86_64", "path": "system-images/android-27/default/x86_64", @@ -5864,7 +5864,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-27-google_apis-arm64-v8a", "path": "system-images/android-27/google_apis/arm64-v8a", @@ -5920,7 +5920,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-27-google_apis-x86", "path": "system-images/android-27/google_apis/x86", @@ -5978,7 +5978,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-27-google_apis_playstore-x86", "path": "system-images/android-27/google_apis_playstore/x86", @@ -6023,7 +6023,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "system-image-28-android-tv-x86", "path": "system-images/android-28/android-tv/x86", @@ -6062,7 +6062,7 @@ } }, "displayName": "Wear OS Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-28-android-wear-x86", "path": "system-images/android-28/android-wear/x86", @@ -6106,7 +6106,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-28-default-arm64-v8a", "path": "system-images/android-28/default/arm64-v8a", @@ -6136,7 +6136,7 @@ } ], "displayName": "Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "system-image-28-default-x86", "path": "system-images/android-28/default/x86", @@ -6166,7 +6166,7 @@ } ], "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "system-image-28-default-x86_64", "path": "system-images/android-28/default/x86_64", @@ -6210,7 +6210,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-28-google_apis-arm64-v8a", "path": "system-images/android-28/google_apis/arm64-v8a", @@ -6266,7 +6266,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-28-google_apis-x86", "path": "system-images/android-28/google_apis/x86", @@ -6322,7 +6322,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-28-google_apis-x86_64", "path": "system-images/android-28/google_apis/x86_64", @@ -6370,7 +6370,7 @@ } }, "displayName": "Google ARM64-V8a Play ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-28-google_apis_playstore-arm64-v8a", "path": "system-images/android-28/google_apis_playstore/arm64-v8a", @@ -6426,7 +6426,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-28-google_apis_playstore-x86", "path": "system-images/android-28/google_apis_playstore/x86", @@ -6482,7 +6482,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-28-google_apis_playstore-x86_64", "path": "system-images/android-28/google_apis_playstore/x86_64", @@ -6542,7 +6542,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "system-image-29-android-tv-x86", "path": "system-images/android-29/android-tv/x86", @@ -6574,7 +6574,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-29-default-arm64-v8a", "path": "system-images/android-29/default/arm64-v8a", @@ -6628,7 +6628,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-29-default-x86", "path": "system-images/android-29/default/x86", @@ -6682,7 +6682,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-29-default-x86_64", "path": "system-images/android-29/default/x86_64", @@ -6726,7 +6726,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-29-google_apis-arm64-v8a", "path": "system-images/android-29/google_apis/arm64-v8a", @@ -6772,7 +6772,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-29-google_apis-x86", "path": "system-images/android-29/google_apis/x86", @@ -6818,7 +6818,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-29-google_apis-x86_64", "path": "system-images/android-29/google_apis/x86_64", @@ -6872,7 +6872,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-29-google_apis_playstore-arm64-v8a", "path": "system-images/android-29/google_apis_playstore/arm64-v8a", @@ -6940,7 +6940,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-29-google_apis_playstore-x86", "path": "system-images/android-29/google_apis_playstore/x86", @@ -7008,7 +7008,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-29-google_apis_playstore-x86_64", "path": "system-images/android-29/google_apis_playstore/x86_64", @@ -7068,7 +7068,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "system-image-30-android-tv-x86", "path": "system-images/android-30/android-tv/x86", @@ -7107,7 +7107,7 @@ } }, "displayName": "Wear OS 3 ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-30-android-wear-arm64-v8a", "path": "system-images/android-30/android-wear/arm64-v8a", @@ -7144,7 +7144,7 @@ } }, "displayName": "Wear OS 3 Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-30-android-wear-x86", "path": "system-images/android-30/android-wear/x86", @@ -7176,7 +7176,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-30-default-arm64-v8a", "path": "system-images/android-30/default/arm64-v8a", @@ -7218,7 +7218,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-30-default-x86_64", "path": "system-images/android-30/default/x86_64", @@ -7244,9 +7244,9 @@ "archives": [ { "os": "all", - "sha1": "c3575404189a32f1d77ef0f080a09b8697ebb14b", - "size": 1244307632, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-30_r13.zip" + "sha1": "0e66987d6b4db2e278af83d453ce5d74a7e6ced3", + "size": 1244324730, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-30_r16.zip" } ], "dependencies": { @@ -7262,13 +7262,13 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19823, - "license": "android-sdk-license", + "last-available-day": 19954, + "license": "android-sdk-arm-dbt-license", "name": "system-image-30-google_apis-arm64-v8a", "path": "system-images/android-30/google_apis/arm64-v8a", "revision": "30-google_apis-arm64-v8a", "revision-details": { - "major:0": "13" + "major:0": "16" }, "type-details": { "abi:3": "arm64-v8a", @@ -7290,9 +7290,9 @@ "archives": [ { "os": "all", - "sha1": "c1d3209b861461e9c37273710bc4140ce2ae6056", - "size": 1240622989, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-30_r12.zip" + "sha1": "a58447e540a8581394dd04ee419c6771d62723d8", + "size": 1240551553, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-30_r16.zip" } ], "dependencies": { @@ -7318,13 +7318,13 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19823, - "license": "android-sdk-arm-dbt-license", + "last-available-day": 19954, + "license": "android-sdk-license", "name": "system-image-30-google_apis-x86", "path": "system-images/android-30/google_apis/x86", "revision": "30-google_apis-x86", "revision-details": { - "major:0": "12" + "major:0": "16" }, "type-details": { "abi:3": "x86", @@ -7346,9 +7346,9 @@ "archives": [ { "os": "all", - "sha1": "efb07cd6268d93d7e2be88883bc9249a00b378b3", - "size": 1438275289, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-30_r12.zip" + "sha1": "6ae21030eaadc041078444d3798e4b399f3e787d", + "size": 1438186618, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-30_r16.zip" } ], "dependencies": { @@ -7374,13 +7374,13 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19823, - "license": "android-sdk-arm-dbt-license", + "last-available-day": 19954, + "license": "android-sdk-license", "name": "system-image-30-google_apis-x86_64", "path": "system-images/android-30/google_apis/x86_64", "revision": "30-google_apis-x86_64", "revision-details": { - "major:0": "12" + "major:0": "16" }, "type-details": { "abi:3": "x86_64", @@ -7428,7 +7428,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-30-google_apis_playstore-arm64-v8a", "path": "system-images/android-30/google_apis_playstore/arm64-v8a", @@ -7496,7 +7496,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-30-google_apis_playstore-x86", "path": "system-images/android-30/google_apis_playstore/x86", @@ -7564,7 +7564,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-30-google_apis_playstore-x86_64", "path": "system-images/android-30/google_apis_playstore/x86_64", @@ -7624,7 +7624,7 @@ } }, "displayName": "Android TV ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-31-android-tv-arm64-v8a", "path": "system-images/android-31/android-tv/arm64-v8a", @@ -7676,7 +7676,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-31-android-tv-x86", "path": "system-images/android-31/android-tv/x86", @@ -7720,7 +7720,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-31-default-arm64-v8a", "path": "system-images/android-31/default/arm64-v8a", @@ -7762,7 +7762,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-31-default-x86_64", "path": "system-images/android-31/default/x86_64", @@ -7816,7 +7816,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-31-google_apis-arm64-v8a", "path": "system-images/android-31/google_apis/arm64-v8a", @@ -7872,7 +7872,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "system-image-31-google_apis-x86_64", "path": "system-images/android-31/google_apis/x86_64", @@ -7936,7 +7936,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-31-google_apis_playstore-arm64-v8a", "path": "system-images/android-31/google_apis_playstore/arm64-v8a", @@ -7992,7 +7992,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-31-google_apis_playstore-x86_64", "path": "system-images/android-31/google_apis_playstore/x86_64", @@ -8042,7 +8042,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-32-default-arm64-v8a", "path": "system-images/android-32/default/arm64-v8a", @@ -8084,7 +8084,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-32-default-x86_64", "path": "system-images/android-32/default/x86_64", @@ -8138,7 +8138,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-32-google_apis-arm64-v8a", "path": "system-images/android-32/google_apis/arm64-v8a", @@ -8194,7 +8194,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "system-image-32-google_apis-x86_64", "path": "system-images/android-32/google_apis/x86_64", @@ -8258,7 +8258,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-32-google_apis_playstore-arm64-v8a", "path": "system-images/android-32/google_apis_playstore/arm64-v8a", @@ -8326,7 +8326,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "system-image-32-google_apis_playstore-x86_64", "path": "system-images/android-32/google_apis_playstore/x86_64", @@ -8386,7 +8386,7 @@ } }, "displayName": "Android TV ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-33-android-tv-arm64-v8a", "path": "system-images/android-33/android-tv/arm64-v8a", @@ -8438,7 +8438,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-33-android-tv-x86", "path": "system-images/android-33/android-tv/x86", @@ -8477,7 +8477,7 @@ } }, "displayName": "Wear OS 4 ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "system-image-33-android-wear-arm64-v8a", "path": "system-images/android-33/android-wear/arm64-v8a", @@ -8514,7 +8514,7 @@ } }, "displayName": "Wear OS 4 Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "system-image-33-android-wear-x86_64", "path": "system-images/android-33/android-wear/x86_64", @@ -8558,7 +8558,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-33-default-arm64-v8a", "path": "system-images/android-33/default/arm64-v8a", @@ -8600,7 +8600,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-33-default-x86_64", "path": "system-images/android-33/default/x86_64", @@ -8626,9 +8626,9 @@ "archives": [ { "os": "all", - "sha1": "9e314318536875458eaf68d02d411c59a386ab59", - "size": 1629980162, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-33_r15.zip" + "sha1": "8143bc8b517db20f1f34dd5d93a021b131d73720", + "size": 1751160645, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-33_r16.zip" } ], "dependencies": { @@ -8654,13 +8654,13 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-33-google_apis-arm64-v8a", "path": "system-images/android-33/google_apis/arm64-v8a", "revision": "33-google_apis-arm64-v8a", "revision-details": { - "major:0": "15" + "major:0": "16" }, "type-details": { "abi:3": "arm64-v8a", @@ -8682,9 +8682,9 @@ "archives": [ { "os": "all", - "sha1": "966eadeb61cd888a79477851e51349eed103e5c8", - "size": 1545118291, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-33_r15.zip" + "sha1": "a18ba5146f8a10e6f3c1d45df4a8d22c68306ee3", + "size": 1697603005, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-33_r16.zip" } ], "dependencies": { @@ -8710,13 +8710,13 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19823, - "license": "android-sdk-arm-dbt-license", + "last-available-day": 19954, + "license": "android-sdk-license", "name": "system-image-33-google_apis-x86_64", "path": "system-images/android-33/google_apis/x86_64", "revision": "33-google_apis-x86_64", "revision-details": { - "major:0": "15" + "major:0": "16" }, "type-details": { "abi:3": "x86_64", @@ -8774,7 +8774,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-33-google_apis_playstore-arm64-v8a", "path": "system-images/android-33/google_apis_playstore/arm64-v8a", @@ -8830,7 +8830,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-33-google_apis_playstore-x86_64", "path": "system-images/android-33/google_apis_playstore/x86_64", @@ -8862,9 +8862,9 @@ "archives": [ { "os": "all", - "sha1": "81b98fc5c3521a3a872667851c7f6bf61dfcdd5a", - "size": 883278287, - "url": "https://dl.google.com/android/repository/sys-img/android-tv/arm64-v8a-34_r02.zip" + "sha1": "a31d0d8326f2c82787f95dd387614274082a96a0", + "size": 815200224, + "url": "https://dl.google.com/android/repository/sys-img/android-tv/arm64-v8a-34_r03.zip" } ], "dependencies": { @@ -8890,13 +8890,13 @@ } }, "displayName": "Android TV ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-34-android-tv-arm64-v8a", "path": "system-images/android-34/android-tv/arm64-v8a", "revision": "34-android-tv-arm64-v8a", "revision-details": { - "major:0": "2" + "major:0": "3" }, "type-details": { "abi:2": "arm64-v8a", @@ -8914,9 +8914,9 @@ "archives": [ { "os": "all", - "sha1": "3be0ccf9611c7125e9c43083ae3ca6abba5f45b7", - "size": 880214246, - "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-34_r02.zip" + "sha1": "8de1dcb502b0b4080e6f363828db64e609b3aa2a", + "size": 809947873, + "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-34_r03.zip" } ], "dependencies": { @@ -8942,13 +8942,13 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-34-android-tv-x86", "path": "system-images/android-34/android-tv/x86", "revision": "34-android-tv-x86", "revision-details": { - "major:0": "2" + "major:0": "3" }, "type-details": { "abi:2": "x86", @@ -8963,6 +8963,68 @@ } } }, + "android-wear": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "29a733a9e6d89a70f26dabff7525edc657be6b07", + "size": 1215167945, + "url": "https://dl.google.com/android/repository/sys-img/android-wear/arm64-v8a-34_r01.zip" + } + ], + "displayName": "Wear OS 5 ARM 64 v8a System Image", + "last-available-day": 19954, + "license": "android-sdk-license", + "name": "system-image-34-android-wear-arm64-v8a", + "path": "system-images/android-34/android-wear/arm64-v8a", + "revision": "34-android-wear-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "34", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Wear OS 5", + "id:0": "android-wear" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "851c223ddf735d692d3cca96fdffa4c1f7ca4316", + "size": 1209506837, + "url": "https://dl.google.com/android/repository/sys-img/android-wear/x86_64-34_r01.zip" + } + ], + "displayName": "Wear OS 5 Intel x86_64 Atom System Image", + "last-available-day": 19954, + "license": "android-sdk-license", + "name": "system-image-34-android-wear-x86_64", + "path": "system-images/android-34/android-wear/x86_64", + "revision": "34-android-wear-x86_64", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "34", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Wear OS 5", + "id:0": "android-wear" + } + } + } + }, "default": { "arm64-v8a": { "archives": [ @@ -8986,7 +9048,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-34-default-arm64-v8a", "path": "system-images/android-34/default/arm64-v8a", @@ -9028,7 +9090,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-34-default-x86_64", "path": "system-images/android-34/default/x86_64", @@ -9054,9 +9116,9 @@ "archives": [ { "os": "all", - "sha1": "0981c5416516d609b1df5f29d3781c99d9fe061c", - "size": 1588261149, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-34_r12.zip" + "sha1": "2fe8b46d419a3400e30f31b0152b241b50c8b99f", + "size": 1610393229, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-34_r14.zip" } ], "dependencies": { @@ -9082,13 +9144,13 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-34-google_apis-arm64-v8a", "path": "system-images/android-34/google_apis/arm64-v8a", "revision": "34-google_apis-arm64-v8a", "revision-details": { - "major:0": "12" + "major:0": "14" }, "type-details": { "abi:3": "arm64-v8a", @@ -9110,9 +9172,9 @@ "archives": [ { "os": "all", - "sha1": "3392de02e09144d61e3a789c0f17ce447b70b191", - "size": 1541568922, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-34_r12.zip" + "sha1": "e0f6c9a0691aa27bd597d0deb1bcfdc943ac8ca7", + "size": 1563721130, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-34_r14.zip" } ], "dependencies": { @@ -9138,13 +9200,13 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19823, - "license": "android-sdk-arm-dbt-license", + "last-available-day": 19954, + "license": "android-sdk-license", "name": "system-image-34-google_apis-x86_64", "path": "system-images/android-34/google_apis/x86_64", "revision": "34-google_apis-x86_64", "revision-details": { - "major:0": "12" + "major:0": "14" }, "type-details": { "abi:3": "x86_64", @@ -9168,9 +9230,9 @@ "archives": [ { "os": "all", - "sha1": "a4fec7b9035d6f182fad788a4c1e5fef0fa94cb1", - "size": 1549222105, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-34-ext8_r02.zip" + "sha1": "c307c3301dc52635ebc78b943c39b3c377856ebc", + "size": 1548905381, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-34_r14.zip" }, { "os": "macosx", @@ -9208,13 +9270,13 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-34-google_apis_playstore-arm64-v8a", - "path": "system-images/android-34-ext10/google_apis_playstore/arm64-v8a", + "path": "system-images/android-34-ext12/google_apis_playstore/arm64-v8a", "revision": "34-google_apis_playstore-arm64-v8a", "revision-details": { - "major:0": "2" + "major:0": "1" }, "type-details": { "abi:2": "arm64-v8a", @@ -9265,13 +9327,13 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-34-google_apis_playstore-x86_64", - "path": "system-images/android-34-ext10/google_apis_playstore/x86_64", + "path": "system-images/android-34-ext12/google_apis_playstore/x86_64", "revision": "34-google_apis_playstore-x86_64", "revision-details": { - "major:0": "2" + "major:0": "1" }, "type-details": { "abi:2": "x86_64", @@ -9292,6 +9354,218 @@ } } }, + "35": { + "google_apis": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "4bb0111ce3e386f40337c652c0230524d97a05ae", + "size": 1766503283, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-35_r07.zip" + } + ], + "displayName": "Google APIs ARM 64 v8a System Image", + "last-available-day": 19954, + "license": "android-sdk-arm-dbt-license", + "name": "system-image-35-google_apis-arm64-v8a", + "path": "system-images/android-35/google_apis/arm64-v8a", + "revision": "35-google_apis-arm64-v8a", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "35", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "febd4186e0d234d60fecd50a37aaabf07bac6605", + "size": 1689421014, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-35_r07.zip" + } + ], + "displayName": "Google APIs Intel x86_64 Atom System Image", + "last-available-day": 19954, + "license": "android-sdk-license", + "name": "system-image-35-google_apis-x86_64", + "path": "system-images/android-35/google_apis/x86_64", + "revision": "35-google_apis-x86_64", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "35", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + } + }, + "google_apis_playstore": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "ecb2b9dbedda0e8aca02b23bc069c462499731ce", + "size": 1776691122, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-35_r07.zip" + } + ], + "displayName": "Google Play Experimental 16k Page Size ARM 64 v8a System Image", + "last-available-day": 19954, + "license": "android-sdk-arm-dbt-license", + "name": "system-image-35-google_apis_playstore-arm64-v8a", + "path": "system-images/android-35/google_apis_playstore_ps16k/arm64-v8a", + "revision": "35-google_apis_playstore-arm64-v8a", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "35", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs PlayStore", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "b06db9ec697e40e2acd301653ff76bb6b2abe1d8", + "size": 1714146193, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-35_r07.zip" + } + ], + "displayName": "Google Play Experimental 16k Page Size Intel x86_64 Atom System Image", + "last-available-day": 19954, + "license": "android-sdk-license", + "name": "system-image-35-google_apis_playstore-x86_64", + "path": "system-images/android-35/google_apis_playstore_ps16k/x86_64", + "revision": "35-google_apis_playstore-x86_64", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "35", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs PlayStore", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + } + }, + "page_size_16kb": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "bcb011c34aa3ae9f198b5adf728430d5c0cafc25", + "size": 1522862879, + "url": "https://dl.google.com/android/repository/sys-img/page_size_16kb/arm64-v8a-ps16k-35_r03.zip" + } + ], + "displayName": "Pre-Release 16 KB Page Size Google APIs ARM 64 v8a System Image", + "last-available-day": 19954, + "license": "android-sdk-arm-dbt-license", + "name": "system-image-35-page_size_16kb-arm64-v8a", + "path": "system-images/android-35/google_apis_ps16k/arm64-v8a", + "revision": "35-page_size_16kb-arm64-v8a", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "35", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "16 KB Page Size", + "id:0": "page_size_16kb" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "e5ba89f23ee36ec6c46bd06df332ab876f123b13", + "size": 1444723260, + "url": "https://dl.google.com/android/repository/sys-img/page_size_16kb/x86_64-ps16k-35_r03.zip" + } + ], + "displayName": "Pre-Release 16 KB Page Size Google APIs Intel x86_64 Atom System Image", + "last-available-day": 19954, + "license": "android-sdk-license", + "name": "system-image-35-page_size_16kb-x86_64", + "path": "system-images/android-35/google_apis_ps16k/x86_64", + "revision": "35-page_size_16kb-x86_64", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "35", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "16 KB Page Size", + "id:0": "page_size_16kb" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + } + } + }, "TiramisuPrivacySandbox": { "google_apis": { "arm64-v8a": { @@ -9316,7 +9590,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-TiramisuPrivacySandbox-google_apis-arm64-v8a", "path": "system-images/android-TiramisuPrivacySandbox/google_apis/arm64-v8a", @@ -9363,7 +9637,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-TiramisuPrivacySandbox-google_apis-x86_64", "path": "system-images/android-TiramisuPrivacySandbox/google_apis/x86_64", @@ -9428,7 +9702,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-TiramisuPrivacySandbox-google_apis_playstore-arm64-v8a", "path": "system-images/android-TiramisuPrivacySandbox/google_apis_playstore/arm64-v8a", @@ -9485,7 +9759,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "system-image-TiramisuPrivacySandbox-google_apis_playstore-x86_64", "path": "system-images/android-TiramisuPrivacySandbox/google_apis_playstore/x86_64", @@ -9772,7 +10046,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-UpsideDownCakePrivacySandbox-google_apis_playstore-arm64-v8a", "path": "system-images/android-UpsideDownCakePrivacySandbox/google_apis_playstore/arm64-v8a", @@ -9829,7 +10103,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "system-image-UpsideDownCakePrivacySandbox-google_apis_playstore-x86_64", "path": "system-images/android-UpsideDownCakePrivacySandbox/google_apis_playstore/x86_64", @@ -9862,22 +10136,23 @@ "archives": [ { "os": "all", - "sha1": "d87d6bb8cc98e91bd76a3585fed3f3616ad3140b", - "size": 1852895338, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-VanillaIceCream_r03.zip" + "sha1": "896dec0aaae40954e2da30527f0763f292511217", + "size": 1737853248, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-VanillaIceCream_r05.zip" } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-VanillaIceCream-google_apis-arm64-v8a", "path": "system-images/android-VanillaIceCream/google_apis/arm64-v8a", "revision": "VanillaIceCream-google_apis-arm64-v8a", "revision-details": { - "major:0": "3" + "major:0": "5" }, "type-details": { "abi:3": "arm64-v8a", + "abi:4": "arm64-v8a", "api-level:0": "34", "codename:1": "VanillaIceCream", "element-attributes": { @@ -9886,6 +10161,10 @@ "tag:2": { "display:1": "Google APIs", "id:0": "google_apis" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, @@ -9893,22 +10172,23 @@ "archives": [ { "os": "all", - "sha1": "f64e861db5568cfb0e6392dd4b34d78e41c1be8c", - "size": 1648708425, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-VanillaIceCream_r03.zip" + "sha1": "2efa686b5a420f3b9cb30e45a1e0e78a10a5fba8", + "size": 1682110854, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-VanillaIceCream_r05.zip" } ], "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-VanillaIceCream-google_apis-x86_64", "path": "system-images/android-VanillaIceCream/google_apis/x86_64", "revision": "VanillaIceCream-google_apis-x86_64", "revision-details": { - "major:0": "3" + "major:0": "5" }, "type-details": { "abi:3": "x86_64", + "abi:4": "x86_64", "api-level:0": "34", "codename:1": "VanillaIceCream", "element-attributes": { @@ -9917,6 +10197,10 @@ "tag:2": { "display:1": "Google APIs", "id:0": "google_apis" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -9926,22 +10210,23 @@ "archives": [ { "os": "all", - "sha1": "d0b5b5d7a7df6df55aa41b49460936ecf72625d1", - "size": 1863404889, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-VanillaIceCream_r03.zip" + "sha1": "41c8b6df52b60c76881fa5f819363678f9ef096c", + "size": 1745670932, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-VanillaIceCream_r05.zip" } ], "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-VanillaIceCream-google_apis_playstore-arm64-v8a", "path": "system-images/android-VanillaIceCream/google_apis_playstore/arm64-v8a", "revision": "VanillaIceCream-google_apis_playstore-arm64-v8a", "revision-details": { - "major:0": "3" + "major:0": "5" }, "type-details": { "abi:3": "arm64-v8a", + "abi:4": "arm64-v8a", "api-level:0": "34", "codename:1": "VanillaIceCream", "element-attributes": { @@ -9950,6 +10235,10 @@ "tag:2": { "display:1": "Google Play", "id:0": "google_apis_playstore" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, @@ -9957,22 +10246,23 @@ "archives": [ { "os": "all", - "sha1": "3bfcf04fc5476d65588fbfc51798a9bbc94b5e19", - "size": 1673530237, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-VanillaIceCream_r03.zip" + "sha1": "0d4c047003eaa8c78698f9aea0708e71b0895248", + "size": 1704139494, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-VanillaIceCream_r05.zip" } ], "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-VanillaIceCream-google_apis_playstore-x86_64", "path": "system-images/android-VanillaIceCream/google_apis_playstore/x86_64", "revision": "VanillaIceCream-google_apis_playstore-x86_64", "revision-details": { - "major:0": "3" + "major:0": "5" }, "type-details": { "abi:3": "x86_64", + "abi:4": "x86_64", "api-level:0": "34", "codename:1": "VanillaIceCream", "element-attributes": { @@ -9981,6 +10271,82 @@ "tag:2": { "display:1": "Google Play", "id:0": "google_apis_playstore" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + } + }, + "page_size_16kb": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "167fc0f1baae778d3382a7ec4a463a1bfbc3253c", + "size": 1392391828, + "url": "https://dl.google.com/android/repository/sys-img/page_size_16kb/arm64-v8a-ps16k-VanillaIceCream_r01.zip" + } + ], + "displayName": "Pre-Release 16 KB Page Size Google APIs ARM 64 v8a System Image", + "last-available-day": 19954, + "license": "android-sdk-arm-dbt-license", + "name": "system-image-VanillaIceCream-page_size_16kb-arm64-v8a", + "path": "system-images/android-VanillaIceCream/google_apis_ps16k/arm64-v8a", + "revision": "VanillaIceCream-page_size_16kb-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:4": "arm64-v8a", + "api-level:0": "34", + "codename:1": "VanillaIceCream", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:2": { + "display:1": "16 KB Page Size", + "id:0": "page_size_16kb" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "4a48eab34ea526f9a4cd60948ed7e6698b3e5cfd", + "size": 1332306731, + "url": "https://dl.google.com/android/repository/sys-img/page_size_16kb/x86_64-ps16k-VanillaIceCream_r01.zip" + } + ], + "displayName": "Pre-Release 16 KB Page Size Google APIs Intel x86_64 Atom System Image", + "last-available-day": 19954, + "license": "android-sdk-license", + "name": "system-image-VanillaIceCream-page_size_16kb-x86_64", + "path": "system-images/android-VanillaIceCream/google_apis_ps16k/x86_64", + "revision": "VanillaIceCream-page_size_16kb-x86_64", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:4": "x86_64", + "api-level:0": "34", + "codename:1": "VanillaIceCream", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:2": { + "display:1": "16 KB Page Size", + "id:0": "page_size_16kb" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -10044,7 +10410,7 @@ } }, "displayName": "Android SDK Build-Tools 17", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10090,7 +10456,7 @@ } }, "displayName": "Android SDK Build-Tools 18.0.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10136,7 +10502,7 @@ } }, "displayName": "Android SDK Build-Tools 18.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10182,7 +10548,7 @@ } }, "displayName": "Android SDK Build-Tools 18.1.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10228,7 +10594,7 @@ } }, "displayName": "Android SDK Build-Tools 19", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10274,7 +10640,7 @@ } }, "displayName": "Android SDK Build-Tools 19.0.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10320,7 +10686,7 @@ } }, "displayName": "Android SDK Build-Tools 19.0.2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10366,7 +10732,7 @@ } }, "displayName": "Android SDK Build-Tools 19.0.3", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10412,7 +10778,7 @@ } }, "displayName": "Android SDK Build-Tools 19.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/19.1.0", @@ -10457,7 +10823,7 @@ } }, "displayName": "Android SDK Build-Tools 20", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/20.0.0", @@ -10502,7 +10868,7 @@ } }, "displayName": "Android SDK Build-Tools 21", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10548,7 +10914,7 @@ } }, "displayName": "Android SDK Build-Tools 21.0.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10594,7 +10960,7 @@ } }, "displayName": "Android SDK Build-Tools 21.0.2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10640,7 +11006,7 @@ } }, "displayName": "Android SDK Build-Tools 21.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10686,7 +11052,7 @@ } }, "displayName": "Android SDK Build-Tools 21.1.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10732,7 +11098,7 @@ } }, "displayName": "Android SDK Build-Tools 21.1.2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/21.1.2", @@ -10777,7 +11143,7 @@ } }, "displayName": "Android SDK Build-Tools 22", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10823,7 +11189,7 @@ } }, "displayName": "Android SDK Build-Tools 22.0.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/22.0.1", @@ -10868,7 +11234,7 @@ } }, "displayName": "Android SDK Build-Tools 23", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10914,7 +11280,7 @@ } }, "displayName": "Android SDK Build-Tools 23.0.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.1", @@ -10959,7 +11325,7 @@ } }, "displayName": "Android SDK Build-Tools 23.0.2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.2", @@ -11004,7 +11370,7 @@ } }, "displayName": "Android SDK Build-Tools 23.0.3", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.3", @@ -11049,7 +11415,7 @@ } }, "displayName": "Android SDK Build-Tools 24", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.0", @@ -11094,7 +11460,7 @@ } }, "displayName": "Android SDK Build-Tools 24.0.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.1", @@ -11139,7 +11505,7 @@ } }, "displayName": "Android SDK Build-Tools 24.0.2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.2", @@ -11184,7 +11550,7 @@ } }, "displayName": "Android SDK Build-Tools 24.0.3", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.3", @@ -11229,7 +11595,7 @@ } }, "displayName": "Android SDK Build-Tools 25", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.0", @@ -11274,7 +11640,7 @@ } }, "displayName": "Android SDK Build-Tools 25.0.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.1", @@ -11319,7 +11685,7 @@ } }, "displayName": "Android SDK Build-Tools 25.0.2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.2", @@ -11364,7 +11730,7 @@ } }, "displayName": "Android SDK Build-Tools 25.0.3", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.3", @@ -11409,7 +11775,7 @@ } }, "displayName": "Android SDK Build-Tools 26", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.0", @@ -11454,7 +11820,7 @@ } }, "displayName": "Android SDK Build-Tools 26.0.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.1", @@ -11499,7 +11865,7 @@ } }, "displayName": "Android SDK Build-Tools 26.0.2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.2", @@ -11544,7 +11910,7 @@ } }, "displayName": "Android SDK Build-Tools 26.0.3", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.3", @@ -11589,7 +11955,7 @@ } }, "displayName": "Android SDK Build-Tools 27", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.0", @@ -11634,7 +12000,7 @@ } }, "displayName": "Android SDK Build-Tools 27.0.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.1", @@ -11679,7 +12045,7 @@ } }, "displayName": "Android SDK Build-Tools 27.0.2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.2", @@ -11724,7 +12090,7 @@ } }, "displayName": "Android SDK Build-Tools 27.0.3", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.3", @@ -11769,7 +12135,7 @@ } }, "displayName": "Android SDK Build-Tools 28", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.0", @@ -11814,7 +12180,7 @@ } }, "displayName": "Android SDK Build-Tools 28-rc1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -11861,7 +12227,7 @@ } }, "displayName": "Android SDK Build-Tools 28-rc2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -11908,7 +12274,7 @@ } }, "displayName": "Android SDK Build-Tools 28.0.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.1", @@ -11953,7 +12319,7 @@ } }, "displayName": "Android SDK Build-Tools 28.0.2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.2", @@ -11998,7 +12364,7 @@ } }, "displayName": "Android SDK Build-Tools 28.0.3", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.3", @@ -12043,7 +12409,7 @@ } }, "displayName": "Android SDK Build-Tools 29", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.0", @@ -12088,7 +12454,7 @@ } }, "displayName": "Android SDK Build-Tools 29-rc1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -12135,7 +12501,7 @@ } }, "displayName": "Android SDK Build-Tools 29-rc2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -12182,7 +12548,7 @@ } }, "displayName": "Android SDK Build-Tools 29-rc3", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -12229,7 +12595,7 @@ } }, "displayName": "Android SDK Build-Tools 29.0.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.1", @@ -12274,7 +12640,7 @@ } }, "displayName": "Android SDK Build-Tools 29.0.2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.2", @@ -12319,7 +12685,7 @@ } }, "displayName": "Android SDK Build-Tools 29.0.3", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.3", @@ -12364,7 +12730,7 @@ } }, "displayName": "Android SDK Build-Tools 30", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.0", @@ -12409,7 +12775,7 @@ } }, "displayName": "Android SDK Build-Tools 30.0.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.1", @@ -12454,7 +12820,7 @@ } }, "displayName": "Android SDK Build-Tools 30.0.2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.2", @@ -12499,7 +12865,7 @@ } }, "displayName": "Android SDK Build-Tools 30.0.3", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.3", @@ -12537,7 +12903,7 @@ } ], "displayName": "Android SDK Build-Tools 31", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/31.0.0", @@ -12575,7 +12941,7 @@ } ], "displayName": "Android SDK Build-Tools 32", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/32.0.0", @@ -12613,7 +12979,7 @@ } ], "displayName": "Android SDK Build-Tools 32.1-rc1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/32.1.0-rc1", @@ -12652,7 +13018,7 @@ } ], "displayName": "Android SDK Build-Tools 33", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.0", @@ -12690,7 +13056,7 @@ } ], "displayName": "Android SDK Build-Tools 33.0.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.1", @@ -12728,7 +13094,7 @@ } ], "displayName": "Android SDK Build-Tools 33.0.2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.2", @@ -12766,7 +13132,7 @@ } ], "displayName": "Android SDK Build-Tools 33.0.3", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.3", @@ -12804,7 +13170,7 @@ } ], "displayName": "Android SDK Build-Tools 34", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/34.0.0", @@ -12842,7 +13208,7 @@ } ], "displayName": "Android SDK Build-Tools 34-rc1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/34.0.0-rc1", @@ -12881,7 +13247,7 @@ } ], "displayName": "Android SDK Build-Tools 34-rc2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/34.0.0-rc2", @@ -12920,7 +13286,7 @@ } ], "displayName": "Android SDK Build-Tools 34-rc3", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/34.0.0-rc3", @@ -12976,6 +13342,44 @@ } } }, + "35.0.0": { + "archives": [ + { + "os": "linux", + "sha1": "2cfaa0bbb2336e9ec18ed3ecea84fa2e2af607bc", + "size": 61958799, + "url": "https://dl.google.com/android/repository/build-tools_r35_linux.zip" + }, + { + "os": "windows", + "sha1": "af059bb67cf7786f45ee0db85e2d24985df1b4b6", + "size": 59878107, + "url": "https://dl.google.com/android/repository/build-tools_r35_windows.zip" + }, + { + "os": "macosx", + "sha1": "93ab8ce91230e067b5add4bfa79919c52b27f072", + "size": 76857898, + "url": "https://dl.google.com/android/repository/build-tools_r35_macosx.zip" + } + ], + "displayName": "Android SDK Build-Tools 35", + "last-available-day": 19954, + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/35.0.0", + "revision": "35.0.0", + "revision-details": { + "major:0": "35", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, "35.0.0-rc1": { "archives": [ { @@ -12998,7 +13402,7 @@ } ], "displayName": "Android SDK Build-Tools 35-rc1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/35.0.0-rc1", @@ -13037,7 +13441,7 @@ } ], "displayName": "Android SDK Build-Tools 35-rc2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/35.0.0-rc2", @@ -13053,6 +13457,84 @@ "xsi:type": "ns5:genericDetailsType" } } + }, + "35.0.0-rc3": { + "archives": [ + { + "os": "linux", + "sha1": "25a13fd75a525385d77864f5470db9c1c48b5a40", + "size": 62746687, + "url": "https://dl.google.com/android/repository/build-tools_r35-rc3_linux.zip" + }, + { + "os": "windows", + "sha1": "f04f402d7d92edc14502e7b94034d1a1695ac12e", + "size": 59812048, + "url": "https://dl.google.com/android/repository/build-tools_r35-rc3_windows.zip" + }, + { + "os": "macosx", + "sha1": "f0d2a565d3634d2fd7a22838eafad792e8538c0a", + "size": 78263822, + "url": "https://dl.google.com/android/repository/build-tools_r35-rc3_macosx.zip" + } + ], + "displayName": "Android SDK Build-Tools 35-rc3", + "last-available-day": 19954, + "license": "android-sdk-preview-license", + "name": "build-tools", + "path": "build-tools/35.0.0-rc3", + "revision": "35.0.0-rc3", + "revision-details": { + "major:0": "35", + "micro:2": "0", + "minor:1": "0", + "preview:3": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, + "35.0.0-rc4": { + "archives": [ + { + "os": "linux", + "sha1": "08049ed693a2ba9bf6b9fa0edec897abac9f85ed", + "size": 61882448, + "url": "https://dl.google.com/android/repository/build-tools_r35-rc4_linux.zip" + }, + { + "os": "windows", + "sha1": "e08195bf5ce51105aca15f9eba758fceeb7b4b5d", + "size": 59901374, + "url": "https://dl.google.com/android/repository/build-tools_r35-rc4_windows.zip" + }, + { + "os": "macosx", + "sha1": "d9ce6ae1b0d720d7c2abd6510843c881f9d65188", + "size": 76832786, + "url": "https://dl.google.com/android/repository/build-tools_r35-rc4_macosx.zip" + } + ], + "displayName": "Android SDK Build-Tools 35-rc4", + "last-available-day": 19954, + "license": "android-sdk-preview-license", + "name": "build-tools", + "path": "build-tools/35.0.0-rc4", + "revision": "35.0.0-rc4", + "revision-details": { + "major:0": "35", + "micro:2": "0", + "minor:1": "0", + "preview:3": "4" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "cmake": { @@ -13078,7 +13560,7 @@ } ], "displayName": "CMake 3.10.2.4988404", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.10.2.4988404", @@ -13116,7 +13598,7 @@ } ], "displayName": "CMake 3.18.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.18.1", @@ -13154,7 +13636,7 @@ } ], "displayName": "CMake 3.22.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.22.1", @@ -13192,7 +13674,7 @@ } ], "displayName": "CMake 3.6.4111459", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.6.4111459", @@ -13232,7 +13714,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/1.0", @@ -13269,7 +13751,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/10.0", @@ -13344,7 +13826,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/11.0", @@ -13457,7 +13939,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/12.0", @@ -13532,7 +14014,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/13.0", @@ -13569,7 +14051,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "cmdline-tools", "path": "cmdline-tools/13.0-rc01", @@ -13607,7 +14089,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "cmdline-tools", "path": "cmdline-tools/14.0-alpha01", @@ -13623,6 +14105,44 @@ } } }, + "16.0-rc01": { + "archives": [ + { + "os": "linux", + "sha1": "818d632f1d727edaecd4ff94aa5f86b5a8a129a6", + "size": 165618743, + "url": "https://dl.google.com/android/repository/commandlinetools-linux-12172612_latest.zip" + }, + { + "os": "macosx", + "sha1": "8c7e4cc8fa9b2594ab8b56343bf56618ebdf04b9", + "size": 143967294, + "url": "https://dl.google.com/android/repository/commandlinetools-mac-12172612_latest.zip" + }, + { + "os": "windows", + "sha1": "b2ae4d96dca0f10358a041adc9b79eedf399779b", + "size": 143481957, + "url": "https://dl.google.com/android/repository/commandlinetools-win-12172612_latest.zip" + } + ], + "displayName": "Android SDK Command-line Tools", + "last-available-day": 19954, + "license": "android-sdk-preview-license", + "name": "cmdline-tools", + "path": "cmdline-tools/16.0-alpha01", + "revision": "16.0-rc01", + "revision-details": { + "major:0": "16", + "minor:1": "0", + "preview:2": "01" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, "2.0": { "archives": [ { @@ -13645,7 +14165,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmdline-tools", "obsolete": "true", @@ -13683,7 +14203,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/2.1", @@ -13720,7 +14240,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/3.0", @@ -13757,7 +14277,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/4.0", @@ -13794,7 +14314,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/5.0", @@ -13831,7 +14351,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/6.0", @@ -13868,7 +14388,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/7.0", @@ -13905,7 +14425,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/8.0", @@ -13942,7 +14462,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/9.0", @@ -14599,6 +15119,82 @@ } } }, + "34.2.16": { + "archives": [ + { + "os": "linux", + "sha1": "fe7a96bf6fbe7b026555dd7f76b713f22a07ec8b", + "size": 292750827, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-12038310.zip" + }, + { + "os": "macosx", + "sha1": "8da9494f5a08c2a04f50aeef543fd32ca8424f12", + "size": 387388734, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-12038310.zip" + }, + { + "os": "windows", + "sha1": "76a5cbca04dc11bc04421e30392e78ab3b744d33", + "size": 412503831, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-12038310.zip" + } + ], + "displayName": "Android Emulator", + "last-available-day": 19954, + "license": "android-sdk-license", + "name": "emulator", + "path": "emulator", + "revision": "34.2.16", + "revision-details": { + "major:0": "34", + "micro:2": "16", + "minor:1": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, + "35.1.19": { + "archives": [ + { + "os": "linux", + "sha1": "728fb67266a7648aee58c1f4eaadeb8781c646d8", + "size": 295185796, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-12171648.zip" + }, + { + "os": "macosx", + "sha1": "a7c61d2f057186e54f41e0573f5cb5659daca9c4", + "size": 390781280, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-12171648.zip" + }, + { + "os": "windows", + "sha1": "a954a95bf3f49907ea8e3b4dbeda8f963394540c", + "size": 420058404, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-12171648.zip" + } + ], + "displayName": "Android Emulator", + "last-available-day": 19954, + "license": "android-sdk-license", + "name": "emulator", + "path": "emulator", + "revision": "35.1.19", + "revision-details": { + "major:0": "35", + "micro:2": "19", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, "35.1.2": { "archives": [ { @@ -14712,6 +15308,44 @@ "xsi:type": "ns5:genericDetailsType" } } + }, + "35.2.5": { + "archives": [ + { + "os": "linux", + "sha1": "cc22b6fb2d6dbb17f436af29364929aba5f776ae", + "size": 301992613, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-12205771.zip" + }, + { + "os": "macosx", + "sha1": "32e32d993b1af0c4c93a3aed775baeed881e0ce7", + "size": 399727915, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-12205771.zip" + }, + { + "os": "windows", + "sha1": "739dd017682373c745ec60189d2cb52be016181d", + "size": 426685873, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-12205771.zip" + } + ], + "displayName": "Android Emulator", + "last-available-day": 19954, + "license": "android-sdk-preview-license", + "name": "emulator", + "path": "emulator", + "revision": "35.2.5", + "revision-details": { + "major:0": "35", + "micro:2": "5", + "minor:1": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "extras": { @@ -14737,7 +15371,7 @@ } ], "displayName": "Android Auto Desktop Head Unit Emulator", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "extras", "path": "extras/google/auto", @@ -14774,7 +15408,7 @@ } ], "displayName": "Android Auto Desktop Head Unit Emulator", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "extras", "path": "extras/google/auto", @@ -14820,7 +15454,7 @@ } }, "displayName": "NDK (Side by side) 16.1.4479499", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/16.1.4479499", @@ -14865,7 +15499,7 @@ } }, "displayName": "NDK (Side by side) 17.2.4988734", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/17.2.4988734", @@ -14910,7 +15544,7 @@ } }, "displayName": "NDK (Side by side) 18.1.5063045", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/18.1.5063045", @@ -14955,7 +15589,7 @@ } }, "displayName": "NDK (Side by side) 19.0.5232133", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "obsolete": "true", @@ -15001,7 +15635,7 @@ } }, "displayName": "NDK (Side by side) 19.2.5345600", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/19.2.5345600", @@ -15046,7 +15680,7 @@ } }, "displayName": "NDK (Side by side) 20.0.5392854", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "obsolete": "true", @@ -15093,7 +15727,7 @@ } }, "displayName": "NDK (Side by side) 20.0.5471264", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "obsolete": "true", @@ -15140,7 +15774,7 @@ } }, "displayName": "NDK (Side by side) 20.0.5594570", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/20.0.5594570", @@ -15185,7 +15819,7 @@ } }, "displayName": "NDK (Side by side) 20.1.5948944", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/20.1.5948944", @@ -15230,7 +15864,7 @@ } }, "displayName": "NDK (Side by side) 21.0.6011959", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.0.6011959", @@ -15276,7 +15910,7 @@ } }, "displayName": "NDK (Side by side) 21.0.6113669", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.0.6113669", @@ -15321,7 +15955,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6210238", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6210238", @@ -15367,7 +16001,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6273396", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6273396", @@ -15413,7 +16047,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6352462", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.1.6352462", @@ -15458,7 +16092,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6363665", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6363665", @@ -15504,7 +16138,7 @@ } }, "displayName": "NDK (Side by side) 21.2.6472646", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.2.6472646", @@ -15549,7 +16183,7 @@ } }, "displayName": "NDK (Side by side) 21.3.6528147", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.3.6528147", @@ -15594,7 +16228,7 @@ } }, "displayName": "NDK (Side by side) 21.4.7075529", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.4.7075529", @@ -15639,7 +16273,7 @@ } }, "displayName": "NDK (Side by side) 22.0.6917172", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/22.0.6917172", @@ -15685,7 +16319,7 @@ } }, "displayName": "NDK (Side by side) 22.0.7026061", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/22.0.7026061", @@ -15730,7 +16364,7 @@ } }, "displayName": "NDK (Side by side) 22.1.7171670", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/22.1.7171670", @@ -15775,7 +16409,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7123448", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7123448", @@ -15821,7 +16455,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7196353", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7196353", @@ -15867,7 +16501,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7272597", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7272597", @@ -15913,7 +16547,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7344513", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7344513", @@ -15959,7 +16593,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7421159", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7421159", @@ -16005,7 +16639,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7530507", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7530507", @@ -16051,7 +16685,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7599858", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.0.7599858", @@ -16096,7 +16730,7 @@ } }, "displayName": "NDK (Side by side) 23.1.7779620", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.1.7779620", @@ -16141,7 +16775,7 @@ } }, "displayName": "NDK (Side by side) 23.2.8568313", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.2.8568313", @@ -16186,7 +16820,7 @@ } }, "displayName": "NDK (Side by side) 24.0.7856742", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.7856742", @@ -16232,7 +16866,7 @@ } }, "displayName": "NDK (Side by side) 24.0.7956693", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.7956693", @@ -16278,7 +16912,7 @@ } }, "displayName": "NDK (Side by side) 24.0.8079956", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.8079956", @@ -16324,7 +16958,7 @@ } }, "displayName": "NDK (Side by side) 24.0.8215888", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/24.0.8215888", @@ -16369,7 +17003,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8151533", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8151533", @@ -16415,7 +17049,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8221429", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8221429", @@ -16461,7 +17095,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8355429", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8355429", @@ -16507,7 +17141,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8528842", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8528842", @@ -16553,7 +17187,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8775105", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/25.0.8775105", @@ -16598,7 +17232,7 @@ } }, "displayName": "NDK (Side by side) 25.1.8937393", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/25.1.8937393", @@ -16643,7 +17277,7 @@ } }, "displayName": "NDK (Side by side) 25.2.9519653", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/25.2.9519653", @@ -16688,7 +17322,7 @@ } }, "displayName": "NDK (Side by side) 26.0.10404224", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/26.0.10404224", @@ -16727,7 +17361,7 @@ } ], "displayName": "NDK (Side by side) 26.0.10636728", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/26.0.10636728", @@ -16766,7 +17400,7 @@ } ], "displayName": "NDK (Side by side) 26.0.10792818", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/26.0.10792818", @@ -16804,7 +17438,7 @@ } ], "displayName": "NDK (Side by side) 26.1.10909125", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/26.1.10909125", @@ -16842,7 +17476,7 @@ } ], "displayName": "NDK (Side by side) 26.2.11394342", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/26.2.11394342", @@ -16880,7 +17514,7 @@ } ], "displayName": "NDK (Side by side) 26.3.11579264", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/26.3.11579264", @@ -16895,6 +17529,122 @@ "xsi:type": "ns5:genericDetailsType" } } + }, + "27.0.11718014-rc1": { + "archives": [ + { + "os": "linux", + "sha1": "35a78f7544ccc72d8438d8ea2feb7f252a062abe", + "size": 658958615, + "url": "https://dl.google.com/android/repository/android-ndk-r27-beta1-linux.zip" + }, + { + "os": "macosx", + "sha1": "0206d7e1c4255c40acc691fad8bf943f055e627e", + "size": 841636299, + "url": "https://dl.google.com/android/repository/android-ndk-r27-beta1-darwin.zip" + }, + { + "os": "windows", + "sha1": "147b5b333cc57875e34b88ccd29efbe58963264d", + "size": 785017110, + "url": "https://dl.google.com/android/repository/android-ndk-r27-beta1-windows.zip" + } + ], + "displayName": "NDK (Side by side) 27.0.11718014", + "last-available-day": 19954, + "license": "android-sdk-preview-license", + "name": "ndk", + "path": "ndk/27.0.11718014", + "revision": "27.0.11718014-rc1", + "revision-details": { + "major:0": "27", + "micro:2": "11718014", + "minor:1": "0", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, + "27.0.11902837-rc2": { + "archives": [ + { + "os": "linux", + "sha1": "93103e182405b9d7757231a1d9dad58937a6374b", + "size": 662398163, + "url": "https://dl.google.com/android/repository/android-ndk-r27-beta2-linux.zip" + }, + { + "os": "macosx", + "sha1": "48af6bb62dbfff2f68b39cf118494ebd5ba3b8ad", + "size": 836162827, + "url": "https://dl.google.com/android/repository/android-ndk-r27-beta2-darwin.zip" + }, + { + "os": "windows", + "sha1": "30f4103bc32fd28a5b93bb610db0130cfe9ff125", + "size": 781461627, + "url": "https://dl.google.com/android/repository/android-ndk-r27-beta2-windows.zip" + } + ], + "displayName": "NDK (Side by side) 27.0.11902837", + "last-available-day": 19954, + "license": "android-sdk-preview-license", + "name": "ndk", + "path": "ndk/27.0.11902837", + "revision": "27.0.11902837-rc2", + "revision-details": { + "major:0": "27", + "micro:2": "11902837", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, + "27.0.12077973": { + "archives": [ + { + "os": "linux", + "sha1": "5e5cd517bdb98d7e0faf2c494a3041291e71bdcc", + "size": 663957918, + "url": "https://dl.google.com/android/repository/android-ndk-r27-linux.zip" + }, + { + "os": "macosx", + "sha1": "1a4a8c39c018430ff170657fc1673d895f5e4570", + "size": 836135405, + "url": "https://dl.google.com/android/repository/android-ndk-r27-darwin.zip" + }, + { + "os": "windows", + "sha1": "0ea2756e6815356831bda3af358cce4cdb6a981e", + "size": 781482169, + "url": "https://dl.google.com/android/repository/android-ndk-r27-windows.zip" + } + ], + "displayName": "NDK (Side by side) 27.0.12077973", + "last-available-day": 19954, + "license": "android-sdk-license", + "name": "ndk", + "path": "ndk/27.0.12077973", + "revision": "27.0.12077973", + "revision-details": { + "major:0": "27", + "micro:2": "12077973", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "ndk-bundle": { @@ -16927,7 +17677,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -16972,7 +17722,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17017,7 +17767,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17062,7 +17812,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk-bundle", "obsolete": "true", @@ -17108,7 +17858,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17153,7 +17903,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk-bundle", "obsolete": "true", @@ -17200,7 +17950,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk-bundle", "obsolete": "true", @@ -17247,7 +17997,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17292,7 +18042,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17337,7 +18087,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17383,7 +18133,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17428,7 +18178,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17474,7 +18224,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17520,7 +18270,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17565,7 +18315,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17611,7 +18361,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17656,7 +18406,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17701,7 +18451,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17746,7 +18496,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17792,7 +18542,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17837,7 +18587,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17882,7 +18632,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17928,7 +18678,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17974,7 +18724,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -18020,7 +18770,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -18254,6 +19004,44 @@ "xsi:type": "ns5:genericDetailsType" } } + }, + "35.0.2": { + "archives": [ + { + "os": "linux", + "sha1": "f6406982a79d67e40b1ca3cb9e5e2cc783c0f232", + "size": 7472902, + "url": "https://dl.google.com/android/repository/platform-tools_r35.0.2-linux.zip" + }, + { + "os": "macosx", + "sha1": "f6b3158097ca0e9d6fe2024b790ac68af3f2faf2", + "size": 13335867, + "url": "https://dl.google.com/android/repository/platform-tools_r35.0.2-darwin.zip" + }, + { + "os": "windows", + "sha1": "6d204cdff21bce8a39c1d2367084e6174f854c2c", + "size": 6700829, + "url": "https://dl.google.com/android/repository/platform-tools_r35.0.2-win.zip" + } + ], + "displayName": "Android SDK Platform-Tools", + "last-available-day": 19954, + "license": "android-sdk-license", + "name": "platform-tools", + "path": "platform-tools", + "revision": "35.0.2", + "revision-details": { + "major:0": "35", + "micro:2": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "platforms": { @@ -18267,7 +19055,7 @@ } ], "displayName": "Android SDK Platform 10", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-10", @@ -18299,7 +19087,7 @@ } ], "displayName": "Android SDK Platform 11", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-11", @@ -18331,7 +19119,7 @@ } ], "displayName": "Android SDK Platform 12", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-12", @@ -18363,7 +19151,7 @@ } ], "displayName": "Android SDK Platform 13", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-13", @@ -18395,7 +19183,7 @@ } ], "displayName": "Android SDK Platform 14", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-14", @@ -18427,7 +19215,7 @@ } ], "displayName": "Android SDK Platform 15", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-15", @@ -18459,7 +19247,7 @@ } ], "displayName": "Android SDK Platform 16", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-16", @@ -18491,7 +19279,7 @@ } ], "displayName": "Android SDK Platform 17", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-17", @@ -18523,7 +19311,7 @@ } ], "displayName": "Android SDK Platform 18", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-18", @@ -18555,7 +19343,7 @@ } ], "displayName": "Android SDK Platform 19", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-19", @@ -18599,7 +19387,7 @@ } ], "displayName": "Android SDK Platform 2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -18632,7 +19420,7 @@ } ], "displayName": "Android SDK Platform 20", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-20", @@ -18664,7 +19452,7 @@ } ], "displayName": "Android SDK Platform 21", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-21", @@ -18696,7 +19484,7 @@ } ], "displayName": "Android SDK Platform 22", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-22", @@ -18728,7 +19516,7 @@ } ], "displayName": "Android SDK Platform 23", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-23", @@ -18760,7 +19548,7 @@ } ], "displayName": "Android SDK Platform 24", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-24", @@ -18792,7 +19580,7 @@ } ], "displayName": "Android SDK Platform 25", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-25", @@ -18824,7 +19612,7 @@ } ], "displayName": "Android SDK Platform 26", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-26", @@ -18856,7 +19644,7 @@ } ], "displayName": "Android SDK Platform 27", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-27", @@ -18888,7 +19676,7 @@ } ], "displayName": "Android SDK Platform 28", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-28", @@ -18920,7 +19708,7 @@ } ], "displayName": "Android SDK Platform 29", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-29", @@ -18964,7 +19752,7 @@ } ], "displayName": "Android SDK Platform 3", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -18997,7 +19785,7 @@ } ], "displayName": "Android SDK Platform 30", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-30", @@ -19029,7 +19817,7 @@ } ], "displayName": "Android SDK Platform 31", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-31", @@ -19061,7 +19849,7 @@ } ], "displayName": "Android SDK Platform 32", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-32", @@ -19093,7 +19881,7 @@ } ], "displayName": "Android SDK Platform 33-ext5", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-33", @@ -19124,8 +19912,8 @@ "url": "https://dl.google.com/android/repository/platform-34-ext7_r02.zip" } ], - "displayName": "Android SDK Platform 34-ext10", - "last-available-day": 19823, + "displayName": "Android SDK Platform 34-ext12", + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -19141,6 +19929,11 @@ "element-attributes": { "xsi:type": "ns11:platformDetailsType" }, + "layoutlib:1": { + "element-attributes": { + "api": "15" + } + }, "layoutlib:2": { "element-attributes": { "api": "15" @@ -19148,6 +19941,36 @@ } } }, + "35": { + "archives": [ + { + "os": "all", + "sha1": "c84ed39cecaeec13bc06c67639fcf86734013d98", + "size": 64281654, + "url": "https://dl.google.com/android/repository/platform-35_r01.zip" + } + ], + "displayName": "Android SDK Platform 35", + "last-available-day": 19954, + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-35", + "revision": "35", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "35", + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:1": { + "element-attributes": { + "api": "15" + } + } + } + }, "4": { "archives": [ { @@ -19170,7 +19993,7 @@ } ], "displayName": "Android SDK Platform 4", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -19215,7 +20038,7 @@ } ], "displayName": "Android SDK Platform 5", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -19260,7 +20083,7 @@ } ], "displayName": "Android SDK Platform 6", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -19293,7 +20116,7 @@ } ], "displayName": "Android SDK Platform 7", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-7", @@ -19325,7 +20148,7 @@ } ], "displayName": "Android SDK Platform 8", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-8", @@ -19357,7 +20180,7 @@ } ], "displayName": "Android SDK Platform 9", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-9", @@ -19389,7 +20212,7 @@ } ], "displayName": "Android SDK Platform TiramisuPrivacySandbox", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-TiramisuPrivacySandbox", @@ -19420,7 +20243,7 @@ } ], "displayName": "Android SDK Platform UpsideDownCake", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -19452,7 +20275,7 @@ } ], "displayName": "Android SDK Platform UpsideDownCakePrivacySandbox", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-UpsideDownCakePrivacySandbox", @@ -19477,19 +20300,19 @@ "archives": [ { "os": "all", - "sha1": "b95f5a8a2bb908f8d13b6f874ab622e194c5aa20", - "size": 64097940, - "url": "https://dl.google.com/android/repository/platform-VanillaIceCream_r02.zip" + "sha1": "593df928592daf8e8b904a1680f54be715b32e98", + "size": 64462100, + "url": "https://dl.google.com/android/repository/platform-VanillaIceCream_r04.zip" } ], "displayName": "Android SDK Platform VanillaIceCream", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-VanillaIceCream", "revision": "VanillaIceCream", "revision-details": { - "major:0": "2" + "major:0": "4" }, "type-details": { "api-level:0": "34", @@ -19564,7 +20387,7 @@ } ], "displayName": "Layout Inspector image server for API S", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/2", @@ -19600,7 +20423,7 @@ } ], "displayName": "Layout Inspector image server for API 31-35", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/3", @@ -19636,7 +20459,7 @@ } ], "displayName": "Layout Inspector image server for API 29-30", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/1", @@ -19662,7 +20485,7 @@ } ], "displayName": "Sources for Android 14", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "obsolete": "true", @@ -19690,7 +20513,7 @@ } ], "displayName": "Sources for Android 15", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-15", @@ -19717,7 +20540,7 @@ } ], "displayName": "Sources for Android 16", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-16", @@ -19744,7 +20567,7 @@ } ], "displayName": "Sources for Android 17", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-17", @@ -19771,7 +20594,7 @@ } ], "displayName": "Sources for Android 18", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-18", @@ -19798,7 +20621,7 @@ } ], "displayName": "Sources for Android 19", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-19", @@ -19825,7 +20648,7 @@ } ], "displayName": "Sources for Android 20", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-20", @@ -19852,7 +20675,7 @@ } ], "displayName": "Sources for Android 21", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-21", @@ -19879,7 +20702,7 @@ } ], "displayName": "Sources for Android 22", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-22", @@ -19906,7 +20729,7 @@ } ], "displayName": "Sources for Android 23", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-23", @@ -19933,7 +20756,7 @@ } ], "displayName": "Sources for Android 24", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-24", @@ -19960,7 +20783,7 @@ } ], "displayName": "Sources for Android 25", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-25", @@ -19987,7 +20810,7 @@ } ], "displayName": "Sources for Android 26", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-26", @@ -20014,7 +20837,7 @@ } ], "displayName": "Sources for Android 27", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-27", @@ -20041,7 +20864,7 @@ } ], "displayName": "Sources for Android 28", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-28", @@ -20068,7 +20891,7 @@ } ], "displayName": "Sources for Android 29", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-29", @@ -20095,7 +20918,7 @@ } ], "displayName": "Sources for Android 30", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-30", @@ -20122,7 +20945,7 @@ } ], "displayName": "Sources for Android 31", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-31", @@ -20149,7 +20972,7 @@ } ], "displayName": "Sources for Android 32", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-32", @@ -20176,7 +20999,7 @@ } ], "displayName": "Sources for Android 33", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-33", @@ -20203,7 +21026,7 @@ } ], "displayName": "Sources for Android 34", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-34", @@ -20219,6 +21042,33 @@ "xsi:type": "ns11:sourceDetailsType" } } + }, + "35": { + "archives": [ + { + "os": "all", + "sha1": "c2770115a5f5ad787c8b298b93687a27eebb85b9", + "size": 48616636, + "url": "https://dl.google.com/android/repository/source-35_r01.zip" + } + ], + "displayName": "Sources for Android 35", + "last-available-day": 19954, + "license": "android-sdk-license", + "name": "sources", + "path": "sources/android-35", + "revision": "35", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "35", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } } }, "tools": { @@ -20267,7 +21117,7 @@ } }, "displayName": "Android SDK Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "tools", "obsolete": "true", diff --git a/third_party/nixpkgs/pkgs/development/node-packages/aliases.nix b/third_party/nixpkgs/pkgs/development/node-packages/aliases.nix index f8332ddd36..0396d33c76 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/aliases.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/aliases.nix @@ -74,6 +74,7 @@ mapAliases { inherit (pkgs) coc-diagnostic; # added 2024-06-29 coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21 inherit (pkgs) coc-pyright; # added 2024-07-14 + coc-python = throw "coc-python was removed because it was abandoned upstream on 2020-12-24. Upstream now recommends using coc-pyright or coc-jedi instead."; # added 2024-10-15 coinmon = throw "coinmon was removed since it was abandoned upstream"; # added 2024-03-19 coffee-script = pkgs.coffeescript; # added 2023-08-18 inherit (pkgs) concurrently; # added 2024-08-05 @@ -136,6 +137,7 @@ mapAliases { inherit (pkgs) node-pre-gyp; # added 2024-08-05 inherit (pkgs) node-red; # added 2024-10-06 inherit (pkgs) nodemon; # added 2024-06-28 + npm = pkgs.nodejs.overrideAttrs (old: { meta = old.meta // { mainProgram = "npm"; }; }); # added 2024-10-04 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 = self.parcel; # added 2023-09-04 @@ -156,6 +158,7 @@ mapAliases { s3http = throw "s3http was removed because it was abandoned upstream"; # added 2023-08-18 inherit (pkgs) serverless; # Added 2023-11-29 inherit (pkgs) snyk; # Added 2023-08-30 + inherit (pkgs) sql-formatter; # added 2024-06-29 "@squoosh/cli" = throw "@squoosh/cli was removed because it was abandoned upstream"; # added 2023-09-02 ssb-server = throw "ssb-server was removed because it was broken"; # added 2023-08-21 stf = throw "stf was removed because it was broken"; # added 2023-08-21 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 3844e327f3..928cfdd5d5 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -47,7 +47,6 @@ , "coc-metals" , "coc-pairs" , "coc-prettier" -, "coc-python" , "coc-r-lsp" , "coc-rls" , "coc-rust-analyzer" @@ -147,7 +146,6 @@ , "node-gyp-build" , "node2nix" , "np" -, "npm" , "npm-merge-driver" , "nrm" , "orval" @@ -182,7 +180,6 @@ , "smartdc" , "socket.io" , "speed-test" -, "sql-formatter" , "stackdriver-statsd-backend" , "svelte-check" , "svgo" 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 42ca576348..d9d6ae7a4e 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -21335,15 +21335,6 @@ let sha512 = "Cuia7IBvmSanM+7ZmKYtP9hq+Du7n7mv2cpCt8GiEIkUDni0ecSlVCFJUL6HWwGzqLX03uA49xVOZOjwnabWmQ=="; }; }; - "discontinuous-range-1.0.0" = { - name = "discontinuous-range"; - packageName = "discontinuous-range"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz"; - sha512 = "c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ=="; - }; - }; "dlnacasts-0.1.0" = { name = "dlnacasts"; packageName = "dlnacasts"; @@ -36863,15 +36854,6 @@ let sha512 = "HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ=="; }; }; - "moo-0.5.2" = { - name = "moo"; - packageName = "moo"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz"; - sha512 = "iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q=="; - }; - }; "morgan-1.10.0" = { name = "morgan"; packageName = "morgan"; @@ -37295,15 +37277,6 @@ let sha512 = "51cECUJMT0rUZNQa09EoKsnFeDL4x2dHRT0VR5U2H5ZgEcm95ZDWcMA5JShroXjHOejmAD/fg8+H+OvUnVXz2g=="; }; }; - "nearley-2.20.1" = { - name = "nearley"; - packageName = "nearley"; - version = "2.20.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz"; - sha512 = "+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ=="; - }; - }; "nedb-1.8.0" = { name = "nedb"; packageName = "nedb"; @@ -42984,15 +42957,6 @@ let sha512 = "1s5BQAy643nfjtnZZrH8V2fhj3snKrKkwp8cDaf2KfjW4/auwB+qffSEsvs1/iOuKiOr5vK7R0HQ0dQ1zituiQ=="; }; }; - "railroad-diagrams-1.0.0" = { - name = "railroad-diagrams"; - packageName = "railroad-diagrams"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz"; - sha512 = "cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A=="; - }; - }; "ramda-0.27.2" = { name = "ramda"; packageName = "ramda"; @@ -43002,15 +42966,6 @@ let sha512 = "SbiLPU40JuJniHexQSAgad32hfwd+DRUdwF2PlVuI5RZD0/vahUco7R8vD86J/tcEKKF9vZrUVwgtmGCqlCKyA=="; }; }; - "randexp-0.4.6" = { - name = "randexp"; - packageName = "randexp"; - version = "0.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz"; - sha512 = "80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ=="; - }; - }; "random-access-file-2.2.1" = { name = "random-access-file"; packageName = "random-access-file"; @@ -61238,24 +61193,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-python = nodeEnv.buildNodePackage { - name = "coc-python"; - packageName = "coc-python"; - version = "1.2.13"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-python/-/coc-python-1.2.13.tgz"; - sha512 = "thsXkbwwJMpiGa/1GiPvFnbWtC5K8QcZvcUtoc4lU8Hf38LbywK5qRp6M7tOAabJOq5dYcIYYbPZWzGwhoZEiw=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Python extension for coc.nvim, forked from vscode-python."; - homepage = "https://github.com/neoclide/coc-python#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-r-lsp = nodeEnv.buildNodePackage { name = "coc-r-lsp"; packageName = "coc-r-lsp"; @@ -76280,24 +76217,6 @@ in bypassCache = true; reconstructLock = true; }; - npm = nodeEnv.buildNodePackage { - name = "npm"; - packageName = "npm"; - version = "10.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-10.8.3.tgz"; - sha512 = "0IQlyAYvVtQ7uOhDFYZCGK8kkut2nh8cpAdA9E6FvRSJaTgtZRZgNjlC5ZCct//L73ygrpY93CxXpRJDtNqPVg=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "a package manager for JavaScript"; - homepage = "https://docs.npmjs.com/"; - license = "Artistic-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; npm-merge-driver = nodeEnv.buildNodePackage { name = "npm-merge-driver"; packageName = "npm-merge-driver"; @@ -80499,35 +80418,6 @@ in bypassCache = true; reconstructLock = true; }; - sql-formatter = nodeEnv.buildNodePackage { - name = "sql-formatter"; - packageName = "sql-formatter"; - version = "15.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/sql-formatter/-/sql-formatter-15.4.2.tgz"; - sha512 = "Pw4aAgfuyml/SHMlhbJhyOv+GR+Z1HNb9sgX3CVBVdN5YNM+v2VWkYJ3NNbYS7cu37GY3vP/PgnwoVynCuXRxg=="; - }; - dependencies = [ - sources."argparse-2.0.1" - sources."commander-2.20.3" - sources."discontinuous-range-1.0.0" - sources."get-stdin-8.0.0" - sources."moo-0.5.2" - sources."nearley-2.20.1" - sources."railroad-diagrams-1.0.0" - sources."randexp-0.4.6" - sources."ret-0.1.15" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Format whitespace in a SQL query to make it more readable"; - homepage = "https://github.com/sql-formatter-org/sql-formatter#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; stackdriver-statsd-backend = nodeEnv.buildNodePackage { name = "stackdriver-statsd-backend"; packageName = "stackdriver-statsd-backend"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/hacl-star/raw.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/hacl-star/raw.nix index 15dde10e7f..e481fea386 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/hacl-star/raw.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/hacl-star/raw.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-hacl-star-raw"; - version = "0.7.1"; + version = "0.7.2"; src = fetchzip { url = "https://github.com/cryspen/hacl-packages/releases/download/ocaml-v${version}/hacl-star.${version}.tar.gz"; - hash = "sha256-TcAEaJou4BOVXSz5DYewzKfvIpjXmhLAlgF0hlq3ToQ="; + hash = "sha256-6WPbdkT9IsX0Q8mF2vLBJMktEES8tU45JztOPepAL0o="; stripRoot = false; }; @@ -25,10 +25,7 @@ stdenv.mkDerivation rec { # strictoverflow is disabled because it breaks aarch64-darwin hardeningDisable = [ "strictoverflow" ]; - # Compatibility with ctypes ≥ 0.21 - # see: https://github.com/cryspen/hacl-packages/commit/81303b83a54a92d3b5f54f1b8ddbea60438cc2bf postPatch = '' - substituteInPlace hacl-star-raw/META --replace-warn 'requires="ctypes"' 'requires="ctypes ctypes.stubs"' patchShebangs ./ ''; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/default.nix index 9e512e35f3..d9a21225cb 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/default.nix @@ -9,6 +9,7 @@ , dot-merlin-reader , spawn , ocamlc-loc +, merlin , merlin-lib , astring , camlp-streams @@ -25,6 +26,22 @@ let lsp_v = let lsp = lsp_v; in +# Use merlin < 4.17 for OCaml < 5.2 +let merlin-lib_v = + if lib.versions.majorMinor ocaml.version == "4.14" + then merlin-lib.override { + merlin = merlin.override { + version = "4.16-414"; + }; + } else if lib.versions.majorMinor ocaml.version == "5.1" + then merlin-lib.override { + merlin = merlin.override { + version = "4.16-501"; + }; + } else merlin-lib +; in +let merlin-lib = merlin-lib_v; in + buildDunePackage rec { pname = "ocaml-lsp-server"; inherit (lsp) version src preBuild; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix index b22561666b..9787c67bbd 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix @@ -85,7 +85,7 @@ buildDunePackage rec { stdune ] else if lib.versionAtLeast version "1.7.0" then - [ pp re ppx_yojson_conv_lib octavius dune-build-info omd cmdliner ocamlformat-rpc-lib ] + [ re octavius dune-build-info omd cmdliner ocamlformat-rpc-lib ] else [ ppx_yojson_conv_lib @@ -113,7 +113,7 @@ buildDunePackage rec { ] else if lib.versionAtLeast version "1.7.0" then [ csexp jsonrpc - pp + (pp.override { version = "1.2.0"; }) ppx_yojson_conv_lib result uutf diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/pp/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/pp/default.nix index 19f446ad85..5851c758cf 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/pp/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/pp/default.nix @@ -1,16 +1,23 @@ -{ buildDunePackage, fetchurl, ppx_expect, lib }: +{ lib +, buildDunePackage +, fetchurl +, ppx_expect +, version ? "2.0.0" +}: buildDunePackage rec { pname = "pp"; - version = "1.2.0"; + inherit version; src = fetchurl { url = "https://github.com/ocaml-dune/pp/releases/download/${version}/pp-${version}.tbz"; - hash = "sha256-pegiVzxVr7Qtsp7FbqzR8qzY9lzy3yh44pHeN0zmkJw="; + hash = { + "2.0.0" = "sha256-hlE1FRiwkrSi3vTggXHCdhUvkvtqhKixm2uSnM20RBk="; + "1.2.0" = "sha256-pegiVzxVr7Qtsp7FbqzR8qzY9lzy3yh44pHeN0zmkJw="; + }."${version}"; }; - duneVersion = "3"; minimalOCamlVersion = "4.08"; checkInputs = [ ppx_expect ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/sail/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/sail/default.nix index c7df6ef503..56a7ef2ece 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/sail/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/sail/default.nix @@ -52,12 +52,12 @@ buildDunePackage rec { # This doesnt work in this case, as sail includes multiple packages in the same source tree buildPhase = '' runHook preBuild - dune build --release ''${enableParallelBuild:+-j $NIX_BUILD_CORES} + dune build --release ''${enableParallelBuilding:+-j $NIX_BUILD_CORES} runHook postBuild ''; checkPhase = '' runHook preCheck - dune runtest ''${enableParallelBuild:+-j $NIX_BUILD_CORES} + dune runtest ''${enableParallelBuilding:+-j $NIX_BUILD_CORES} runHook postCheck ''; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix index 83b8cacc77..cf354c5e89 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix @@ -1,20 +1,21 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner +, version ? if lib.versionAtLeast ocaml.version "4.14" then "0.9.9" else "0.9.8" +}: lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") "uuidm is not available for OCaml ${ocaml.version}" -stdenv.mkDerivation rec { - version = "0.9.8"; +stdenv.mkDerivation { + inherit version; pname = "uuidm"; src = fetchurl { url = "https://erratique.ch/software/uuidm/releases/uuidm-${version}.tbz"; - sha256 = "sha256-/GZbkJVDQu1UY8SliK282kUWAVMfOnpQadUlRT/tJrM="; + hash = { + "0.9.9" = "sha256-jOgNF05dpoU/XQEefSZhn3zSlQ1BA1b/U4Ib9j2mvFo="; + "0.9.8" = "sha256-/GZbkJVDQu1UY8SliK282kUWAVMfOnpQadUlRT/tJrM="; + }."${version}"; }; - postPatch = '' - substituteInPlace pkg/META --replace "bytes" "" - ''; - strictDeps = true; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/video/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/video/default.nix index c95d78590c..798607fb34 100644 --- a/third_party/nixpkgs/pkgs/development/octave-modules/video/default.nix +++ b/third_party/nixpkgs/pkgs/development/octave-modules/video/default.nix @@ -3,7 +3,7 @@ , lib , fetchFromGitHub , pkg-config -, ffmpeg_7 +, ffmpeg }: buildOctavePackage rec { @@ -22,7 +22,7 @@ buildOctavePackage rec { ]; propagatedBuildInputs = [ - ffmpeg_7 + ffmpeg ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/Po4a/default.nix b/third_party/nixpkgs/pkgs/development/perl-modules/Po4a/default.nix index f15697fbf3..dee562e682 100644 --- a/third_party/nixpkgs/pkgs/development/perl-modules/Po4a/default.nix +++ b/third_party/nixpkgs/pkgs/development/perl-modules/Po4a/default.nix @@ -10,6 +10,7 @@ , docbook_sgml_dtd_41 , opensp , bash +, fetchpatch , perl , buildPerlPackage , ModuleBuild @@ -25,11 +26,11 @@ buildPerlPackage rec { pname = "po4a"; - version = "0.71"; + version = "0.73"; src = fetchurl { url = "https://github.com/mquinson/po4a/releases/download/v${version}/po4a-${version}.tar.gz"; - hash = "sha256-xXJAHknMEXV8bTBgkW/ftagzJR7R1K65ibZnBLzyg/k="; + hash = "sha256-bxj4LYyyo3c5QTfqOWzD6BldbNbkVP4CGKoPDjYDjqA="; }; strictDeps = true; @@ -55,6 +56,13 @@ buildPerlPackage rec { kpsewhich-stub glibcLocales ]; + patches = [ + # Needs a patch for 5.40 until the next release + (fetchpatch { + url = "https://github.com/mquinson/po4a/commit/28fe52651eb8096d97d6bd3a97b3168522ba5306.patch"; + hash = "sha256-QUXxkSzcnwRvU+2y2KoBXmtfE8qTZ2BV0StkJHqZehQ="; + }) + ]; # TODO: TermReadKey was temporarily removed from propagatedBuildInputs to unfreeze the build propagatedBuildInputs = lib.optionals (!stdenv.hostPlatform.isMusl) [ diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/encode-imaputf7.patch b/third_party/nixpkgs/pkgs/development/perl-modules/encode-imaputf7.patch new file mode 100644 index 0000000000..93842cf288 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/perl-modules/encode-imaputf7.patch @@ -0,0 +1,13 @@ +diff --git a/lib/Encode/IMAPUTF7.pm b/lib/Encode/IMAPUTF7.pm +index 07835b9..411c57f 100644 +--- a/lib/Encode/IMAPUTF7.pm ++++ b/lib/Encode/IMAPUTF7.pm +@@ -9,6 +9,8 @@ __PACKAGE__->Define('IMAP-UTF-7', 'imap-utf-7'); + our $VERSION = '1.05'; + use MIME::Base64; + use Encode; ++use Exporter 'import'; ++our @EXPORT_OK = qw(encode decode); + + # + # Algorithms taken from Unicode::String by Gisle Aas diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/generic/default.nix b/third_party/nixpkgs/pkgs/development/perl-modules/generic/default.nix index e7afedf5d6..73c09f4dbe 100644 --- a/third_party/nixpkgs/pkgs/development/perl-modules/generic/default.nix +++ b/third_party/nixpkgs/pkgs/development/perl-modules/generic/default.nix @@ -43,7 +43,7 @@ lib.throwIf (attrs ? name) "buildPerlPackage: `name` (\"${attrs.name}\") is depr builder = ./builder.sh; buildInputs = buildInputs ++ [ perl ]; - nativeBuildInputs = nativeBuildInputs ++ (if stdenv.buildPlatform != stdenv.hostPlatform then [ perl.mini ] else [ perl ]); + nativeBuildInputs = nativeBuildInputs ++ (if !(stdenv.buildPlatform.canExecute stdenv.hostPlatform) then [ perl.mini ] else [ perl ]); inherit outputs src doCheck checkTarget enableParallelBuilding; env = { diff --git a/third_party/nixpkgs/pkgs/development/php-packages/memcached/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/memcached/default.nix index bbf4f9856f..1b85b25671 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/memcached/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/memcached/default.nix @@ -11,13 +11,13 @@ buildPecl rec { pname = "memcached"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "php-memcached-dev"; repo = "php-memcached"; rev = "v${version}"; - sha256 = "sha256-g9IzGSZUxLlOE32o9ZJOa3erb5Qs1ntR8nzS3kRd/EU="; + sha256 = "sha256-V4d6bY0m1nuEfjZjt3qio4/HOBcSlD9+XMEl1GPfbhs="; }; internalDeps = [ php.extensions.session ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/accelerate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/accelerate/default.nix index a809c48b73..bcbd29bcc9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/accelerate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/accelerate/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "accelerate"; - version = "0.34.2"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "accelerate"; rev = "refs/tags/v${version}"; - hash = "sha256-4kDNLta6gGev16A4hNOArTpoD8p6LMRwqwHS/DZjtz0="; + hash = "sha256-XVJqyhDSUPQDHdaB6GDxHhuC6EWCSZNArjzyLpvhQHI="; }; buildInputs = [ llvmPackages.openmp ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix index a0b9efec09..5ca70cdd14 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix @@ -115,6 +115,12 @@ buildPythonPackage rec { "test_hinting_data" "test_waterfallplot" ] + ++ lib.optionals (stdenv.cc.isGNU) [ + # broke in the gcc 13 → 14 update + "test_dump" + "test_input_formats" + "test_other_input_formats" + ] ++ lib.optionals (!runAllTests) [ # Disable slow tests, reduces test time ~25 % "test_report" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aggdraw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aggdraw/default.nix index 06e092b4a6..5eaa52f726 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aggdraw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aggdraw/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "aggdraw"; - version = "1.3.18"; + version = "1.3.19"; format = "pyproject"; src = fetchFromGitHub { owner = "pytroll"; repo = pname; rev = "v${version}"; - hash = "sha256-dM6yLR6xsZerpqY+BMxIjrJ3fQty9CFUWhxl2zkTgRA="; + hash = "sha256-J9+mxlUxOoRBFdz+p8me2T93jaov5rNvKbAZ2YX/VhA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioairzone-cloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioairzone-cloud/default.nix index f2e7c88af8..5e5499e2bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone-cloud"; - version = "0.6.6"; + version = "0.6.7"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone-cloud"; rev = "refs/tags/${version}"; - hash = "sha256-a1UsRmDCieCMblH2SpNujDj98GjqDcMN6+TRAWkkV3I="; + hash = "sha256-6M80Qm5stk3wsZ55wcrJc8Y/TDd5zLWwiOhKj+5FQHs="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioautomower/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioautomower/default.nix index 675657c7be..8884f0ef90 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioautomower/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioautomower/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aioautomower"; - version = "2024.9.3"; + version = "2024.10.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Thomas55555"; repo = "aioautomower"; rev = "refs/tags/${version}"; - hash = "sha256-2jPQcMD05SUYnBwAaWHbGKXy7Du2JKPVq3eui9YaqxI="; + hash = "sha256-qWXFkz1yIpSDGFilVZK0n+hEUs7osfO+2xfknr2cOZY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix index a926f96b8d..9d3778b864 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix @@ -5,6 +5,7 @@ buildPythonPackage, fetchPypi, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, setuptools, @@ -14,24 +15,17 @@ buildPythonPackage rec { pname = "aioftp"; - version = "0.22.3"; + version = "0.23.1"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-uqKxMYaqAWIuS4LyfC9I9Nr7SORXprGPzamakl4NwnA="; + hash = "sha256-uA6t2MqV0ru8+r594Vy+AawRey50Z3FzdN5Ge62TVws="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov" "" - ''; - - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ siosocks ]; + build-system = [ setuptools ]; optional-dependencies = { socks = [ siosocks ]; @@ -40,6 +34,7 @@ buildPythonPackage rec { nativeCheckInputs = [ async-timeout pytest-asyncio + pytest-cov-stub pytestCheckHook trustme ] ++ lib.flatten (builtins.attrValues optional-dependencies); diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioopenexchangerates/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioopenexchangerates/default.nix index 2c372e0a63..fff4745000 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioopenexchangerates/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioopenexchangerates/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioopenexchangerates"; - version = "0.6.6"; + version = "0.6.7"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aioopenexchangerates"; rev = "refs/tags/v${version}"; - hash = "sha256-KFs5r7C7CorjEix2yL+NT/0liz3ivoiL6ZV5lJbBWBc="; + hash = "sha256-vXDgtoQWKWLadOFtZR+zsYvNAsdfMDqFBKz0tWOsMEE="; }; pythonRelaxDeps = [ "pydantic" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiortm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiortm/default.nix index 05263b49c7..378d17562c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiortm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiortm/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aiortm"; - version = "0.9.7"; + version = "0.9.17"; pyproject = true; disabled = pythonOlder "3.12"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiortm"; rev = "refs/tags/v${version}"; - hash = "sha256-dkQihn2x6WHEPA4bbbeONhQlFXR0xc1vC1A+sWAhSl8="; + hash = "sha256-mn0BXKfDbbLPt11uhF1laL2F/OA7+w1vHM5SaCQWJRw="; }; pythonRelaxDeps = [ "typer" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiostream/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiostream/default.nix index 4c03576350..701278b299 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiostream/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiostream/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, setuptools, @@ -14,7 +15,7 @@ buildPythonPackage rec { version = "0.6.3"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "vxgmichel"; @@ -23,17 +24,13 @@ buildPythonPackage rec { hash = "sha256-MssA4gDo79mlHjVwQAxhX6DZPHB4Quo6V05Nye91oJg="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail " --cov aiostream" "" - ''; - build-system = [ setuptools ]; dependencies = [ typing-extensions ]; nativeCheckInputs = [ pytest-asyncio + pytest-cov-stub pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiostreammagic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiostreammagic/default.nix index 4b631f5e0e..112e84f2d4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiostreammagic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiostreammagic/default.nix @@ -1,6 +1,5 @@ { lib, - aiohttp, buildPythonPackage, fetchFromGitHub, mashumaro, @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "aiostreammagic"; - version = "2.5.0"; + version = "2.8.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +21,7 @@ buildPythonPackage rec { owner = "noahhusby"; repo = "aiostreammagic"; rev = "refs/tags/${version}"; - hash = "sha256-Tb15ro+6K+7jqmer/bXDJUEBonMv1sZSU/0ZtCWOCfc="; + hash = "sha256-xXKI7qbIAyG957TTZHoA23sQvvom2TNDGSGSTlRcZUQ="; }; pythonRelaxDeps = [ "websockets" ]; @@ -30,7 +29,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; dependencies = [ - aiohttp mashumaro orjson websockets diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix index f68dec2eeb..9fdbb0c65f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-core"; - version = "2.15.2"; + version = "2.16.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VPZqU+GTxhxeFupFBaDKtDVD+K0u8igz9pxNXlFRwX0="; + hash = "sha256-ZRyq1ZfrOdT61s+FEz3/6Sg31TvfYtudjzfatlCLuPk="; }; pythonRelaxDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/androguard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/androguard/default.nix index c5a4300736..a688939a84 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/androguard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/androguard/default.nix @@ -16,10 +16,7 @@ pyqt5, pyperclip, pytestCheckHook, - mock, python-magic, - codecov, - coverage, qt5, # This is usually used as a library, and it'd be a shame to force the GUI # libraries to the closure if GUI is not desired. @@ -73,9 +70,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - codecov - coverage - mock pyperclip pyqt5 python-magic @@ -88,10 +82,10 @@ buildPythonPackage rec { makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; - meta = with lib; { + meta = { description = "Tool and Python library to interact with Android Files"; homepage = "https://github.com/androguard/androguard"; - license = licenses.asl20; - maintainers = with maintainers; [ pmiddend ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ pmiddend ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/androguard/fix-tests.patch b/third_party/nixpkgs/pkgs/development/python-modules/androguard/fix-tests.patch index b971b46c62..267f839eb9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/androguard/fix-tests.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/androguard/fix-tests.patch @@ -1,8 +1,21 @@ +diff --git a/tests/dataflow_test.py b/tests/dataflow_test.py +index e9ac3cdb..edef8200 100644 +--- a/tests/dataflow_test.py ++++ b/tests/dataflow_test.py +@@ -5,7 +5,7 @@ import sys + sys.path.append('.') + + import collections +-import mock ++from unittest import mock + import unittest + from androguard.decompiler.dad import dataflow + from androguard.decompiler.dad import graph diff --git a/tests/test_types.py b/tests/test_types.py -index 127dfc20eb..f1c89f0712 100644 +index 127dfc20..f1c89f07 100644 --- a/tests/test_types.py +++ b/tests/test_types.py -@@ -182,7 +182,7 @@ +@@ -182,7 +182,7 @@ class TypesTest(unittest.TestCase): for i in filter(lambda x: 'const' in x.get_name(), method.get_instructions()): i.show(0) # ins should only have one literal diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansiwrap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansiwrap/default.nix index f45f8c0cca..48963155d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansiwrap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansiwrap/default.nix @@ -9,7 +9,6 @@ setuptools, textwrap3, }: - buildPythonPackage rec { pname = "ansiwrap"; version = "0.8.4"; @@ -47,5 +46,7 @@ buildPythonPackage rec { changelog = "https://github.com/jonathaneunice/ansiwrap/blob/master/CHANGES.yml"; license = licenses.asl20; maintainers = [ ]; + + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/app-model/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/app-model/default.nix index da4854d547..8378cbfea5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/app-model/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/app-model/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "app-model"; - version = "0.2.8"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pyapp-kit"; repo = "app-model"; rev = "refs/tags/v${version}"; - hash = "sha256-vGSFo2ZckIDI3TjBSTKZagTEYdILt1/5Wyws3P7FNiQ="; + hash = "sha256-PvQ9l2sCi1NaF/SWApWqt6a5AHI5A+zmJRo8gR3ng6Y="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index ed93d5dc27..01ed99cb62 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "6.0.14"; + version = "6.1.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-Xm/2AHV4r6SmKK1wZS20xh9xRO3zhdEB/hpRT1o3z2Q="; + hash = "sha256-phqlzL2t7wv1Fxi8ZdTospcpHRcS9Q+mlpKRP6VeB4o="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asn1tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asn1tools/default.nix index cd0b3a0895..8ca21fece1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asn1tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asn1tools/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "asn1tools"; - version = "0.166.0"; + version = "0.167.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,17 +23,17 @@ buildPythonPackage rec { owner = "eerimoq"; repo = "asn1tools"; rev = "refs/tags/${version}"; - hash = "sha256-TWAOML6nsLX3TYqoQ9fcSjrUmC4byXOfczfkmSaSa0k="; + hash = "sha256-86bdBYlAVJfd3EY8s0t6ZDRA/qZVWuHD4Jxa1n1Ke5E="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ bitstruct pyparsing ]; - passthru.optional-depdendencies = { + optional-dependencies = { shell = [ prompt-toolkit ]; cache = [ diskcache ]; }; @@ -41,7 +41,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-xdist pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-depdendencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "asn1tools" ]; @@ -53,10 +53,10 @@ buildPythonPackage rec { meta = with lib; { description = "ASN.1 parsing, encoding and decoding"; - mainProgram = "asn1tools"; homepage = "https://github.com/eerimoq/asn1tools"; changelog = "https://github.com/eerimoq/asn1tools/releases/tag/${version}"; license = licenses.mit; maintainers = [ ]; + mainProgram = "asn1tools"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asynccmd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asynccmd/default.nix index 0cfbf87fc4..d9ffae1cf7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asynccmd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asynccmd/default.nix @@ -4,20 +4,21 @@ fetchFromGitHub, fetchpatch, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "asynccmd"; version = "0.2.4"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "valentinmk"; - repo = pname; - rev = version; - sha256 = "02sa0k0zgwv0y8k00pd1yh4x7k7xqhdikk2c0avpih1204lcw26h"; + repo = "asynccmd"; + rev = "refs/tags/${version}"; + hash = "sha256-0AjOKAEiwHi3AkzMGRvE/czTCfShXQAm8mDz98EESgs="; }; patches = [ @@ -25,10 +26,12 @@ buildPythonPackage rec { (fetchpatch { name = "deprecation-python-38.patch"; url = "https://github.com/valentinmk/asynccmd/commit/12afa60ac07db17e96755e266061f2c88cb545ff.patch"; - sha256 = "0l6sk93gj51qqrpw01a8iiyz14k6dd2z68vr9l9w9vx76l8725yf"; + hash = "sha256-zhdxEDWn78QTTXkj80VrZpLwfYxIBcBvxjgU+Uaa2lA="; }) ]; + build-system = [ setuptools ]; + # Tests are outdated doCheck = false; @@ -37,7 +40,8 @@ buildPythonPackage rec { meta = with lib; { description = "Asyncio implementation of Cmd Python library"; homepage = "https://github.com/valentinmk/asynccmd"; - license = with licenses; [ asl20 ]; + changelog = "https://github.com/valentinmk/asynccmd/releases/tag/${version}"; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/atenpdu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atenpdu/default.nix index f60b281112..b34b1c46c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/atenpdu/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/atenpdu/default.nix @@ -10,24 +10,19 @@ buildPythonPackage rec { pname = "atenpdu"; - version = "0.6.2"; + version = "0.6.3"; pyproject = true; - disabled = pythonOlder "3."; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-KzRoE4tE/tQkKYroq5PbWKREmEl8AwbIOg3IHRZZtsQ="; + hash = "sha256-BcCw5y5LB0jLp9dRP0ZsAObTZ07kS+h+Hm8PZ0NwU3E="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail pysnmp-lextudio pysnmp - ''; + build-system = [ poetry-core ]; - nativeBuildInputs = [ poetry-core ]; - - propagatedBuildInputs = [ + dependencies = [ async-timeout pysnmp ]; @@ -39,10 +34,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface to control ATEN PE PDUs"; - mainProgram = "pductl"; homepage = "https://github.com/mtdcr/pductl"; changelog = "https://github.com/mtdcr/pductl/releases/tag/${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "pductl"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix index 98f2f16b1f..fe6ee9f8f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix @@ -4,25 +4,14 @@ fetchFromGitHub, attrs, argon2-cffi, - base58, cbor2, cffi, - click, cryptography, - ecdsa, - eth-abi, - eth-account, flatbuffers, - jinja2, - hkdf, hyperlink, - mnemonic, mock, msgpack, passlib, - py-ecc, - # , py-eth-sig-utils - py-multihash, py-ubjson, pynacl, pygobject3, @@ -32,19 +21,11 @@ python-snappy, pytestCheckHook, pythonOlder, - # , pytrie - rlp, service-identity, setuptools, - spake2, twisted, txaio, ujson, - # , web3 - # , wsaccel - # , xbr - yapf, - # , zlmdb zope-interface, }@args: @@ -71,13 +52,11 @@ buildPythonPackage rec { txaio ]; - nativeCheckInputs = - [ - mock - pytest-asyncio - pytestCheckHook - ] - ++ optional-dependencies.scram ++ optional-dependencies.serialization ++ optional-dependencies.xbr; + nativeCheckInputs = [ + mock + pytest-asyncio + pytestCheckHook + ] ++ optional-dependencies.scram ++ optional-dependencies.serialization; preCheck = '' # Run asyncio tests (requires twisted) @@ -92,7 +71,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "autobahn" ]; optional-dependencies = rec { - all = accelerate ++ compress ++ encryption ++ nvx ++ serialization ++ scram ++ twisted ++ ui ++ xbr; + all = accelerate ++ compress ++ encryption ++ nvx ++ serialization ++ scram ++ twisted ++ ui; accelerate = [ # wsaccel ]; @@ -122,22 +101,6 @@ buildPythonPackage rec { zope-interface ]; ui = [ pygobject3 ]; - xbr = [ - base58 - cbor2 - click - ecdsa - eth-abi - jinja2 - hkdf - mnemonic - py-ecc # py-eth-sig-utils - py-multihash - rlp - spake2 - twisted # web3 xbr - yapf # zlmdb - ]; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/automat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/automat/default.nix index 05d612256e..7833eb27f5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/automat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/automat/default.nix @@ -11,14 +11,13 @@ let automat = buildPythonPackage rec { - version = "22.10.0"; - format = "setuptools"; + version = "24.8.1"; + format = "pyproject"; pname = "automat"; src = fetchPypi { - pname = "Automat"; - inherit version; - hash = "sha256-5WvrhO2tGdzBHTDo2biV913ute9elrhKRnBms7hLsE4="; + inherit pname version; + hash = "sha256-s0Inz2P2MluK0jme3ngGdQg+Q5sgwyPTdjc9juYwbYg="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/av/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/av/default.nix index e3da4e6427..249c5af0be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/av/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/av/default.nix @@ -6,7 +6,7 @@ fetchFromGitHub, fetchurl, linkFarm, - ffmpeg_6-headless, + ffmpeg-headless, numpy, pillow, pkg-config, @@ -17,16 +17,16 @@ buildPythonPackage rec { pname = "av"; - version = "12.3.0"; + version = "13.0.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "PyAV-Org"; repo = "PyAV"; rev = "refs/tags/v${version}"; - hash = "sha256-ezeYv55UzNnnYDjrMz5YS5g2pV6U/Fxx3e2bCoPP3eI="; + hash = "sha256-blvtHSUqSl9xAM4t+dFJWmXiOjtnAUC9nicMaUY1zuU="; }; build-system = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ffmpeg_6-headless ]; + buildInputs = [ ffmpeg-headless ]; preCheck = let diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ayla-iot-unofficial/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ayla-iot-unofficial/default.nix index 3e2819fa0f..462a9f1130 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ayla-iot-unofficial/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ayla-iot-unofficial/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ayla-iot-unofficial"; - version = "1.4.1"; + version = "1.4.2"; pyproject = true; src = fetchFromGitHub { owner = "rewardone"; repo = "ayla-iot-unofficial"; rev = "refs/tags/v${version}"; - hash = "sha256-SAfDpABOWsic3kqsN0txlchEIRKJ0xtpJERZUH5CKR0="; + hash = "sha256-E0vDaKZxrOwzRsqVYw+RVgFYgRB+klW1yb07KA+9zWc="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-billing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-billing/default.nix index db243f5857..dfef1554ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-billing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-billing/default.nix @@ -1,45 +1,46 @@ { lib, - buildPythonPackage, - fetchPypi, - msrestazure, azure-common, azure-mgmt-core, - azure-mgmt-nspkg, + buildPythonPackage, + fetchPypi, + isodate, + pythonOlder, + setuptools, + typing-extensions, }: buildPythonPackage rec { pname = "azure-mgmt-billing"; - version = "6.0.0"; # pypi's 0.2.0 doesn't build ootb - format = "setuptools"; + version = "7.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - sha256 = "d4f5c5a4188a456fe1eb32b6c45f55ca2069c74be41eb76921840b39f2f5c07f"; - extension = "zip"; + pname = "azure_mgmt_billing"; + inherit version; + hash = "sha256-jgplxlEQtTpCk35b7WrgDvydYgaXLZa/1KdOgMhcLXs="; }; - propagatedBuildInputs = [ - msrestazure + build-system = [ setuptools ]; + + dependencies = [ azure-common azure-mgmt-core - azure-mgmt-nspkg + isodate + typing-extensions ]; - preBuild = '' - rm -rf azure_bdist_wheel.py - substituteInPlace setup.cfg \ - --replace "azure-namespace-package = azure-mgmt-nspkg" "" - ''; - pythonNamespaces = [ "azure.mgmt" ]; - # has no tests + # Module has no tests doCheck = false; meta = with lib; { description = "This is the Microsoft Azure Billing Client Library"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/billing/azure-mgmt-billing"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-billing_${version}/sdk/billing/azure-mgmt-billing/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ maxwilson ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix index 5169b9a733..04e4ee8bf5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.18.0"; + version = "12.19.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_storage_file_share"; inherit version; - hash = "sha256-CoHa7l4TWYrM3jxzsa7Mxu39zsXpV79AFQwGIvuV3HY="; + hash = "sha256-6npBdNxsUvUKyMMPIoFZ/MNnXR+Lp3G40O/LwxB0Ang="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/beancount-black/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/beancount-black/default.nix index c229ec89ce..4ee5b85f00 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/beancount-black/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/beancount-black/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "beancount-black"; - version = "1.0.4"; + version = "1.0.5"; disabled = pythonOlder "3.9"; format = "pyproject"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "LaunchPlatform"; repo = "beancount-black"; rev = "refs/tags/${version}"; - hash = "sha256-GrdQCxVsAzCusxxfQHF48doWG8OVrqBayCFof9RHTkE="; + hash = "sha256-vo11mlgDhyc8YFnULJ4AFrANWmGpAMNX5jJ6QaUNqk0="; }; buildInputs = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/beautifulsoup4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/beautifulsoup4/default.nix index 764f91ec40..a0fbb4ade8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + fetchpatch, chardet, hatchling, html5lib, @@ -37,6 +38,14 @@ buildPythonPackage rec { hash = "sha256-dOPRko7cBw0hdIGFxG4/szSQ8i9So63e6a7g9Pd4EFE="; }; + patches = [ + (fetchpatch { + name = "tests.patch"; + url = "https://git.launchpad.net/beautifulsoup/patch/?id=9786a62726de5a8caba10021c4d4a58c8a3e9e3f"; + hash = "sha256-FOMoJjT0RgqKjbTLN/qCuc0HjhKeenMcgwb9Fp8atAY="; + }) + ]; + nativeBuildInputs = [ hatchling sphinxHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix index 1cc552f2aa..f06a56eb97 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "bleak-retry-connector"; - version = "3.5.0"; + version = "3.6.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bleak-retry-connector"; rev = "refs/tags/v${version}"; - hash = "sha256-oqc997siTg43Ulrc539G3utfQvHjcBZJgQ8/CfcSduc="; + hash = "sha256-WjowXfj9kPlMmfs3aJBHIux5/w6te7zpXXqXPaz2pks="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix index aef8d84b43..9fde15cf9d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "bleak"; - version = "0.22.2"; + version = "0.22.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "hbldh"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-O8EvF+saJ0UBZ8MESM5gIRmk2wbA4HUDADiVUtXzXrY="; + hash = "sha256-kPeKQcJETZE6+btQsmCgb37yRI2Klg0lZ1ZIrm8ODow="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-adapters/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-adapters/default.nix index 4b56028b75..515c3f167e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-adapters/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-adapters/default.nix @@ -10,6 +10,7 @@ mac-vendor-lookup, myst-parser, poetry-core, + pytest-asyncio, pytestCheckHook, pythonOlder, sphinx-rtd-theme, @@ -20,7 +21,7 @@ buildPythonPackage rec { pname = "bluetooth-adapters"; - version = "0.19.4"; + version = "0.20.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +30,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bluetooth-adapters"; rev = "refs/tags/v${version}"; - hash = "sha256-XpPC7FVWzdEki6kdZDu0vV7iD1DZzGbI1f9VKxsjKUQ="; + hash = "sha256-dQjoaBK+WMHQss/7nQRRCE8Jv4S0iq6awa/t3SMGUiE="; }; postPatch = '' @@ -60,9 +61,12 @@ buildPythonPackage rec { usb-devices ]; - pythonImportsCheck = [ "bluetooth_adapters" ]; + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; - nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "bluetooth_adapters" ]; meta = with lib; { description = "Tools to enumerate and find Bluetooth Adapters"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix index f1d9105c5f..98d8dc30c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "boto"; repo = "boto3"; rev = "refs/tags/${version}"; - hash = "sha256-fiUguOzNF9T3CcGD1mYl2b5QFbvBG8wNOd3Or2NR66E="; + hash = "sha256-4WP5E8LuuxWZi8DK8yOpvyy6isSfB4eFcbctkTEd3As="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix index dd08f7215a..974846ebd2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.34.131"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.35.29"; # N.B: if you change this, change boto3 and awscli to a matching version pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-UC3a/h1if88eTAB8hkVOXdAR26fFi9jopTaKefPjh9w="; + hash = "sha256-TtKKsDZ1uwCKKQxFLF3deqpdTj+hkSqtvfkwV+6ENis="; }; pythonRelaxDeps = [ "urllib3" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bugwarrior/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bugwarrior/default.nix index ada42fb4b4..6510ce721f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bugwarrior/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bugwarrior/default.nix @@ -7,7 +7,7 @@ twiggy, requests, offtrac, - bugzilla, + python-bugzilla, taskw, python-dateutil, pytz, @@ -39,7 +39,7 @@ buildPythonPackage rec { twiggy requests offtrac - bugzilla + python-bugzilla taskw python-dateutil pytz diff --git a/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix index d332923030..b5077ddc5f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix @@ -15,12 +15,13 @@ pythonOlder, setuptools, tomli, + virtualenv, wheel, }: buildPythonPackage rec { pname = "build"; - version = "1.2.1"; + version = "1.2.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,7 +30,7 @@ buildPythonPackage rec { owner = "pypa"; repo = "build"; rev = "refs/tags/${version}"; - hash = "sha256-G0g+1v19sQMUuQlZKGELZOwwX07i7TIdEdaYzr8bKtI="; + hash = "sha256-pord65+Mg3TmHpAtU6PQAzxAmGtNu6MSxTruJsnA0EE="; }; postPatch = '' @@ -65,6 +66,7 @@ buildPythonPackage rec { pytest-xdist pytestCheckHook setuptools + virtualenv wheel ]; @@ -85,6 +87,9 @@ buildPythonPackage rec { "test_init" "test_output" "test_wheel_metadata" + # Tests require network access to run pip install + "test_verbose_output" + "test_requirement_installation" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Expects Apple's Python and its quirks diff --git a/third_party/nixpkgs/pkgs/development/python-modules/catboost/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/catboost/default.nix index 98e4f0869c..d0fc77b700 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/catboost/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/catboost/default.nix @@ -3,15 +3,18 @@ buildPythonPackage, catboost, python, + + # build-system + setuptools, + + # dependencies graphviz, matplotlib, numpy, pandas, plotly, scipy, - setuptools, six, - wheel, }: buildPythonPackage rec { @@ -21,16 +24,15 @@ buildPythonPackage rec { src meta ; - format = "pyproject"; + pyproject = true; sourceRoot = "${src.name}/catboost/python-package"; - nativeBuildInputs = [ + build-system = [ setuptools - wheel ]; - propagatedBuildInputs = [ + dependencies = [ graphviz matplotlib numpy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix index bfdbd76352..8b15979cb2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "censys"; - version = "2.2.14"; + version = "2.2.15"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "censys"; repo = "censys-python"; rev = "refs/tags/v${version}"; - hash = "sha256-3evll1Ll8krvAfelGoJHOrmH7RvkeM/ZU1j13cTuXR4="; + hash = "sha256-LJX2hYqdSd6SgObrs1FsJ4oxYGs6Y4g2wyFi5pDY4z8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix index ea1873e2c5..8709b0507e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix @@ -4,6 +4,7 @@ python, runCommand, fetchFromGitHub, + fetchpatch, configargparse, acme, configobj, @@ -33,7 +34,16 @@ buildPythonPackage rec { hash = "sha256-Qee7lUjgliG5fmUWWPm3MzpGJHUF/DXZ08UA6kkWjjk="; }; - sourceRoot = "${src.name}/${pname}"; + patches = [ + (fetchpatch { + name = "CSR_support_in_pyOpenSSL_is_deprecated.patch"; + url = "https://github.com/certbot/certbot/commit/f005045d87b25f1922774685646e57765aa202ad.patch"; + includes = [ "pytest.ini" ]; + hash = "sha256-YcQbZb7DLU+AXxNyqJRYZIC18DuT6X8kGbfdYtUrHiA="; + }) + ]; + + postPatch = "cd ${pname}"; # using sourceRoot would interfere with patches nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix index 9ddc6ba9cc..cd0e1c143a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix @@ -19,12 +19,12 @@ if isPyPy then else buildPythonPackage rec { pname = "cffi"; - version = "1.17.0"; + version = "1.17.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-8xV2JLdVi5FMsDn9Gvc15egEmofIF8whUQmtHId533Y="; + hash = "sha256-HDnGAWwyvEjdVFYZUOvWg24WcPKuRhKPZ89J54nFKCQ="; }; patches = diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cgal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cgal/default.nix index e66d56879f..0b461c3b80 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cgal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cgal/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "cgal"; - version = "5.6.1.post202403291426"; + version = "6.0.post202410011635"; pyproject = true; src = fetchFromGitHub { owner = "CGAL"; repo = "cgal-swig-bindings"; - rev = "v${version}"; - hash = "sha256-EcvS1TWL3uGCE1G8Lbfiu/AzifMdUSei+z91bzkiKes="; + rev = "refs/tags/v${version}"; + hash = "sha256-KXcXykL/m+A5dCDc+f8j7GgVeQahAOaZ/+LLKHyqbS4="; }; dontUseCmakeConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coffea/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coffea/default.nix index cd97bc6cbd..9f148a4bea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coffea/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coffea/default.nix @@ -42,14 +42,14 @@ buildPythonPackage rec { pname = "coffea"; - version = "2024.9.0"; + version = "2024.10.0"; pyproject = true; src = fetchFromGitHub { owner = "CoffeaTeam"; repo = "coffea"; rev = "refs/tags/v${version}"; - hash = "sha256-IX9c1EhQfFF2Gsn8atxngJ4gpgrwX5SnolUQ3nphhUY="; + hash = "sha256-n17L/IuJGjDdYhVxW7Q0Qgeg+Y+pz9GphUxpLY4vXDM="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cohere/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cohere/default.nix index 79fcf2764b..90b3423ac3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cohere/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cohere/default.nix @@ -15,6 +15,7 @@ pydantic, pydantic-core, requests, + sagemaker, tokenizers, types-requests, typing-extensions, @@ -22,14 +23,14 @@ buildPythonPackage rec { pname = "cohere"; - version = "5.10.0"; + version = "5.11.0"; pyproject = true; src = fetchFromGitHub { owner = "cohere-ai"; repo = "cohere-python"; rev = "refs/tags/${version}"; - hash = "sha256-9d72JWEz2L8yyZQKkdwQMgwQM3nz4yVHnmVCERaa5C8="; + hash = "sha256-KhONCdIGKYbIcFG+zv6uXSiX+crsmgPZUU+5NsSWaA8="; }; build-system = [ poetry-core ]; @@ -43,6 +44,7 @@ buildPythonPackage rec { pydantic pydantic-core requests + sagemaker tokenizers types-requests typing-extensions diff --git a/third_party/nixpkgs/pkgs/development/python-modules/conda-inject/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/conda-inject/default.nix new file mode 100644 index 0000000000..78d57f748b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/conda-inject/default.nix @@ -0,0 +1,47 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies + pyyaml, +}: + +buildPythonPackage rec { + pname = "conda-inject"; + version = "1.3.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "koesterlab"; + repo = "conda-inject"; + rev = "refs/tags/v${version}"; + hash = "sha256-M4+bz7ZuHlcF8tF5kSCUjjkIHG75eCCW1IJxcwxNL6o="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + pyyaml + ]; + + pythonImportsCheck = [ + "conda_inject" + ]; + + # no tests + doCheck = false; + + meta = { + description = "Helper functions for injecting a conda environment into the current python environment"; + homepage = "https://github.com/koesterlab/conda-inject"; + changelog = "https://github.com/koesterlab/conda-inject/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/conda-package-handling/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/conda-package-handling/default.nix index 75ccc6039f..2c5563d2ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/conda-package-handling/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/conda-package-handling/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { pname = "conda-package-handling"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "conda"; repo = "conda-package-handling"; rev = "refs/tags/${version}"; - hash = "sha256-Mo3qCNA/NtVtrsJmJ96ST6GMt2basSh5KlFBkrJ4pGE="; + hash = "sha256-AvuxHl3gUH7zIyMhZGeXqpMy0rJ99wj1/SrdTvlaX9A="; }; pyproject = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/conda-package-streaming/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/conda-package-streaming/default.nix index 462660cce1..ef4b6f3fa9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/conda-package-streaming/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/conda-package-streaming/default.nix @@ -8,14 +8,14 @@ }: buildPythonPackage rec { pname = "conda-package-streaming"; - version = "0.10.0"; + version = "0.11.0"; pyproject = true; src = fetchFromGitHub { owner = "conda"; repo = "conda-package-streaming"; rev = "refs/tags/v${version}"; - hash = "sha256-3TSjVISnUTReyKtt58RXCD30VodhiDDfJssM3PkP5Yk="; + hash = "sha256-Y0moewJROhybbyo263akbO20Q6As245ULKJikkWU4XE="; }; build-system = [ flit-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/connexion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/connexion/default.nix index a43fccb017..bd19ae31ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/connexion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/connexion/default.nix @@ -37,18 +37,18 @@ buildPythonPackage rec { version = "3.1.0"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "spec-first"; - repo = pname; + repo = "connexion"; rev = "refs/tags/${version}"; hash = "sha256-rngQDU9kXw/Z+Al0SCVnWN8xnphueTtZ0+xPBR5MbEM="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ asgiref httpx inflection @@ -80,6 +80,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "connexion" ]; disabledTests = [ + "test_build_example" + "test_mock_resolver_no_example" + # Tests require network access + "test_remote_api" # AssertionError "test_headers" # waiter.acquire() deadlock @@ -91,9 +95,10 @@ buildPythonPackage rec { meta = with lib; { description = "Swagger/OpenAPI First framework on top of Flask"; - mainProgram = "connexion"; homepage = "https://github.com/spec-first/connexion"; changelog = "https://github.com/spec-first/connexion/releases/tag/${version}"; license = licenses.asl20; + maintainers = [ ]; + mainProgram = "connexion"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cpyparsing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cpyparsing/default.nix index aa83e9a434..96fe9a569a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cpyparsing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cpyparsing/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "cpyparsing"; - version = "2.4.7.2.4.0"; + version = "2.4.7.2.4.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7j0vJicSrSUqZAExaH0bJZhRJ6XZui4SAPMBcWXy7n0="; + hash = "sha256-2RfwGnSz/GFPk565n8MooIybHeWAlWYMDylZd0S/HTA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/curl-cffi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/curl-cffi/default.nix index 28f8eb2da7..bb0e353d4d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/curl-cffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/curl-cffi/default.nix @@ -1,4 +1,5 @@ { + stdenv, lib, buildPythonPackage, fetchFromGitHub, @@ -31,6 +32,10 @@ buildPythonPackage rec { certifi ]; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + }; + pythonImportsCheck = [ "curl_cffi" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cvelib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cvelib/default.nix index 121a9d166c..b55279325b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cvelib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cvelib/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "cvelib"; - version = "1.5.0"; + version = "1.6.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "RedHatProductSecurity"; repo = "cvelib"; rev = "refs/tags/${version}"; - hash = "sha256-me61A1SyktPTd9u0t51kF4237/t9wiHqz+IVoyojMXY="; + hash = "sha256-yDsnw7jw1NDs3dy5RUY4a+dWZzORyFG9kpR4WaJNbEE="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cython/default.nix index 63e2821cde..68e3b299c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cython/default.nix @@ -1,46 +1,28 @@ { lib, - stdenv, buildPythonPackage, - fetchPypi, - setuptools, - python, - pkg-config, + fetchFromGitHub, gdb, - numpy, ncurses, - - # Reverse dependency - sage, + numpy, + pkg-config, + pygame-ce, + python, + sage, # Reverse dependency + setuptools, + stdenv, }: -let - excludedTests = - [ "reimport_from_subinterpreter" ] - # cython's testsuite is not working very well with libc++ - # We are however optimistic about things outside of testsuite still working - ++ lib.optionals (stdenv.cc.isClang or false) [ - "cpdef_extern_func" - "libcpp_algo" - ] - # Some tests in the test suite isn't working on aarch64. Disable them for - # now until upstream finds a workaround. - # Upstream issue here: https://github.com/cython/cython/issues/2308 - ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "numpy_memoryview" ] - ++ lib.optionals stdenv.hostPlatform.isi686 [ - "future_division" - "overflow_check_longlong" - ]; -in buildPythonPackage rec { pname = "cython"; version = "3.0.11"; pyproject = true; - src = fetchPypi { - pname = "cython"; - inherit version; - hash = "sha256-cUbdKvhoK0ymEzGFHmrrzp/lFY51MAND+AwHyoCx+v8="; + src = fetchFromGitHub { + owner = "cython"; + repo = "cython"; + rev = version; + hash = "sha256-ZyDNv95eS9YrVHIh5C/Xq8OvfX1cnI3f9GjA+OfaONA="; }; build-system = [ @@ -56,34 +38,87 @@ buildPythonPackage rec { env.LC_ALL = "en_US.UTF-8"; - checkPhase = '' - export HOME="$NIX_BUILD_TOP" - ${python.interpreter} runtests.py -j$NIX_BUILD_CORES \ - --no-code-style \ - ${ - lib.optionalString ( - builtins.length excludedTests != 0 - ) ''--exclude="(${builtins.concatStringsSep "|" excludedTests})"'' - } - ''; - # https://github.com/cython/cython/issues/2785 # Temporary solution doCheck = false; - # doCheck = !stdenv.hostPlatform.isDarwin; + + strictDeps = true; + + checkPhase = + let + excludedTests = + [ "reimport_from_subinterpreter" ] + # cython's testsuite is not working very well with libc++ + # We are however optimistic about things outside of testsuite still working + ++ lib.optionals (stdenv.cc.isClang or false) [ + "cpdef_extern_func" + "libcpp_algo" + ] + # Some tests in the test suite aren't working on aarch64. + # Disable them for now until upstream finds a workaround. + # Upstream issue: https://github.com/cython/cython/issues/2308 + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "numpy_memoryview" ] + ++ lib.optionals stdenv.hostPlatform.isi686 [ + "future_division" + "overflow_check_longlong" + ]; + commandline = builtins.concatStringsSep " " ( + [ + "-j$NIX_BUILD_CORES" + "--no-code-style" + ] + ++ lib.optionals (builtins.length excludedTests != 0) [ + ''--exclude="(${builtins.concatStringsSep "|" excludedTests})"'' + ] + ); + in + '' + runHook preCheck + export HOME="$NIX_BUILD_TOP" + ${python.interpreter} runtests.py ${commandline} + runHook postCheck + ''; passthru.tests = { - inherit sage; + inherit pygame-ce sage; }; - # force regeneration of generated code in source distributions + # Force code regeneration in source distributions # https://github.com/cython/cython/issues/5089 setupHook = ./setup-hook.sh; meta = { - changelog = "https://github.com/cython/cython/blob/${version}/CHANGES.rst"; - description = "Optimising static compiler for both the Python programming language and the extended Cython programming language"; homepage = "https://cython.org"; + description = "Optimising static compiler for both the Python and the extended Cython programming languages"; + longDescription = '' + Cython is an optimising static compiler for both the Python programming + language and the extended Cython programming language (based on Pyrex). It + makes writing C extensions for Python as easy as Python itself. + + Cython gives you the combined power of Python and C to let you: + + - write Python code that calls back and forth from and to C or C++ code + natively at any point. + - easily tune readable Python code into plain C performance by adding + static type declarations, also in Python syntax. + - use combined source code level debugging to find bugs in your Python, + Cython and C code. + - interact efficiently with large data sets, e.g. using multi-dimensional + NumPy arrays. + - quickly build your applications within the large, mature and widely used + CPython ecosystem. + - integrate natively with existing code and data from legacy, low-level or + high-performance libraries and applications. + + The Cython language is a superset of the Python language that additionally + supports calling C functions and declaring C types on variables and class + attributes. This allows the compiler to generate very efficient C code + from Cython code. + ''; + changelog = "https://github.com/cython/cython/blob/${version}/CHANGES.rst"; license = lib.licenses.asl20; + mainProgram = "cython"; + maintainers = with lib.maintainers; [ AndersonTorres ]; }; } +# TODO: investigate recursive loop when doCheck is true diff --git a/third_party/nixpkgs/pkgs/development/python-modules/databricks-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/databricks-sdk/default.nix new file mode 100644 index 0000000000..93292f7eec --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/databricks-sdk/default.nix @@ -0,0 +1,85 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + google-auth, + requests, + + # tests + pyfakefs, + pytestCheckHook, + pytest-mock, + requests-mock, +}: + +buildPythonPackage rec { + pname = "databricks-sdk"; + version = "0.34.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "databricks"; + repo = "databricks-sdk-py"; + rev = "refs/tags/v${version}"; + hash = "sha256-pbOm1aTHtIAwk/TJ5CCT9/CqSTuHTWkRgJuflObkU54="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + google-auth + requests + ]; + + pythonImportsCheck = [ + "databricks.sdk" + ]; + + nativeCheckInputs = [ + pyfakefs + pytestCheckHook + pytest-mock + requests-mock + ]; + + disabledTests = + [ + # Require internet access + # ValueError: default auth: cannot configure default credentials, please chec... + "test_azure_cli_does_not_specify_tenant_id_with_msi" + "test_azure_cli_fallback" + "test_azure_cli_user_no_management_access" + "test_azure_cli_user_with_management_access" + "test_azure_cli_with_warning_on_stderr" + "test_azure_cli_workspace_header_present" + "test_config_azure_cli_host" + "test_config_azure_cli_host_and_resource_id" + "test_config_azure_cli_host_and_resource_i_d_configuration_precedence" + "test_load_azure_tenant_id_404" + "test_load_azure_tenant_id_happy_path" + "test_load_azure_tenant_id_no_location_header" + "test_load_azure_tenant_id_unparsable_location_header" + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + # requests.exceptions.ChunkedEncodingError: ("Connection broken: ConnectionResetError(54, 'Connection reset by peer')", ConnectionResetError(54, 'Connection reset by peer')) + "test_github_oidc_flow_works_with_azure" + ]; + + __darwinAllowLocalNetworking = true; + + meta = { + description = "Databricks SDK for Python"; + homepage = "https://github.com/databricks/databricks-sdk-py"; + changelog = "https://github.com/databricks/databricks-sdk-py/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datasalad/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datasalad/default.nix index a9eba3978a..4216dd180c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datasalad/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datasalad/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "datasalad"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "datalad"; repo = "datasalad"; rev = "refs/tags/v${version}"; - hash = "sha256-WkU3MqAveeANrRGLj1A4UGlT5Sel5wxNcYbIeKlPIqE="; + hash = "sha256-UIrbvFz674+HarFbv1eF++flj1hOR0cZyqKQSl+G7xY="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dateparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dateparser/default.nix index e87f6d2a72..e2f6436f0c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dateparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dateparser/default.nix @@ -73,6 +73,10 @@ buildPythonPackage rec { # access network "test_custom_language_detect_fast_text_0" "test_custom_language_detect_fast_text_1" + + # breaks with latest tzdata: https://github.com/scrapinghub/dateparser/issues/1237 + # FIXME: look into this more + "test_relative_base" ]; pythonImportsCheck = [ "dateparser" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbf/darwin.patch b/third_party/nixpkgs/pkgs/development/python-modules/dbf/darwin.patch new file mode 100644 index 0000000000..92c96c7f1c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbf/darwin.patch @@ -0,0 +1,12 @@ +diff --git a/dbf/test.py b/dbf/test.py +index 117f611..34a9507 100755 +--- a/dbf/test.py ++++ b/dbf/test.py +@@ -4814,6 +4814,7 @@ def test_index_search(self): + self.assertEqual(sorted.index_search('jul', partial=True), 9) + self.assertTrue(sorted.index_search('jul', partial=True)) + ++ @unittest.skipIf(sys.platform == 'darwin', 'fails on case-insensitive filesystems') + def test_mismatched_extensions(self): + old_memo_name = self.dbf_table._meta.memoname + new_memo_name = old_memo_name[:-3] + 'Dbt' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbf/default.nix index 0be997c9fc..cdecd4e85c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbf/default.nix @@ -19,10 +19,15 @@ buildPythonPackage rec { hash = "sha256-MFEi1U0RNvrfDtV4HpvPgKTCibAh76z7Gnmj32IubYw="; }; + # Workaround for https://github.com/ethanfurman/dbf/issues/48 + patches = lib.optional python.stdenv.isDarwin ./darwin.patch; + propagatedBuildInputs = [ aenum ]; checkPhase = '' + runHook preCheck ${python.interpreter} -m dbf.test + runHook postCheck ''; pythonImportsCheck = [ "dbf" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix index 4bf451d834..cce50d3b7e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "debugpy"; - version = "1.8.6"; + version = "1.8.7"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "debugpy"; rev = "refs/tags/v${version}"; - hash = "sha256-kkFNIJ3QwojwgiRAOmBiWIg5desxOKTmo9YH1Qup6fI="; + hash = "sha256-JFVhEAfdSfl2ACfXLMdoO/1otdif9bHialdQXucTM5A="; }; patches = diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dirigera/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dirigera/default.nix index 7bb2a1150a..6350bbdb9f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dirigera/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dirigera/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dirigera"; - version = "1.2.0"; + version = "1.2.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Leggin"; repo = "dirigera"; rev = "refs/tags/v${version}"; - hash = "sha256-JmrKeHypWhqOWO0LpzNe1qyeXuYnMyZoM+2IQbz6WDU="; + hash = "sha256-fjVMdBIU1MCfiv1UGgjVonlvU+xESQPn4HIbEhOGclc="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-cobaltstrike/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-cobaltstrike/default.nix index 0795b7aaee..ef8e70ef13 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-cobaltstrike/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-cobaltstrike/default.nix @@ -5,6 +5,8 @@ dissect-util, fetchFromGitHub, flow-record, + hatch-vcs, + hatchling, httpx, lark, pycryptodome, @@ -13,13 +15,11 @@ pytestCheckHook, pythonOlder, rich, - setuptools, - setuptools-scm, }: buildPythonPackage rec { pname = "dissect-cobaltstrike"; - version = "1.0.0"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,12 +28,12 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.cobaltstrike"; rev = "refs/tags/v${version}"; - hash = "sha256-CS50c3r7sdxp3CRS6XJ4QUmUFtmhFg6rSdKfYzJSOV4="; + hash = "sha256-GMpMTsI4mepaOGhw7/cSymkcxzn4mlNS1ZKYGYut+LM="; }; build-system = [ - setuptools - setuptools-scm + hatch-vcs + hatchling ]; dependencies = [ @@ -78,8 +78,5 @@ buildPythonPackage rec { changelog = "https://github.com/fox-it/dissect.cobaltstrike/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; - # Compatibility with dissect.struct 4.x - # https://github.com/fox-it/dissect.cobaltstrike/issues/53 - broken = versionAtLeast dissect-cstruct.version "4"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-cstruct/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-cstruct/default.nix index 05127c50e8..3f020492ff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-cstruct/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-cstruct/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-cstruct"; - version = "4.1"; + version = "4.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.cstruct"; rev = "refs/tags/${version}"; - hash = "sha256-8CEvn2TJTXm0t4GBG9OQo9TgSy1+sTZIusaiiGNu05M="; + hash = "sha256-HYBt1ok2ytqBodHwpBPQqjm9fNPkE6ID2j9Bn2sm7wA="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-target/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-target/default.nix index 409f8444c3..259d2e7d07 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-target/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-target/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "dissect-target"; - version = "3.18"; + version = "3.19"; pyproject = true; disabled = pythonOlder "3.9"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.target"; rev = "refs/tags/${version}"; - hash = "sha256-jR+f4t0QXmm007lrGdMyF9vFa3NW35gZxs7pe9sdjfg="; + hash = "sha256-D5YgCAKcnPyBrZTpcSuvKfWfIIcCxKGxn+mj8Jqzmws="; }; postPatch = '' @@ -138,6 +138,8 @@ buildPythonPackage rec { "test_systemd_basic_syntax" "test_target_cli_unicode_argparse" "test_target_query" + "test_target_info" + "test_yara" ] ++ # test is broken on Darwin diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-volume/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-volume/default.nix index 3a094cbd78..0fb8e92a7c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-volume/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-volume/default.nix @@ -12,24 +12,24 @@ buildPythonPackage rec { pname = "dissect-volume"; - version = "3.11"; + version = "3.12"; pyproject = true; - disabled = pythonOlder "3.11"; + disabled = pythonOlder "3.12"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.volume"; rev = "refs/tags/${version}"; - hash = "sha256-eHIInoquuyukKuPVvVB6qtovx1NloHHVGKfFBHxVd+o="; + hash = "sha256-IhG2FZdCmYrGxHc2i+ERhphxP/uGgOY67epHEWnQXb0="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dissect-cstruct dissect-util ]; @@ -44,6 +44,7 @@ buildPythonPackage rec { "test_dm_thin" "test_lvm_mirro" "test_lvm_thin" + "test_lvm" "test_md_raid0_zones" "test_md_read" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-mdeditor/Bump-KaTeX-and-replace-bootcdn-with-jsdelivr.patch b/third_party/nixpkgs/pkgs/development/python-modules/django-mdeditor/Bump-KaTeX-and-replace-bootcdn-with-jsdelivr.patch new file mode 100644 index 0000000000..28f7b18280 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-mdeditor/Bump-KaTeX-and-replace-bootcdn-with-jsdelivr.patch @@ -0,0 +1,63 @@ +From c5af641cccf663dffb4a47d32e28404f609badce Mon Sep 17 00:00:00 2001 +From: Tomo +Date: Sat, 12 Oct 2024 03:39:12 +0000 +Subject: [PATCH 1/2] chore(KaTeX): bump to 0.7.1 + +Many bugfixes. This KaTeX is still quite old, +but versions beyond this have backwards-incompatibilities +(starting in 0.8). +--- + mdeditor/static/mdeditor/js/editormd.js | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mdeditor/static/mdeditor/js/editormd.js b/mdeditor/static/mdeditor/js/editormd.js +index be0005d..8aacb56 100644 +--- a/mdeditor/static/mdeditor/js/editormd.js ++++ b/mdeditor/static/mdeditor/js/editormd.js +@@ -4179,8 +4179,8 @@ + // 使用国外的CDN，加载速度有时会很慢，或者自定义URL + // You can custom KaTeX load url. + editormd.katexURL = { +- css : "//cdn.bootcdn.net/ajax/libs/KaTeX/0.3.0/katex.min", +- js : "//cdn.bootcdn.net/ajax/libs/KaTeX/0.3.0/katex.min" ++ css : "//cdn.bootcdn.net/ajax/libs/KaTeX/0.7.1/katex.min", ++ js : "//cdn.bootcdn.net/ajax/libs/KaTeX/0.7.1/katex.min" + }; + + editormd.kaTeXLoaded = false; +-- +2.46.2 + + +From 3d082a738262b057d33b9aa8c777d50113143952 Mon Sep 17 00:00:00 2001 +From: Tomo +Date: Mon, 7 Oct 2024 17:44:39 -0700 +Subject: [PATCH 2/2] fix(KaTeX): Use jsdelivr instead of bootcdn + +Bootcdn was compromised by a malicious actor: +https://sansec.io/research/polyfill-supply-chain-attack + +KaTeX recommends using jsdelivr, so I used that: +https://katex.org/docs/browser +--- + mdeditor/static/mdeditor/js/editormd.js | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mdeditor/static/mdeditor/js/editormd.js b/mdeditor/static/mdeditor/js/editormd.js +index 8aacb56..a31e817 100644 +--- a/mdeditor/static/mdeditor/js/editormd.js ++++ b/mdeditor/static/mdeditor/js/editormd.js +@@ -4179,8 +4179,8 @@ + // 使用国外的CDN，加载速度有时会很慢，或者自定义URL + // You can custom KaTeX load url. + editormd.katexURL = { +- css : "//cdn.bootcdn.net/ajax/libs/KaTeX/0.7.1/katex.min", +- js : "//cdn.bootcdn.net/ajax/libs/KaTeX/0.7.1/katex.min" ++ css : "//cdn.jsdelivr.net/npm/katex@0.7.1/dist/katex.min.css", ++ js : "//cdn.jsdelivr.net/npm/katex@0.7.1/dist/katex.min.js" + }; + + editormd.kaTeXLoaded = false; +-- +2.46.2 + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-mdeditor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-mdeditor/default.nix index 96b5c93bae..a495b41c89 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-mdeditor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-mdeditor/default.nix @@ -18,6 +18,10 @@ buildPythonPackage { hash = "sha256-t57j1HhjNQtBwlbqe4mAHQ9WiNcIhMKYmrZkiqh+k5k="; }; + patches = [ + ./Bump-KaTeX-and-replace-bootcdn-with-jsdelivr.patch + ]; + propagatedBuildInputs = [ django ]; # no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-pwa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-pwa/default.nix index 134a84852f..0e8d3c9c59 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-pwa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-pwa/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django ]; - pyImportCheck = [ "pwa" ]; + pythonImportsCheck = [ "pwa" ]; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django/5.nix b/third_party/nixpkgs/pkgs/development/python-modules/django/5.nix index 6cf85445c4..39be46703e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django/5.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django/5.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { pname = "django"; - version = "5.1.1"; + version = "5.1.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -52,7 +52,7 @@ buildPythonPackage rec { owner = "django"; repo = "django"; rev = "refs/tags/${version}"; - hash = "sha256-4w5MSu3xdF9Pl0iRcD6bOgUF0tLMiZdCWt3JKsx/Rqc="; + hash = "sha256-HQt7et2PBG5rPCFCl64CIr+jTpty0a5IxJ0rKP6QCBM="; }; patches = 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 59ab528578..bcc56c0259 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix @@ -14,7 +14,7 @@ requests, urllib3, - # optional-dependenices + # optional-dependencies paramiko, websocket-client, @@ -48,7 +48,7 @@ buildPythonPackage rec { ]; optional-dependencies = { - ssh = [ paramiko ]; + ssh = [ paramiko paramiko.optional-dependencies.ed25519 ]; tls = []; websockets = [ websocket-client ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/drf-extra-fields/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/drf-extra-fields/default.nix new file mode 100644 index 0000000000..76966803cf --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/drf-extra-fields/default.nix @@ -0,0 +1,55 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + django, + djangorestframework, + filetype, + pillow, + psycopg2, + pytestCheckHook, + pytest-django, +}: + +buildPythonPackage rec { + pname = "drf-extra-fields"; + version = "3.7.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "hipo"; + repo = "drf-extra-fields"; + rev = "v${version}"; + hash = "sha256-Ym4vnZ/t0ZdSxU53BC0ducJl1YiTygRSWql/35PNbOU"; + }; + + build-system = [ setuptools ]; + + dependencies = [ + django + djangorestframework + filetype + ]; + + optional-dependencies = { + Base64ImageField = [ pillow ]; + }; + + nativeCheckInputs = [ + (django.override { withGdal = true; }) + psycopg2 + pytestCheckHook + pytest-django + ] ++ optional-dependencies.Base64ImageField; + + pythonImportsCheck = [ "drf_extra_fields" ]; + + meta = { + description = "Extra Fields for Django Rest Framework"; + homepage = "https://github.com/Hipo/drf-extra-fields"; + changelog = "https://github.com/Hipo/drf-extra-fields/releases/tag/${src.rev}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ felbinger ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dukpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dukpy/default.nix index 453d68e853..7b684658d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dukpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dukpy/default.nix @@ -21,6 +21,12 @@ buildPythonPackage rec { hash = "sha256-8RDMz9SfBoUe7LQ9/atsZlJ/2uwLUb0hZxeYdsUOGpU="; }; + postPatch = '' + substituteInPlace tests/test_webassets_filter.py \ + --replace-fail "class PyTestTemp" "class _Temp" \ + --replace-fail "PyTestTemp" "Temp" + ''; + build-system = [ setuptools ]; dependencies = [ mutf8 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix index e4b3663dda..91a1869099 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix @@ -76,9 +76,6 @@ buildPythonPackage rec { # ImportError: attempted relative import beyond top-level package rm tests/test_greenthreads.py - - # git crashes; https://github.com/jelmer/dulwich/issues/1359 - rm tests/compat/test_pack.py ''; doCheck = !stdenv.hostPlatform.isDarwin; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dvc-task/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dvc-task/default.nix index 76ad629608..6c4ea111ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dvc-task/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dvc-task/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-task"; - version = "0.40.1"; + version = "0.40.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc-task"; rev = "refs/tags/${version}"; - hash = "sha256-r5rBY4g4S4VaifGCK3bGx6arjPoGZI9th2T9LDC5wfI="; + hash = "sha256-bRQJLncxCigYPEtlvKjUtKqhcBkB7erEtoJQ30yGamE="; }; build-system = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix index 911f33b809..d97651c8e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "elkm1-lib"; - version = "2.2.8"; + version = "2.2.10"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "gwww"; repo = "elkm1"; rev = "refs/tags/${version}"; - hash = "sha256-tUHpDVHx3eIWGftAViVbW9zt7wyWqD+5vJeOPf9jeIg="; + hash = "sha256-8B3icNW1QTTjFeWllPKzVgRFz+gUzUV6o3wOBXx2Zws="; }; build-system = [ hatchling ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/executing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/executing/default.nix index e9bdb9bf73..1c20e1b16d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/executing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/executing/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, pythonAtLeast, pythonOlder, @@ -18,7 +19,7 @@ buildPythonPackage rec { pname = "executing"; - version = "2.0.1"; + version = "2.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,12 +28,15 @@ buildPythonPackage rec { owner = "alexmojaki"; repo = pname; rev = "v${version}"; - hash = "sha256-PBvfkv9GQ5Vj5I5SygtmHXtqqHMJ4XgNV1/I+lSU0/U="; + hash = "sha256-epgKMPOvPdkpRp0n5A22gZ5DeXLyI60bqzLTx5JFlLk="; }; patches = [ - # TODO: replace after the PR is merged or tagged - ./get_iter.patch + (fetchpatch { + name = "python-3.12.6.patch"; + url = "https://github.com/alexmojaki/executing/commit/3f11fdcd7a017fbdca8a3a9de23dab18d3ba2100.patch"; + hash = "sha256-ZnTO9lT+bj4nekPx4D0DxjhJOCkZn6lDm5xdLrziB+4="; + }) ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/executing/get_iter.patch b/third_party/nixpkgs/pkgs/development/python-modules/executing/get_iter.patch deleted file mode 100644 index c8d5bc7a1d..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/executing/get_iter.patch +++ /dev/null @@ -1,192 +0,0 @@ -https://github.com/alexmojaki/executing/pull/83#pullrequestreview-2244302661 - - -From 0b913873b9db8c157a8dd581e8771242bcb8864b Mon Sep 17 00:00:00 2001 -From: Frank Hoffmann <15r10nk-git@polarbit.de> -Date: Fri, 16 Aug 2024 22:51:32 +0200 -Subject: [PATCH 1/4] fix: backward compatibility fix for changed source - positions in 3.12.5 (#82) - ---- - executing/_position_node_finder.py | 27 +++++++++++++++++++++++++++ - 1 file changed, 27 insertions(+) - -diff --git a/executing/_position_node_finder.py b/executing/_position_node_finder.py -index 8ca21a6..9a3f8b3 100644 ---- a/executing/_position_node_finder.py -+++ b/executing/_position_node_finder.py -@@ -156,6 +156,8 @@ def __init__(self, frame: FrameType, stmts: Set[EnhancedAST], tree: ast.Module, - typ=typ, - ) - -+ self.result = self.fix_result(self.result, self.instruction(lasti)) -+ - self.known_issues(self.result, self.instruction(lasti)) - - self.test_for_decorator(self.result, lasti) -@@ -213,6 +215,31 @@ def test_for_decorator(self, node: EnhancedAST, index: int) -> None: - if sys.version_info < (3, 12): - index += 4 - -+ def fix_result( -+ self, node: EnhancedAST, instruction: dis.Instruction -+ ) -> EnhancedAST: -+ if ( -+ sys.version_info >= (3, 12, 5) -+ and instruction.opname in ("GET_ITER", "FOR_ITER") -+ and isinstance(node, ast.For) -+ ): -+ # node positions have changed in 3.13 -+ # https://github.com/python/cpython/issues/93691#event-13151024246 -+ # `for` calls __iter__ and __next__ during execution, the calling -+ # expression of these calls was the ast.For node since cpython 3.11 (see test_iter). -+ # cpython 3.13 changed this to the `iter` node of the loop, to make tracebacks easier to read. -+ # This keeps backward compatibility with older executing versions. -+ -+ # there are also cases like: -+ # -+ # for a in iter(l): pass -+ # -+ # where `iter(l)` would be otherwise the resulting node for the `iter()` call and the __iter__ call of the for implementation. -+ # keeping the old behaviour makes it possible to distinguish both cases. -+ -+ return self.result.parent -+ return node -+ - def known_issues(self, node: EnhancedAST, instruction: dis.Instruction) -> None: - if instruction.opname in ("COMPARE_OP", "IS_OP", "CONTAINS_OP") and isinstance( - node, types_cmp_issue - -From d421795d8213abb4fea30067af0149d3a767fed4 Mon Sep 17 00:00:00 2001 -From: Frank Hoffmann <15r10nk-git@polarbit.de> -Date: Tue, 4 Jun 2024 19:46:57 +0200 -Subject: [PATCH 2/4] feat!: dropped support for 3.5, 3.6 and 3.7 - ---- - .github/workflows/test.yml | 2 +- - setup.cfg | 5 +---- - tox.ini | 4 ++-- - 3 files changed, 4 insertions(+), 7 deletions(-) - -diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml -index 8fca81a..140de04 100644 ---- a/.github/workflows/test.yml -+++ b/.github/workflows/test.yml -@@ -12,7 +12,7 @@ jobs: - runs-on: ubuntu-20.04 - strategy: - matrix: -- python-version: [3.5, 3.6, 3.7, 3.8, 3.9, '3.10', 3.11, 3.12-dev, pypy-3.6] -+ python-version: [3.8, 3.9, '3.10', 3.11, 3.12-dev] - - steps: - - uses: actions/checkout@v2 -diff --git a/setup.cfg b/setup.cfg -index fdf901f..ed446d0 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -11,9 +11,6 @@ classifiers = - License :: OSI Approved :: MIT License - Programming Language :: Python - Programming Language :: Python :: 3 -- Programming Language :: Python :: 3.5 -- Programming Language :: Python :: 3.6 -- Programming Language :: Python :: 3.7 - Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 -@@ -25,7 +22,7 @@ packages = executing - zip_safe = False - include_package_data = True - setup_requires = setuptools; setuptools_scm[toml] --python_requires = >=3.5 -+python_requires = >=3.8 - - [options.extras_require] - tests= -diff --git a/tox.ini b/tox.ini -index 3566691..6c68c4e 100644 ---- a/tox.ini -+++ b/tox.ini -@@ -1,5 +1,5 @@ - [tox] --envlist = py35,py36,py37,py38,py39,py310,py311,py312,pypy35,pypy36 -+envlist = py38,py39,py310,py311,py312,pypy35,pypy36 - - [testenv] - commands = -@@ -10,7 +10,7 @@ passenv = - ADD_EXECUTING_TESTS - EXECUTING_SLOW_TESTS - --[testenv:generate_small_sample-py{35,36,37,38,39,310,311}] -+[testenv:generate_small_sample-py{38,39,310,311,312}] - extras = tests - deps = pysource-minimize - commands = - -From 3c5ae436a4cff833606ce22c637d088481442154 Mon Sep 17 00:00:00 2001 -From: Frank Hoffmann <15r10nk-git@polarbit.de> -Date: Sat, 17 Aug 2024 11:32:44 +0200 -Subject: [PATCH 3/4] test: skip module tests for python.py - ---- - tests/test_main.py | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/tests/test_main.py b/tests/test_main.py -index bc015cd..84b1305 100644 ---- a/tests/test_main.py -+++ b/tests/test_main.py -@@ -810,6 +810,9 @@ def test_module_files(self): - or 'pyparsing.py' in filename - or 'enum' in filename - ) -+ or sys.version_info < (3,11) and ( -+ 'python.py' in filename -+ ) - ): - continue - - -From f15a55201be20f30664df4381f4a81407e0d25fb Mon Sep 17 00:00:00 2001 -From: Frank Hoffmann <15r10nk-git@polarbit.de> -Date: Sun, 18 Aug 2024 14:02:30 +0200 -Subject: [PATCH 4/4] refactor: review changes - ---- - executing/_position_node_finder.py | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/executing/_position_node_finder.py b/executing/_position_node_finder.py -index 9a3f8b3..7a0cca6 100644 ---- a/executing/_position_node_finder.py -+++ b/executing/_position_node_finder.py -@@ -221,13 +221,14 @@ def fix_result( - if ( - sys.version_info >= (3, 12, 5) - and instruction.opname in ("GET_ITER", "FOR_ITER") -- and isinstance(node, ast.For) -+ and isinstance(node.parent, ast.For) -+ and node is node.parent.iter - ): -- # node positions have changed in 3.13 -- # https://github.com/python/cpython/issues/93691#event-13151024246 -+ # node positions have changed in 3.12.5 -+ # https://github.com/python/cpython/issues/93691 - # `for` calls __iter__ and __next__ during execution, the calling - # expression of these calls was the ast.For node since cpython 3.11 (see test_iter). -- # cpython 3.13 changed this to the `iter` node of the loop, to make tracebacks easier to read. -+ # cpython 3.12.5 changed this to the `iter` node of the loop, to make tracebacks easier to read. - # This keeps backward compatibility with older executing versions. - - # there are also cases like: -@@ -237,7 +238,7 @@ def fix_result( - # where `iter(l)` would be otherwise the resulting node for the `iter()` call and the __iter__ call of the for implementation. - # keeping the old behaviour makes it possible to distinguish both cases. - -- return self.result.parent -+ return node.parent - return node - - def known_issues(self, node: EnhancedAST, instruction: dis.Instruction) -> None: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/explorerscript/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/explorerscript/default.nix index 0d4a31376f..6f1b346274 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/explorerscript/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/explorerscript/default.nix @@ -2,49 +2,56 @@ lib, buildPythonPackage, fetchFromGitHub, - antlr4, - antlr4-python3-runtime, igraph, pygments, + scikit-build-core, + pybind11, + ninja, + ruff, + cmake, pytestCheckHook, setuptools, }: buildPythonPackage rec { pname = "explorerscript"; - version = "0.1.5"; + version = "0.2.1.post2"; pyproject = true; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - hash = "sha256-dGbzZYEFEWE5bUz+647pPzP4Z/XmrJU82jNT4ZBRNHk="; + hash = "sha256-cKEceWr7XmZbuomPOmjQ32ptAjz3LZDQBWAgZEFadDY="; + # Include a pinned antlr4 fork used as a C++ library + fetchSubmodules = true; }; nativeBuildInputs = [ - antlr4 setuptools + scikit-build-core + ninja + cmake + ruff ]; - pythonRelaxDeps = [ - # antlr output is rebuilt in postPatch step. - "antlr4-python3-runtime" - # igraph > 0.10.4 was marked as incompatible by upstream - # due to a breaking change introduced in 0.10.5. Later versions reverted - # this change, and introduced a deprecation warning instead. - # - # https://github.com/igraph/python-igraph/issues/693 - "igraph" - ]; + # The source include some auto-generated ANTLR code that could be recompiled, but trying that resulted in a crash while decompiling unionall.ssb. + # We thus do not rebuild them. postPatch = '' - antlr -Dlanguage=Python3 -visitor explorerscript/antlr/{ExplorerScript,SsbScript}.g4 + substituteInPlace Makefile \ + --replace-fail ./generate_parser_bindings.py "python3 ./generate_parser_bindings.py" + + # Doesn’t detect that package for some reason + substituteInPlace pyproject.toml \ + --replace-fail "\"scikit-build-core<=0.9.8\"," "" ''; + dontUseCmakeConfigure = true; + propagatedBuildInputs = [ - antlr4-python3-runtime igraph + pybind11 ]; optional-dependencies.pygments = [ pygments ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/extension-helpers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/extension-helpers/default.nix index d8429d0869..01ba9fd55a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/extension-helpers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/extension-helpers/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "extension-helpers"; - version = "1.1.1"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "astropy"; repo = "extension-helpers"; rev = "refs/tags/v${version}"; - hash = "sha256-pYCSLb6uuQ9ZtMZOQH0DxLlfgFv3tgH+AL35IN71cNI="; + hash = "sha256-qneulhSYB2gYiCdgoU7Dqg1luLWhVouFVihcKeOA37E="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/faiss/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/faiss/default.nix index f6eee8cc5e..39e34a1879 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/faiss/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/faiss/default.nix @@ -7,7 +7,6 @@ packaging, setuptools, pip, - wheel, }: buildPythonPackage { @@ -24,7 +23,6 @@ buildPythonPackage { build-system = [ setuptools pip - wheel ]; dependencies = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix index 288389dea8..4f3baf7fe8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ffmpeg-progress-yield"; - version = "0.7.8"; + version = "0.9.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-muauX4Mq58ew9lGPE0H+bu4bqPydNADLocujjy6qRh4="; + hash = "sha256-n6zHi6M9SyrNm8MhQ9xvBo2OIzoQYJ4yhgujW5C6QWY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ffmpeg-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ffmpeg-python/default.nix index c337d64dc7..b7ae441c9f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ffmpeg-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ffmpeg-python/default.nix @@ -2,12 +2,12 @@ lib, buildPythonPackage, fetchFromGitHub, - substituteAll, + replaceVars, fetchpatch2, setuptools, pytestCheckHook, pytest-mock, - ffmpeg_7, + ffmpeg, }: buildPythonPackage { @@ -23,10 +23,7 @@ buildPythonPackage { }; patches = [ - (substituteAll { - src = ./ffmpeg-location.patch; - ffmpeg = ffmpeg_7; - }) + (replaceVars ./ffmpeg-location.patch { inherit ffmpeg; }) # Remove dependency on `future` # https://github.com/kkroening/ffmpeg-python/pull/795 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/findimports/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/findimports/default.nix index 7eb31b29b6..7a03e9aeea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/findimports/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/findimports/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "findimports"; - version = "2.5.0"; + version = "2.5.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,10 +18,10 @@ buildPythonPackage rec { owner = "mgedmin"; repo = "findimports"; rev = "refs/tags/${version}"; - hash = "sha256-kHm0TiLe7zvUnU6+MR1M0xOt0gpMDJ5FJ5+HgY0LPeo="; + hash = "sha256-0HD5n9kxlXB86w8zkti6MkVZxEgGRrXzM6f+g0H/jrs="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; pythonImportsCheck = [ "findimports" ]; @@ -36,7 +36,6 @@ buildPythonPackage rec { meta = with lib; { description = "Module for the analysis of Python import statements"; - mainProgram = "findimports"; homepage = "https://github.com/mgedmin/findimports"; changelog = "https://github.com/mgedmin/findimports/blob/${version}/CHANGES.rst"; license = with licenses; [ @@ -44,5 +43,6 @@ buildPythonPackage rec { gpl3Only ]; maintainers = with maintainers; [ fab ]; + mainProgram = "findimports"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/findpython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/findpython/default.nix index 140c912543..16cb43c7d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/findpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/findpython/default.nix @@ -16,7 +16,7 @@ let pname = "findpython"; - version = "0.6.1"; + version = "0.6.2"; in buildPythonPackage { inherit pname version; @@ -26,7 +26,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-VuUrQJqSvL1JXPmByFrPE387PlHMdptG66IZuxq3Uzw="; + hash = "sha256-4MdbqfNaf5u0Qj6zG9FzWMzPFXYbaDcxdxkXeu/0ZyM="; }; nativeBuildInputs = [ pdm-backend ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-assets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-assets/default.nix index 46e2257834..6618e13006 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-assets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-assets/default.nix @@ -1,7 +1,8 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + fetchpatch2, setuptools, flask, webassets, @@ -13,35 +14,37 @@ buildPythonPackage rec { version = "2.1.0"; pyproject = true; - src = fetchPypi { - pname = "Flask-Assets"; - inherit version; - hash = "sha256-+E1lMv/lnJ/zUoheh0D/TaJcC8+s2AXwqAaBXkQ1SBM="; + src = fetchFromGitHub { + owner = "miracle2k"; + repo = "flask-assets"; + rev = "refs/tags/${version}"; + hash = "sha256-R6cFTT+r/i5j5/QQ+cCFmeuO7SNTiV1F+e0JTxwIUGY="; }; - patchPhase = '' - substituteInPlace tests/test_integration.py --replace 'static_path=' 'static_url_path=' - substituteInPlace tests/test_integration.py --replace "static_folder = '/'" "static_folder = '/x'" - substituteInPlace tests/test_integration.py --replace "'/foo'" "'/x/foo'" - ''; + patches = [ + # On master branch but not in a release. + (fetchpatch2 { + name = "refactor-with-pytest.patch"; + url = "https://github.com/miracle2k/flask-assets/commit/56e06dbb160c165e0289ac97496354786fe3f3fd.patch?full_index=1"; + hash = "sha256-Feo7gHHmHtWRB+3XvlECdU4i5rpyjyKEYEUCuy24rf4="; + }) + ]; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ flask webassets ]; - doCheck = false; # tests are broken with webassets 2.0 - nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "flask_assets" ]; - meta = with lib; { + meta = { homepage = "https://github.com/miracle2k/flask-assets"; description = "Asset management for Flask, to compress and merge CSS and Javascript files"; - license = licenses.bsd2; - maintainers = with maintainers; [ abbradar ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ abbradar ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix index 85f0218fd9..a817e75cb9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix @@ -73,6 +73,12 @@ buildPythonPackage rec { # broken in werkzeug 2.3 upgrade "test_media_types_method" "test_media_types_q" + # erroneous use of pytz + # https://github.com/python-restx/flask-restx/issues/620 + # two fixes are proposed: one fixing just tests, and one removing pytz altogether. + # we disable the tests in the meanwhile and let upstream decide + "test_rfc822_value" + "test_iso8601_value" ]; pythonImportsCheck = [ "flask_restx" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-simpleldap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-simpleldap/default.nix new file mode 100644 index 0000000000..9ba36f1b4d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-simpleldap/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + flask, + python-ldap, + setuptools, +}: + +buildPythonPackage rec { + pname = "flask-simpleldap"; + version = "2.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "alexferl"; + repo = "flask-simpleldap"; + rev = "refs/tags/v${version}"; + hash = "sha256-WcedTtEwaSc3BYFE3L0FZrtKKdbwk7r3qSPP8evtYlc="; + }; + + build-system = [ + setuptools + ]; + dependencies = [ + flask + python-ldap + ]; + + pythonImportsCheck = [ "flask_simpleldap" ]; + + meta = with lib; { + description = "LDAP authentication extension for Flask"; + homepage = "https://github.com/alexferl/flask-simpleldap"; + license = licenses.mit; + maintainers = with maintainers; [ kip93 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flow-record/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flow-record/default.nix index b926605875..268c738750 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flow-record/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flow-record/default.nix @@ -1,30 +1,35 @@ { lib, buildPythonPackage, + duckdb, + elastic-transport, elasticsearch, fastavro, fetchFromGitHub, + httpx, lz4, + maxminddb, msgpack, pytest7CheckHook, pythonOlder, - setuptools, + pytz, setuptools-scm, + setuptools, zstandard, }: buildPythonPackage rec { pname = "flow-record"; - version = "3.15"; + version = "3.17"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "flow.record"; rev = "refs/tags/${version}"; - hash = "sha256-j5N66p7feB9Ae+Fu5RhVzh8XCHiq55jJMg0Fe+C6Jvg="; + hash = "sha256-fFP2bdO4wTR9Y+9no3FabtVmLicTD76Jw5aWDMPOB0w="; }; build-system = [ @@ -39,11 +44,18 @@ buildPythonPackage rec { lz4 zstandard ]; + duckdb = [ + duckdb + pytz + ]; elastic = [ elasticsearch ]; + geoip = [ maxminddb ]; avro = [ fastavro ] ++ fastavro.optional-dependencies.snappy; + splunk = [ httpx ]; }; nativeCheckInputs = [ + elastic-transport pytest7CheckHook ] ++ lib.flatten (builtins.attrValues optional-dependencies); diff --git a/third_party/nixpkgs/pkgs/development/python-modules/furl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/furl/default.nix index 4b4f81d1a2..8fcaeb27d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/furl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/furl/default.nix @@ -36,8 +36,9 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optionals (pythonAtLeast "3.12") [ + disabledTests = [ # AssertionError: assert '//////path' == '////path' + # https://github.com/gruns/furl/issues/176 "test_odd_urls" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gcal-sync/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gcal-sync/default.nix index 4fcf343a71..841be6b868 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gcal-sync/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gcal-sync/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "gcal-sync"; - version = "6.1.5"; + version = "6.1.6"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "gcal_sync"; rev = "refs/tags/${version}"; - hash = "sha256-qEvXSyiqTj5rLI+voieNzCUKsOxcJVhI0z3pbbL7VcQ="; + hash = "sha256-dVpPq2TJsR+0VWfup2SNLsnBP2j/HUQsoxJebNkD8Sw="; }; nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gcovr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gcovr/default.nix index c6ec91b594..0344d56a5d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gcovr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gcovr/default.nix @@ -7,22 +7,25 @@ lxml, pygments, pythonOlder, + setuptools, tomli, }: buildPythonPackage rec { pname = "gcovr"; - version = "7.2"; - format = "setuptools"; + version = "8.2"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-4+lctWyojbvnQctdaaor5JTrL8KgnuT2UWRKZw7lrrM="; + hash = "sha256-mh3d1FhdE+x3VV211rajHugVh+pvxgT/n80jLLB4LfU="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ colorlog jinja2 lxml @@ -41,10 +44,10 @@ buildPythonPackage rec { meta = { description = "Python script for summarizing gcov data"; - mainProgram = "gcovr"; homepage = "https://www.gcovr.com/"; changelog = "https://github.com/gcovr/gcovr/blob/${version}/CHANGELOG.rst"; license = lib.licenses.bsd0; maintainers = with lib.maintainers; [ sigmanificient ]; + mainProgram = "gcovr"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gevent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gevent/default.nix index 1e38def456..02df1ed586 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gevent/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gevent/default.nix @@ -1,4 +1,5 @@ { + stdenv, lib, fetchPypi, buildPythonPackage, @@ -54,6 +55,10 @@ buildPythonPackage rec { zope-interface ] ++ lib.optionals (!isPyPy) [ greenlet ]; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + }; + # Bunch of failures. doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gios/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gios/default.nix index 0a5632ad31..952056492c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gios/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gios/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "gios"; - version = "4.0.0"; + version = "5.0.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = "gios"; rev = "refs/tags/${version}"; - hash = "sha256-rjC4zWWtaPxuBcjiO9dVsXD4dTa47iwkKuSFx+QXeXw="; + hash = "sha256-J+LCu7wMuc3dYghvkKq58GcBAa76X5IPUWe7qCQwjjI="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix index 8d9083115f..c9cfaeae73 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, google-auth, googleapis-common-protos, grpcio, @@ -19,14 +19,16 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "2.19.0"; + version = "2.20.0"; pyproject = true; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - hash = "sha256-zxt8JpQEeIbSrxEooDrpnjkRCKCIBPh8/TWXDknJzRA="; + src = fetchFromGitHub { + owner = "googleapis"; + repo = "python-api-core"; + rev = "v${version}"; + hash = "sha256-ccjkGQNaPRefI6+j/O+NwdBGEVNuZ5q5m1d8EAJGcbs="; }; nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix index ff28fe3dfc..7c879b7235 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -15,14 +15,15 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.23.0"; + version = "3.0.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-UrX8b3CxY1FvrWEKr8CI++eI9QHVu+HV9FjNw/y6/Sw="; + pname = "google_cloud_kms"; + inherit version; + hash = "sha256-suyMBB/cl8hkW/w7S2TNFJ32JFl8dbSuS8qmIU7oSus="; }; nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gotenberg-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gotenberg-client/default.nix index e86eb4e6e0..bb18da52f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gotenberg-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gotenberg-client/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { pname = "gotenberg-client"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "stumpylog"; repo = "gotenberg-client"; rev = "refs/tags/${version}"; - hash = "sha256-rF4msWYWgNUtOnMAB11vdAPNWZeAoeglnzMPWEM503I="; + hash = "sha256-pkxu9WIsyHW2iTepv5B2naKkK+yw8lT+i3EwobE+u1M="; }; nativeBuildInputs = [ hatchling ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/greatfet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/greatfet/default.nix index 2ed9792df3..1e73858510 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/greatfet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/greatfet/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "greatfet"; - version = "2024.0.2"; + version = "2024.0.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "greatscottgadgets"; repo = "greatfet"; rev = "refs/tags/v${version}"; - hash = "sha256-1GfyhxwA6Nhf/umvllR/hkh5hyn42141QOT7+6IGAis="; + hash = "sha256-jdOTEOotLiIxA9TxmFGOjP8IZ/8xo7mzXSJRg3A5Ri4="; }; sourceRoot = "${src.name}/host"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/griffe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/griffe/default.nix index 6bc84c1e56..208f6a7c82 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/griffe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/griffe/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "1.3.2"; + version = "1.4.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "griffe"; rev = "refs/tags/${version}"; - hash = "sha256-IDIacG1FM/JidHV76PGTaPnkIfulAli8+YLuiuPHdZ8="; + hash = "sha256-DgfoaRvgU4WWbCirbLld8f/C2bPrW576aX0HglaRjEU="; }; build-system = [ pdm-backend ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpc-google-iam-v1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpc-google-iam-v1/default.nix index 17ede6dee3..0f0062f4a3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grpc-google-iam-v1/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpc-google-iam-v1/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "grpc-google-iam-v1"; - version = "0.13.0"; + version = "0.13.1"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "python-grpc-google-iam-v1"; rev = "refs/tags/v${version}"; - hash = "sha256-pmwHDzOaXrgqXZiaxIn01CtiAG+XRBGr8BgzbG/F1uw="; + hash = "sha256-FLDx2zbM0qqLa+k/7xexyv5/YHlSOdikrbU2eYbxDM0="; }; nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-status/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-status/default.nix index 2486ba8aa7..e72822cbd6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-status/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-status/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "grpcio-status"; - version = "1.64.1"; + version = "1.66.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "grpcio_status"; inherit version; - hash = "sha256-xQvRTrZQbYWApsVTvqRj18CEmbLA6T9tGGTF6Oq7EGY="; + hash = "sha256-s/fTTMxG2D/qUmHuo3hhdEWfdjwx9uNPHSTrptUV0CQ="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix index acd09b1eb4..a61999ef5b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.65.1"; - pyproject = true; + version = "1.66.1"; + format = "setuptools"; src = fetchPypi { pname = "grpcio_tools"; inherit version; - hash = "sha256-JM/+i8kPuCN/C88kC9bHAwQlX+J7adsyYBSZoEP4cb4="; + hash = "sha256-UFX/6EDqj1BcMDeL4Cr7Tb7LM0gOVU3r4Qtj1rL2QcM="; }; outputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gst-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gst-python/default.nix index 27d4d0f869..ab476729c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gst-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gst-python/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "gst-python"; - version = "1.24.3"; + version = "1.24.7"; format = "other"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/gst-python/${pname}-${version}.tar.xz"; - hash = "sha256-7Ns+K6lOosgrk6jHFdWn4E+XJqiDjAprF2lJKP0ehZU="; + hash = "sha256-bD7gKyDICobiQkWwYQLa4A4BdobydAdib0TcA6w8pTo="; }; # Python 2.x is not supported. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix index 37c13fdfe1..68de99e265 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2024.8.13"; + version = "2024.10.8"; pyproject = true; disabled = pythonOlder "3.12"; @@ -25,15 +25,14 @@ buildPythonPackage rec { owner = "danielperna84"; repo = "hahomematic"; rev = "refs/tags/${version}"; - hash = "sha256-dojgIKF3AGkJm2USspV0rm8UZnTLxYf4dgt86WwonQk="; + hash = "sha256-NFDh6XA6c1IWTHYjXB19V2kEW3ZkjFU/mz5XduzXj+g="; }; __darwinAllowLocalNetworking = true; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools~=69.2.0" "setuptools" \ - --replace-fail "wheel~=0.43.0" "wheel" + --replace-fail "setuptools==75.1.0" "setuptools" \ ''; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hcloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hcloud/default.nix index f3e0ae54c4..eb9be89cd8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hcloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hcloud/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "hcloud"; - version = "2.2.1"; + version = "2.3.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-3Bcvj+VkIdoU2AiGtbkgwrqwgb8RjHMqQxjBf03iWG4="; + hash = "sha256-6QHSmLES8dLUVo2DAPPOGd/ngr3vP/nEFwJqgeFu6VY="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hkdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hkdf/default.nix deleted file mode 100644 index f04e486fd7..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/hkdf/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - nose, - setuptools, -}: - -buildPythonPackage { - pname = "hkdf"; - version = "0.0.3"; - pyproject = true; - - src = fetchFromGitHub { - owner = "casebeer"; - repo = "python-hkdf"; - rev = "cc3c9dbf0a271b27a7ac5cd04cc1485bbc3b4307"; - hash = "sha256-i3vJzUI7dpZbgZkz7Agd5RAeWisNWftdk/mkJBZkkLg="; - }; - - build-system = [ setuptools ]; - - pythonImportsCheck = [ "hkdf" ]; - - nativeCheckInputs = [ nose ]; - - checkPhase = '' - runHook preCheck - - nosetests - - runHook postCheck - ''; - - meta = with lib; { - description = "HMAC-based Extract-and-Expand Key Derivation Function (HKDF)"; - homepage = "https://github.com/casebeer/python-hkdf"; - license = licenses.bsd2; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpserver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpserver/default.nix index 9b65a6341c..222933a85d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httpserver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpserver/default.nix @@ -1,30 +1,49 @@ { lib, - fetchPypi, buildPythonPackage, docopt, + fetchPypi, + freezegun, + pytestCheckHook, + pythonOlder, + selenium, + setuptools, }: buildPythonPackage rec { pname = "httpserver"; version = "1.1.0"; - format = "setuptools"; + pyproject = true; - buildInputs = [ docopt ]; - - # Tests pull in lots of other dependencies to emulate different web - # drivers. - doCheck = false; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1q62g324dvb0hqdwwrnj41sqr4d3ly78v9nc26rz1whj4pwdmhsv"; + hash = "sha256-W8Pa+CUS8vCzEcymjY6no5GMdSDSZs4bhmDtRsR4wuA="; }; + build-system = [ setuptools ]; + + dependencies = [ docopt ]; + + nativeCheckInputs = [ + freezegun + selenium + pytestCheckHook + ]; + + pythonImportsCheck = [ "httpserver" ]; + + disabledTestPaths = [ + # Tests want driver for Firefox + "tests/test_selenium.py" + ]; + meta = { description = "Asyncio implementation of an HTTP server"; - mainProgram = "httpserver"; homepage = "https://github.com/thomwiggers/httpserver"; license = with lib.licenses; [ bsd3 ]; + maintainers = [ ]; + mainProgram = "httpserver"; }; } 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 eca2ca1014..13457576cd 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 @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "hypothesis-auto"; version = "1.1.5"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -23,14 +23,22 @@ buildPythonPackage rec { hash = "sha256-U0vcOB9jXmUV5v2IwybVu2arY1FpPnKkP7m2kbD1kRw="; }; - nativeBuildInputs = [ poetry-core ]; - - propagatedBuildInputs = [ - pydantic - hypothesis - pytest + pythonRelaxDeps = [ + "hypothesis" + "pydantic" ]; + build-system = [ poetry-core ]; + + dependencies = [ + hypothesis + pydantic + ]; + + optional-dependencies = { + pytest = [ pytest ]; + }; + pythonImportsCheck = [ "hypothesis_auto" ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -38,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Enables fully automatic tests for type annotated functions"; homepage = "https://github.com/timothycrosley/hypothesis-auto/"; + changelog = "https://github.com/timothycrosley/hypothesis-auto/blob/master/CHANGELOG.md"; license = licenses.mit; maintainers = [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ibis-framework/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ibis-framework/default.nix index 16f3e395e7..de07c1d262 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ibis-framework/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ibis-framework/default.nix @@ -7,7 +7,6 @@ atpublic, black, clickhouse-connect, - dask, datafusion, db-dtypes, duckdb, diff --git a/third_party/nixpkgs/pkgs/development/python-modules/icalendar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/icalendar/default.nix index 1170485bf3..fb88bcfebc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/icalendar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/icalendar/default.nix @@ -2,17 +2,19 @@ lib, buildPythonPackage, fetchFromGitHub, + replaceVars, pythonOlder, - setuptools, + hatch-vcs, + hatchling, backports-zoneinfo, python-dateutil, - pytz, + tzdata, hypothesis, pytestCheckHook, }: buildPythonPackage rec { - version = "5.0.13"; + version = "6.0.1"; pname = "icalendar"; pyproject = true; @@ -20,14 +22,23 @@ buildPythonPackage rec { owner = "collective"; repo = "icalendar"; rev = "refs/tags/v${version}"; - hash = "sha256-2gpWfLXR4HThw23AWxY2rY9oiK6CF3Qiad8DWHCs4Qk="; + hash = "sha256-pcTiXRiHtx7jVzxDkY6WDhzo8sg8fPecqTpRSRIdvfs="; }; - build-system = [ setuptools ]; + patches = [ + (replaceVars ./no-dynamic-version.patch { + inherit version; + }) + ]; + + build-system = [ + hatch-vcs + hatchling + ]; dependencies = [ python-dateutil - pytz + tzdata ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/icalendar/no-dynamic-version.patch b/third_party/nixpkgs/pkgs/development/python-modules/icalendar/no-dynamic-version.patch new file mode 100644 index 0000000000..4754b6441a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/icalendar/no-dynamic-version.patch @@ -0,0 +1,17 @@ +diff --git a/pyproject.toml b/pyproject.toml +index 9730e46..9834686 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -34,11 +34,7 @@ maintainers = [ + { name="Christian Geier" }, + { name="Jaca", email="vitouejj@gmail.com" }, + ] +-# These attributes are dynamically generated by hatch-vcs +-dynamic = [ +- "urls", +- "version" +-] ++version = "@version@" + description = "iCalendar parser/generator" + readme = { file = "README.rst", content-type = "text/x-rst" } + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/icalevents/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/icalevents/default.nix index 8c08395906..b530306094 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/icalevents/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/icalevents/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, pythonOlder, pytestCheckHook, poetry-core, @@ -25,6 +26,14 @@ buildPythonPackage rec { hash = "sha256-Bp+Wz88q65Gem8LyRz0A4xE5hIgOD+iZ7E1UlnfFiD4="; }; + patches = [ + (fetchpatch2 { + name = "icalendar-v6-compat.patch"; + url = "https://github.com/jazzband/icalevents/commit/fa925430bd63e46b0941b84a1ae2c9a063f2f720.patch"; + hash = "sha256-MeRC3iJ5raKvl9udzv/44Vs34LxSzq1S6VVKAVFSpiY="; + }) + ]; + build-system = [ poetry-core ]; 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 47018744c6..0c489b5c30 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix @@ -2,8 +2,8 @@ lib, stdenv, buildPythonPackage, - pythonOlder, fetchFromGitHub, + fetchpatch, isPyPy, substituteAll, @@ -32,16 +32,14 @@ buildPythonPackage rec { pname = "imageio"; - version = "2.35.1"; + version = "2.36.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "imageio"; repo = "imageio"; rev = "refs/tags/v${version}"; - hash = "sha256-WeoZE2TPBAhzBBcZNQqoiqvribMCLSZWk/XpdMydvCQ="; + hash = "sha256-dQrAVPXtDdibaxxfqW29qY7j5LyegvmI0Y7/btXmsyY="; }; patches = lib.optionals (!stdenv.hostPlatform.isDarwin) [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix index d914f72b94..21a9f2607e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "1.7.2"; + version = "1.7.3"; disabled = pythonOlder "3.5"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "refs/tags/v${version}"; - hash = "sha256-KW6YyArM3rHOkhXJCRWWy9OSwMwRFr16njeN+EcSGz0="; + hash = "sha256-orzU5jTFTj8O1zYDUDJYbXGpfZ60Egz0/eUttvej08k="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/import-expression/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/import-expression/default.nix index 369495b96e..6be9824a37 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/import-expression/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/import-expression/default.nix @@ -3,38 +3,43 @@ buildPythonPackage, fetchPypi, pytestCheckHook, - astunparse, + pythonOlder, setuptools, + typing-extensions, }: + buildPythonPackage rec { pname = "import-expression"; version = "2.0.0"; pyproject = true; + disabled = pythonOlder "3.9"; + src = fetchPypi { - inherit version; pname = "import_expression"; + inherit version; hash = "sha256-Biw7dIOPKbDcqYJSCyeqC/seREcVihSZuaKNFfgjTew="; }; build-system = [ setuptools ]; - dependencies = [ astunparse ]; + + dependencies = [ typing-extensions ]; + nativeCheckInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "tests.py" ]; - pythonImportsCheck = [ - "import_expression" - "import_expression._codec" - ]; + pythonImportsCheck = [ "import_expression" ]; meta = { description = "Transpiles a superset of python to allow easy inline imports"; homepage = "https://github.com/ioistired/import-expression-parser"; + changelog = "https://github.com/ioistired/import-expression/releases/tag/v${version}"; license = with lib.licenses; [ mit psfl ]; - mainProgram = "import-expression"; maintainers = with lib.maintainers; [ ]; + mainProgram = "import-expression"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/inotify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inotify/default.nix index 6e8e7f0aba..b5e3fd5acf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/inotify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/inotify/default.nix @@ -2,31 +2,44 @@ lib, buildPythonPackage, fetchFromGitHub, - nose, + pytestCheckHook, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage { pname = "inotify"; version = "unstable-2020-08-27"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "dsoprea"; repo = "PyInotify"; rev = "f77596ae965e47124f38d7bd6587365924dcd8f7"; - sha256 = "X0gu4s1R/Kg+tmf6s8SdZBab2HisJl4FxfdwKktubVc="; - fetchSubmodules = false; + hash = "sha256-X0gu4s1R/Kg+tmf6s8SdZBab2HisJl4FxfdwKktubVc="; }; - nativeCheckInputs = [ nose ]; + postPatch = '' + # Needed because assertEquals was removed in python 3.12 + substituteInPlace tests/test_inotify.py \ + --replace-fail "assertEquals" "assertEqual" \ + ''; - # dunno what's wrong but the module works regardless - doCheck = false; + build-system = [ setuptools ]; - meta = with lib; { + nativeCheckInputs = [ pytestCheckHook ]; + + # Disable these tests as they're flaky. + # The returned list can be in a different order, which causes the tests to fail. + disabledTests = [ + "test__automatic_new_watches_on_new_paths" + "test__cycle" + "test__renames" + ]; + + meta = { homepage = "https://github.com/dsoprea/PyInotify"; description = "Monitor filesystems events on Linux platforms with inotify"; - license = licenses.gpl2; - platforms = platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipwhois/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipwhois/default.nix index ea8fa07883..abdcb10e9e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipwhois/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipwhois/default.nix @@ -2,6 +2,7 @@ lib, stdenv, buildPythonPackage, + defusedxml, dnspython, fetchFromGitHub, fetchpatch, @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "ipwhois"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,27 +24,19 @@ buildPythonPackage rec { owner = "secynic"; repo = "ipwhois"; rev = "refs/tags/v${version}"; - hash = "sha256-2CfRRHlIIaycUtzKeMBKi6pVPeBCb1nW3/1hoxQU1YM="; + hash = "sha256-PY3SUPELcCvS/o5kfko4OD1BlTc9DnyqfkSFuzcAOSY="; }; - patches = [ - # Use assertEqual instead of assertEquals, https://github.com/secynic/ipwhois/pull/316 - (fetchpatch { - name = "assert-equal.patch"; - url = "https://github.com/secynic/ipwhois/commit/fce2761354af99bc169e6cd08057e838fcc40f75.patch"; - hash = "sha256-7Ic4xWTAmklk6MvnZ/WsH9SW/4D9EG/jFKt5Wi89Xtc="; - }) - ]; - __darwinAllowLocalNetworking = true; pythonRelaxDeps = [ "dnspython" ]; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ dnspython ]; + dependencies = [ + defusedxml + dnspython + ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipyniivue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipyniivue/default.nix index 52bb55afff..58e9e0829b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipyniivue/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipyniivue/default.nix @@ -1,8 +1,11 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + fetchNpmDeps, pythonOlder, + nodejs, + npmHooks, hatchling, hatch-vcs, anywidget, @@ -16,15 +19,32 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-C0mYkguN4ZfxSLqETH3dUwXeoNcicrmAgp6e9IIT43s="; + src = fetchFromGitHub { + owner = "niivue"; + repo = "ipyniivue"; + rev = "v${version}"; + hash = "sha256-6DZmHVVxJspjUhJ9pzTmTvwAnQfvTp8OL2xZONz2XbU="; + }; + + npmDeps = fetchNpmDeps { + name = "${pname}-${version}-npm-deps"; + inherit src; + hash = "sha256-ZJRBGMNn5clxMavimfl6Jwqf7M2pRo+WLne0gUWOiJ8="; }; # We do not need the build hooks, because we do not need to # build any JS components; these are present already in the PyPI artifact. env.HATCH_BUILD_NO_HOOKS = true; + nativeBuildInputs = [ + nodejs + npmHooks.npmConfigHook + ]; + + preBuild = '' + npm run build + ''; + build-system = [ hatchling hatch-vcs @@ -32,7 +52,7 @@ buildPythonPackage rec { dependencies = [ anywidget ]; - nativeCheckImports = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "ipyniivue" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipytablewidgets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipytablewidgets/default.nix index 0f54bb3105..e536861e10 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipytablewidgets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipytablewidgets/default.nix @@ -12,20 +12,18 @@ pandas, setuptools, traitlets, - traittypes, - wheel, }: buildPythonPackage rec { pname = "ipytablewidgets"; - version = "0.3.1"; - format = "pyproject"; + version = "0.3.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-14vIih+r/PHLxhgG29YtwuosSBLpewD2CluWpH2+pLc="; + hash = "sha256-CGkb//mLUmkyv+hmVJX5+04JGCfw+TtfBxMTXW0bhsw="; }; # Opened https://github.com/progressivis/ipytablewidgets/issues/3 to ask if @@ -37,20 +35,18 @@ buildPythonPackage rec { --replace 'jupyterlab>=3.0.0,<3.7' 'jupyterlab>=3.0.0' ''; - nativeBuildInputs = [ + build-system = [ jupyter-packaging jupyterlab setuptools - wheel ]; - propagatedBuildInputs = [ + dependencies = [ ipywidgets lz4 numpy pandas traitlets - traittypes ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix index 077ea0e4ac..33c3c0a8a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix @@ -42,13 +42,13 @@ buildPythonPackage rec { pname = "ipython"; - version = "8.26.0"; + version = "8.27.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-HOwPu6hASvE/rOvoPQRDanQ0x0AOWfR6z0Z8ZKvQlWw="; + hash = "sha256-C5mi3J8V/WhpLomOVWhyXG1JxSfTap+1lg/73qqC/34="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jalali-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jalali-core/default.nix new file mode 100644 index 0000000000..69c613d041 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/jalali-core/default.nix @@ -0,0 +1,35 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "jalali-core"; + version = "1.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "jalali_core"; + inherit version; + hash = "sha256-9Ch8cMYwMj3PCjqybfkFuk1FHiMKwfZbO7L3d5eJSis="; + }; + + build-system = [ setuptools ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "jalali_core" ]; + + meta = { + description = "Module to convert Gregorian to Jalali and inverse dates"; + homepage = "https://pypi.org/project/jalali-core/"; + license = lib.licenses.lgpl2Only; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jdatetime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jdatetime/default.nix index 553500c47b..acc5dca6a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jdatetime/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jdatetime/default.nix @@ -2,29 +2,33 @@ lib, buildPythonPackage, fetchPypi, - six, + jalali-core, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "jdatetime"; version = "5.0.0"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; hash = "sha256-LMYD2RPA2OMokoRU09KVJhywN+mVAif2fJYpq0cQ/fk="; }; - propagatedBuildInputs = [ six ]; + build-system = [ setuptools ]; + + dependencies = [ jalali-core ]; pythonImportsCheck = [ "jdatetime" ]; meta = with lib; { description = "Jalali datetime binding"; homepage = "https://github.com/slashmili/python-jalali"; + changelog = "https://github.com/slashmili/python-jalali/blob/v${version}/CHANGELOG.md"; license = licenses.psfl; maintainers = [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/josepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/josepy/default.nix index 955bc33cc2..b1aa721e13 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/josepy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/josepy/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, cryptography, fetchPypi, + fetchpatch, poetry-core, pyopenssl, pytestCheckHook, @@ -21,6 +22,15 @@ buildPythonPackage rec { hash = "sha256-MIs7+c6CWtTUu6djcs8ZtdwcLOlqnSmPlkKXXmS9E90="; }; + patches = [ + # don't fail tests on openssl deprecation warning, upstream is working on proper fix + # FIXME: remove for next update + (fetchpatch { + url = "https://github.com/certbot/josepy/commit/350410fc1d38c4ac8422816b6865ac8cd9c60fc7.diff"; + hash = "sha256-QGbzonXb5BtTTWDeDqnZhbS6gHce99vIOm/H8QYeGXY="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/js2py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/js2py/default.nix index fd28870e0e..1ecceaf832 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/js2py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/js2py/default.nix @@ -42,5 +42,6 @@ buildPythonPackage rec { homepage = "https://github.com/PiotrDabkowski/Js2Py"; license = licenses.mit; maintainers = with maintainers; [ onny ]; + knownVulnerabilities = [ "CVE-2024-28397" ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-collaboration/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-collaboration/default.nix index 4e4bfd7b45..0489550cfc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-collaboration/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-collaboration/default.nix @@ -1,18 +1,24 @@ { lib, buildPythonPackage, - pythonOlder, fetchPypi, + + # build-system hatch-jupyter-builder, hatch-nodejs-version, hatchling, + jupyterlab, + + # dependencies jsonschema, jupyter-events, jupyter-server, jupyter-server-fileid, jupyter-ydoc, - jupyterlab, + pycrdt, pycrdt-websocket, + + # tests pytest-jupyter, pytestCheckHook, websockets, @@ -20,15 +26,13 @@ buildPythonPackage rec { pname = "jupyter-collaboration"; - version = "2.1.2"; + version = "2.1.4"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchPypi { pname = "jupyter_collaboration"; inherit version; - hash = "sha256-uLbNYzszaSLnU4VcaDr5KBcRN+Xm/B471s+W9qJibsk="; + hash = "sha256-YT3wrTQ8imuTK8zeJbwscHtawtqspf1oItGzMMfg5io="; }; postPatch = '' @@ -48,6 +52,7 @@ buildPythonPackage rec { jupyter-server jupyter-server-fileid jupyter-ydoc + pycrdt pycrdt-websocket ]; @@ -65,20 +70,13 @@ buildPythonPackage rec { pytestFlagsArray = [ "-Wignore::DeprecationWarning" ]; - disabledTests = [ - # ExceptionGroup: unhandled errors in a TaskGroup (1 sub-exception) - "test_dirty" - # causes a hang - "test_rooms" - ]; - __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { description = "JupyterLab Extension enabling Real-Time Collaboration"; homepage = "https://github.com/jupyterlab/jupyter_collaboration"; changelog = "https://github.com/jupyterlab/jupyter_collaboration/blob/v${version}/CHANGELOG.md"; - license = licenses.bsd3; - maintainers = teams.jupyter.members; + license = lib.licenses.bsd3; + maintainers = lib.teams.jupyter.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-ydoc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-ydoc/default.nix index 41ba6312e4..4bb08e6ed9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-ydoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-ydoc/default.nix @@ -2,35 +2,37 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, + + # build-system hatch-nodejs-version, hatchling, - importlib-metadata, + + # dependencies pycrdt, pytestCheckHook, + + # tests websockets, ypy-websocket, }: buildPythonPackage rec { pname = "jupyter-ydoc"; - version = "2.1.1"; + version = "2.1.2"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { pname = "jupyter_ydoc"; inherit version; - hash = "sha256-HcvxOGGzZ4AA1pr07zi0njoS+AgbqFHGgDk8Lhi8S4Q="; + hash = "sha256-yYnIm0s9ljtYQJVzKJcimNTVSDTtjzz3Zo3WE9OfKsw="; }; - nativeBuildInputs = [ + build-system = [ hatch-nodejs-version hatchling ]; - propagatedBuildInputs = [ pycrdt ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; + dependencies = [ pycrdt ]; pythonImportsCheck = [ "jupyter_ydoc" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kserve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kserve/default.nix index f11863d014..c0f878a78e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kserve/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kserve/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -9,35 +8,38 @@ poetry-core, # dependencies - async-timeout, - asgi-logger, cloudevents, fastapi, grpcio, httpx, - azure-identity, kubernetes, numpy, orjson, pandas, - prometheus-client, - protobuf, - requests, - psutil, + uvicorn, + + # optional-dependencies + azure-identity, azure-storage-blob, azure-storage-file-share, boto3, google-cloud-storage, + huggingface-hub, + asgi-logger, + ray, + + prometheus-client, + protobuf, + requests, + psutil, pydantic, python-dateutil, pyyaml, - ray, six, tabulate, timing-asgi, - uvicorn, - # checks + # tests avro, grpcio-testing, pytest-asyncio, @@ -47,16 +49,14 @@ buildPythonPackage rec { pname = "kserve"; - version = "0.13.1"; + version = "0.14.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "kserve"; repo = "kserve"; rev = "refs/tags/v${version}"; - hash = "sha256-wGS001PK+k21oCOaQCiAtytTDjfe0aiTVJ9spyOucYA="; + hash = "sha256-N/IgiTiyBNw7WQWxcUJlXU+Q9o3UUaduD9ZBKwu0uRE="; }; sourceRoot = "${src.name}/python/kserve"; @@ -66,7 +66,6 @@ buildPythonPackage rec { "httpx" "prometheus-client" "protobuf" - "ray" "uvicorn" "psutil" ]; @@ -77,7 +76,6 @@ buildPythonPackage rec { ]; dependencies = [ - async-timeout cloudevents fastapi grpcio @@ -92,12 +90,11 @@ buildPythonPackage rec { pydantic python-dateutil pyyaml - ray six tabulate timing-asgi uvicorn - ] ++ ray.optional-dependencies.serve-deps; + ]; optional-dependencies = { storage = [ @@ -105,6 +102,7 @@ buildPythonPackage rec { azure-storage-blob azure-storage-file-share boto3 + huggingface-hub google-cloud-storage requests ]; @@ -129,11 +127,11 @@ buildPythonPackage rec { disabledTests = [ # Require network access - "test_health_handler" - "test_infer" - "test_infer_v2" - # Assertion error due to HTTP response code - "test_unload" + "test_infer_graph_endpoint" + "test_infer_path_based_routing" + + # Tries to access `/tmp` (hardcoded) + "test_local_path_with_out_dir_exist" ]; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix index 09e7f9fa48..060b8d9444 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "labelbox"; - version = "5.1.0"; + version = "5.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "Labelbox"; repo = "labelbox-python"; rev = "refs/tags/v.${version}"; - hash = "sha256-M55cwT7BrY+8m9ec+2bKDCxGkHJp/c50Gzib4sEg7Bk="; + hash = "sha256-vfhlzkCTm1fhvCpzwAaXWPyXE8/2Yx63fTVHl5CWon4="; }; sourceRoot = "${src.name}/libs/labelbox"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lark/default.nix index df891d96ed..85f690d93d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lark/default.nix @@ -3,9 +3,6 @@ buildPythonPackage, fetchFromGitHub, regex, - pytestCheckHook, - pythonOlder, - js2py, setuptools, }: @@ -33,13 +30,8 @@ buildPythonPackage rec { "lark.grammars" ]; - # Js2py is not supported on 3.12 - doCheck = pythonOlder "3.12"; - - nativeCheckInputs = [ - js2py - pytestCheckHook - ]; + # Js2py is needed for tests but it's marked as insecure + doCheck = false; meta = with lib; { description = "Modern parsing library for Python, implementing Earley & LALR(1) and an easy interface"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/latexrestricted/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/latexrestricted/default.nix index 394176397b..1abc58cbd3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/latexrestricted/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/latexrestricted/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "latexrestricted"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-AMfDTruJKejDdXW98VkeeEwELql5566bsL1SutLDpso="; + hash = "sha256-PwhVKgoXujiLC+3FPAtUdvBEgeNwD6aBK+I5p8xeLwo="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libarcus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libarcus/default.nix index 316c604750..ce56a19501 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libarcus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libarcus/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { ''; meta = with lib; { + broken = true; description = "Communication library between internal components for Ultimaker software"; homepage = "https://github.com/Ultimaker/libArcus"; license = licenses.lgpl3Plus; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libknot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libknot/default.nix index 7d0ce1a2ed..abaccdefa9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libknot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libknot/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "libknot"; - version = "3.4.0"; + version = "3.4.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-BtESc9BIZeDNNPJYyMLTeMsNHm+xBcLueyJ7/1iXFos="; + hash = "sha256-NJmOm2PIbH4GeDN1XlKKeLePHGatDQlWDPJtn5tUO3s="; }; postPatch = '' 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 4d437ac67c..99a00df4ea 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 @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build @@ -19,14 +18,14 @@ buildPythonPackage rec { pname = "lightning-utilities"; - version = "0.11.7"; + version = "0.11.8"; pyproject = true; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "utilities"; rev = "refs/tags/v${version}"; - hash = "sha256-0XxBDe9OGQLfl4viuUm5Hx8WvZhSj+J0FoDqD/JOiZM="; + hash = "sha256-1npXzPqasgtI5KLq791hfneKFO5GrSiRdqfRd13//6M="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lxmf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lxmf/default.nix index 4c8f04cbd5..b5e957b54d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lxmf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lxmf/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "lxmf"; - version = "0.5.5"; + version = "0.5.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; rev = "refs/tags/${version}"; - hash = "sha256-1zZRONzKafXfnmszRl7oCRTFBsy9U1bUaOzWwt7jLzY="; + hash = "sha256-ekemsCs3Ils8ovDTzyi6aQ4Z0bnfTKpuQYBeh1MA94Q="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lxml-html-clean/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lxml-html-clean/default.nix index 3b0308fe24..1a5990bb84 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lxml-html-clean/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lxml-html-clean/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "lxml-html-clean"; - version = "0.2.2"; + version = "0.3.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fedora-python"; repo = "lxml_html_clean"; rev = "refs/tags/${version}"; - hash = "sha256-DiHbO2m/JckdXFMU7/LAW2hkyskqWtrQ93sgsVcdDSo="; + hash = "sha256-LNfsqvBYxhUANiftDp6aYb5UWnP7/NvDEZcSSn+l20Q="; }; build-system = [ setuptools ]; 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 c035c52467..0a0bef5219 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lxml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lxml/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "lxml"; - version = "5.2.2"; + version = "5.3.0"; pyproject = true; src = fetchFromGitHub { owner = "lxml"; repo = "lxml"; rev = "refs/tags/lxml-${version}"; - hash = "sha256-c9r2uqjXmQOXyPCsJTzi1OatkQ9rhJbKqpxaoFz2l18="; + hash = "sha256-xhKtqsh5FfgXt1fKUhN/Aib/004P7epArv3/XxDSBtw="; }; # setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs diff --git a/third_party/nixpkgs/pkgs/development/python-modules/magicgui/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/magicgui/default.nix index 06476b9d92..a996573f30 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/magicgui/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/magicgui/default.nix @@ -1,37 +1,46 @@ { lib, buildPythonPackage, - fetchFromGitHub, - setuptools-scm, - pytestCheckHook, - typing-extensions, - qtpy, - pyside2, - psygnal, docstring-parser, + fetchFromGitHub, + hatch-vcs, + hatchling, napari, # a reverse-dependency, for tests + psygnal, + pyside2, + pytestCheckHook, + pythonOlder, + superqt, + typing-extensions, }: + buildPythonPackage rec { pname = "magicgui"; - version = "0.5.1"; + version = "0.9.1"; + pyproject = true; - format = "pyproject"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = "napari"; + owner = "pyapp-kit"; repo = "magicgui"; rev = "refs/tags/v${version}"; - hash = "sha256-fVfBQaaT8/lUGqZRXjOPgvkC01Izb8Sxqn7RCqnW9bo="; + hash = "sha256-6ye29HtGQ8iwYE2kQ1wWIBC+bzFsMZmJR4eTXWwu7+U="; }; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ + build-system = [ + hatch-vcs + hatchling + ]; + + dependencies = [ typing-extensions - qtpy + superqt pyside2 psygnal docstring-parser ]; + nativeCheckInputs = [ pytestCheckHook ]; doCheck = false; # Reports "Fatal Python error" @@ -43,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Build GUIs from python functions, using magic. (napari/magicgui)"; homepage = "https://github.com/napari/magicgui"; + changelog = "https://github.com/pyapp-kit/magicgui/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ SomeoneSerge ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/markdown/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/markdown/default.nix index f0858ca0da..f99269fb36 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/markdown/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/markdown/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "markdown"; - version = "3.6"; + version = "3.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Python-Markdown"; repo = "markdown"; rev = "refs/tags/${version}"; - hash = "sha256-jGo9/ZS2EhMDl/o1ref7Owqckuc7am578Ojmcz2aWIE="; + hash = "sha256-bIBen693MC56k4LZ+8vhbvP+E3myFXoaXpNHOlnIdG8="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix index 7dc7dcd2d4..f942fadb40 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix @@ -96,8 +96,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ - # Frequently fails when exiftool is updated and adds support for new metadata. - "test_all_parametred" + # libmat2.pdf.cairo.MemoryError: out of memory + "test_all" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mdformat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mdformat/default.nix index 28df80388d..29f62b9f68 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mdformat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mdformat/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mdformat"; - version = "0.7.17"; + version = "0.7.18"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,12 +21,12 @@ buildPythonPackage rec { owner = "executablebooks"; repo = "mdformat"; rev = "refs/tags/${version}"; - hash = "sha256-umtfbhN6sDR/rFr1LwmJ21Ph9bK1Qq43bmMVzGCPD5s="; + hash = "sha256-t2yx8cIq8es3XOc2nbHPKjUUium5+RPZuD8oNWZxVV0="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = + dependencies = [ markdown-it-py ] ++ lib.optionals (pythonOlder "3.11") [ tomli ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix index e3a5bf6a39..5887818342 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.5.1"; + version = "2.5.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-LyWb7BWwRi0Q/dOZkFu/FwOBIqR2mPr3c8/mpsqw/ec="; + hash = "sha256-k2i6oZudY59CmFt5qlWCCtZgywcbLHR9OUYIannSZ20="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mhcflurry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mhcflurry/default.nix index b33e95fbdf..e27c94704e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mhcflurry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mhcflurry/default.nix @@ -15,7 +15,6 @@ tqdm, # tests - nose, pytestCheckHook, }: @@ -44,8 +43,9 @@ buildPythonPackage rec { tqdm ]; + # Tests currently depend on nose; see + # . nativeCheckInputs = [ - nose pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mitogen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mitogen/default.nix index a43796cba3..45b5018b78 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mitogen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mitogen/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "mitogen"; - version = "0.3.12"; + version = "0.3.14"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mitogen-hq"; repo = "mitogen"; rev = "refs/tags/v${version}"; - hash = "sha256-OlZzE4Nc9VBrv5oCZ4LUFdj1a+9rc7YbHDYSbHwALY8="; + hash = "sha256-Gacn3EjyNq5LtjfbCczO+fqlq6+KgzxFs4d/K2xttHE="; }; build-system = [ setuptools ]; 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 1b741ff733..47b9e1bf4e 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.11.1"; + version = "1.12.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "python"; rev = "refs/tags/${version}"; - hash = "sha256-g6F6xIFKLzNqgbWGZXdJeoqQz/GIlC3XmrG9Kjkr1rU="; + hash = "sha256-Dwh1MQuOjN/quxKlOMIadZ5MR8BrS/s6l4mwSBTfXQE="; }; build-system = [ pdm-backend ]; @@ -38,6 +38,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "mkdocstrings_handlers" ]; + disabledTests = [ + # Tests fails with AssertionError + "test_windows_root_conversion" + ]; + meta = with lib; { description = "Python handler for mkdocstrings"; homepage = "https://github.com/mkdocstrings/python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkl-service/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkl-service/default.nix index fd5e8e9927..f4e52431ed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkl-service/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkl-service/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "mkl-service"; - version = "2.4.1"; + version = "2.4.2"; pyproject = true; src = fetchFromGitHub { owner = "IntelPython"; repo = "mkl-service"; rev = "refs/tags/v${version}"; - hash = "sha256-4UPiQt1hVVlPFZnuKlMK3FLv2cIEXToHKxnyYLXR/sY="; + hash = "sha256-o5mjZhqQc7tu44EjrScuGzv6pZNlnZnndMIAhl8pY5o="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix index 7032d0e91d..b04eddabc5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix @@ -1,20 +1,24 @@ { lib, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies alembic, buildPythonPackage, cachetools, click, cloudpickle, - databricks-cli, + databricks-sdk, docker, - entrypoints, - fetchPypi, flask, gitpython, - gorilla, graphene, gunicorn, importlib-metadata, + jinja2, markdown, matplotlib, numpy, @@ -22,60 +26,77 @@ opentelemetry-sdk, packaging, pandas, - prometheus-flask-exporter, protobuf, - python-dateutil, - pythonOlder, pyarrow, - pytz, pyyaml, - querystring-parser, requests, - setuptools, scikit-learn, scipy, - simplejson, sqlalchemy, sqlparse, + + # tests + aiohttp, + azure-core, + azure-storage-blob, + azure-storage-file, + boto3, + botocore, + catboost, + datasets, + fastapi, + google-cloud-storage, + httpx, + jwt, + keras, + langchain, + librosa, + moto, + opentelemetry-exporter-otlp, + optuna, + pydantic, + pyspark, + pytestCheckHook, + pytorch-lightning, + sentence-transformers, + starlette, + statsmodels, + tensorflow, + torch, + transformers, + uvicorn, + xgboost, }: buildPythonPackage rec { pname = "mlflow"; - version = "2.14.3"; + version = "2.16.2"; pyproject = true; - disabled = pythonOlder "3.8"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-KSyuS4NXSgyyIxF+IkyqZ5iTMHivAjNxnCthK+pkVhc="; + src = fetchFromGitHub { + owner = "mlflow"; + repo = "mlflow"; + rev = "refs/tags/v${version}"; + hash = "sha256-7W1gpVgJSN/iXoW987eCHfcOeE3D/ZJ2W/eilDdzOww="; }; - # Remove currently broken dependency `shap`, a model explainability package. - # This seems quite unprincipled especially with tests not being enabled, - # but not mlflow has a 'skinny' install option which does not require `shap`. - pythonRemoveDeps = [ "shap" ]; - pythonRelaxDeps = [ - "gunicorn" - "packaging" - "pytz" - "pyarrow" + build-system = [ + setuptools ]; - propagatedBuildInputs = [ + dependencies = [ alembic cachetools click cloudpickle - databricks-cli + databricks-sdk docker - entrypoints flask gitpython - gorilla graphene gunicorn importlib-metadata + jinja2 markdown matplotlib numpy @@ -83,36 +104,87 @@ buildPythonPackage rec { opentelemetry-sdk packaging pandas - prometheus-flask-exporter protobuf pyarrow - python-dateutil - pytz pyyaml - querystring-parser requests scikit-learn scipy - setuptools - #shap - simplejson sqlalchemy sqlparse ]; pythonImportsCheck = [ "mlflow" ]; - # no tests in PyPI dist - # run into https://stackoverflow.com/questions/51203641/attributeerror-module-alembic-context-has-no-attribute-config - # also, tests use conda so can't run on NixOS without buildFHSEnv + nativeCheckInputs = [ + aiohttp + azure-core + azure-storage-blob + azure-storage-file + boto3 + botocore + catboost + datasets + fastapi + google-cloud-storage + httpx + jwt + keras + langchain + librosa + moto + opentelemetry-exporter-otlp + optuna + pydantic + pyspark + pytestCheckHook + pytorch-lightning + sentence-transformers + starlette + statsmodels + tensorflow + torch + transformers + uvicorn + xgboost + ]; + + disabledTestPaths = [ + # Requires unpackaged `autogen` + "tests/autogen/test_autogen_autolog.py" + + # Requires unpackaged `diviner` + "tests/diviner/test_diviner_model_export.py" + + # Requires unpackaged `sktime` + "examples/sktime/test_sktime_model_export.py" + + # Requires `fastai` which would cause a circular dependency + "tests/fastai/test_fastai_autolog.py" + "tests/fastai/test_fastai_model_export.py" + + # Requires `spacy` which would cause a circular dependency + "tests/spacy/test_spacy_model_export.py" + + # Requires `tensorflow.keras` which is not included in our outdated version of `tensorflow` (2.13.0) + "tests/gateway/providers/test_ai21labs.py" + "tests/tensorflow/test_keras_model_export.py" + "tests/tensorflow/test_keras_pyfunc_model_works_with_all_input_types.py" + "tests/tensorflow/test_mlflow_callback.py" + ]; + + # I (@GaetanLepage) gave up at enabling tests: + # - They require a lot of dependencies (some unpackaged); + # - Many errors occur at collection time; + # - Most (all ?) tests require internet access anyway. doCheck = false; - meta = with lib; { + meta = { description = "Open source platform for the machine learning lifecycle"; mainProgram = "mlflow"; homepage = "https://github.com/mlflow/mlflow"; changelog = "https://github.com/mlflow/mlflow/blob/v${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ tbenst ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ tbenst ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/model-bakery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/model-bakery/default.nix index 464b2920a7..2a3a02e483 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/model-bakery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/model-bakery/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "model-bakery"; - version = "1.19.5"; + version = "1.20.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "model-bakers"; repo = "model_bakery"; rev = "refs/tags/${version}"; - hash = "sha256-hOXE3mddGmRRgO9qAlj3bnmco8QTg2rD0sgui3J9pp8="; + hash = "sha256-71c5p6FypqbwUUoYu4dTamYnBlks1fiXTp7dUfc0ZQs="; }; build-system = [ hatchling ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/moto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/moto/default.nix index 3f5ae81339..96e633f4c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/moto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/moto/default.nix @@ -44,14 +44,14 @@ buildPythonPackage rec { pname = "moto"; - version = "5.0.12"; + version = "5.0.15"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-EL1DS/2jKWOf6VKUcMTCeTgGTBOZhAJOamJRPlCv9Cc="; + hash = "sha256-V6qMKvQXzGSg3f5j5bzRrakPUHm3PN0fdMTp+zChp+Y="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mujoco/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mujoco/default.nix index 6416d75a38..75b2b9e6a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mujoco/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mujoco/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { # in the project's CI. src = fetchPypi { inherit pname version; - hash = "sha256-3WF/QMHARPXff7yTM9MJTTyIYp1OPYYiTly0LeQKaos="; + hash = "sha256-26zb79/ixZh6XmMpn0KSCEr6jyl6SNI4ih1uUwlx6Hw="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/multidict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/multidict/default.nix index 0321c5deba..416df76262 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/multidict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/multidict/default.nix @@ -1,37 +1,45 @@ { lib, - fetchPypi, + fetchFromGitHub, buildPythonPackage, + pytest-cov-stub, pytestCheckHook, pythonOlder, setuptools, + typing-extensions, }: buildPythonPackage rec { pname = "multidict"; - version = "6.0.5"; + version = "6.1.0"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-9+MBB17a9QUA8LNBVDxBGU2N865cr0cC8glfPKc92No="; + src = fetchFromGitHub { + owner = "aio-libs"; + repo = "multidict"; + rev = "refs/tags/v${version}"; + hash = "sha256-rvL1XzMNBVBlElE5wznecL3Ku9h4tG9VeqGRd04iPXw="; }; postPatch = '' - substituteInPlace pytest.ini \ - --replace-fail "-p pytest_cov" "" - sed -i '/--cov/d' pytest.ini # `python3 -I -c "import multidict"` fails with ModuleNotFoundError substituteInPlace tests/test_circular_imports.py \ --replace-fail '"-I",' "" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ pytestCheckHook ]; + dependencies = lib.optionals (pythonOlder "3.11") [ + typing-extensions + ]; + + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; preCheck = '' # import from $out diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3/default.nix index 0f69b68b7b..8beba0e475 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3/default.nix @@ -58,16 +58,16 @@ rec { "sha256-kdakfB1uRg5K+FZyeNSQxvBYj0+ztJrDTq4Dkh6dqAA="; mypy-boto3-acm-pca = - buildMypyBoto3Package "acm-pca" "1.35.0" - "sha256-YU4Djb4Z9//5WYvkSgv9vlv4oG8Da6dP/Oktpuff4q0="; + buildMypyBoto3Package "acm-pca" "1.35.38" + "sha256-9hJo5ZV8ckN5+V/L6MOowyWr2eZoroVRmzooMDDA6WE="; mypy-boto3-amp = buildMypyBoto3Package "amp" "1.35.0" "sha256-Pm/KyqcUUAQBZjQKaVhuL/9c+qfkgfeD51esgE+EgQw="; mypy-boto3-amplify = - buildMypyBoto3Package "amplify" "1.35.19" - "sha256-EP342ZP67DkGOrA2hLiv0iE1mL6SpaUOY8BHCdhaqRE="; + buildMypyBoto3Package "amplify" "1.35.41" + "sha256-s17sJsHlnr6L8SGyhVUtdb8xJNsO441QzidzxgoK99I="; mypy-boto3-amplifybackend = buildMypyBoto3Package "amplifybackend" "1.35.0" @@ -102,8 +102,8 @@ rec { "sha256-jwjD2mkz6YpUEOwEHMNiIzBNoVwYUUONQjKZemGFEl8="; mypy-boto3-appflow = - buildMypyBoto3Package "appflow" "1.35.0" - "sha256-tNCfrUzsRHhpfIY+D2Y+OscMnYw7lGeYhFvs+wHq9zk="; + buildMypyBoto3Package "appflow" "1.35.39" + "sha256-W5GJoGRQUcjTBUYAWJjBgMKcAKRdn63deVsyU6ezRIU="; mypy-boto3-appintegrations = buildMypyBoto3Package "appintegrations" "1.35.0" @@ -226,8 +226,8 @@ rec { "sha256-D64DZgrma3/kvhyH6ZbPtD8nlRrzFVM8WT8Ex2fTZLM="; mypy-boto3-cloudformation = - buildMypyBoto3Package "cloudformation" "1.35.0" - "sha256-DQN9nWvbQ5qE4jkbqYek4D/O360OiB2xzw94YdJ1kHw="; + buildMypyBoto3Package "cloudformation" "1.35.41" + "sha256-ElaYUwcYs2/Z5CoTzclkAoMERA2AknrfLh389eN2g54="; mypy-boto3-cloudfront = buildMypyBoto3Package "cloudfront" "1.35.0" @@ -266,8 +266,8 @@ rec { "sha256-wCjyRnd7RlnLRQrADd2Xmh74IsQxBfUgLIJuaZW7kjw="; mypy-boto3-codebuild = - buildMypyBoto3Package "codebuild" "1.35.21" - "sha256-sCIMOBe3VppVALMDc4BV3rK+RYlCbxK80YUKPnckvT8="; + buildMypyBoto3Package "codebuild" "1.35.41" + "sha256-TP+a2iM+KEy2erXCTQ3NgwE/Qy3XWoJKRhSA0XOAJKE="; mypy-boto3-codecatalyst = buildMypyBoto3Package "codecatalyst" "1.35.0" @@ -294,8 +294,8 @@ rec { "sha256-UJmPVW20ofQmmer9/IYwaFIU2+xhXcT+0s2aUxFDGZY="; mypy-boto3-codepipeline = - buildMypyBoto3Package "codepipeline" "1.35.33" - "sha256-hnmb6+m1iiVfzNjm1AxGlAkEjSbAslPe4st7i52Kj3w="; + buildMypyBoto3Package "codepipeline" "1.35.40" + "sha256-r5yVdmlR32GRRdtsKcZ+KucAeCeIW9ValznnX3aB9J4="; mypy-boto3-codestar = buildMypyBoto3Package "codestar" "1.35.0" @@ -374,8 +374,8 @@ rec { "sha256-zzd0tw46A9NwxUJ+7tz3Xlb4RbVTY3v7szDG4/189Ng="; mypy-boto3-dataexchange = - buildMypyBoto3Package "dataexchange" "1.35.0" - "sha256-DZ8sYkjFA0yFfRKNQbEW2YA3Dl04FbG6Hu8myRuFlUs="; + buildMypyBoto3Package "dataexchange" "1.35.43" + "sha256-DkxAJiOhOgID1DzOAwNNqx3Yk/H5P9j130fZyB9fxwc="; mypy-boto3-datapipeline = buildMypyBoto3Package "datapipeline" "1.35.0" @@ -414,8 +414,8 @@ rec { "sha256-yJ3ApQy6xeEdxNcRQG5mekfK1aP7FPdR79TfbRZkESo="; mypy-boto3-dms = - buildMypyBoto3Package "dms" "1.35.0" - "sha256-mTwE5mn8GTCMuidyk8cYnZEk3PkrnP2ykVZgn2geMTo="; + buildMypyBoto3Package "dms" "1.35.38" + "sha256-b9AA9n1WWgk4HV1U/3L/eVl4eualNyhYCjbFw+QvHV4="; mypy-boto3-docdb = buildMypyBoto3Package "docdb" "1.35.0" @@ -446,8 +446,8 @@ rec { "sha256-wBJ7PnAlsi88AZIRPoNgbzOhPwUAJBegtwk+tw1lOwU="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.35.34" - "sha256-gi80wl0sVQmaeYdAiPIeeL2Uc8dwQuGDTFKRvbGh6Co="; + buildMypyBoto3Package "ec2" "1.35.38" + "sha256-AwY1//39/3P8l+zEsunb7Mun//B1wiR8ae+ZxGulzRo="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.35.0" @@ -462,8 +462,8 @@ rec { "sha256-KXtN44KAIDXjMgv3ICG8rXYfEjcZ85pQ+qdvN2Yiq3g="; mypy-boto3-ecs = - buildMypyBoto3Package "ecs" "1.35.21" - "sha256-DSmCf9/TXUfoEYppEZOxAJOxuOCZK5p6GRIKWIa3aPQ="; + buildMypyBoto3Package "ecs" "1.35.43" + "sha256-KG94nsbTrwpvoitQ3gdcJPDAWp6MIWDMAmupjB8xwtg="; mypy-boto3-efs = buildMypyBoto3Package "efs" "1.35.0" @@ -474,12 +474,12 @@ rec { "sha256-w+uJ5Jqfbnj3ykj59C8sbhitp5MyTIE+PnZXrlIkOag="; mypy-boto3-elastic-inference = - buildMypyBoto3Package "elastic-inference" "1.35.0" - "sha256-GpOOU/ritDu+hDZL8adN5fLYhYt0bgBTqCv2mDjt1T0="; + buildMypyBoto3Package "elastic-inference" "1.35.38" + "sha256-D+Ecu2+03ua8vs8C2NdGtDVSUpyM0SozHIb2PbRO2+g="; mypy-boto3-elasticache = - buildMypyBoto3Package "elasticache" "1.35.0" - "sha256-m80E+gaUJNpmrY9k4TuKaMbaAm+fCDqUbgH5IVgrArw="; + buildMypyBoto3Package "elasticache" "1.35.36" + "sha256-pLGZiHH9nyv0jzS4kWUw9BUMjsSR9X/i0VKIUkIeohs="; mypy-boto3-elasticbeanstalk = buildMypyBoto3Package "elasticbeanstalk" "1.35.0" @@ -494,12 +494,12 @@ rec { "sha256-fw/vfzKXXQSG7xj9FolkJgzciHBz4ELlFh2MlEJ6wQI="; mypy-boto3-elbv2 = - buildMypyBoto3Package "elbv2" "1.35.18" - "sha256-BlHZi/WM1rKK0QWbAYfHmdpZmgm8ZpWZPZQ4gz0k4oY="; + buildMypyBoto3Package "elbv2" "1.35.39" + "sha256-k7IgKkdS2h5p+Xl+UhiQRtk9fjCZQMzc2FXRRTjscTc="; mypy-boto3-emr = - buildMypyBoto3Package "emr" "1.35.18" - "sha256-yXm2k6pDyJ1N93q6ltz6jvQy17AKpKsKhVFMpS1oGaI="; + buildMypyBoto3Package "emr" "1.35.39" + "sha256-PAVHgUn9cbnu7EPOO2+SNbT+WrayTP/mmIoqt3Kw29E="; mypy-boto3-emr-containers = buildMypyBoto3Package "emr-containers" "1.35.4" @@ -594,8 +594,8 @@ rec { "sha256-U0sYInE/1XsjwQCxmcYLVvmEQf4R6drtdSqTr0b+3OM="; mypy-boto3-guardduty = - buildMypyBoto3Package "guardduty" "1.35.22" - "sha256-+Ro4QM8DwrDlbroFb6YV6fZGYPieHB0B5+EgdNrnIzQ="; + buildMypyBoto3Package "guardduty" "1.35.39" + "sha256-6+k3i6IdCsHW8xTy/AG2JcfDqpGGj67JSihC6OPjXYE="; mypy-boto3-health = buildMypyBoto3Package "health" "1.35.0" @@ -674,8 +674,8 @@ rec { "sha256-Hse02blZttIxqJovJ3h6yCEi+jN3e+pfznIXjBAid1k="; mypy-boto3-iotfleetwise = - buildMypyBoto3Package "iotfleetwise" "1.35.0" - "sha256-VQCFJX2wZYKWey8yxEBoAK29uDxb/xn5+EuZH739DV8="; + buildMypyBoto3Package "iotfleetwise" "1.35.38" + "sha256-vkQmyoPMcf2ZBnJ1TJba2uNJL3GaVVZI9h3R75C3uR8="; mypy-boto3-iotsecuretunneling = buildMypyBoto3Package "iotsecuretunneling" "1.35.0" @@ -698,8 +698,8 @@ rec { "sha256-e4a8Na1spmmaUVAiAWPvn7DqzYHzEL4EatCewrRxJKE="; mypy-boto3-ivs = - buildMypyBoto3Package "ivs" "1.35.19" - "sha256-CXQnPKSn8oMyj2V2+iTjcqPEGykM2mOrRDVTkYEX/Jo="; + buildMypyBoto3Package "ivs" "1.35.41" + "sha256-U4GiLc6Tdk6qCKrLxVPikRKkcAWxnp1DIV8nOi/XQH8="; mypy-boto3-ivs-realtime = buildMypyBoto3Package "ivs-realtime" "1.35.32" @@ -898,8 +898,8 @@ rec { "sha256-u+GgBEtw2AVonu+XqL8gDIJig9foiUufz1++qmrfx00="; mypy-boto3-memorydb = - buildMypyBoto3Package "memorydb" "1.35.0" - "sha256-hulSiv/A/GXV9rCjjSSIGKQSZqeBkKUKZuuKGwl8/aU="; + buildMypyBoto3Package "memorydb" "1.35.36" + "sha256-WLbTMLs4KXOtoesqSm6X4MK/BcCAqcCxH7mbBBisYzQ="; mypy-boto3-meteringmarketplace = buildMypyBoto3Package "meteringmarketplace" "1.35.0" @@ -994,8 +994,8 @@ rec { "sha256-PdOH3KaQn9d455qCR565qFlyCb8t7R8x8wXBebHgtt8="; mypy-boto3-outposts = - buildMypyBoto3Package "outposts" "1.35.0" - "sha256-CFULIBMCKb4mUQ7ogh5hvfewDMpsP1jnQEJmtuArCck="; + buildMypyBoto3Package "outposts" "1.35.38" + "sha256-Adb8A8DVn3T00xuEtXXT+LHxwM4jh0IG3JLUiAi02ds="; mypy-boto3-panorama = buildMypyBoto3Package "panorama" "1.35.0" @@ -1042,12 +1042,12 @@ rec { "sha256-AYfD/JY1//vPw1obZAmwqW3NYwSpqg1zjQqTpIk80Rw="; mypy-boto3-pinpoint-sms-voice-v2 = - buildMypyBoto3Package "pinpoint-sms-voice-v2" "1.35.26" - "sha256-NLr2dUrIW3bwuYg9XMMaBE97aWZqQr3onXBcME3EEbE="; + buildMypyBoto3Package "pinpoint-sms-voice-v2" "1.35.43" + "sha256-Wiue58JJyi8Td4H+byVkmjUEkuZdM4zeyJ4CAwk/+Z8="; mypy-boto3-pipes = - buildMypyBoto3Package "pipes" "1.35.16" - "sha256-Mur45GAzHsGamKaooUdGwuydMbfaQCSTVrRwwENbmFs="; + buildMypyBoto3Package "pipes" "1.35.43" + "sha256-ue5t9EUm1PKFCCwkAq2A1CRl3rWFuo5IhrG0SHddUWk="; mypy-boto3-polly = buildMypyBoto3Package "polly" "1.35.7" @@ -1074,8 +1074,8 @@ rec { "sha256-mtpp+ro3b7tOrN4TrWr8BjLzaPo264ty8Sng6wtciMs="; mypy-boto3-quicksight = - buildMypyBoto3Package "quicksight" "1.35.33" - "sha256-sqrWVvrPBS/Wq+m9QDhrvQ+8prlVmrq1VDrAl4Ro9dg="; + buildMypyBoto3Package "quicksight" "1.35.43" + "sha256-rcIdJWamEYS6M/aLO9oLe2vwyipzNra5cIrt1pFWn5Y="; mypy-boto3-ram = buildMypyBoto3Package "ram" "1.35.0" @@ -1086,16 +1086,16 @@ rec { "sha256-85yUjKQ8oiECUYHhmmYrDssyFSQb6itfIRY2iuwCZdo="; mypy-boto3-rds = - buildMypyBoto3Package "rds" "1.35.31" - "sha256-WX0o2LkYYNXMi6IOR8Cqm6faTwW5/Y2pir4+GOpBytI="; + buildMypyBoto3Package "rds" "1.35.43" + "sha256-TxyamNf02uzH31iZzcSZJbGe0g+oVtq1vo+QE4KO/so="; mypy-boto3-rds-data = buildMypyBoto3Package "rds-data" "1.35.28" "sha256-XPb/7sVSVFkDjPQ2x6w7tJmIBiS1YH10805lv/eGsyw="; mypy-boto3-redshift = - buildMypyBoto3Package "redshift" "1.35.0" - "sha256-8YX4mAvSCQgacJy+BLxuW6+gojDz0oT3wMtJG5P/WP0="; + buildMypyBoto3Package "redshift" "1.35.41" + "sha256-+BwE/phcHGdn8RLD46/gzTKH9g6+AMt5dF8WyRmMTUI="; mypy-boto3-redshift-data = buildMypyBoto3Package "redshift-data" "1.35.10" @@ -1110,8 +1110,8 @@ rec { "sha256-mG3TeywuB5+87Z3nhqjFwf0y2WO49oETPMz+oL0LbOA="; mypy-boto3-resiliencehub = - buildMypyBoto3Package "resiliencehub" "1.35.0" - "sha256-MKlBdSJGl7WCnD66fx5nCPhGAtLtLjoahe08KHTT+KM="; + buildMypyBoto3Package "resiliencehub" "1.35.41" + "sha256-zqBEwEnaCrmUl9xRlYOQHFSwZcXR1zj42Pd0Lik9SIQ="; mypy-boto3-resource-explorer-2 = buildMypyBoto3Package "resource-explorer-2" "1.35.25" @@ -1126,8 +1126,8 @@ rec { "sha256-3DVLn61w42L8qwyQB1WbOPjOZXqXalLZ9rITcmcDkQI="; mypy-boto3-robomaker = - buildMypyBoto3Package "robomaker" "1.35.0" - "sha256-Yl7v7zQHeixpG244Qld1vceR8ZazGjcUc26LUuane3I="; + buildMypyBoto3Package "robomaker" "1.35.39" + "sha256-kh/KojcYdBfGA7BRorshz34R/Lx8e/WTa0kWpW78PcY="; mypy-boto3-rolesanywhere = buildMypyBoto3Package "rolesanywhere" "1.35.0" @@ -1154,16 +1154,16 @@ rec { "sha256-pM5+b6he5Gp9DuD2Uz/x+SYmVzxhZIh/gJ626S9I19g="; mypy-boto3-route53resolver = - buildMypyBoto3Package "route53resolver" "1.35.0" - "sha256-F0ixOVQ8zmCrspV3+a5QmuJdvc5NOV8WiWdepiIeW9E="; + buildMypyBoto3Package "route53resolver" "1.35.38" + "sha256-MVADJUXYj6HvnJIZZJVfi/rMRCJFE1BZfcoQKvlg69Y="; mypy-boto3-rum = buildMypyBoto3Package "rum" "1.35.0" "sha256-RwPNNFntNChLqbr86wd1bwp6OqWvs3oj3V+4X71J3Hw="; mypy-boto3-s3 = - buildMypyBoto3Package "s3" "1.35.32" - "sha256-/O6xDqcJkaUWs00Rwf3g9/P+dQjfTkNv/gZtJ9BNsOQ="; + buildMypyBoto3Package "s3" "1.35.42" + "sha256-LQQMBdaKFh2RxLcpJhJwNNooremNSA3vapVpq3ZVzd0="; mypy-boto3-s3control = buildMypyBoto3Package "s3control" "1.35.12" @@ -1226,8 +1226,8 @@ rec { "sha256-RQXlvvSr0DNC2eXEVTQjx4TCR6A/v9qsRArIfg9Mq+w="; mypy-boto3-securitylake = - buildMypyBoto3Package "securitylake" "1.35.0" - "sha256-cI6Ei0p1LtQ+QuM4URYu+k2kJiUUjyEs8rbeX5c7Vvk="; + buildMypyBoto3Package "securitylake" "1.35.40" + "sha256-w0Usj5BpCAYbX6/0uNoIqH3EBd8fgru4RwQHuF2OEyQ="; mypy-boto3-serverlessrepo = buildMypyBoto3Package "serverlessrepo" "1.35.0" @@ -1254,8 +1254,8 @@ rec { "sha256-+TyI+ffXN0M9HVWA3iQfg3T/xF49wslYFx9MTxHCfYw="; mypy-boto3-sesv2 = - buildMypyBoto3Package "sesv2" "1.35.29" - "sha256-rGP+LaoeO6lOMr65C274Qx6EbfwqTau9Q/NgmxIppX0="; + buildMypyBoto3Package "sesv2" "1.35.41" + "sha256-DUotfO7GlrWHOU8LuhbmF4U2oywMW48JzYomlXYS8Tg="; mypy-boto3-shield = buildMypyBoto3Package "shield" "1.35.0" @@ -1370,8 +1370,8 @@ rec { "sha256-pRyowqpW9cqiZe0aCDvcJAqIaRkEhG8DFRxP89daIPo="; mypy-boto3-transfer = - buildMypyBoto3Package "transfer" "1.35.0" - "sha256-at9iKdpW8fCiOOX6smp8lDg8xWT9M6RdHJr7Qtpzrbo="; + buildMypyBoto3Package "transfer" "1.35.40" + "sha256-uJ15ZsA5oQgzjNTqX2Zhg+K29HBfyK40BVlG0GicyRA="; mypy-boto3-translate = buildMypyBoto3Package "translate" "1.35.0" @@ -1426,8 +1426,8 @@ rec { "sha256-Om/TFPBZh3xr0inpGzCpvTNij9DTPq8dV1ikX8g4YtE="; mypy-boto3-workspaces = - buildMypyBoto3Package "workspaces" "1.35.32" - "sha256-jLbVnqgOAU1meb5FFSBZM1xn8ueQkdK9sdJO1+9CUVA="; + buildMypyBoto3Package "workspaces" "1.35.43" + "sha256-l6Jfcb3+7RbUuXBsQvtYGqffbVobjFldwscGSIJR6Cs="; mypy-boto3-workspaces-web = buildMypyBoto3Package "workspaces-web" "1.35.23" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix index 782b0c88fe..465d789500 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "mypy"; - version = "1.10.1"; + version = "1.11.2"; pyproject = true; # mypy doesn't support python313 yet @@ -43,7 +43,7 @@ buildPythonPackage rec { owner = "python"; repo = "mypy"; rev = "refs/tags/v${version}"; - hash = "sha256-joV+elRaAICNQHkYuYtTDjvOUkHPsRkG1OLRvdxeIHc="; + hash = "sha256-5gfqIBtI/G5HARYdXHjYNYNRxeNgrk9dnpSgvMSu9bw="; }; passthru.updateScript = gitUpdater { rev-prefix = "v"; @@ -133,6 +133,7 @@ buildPythonPackage rec { meta = with lib; { description = "Optional static typing for Python"; homepage = "https://www.mypy-lang.org"; + changelog = "https://github.com/python/mypy/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; mainProgram = "mypy"; maintainers = with maintainers; [ lnl7 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/napari-npe2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/napari-npe2/default.nix index 1affda693c..e4f97dcd58 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/napari-npe2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/napari-npe2/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "napari-npe2"; - version = "0.7.2-unstable-2023-10-20"; + version = "0.7.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,19 +27,16 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "napari"; repo = "npe2"; - rev = "9d29e4d6dbbec75c2d36273647efd9ddfb59ded0"; - hash = "sha256-JLu/5pXijPdpKY2z2rREtSKPiP33Yy4viegbxUiQg7Y="; + rev = "refs/tags/v${version}"; + hash = "sha256-HjMf5J1n5NKqtunRQ7cqZiTZMTNmcq5j++O03Sxwvqw="; }; - # fix this in the next release - env.SETUPTOOLS_SCM_PRETEND_VERSION = "0.7.2"; - - nativeBuildInputs = [ + build-system = [ hatchling hatch-vcs ]; - propagatedBuildInputs = [ + dependencies = [ appdirs build magicgui @@ -59,9 +56,9 @@ buildPythonPackage rec { meta = with lib; { description = "Plugin system for napari (the image visualizer)"; - mainProgram = "npe2"; homepage = "https://github.com/napari/npe2"; license = licenses.bsd3; maintainers = with maintainers; [ SomeoneSerge ]; + mainProgram = "npe2"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/napari/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/napari/default.nix index 93252b0e91..8d3a0bf5b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/napari/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/napari/default.nix @@ -40,7 +40,7 @@ mkDerivationWith buildPythonPackage rec { pname = "napari"; - version = "0.4.19.post1"; + version = "0.5.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -49,11 +49,11 @@ mkDerivationWith buildPythonPackage rec { owner = "napari"; repo = "napari"; rev = "refs/tags/v${version}"; - hash = "sha256-qw5WdFPySNkmm+dNu+hqsmr+csBpHnSl9bMpb4nKEqI="; + hash = "sha256-wJifLRrHlDzPgBU7OOPqjdzYpr9M+Klc+yAc/IpyZN8="; }; postPatch = '' - substituteInPlace setup.cfg \ + substituteInPlace pyproject.toml \ --replace-fail "scikit-image[data]>=0.19.1" "scikit-image" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix index 07baf52739..b11d97f30e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "nbxmpp"; - version = "5.0.3"; + version = "5.0.4"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "gajim"; repo = "python-nbxmpp"; rev = "refs/tags/${version}"; - hash = "sha256-p7BRUf0YECI8xW3GVOCXHKtKs/4MFKUZR3k1XmTKMZI="; + hash = "sha256-5UFhR5WYxHJSRk2G5ik1IuNW1ra/IHoU/LNqiA95R94="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ncclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ncclient/default.nix index 11f3424083..3a8812b542 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ncclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ncclient/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "ncclient"; - version = "0.6.15"; + version = "0.6.16"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,14 +20,14 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mdFoSTUS4QhY05rY0fqKTpRQTR9oLvOMTVr4kWJbiUQ="; + hash = "sha256-IMCMlGt5/G4PRz525ZomsovU55vBnGhHndBtC7ym6lc="; }; propagatedBuildInputs = [ paramiko lxml six - ]; + ] ++ paramiko.optional-dependencies.ed25519; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/netbox-documents/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/netbox-documents/default.nix new file mode 100644 index 0000000000..099911166d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/netbox-documents/default.nix @@ -0,0 +1,43 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + drf-extra-fields, + python, + netbox, +}: + +buildPythonPackage rec { + pname = "netbox-documents"; + version = "0.7.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jasonyates"; + repo = "netbox-documents"; + rev = "v${version}"; + hash = "sha256-Uijdaicbx9A9fBgFx3zyhhFlokFdb9TSolnExbfkkc4="; + }; + + build-system = [ setuptools ]; + + dependencies = [ drf-extra-fields ]; + + nativeCheckInputs = [ netbox ]; + + preFixup = '' + export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH + ''; + + dontUsePythonImportsCheck = python.pythonVersion != netbox.python.pythonVersion; + pythonImportsCheck = [ "netbox_documents" ]; + + meta = { + description = "Plugin designed to faciliate the storage of site, circuit, device type and device specific documents within NetBox"; + homepage = "https://github.com/jasonyates/netbox-documents"; + changelog = "https://github.com/jasonyates/netbox-documents/releases/tag/${src.rev}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ felbinger ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nose/0001-nose-python-3.12-fixes.patch b/third_party/nixpkgs/pkgs/development/python-modules/nose/0001-nose-python-3.12-fixes.patch deleted file mode 100644 index 67a671a8ae..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/nose/0001-nose-python-3.12-fixes.patch +++ /dev/null @@ -1,576 +0,0 @@ -diff --git a/LICENSE.cpython b/LICENSE.cpython -new file mode 100644 -index 0000000..14603b9 ---- /dev/null -+++ b/LICENSE.cpython -@@ -0,0 +1,277 @@ -+A. HISTORY OF THE SOFTWARE -+========================== -+ -+Python was created in the early 1990s by Guido van Rossum at Stichting -+Mathematisch Centrum (CWI, see https://www.cwi.nl) in the Netherlands -+as a successor of a language called ABC. Guido remains Python's -+principal author, although it includes many contributions from others. -+ -+In 1995, Guido continued his work on Python at the Corporation for -+National Research Initiatives (CNRI, see https://www.cnri.reston.va.us) -+in Reston, Virginia where he released several versions of the -+software. -+ -+In May 2000, Guido and the Python core development team moved to -+BeOpen.com to form the BeOpen PythonLabs team. In October of the same -+year, the PythonLabs team moved to Digital Creations, which became -+Zope Corporation. In 2001, the Python Software Foundation (PSF, see -+https://www.python.org/psf/) was formed, a non-profit organization -+created specifically to own Python-related Intellectual Property. -+Zope Corporation was a sponsoring member of the PSF. -+ -+All Python releases are Open Source (see https://opensource.org for -+the Open Source Definition). Historically, most, but not all, Python -+releases have also been GPL-compatible; the table below summarizes -+the various releases. -+ -+ Release Derived Year Owner GPL- -+ from compatible? (1) -+ -+ 0.9.0 thru 1.2 1991-1995 CWI yes -+ 1.3 thru 1.5.2 1.2 1995-1999 CNRI yes -+ 1.6 1.5.2 2000 CNRI no -+ 2.0 1.6 2000 BeOpen.com no -+ 1.6.1 1.6 2001 CNRI yes (2) -+ 2.1 2.0+1.6.1 2001 PSF no -+ 2.0.1 2.0+1.6.1 2001 PSF yes -+ 2.1.1 2.1+2.0.1 2001 PSF yes -+ 2.1.2 2.1.1 2002 PSF yes -+ 2.1.3 2.1.2 2002 PSF yes -+ 2.2 and above 2.1.1 2001-now PSF yes -+ -+Footnotes: -+ -+(1) GPL-compatible doesn't mean that we're distributing Python under -+ the GPL. All Python licenses, unlike the GPL, let you distribute -+ a modified version without making your changes open source. The -+ GPL-compatible licenses make it possible to combine Python with -+ other software that is released under the GPL; the others don't. -+ -+(2) According to Richard Stallman, 1.6.1 is not GPL-compatible, -+ because its license has a choice of law clause. According to -+ CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1 -+ is "not incompatible" with the GPL. -+ -+Thanks to the many outside volunteers who have worked under Guido's -+direction to make these releases possible. -+ -+ -+B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON -+=============================================================== -+ -+Python software and documentation are licensed under the -+Python Software Foundation License Version 2. -+ -+Starting with Python 3.8.6, examples, recipes, and other code in -+the documentation are dual licensed under the PSF License Version 2 -+and the Zero-Clause BSD license. -+ -+Some software incorporated into Python is under different licenses. -+The licenses are listed with code falling under that license. -+ -+ -+PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 -+-------------------------------------------- -+ -+1. This LICENSE AGREEMENT is between the Python Software Foundation -+("PSF"), and the Individual or Organization ("Licensee") accessing and -+otherwise using this software ("Python") in source or binary form and -+its associated documentation. -+ -+2. Subject to the terms and conditions of this License Agreement, PSF hereby -+grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, -+analyze, test, perform and/or display publicly, prepare derivative works, -+distribute, and otherwise use Python alone or in any derivative version, -+provided, however, that PSF's License Agreement and PSF's notice of copyright, -+i.e., "Copyright (c) 2001-2024 Python Software Foundation; All Rights Reserved" -+are retained in Python alone or in any derivative version prepared by Licensee. -+ -+3. In the event Licensee prepares a derivative work that is based on -+or incorporates Python or any part thereof, and wants to make -+the derivative work available to others as provided herein, then -+Licensee hereby agrees to include in any such work a brief summary of -+the changes made to Python. -+ -+4. PSF is making Python available to Licensee on an "AS IS" -+basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR -+IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND -+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS -+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT -+INFRINGE ANY THIRD PARTY RIGHTS. -+ -+5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON -+FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS -+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, -+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. -+ -+6. This License Agreement will automatically terminate upon a material -+breach of its terms and conditions. -+ -+7. Nothing in this License Agreement shall be deemed to create any -+relationship of agency, partnership, or joint venture between PSF and -+Licensee. This License Agreement does not grant permission to use PSF -+trademarks or trade name in a trademark sense to endorse or promote -+products or services of Licensee, or any third party. -+ -+8. By copying, installing or otherwise using Python, Licensee -+agrees to be bound by the terms and conditions of this License -+Agreement. -+ -+ -+BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0 -+------------------------------------------- -+ -+BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1 -+ -+1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an -+office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the -+Individual or Organization ("Licensee") accessing and otherwise using -+this software in source or binary form and its associated -+documentation ("the Software"). -+ -+2. Subject to the terms and conditions of this BeOpen Python License -+Agreement, BeOpen hereby grants Licensee a non-exclusive, -+royalty-free, world-wide license to reproduce, analyze, test, perform -+and/or display publicly, prepare derivative works, distribute, and -+otherwise use the Software alone or in any derivative version, -+provided, however, that the BeOpen Python License is retained in the -+Software, alone or in any derivative version prepared by Licensee. -+ -+3. BeOpen is making the Software available to Licensee on an "AS IS" -+basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR -+IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND -+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS -+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT -+INFRINGE ANY THIRD PARTY RIGHTS. -+ -+4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE -+SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS -+AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY -+DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. -+ -+5. This License Agreement will automatically terminate upon a material -+breach of its terms and conditions. -+ -+6. This License Agreement shall be governed by and interpreted in all -+respects by the law of the State of California, excluding conflict of -+law provisions. Nothing in this License Agreement shall be deemed to -+create any relationship of agency, partnership, or joint venture -+between BeOpen and Licensee. This License Agreement does not grant -+permission to use BeOpen trademarks or trade names in a trademark -+sense to endorse or promote products or services of Licensee, or any -+third party. As an exception, the "BeOpen Python" logos available at -+http://www.pythonlabs.com/logos.html may be used according to the -+permissions granted on that web page. -+ -+7. By copying, installing or otherwise using the software, Licensee -+agrees to be bound by the terms and conditions of this License -+Agreement. -+ -+ -+CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1 -+--------------------------------------- -+ -+1. This LICENSE AGREEMENT is between the Corporation for National -+Research Initiatives, having an office at 1895 Preston White Drive, -+Reston, VA 20191 ("CNRI"), and the Individual or Organization -+("Licensee") accessing and otherwise using Python 1.6.1 software in -+source or binary form and its associated documentation. -+ -+2. Subject to the terms and conditions of this License Agreement, CNRI -+hereby grants Licensee a nonexclusive, royalty-free, world-wide -+license to reproduce, analyze, test, perform and/or display publicly, -+prepare derivative works, distribute, and otherwise use Python 1.6.1 -+alone or in any derivative version, provided, however, that CNRI's -+License Agreement and CNRI's notice of copyright, i.e., "Copyright (c) -+1995-2001 Corporation for National Research Initiatives; All Rights -+Reserved" are retained in Python 1.6.1 alone or in any derivative -+version prepared by Licensee. Alternately, in lieu of CNRI's License -+Agreement, Licensee may substitute the following text (omitting the -+quotes): "Python 1.6.1 is made available subject to the terms and -+conditions in CNRI's License Agreement. This Agreement together with -+Python 1.6.1 may be located on the internet using the following -+unique, persistent identifier (known as a handle): 1895.22/1013. This -+Agreement may also be obtained from a proxy server on the internet -+using the following URL: http://hdl.handle.net/1895.22/1013". -+ -+3. In the event Licensee prepares a derivative work that is based on -+or incorporates Python 1.6.1 or any part thereof, and wants to make -+the derivative work available to others as provided herein, then -+Licensee hereby agrees to include in any such work a brief summary of -+the changes made to Python 1.6.1. -+ -+4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS" -+basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR -+IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND -+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS -+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT -+INFRINGE ANY THIRD PARTY RIGHTS. -+ -+5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON -+1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS -+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1, -+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. -+ -+6. This License Agreement will automatically terminate upon a material -+breach of its terms and conditions. -+ -+7. This License Agreement shall be governed by the federal -+intellectual property law of the United States, including without -+limitation the federal copyright law, and, to the extent such -+U.S. federal law does not apply, by the law of the Commonwealth of -+Virginia, excluding Virginia's conflict of law provisions. -+Notwithstanding the foregoing, with regard to derivative works based -+on Python 1.6.1 that incorporate non-separable material that was -+previously distributed under the GNU General Public License (GPL), the -+law of the Commonwealth of Virginia shall govern this License -+Agreement only as to issues arising under or with respect to -+Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this -+License Agreement shall be deemed to create any relationship of -+agency, partnership, or joint venture between CNRI and Licensee. This -+License Agreement does not grant permission to use CNRI trademarks or -+trade name in a trademark sense to endorse or promote products or -+services of Licensee, or any third party. -+ -+8. By clicking on the "ACCEPT" button where indicated, or by copying, -+installing or otherwise using Python 1.6.1, Licensee agrees to be -+bound by the terms and conditions of this License Agreement. -+ -+ ACCEPT -+ -+ -+CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2 -+-------------------------------------------------- -+ -+Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, -+The Netherlands. All rights reserved. -+ -+Permission to use, copy, modify, and distribute this software and its -+documentation for any purpose and without fee is hereby granted, -+provided that the above copyright notice appear in all copies and that -+both that copyright notice and this permission notice appear in -+supporting documentation, and that the name of Stichting Mathematisch -+Centrum or CWI not be used in advertising or publicity pertaining to -+distribution of the software without specific, written prior -+permission. -+ -+STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO -+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND -+FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE -+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT -+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ -+ZERO-CLAUSE BSD LICENSE FOR CODE IN THE PYTHON DOCUMENTATION -+---------------------------------------------------------------------- -+ -+Permission to use, copy, modify, and/or distribute this software for any -+purpose with or without fee is hereby granted. -+ -+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH -+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, -+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR -+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -+PERFORMANCE OF THIS SOFTWARE. -diff --git a/nose/importer.py b/nose/importer.py -index e677658..77099eb 100644 ---- a/nose/importer.py -+++ b/nose/importer.py -@@ -7,9 +7,10 @@ the builtin importer. - import logging - import os - import sys -+import tokenize - from nose.config import Config -- --from imp import find_module, load_module, acquire_lock, release_lock -+from importlib import _imp -+from importlib import machinery - - log = logging.getLogger(__name__) - -@@ -20,6 +21,244 @@ except AttributeError: - return (os.path.normcase(os.path.realpath(src)) == - os.path.normcase(os.path.realpath(dst))) - -+################################################################################ -+# BEGIN IMPORTLIB SHIMS -+################################################################################ -+ -+# Adapted from the CPython 3.11 imp.py code. -+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Python Software Foundation; All Rights Reserved -+# Originally licensed under the PSLv2 (see LICENSE.cpython) and incorporated under the LGPL 2.1 (see lgpl.txt). -+ -+try: -+ from _imp import create_dynamic -+except ImportError: -+ # Platform doesn't support dynamic loading. -+ create_dynamic = None -+ -+from importlib._bootstrap import _ERR_MSG, _exec, _load, _builtin_from_name -+from importlib._bootstrap_external import SourcelessFileLoader -+ -+from importlib import machinery -+from importlib import util -+import importlib -+import os -+import sys -+import tokenize -+import types -+ -+ -+SEARCH_ERROR = 0 -+PY_SOURCE = 1 -+PY_COMPILED = 2 -+C_EXTENSION = 3 -+PY_RESOURCE = 4 -+PKG_DIRECTORY = 5 -+C_BUILTIN = 6 -+PY_FROZEN = 7 -+PY_CODERESOURCE = 8 -+IMP_HOOK = 9 -+ -+ -+def get_suffixes(): -+ extensions = [(s, 'rb', C_EXTENSION) for s in machinery.EXTENSION_SUFFIXES] -+ source = [(s, 'r', PY_SOURCE) for s in machinery.SOURCE_SUFFIXES] -+ bytecode = [(s, 'rb', PY_COMPILED) for s in machinery.BYTECODE_SUFFIXES] -+ -+ return extensions + source + bytecode -+ -+ -+class _HackedGetData: -+ -+ """Compatibility support for 'file' arguments of various load_*() -+ functions.""" -+ -+ def __init__(self, fullname, path, file=None): -+ super().__init__(fullname, path) -+ self.file = file -+ -+ def get_data(self, path): -+ """Gross hack to contort loader to deal w/ load_*()'s bad API.""" -+ if self.file and path == self.path: -+ # The contract of get_data() requires us to return bytes. Reopen the -+ # file in binary mode if needed. -+ if not self.file.closed: -+ file = self.file -+ if 'b' not in file.mode: -+ file.close() -+ if self.file.closed: -+ self.file = file = open(self.path, 'rb') -+ -+ with file: -+ return file.read() -+ else: -+ return super().get_data(path) -+ -+ -+class _LoadSourceCompatibility(_HackedGetData, machinery.SourceFileLoader): -+ -+ """Compatibility support for implementing load_source().""" -+ -+ -+def load_source(name, pathname, file=None): -+ loader = _LoadSourceCompatibility(name, pathname, file) -+ spec = util.spec_from_file_location(name, pathname, loader=loader) -+ if name in sys.modules: -+ module = _exec(spec, sys.modules[name]) -+ else: -+ module = _load(spec) -+ # To allow reloading to potentially work, use a non-hacked loader which -+ # won't rely on a now-closed file object. -+ module.__loader__ = machinery.SourceFileLoader(name, pathname) -+ module.__spec__.loader = module.__loader__ -+ return module -+ -+ -+class _LoadCompiledCompatibility(_HackedGetData, SourcelessFileLoader): -+ -+ """Compatibility support for implementing load_compiled().""" -+ -+ -+def load_compiled(name, pathname, file=None): -+ loader = _LoadCompiledCompatibility(name, pathname, file) -+ spec = util.spec_from_file_location(name, pathname, loader=loader) -+ if name in sys.modules: -+ module = _exec(spec, sys.modules[name]) -+ else: -+ module = _load(spec) -+ # To allow reloading to potentially work, use a non-hacked loader which -+ # won't rely on a now-closed file object. -+ module.__loader__ = SourcelessFileLoader(name, pathname) -+ module.__spec__.loader = module.__loader__ -+ return module -+ -+ -+def load_package(name, path): -+ if os.path.isdir(path): -+ extensions = (machinery.SOURCE_SUFFIXES[:] + -+ machinery.BYTECODE_SUFFIXES[:]) -+ for extension in extensions: -+ init_path = os.path.join(path, '__init__' + extension) -+ if os.path.exists(init_path): -+ path = init_path -+ break -+ else: -+ raise ValueError('{!r} is not a package'.format(path)) -+ spec = util.spec_from_file_location(name, path, -+ submodule_search_locations=[]) -+ if name in sys.modules: -+ return _exec(spec, sys.modules[name]) -+ else: -+ return _load(spec) -+ -+ -+def load_module(name, file, filename, details): -+ """ -+ -+ Load a module, given information returned by find_module(). -+ -+ The module name must include the full package name, if any. -+ -+ """ -+ suffix, mode, type_ = details -+ if mode and (not mode.startswith('r') or '+' in mode): -+ raise ValueError('invalid file open mode {!r}'.format(mode)) -+ elif file is None and type_ in {PY_SOURCE, PY_COMPILED}: -+ msg = 'file object required for import (type code {})'.format(type_) -+ raise ValueError(msg) -+ elif type_ == PY_SOURCE: -+ return load_source(name, filename, file) -+ elif type_ == PY_COMPILED: -+ return load_compiled(name, filename, file) -+ elif type_ == PKG_DIRECTORY: -+ return load_package(name, filename) -+ elif type_ == C_BUILTIN: -+ return init_builtin(name) -+ elif type_ == PY_FROZEN: -+ return _imp.init_frozen(name) -+ else: -+ msg = "Don't know how to import {} (type code {})".format(name, type_) -+ raise ImportError(msg, name=name) -+ -+ -+def find_module(name, path=None): -+ """ -+ -+ Search for a module. -+ -+ If path is omitted or None, search for a built-in, frozen or special -+ module and continue search in sys.path. The module name cannot -+ contain '.'; to search for a submodule of a package, pass the -+ submodule name and the package's __path__. -+ -+ """ -+ if not isinstance(name, str): -+ raise TypeError("'name' must be a str, not {}".format(type(name))) -+ elif not isinstance(path, (type(None), list)): -+ # Backwards-compatibility -+ raise RuntimeError("'path' must be None or a list, " -+ "not {}".format(type(path))) -+ -+ if path is None: -+ if _imp.is_builtin(name): -+ return None, None, ('', '', C_BUILTIN) -+ elif _imp.is_frozen(name): -+ return None, None, ('', '', PY_FROZEN) -+ else: -+ path = sys.path -+ -+ for entry in path: -+ package_directory = os.path.join(entry, name) -+ for suffix in ['.py', machinery.BYTECODE_SUFFIXES[0]]: -+ package_file_name = '__init__' + suffix -+ file_path = os.path.join(package_directory, package_file_name) -+ if os.path.isfile(file_path): -+ return None, package_directory, ('', '', PKG_DIRECTORY) -+ for suffix, mode, type_ in get_suffixes(): -+ file_name = name + suffix -+ file_path = os.path.join(entry, file_name) -+ if os.path.isfile(file_path): -+ break -+ else: -+ continue -+ break # Break out of outer loop when breaking out of inner loop. -+ else: -+ raise ImportError(_ERR_MSG.format(name), name=name) -+ -+ encoding = None -+ if 'b' not in mode: -+ with open(file_path, 'rb') as file: -+ encoding = tokenize.detect_encoding(file.readline)[0] -+ file = open(file_path, mode, encoding=encoding) -+ return file, file_path, (suffix, mode, type_) -+ -+ -+def reload(module): -+ """ -+ -+ Reload the module and return it. -+ -+ The module must have been successfully imported before. -+ -+ """ -+ return importlib.reload(module) -+ -+ -+def init_builtin(name): -+ """ -+ -+ Load and return a built-in module by name, or None is such module doesn't -+ exist -+ """ -+ try: -+ return _builtin_from_name(name) -+ except ImportError: -+ return None -+ -+ -+################################################################################ -+# END IMPORTLIB SHIMS -+################################################################################ -+ - - class Importer(object): - """An importer class that does only path-specific imports. That -@@ -73,7 +312,7 @@ class Importer(object): - else: - part_fqname = "%s.%s" % (part_fqname, part) - try: -- acquire_lock() -+ _imp.acquire_lock() - log.debug("find module part %s (%s) in %s", - part, part_fqname, path) - fh, filename, desc = find_module(part, path) -@@ -95,7 +334,7 @@ class Importer(object): - finally: - if fh: - fh.close() -- release_lock() -+ _imp.release_lock() - if parent: - setattr(parent, part, mod) - if hasattr(mod, '__path__'): -diff --git a/nose/result.py b/nose/result.py -index f974a14..228a42c 100644 ---- a/nose/result.py -+++ b/nose/result.py -@@ -13,7 +13,7 @@ try: - # 2.7+ - from unittest.runner import _TextTestResult - except ImportError: -- from unittest import _TextTestResult -+ from unittest import TextTestResult as _TextTestResult - from nose.config import Config - from nose.util import isclass, ln as _ln # backwards compat - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nose/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nose/default.nix deleted file mode 100644 index 308039cc61..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/nose/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - isPy3k, - isPyPy, - python, - python312, - coverage, - setuptools, -}: - -buildPythonPackage rec { - version = "1.3.7"; - pname = "nose"; - pyproject = true; - - src = fetchPypi { - inherit pname version; - sha256 = "f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98"; - }; - - build-system = [ setuptools ]; - - patches = lib.optional isPy3k [ ./0001-nose-python-3.12-fixes.patch ]; - - postPatch = '' - substituteInPlace setup.py \ - --replace "'use_2to3': True," "" - - substituteInPlace setup3lib.py \ - --replace "from setuptools.command.build_py import Mixin2to3" "from distutils.util import Mixin2to3" - ''; - - # 2to3 is removed from Python 3.13, so always use Python 3.12 2to3 for now. - preBuild = lib.optionalString isPy3k '' - ${python312.pythonOnBuildForHost}/bin/2to3 -wn nose functional_tests unit_tests - ''; - - propagatedBuildInputs = [ coverage ]; - - doCheck = false; # lot's of transient errors, too much hassle - checkPhase = - if isPy3k then - '' - ${python.pythonOnBuildForHost.interpreter} setup.py build_tests - '' - else - "" - + '' - rm functional_tests/test_multiprocessing/test_concurrent_shared.py* # see https://github.com/nose-devs/nose/commit/226bc671c73643887b36b8467b34ad485c2df062 - ${python.pythonOnBuildForHost.interpreter} selftest.py - ''; - - meta = with lib; { - broken = isPyPy; # missing 2to3 conversion utility - description = "Unittest-based testing framework for python that makes writing and running tests easier"; - mainProgram = "nosetests"; - homepage = "https://nose.readthedocs.io/"; - license = licenses.lgpl3; - maintainers = [ ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nose2pytest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nose2pytest/default.nix index a1aaa748db..72f554e8a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nose2pytest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nose2pytest/default.nix @@ -5,8 +5,7 @@ fetchpatch2, setuptools, fissix, - pytestCheckHook, - nose, + pytest, }: let @@ -37,16 +36,13 @@ buildPythonPackage { build-system = [ setuptools ]; - dependencies = [ fissix ]; - - nativeCheckInputs = [ - pytestCheckHook - nose + dependencies = [ + fissix + pytest ]; - preCheck = '' - export HOME=$(mktemp -d) - ''; + # Tests depend on nose! + doCheck = false; pythonImportsCheck = [ "nose2pytest.assert_tools" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nox/default.nix index 2f60f11991..2751d971c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nox/default.nix @@ -5,55 +5,64 @@ colorlog, fetchFromGitHub, hatchling, - importlib-metadata, jinja2, packaging, pytestCheckHook, pythonOlder, + tomli, tox, - typing-extensions, + uv, virtualenv, }: buildPythonPackage rec { pname = "nox"; - version = "2024.04.15"; - format = "pyproject"; + version = "2024.10.09"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "wntrblm"; - repo = pname; + repo = "nox"; rev = "refs/tags/${version}"; - hash = "sha256-PagZR2IdS1gS/ukl4b0Al9sdEsFnFwP8oy0eOGKJHMs="; + hash = "sha256-GdNz34A8IKwPG/270sY5t3SoggGCZMWfDq/Wyhk0ez8="; }; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; - propagatedBuildInputs = + dependencies = [ argcomplete colorlog packaging virtualenv ] - ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions - importlib-metadata + ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; - nativeCheckInputs = [ - jinja2 - tox - pytestCheckHook - ]; + optional-dependencies = { + tox_to_nox = [ + jinja2 + tox + ]; + uv = [ uv ]; + }; + + nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (builtins.attrValues optional-dependencies); + + preCheck = '' + export HOME=$(mktemp -d) + ''; pythonImportsCheck = [ "nox" ]; disabledTests = [ # our conda is not available on 3.11 "test__create_venv_options" + # Assertion errors + "test_uv" ]; disabledTestPaths = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix index 95604dcb20..08beac0daf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix @@ -40,10 +40,20 @@ buildPythonPackage rec { passthru.tests.tester-nvmlInit = cudaPackages.writeGpuTestPython { libraries = [ nvidia-ml-py ]; } '' - import pynvml - from pynvml.smi import nvidia_smi # noqa: F401 + from pynvml import ( + nvmlInit, + nvmlSystemGetDriverVersion, + nvmlDeviceGetCount, + nvmlDeviceGetHandleByIndex, + nvmlDeviceGetName, + ) - print(f"{pynvml.nvmlInit()=}") + nvmlInit() + print(f"Driver Version: {nvmlSystemGetDriverVersion()}") + + for i in range(nvmlDeviceGetCount()): + handle = nvmlDeviceGetHandleByIndex(i) + print(f"Device {i} : {nvmlDeviceGetName(handle)}") ''; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix index f8bdd75368..ce9d31be5a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix @@ -1,23 +1,30 @@ { lib, - stdenv, buildPythonPackage, - cmake, fetchFromGitHub, - gtest, - nbval, - numpy, - parameterized, - protobuf_21, + + # build-system + cmake, pybind11, - pytestCheckHook, - pythonOlder, - tabulate, - typing-extensions, + setuptools, + + # nativeBuildInputs + protobuf-core, + + # buildInputs abseil-cpp, - google-re2, - pillow, protobuf, + gtest, + + # dependencies + numpy, + + google-re2, + nbval, + parameterized, + pillow, + pytestCheckHook, + tabulate, }: let @@ -25,64 +32,58 @@ let in buildPythonPackage rec { pname = "onnx"; - version = "1.16.2"; - format = "setuptools"; - - disabled = pythonOlder "3.8"; + version = "1.17.0"; + pyproject = true; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "onnx"; + repo = "onnx"; rev = "refs/tags/v${version}"; - hash = "sha256-JmxnsHRrzj2QzPz3Yndw0MmgZJ8MDYxHjuQ7PQkQsDg="; + hash = "sha256-9oORW0YlQ6SphqfbjcYb0dTlHc+1gzy9quH/Lj6By8Q="; }; build-system = [ cmake - pybind11 + protobuf + setuptools + ]; + + nativeBuildInputs = [ + protobuf-core # `protoc` required ]; buildInputs = [ abseil-cpp - protobuf - google-re2 gtestStatic - pillow + pybind11 ]; dependencies = [ - protobuf_21 protobuf numpy - typing-extensions ]; nativeCheckInputs = [ + google-re2 nbval parameterized + pillow pytestCheckHook tabulate ]; postPatch = '' + rm -r third_party + chmod +x tools/protoc-gen-mypy.sh.in patchShebangs tools/protoc-gen-mypy.sh.in - - substituteInPlace setup.py \ - --replace 'setup_requires.append("pytest-runner")' "" - - # prevent from fetching & building own gtest - substituteInPlace CMakeLists.txt \ - --replace 'include(googletest)' "" - substituteInPlace cmake/unittest.cmake \ - --replace 'googletest)' ')' ''; preConfigure = '' # Set CMAKE_INSTALL_LIBDIR to lib explicitly, because otherwise it gets set # to lib64 and cmake incorrectly looks for the protobuf library in lib64 export CMAKE_ARGS="-DCMAKE_INSTALL_LIBDIR=lib -DONNX_USE_PROTOBUF_SHARED_LIBS=ON" - export CMAKE_ARGS+=" -Dgoogletest_STATIC_LIBRARIES=${gtestStatic}/lib/libgtest.a -Dgoogletest_INCLUDE_DIRS=${lib.getDev gtestStatic}/include" + export CMAKE_ARGS+=" -Dgoogletest_STATIC_LIBRARIES=${gtestStatic}/lib/libgtest.a" export ONNX_BUILD_TESTS=1 ''; @@ -107,37 +108,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "onnx/test" - "onnx/examples" - ]; - - disabledTests = - [ - # attempts to fetch data from web - "test_bvlc_alexnet_cpu" - "test_densenet121_cpu" - "test_inception_v1_cpu" - "test_inception_v2_cpu" - "test_resnet50_cpu" - "test_shufflenet_cpu" - "test_squeezenet_cpu" - "test_vgg19_cpu" - "test_zfnet512_cpu" - ] - ++ lib.optionals stdenv.hostPlatform.isAarch64 [ - # AssertionError: Output 0 of test 0 in folder - "test__pytorch_converted_Conv2d_depthwise_padded" - "test__pytorch_converted_Conv2d_dilated" - "test_dft" - "test_dft_axis" - # AssertionError: Mismatch in test 'test_Conv2d_depthwise_padded' - "test_xor_bcast4v4d" - # AssertionError: assert 1 == 0 - "test_ops_tested" - ]; - - disabledTestPaths = [ - # Unexpected output fields from running code: {'stderr'} - "onnx/examples/np_array_tensorproto.ipynb" + "examples" ]; __darwinAllowLocalNetworking = true; @@ -149,10 +120,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "onnx" ]; - meta = with lib; { + meta = { description = "Open Neural Network Exchange"; homepage = "https://onnx.ai"; - license = licenses.asl20; - maintainers = with maintainers; [ acairncross ]; + changelog = "https://github.com/onnx/onnx/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ acairncross ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/open-clip-torch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/open-clip-torch/default.nix index a315c3d0d0..d9c9002b89 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/open-clip-torch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/open-clip-torch/default.nix @@ -11,6 +11,7 @@ huggingface-hub, protobuf, regex, + safetensors, sentencepiece, timm, torch, @@ -28,14 +29,14 @@ }: buildPythonPackage rec { pname = "open-clip-torch"; - version = "2.26.1"; + version = "2.27.1"; pyproject = true; src = fetchFromGitHub { owner = "mlfoundations"; repo = "open_clip"; rev = "refs/tags/v${version}"; - hash = "sha256-XjPOsGet8VNzwEwzz14f1nF3XOgpkb4OERIc6VrDDZ8="; + hash = "sha256-1wOxnpNEipA0N6o4b5JCsrAtBnGP7x+MPXmVIjfDmLI="; }; build-system = [ pdm-backend ]; @@ -45,6 +46,7 @@ buildPythonPackage rec { huggingface-hub protobuf regex + safetensors sentencepiece timm torch diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openapi3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openapi3/default.nix index ed2b1d5904..1ddd3a9bbf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openapi3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openapi3/default.nix @@ -2,11 +2,16 @@ lib, buildPythonPackage, pythonOlder, - fetchPypi, + fetchFromGitHub, requests, pyyaml, setuptools, pytestCheckHook, + pytest-asyncio, + uvloop, + hypercorn, + starlette, + pydantic_1, }: buildPythonPackage rec { @@ -15,9 +20,11 @@ buildPythonPackage rec { pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-ohpJBXPYnKaa2ny+WFrbL8pJZCV/bzod9THxKBVFXSw="; + src = fetchFromGitHub { + owner = "Dorthu"; + repo = "openapi3"; + rev = version; + hash = "sha256-Crn+nRbptRycnWJzH8Tm/BBLcBSRCcNtLX8NoKnSDdA="; }; nativeBuildInputs = [ setuptools ]; @@ -27,7 +34,19 @@ buildPythonPackage rec { pyyaml ]; - nativeCheckinputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + pydantic_1 + uvloop + hypercorn + starlette + ]; + + disabledTestPaths = [ + # tests old fastapi behaviour + "tests/fastapi_test.py" + ]; pythonImportsCheck = [ "openapi3" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-botocore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-botocore/default.nix new file mode 100644 index 0000000000..caa6d327df --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-botocore/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + hatchling, + opentelemetry-api, + opentelemetry-instrumentation, + opentelemetry-semantic-conventions, + botocore, + moto, + opentelemetry-test-utils, + opentelemetry-propagator-aws-xray, + pytestCheckHook, + aws-xray-sdk, +}: + +buildPythonPackage rec { + inherit (opentelemetry-instrumentation) version src; + pname = "opentelemetry-instrumentation-botocore"; + pyproject = true; + + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-botocore"; + + build-system = [ hatchling ]; + + dependencies = [ + opentelemetry-api + opentelemetry-instrumentation + opentelemetry-propagator-aws-xray + opentelemetry-semantic-conventions + ]; + + nativeCheckInputs = [ + opentelemetry-test-utils + pytestCheckHook + ]; + + checkInputs = [ + aws-xray-sdk + moto + ]; + + optional-dependencies = { + instruments = [ botocore ]; + }; + + pythonImportsCheck = [ "opentelemetry.instrumentation.botocore" ]; + + meta = opentelemetry-instrumentation.meta // { + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-botocore"; + description = "Botocore instrumentation for OpenTelemetry"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-celery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-celery/default.nix new file mode 100644 index 0000000000..bb6c9e5716 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-celery/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + hatchling, + opentelemetry-api, + opentelemetry-instrumentation, + opentelemetry-semantic-conventions, + opentelemetry-test-utils, + billiard, + celery, + pytestCheckHook, +}: + +buildPythonPackage rec { + inherit (opentelemetry-instrumentation) version src; + pname = "opentelemetry-instrumentation-celery"; + pyproject = true; + + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-celery"; + + build-system = [ hatchling ]; + + dependencies = [ + billiard + celery + opentelemetry-api + opentelemetry-instrumentation + opentelemetry-semantic-conventions + ]; + + optional-dependencies = { + instruments = [ celery ]; + }; + + nativeCheckInputs = [ + opentelemetry-test-utils + pytestCheckHook + ]; + + pythonImportsCheck = [ "opentelemetry.instrumentation.celery" ]; + + meta = opentelemetry-instrumentation.meta // { + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-celery"; + description = "Celery instrumentation for OpenTelemetry"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-logging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-logging/default.nix new file mode 100644 index 0000000000..5d0e946bd1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-logging/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildPythonPackage, + hatchling, + opentelemetry-api, + opentelemetry-instrumentation, + opentelemetry-test-utils, + pytestCheckHook, +}: + +buildPythonPackage rec { + inherit (opentelemetry-instrumentation) version src; + pname = "opentelemetry-instrumentation-logging"; + pyproject = true; + + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-logging"; + + build-system = [ hatchling ]; + + dependencies = [ + opentelemetry-api + opentelemetry-instrumentation + ]; + + nativeCheckInputs = [ + opentelemetry-test-utils + pytestCheckHook + ]; + + pythonImportsCheck = [ "opentelemetry.instrumentation.logging" ]; + + meta = opentelemetry-instrumentation.meta // { + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-logging"; + description = "Logging instrumentation for OpenTelemetry"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-redis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-redis/default.nix new file mode 100644 index 0000000000..7c86cb4887 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-redis/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + opentelemetry-api, + opentelemetry-instrumentation, + opentelemetry-semantic-conventions, + wrapt, + redis, + opentelemetry-test-utils, + pythonOlder, + pytestCheckHook, + fakeredis, +}: + +buildPythonPackage rec { + inherit (opentelemetry-instrumentation) version src; + pname = "opentelemetry-instrumentation-redis"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-redis"; + + build-system = [ hatchling ]; + + dependencies = [ + opentelemetry-api + opentelemetry-instrumentation + opentelemetry-semantic-conventions + wrapt + ]; + + nativeCheckInputs = [ + fakeredis + opentelemetry-test-utils + pytestCheckHook + ]; + + optional-dependencies = { + instruments = [ redis ]; + }; + + pythonImportsCheck = [ "opentelemetry.instrumentation.redis" ]; + + meta = opentelemetry-instrumentation.meta // { + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-redis"; + description = "Redis instrumentation for OpenTelemetry"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-propagator-aws-xray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-propagator-aws-xray/default.nix new file mode 100644 index 0000000000..47d67c2b10 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-propagator-aws-xray/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + hatchling, + opentelemetry-api, + opentelemetry-instrumentation, + opentelemetry-semantic-conventions, + opentelemetry-instrumentation-botocore, + opentelemetry-test-utils, + pytestCheckHook, + requests, + pytest-benchmark, +}: + +buildPythonPackage rec { + inherit (opentelemetry-instrumentation) version src; + pname = "opentelemetry-propagator-aws-xray"; + pyproject = true; + + sourceRoot = "${opentelemetry-instrumentation.src.name}/propagator/opentelemetry-propagator-aws-xray"; + + build-system = [ hatchling ]; + + dependencies = [ opentelemetry-api ]; + + nativeCheckInputs = [ + opentelemetry-test-utils + pytestCheckHook + ]; + + checkInputs = [ + pytest-benchmark + requests + ]; + + pythonImportsCheck = [ "opentelemetry.propagators.aws" ]; + + meta = opentelemetry-instrumentation.meta // { + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/propagator/opentelemetry-propagator-aws-xray"; + description = "AWS X-Ray Propagator for OpenTelemetry"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opower/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opower/default.nix index 6f8ec1fb2a..265adff827 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opower/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opower/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "opower"; - version = "0.8.2"; + version = "0.8.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; rev = "refs/tags/v${version}"; - hash = "sha256-p1fvfAQVmizfsW+6F3gKkNQTYUF+A0cafh3PZZTpTRw="; + hash = "sha256-UwiEUHLeGK7WsQ8RPmHAjPVXgFf6N5upJIKMp54NSjs="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/optimum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/optimum/default.nix index d23fe4ab52..02485462a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/optimum/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/optimum/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "optimum"; - version = "1.22.0"; + version = "1.23.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "optimum"; rev = "refs/tags/v${version}"; - hash = "sha256-fVpSoa6s7puYO8BiA6aSAhSOTfiZJgaX5iwYkd9VdVo="; + hash = "sha256-1A430tvuUsMiVmDbISdj2g5l05D6FswGKsjdUBpZrP0="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paddleocr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paddleocr/default.nix index 8033d8c79e..fe2ad63e0e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/paddleocr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/paddleocr/default.nix @@ -14,7 +14,6 @@ openpyxl, pdf2docx, pillow, - premailer, pyclipper, pymupdf, python-docx, @@ -76,7 +75,6 @@ buildPythonPackage { openpyxl pdf2docx pillow - premailer pyclipper pymupdf python-docx diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paramiko/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paramiko/default.nix index 8903d65550..b72f2d9fa2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/paramiko/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/paramiko/default.nix @@ -12,17 +12,18 @@ pyasn1, pynacl, pytestCheckHook, + pytest-relaxed, six, }: buildPythonPackage rec { pname = "paramiko"; - version = "3.4.0"; + version = "3.5.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-qsCPJqMdxN/9koIVJ9FoLZnVL572hRloEUqHKPPCdNM="; + hash = "sha256-rRHlQNpPVc7dpSkx8aP4Eqgjinr39ipg3lOM2AuygSQ="; }; patches = [ @@ -32,19 +33,14 @@ buildPythonPackage rec { url = "https://github.com/paramiko/paramiko/commit/18e38b99f515056071fb27b9c1a4f472005c324a.patch"; hash = "sha256-bPDghPeLo3NiOg+JwD5CJRRLv2VEqmSx1rOF2Tf8ZDA="; }) - (fetchpatch { - name = "paramiko-pytest8-compat.patch"; - url = "https://github.com/paramiko/paramiko/commit/d71046151d9904df467ff72709585cde39cdd4ca.patch"; - hash = "sha256-4CTIZ9BmzRdh+HOwxSzfM9wkUGJOnndctK5swqqsIvU="; - }) ]; - propagatedBuildInputs = [ + dependencies = [ bcrypt cryptography pyasn1 six - ] ++ optional-dependencies.ed25519; # remove on 3.0 update + ]; optional-dependencies = { gssapi = [ @@ -62,29 +58,24 @@ buildPythonPackage rec { icecream mock pytestCheckHook + pytest-relaxed ] ++ lib.flatten (builtins.attrValues optional-dependencies); - disabledTestPaths = [ - # disable tests that require pytest-relaxed, which is broken - "tests/test_client.py" - "tests/test_ssh_gss.py" - ]; - pythonImportsCheck = [ "paramiko" ]; __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { homepage = "https://github.com/paramiko/paramiko/"; changelog = "https://github.com/paramiko/paramiko/blob/${version}/sites/www/changelog.rst"; description = "Native Python SSHv2 protocol library"; - license = licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; longDescription = '' Library for making SSH2 connections (client or server). Emphasis is on using SSH2 as an alternative to SSL for making secure connections between python scripts. All major ciphers and hash methods are supported. SFTP client and server mode are both supported too. ''; - maintainers = [ ]; + maintainers = lib.teams.helsinki-systems.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pbr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pbr/default.nix index 1c215cb307..bd45d03af8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pbr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pbr/default.nix @@ -1,22 +1,28 @@ { lib, buildPythonPackage, + callPackage, fetchPypi, setuptools, - callPackage, + six, }: buildPythonPackage rec { pname = "pbr"; - version = "6.0.0"; + version = "6.1.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-0TdxIqWgDi+UDuSCmZUY7+FtdF1COmcMJ3c9+8PJp9k="; + hash = "sha256-eIGD44Lj0ddwfbCJeCOZZei55OXtQmab9HWBhnNNXyQ="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; + + dependencies = [ + setuptools # for pkg_resources + six + ]; # check in passthru.tests.pytest to escape infinite recursion with fixtures doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pbr/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/pbr/tests.nix index 70e768814d..c464983fa3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pbr/tests.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pbr/tests.nix @@ -46,6 +46,9 @@ buildPythonPackage { pbr.tests.test_core.TestCore.test_console_script_install pbr.tests.test_wsgi.TestWsgiScripts.test_with_argument pbr.tests.test_wsgi.TestWsgiScripts.test_wsgi_script_run + # Tests are failing because of fixture timeouts + pbr.tests.test_packaging.TestPEP517Support.test_pep_517_support + pbr.tests.test_packaging.TestRequirementParsing.test_requirement_parsing ") ''; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdf2docx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdf2docx/default.nix index 12d347227a..3e30415a54 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdf2docx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdf2docx/default.nix @@ -2,9 +2,7 @@ stdenv, lib, fetchFromGitHub, - python, buildPythonPackage, - imagemagick, pip, pytestCheckHook, pymupdf, @@ -14,6 +12,7 @@ opencv4, tkinter, python-docx, + setuptools, }: let version = "0.5.8"; @@ -21,26 +20,25 @@ in buildPythonPackage { pname = "pdf2docx"; inherit version; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { - owner = "dothinking"; + owner = "ArtifexSoftware"; repo = "pdf2docx"; rev = "refs/tags/v${version}"; hash = "sha256-tMITDm2NkxWS+H/hhd2LlaPbyuI86ZKaALqqHJqb8V0="; }; - nativeBuildInputs = [ + build-system = [ pip - imagemagick + setuptools ]; pythonRemoveDeps = [ "opencv-python" ]; preBuild = "echo '${version}' > version.txt"; - propagatedBuildInputs = [ - tkinter + dependencies = [ pymupdf fire fonttools @@ -49,15 +47,6 @@ buildPythonPackage { python-docx ]; - postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' - # on linux the icon file can only be xbm format - convert $out/${python.sitePackages}/pdf2docx/gui/icon.ico \ - $out/${python.sitePackages}/pdf2docx/gui/icon.xbm - substituteInPlace $out/${python.sitePackages}/pdf2docx/gui/App.py \ - --replace 'icon.ico' 'icon.xbm' \ - --replace 'iconbitmap(icon_path)' "iconbitmap(f'@{icon_path}')" - ''; - nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ @@ -71,9 +60,9 @@ buildPythonPackage { meta = with lib; { description = "Convert PDF to DOCX"; mainProgram = "pdf2docx"; - homepage = "https://github.com/dothinking/pdf2docx"; - changelog = "https://github.com/dothinking/pdf2docx/releases/tag/v${version}"; - license = licenses.gpl3Only; + homepage = "https://github.com/ArtifexSoftware/pdf2docx"; + changelog = "https://github.com/ArtifexSoftware/pdf2docx/releases/tag/v${version}"; + license = licenses.agpl3Only; maintainers = with maintainers; [ happysalada ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdm-backend/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdm-backend/default.nix index 64ad22dd16..536b8a98a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdm-backend/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdm-backend/default.nix @@ -46,6 +46,7 @@ buildPythonPackage rec { # tests require a configured git identity export HOME=$TMPDIR + git config --global user.name nixbld git config --global user.email nixbld@localhost ''; 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 9f736b9ca2..dec5ef5832 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/photutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/photutils/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "photutils"; - version = "1.13.0"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -32,12 +32,12 @@ buildPythonPackage rec { owner = "astropy"; repo = "photutils"; rev = "refs/tags/${version}"; - hash = "sha256-J1i1H7AfQdiUIyBpgJK3dkH6C8MoEOwug4YQP+NEPbk="; + hash = "sha256-slrg1iByOhW1jiSG7nKHWj0ZSOP8v3LhCCr+DLLspKM="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "'numpy>=2.0.0rc1'," "" + --replace-fail "'numpy>=2.0.0'," "" ''; build-system = [ @@ -55,6 +55,7 @@ buildPythonPackage rec { dependencies = [ astropy numpy + scipy ]; optional-dependencies = { @@ -65,7 +66,6 @@ buildPythonPackage rec { rasterio scikit-image scikit-learn - scipy shapely tqdm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix index 2f3ace4dd7..da280313c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "9.1.1"; + version = "9.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,14 +33,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pikepdf"; repo = "pikepdf"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; # The content of .git_archival.txt is substituted upon tarball creation, # which creates indeterminism if master no longer points to the tag. # See https://github.com/jbarlow83/OCRmyPDF/issues/841 postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-++je4tKnXr504Yl9VBH9dc9fycDrMstRN5hu4s/oe9w="; + hash = "sha256-k50Wg/JvHgOULocUsYRjYH+q1M+5DTFLBZzHC6io+To="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/playwrightcapture/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/playwrightcapture/default.nix index e35e94376e..58afee646c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/playwrightcapture/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.26.0"; + version = "1.26.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; rev = "refs/tags/v${version}"; - hash = "sha256-v6n+zsiLEQHeAeSALDxu4FWwwQaD/zu3rwxIjR57Ly4="; + hash = "sha256-zVwsRTsxic0/K6HyTLVRYCnBpSIF9Ly0TRJS90nADTg="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix index 8bd265181a..ab177fa01b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, setuptools, @@ -13,26 +14,26 @@ xarray, pillow, scipy, - psutil, statsmodels, ipython, ipywidgets, which, - orca, nbformat, scikit-image, + orca, + psutil, }: buildPythonPackage rec { pname = "plotly"; - version = "5.24.0"; + version = "5.24.1"; pyproject = true; src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; rev = "refs/tags/v${version}"; - hash = "sha256-frSUybQxst4wG8g8U43Nay9dYCUXuR3dBealwPVyFdI="; + hash = "sha256-ONuX5/GlirPF8+7bZtib1Xsv5llcXcSelFfGyeTc5L8="; }; sourceRoot = "${src.name}/packages/python/plotly"; @@ -52,6 +53,15 @@ buildPythonPackage rec { kaleido ]; + # packages/python/plotly/optional-requirements.txt + optional-dependencies = { + orca = [ + orca + requests + psutil + ]; + }; + nativeCheckInputs = [ pytestCheckHook pandas @@ -60,63 +70,39 @@ buildPythonPackage rec { xarray pillow scipy - psutil statsmodels ipython ipywidgets which - orca nbformat scikit-image ]; disabledTests = [ - # FAILED plotly/matplotlylib/mplexporter/tests/test_basic.py::test_legend_dots - AssertionError: assert '3' == '2' + # failed pinning test, sensitive to dep versions "test_legend_dots" - # FAILED plotly/matplotlylib/mplexporter/tests/test_utils.py::test_linestyle - AssertionError: "test_linestyle" - # FAILED plotly/tests/test_io/test_to_from_plotly_json.py::test_sanitize_json[auto] - KeyError: 'template' - # FAILED plotly/tests/test_io/test_to_from_plotly_json.py::test_sanitize_json[json] - KeyError: 'template' + # test bug, i assume sensitive to dep versions "test_sanitize_json" - # FAILED plotly/tests/test_orca/test_orca_server.py::test_validate_orca - ValueError: - "test_validate_orca" - # FAILED plotly/tests/test_orca/test_orca_server.py::test_orca_executable_path - ValueError: - "test_orca_executable_path" - # FAILED plotly/tests/test_orca/test_orca_server.py::test_orca_version_number - ValueError: - "test_orca_version_number" - # FAILED plotly/tests/test_orca/test_orca_server.py::test_ensure_orca_ping_and_proc - ValueError: - "test_ensure_orca_ping_and_proc" - # FAILED plotly/tests/test_orca/test_orca_server.py::test_server_timeout_shutdown - ValueError: - "test_server_timeout_shutdown" - # FAILED plotly/tests/test_orca/test_orca_server.py::test_external_server_url - ValueError: - "test_external_server_url" - # FAILED plotly/tests/test_orca/test_to_image.py::test_simple_to_image[eps] - ValueError: - "test_simple_to_image" - # FAILED plotly/tests/test_orca/test_to_image.py::test_to_image_default[eps] - ValueError: - "test_to_image_default" - # FAILED plotly/tests/test_orca/test_to_image.py::test_write_image_string[eps] - ValueError: - "test_write_image_string" - # FAILED plotly/tests/test_orca/test_to_image.py::test_write_image_writeable[eps] - ValueError: - "test_write_image_writeable" - # FAILED plotly/tests/test_orca/test_to_image.py::test_write_image_string_format_inference[eps] - ValueError: - "test_write_image_string_format_inference" - # FAILED plotly/tests/test_orca/test_to_image.py::test_write_image_string_bad_extension_failure - assert 'must be specified as one of the followi... - "test_write_image_string_bad_extension_failure" - # FAILED plotly/tests/test_orca/test_to_image.py::test_write_image_string_bad_extension_override - ValueError: - "test_write_image_string_bad_extension_override" - # FAILED plotly/tests/test_orca/test_to_image.py::test_topojson_fig_to_image[eps] - ValueError: - "test_topojson_fig_to_image" - # FAILED plotly/tests/test_orca/test_to_image.py::test_latex_fig_to_image[eps] - ValueError: - "test_latex_fig_to_image" - # FAILED plotly/tests/test_orca/test_to_image.py::test_problematic_environment_variables[eps] - ValueError: - "test_problematic_environment_variables" - # FAILED plotly/tests/test_orca/test_to_image.py::test_invalid_figure_json - assert 'Invalid' in "\nThe orca executable is required in order to e... - "test_invalid_figure_json" - # FAILED test_init/test_dependencies_not_imported.py::test_dependencies_not_imported - AssertionError: assert 'plotly' not in {'IPython': + # requires vaex and polars, vaex is not packaged + "test_build_df_from_vaex_and_polars" + "test_build_df_with_hover_data_from_vaex_and_polars" + # lazy loading error, could it be the sandbox PYTHONPATH? + # AssertionError: assert "plotly" not in sys.modules "test_dependencies_not_imported" - # FAILED test_init/test_lazy_imports.py::test_lazy_imports - AssertionError: assert 'plotly' not in {'IPython': =6.9, <7" "sip >=6.8.6, <7" \ + --replace-fail 'PyQt-builder >=1.17, <2' "PyQt-builder >=1.16, <2" ''; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrisco/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrisco/default.nix index faec26a7fe..f8d85bc286 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyrisco/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrisco/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyrisco"; - version = "0.6.4"; + version = "0.6.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "OnFreund"; repo = "pyrisco"; rev = "refs/tags/v${version}"; - hash = "sha256-Xd6m7P/9ZB0tY6io59kCr8n4H8PXMO3nyMRmm8rpgJs="; + hash = "sha256-V+Wez9r/AoyNkR77yJTV3/9Kl0PHGw9kbQbzGauWEfc="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix index 4f94e2ce63..4860c6e0d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix @@ -41,6 +41,11 @@ buildPythonPackage rec { "pyroute2.protocols" ]; + postPatch = '' + patchShebangs util + make VERSION + ''; + meta = with lib; { description = "Python Netlink library"; homepage = "https://github.com/svinota/pyroute2"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysmi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysmi/default.nix index 69aac0ffc1..c1284b2c79 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysmi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysmi/default.nix @@ -13,7 +13,7 @@ }: buildPythonPackage rec { - version = "1.5.0"; + version = "1.5.4"; pname = "pysmi"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "lextudio"; repo = "pysmi"; rev = "refs/tags/v${version}"; - hash = "sha256-9yAsseMI50RhVeyFvuTo/pN9ftrvvUWYCacy2v3VVT8="; + hash = "sha256-QKxUV2QTaGkCQmWTS8GBeaXKsKTIsrDVZFwidTqLdh0="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysmlight/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysmlight/default.nix index 907fbad8fd..316908f546 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysmlight/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysmlight/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pysmlight"; - version = "0.1.2"; + version = "0.1.3"; pyproject = true; src = fetchFromGitHub { owner = "smlight-tech"; repo = "pysmlight"; rev = "refs/tags/v${version}"; - hash = "sha256-ouPUNKlTlF2t2K7RMG7oDSfeITjNPoGb5pNC7oUyGDI="; + hash = "sha256-U5/pKlnRt+OQeE/RQabTcnZLiLBIGqBinXdI7yc//30="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pystac-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pystac-client/default.nix index 841e0f91b4..e554cf1401 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pystac-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pystac-client/default.nix @@ -18,15 +18,15 @@ buildPythonPackage rec { pname = "pystac-client"; - version = "0.8.3"; + version = "0.8.4"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "stac-utils"; repo = "pystac-client"; - rev = "v${version}"; - hash = "sha256-tzfpvNtj+KkKjA75En+OwxYQWGzxHLACLkzWT2j/ThU="; + rev = "refs/tags/v${version}"; + hash = "sha256-EetS0MD5DLBR+ht9YfD+oRdfHbVONuVHdSZj3FQ5Sm8="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytensor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytensor/default.nix index 8d227fe110..21dd73ae25 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytensor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytensor/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "pytensor"; - version = "2.25.6"; + version = "2.25.5"; pyproject = true; src = fetchFromGitHub { owner = "pymc-devs"; repo = "pytensor"; rev = "refs/tags/rel-${version}"; - hash = "sha256-6emtX0tNqVqKyKXnwxvAwCyM3TRJ2MNClPNg0tVxBU8="; + hash = "sha256-tEIDuMAY+rMBqzHLnhbSqOoWzjIbZKCWWMx/uej2pOU="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-forked/setup-hook.sh b/third_party/nixpkgs/pkgs/development/python-modules/pytest-forked/setup-hook.sh index e613feadf8..0eff690e90 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-forked/setup-hook.sh +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-forked/setup-hook.sh @@ -16,10 +16,17 @@ pytestForkedHook() { # until we have dependency mechanism in generic builder, we need to use this ugly hack. if [ -z "${dontUsePytestForked-}" ] && [ -z "${dontUsePytestCheck-}" ]; then - if [[ " ${preDistPhases:-} " =~ " pytestCheckPhase " ]]; then - preDistPhases+=" " - preDistPhases="${preDistPhases/ pytestCheckPhase / pytestForkedHook pytestCheckPhase }" + if [[ " ${preDistPhases[*]:-} " =~ " pytestCheckPhase " ]]; then + _preDistPhases="${preDistPhases[*]} " + _preDistPhases="${_preDistPhases/ pytestCheckPhase / pytestForkedHook pytestCheckPhase }" + if [[ -n "${__structuredAttrs-}" ]]; then + preDistPhases=() + else + preDistPhases="" + fi + appendToVar preDistPhases $_preDistPhases + unset _preDistPhases else - preDistPhases+=" pytestForkedHook" + appendToVar preDistPhases pytestForkedHook fi fi diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/setup-hook.sh b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/setup-hook.sh index 4c6473cea6..9819e0d3ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/setup-hook.sh +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/setup-hook.sh @@ -8,10 +8,17 @@ pytestXdistHook() { # until we have dependency mechanism in generic builder, we need to use this ugly hack. if [ -z "${dontUsePytestXdist-}" ] && [ -z "${dontUsePytestCheck-}" ]; then - if [[ " ${preDistPhases:-} " =~ " pytestCheckPhase " ]]; then - preDistPhases+=" " - preDistPhases="${preDistPhases/ pytestCheckPhase / pytestXdistHook pytestCheckPhase }" + if [[ " ${preDistPhases[*]:-} " =~ " pytestCheckPhase " ]]; then + _preDistPhases="${preDistPhases[*]} " + _preDistPhases="${_preDistPhases/ pytestCheckPhase / pytestXdistHook pytestCheckPhase }" + if [[ -n "${__structuredAttrs-}" ]]; then + preDistPhases=() + else + preDistPhases="" + fi + appendToVar preDistPhases $_preDistPhases + unset _preDistPhases else - preDistPhases+=" pytestXdistHook" + appendToVar preDistPhases pytestXdistHook fi fi diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest/7.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest/7.nix index b00e988d2e..3abbffcf3d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest/7.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest/7.nix @@ -22,7 +22,6 @@ argcomplete, hypothesis, mock, - nose, pygments, requests, xmlschema, @@ -66,7 +65,6 @@ let attrs hypothesis mock - nose pygments requests setuptools @@ -87,7 +85,7 @@ let pytestcachePhase() { find $out -name .pytest_cache -type d -exec rm -rf {} + } - preDistPhases+=" pytestcachePhase" + appendToVar preDistPhases pytestcachePhase # pytest generates it's own bytecode files to improve assertion messages. # These files similar to cpython's bytecode files but are never laoded @@ -100,7 +98,7 @@ let # https://github.com/pytest-dev/pytest/blob/7.2.1/src/_pytest/assertion/rewrite.py#L51-L53 find $out -name "*-pytest-*.py[co]" -delete } - preDistPhases+=" pytestRemoveBytecodePhase" + appendToVar preDistPhases pytestRemoveBytecodePhase ''; pythonImportsCheck = [ "pytest" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest/default.nix index 4d1b33f2cb..ddfcf7c3d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest/default.nix @@ -84,7 +84,7 @@ buildPythonPackage rec { pytestcachePhase() { find $out -name .pytest_cache -type d -exec rm -rf {} + } - preDistPhases+=" pytestcachePhase" + appendToVar preDistPhases pytestcachePhase # pytest generates it's own bytecode files to improve assertion messages. # These files similar to cpython's bytecode files but are never laoded @@ -97,7 +97,7 @@ buildPythonPackage rec { # https://github.com/pytest-dev/pytest/blob/7.2.1/src/_pytest/assertion/rewrite.py#L51-L53 find $out -name "*-pytest-*.py[co]" -delete } - preDistPhases+=" pytestRemoveBytecodePhase" + appendToVar preDistPhases pytestRemoveBytecodePhase ''; pythonImportsCheck = [ "pytest" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bugzilla/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-bugzilla/default.nix similarity index 69% rename from third_party/nixpkgs/pkgs/development/python-modules/bugzilla/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/python-bugzilla/default.nix index 3125ed3062..1aa40b81c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bugzilla/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-bugzilla/default.nix @@ -2,27 +2,32 @@ lib, buildPythonPackage, fetchPypi, + setuptools, requests, + responses, pytestCheckHook, glibcLocalesUtf8, }: buildPythonPackage rec { - pname = "bugzilla"; - version = "3.2.0"; - format = "setuptools"; + pname = "python-bugzilla"; + version = "3.3.0"; + pyproject = true; src = fetchPypi { - pname = "python-${pname}"; + pname = "python_bugzilla"; inherit version; - sha256 = "TvyM+il4N8nk6rIg4ZcXZxW9Ye4zzsLBsPJ5DweGA4c="; + hash = "sha256-4YIgFx4DPrO6YAxNE5NZ0BqhrOwdrrxDCJEORQdj3kc="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; nativeCheckInputs = [ pytestCheckHook glibcLocalesUtf8 + responses ]; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-ipware/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-ipware/default.nix index 9e63a766bc..394f114b09 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-ipware/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-ipware/default.nix @@ -3,12 +3,13 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - unittestCheckHook, setuptools, + unittestCheckHook, }: + buildPythonPackage rec { pname = "python-ipware"; - version = "2.0.0"; + version = "3.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -16,16 +17,16 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "un33k"; repo = "python-ipware"; - rev = "v${version}"; - hash = "sha256-j43uAcb1dyKe/SHQLLR+QJS6hKGB5qxjb9NiJaUPj8Y="; + rev = "refs/tags/v${version}"; + hash = "sha256-S8/HbRztYGzrpLQRTHcvO7Zv3mNn/0+y5PNBYLpd++E="; }; - nativeBuildInputs = [ setuptools ]; - - pythonImportsCheck = [ "python_ipware" ]; + build-system = [ setuptools ]; nativeCheckInputs = [ unittestCheckHook ]; + pythonImportsCheck = [ "python_ipware" ]; + meta = with lib; { description = "Python package for server applications to retrieve client's IP address"; homepage = "https://github.com/un33k/python-ipware"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix index dd82fbca2c..729d98a9e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -2,46 +2,54 @@ lib, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, mock, - pytest-cov, - coverage, - future, + pytest-cov-stub, + pytestCheckHook, + pythonOlder, + setuptools, ujson, + versioneer, }: buildPythonPackage rec { pname = "python-jsonrpc-server"; version = "0.4.0"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "palantir"; repo = "python-jsonrpc-server"; - rev = version; - sha256 = "0pcf50qvcxqnz3db58whqd8z89cdph19pfs1whgfm0zmwbwk0lw6"; + rev = "refs/tags/${version}"; + hash = "sha256-hlMw+eL1g+oe5EG7mwK8jSX0UcOQo7La+BZ3tjEojl0="; }; postPatch = '' - sed -i "s/version=versioneer.get_version(),/version=\"$version\",/g" setup.py + # Remove vendorized versioneer.py + rm versioneer.py ''; - nativeCheckInputs = [ - pytestCheckHook - mock - pytest-cov - coverage + build-system = [ + setuptools + versioneer ]; - propagatedBuildInputs = [ - future - ujson + dependencies = [ ujson ]; + + nativeCheckInputs = [ + mock + pytest-cov-stub + pytestCheckHook ]; + pythonImportsCheck = [ "pyls_jsonrpc" ]; + meta = with lib; { + description = "Module for erver implementation of the JSON RPC 2.0 protocol"; homepage = "https://github.com/palantir/python-jsonrpc-server"; - description = "Python 2 and 3 asynchronous JSON RPC server"; + changelog = "https://github.com/palantir/python-jsonrpc-server/releases/tag/${version}"; license = licenses.mit; - maintainers = [ maintainers.mic92 ]; + maintainers = with maintainers; [ mic92 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix index 9561deec1b..51772d90f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "python-kasa"; - version = "0.7.4"; + version = "0.7.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "python-kasa"; repo = "python-kasa"; rev = "refs/tags/${version}"; - hash = "sha256-dzDbA/iJUfTQNKq2V1PlCYpIeg031Fm0JyZvHrDWqHI="; + hash = "sha256-bRhE9pC2SJwy4blkv27JsfFTLEDJPCeWUtnQvVb8Vfs="; }; build-system = [ hatchling ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-linkplay/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-linkplay/default.nix index 9b6509591e..7a0cc917a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-linkplay/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-linkplay/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "python-linkplay"; - version = "0.0.14"; + version = "0.0.15"; pyproject = true; src = fetchFromGitHub { owner = "Velleman"; repo = "python-linkplay"; rev = "refs/tags/v${version}"; - hash = "sha256-Sj22bbSJoD52WQBWzdFW36WFQcfvPadpd6mv84vN73U="; + hash = "sha256-PDkDZchAXxrmjg7G/dbbUyZUS8dNrOppH96mLLdwK1s="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-toolbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-toolbox/default.nix index 3a91ae3737..230ff86d7f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-toolbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-toolbox/default.nix @@ -3,22 +3,27 @@ buildPythonPackage, docutils, fetchFromGitHub, - isPy27, pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { - version = "1.0.10"; - pname = "python_toolbox"; - disabled = isPy27; + pname = "python-toolbox"; + version = "1.0.11"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "cool-RR"; - repo = pname; - rev = version; - sha256 = "1hpls1hwisdjx1g15cq052bdn9fvh43r120llws8bvgvj9ivnaha"; + repo = "python_toolbox"; + rev = "refs/tags/${version}"; + hash = "sha256-Y9RmVndgsBESrUCEORUwAdaFYBiunY3kWArhB9d7bw4="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ docutils pytestCheckHook @@ -30,9 +35,15 @@ buildPythonPackage rec { "test_python_toolbox/test_cute_profile/test_cute_profile.py" ]; + disabledTests = [ + # AssertionError + "test_repr" + ]; + meta = with lib; { description = "Tools for testing PySnooper"; homepage = "https://github.com/cool-RR/python_toolbox"; + changelog = "https://github.com/cool-RR/python_toolbox/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ seqizz ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pythran/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pythran/default.nix index e74a9d62b2..c1fce20001 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pythran/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pythran/default.nix @@ -25,14 +25,14 @@ let in buildPythonPackage rec { pname = "pythran"; - version = "0.15.0"; + version = "0.16.1"; pyproject = true; src = fetchFromGitHub { owner = "serge-sans-paille"; repo = "pythran"; rev = "refs/tags/${version}"; - hash = "sha256-TpD8YZnnv48PKYrUqR0/qvJG1XRbcMBcrkcERh6Q4q0="; + hash = "sha256-wiQmShniYZmB8hk/MC5FWFf1s5vqEHiYBkXTo4OeZ+E="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytouchlinesl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytouchlinesl/default.nix index 423d29f6ce..845b734fc5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytouchlinesl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytouchlinesl/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytouchlinesl"; - version = "0.1.7"; + version = "0.1.8"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "jnsgruk"; repo = "pytouchlinesl"; rev = "refs/tags/${version}"; - hash = "sha256-Xth1zC08SIL8j7t2n64I4cyLd6UQABoSeg57tYhnvtE="; + hash = "sha256-BSffzy/MKmpPdvk55Ff76i+p4/cY0OHjS/NOc9tEGwo="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytz/default.nix index d99da5d17d..2d69cfdb0c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytz/default.nix @@ -8,15 +8,15 @@ buildPythonPackage rec { pname = "pytz"; - version = "2024.1"; + version = "2024.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-KilzXqnBi68UtEiEa95aSAMO0mdXhHLYlVzQ50Q6mBI="; + hash = "sha256-KqNVCDxQoPk/pYFwnerAya1lzKip6b6sZgrcvUk8eYo="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; nativeCheckInputs = [ unittestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywebpush/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywebpush/default.nix index cc00679867..71ba2f75af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywebpush/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywebpush/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pywebpush"; - version = "2.0.0"; + version = "2.0.1"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-A8zD6XW2A3S3Y0xJVZVha+Ujvyx9oNl26E/amsjGMwE="; + hash = "sha256-cuNYauyJoGNzwFheb5fG/QuBUZ5B8yiWo2OZCez0XbA="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix index 6c4b807629..a0495c9b06 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix @@ -18,6 +18,7 @@ python, pythonOlder, tornado, + libsodium, zeromq, pytest-asyncio, }: @@ -44,7 +45,10 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - buildInputs = [ zeromq ]; + buildInputs = [ + libsodium + zeromq + ]; dependencies = lib.optionals isPyPy [ cffi ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qcodes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qcodes/default.nix index e10eb77d28..01ae838022 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qcodes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qcodes/default.nix @@ -6,7 +6,6 @@ # build-system setuptools, versioningit, - wheel, # dependencies broadbean, @@ -45,8 +44,6 @@ sphinx, sphinx-issues, towncrier, - opencensus, - opencensus-ext-azure, # checks deepdiff, @@ -62,20 +59,19 @@ buildPythonPackage rec { pname = "qcodes"; - version = "0.48.0"; + version = "0.49.0"; pyproject = true; src = fetchFromGitHub { owner = "microsoft"; repo = "Qcodes"; rev = "refs/tags/v${version}"; - hash = "sha256-Q1WyuK1mCbs75kGY1Aaw7S5EfFRjwqzZnhNyeSx7qc8="; + hash = "sha256-AlrQH0yKbEz+ICdvWWjMD7LQvWl36cFWlp+fegAmtL8="; }; build-system = [ setuptools versioningit - wheel ]; dependencies = [ @@ -125,10 +121,6 @@ buildPythonPackage rec { loop = [ # qcodes-loop ]; - opencensus = [ - opencensus - opencensus-ext-azure - ]; refactor = [ libcst ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix index 4e11201bef..3a99b5ac56 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + fetchpatch2, cmake, cython, ninja, @@ -31,6 +32,15 @@ buildPythonPackage rec { hash = "sha256-hLYidU09nCSOi42zgSh7dW83glxIjFY4C6BTmy/sf60="; }; + patches = [ + # https://github.com/rapidfuzz/RapidFuzz/pull/414 + (fetchpatch2 { + name = "support-taskflow-3.8.0.patch"; + url = "https://github.com/rapidfuzz/RapidFuzz/commit/8f0429bbd970ccc036018b87108845c384911ff7.patch"; + hash = "sha256-1wizdCkXYEMe5JWXUHCOCuDdS0z76FKimR47B3s2oVU="; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "Cython >=3.0.11, <3.1.0" "Cython" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/recipe-scrapers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/recipe-scrapers/default.nix index dc72a492a2..eba4cd32df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/recipe-scrapers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/recipe-scrapers/default.nix @@ -16,16 +16,16 @@ buildPythonPackage rec { pname = "recipe-scrapers"; - version = "15.1.0"; + version = "15.2.1"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "hhursev"; repo = "recipe-scrapers"; rev = "refs/tags/${version}"; - hash = "sha256-PCtvDd/1eAbo1aHUPMu0XHNHMwBTbjZmdSNrY2PmxQc="; + hash = "sha256-2rwy7tfTKaUmPJv59WMVGAOUP+vGWquJbF/3BbS3kkA="; }; nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/recurring-ical-events/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/recurring-ical-events/default.nix index 3be853d2fc..de3e2f377d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/recurring-ical-events/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/recurring-ical-events/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "recurring-ical-events"; - version = "3.3.0"; + version = "3.3.2"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "niccokunzmann"; repo = "python-recurring-ical-events"; rev = "v${version}"; - hash = "sha256-1Ggxi61epge6Rxc/vJ7OuuNjjeaQYReEPeOZV8DLghk="; + hash = "sha256-1cWjOaL+STrHMux/fc+FaRVQIOMcseznNRcghsV+DtM="; }; build-system = [ setuptools ]; @@ -47,12 +47,6 @@ buildPythonPackage rec { pygments ]; - disabledTests = lib.optionals (lib.versionOlder icalendar.version "6") [ - # ModuleNotFoundError: No module named 'icalendar.timezone' - "test_can_import_zoneinfo" - "test_documentation_file" - ]; - pythonImportsCheck = [ "recurring_ical_events" ]; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reflex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reflex/default.nix index 572a4417cc..a0b7767fd1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reflex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reflex/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { pname = "reflex"; - version = "0.6.1"; + version = "0.6.2.post1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -56,7 +56,7 @@ buildPythonPackage rec { owner = "reflex-dev"; repo = "reflex"; rev = "refs/tags/v${version}"; - hash = "sha256-p7o7e/OBX8P5QKsHNInKKQO1jklTr61SXuGk+ceakJU="; + hash = "sha256-JW1hebcoBMMEirJkJ5Cquh23p9Gv3RU5AxPbXUcwPK4="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix index d3ffb49779..bdbf3209d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix @@ -5,6 +5,7 @@ buildPythonPackage, fetchFromGitHub, orjson, + pycryptodomex, pythonOlder, setuptools, typing-extensions, @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.9.11"; + version = "0.10.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-xIN6ioX02YgzY3sh3l7rFT6UQCMnzlrX/CJj483G6ig="; + hash = "sha256-SuNY+H21rjO+iotDJymLI7JccQRoMnLX/YL05wQqlmc="; }; build-system = [ setuptools ]; @@ -30,6 +31,7 @@ buildPythonPackage rec { aiohttp aiortsp orjson + pycryptodomex typing-extensions ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/replicate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/replicate/default.nix index c6aacef32d..f2b6f3d00b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/replicate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/replicate/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "replicate"; - version = "0.34.1"; + version = "1.0.1"; pyproject = true; src = fetchFromGitHub { owner = "replicate"; repo = "replicate-python"; - rev = version; - hash = "sha256-DhmuGh0OASd4rBvizf1qx537j4RGs4eVe0jH1BrhZa4="; + rev = "refs/tags/${version}"; + hash = "sha256-q//RV4Y9k2KXXgZGfBF/XObxsBfAHE50oG+r/Vvu9BY="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/restrictedpython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/restrictedpython/default.nix index 2d85f85eb8..0089f23077 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/restrictedpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/restrictedpython/default.nix @@ -11,15 +11,14 @@ buildPythonPackage rec { pname = "restrictedpython"; - version = "7.3"; + version = "7.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - pname = "RestrictedPython"; - inherit version; - hash = "sha256-iIgwTHhY/c/YbFC1hWF5c3W6QDGdK2/7XSSwi2otzWE="; + inherit pname version; + hash = "sha256-gbYpJHE9vSgJF/zq7K8hD+96Sd3fGgjIwhSjYT++tCU="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rns/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rns/default.nix index 05c294115c..684c06255d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rns/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rns/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.8.2"; + version = "0.8.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-H3n3TywMkyefX5X6QhjX73dy9xCnLRjJh0cmx8HSdVU="; + hash = "sha256-uonOifCGvSKJhxTAqD49BOHDdN69pRexcb2ny1GwqjA="; }; patches = [ @@ -49,6 +49,9 @@ buildPythonPackage rec { homepage = "https://github.com/markqvist/Reticulum"; changelog = "https://github.com/markqvist/Reticulum/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ fab ]; + maintainers = with maintainers; [ + fab + qbit + ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker-mlflow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker-mlflow/default.nix new file mode 100644 index 0000000000..152ef3b78e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker-mlflow/default.nix @@ -0,0 +1,74 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + boto3, + mlflow, + + # tests + pytestCheckHook, + scikit-learn, +}: + +buildPythonPackage rec { + pname = "sagemaker-mlflow"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "aws"; + repo = "sagemaker-mlflow"; + rev = "refs/tags/v${version}"; + hash = "sha256-1bonIqZ+cFxCOxoFWn1MLBOIiB1wUX69/lUTPPupJaw="; + }; + + postPatch = '' + substituteInPlace VERSION \ + --replace-fail "${version}.dev0" "${version}" + ''; + + build-system = [ + setuptools + ]; + + dependencies = [ + boto3 + mlflow + ]; + + pythonImportsCheck = [ + "sagemaker_mlflow" + ]; + + nativeCheckInputs = [ + pytestCheckHook + scikit-learn + ]; + + disabledTests = [ + # AssertionError: assert 's3' in '/build/source/not implemented/0/d3c16d2bad4245bf9fc68f86d2e7599d/artifacts' + "test_log_metric" + + # AssertionError: assert 'not implemented' == 'mw' + "test_request_header" + + # Require internet access + "test_auth_provider_returns_correct_sigv4" + "test_log_artifact" + "test_presigned_url" + "test_presigned_url_with_fields" + ]; + + meta = { + description = "MLFlow plugin for SageMaker"; + homepage = "https://github.com/aws/sagemaker-mlflow"; + changelog = "https://github.com/aws/sagemaker-mlflow/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix index 7c3b26cbb2..582ddd93f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, # build-system hatchling, @@ -25,6 +24,7 @@ pyyaml, requests, sagemaker-core, + sagemaker-mlflow, schema, smdebug-rulesconfig, tblib, @@ -38,29 +38,16 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.232.1"; + version = "2.232.2"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "sagemaker-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-I+iZKx1CnZIGYgYuYhhs8BnY84KPyKOGw8M0He26DGU="; + hash = "sha256-q0JxQi1kUnp5L/hexxpGhR4t0v53l8iVuc9H6N0K6Y4="; }; - patches = [ - # Distutils removal, fix build with python 3.12 - # https://github.com/aws/sagemaker-python-sdk/pull/4544 - (fetchpatch { - url = "https://github.com/aws/sagemaker-python-sdk/commit/84447ba59e544c810aeb842fd058e20d89e3fc74.patch"; - hash = "sha256-B8Q18ViB7xYy1F5LoL1NvXj2lnFPgt+C9wssSODyAXM="; - }) - (fetchpatch { - url = "https://github.com/aws/sagemaker-python-sdk/commit/e9e08a30cb42d4b2d7299c1c4b42d680a8c78110.patch"; - hash = "sha256-uGPtXSXfeaIvt9kkZZKQDuiZfoRgw3teffuxai1kKlY="; - }) - ]; - build-system = [ hatchling ]; @@ -69,6 +56,7 @@ buildPythonPackage rec { "boto3" "cloudpickle" "importlib-metadata" + "protobuf" ]; dependencies = [ @@ -89,6 +77,7 @@ buildPythonPackage rec { pyyaml requests sagemaker-core + sagemaker-mlflow schema smdebug-rulesconfig tblib diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scales/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scales/default.nix index ff9ab853e5..e258bdf045 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scales/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scales/default.nix @@ -2,29 +2,48 @@ lib, buildPythonPackage, fetchPypi, - nose, + pytestCheckHook, + fetchpatch2, six, + setuptools, }: buildPythonPackage rec { pname = "scales"; version = "1.0.9"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "8b6930f7d4bf115192290b44c757af5e254e3fcfcb75ff9a51f5c96a404e2753"; + hash = "sha256-i2kw99S/EVGSKQtEx1evXiVOP8/Ldf+aUfXJakBOJ1M="; }; - nativeCheckInputs = [ nose ]; - propagatedBuildInputs = [ six ]; + patches = [ + # Use html module in Python 3 and cgi module in Python 2 + # https://github.com/Cue/scales/pull/47 + (fetchpatch2 { + url = "https://github.com/Cue/scales/commit/ee69d45f1a7f928f7b241702e9be06007444115e.patch?full_index=1"; + hash = "sha256-xBlgkh1mf+3J7GtNI0zGb7Sum8UYbTpUmM12sxK/fSU="; + }) + ]; - # No tests included - doCheck = false; + postPatch = '' + for file in scales_test formats_test aggregation_test; do + substituteInPlace src/greplin/scales/$file.py \ + --replace-fail "assertEquals" "assertEqual" + done; + ''; - meta = with lib; { + build-system = [ setuptools ]; + + dependencies = [ six ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { description = "Stats for Python processes"; homepage = "https://www.github.com/Cue/scales"; - license = licenses.asl20; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ pyrox0 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-posthocs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-posthocs/default.nix index 7072fb0323..2a25488c15 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-posthocs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-posthocs/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "scikit-posthocs"; - version = "0.9.0"; + version = "0.9.1"; pyproject = true; src = fetchFromGitHub { owner = "maximtrp"; repo = "scikit-posthocs"; rev = "refs/tags/v${version}"; - hash = "sha256-sRop5DKakrZEBswzTvumn68wKqU15zM5aCLfZ/PdsFg="; + hash = "sha256-ssaTd+A7lzd4tlKHGkgKixi3XjZLQBcPs6UOEzX/hrk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/selenium/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/selenium/default.nix index ab3b46b438..72c9d14e91 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/selenium/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/selenium/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "selenium"; - version = "4.22.0"; + version = "4.24.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,9 +29,11 @@ buildPythonPackage rec { repo = "selenium"; # check if there is a newer tag with or without -python suffix rev = "refs/tags/selenium-${version}"; - hash = "sha256-qBuZgI5SSBwxbSBrAT0W/HzzV2JmPL00hPJ6s57QTeg="; + hash = "sha256-AsQr9kGv2dxkiFzptDA0D27OXZjYj7oDKz2oEQ2qW7s="; }; + patches = [ ./dont-build-the-selenium-manager.patch ]; + preConfigure = '' cd py ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/selenium/dont-build-the-selenium-manager.patch b/third_party/nixpkgs/pkgs/development/python-modules/selenium/dont-build-the-selenium-manager.patch new file mode 100644 index 0000000000..51db7aaf0e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/selenium/dont-build-the-selenium-manager.patch @@ -0,0 +1,37 @@ +From e52d75248a5d18bcf965591eb240a11a23147634 Mon Sep 17 00:00:00 2001 +From: Pavel Sobolev +Date: Sat, 3 Aug 2024 22:38:49 +0300 +Subject: [PATCH] Don't build the Selenium Manager. + +--- + py/setup.py | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/py/setup.py b/py/setup.py +index a71007f..fdda74e 100755 +--- a/py/setup.py ++++ b/py/setup.py +@@ -19,7 +19,6 @@ from distutils.command.install import INSTALL_SCHEMES + from os.path import dirname, join, abspath + from setuptools import setup + from setuptools.command.install import install +-from setuptools_rust import Binding, RustExtension + + + for scheme in INSTALL_SCHEMES.values(): +@@ -84,12 +83,6 @@ setup_args = { + "typing_extensions~=4.9", + "websocket-client~=1.8", + ], +- 'rust_extensions': [ +- RustExtension( +- {"selenium-manager": "selenium.webdriver.common.selenium-manager"}, +- binding=Binding.Exec +- ) +- ], + 'zip_safe': False + } + +-- +2.45.2 + 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 b3f99bf3ee..54e7d1c2b3 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,16 +16,16 @@ buildPythonPackage rec { pname = "sense-energy"; - version = "0.12.4"; + version = "0.13.2"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "scottbonline"; repo = "sense"; rev = "refs/tags/${version}"; - hash = "sha256-jHYXqlRV1JR95GtO9E6oYj69Jj8TsvLANcI1kl7/Gl4="; + hash = "sha256-HE0bMcxfzfaMLDepjwDwV8AXQ3Q/bQt6SqHt7m/UY9I="; }; postPatch = '' @@ -33,9 +33,9 @@ buildPythonPackage rec { --replace-fail "{{VERSION_PLACEHOLDER}}" "${version}" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp async-timeout kasa-crypt diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sentence-transformers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sentence-transformers/default.nix index b9cf305a8d..c70ea216cd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sentence-transformers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sentence-transformers/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "sentence-transformers"; - version = "3.1.1"; + version = "3.2.0"; pyproject = true; src = fetchFromGitHub { owner = "UKPLab"; repo = "sentence-transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-YtAgv0vH2aL7UX3ETVfwDEQYEWYo5Pj/R45CeH7T3BU="; + hash = "sha256-T9y+usEOqz53Wv5gObD5o3gAlABHM3apoq/ySD5ynVg="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shiboken6/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shiboken6/default.nix index 2c491e193d..f49739d57c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shiboken6/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shiboken6/default.nix @@ -13,12 +13,13 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "shiboken6"; - version = "6.7.2"; + version = "6.8"; src = fetchurl { # https://download.qt.io/official_releases/QtForPython/shiboken6/ - url = "mirror://qt/official_releases/QtForPython/shiboken6/PySide6-${finalAttrs.version}-src/pyside-setup-everywhere-src-${finalAttrs.version}.tar.xz"; - hash = "sha256-OisNDW54yapd3H8GyktvEaP+FFYLrrFI7qU7XZjjaMc="; + # FIXME: inconsistent version numbers in directory name and tarball? + url = "mirror://qt/official_releases/QtForPython/shiboken6/PySide6-${finalAttrs.version}.0-src/pyside-setup-everywhere-src-${finalAttrs.version}.tar.xz"; + hash = "sha256-XAWtOufnJ51tudyUpG6woF/Qk1NzCfdDnDhnG9clUZA="; }; sourceRoot = "pyside-setup-everywhere-src-${finalAttrs.version}/sources/shiboken6"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shippinglabel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shippinglabel/default.nix index c523714e4f..c0ae4fa635 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shippinglabel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shippinglabel/default.nix @@ -11,12 +11,12 @@ }: buildPythonPackage rec { pname = "shippinglabel"; - version = "2.0.0"; + version = "2.1.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-hZYsK+IX/a4bZMtD+hMEYDnwgqhdkkEHkG0MPkAgy20="; + hash = "sha256-XwE/b7TQ7i+2hMSdZJhyVjl2lieweZLbA6PXcSJTnFE="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shiv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shiv/default.nix index 804c33c3e7..346874edfa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shiv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shiv/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "shiv"; - version = "1.0.6"; + version = "1.0.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-4iJ2gTWXe+vftcDRp9/qKVV8VmtY0wDVuMJTXvIj13Y="; + hash = "sha256-lHdX/iY4OuntoMV288uiRN+jcV7S9Jk1RLdYJF9xqxU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sip/default.nix index 8a398654b0..8fd6240e4a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sip/default.nix @@ -4,6 +4,7 @@ fetchPypi, pythonOlder, setuptools, + setuptools-scm, packaging, tomli, @@ -15,17 +16,20 @@ buildPythonPackage rec { pname = "sip"; - version = "6.8.3"; + version = "6.8.6"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-iIVHsBi7JMNq3tUZ6T0+UT1MaqC6VbfMGv+9Rc8Qdiw="; + hash = "sha256-f8lZ5I5uxdWvi9Am9p9eJNCLPLirs0IXb1q4AwzAfXo="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ + dependencies = [ packaging setuptools ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix index 57551e9e67..5baa8bb740 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix @@ -3,7 +3,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, appdirs, dungeon-eos, explorerscript, @@ -29,7 +28,7 @@ buildPythonPackage rec { pname = "skytemple-files"; - version = "1.7.0"; + version = "1.8.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -38,19 +37,11 @@ buildPythonPackage rec { owner = "SkyTemple"; repo = "skytemple-files"; rev = version; - hash = "sha256-G2AAQ+eRnsMTWrAF0SNmxUmOoHTSMCuSy1kUZbFy8y0="; + hash = "sha256-4ENuYq074j/VdzLyrGVCGaZhoStwlgJWTqGbrt20A3Q="; # Most patches are in submodules fetchSubmodules = true; }; - patches = [ - (fetchpatch2 { - name = "fix-tests.patch"; - url = "https://github.com/SkyTemple/skytemple-files/commit/854e5514e6c63ba082618d14643e3a4b30a6c2b2.patch"; - hash = "sha256-oTV2EQQ2OPgu2pYB2fLd4jODfybnV29YNLxzDs2v6Cg="; - }) - ]; - postPatch = '' substituteInPlace skytemple_files/patch/arm_patcher.py skytemple_files/data/data_cd/armips_importer.py \ --replace-fail "exec_name = os.getenv(\"SKYTEMPLE_ARMIPS_EXEC\", f\"{prefix}armips\")" "exec_name = \"${armips}/bin/armips\"" @@ -86,10 +77,13 @@ buildPythonPackage rec { parameterized xmldiff ] ++ optional-dependencies.spritecollab; - pytestFlagsArray = [ "test/" ]; + + preCheck = "pushd test"; + postCheck = "popd"; + disabledTestPaths = [ - "test/skytemple_files_test/common/spritecollab/sc_online_test.py" - "test/skytemple_files_test/compression_container/atupx/atupx_test.py" # Particularly long test + "skytemple_files_test/common/spritecollab/sc_online_test.py" + "skytemple_files_test/compression_container/atupx/atupx_test.py" # Particularly long test ]; pythonImportsCheck = [ "skytemple_files" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-rust/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-rust/default.nix index 83873d2e0a..8b29df6930 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-rust/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-rust/default.nix @@ -3,7 +3,7 @@ stdenv, buildPythonPackage, cargo, - fetchPypi, + fetchFromGitHub, libiconv, Foundation, rustPlatform, @@ -14,18 +14,20 @@ buildPythonPackage rec { pname = "skytemple-rust"; - version = "1.6.5"; + version = "1.8.2"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-bf+umrb5EIoCD2kheVpf9IwsW4Sf2hR7XOEzscYtLA8="; + src = fetchFromGitHub { + owner = "SkyTemple"; + repo = "skytemple-rust"; + rev = version; + hash = "sha256-0hIwFJn/cwtKHKoD+upeorC52YnDlej3TrWf3PmAQAQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-0a57RmZPztcIeRs7GNYe18JO+LlWoeNWG3nD9cG0XIU="; + hash = "sha256-Gdypi9DJAXQgNaRCLEt4LTqUhBJC8plH0YhgNOIOGvA="; }; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix index e50bc2ae59..64bd47671d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "skytemple-ssb-debugger"; - version = "1.7.0"; + version = "1.8.2"; pyproject = true; src = fetchFromGitHub { owner = "SkyTemple"; repo = "skytemple-ssb-debugger"; rev = version; - hash = "sha256-S38Nw7FntacEdwdGu2d/zUKOsGostVy9+U2KPxlvI5Q="; + hash = "sha256-HmJOjHX2/P284DSIdKuSz3++Qr1fKVGRQmA/+cMrcYw="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-ssb-emulator/Cargo.lock b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-ssb-emulator/Cargo.lock index 2960a44145..f1e4602896 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-ssb-emulator/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-ssb-emulator/Cargo.lock @@ -4,36 +4,30 @@ version = 3 [[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 = "arc-swap" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b3d0060af21e8d11a926981cc00c6c1541aa91dd64b9f881985c3da1094425f" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[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 = "1.3.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitvec" @@ -61,15 +55,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" [[package]] name = "cc" -version = "1.0.90" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f" [[package]] name = "cfg-if" @@ -79,18 +73,18 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[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", ] [[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 = "desmume-rs" @@ -116,9 +110,9 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encoding" @@ -186,9 +180,9 @@ checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" [[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", @@ -196,9 +190,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 = "funty" @@ -234,48 +228,48 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[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 = "indoc" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "itertools" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "locale_config" @@ -290,21 +284,11 @@ dependencies = [ "winapi", ] -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "malloc_buf" @@ -317,15 +301,15 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -338,14 +322,14 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.71", ] [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -407,34 +391,11 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.48.5", -] - [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pkg-config" @@ -444,30 +405,30 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.20.3" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" +checksum = "831e8e819a138c36e212f3af3fd9eeffed6bf1510a805af35b0edee5ffa59433" dependencies = [ "cfg-if", "indoc", "libc", "memoffset", - "parking_lot", + "once_cell", "portable-atomic", "pyo3-build-config", "pyo3-ffi", @@ -477,9 +438,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.20.3" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" +checksum = "1e8730e591b14492a8945cdff32f089250b05f5accecf74aeddf9e8272ce1fa8" dependencies = [ "once_cell", "target-lexicon", @@ -487,9 +448,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.20.3" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" +checksum = "5e97e919d2df92eb88ca80a037969f44e5e70356559654962cbb3316d00300c6" dependencies = [ "libc", "pyo3-build-config", @@ -497,9 +458,9 @@ dependencies = [ [[package]] name = "pyo3-log" -version = "0.9.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c10808ee7250403bedb24bc30c32493e93875fef7ba3e4292226fe924f398bd" +checksum = "3ac84e6eec1159bc2a575c9ae6723baa6ee9d45873e9bebad1e3ad7e8d28a443" dependencies = [ "arc-swap", "log", @@ -508,34 +469,34 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.20.3" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" +checksum = "eb57983022ad41f9e683a599f2fd13c3664d7063a3ac5714cae4b7bee7d3f206" dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.52", + "syn 2.0.71", ] [[package]] name = "pyo3-macros-backend" -version = "0.20.3" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" +checksum = "ec480c0c51ddec81019531705acac51bcdbeae563557c982aa8263bb96880372" dependencies = [ "heck", "proc-macro2", "pyo3-build-config", "quote", - "syn 2.0.52", + "syn 2.0.71", ] [[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", ] @@ -546,20 +507,11 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" -[[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 = "regex" -version = "1.10.3" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -569,9 +521,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", @@ -580,17 +532,17 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.2", + "bitflags", "errno", "libc", "linux-raw-sys", @@ -599,41 +551,35 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.71", ] [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -642,8 +588,8 @@ dependencies = [ [[package]] name = "skytemple_rust" -version = "1.6.4" -source = "git+https://github.com/SkyTemple/skytemple-rust.git?tag=1.6.4#6b16478906fb35595fa4307c0ac77dea37e12983" +version = "1.8.1" +source = "git+https://github.com/SkyTemple/skytemple-rust.git?tag=1.8.1#889e3e9e4f9fe82b350c0e36368a28d82727fbe9" dependencies = [ "bytes", "encoding", @@ -654,24 +600,16 @@ dependencies = [ "num-traits", "packed_struct", "paste", + "pyo3", + "pyo3-log", "skytemple_rust_macros", - "skytemple_rust_macros_no_py", "thiserror", ] [[package]] name = "skytemple_rust_macros" version = "1.4.0" -source = "git+https://github.com/SkyTemple/skytemple-rust.git?tag=1.6.4#6b16478906fb35595fa4307c0ac77dea37e12983" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "skytemple_rust_macros_no_py" -version = "1.4.0" -source = "git+https://github.com/SkyTemple/skytemple-rust.git?tag=1.6.4#6b16478906fb35595fa4307c0ac77dea37e12983" +source = "git+https://github.com/SkyTemple/skytemple-rust.git?tag=1.8.1#889e3e9e4f9fe82b350c0e36368a28d82727fbe9" dependencies = [ "quote", "syn 1.0.109", @@ -679,7 +617,7 @@ dependencies = [ [[package]] name = "skytemple_ssb_emulator" -version = "1.6.4" +version = "1.8.0" dependencies = [ "byteorder", "crossbeam-channel", @@ -693,17 +631,11 @@ dependencies = [ "sprintf", ] -[[package]] -name = "smallvec" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" - [[package]] name = "sprintf" -version = "0.2.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2819cb5194dfe9e6d102f4519a9fb9dc7106d2879b71b4fd4d4677f1175bd39" +checksum = "39b60413e681681e22dfe3966674082c075c5f6ed73c3900b95dd19eb9e0181d" dependencies = [ "thiserror", ] @@ -721,9 +653,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.52" +version = "2.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462" dependencies = [ "proc-macro2", "quote", @@ -738,15 +670,15 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2" [[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" @@ -762,22 +694,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.71", ] [[package]] @@ -820,122 +752,72 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets", ] [[package]] name = "windows-targets" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" -dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] -name = "windows_i686_gnu" -version = "0.52.4" +name = "windows_i686_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "wyz" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix index ad3fdd758b..8b5f710306 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix @@ -2,7 +2,7 @@ alsa-lib, buildPythonPackage, cargo, - fetchPypi, + fetchFromGitHub, glib, lib, libpcap, @@ -21,18 +21,20 @@ }: buildPythonPackage rec { pname = "skytemple-ssb-emulator"; - version = "1.6.4"; + version = "1.8.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-qGRfX7Bwr19KJnIdhwuSVBZzXxMJyEgyBuy91aLhEj4="; + src = fetchFromGitHub { + owner = "SkyTemple"; + repo = pname; + rev = version; + hash = "sha256-9xD9Q/oYsi9tuxTOJ6ItLbWkqAjG78uzXYZXOiITDEA="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "skytemple_rust-1.6.4" = "sha256-t7P3F1zes7bgDu2JGqb5DgxlDCiztWtmViy4QY9CzT0="; + "skytemple_rust-1.8.1" = "sha256-KtMqgUOlyF02msQRouE4NpvCHqahY+aRiRV9P32ASqg="; }; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smart-open/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smart-open/default.nix index aa98f44b02..4e8412d2cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/smart-open/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/smart-open/default.nix @@ -12,6 +12,7 @@ requests, moto, paramiko, + pynacl, pytestCheckHook, responses, setuptools, @@ -67,6 +68,7 @@ buildPythonPackage rec { moto pytestCheckHook responses + pynacl ] ++ lib.flatten (builtins.attrValues optional-dependencies); pytestFlagsArray = [ "smart_open" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix index 19365d837f..e6411e3abd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix @@ -10,19 +10,19 @@ buildPythonPackage rec { pname = "snakemake-interface-executor-plugins"; - version = "9.2.0"; - format = "pyproject"; + version = "9.3.2"; + pyproject = true; src = fetchFromGitHub { owner = "snakemake"; - repo = pname; + repo = "snakemake-interface-executor-plugins"; rev = "refs/tags/v${version}"; - hash = "sha256-WMbJP17YnDzFVcr6YepT5Ltw+Jo6PPn7ayIrjx2k+go="; + hash = "sha256-3XdsEnL+kuYhNOeAxkAsjTJ2R6NOtq97zPhQg9kdFkI="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ argparse-dataclass throttler snakemake-interface-common @@ -30,10 +30,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "snakemake_interface_executor_plugins" ]; - meta = with lib; { + meta = { description = "This package provides a stable interface for interactions between Snakemake and its executor plugins"; homepage = "https://github.com/snakemake/snakemake-interface-executor-plugins"; - license = licenses.mit; - maintainers = with maintainers; [ veprbl ]; + changelog = "https://github.com/snakemake/snakemake-interface-executor-plugins/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ veprbl ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix index 191f963c75..373ffc0531 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "soco"; - version = "0.30.4"; + version = "0.30.5"; pyproject = true; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "SoCo"; repo = "SoCo"; rev = "refs/tags/v${version}"; - hash = "sha256-t5Cxlm5HhN6WY6ty4i2MAtqjbC7DwZqSp1g5nybFAH4="; + hash = "sha256-Lw/VXEfIb+avRpQHcy0TVhWDjdGQlHHtVs2gZZkAAM4="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spark-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spark-parser/default.nix index f82b7df763..46eea51363 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spark-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spark-parser/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "spark-parser"; - version = "1.8.9"; + version = "1.9.0"; format = "setuptools"; src = fetchPypi { pname = "spark_parser"; inherit version; - sha256 = "0np2y4jcir4a4j18wws7yzkz2zj6nqhdhn41rpq8pyskg6wrgfx7"; + sha256 = "sha256-3GbUjEJlxBM9tBqcX+nBxQKzsgFn3xWKDyNM0xcSz2Q="; }; propagatedBuildInputs = [ click ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix index 66047794ec..afc005af66 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix @@ -39,10 +39,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "sphinxcontrib.jquery" ]; + dependencies = [ + sphinx + ]; + nativeCheckInputs = [ defusedxml pytestCheckHook - sphinx ]; pythonNamespaces = [ "sphinxcontrib" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spotifyaio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spotifyaio/default.nix new file mode 100644 index 0000000000..f774c81ed8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/spotifyaio/default.nix @@ -0,0 +1,61 @@ +{ + lib, + aiohttp, + aioresponses, + buildPythonPackage, + fetchFromGitHub, + mashumaro, + orjson, + poetry-core, + pytest-asyncio, + pytest-cov-stub, + pytestCheckHook, + pythonOlder, + syrupy, + yarl, +}: + +buildPythonPackage rec { + pname = "spotifyaio"; + version = "0.6.0"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "joostlek"; + repo = "python-spotify"; + rev = "refs/tags/v${version}"; + hash = "sha256-petG4uqySkrThs77zp6pl6bdP0Zeea5QEngDhbqdx6Y="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + aiohttp + mashumaro + orjson + yarl + ]; + + # With 0.6.0 the tests are properly mocked + doCheck = false; + + nativeCheckInputs = [ + aioresponses + syrupy + pytest-asyncio + pytest-cov-stub + pytestCheckHook + ]; + + pythonImportsCheck = [ "spotifyaio" ]; + + meta = { + description = "Module for interacting with for Spotify"; + homepage = "https://github.com/joostlek/python-spotify/"; + changelog = "https://github.com/joostlek/python-spotify/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix index efd9f7a3af..06ce40e7e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { pname = "sqlalchemy"; - version = "2.0.32"; + version = "2.0.34"; pyproject = true; disabled = pythonOlder "3.7"; @@ -50,14 +50,11 @@ buildPythonPackage rec { owner = "sqlalchemy"; repo = "sqlalchemy"; rev = "refs/tags/rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-B0T4GsTIis2ZZykRnNOFfhyfW4qU/waXeP0BS5+G1IM="; + hash = "sha256-5nnMh8pEG6rXiy0nk9SKjIOY+htXNx9eHTEtNOkLrd8="; }; postPatch = '' sed -i '/tag_build = dev/d' setup.cfg - - substituteInPlace pyproject.toml \ - --replace-fail "setuptools>=61.0,<69.3" "setuptools" ''; nativeBuildInputs = [ setuptools ] ++ lib.optionals (!isPyPy) [ cython ]; 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 1422b50c32..ecb8e24d01 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sshtunnel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sshtunnel/default.nix @@ -5,19 +5,22 @@ paramiko, pytestCheckHook, mock, + setuptools, }: buildPythonPackage rec { - version = "0.4.0"; - format = "setuptools"; pname = "sshtunnel"; + version = "0.4.0"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-58sOp3Tbgb+RhE2yLecqQKro97D5u5ug9mbUdO9r+fw="; }; - propagatedBuildInputs = [ paramiko ]; + build-system = [ setuptools ]; + + dependencies = [ paramiko ] ++ paramiko.optional-dependencies.ed25519; nativeCheckInputs = [ pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stdlib-list/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stdlib-list/default.nix index 6109e6ce2f..e4c3fbfa22 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stdlib-list/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stdlib-list/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "stdlib-list"; - version = "0.10.0"; + version = "0.11.0"; format = "pyproject"; src = fetchPypi { pname = "stdlib_list"; inherit version; - hash = "sha256-ZRnFDWRVE+0odle/6FbVJ/J3MxVAaR3er3eyVFmWShQ="; + hash = "sha256-t0p7ZDp3oSY36Qfz9i8KufZzALzkAU9rLTyLTI/WPGY="; }; nativeBuildInputs = [ flit-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/summarytools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/summarytools/default.nix index 58457768fe..40b5359cb3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/summarytools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/summarytools/default.nix @@ -8,7 +8,6 @@ matplotlib, numpy, pandas, - pytestCheckHook, }: buildPythonPackage rec { @@ -32,8 +31,6 @@ buildPythonPackage rec { pandas ]; - nativeCheckImports = [ pytestCheckHook ]; - pythonImportsCheck = [ "summarytools" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/swisshydrodata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/swisshydrodata/default.nix index 24048a1997..c1c9bb698d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/swisshydrodata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/swisshydrodata/default.nix @@ -3,23 +3,29 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, - requests, + pythonOlder, requests-mock, + requests, + setuptools, }: buildPythonPackage rec { pname = "swisshydrodata"; - version = "0.1.0"; - format = "setuptools"; + version = "0.2.1"; + pyproject = true; + + disabled = pythonOlder "3.12"; src = fetchFromGitHub { owner = "Bouni"; - repo = pname; - rev = version; - sha256 = "1rdgfc6zg5j3fvrpbqs9vc3n5m66r5yljawyl7nmrqd5lwq1lqak"; + repo = "swisshydrodata"; + rev = "refs/tags/${version}"; + hash = "sha256-RcVwo61HZ02JEOHsSY/W8j2OTBN25oR2JunLZ5i6yVI="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; nativeCheckInputs = [ pytestCheckHook @@ -31,7 +37,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python client to get data from the Swiss federal Office for Environment FEON"; homepage = "https://github.com/bouni/swisshydrodata"; - license = with licenses; [ mit ]; + changelog = "https://github.com/Bouni/swisshydrodata/releases/tag/${version}"; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/symengine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/symengine/default.nix index d59abb27c8..16893b3f6e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/symengine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/symengine/default.nix @@ -42,13 +42,13 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace-fail "\"cmake\"" "\"${lib.getExe' cmake "cmake"}\"" \ --replace-fail "'cython>=0.29.24'" "'cython'" export PATH=${cython}/bin:$PATH ''; - nativeBuildUnputs = [ cmake ]; + dontUseCmakeConfigure = true; + nativeBuildInputs = [ cmake ]; buildInputs = [ cython ]; @@ -58,8 +58,10 @@ buildPythonPackage rec { ]; checkPhase = '' + runHook preCheck mkdir empty && cd empty ${python.interpreter} ../bin/test_python.py + runHook postCheck ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tableauserverclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tableauserverclient/default.nix index 032b4e189b..910fd59d06 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tableauserverclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tableauserverclient/default.nix @@ -9,19 +9,20 @@ requests, requests-mock, setuptools, + typing-extensions, versioneer, }: buildPythonPackage rec { pname = "tableauserverclient"; - version = "0.31"; + version = "0.33"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-e00/+yVKg7dGGq3Os+oWu/F93j5e9dnwWZxKwm+soqM="; + hash = "sha256-7yj/Ey3mIR2GZ0gtNkrrtoKEmuA5LihZlM9qPhbROQw="; }; postPatch = '' @@ -29,7 +30,10 @@ buildPythonPackage rec { rm versioneer.py ''; - pythonRelaxDeps = [ "urllib3" ]; + pythonRelaxDeps = [ + "defusedxml" + "urllib3" + ]; nativeBuildInputs = [ setuptools @@ -40,6 +44,7 @@ buildPythonPackage rec { defusedxml requests packaging + typing-extensions ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/taskw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/taskw/default.nix index 9e4ad7c8bb..8e3e33cac1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/taskw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/taskw/default.nix @@ -2,13 +2,13 @@ lib, buildPythonPackage, fetchPypi, - pythonAtLeast, # build-system setuptools, # native dependencies taskwarrior2, + distutils, # dependencies kitchen, @@ -24,9 +24,6 @@ buildPythonPackage rec { version = "2.0.0"; pyproject = true; - # ModuleNotFoundError: No module named 'distutils' - disabled = pythonAtLeast "3.12"; - src = fetchPypi { inherit pname version; hash = "sha256-EQm9+b3nqbMqUAejAsh4MD/2UYi2QiWsdKMomkxUi90="; @@ -44,7 +41,10 @@ buildPythonPackage rec { build-system = [ setuptools ]; - buildInputs = [ taskwarrior2 ]; + buildInputs = [ + taskwarrior2 + distutils + ]; dependencies = [ kitchen 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 2f81ba2707..be500fff02 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.1147"; + version = "3.0.1251"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-dqc29D7Zpq7Hkvlx1+CKJop7zRRAXvHBUu4mnUOTpKM="; + hash = "sha256-zLC0jpxRrdsZ9vP8x0ayqMcPE197jwCIL2OrJjS2Wuk="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorstore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorstore/default.nix index 7a550a5c4e..42693111f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorstore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorstore/default.nix @@ -12,6 +12,7 @@ let pythonVersionNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; systemToPlatform = { + "aarch64-linux" = "manylinux_2_17_aarch64.manylinux2014_aarch64"; "x86_64-linux" = "manylinux_2_17_x86_64.manylinux2014_x86_64"; "aarch64-darwin" = "macosx_11_0_arm64"; }; @@ -19,6 +20,9 @@ let "310-x86_64-linux" = "sha256-oB68FjYzmRARWpbajQuLpAzWwg9CCji4tLZRFCsztjk="; "311-x86_64-linux" = "sha256-kGEecBu7b3TFGUIRirI9q2W3nipiQwsh/1OB92RqDB4="; "312-x86_64-linux" = "sha256-Vw8sT5kahSN20BQs3MOYesSUZqk4CuvfZR1z5nAO7g8="; + "310-aarch64-linux" = "sha256-Ocfg3VArM/14a06cpMuJDYP/MIo9rCvtFO4Cd3AahA4="; + "311-aarch64-linux" = "sha256-hegFeV3m0jpjTXNU6ue/3kGe1Cy+Pfeh4GDe96dvL7o="; + "312-aarch64-linux" = "sha256-O0VVtSqSEd4dqjmaXMTRvf/Bcc9YR7zzbz9N/8GVcXk="; "310-aarch64-darwin" = "sha256-2vuVxmJMx/GeaHgzUS6rRdysQFHreVzZ5IT5YSDUJro="; "311-aarch64-darwin" = "sha256-0xRVDSDE9upz2yU7mzpa3Y6l6M5FWOMAPKWBC8eY3Eo="; "312-aarch64-darwin" = "sha256-i2TmLOl2aHD5iyzF6YpjbHKFmBGPx5ixPYyNKKQfRNM="; 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 9e854fc168..4d5d49d7b0 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 @@ -1,16 +1,19 @@ { lib, + aiofiles, aiohttp, aiolimiter, buildPythonPackage, + cryptography, fetchFromGitHub, + protobuf, pythonOlder, setuptools, }: buildPythonPackage rec { pname = "tesla-fleet-api"; - version = "0.7.8"; + version = "0.8.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,14 +22,17 @@ buildPythonPackage rec { owner = "Teslemetry"; repo = "python-tesla-fleet-api"; rev = "refs/tags/v${version}"; - hash = "sha256-jExS2bnxz35mqzN2f6qrqInpoNWGUYLzueKeXp//9/8="; + hash = "sha256-tPMX8zmiwNF/j4FdOU/cWROrBCensfLKfl1A8ouF+0Y="; }; build-system = [ setuptools ]; dependencies = [ + aiofiles aiohttp aiolimiter + cryptography + protobuf ]; # Module has no tests 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 e1ef6e6779..73cd3f3dcb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/testcontainers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/testcontainers/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "testcontainers"; - version = "4.8.1"; + version = "4.8.2"; pyproject = true; src = fetchFromGitHub { owner = "testcontainers"; repo = "testcontainers-python"; rev = "refs/tags/testcontainers-v${version}"; - hash = "sha256-UCT0AmpDWMiAeRuW4BadZl4cJFCQPDogHOSkTYi/tqM="; + hash = "sha256-cfvhTNUadx7zRmDPAv9Djsx+jWgBIAf9dMmwop/8oa0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tika-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tika-client/default.nix index f2e74ad90c..7b1614e9c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tika-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tika-client/default.nix @@ -6,10 +6,11 @@ hatchling, httpx, }: + buildPythonPackage rec { pname = "tika-client"; - version = "0.6.0"; - format = "pyproject"; + version = "0.7.0"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -17,14 +18,15 @@ buildPythonPackage rec { owner = "stumpylog"; repo = "tika-client"; rev = "refs/tags/${version}"; - hash = "sha256-1Gc/WF8eEGT17z2CiuSLUIngDZVoHdBhfsUddNUBwWo="; + hash = "sha256-0cv2HaquIUQOb5CPkCxSYvXDzu3OV7WKIT80jI+pjpY="; }; - propagatedBuildInputs = [ - hatchling - httpx - ]; + build-system = [ hatchling ]; + + dependencies = [ httpx ]; + pythonImportsCheck = [ "tika_client" ]; + # Almost all of the tests (all except one in 0.1.0) fail since there # is no tika http API endpoint reachable. Since tika is not yet # packaged for nixpkgs, it seems like an unreasonable amount of effort diff --git a/third_party/nixpkgs/pkgs/development/python-modules/timm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/timm/default.nix index afee885b54..a854349319 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/timm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/timm/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -22,16 +21,14 @@ buildPythonPackage rec { pname = "timm"; - version = "1.0.9"; + version = "1.0.11"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "huggingface"; repo = "pytorch-image-models"; rev = "refs/tags/v${version}"; - hash = "sha256-iWZXile3hCUMx2q3VHJasX7rlJmT0OKBm9rkCXuWISw="; + hash = "sha256-+e4+k1Oyxf94rLsOTWfMl5YWTteXgSoecvbyxL348kg="; }; build-system = [ pdm-backend ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/Cargo.lock b/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/Cargo.lock index aa12731f49..476c2cabfa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/Cargo.lock @@ -62,9 +62,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "base64" @@ -92,9 +92,12 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.1.8" +version = "1.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504bdec147f2cc13c8b57ed9401fd8a147cc66b67ad5cb241394244f2c947549" +checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0" +dependencies = [ + "shlex", +] [[package]] name = "cfg-if" @@ -183,18 +186,18 @@ dependencies = [ [[package]] name = "derive_builder" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" +checksum = "cd33f37ee6a119146a1781d3356a7c26028f83d779b2e04ecd45fdc75c76877b" dependencies = [ "derive_builder_macro", ] [[package]] name = "derive_builder_core" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" +checksum = "7431fa049613920234f22c47fdc33e6cf3ee83067091ea4277a3f8c4587aae38" dependencies = [ "darling", "proc-macro2", @@ -204,9 +207,9 @@ dependencies = [ [[package]] name = "derive_builder_macro" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" +checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc" dependencies = [ "derive_builder_core", "syn", @@ -268,9 +271,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fnv" @@ -373,9 +376,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "linux-raw-sys" @@ -540,9 +543,12 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1" +dependencies = [ + "portable-atomic", +] [[package]] name = "onig" @@ -597,15 +603,15 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "portable-atomic" -version = "1.7.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" [[package]] name = "ppv-lite86" @@ -690,9 +696,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -766,18 +772,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags 2.6.0", ] [[package]] name = "regex" -version = "1.10.6" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", @@ -787,9 +793,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", @@ -798,9 +804,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "rustc-hash" @@ -810,9 +816,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -835,18 +841,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.205" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33aedb1a7135da52b7c21791455563facbbcc43d0f0f66165b42c21b3dfb150" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.205" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692d6f5ac90220161d6774db30c662202721e64aed9058d2c394f451261420c1" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", @@ -855,9 +861,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.122" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", "memchr", @@ -865,6 +871,12 @@ dependencies = [ "serde", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "smallvec" version = "1.13.2" @@ -891,9 +903,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "2.0.72" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -908,9 +920,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", "fastrand", @@ -921,18 +933,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", @@ -941,7 +953,7 @@ dependencies = [ [[package]] name = "tokenizers" -version = "0.20.0-rc1" +version = "0.20.0-dev.0" dependencies = [ "aho-corasick", "derive_builder", @@ -971,7 +983,7 @@ dependencies = [ [[package]] name = "tokenizers-python" -version = "0.20.0-rc1" +version = "0.20.0-dev.0" dependencies = [ "env_logger", "itertools 0.12.1", @@ -988,9 +1000,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization-alignments" @@ -1003,15 +1015,15 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unicode_categories" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix index edf0c6f378..ce8e034b8c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix @@ -52,7 +52,7 @@ let }; "big.txt" = fetchurl { url = "https://norvig.com/big.txt"; - sha256 = "sha256-+gZsfUDw8gGsQUTmUqpiQw5YprOAXscGUPZ42lgE6Hs="; + hash = "sha256-+gZsfUDw8gGsQUTmUqpiQw5YprOAXscGUPZ42lgE6Hs="; }; "bert-wiki.json" = fetchurl { url = "https://s3.amazonaws.com/models.huggingface.co/bert/anthony/doc-pipeline/tokenizer.json"; @@ -74,14 +74,14 @@ let in buildPythonPackage rec { pname = "tokenizers"; - version = "0.20.0"; + version = "0.20.1"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "tokenizers"; rev = "refs/tags/v${version}"; - hash = "sha256-uuSHsdyx77YQjf1aiz7EJ/X+6RaOgfmjGqHSlMaCWDI="; + hash = "sha256-QTe1QdmJHSoosNG9cCJS7uQNdoMwgL+CJHQQUX5VtSY="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; @@ -149,6 +149,7 @@ buildPythonPackage rec { meta = { description = "Fast State-of-the-Art Tokenizers optimized for Research and Production"; homepage = "https://github.com/huggingface/tokenizers"; + changelog = "https://github.com/huggingface/tokenizers/releases/tag/v${version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ GaetanLepage ]; platforms = lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torch/0001-cmake.py-propagate-cmakeFlags-from-environment.patch b/third_party/nixpkgs/pkgs/development/python-modules/torch/0001-cmake.py-propagate-cmakeFlags-from-environment.patch new file mode 100644 index 0000000000..e30f6449c7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/torch/0001-cmake.py-propagate-cmakeFlags-from-environment.patch @@ -0,0 +1,29 @@ +From c5d4087519eae6f41c80bbd8ffbcc9390db44c7f Mon Sep 17 00:00:00 2001 +From: SomeoneSerge +Date: Thu, 10 Oct 2024 19:19:18 +0000 +Subject: [PATCH] cmake.py: propagate cmakeFlags from environment + +--- + tools/setup_helpers/cmake.py | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/tools/setup_helpers/cmake.py b/tools/setup_helpers/cmake.py +index 4b605fe5975..ea1d6a1ef46 100644 +--- a/tools/setup_helpers/cmake.py ++++ b/tools/setup_helpers/cmake.py +@@ -332,6 +332,12 @@ class CMake: + file=sys.stderr, + ) + print(e, file=sys.stderr) ++ ++ # Nixpkgs compat: ++ if "cmakeFlags" in os.environ: ++ import shlex ++ args.extend(shlex.split(os.environ["cmakeFlags"])) ++ + # According to the CMake manual, we should pass the arguments first, + # and put the directory as the last element. Otherwise, these flags + # may not be passed correctly. +-- +2.46.0 + 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 7b5b8e9f67..36863da675 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix @@ -35,10 +35,8 @@ removeReferencesTo, # Build inputs + darwin, numactl, - Accelerate, - CoreServices, - libobjc, # Propagated build inputs astunparse, @@ -56,6 +54,17 @@ tritonSupport ? (!stdenv.hostPlatform.isDarwin), triton, + # TODO: 1. callPackage needs to learn to distinguish between the task + # of "asking for an attribute from the parent scope" and + # the task of "exposing a formal parameter in .override". + # TODO: 2. We should probably abandon attributes such as `torchWithCuda` (etc.) + # as they routinely end up consuming the wrong arguments\ + # (dependencies without cuda support). + # Instead we should rely on overlays and nixpkgsFun. + # (@SomeoneSerge) + _tritonEffective ? if cudaSupport then triton-cuda else triton, + triton-cuda, + # Unit tests hypothesis, psutil, @@ -95,6 +104,8 @@ let ; inherit (cudaPackages) cudaFlags cudnn nccl; + triton = throw "python3Packages.torch: use _tritonEffective instead of triton to avoid divergence"; + rocmPackages = rocmPackages_5; setBool = v: if v then "1" else "0"; @@ -240,6 +251,7 @@ buildPythonPackage rec { # Allow setting PYTHON_LIB_REL_PATH with an environment variable. # https://github.com/pytorch/pytorch/pull/128419 ./passthrough-python-lib-rel-path.patch + ./0001-cmake.py-propagate-cmakeFlags-from-environment.patch ] ++ lib.optionals cudaSupport [ ./fix-cmake-cuda-toolkit.patch ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ @@ -257,7 +269,18 @@ buildPythonPackage rec { ]; postPatch = - lib.optionalString rocmSupport '' + '' + substituteInPlace cmake/public/cuda.cmake \ + --replace-fail \ + 'message(FATAL_ERROR "Found two conflicting CUDA' \ + 'message(WARNING "Found two conflicting CUDA' \ + --replace-warn \ + "set(CUDAToolkit_ROOT" \ + "# Upstream: set(CUDAToolkit_ROOT" + substituteInPlace third_party/gloo/cmake/Cuda.cmake \ + --replace-warn "find_package(CUDAToolkit 7.0" "find_package(CUDAToolkit" + '' + + lib.optionalString rocmSupport '' # https://github.com/facebookincubator/gloo/pull/297 substituteInPlace third_party/gloo/cmake/Hipify.cmake \ --replace "\''${HIPIFY_COMMAND}" "python \''${HIPIFY_COMMAND}" @@ -351,6 +374,17 @@ buildPythonPackage rec { # NB technical debt: building without NNPACK as workaround for missing `six` USE_NNPACK = 0; + cmakeFlags = + [ + # (lib.cmakeBool "CMAKE_FIND_DEBUG_MODE" true) + (lib.cmakeFeature "CUDAToolkit_VERSION" cudaPackages.cudaVersion) + ] + ++ lib.optionals cudaSupport [ + # Unbreaks version discovery in enable_language(CUDA) when wrapping nvcc with ccache + # Cf. https://gitlab.kitware.com/cmake/cmake/-/issues/26363 + (lib.cmakeFeature "CMAKE_CUDA_COMPILER_TOOLKIT_VERSION" cudaPackages.cudaVersion) + ]; + preBuild = '' export MAX_JOBS=$NIX_BUILD_CORES ${python.pythonOnBuildForHost.interpreter} setup.py build --cmake-only @@ -469,7 +503,7 @@ buildPythonPackage rec { cuda_cccl # cuda_cudart # cuda_runtime.h and libraries cuda_cupti # For kineto - cuda_nvcc # crt/host_config.h; even though we include this in nativeBuildinputs, it's needed here too + cuda_nvcc # crt/host_config.h; even though we include this in nativeBuildInputs, it's needed here too cuda_nvml_dev # cuda_nvrtc cuda_nvtx # -llibNVToolsExt @@ -495,11 +529,11 @@ buildPythonPackage rec { ++ lib.optionals (cudaSupport || rocmSupport) [ effectiveMagma ] ++ lib.optionals stdenv.hostPlatform.isLinux [ numactl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Accelerate - CoreServices - libobjc + darwin.apple_sdk.frameworks.Accelerate + darwin.apple_sdk.frameworks.CoreServices + darwin.libobjc ] - ++ lib.optionals tritonSupport [ triton ] + ++ lib.optionals tritonSupport [ _tritonEffective ] ++ lib.optionals MPISupport [ mpi ] ++ lib.optionals rocmSupport [ rocmtoolkit_joined ]; @@ -527,7 +561,7 @@ buildPythonPackage rec { # torch/csrc requires `pybind11` at runtime pybind11 - ] ++ lib.optionals tritonSupport [ triton ]; + ] ++ lib.optionals tritonSupport [ _tritonEffective ]; propagatedCxxBuildInputs = [ ] ++ lib.optionals MPISupport [ mpi ] ++ lib.optionals rocmSupport [ rocmtoolkit_joined ]; @@ -662,7 +696,9 @@ buildPythonPackage rec { thoughtpolice tscholak ]; # tscholak esp. for darwin-related builds - platforms = with lib.platforms; linux ++ lib.optionals (!cudaSupport && !rocmSupport) darwin; + platforms = + lib.platforms.linux + ++ lib.optionals (!cudaSupport && !rocmSupport) lib.platforms.darwin; broken = builtins.any trivial.id (builtins.attrValues brokenConditions); }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/default.nix index 760ea740b9..63ea30a39f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/default.nix @@ -10,7 +10,7 @@ ninja, # buildInputs - ffmpeg-full, + ffmpeg_6-full, pybind11, sox, torch, @@ -108,9 +108,9 @@ buildPythonPackage rec { FFMPEG_ROOT = symlinkJoin { name = "ffmpeg"; paths = [ - ffmpeg-full.bin - ffmpeg-full.dev - ffmpeg-full.lib + ffmpeg_6-full.bin + ffmpeg_6-full.dev + ffmpeg_6-full.lib ]; }; @@ -131,7 +131,7 @@ buildPythonPackage rec { ); buildInputs = [ - ffmpeg-full + ffmpeg_6-full pybind11 sox torch.cxxdev diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchmetrics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchmetrics/default.nix index cf08a09e55..52f905878a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchmetrics/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchmetrics/default.nix @@ -12,7 +12,7 @@ # buildInputs torch, - # checks + # tests cloudpickle, psutil, pytestCheckHook, @@ -28,7 +28,7 @@ let pname = "torchmetrics"; - version = "1.4.2"; + version = "1.4.3"; in buildPythonPackage { inherit pname version; @@ -38,7 +38,7 @@ buildPythonPackage { owner = "Lightning-AI"; repo = "torchmetrics"; rev = "refs/tags/v${version}"; - hash = "sha256-YieIz99QFnuW3hTtNFgxhkNnSXGsTG2qqYhRCyvZo7Q="; + hash = "sha256-527cHPFdFw/JajHe7Kkz7+zl4EfePaLx77I2OTjjxaA="; }; dependencies = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix index 272a5d535a..b6092e2138 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.4.9"; + version = "4.5.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-6fVMtO9w+dtJRGytOEW3qAQ/x9YtkZKyQXQfP7DYE6w="; + hash = "sha256-/EnZ+8KeJQF3daAk5d+A9iXJ3dv5gs4+pdNEUHCVBCU="; }; build-system = [ setuptools ]; @@ -41,9 +41,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for loading and using triangular meshes"; - homepage = "https://trimsh.org/"; + homepage = "https://trimesh.org/"; changelog = "https://github.com/mikedh/trimesh/releases/tag/${version}"; license = licenses.mit; + mainProgram = "trimesh"; maintainers = with maintainers; [ gebner pbsds diff --git a/third_party/nixpkgs/pkgs/development/python-modules/triton/0000-dont-download-ptxas.patch b/third_party/nixpkgs/pkgs/development/python-modules/triton/0000-dont-download-ptxas.patch deleted file mode 100644 index d31a4798af..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/triton/0000-dont-download-ptxas.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/python/setup.py b/python/setup.py -index 18764ec13..b3bb5b60a 100644 ---- a/python/setup.py -+++ b/python/setup.py -@@ -269,10 +269,6 @@ class CMakeBuild(build_ext): - subprocess.check_call(["cmake", self.base_dir] + cmake_args, cwd=cmake_dir, env=env) - subprocess.check_call(["cmake", "--build", "."] + build_args, cwd=cmake_dir) - -- --download_and_copy_ptxas() -- -- - setup( - name="triton", - version="2.1.0", diff --git a/third_party/nixpkgs/pkgs/development/python-modules/triton/0001-_build-allow-extra-cc-flags.patch b/third_party/nixpkgs/pkgs/development/python-modules/triton/0001-_build-allow-extra-cc-flags.patch new file mode 100644 index 0000000000..1e473dc59f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/triton/0001-_build-allow-extra-cc-flags.patch @@ -0,0 +1,35 @@ +From 2751c5de5c61c90b56e3e392a41847f4c47258fd Mon Sep 17 00:00:00 2001 +From: SomeoneSerge +Date: Sun, 13 Oct 2024 14:16:48 +0000 +Subject: [PATCH 1/3] _build: allow extra cc flags + +--- + python/triton/runtime/build.py | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/python/triton/runtime/build.py b/python/triton/runtime/build.py +index d7baeb286..d334dce77 100644 +--- a/python/triton/runtime/build.py ++++ b/python/triton/runtime/build.py +@@ -42,9 +42,17 @@ def _build(name, src, srcdir, library_dirs, include_dirs, libraries): + py_include_dir = sysconfig.get_paths(scheme=scheme)["include"] + include_dirs = include_dirs + [srcdir, py_include_dir] + cc_cmd = [cc, src, "-O3", "-shared", "-fPIC", "-o", so] ++ ++ # Nixpkgs support branch ++ # Allows passing e.g. extra -Wl,-rpath ++ cc_cmd_extra_flags = "@ccCmdExtraFlags@" ++ if cc_cmd_extra_flags != ("@" + "ccCmdExtraFlags@"): # substituteAll hack ++ import shlex ++ cc_cmd.extend(shlex.split(cc_cmd_extra_flags)) ++ + cc_cmd += [f'-l{lib}' for lib in libraries] + cc_cmd += [f"-L{dir}" for dir in library_dirs] +- cc_cmd += [f"-I{dir}" for dir in include_dirs] ++ cc_cmd += [f"-I{dir}" for dir in include_dirs if dir is not None] + ret = subprocess.check_call(cc_cmd) + if ret == 0: + return so +-- +2.46.0 + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/triton/0001-ptxas-disable-version-key-for-non-cuda-targets.patch b/third_party/nixpkgs/pkgs/development/python-modules/triton/0001-ptxas-disable-version-key-for-non-cuda-targets.patch deleted file mode 100644 index 3941d54b8b..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/triton/0001-ptxas-disable-version-key-for-non-cuda-targets.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 10f3d49aa6084d1b9b9624017cce7df106b9fb7e Mon Sep 17 00:00:00 2001 -From: Yaroslav Bolyukin -Date: Tue, 6 Feb 2024 13:51:28 +0100 -Subject: [PATCH] ptxas: disable version key for non-cuda targets - ---- - python/triton/runtime/jit.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/python/triton/runtime/jit.py b/python/triton/runtime/jit.py -index d55972b4b..bd875a701 100644 ---- a/python/triton/runtime/jit.py -+++ b/python/triton/runtime/jit.py -@@ -117,8 +117,8 @@ def version_key(): - with open(lib.module_finder.find_spec(lib.name).origin, "rb") as f: - contents += [hashlib.md5(f.read()).hexdigest()] - # ptxas version -- ptxas = path_to_ptxas()[0] -- ptxas_version = hashlib.md5(subprocess.check_output([ptxas, "--version"])).hexdigest() -+ # ptxas = path_to_ptxas()[0] -+ ptxas_version = "noptxas" - return '-'.join(TRITON_VERSION) + '-' + ptxas_version + '-' + '-'.join(contents) - - --- -2.43.0 - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/triton/0001-setup.py-introduce-TRITON_OFFLINE_BUILD.patch b/third_party/nixpkgs/pkgs/development/python-modules/triton/0001-setup.py-introduce-TRITON_OFFLINE_BUILD.patch new file mode 100644 index 0000000000..5b195fd7f8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/triton/0001-setup.py-introduce-TRITON_OFFLINE_BUILD.patch @@ -0,0 +1,64 @@ +From 587d1f3428eca63544238802f19e0be670d03244 Mon Sep 17 00:00:00 2001 +From: SomeoneSerge +Date: Mon, 29 Jul 2024 14:31:11 +0000 +Subject: [PATCH] setup.py: introduce TRITON_OFFLINE_BUILD + +To prevent any vendoring whatsoever +--- + python/setup.py | 26 ++++++++++++++++++++++++-- + 1 file changed, 24 insertions(+), 2 deletions(-) + +diff --git a/python/setup.py b/python/setup.py +index 73800ec40..4e5b04de4 100644 +--- a/python/setup.py ++++ b/python/setup.py +@@ -112,6 +112,20 @@ def get_env_with_keys(key: list): + return os.environ[k] + return "" + ++def is_offline_build() -> bool: ++ """ ++ Downstream projects and distributions which bootstrap their own dependencies from scratch ++ and run builds in offline sandboxes ++ may set `TRITON_OFFLINE_BUILD` in the build environment to prevent any attempts at downloading ++ pinned dependencies from the internet or at using dependencies vendored in-tree. ++ ++ Dependencies must be defined using respective search paths (cf. `syspath_var_name` in `Package`). ++ Missing dependencies lead to an early abortion. ++ Dependencies' compatibility is not verified. ++ ++ Note that this flag isn't tested by the CI and does not provide any guarantees. ++ """ ++ return os.environ.get("TRITON_OFFLINE_BUILD", "") != "" + + # --- third party packages ----- + +@@ -220,8 +234,14 @@ def get_thirdparty_packages(packages: list): + if os.environ.get(p.syspath_var_name): + package_dir = os.environ[p.syspath_var_name] + version_file_path = os.path.join(package_dir, "version.txt") +- if p.syspath_var_name not in os.environ and\ +- (not os.path.exists(version_file_path) or Path(version_file_path).read_text() != p.url): ++ ++ input_defined = p.syspath_var_name not in os.environ ++ input_exists = input_defined and os.path.exists(version_file_path) ++ input_compatible = input_exists and Path(version_file_path).read_text() == p.url ++ ++ if is_offline_build() and not input_defined: ++ raise RuntimeError(f"Requested an offline build but {p.syspath_var_name} is not set") ++ if not is_offline_build() and not input_compatible: + with contextlib.suppress(Exception): + shutil.rmtree(package_root_dir) + os.makedirs(package_root_dir, exist_ok=True) +@@ -245,6 +265,8 @@ def get_thirdparty_packages(packages: list): + + + def download_and_copy(name, src_path, variable, version, url_func): ++ if is_offline_build(): ++ return + triton_cache_path = get_triton_cache_path() + if variable in os.environ: + return +-- +2.45.1 + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/triton/0002-nvidia-amd-driver-short-circuit-before-ldconfig.patch b/third_party/nixpkgs/pkgs/development/python-modules/triton/0002-nvidia-amd-driver-short-circuit-before-ldconfig.patch new file mode 100644 index 0000000000..aa65cad58e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/triton/0002-nvidia-amd-driver-short-circuit-before-ldconfig.patch @@ -0,0 +1,70 @@ +From 7407cb03eec82768e333909d87b7668b633bfe86 Mon Sep 17 00:00:00 2001 +From: SomeoneSerge +Date: Sun, 13 Oct 2024 14:28:48 +0000 +Subject: [PATCH 2/3] {nvidia,amd}/driver: short-circuit before ldconfig + +--- + python/triton/runtime/build.py | 6 +++--- + third_party/amd/backend/driver.py | 7 +++++++ + third_party/nvidia/backend/driver.py | 3 +++ + 3 files changed, 13 insertions(+), 3 deletions(-) + +diff --git a/python/triton/runtime/build.py b/python/triton/runtime/build.py +index d334dce77..a64e98da0 100644 +--- a/python/triton/runtime/build.py ++++ b/python/triton/runtime/build.py +@@ -42,6 +42,9 @@ def _build(name, src, srcdir, library_dirs, include_dirs, libraries): + py_include_dir = sysconfig.get_paths(scheme=scheme)["include"] + include_dirs = include_dirs + [srcdir, py_include_dir] + cc_cmd = [cc, src, "-O3", "-shared", "-fPIC", "-o", so] ++ cc_cmd += [f'-l{lib}' for lib in libraries] ++ cc_cmd += [f"-L{dir}" for dir in library_dirs] ++ cc_cmd += [f"-I{dir}" for dir in include_dirs if dir is not None] + + # Nixpkgs support branch + # Allows passing e.g. extra -Wl,-rpath +@@ -50,9 +53,6 @@ def _build(name, src, srcdir, library_dirs, include_dirs, libraries): + import shlex + cc_cmd.extend(shlex.split(cc_cmd_extra_flags)) + +- cc_cmd += [f'-l{lib}' for lib in libraries] +- cc_cmd += [f"-L{dir}" for dir in library_dirs] +- cc_cmd += [f"-I{dir}" for dir in include_dirs if dir is not None] + ret = subprocess.check_call(cc_cmd) + if ret == 0: + return so +diff --git a/third_party/amd/backend/driver.py b/third_party/amd/backend/driver.py +index 0a8cd7bed..aab8805f6 100644 +--- a/third_party/amd/backend/driver.py ++++ b/third_party/amd/backend/driver.py +@@ -24,6 +24,13 @@ def _get_path_to_hip_runtime_dylib(): + return env_libhip_path + raise RuntimeError(f"TRITON_LIBHIP_PATH '{env_libhip_path}' does not point to a valid {lib_name}") + ++ # ...on release/3.1.x: ++ # return mmapped_path ++ # raise RuntimeError(f"memory mapped '{mmapped_path}' in process does not point to a valid {lib_name}") ++ ++ if os.path.isdir("@libhipDir@"): ++ return ["@libhipDir@"] ++ + paths = [] + + import site +diff --git a/third_party/nvidia/backend/driver.py b/third_party/nvidia/backend/driver.py +index 90f71138b..30fbadb2a 100644 +--- a/third_party/nvidia/backend/driver.py ++++ b/third_party/nvidia/backend/driver.py +@@ -21,6 +21,9 @@ def libcuda_dirs(): + if env_libcuda_path: + return [env_libcuda_path] + ++ if os.path.exists("@libcudaStubsDir@"): ++ return ["@libcudaStubsDir@"] ++ + libs = subprocess.check_output(["/sbin/ldconfig", "-p"]).decode() + # each line looks like the following: + # libcuda.so.1 (libc6,x86-64) => /lib/x86_64-linux-gnu/libcuda.so.1 +-- +2.46.0 + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/triton/0003-nvidia-cudart-a-systempath.patch b/third_party/nixpkgs/pkgs/development/python-modules/triton/0003-nvidia-cudart-a-systempath.patch new file mode 100644 index 0000000000..144d84e151 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/triton/0003-nvidia-cudart-a-systempath.patch @@ -0,0 +1,46 @@ +From 6f92d54e5a544bc34bb07f2808d554a71cc0e4c3 Mon Sep 17 00:00:00 2001 +From: SomeoneSerge +Date: Sun, 13 Oct 2024 14:30:19 +0000 +Subject: [PATCH 3/3] nvidia: cudart a systempath + +--- + third_party/nvidia/backend/driver.c | 2 +- + third_party/nvidia/backend/driver.py | 5 +++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/third_party/nvidia/backend/driver.c b/third_party/nvidia/backend/driver.c +index 44524da27..fbdf0d156 100644 +--- a/third_party/nvidia/backend/driver.c ++++ b/third_party/nvidia/backend/driver.c +@@ -1,4 +1,4 @@ +-#include "cuda.h" ++#include + #include + #include + #define PY_SSIZE_T_CLEAN +diff --git a/third_party/nvidia/backend/driver.py b/third_party/nvidia/backend/driver.py +index 30fbadb2a..65c0562ed 100644 +--- a/third_party/nvidia/backend/driver.py ++++ b/third_party/nvidia/backend/driver.py +@@ -10,7 +10,8 @@ from triton.backends.compiler import GPUTarget + from triton.backends.driver import GPUDriver + + dirname = os.path.dirname(os.path.realpath(__file__)) +-include_dir = [os.path.join(dirname, "include")] ++import shlex ++include_dir = [*shlex.split("@cudaToolkitIncludeDirs@"), os.path.join(dirname, "include")] + libdevice_dir = os.path.join(dirname, "lib") + libraries = ['cuda'] + +@@ -149,7 +150,7 @@ def make_launcher(constants, signature, ids): + # generate glue code + params = [i for i in signature.keys() if i not in constants] + src = f""" +-#include \"cuda.h\" ++#include + #include + #include + #include +-- +2.46.0 + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/triton/0004-nvidia-allow-static-ptxas-path.patch b/third_party/nixpkgs/pkgs/development/python-modules/triton/0004-nvidia-allow-static-ptxas-path.patch new file mode 100644 index 0000000000..eea1834d17 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/triton/0004-nvidia-allow-static-ptxas-path.patch @@ -0,0 +1,26 @@ +From e503e572b6d444cd27f1cdf124aaf553aa3a8665 Mon Sep 17 00:00:00 2001 +From: SomeoneSerge +Date: Mon, 14 Oct 2024 00:12:05 +0000 +Subject: [PATCH 4/4] nvidia: allow static ptxas path + +--- + third_party/nvidia/backend/compiler.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/third_party/nvidia/backend/compiler.py b/third_party/nvidia/backend/compiler.py +index 6d7994923..6720e8f97 100644 +--- a/third_party/nvidia/backend/compiler.py ++++ b/third_party/nvidia/backend/compiler.py +@@ -20,6 +20,9 @@ def _path_to_binary(binary: str): + os.path.join(os.path.dirname(__file__), "bin", binary), + ] + ++ import shlex ++ paths.extend(shlex.split("@nixpkgsExtraBinaryPaths@")) ++ + for bin in paths: + if os.path.exists(bin) and os.path.isfile(bin): + result = subprocess.check_output([bin, "--version"], stderr=subprocess.STDOUT) +-- +2.46.0 + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/triton/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/triton/bin.nix index 0189278bc0..6bb67753a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/triton/bin.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/triton/bin.nix @@ -5,11 +5,8 @@ cudaPackages, buildPythonPackage, fetchurl, - isPy38, - isPy39, - isPy310, - isPy311, python, + pythonOlder, autoPatchelfHook, filelock, lit, @@ -29,7 +26,7 @@ buildPythonPackage rec { in fetchurl srcs; - disabled = !(isPy38 || isPy39 || isPy310 || isPy311); + disabled = pythonOlder "3.8"; pythonRemoveDeps = [ "cmake" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/triton/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/triton/default.nix index 98585b850e..214bc9de1e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/triton/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/triton/default.nix @@ -1,111 +1,92 @@ { lib, - config, addDriverRunpath, buildPythonPackage, - fetchFromGitHub, - fetchpatch, - setuptools, cmake, - ninja, - pybind11, + config, + cudaPackages, + fetchFromGitHub, + filelock, gtest, - zlib, - ncurses, libxml2, lit, llvm, - filelock, - torchWithRocm, + ncurses, + ninja, + pybind11, python, - - runCommand, - - cudaPackages, + pytestCheckHook, + stdenv, + substituteAll, + setuptools, + torchWithRocm, + zlib, cudaSupport ? config.cudaSupport, + rocmSupport ? config.rocmSupport, + rocmPackages, + triton, }: -let - ptxas = lib.getExe' cudaPackages.cuda_nvcc "ptxas"; # Make sure cudaPackages is the right version each update (See python/setup.py) -in -buildPythonPackage rec { +buildPythonPackage { pname = "triton"; - version = "2.1.0"; + version = "3.1.0"; pyproject = true; src = fetchFromGitHub { - owner = "openai"; - repo = pname; - rev = "v${version}"; - hash = "sha256-8UTUwLH+SriiJnpejdrzz9qIquP2zBp1/uwLdHmv0XQ="; + owner = "triton-lang"; + repo = "triton"; + # latest branch commit from https://github.com/triton-lang/triton/commits/release/3.1.x/ + rev = "cf34004b8a67d290a962da166f5aa2fc66751326"; + hash = "sha256-233fpuR7XXOaSKN+slhJbE/CMFzAqCRCE4V4rIoJZrk="; }; patches = [ - # fix overflow error - (fetchpatch { - url = "https://github.com/openai/triton/commit/52c146f66b79b6079bcd28c55312fc6ea1852519.patch"; - hash = "sha256-098/TCQrzvrBAbQiaVGCMaF3o5Yc3yWDxzwSkzIuAtY="; + ./0001-setup.py-introduce-TRITON_OFFLINE_BUILD.patch + (substituteAll { + src = ./0001-_build-allow-extra-cc-flags.patch; + ccCmdExtraFlags = "-Wl,-rpath,${addDriverRunpath.driverLink}/lib"; }) - - # Upstream startded pinning CUDA version and falling back to downloading from Conda - # in https://github.com/triton-lang/triton/pull/1574/files#diff-eb8b42d9346d0a5d371facf21a8bfa2d16fb49e213ae7c21f03863accebe0fcfR120-R123 - ./0000-dont-download-ptxas.patch + (substituteAll ( + { + src = ./0002-nvidia-amd-driver-short-circuit-before-ldconfig.patch; + } + // lib.optionalAttrs rocmSupport { libhipDir = "${lib.getLib rocmPackages.clr}/lib"; } + // lib.optionalAttrs cudaSupport { + libcudaStubsDir = "${lib.getLib cudaPackages.cuda_cudart}/lib/stubs"; + ccCmdExtraFlags = "-Wl,-rpath,${addDriverRunpath.driverLink}/lib"; + } + )) ] - ++ lib.optionals (!cudaSupport) [ - # triton wants to get ptxas version even if ptxas is not - # used, resulting in ptxas not found error. - ./0001-ptxas-disable-version-key-for-non-cuda-targets.patch + ++ lib.optionals cudaSupport [ + (substituteAll { + src = ./0003-nvidia-cudart-a-systempath.patch; + cudaToolkitIncludeDirs = "${lib.getInclude cudaPackages.cuda_cudart}/include"; + }) + (substituteAll { + src = ./0004-nvidia-allow-static-ptxas-path.patch; + nixpkgsExtraBinaryPaths = lib.escapeShellArgs [ (lib.getExe' cudaPackages.cuda_nvcc "ptxas") ]; + }) ]; - 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()" + postPatch = '' + # Use our `cmakeFlags` instead and avoid downloading dependencies + # remove any downloads + substituteInPlace python/setup.py \ + --replace-fail "get_json_package_info(), get_pybind11_package_info()" ""\ + --replace-fail "get_pybind11_package_info(), get_llvm_package_info()" ""\ + --replace-fail 'packages += ["triton/profiler"]' ""\ + --replace-fail "curr_version != version" "False" - # 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-fail "include (\''${CMAKE_CURRENT_SOURCE_DIR}/googletest.cmake)" ""\ + --replace-fail "include(GoogleTest)" "find_package(GTest REQUIRED)" + ''; - # 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}' - ''; + build-system = [ setuptools ]; nativeBuildInputs = [ - setuptools - # pytestCheckHook # Requires torch (circular dependency) and probably needs GPUs: cmake ninja @@ -125,7 +106,7 @@ buildPythonPackage rec { zlib ]; - propagatedBuildInputs = [ + dependencies = [ filelock # triton uses setuptools at runtime: # https://github.com/NixOS/nixpkgs/pull/286763/#discussion_r1480392652 @@ -139,76 +120,42 @@ buildPythonPackage rec { ]; # Avoid GLIBCXX mismatch with other cuda-enabled python packages - preConfigure = - '' - # Ensure that the build process uses the requested number of cores - export MAX_JOBS="$NIX_BUILD_CORES" + preConfigure = '' + # Ensure that the build process uses the requested number of cores + export MAX_JOBS="$NIX_BUILD_CORES" - # Upstream's setup.py tries to write cache somewhere in ~/ - export HOME=$(mktemp -d) + # Upstream's setup.py tries to write cache somewhere in ~/ + export HOME=$(mktemp -d) - # Upstream's github actions patch setup.cfg to write base-dir. May be redundant - echo " - [build_ext] - base-dir=$PWD" >> python/setup.cfg + # Upstream's github actions patch setup.cfg to write base-dir. May be redundant + echo " + [build_ext] + base-dir=$PWD" >> python/setup.cfg - # The rest (including buildPhase) is relative to ./python/ - cd python - '' - + lib.optionalString cudaSupport '' - export CC=${cudaPackages.backendStdenv.cc}/bin/cc; - export CXX=${cudaPackages.backendStdenv.cc}/bin/c++; - - # Work around download_and_copy_ptxas() - mkdir -p $PWD/triton/third_party/cuda/bin - ln -s ${ptxas} $PWD/triton/third_party/cuda/bin - ''; - - # CMake is run by setup.py instead - dontUseCmakeConfigure = true; - - # Setuptools (?) strips runpath and +x flags. Let's just restore the symlink - postFixup = lib.optionalString cudaSupport '' - rm -f $out/${python.sitePackages}/triton/third_party/cuda/bin/ptxas - ln -s ${ptxas} $out/${python.sitePackages}/triton/third_party/cuda/bin/ptxas + # The rest (including buildPhase) is relative to ./python/ + cd python ''; - checkInputs = [ cmake ]; # ctest - dontUseSetuptoolsCheck = true; + env = + { + TRITON_BUILD_PROTON = "OFF"; + TRITON_OFFLINE_BUILD = true; + } + // lib.optionalAttrs cudaSupport { + CC = lib.getExe' cudaPackages.backendStdenv.cc "cc"; + CXX = lib.getExe' cudaPackages.backendStdenv.cc "c++"; - preCheck = '' - # build/temp* refers to build_ext.build_temp (looked up in the build logs) - (cd ./build/temp* ; ctest) - - # For pytestCheckHook - cd test/unit - ''; - - # Circular dependency on torch - # pythonImportsCheck = [ - # "triton" - # "triton.language" - # ]; - - # Ultimately, torch is our test suite: - passthru.tests = { - inherit torchWithRocm; - # Implemented as alternative to pythonImportsCheck, in case if circular dependency on torch occurs again, - # and pythonImportsCheck is commented back. - import-triton = - runCommand "import-triton" - { nativeBuildInputs = [ (python.withPackages (ps: [ ps.triton ])) ]; } - '' - python << \EOF - import triton - import triton.language - EOF - touch "$out" - ''; - }; + # TODO: Unused because of how TRITON_OFFLINE_BUILD currently works (subject to change) + TRITON_PTXAS_PATH = lib.getExe' cudaPackages.cuda_nvcc "ptxas"; # Make sure cudaPackages is the right version each update (See python/setup.py) + TRITON_CUOBJDUMP_PATH = lib.getExe' cudaPackages.cuda_cuobjdump "cuobjdump"; + TRITON_NVDISASM_PATH = lib.getExe' cudaPackages.cuda_nvdisasm "nvdisasm"; + TRITON_CUDACRT_PATH = lib.getInclude cudaPackages.cuda_nvcc; + TRITON_CUDART_PATH = lib.getInclude cudaPackages.cuda_cudart; + TRITON_CUPTI_PATH = cudaPackages.cuda_cupti; + }; pythonRemoveDeps = [ - # Circular dependency, cf. https://github.com/openai/triton/issues/1374 + # Circular dependency, cf. https://github.com/triton-lang/triton/issues/1374 "torch" # CLI tools without dist-info @@ -216,14 +163,117 @@ buildPythonPackage rec { "lit" ]; - meta = with lib; { + # CMake is run by setup.py instead + dontUseCmakeConfigure = true; + + nativeCheckInputs = [ cmake ]; + preCheck = '' + # build/temp* refers to build_ext.build_temp (looked up in the build logs) + (cd ./build/temp* ; ctest) + ''; + + pythonImportsCheck = [ + "triton" + "triton.language" + ]; + + passthru.gpuCheck = stdenv.mkDerivation { + pname = "triton-pytest"; + inherit (triton) version src; + + requiredSystemFeatures = [ "cuda" ]; + + nativeBuildInputs = [ + (python.withPackages (ps: [ + ps.scipy + ps.torchWithCuda + ps.triton-cuda + ])) + ]; + + dontBuild = true; + nativeCheckInputs = [ pytestCheckHook ]; + + doCheck = true; + + preCheck = '' + cd python/test/unit + export HOME=$TMPDIR + ''; + checkPhase = "pytestCheckPhase"; + + installPhase = "touch $out"; + }; + + passthru.tests = { + # Ultimately, torch is our test suite: + inherit torchWithRocm; + + # Test as `nix run -f "" python3Packages.triton.tests.axpy-cuda` + # or, using `programs.nix-required-mounts`, as `nix build -f "" python3Packages.triton.tests.axpy-cuda.gpuCheck` + axpy-cuda = + cudaPackages.writeGpuTestPython + { + libraries = ps: [ + ps.triton + ps.torch-no-triton + ]; + } + '' + # Adopted from Philippe Tillet https://triton-lang.org/main/getting-started/tutorials/01-vector-add.html + + import triton + import triton.language as tl + import torch + import os + + @triton.jit + def axpy_kernel(n, a: tl.constexpr, x_ptr, y_ptr, out, BLOCK_SIZE: tl.constexpr): + pid = tl.program_id(axis=0) + block_start = pid * BLOCK_SIZE + offsets = block_start + tl.arange(0, BLOCK_SIZE) + mask = offsets < n + x = tl.load(x_ptr + offsets, mask=mask) + y = tl.load(y_ptr + offsets, mask=mask) + output = a * x + y + tl.store(out + offsets, output, mask=mask) + + def axpy(a, x, y): + output = torch.empty_like(x) + assert x.is_cuda and y.is_cuda and output.is_cuda + n_elements = output.numel() + + def grid(meta): + return (triton.cdiv(n_elements, meta['BLOCK_SIZE']), ) + + axpy_kernel[grid](n_elements, a, x, y, output, BLOCK_SIZE=1024) + return output + + if __name__ == "__main__": + if os.environ.get("HOME", None) == "/homeless-shelter": + os.environ["HOME"] = os.environ.get("TMPDIR", "/tmp") + if "CC" not in os.environ: + os.environ["CC"] = "${lib.getExe' cudaPackages.backendStdenv.cc "cc"}" + torch.manual_seed(0) + size = 12345 + x = torch.rand(size, device='cuda') + y = torch.rand(size, device='cuda') + output_torch = 3.14 * x + y + output_triton = axpy(3.14, x, y) + assert output_torch.sub(output_triton).abs().max().item() < 1e-6 + print("Triton axpy: OK") + ''; + }; + + meta = { description = "Language and compiler for writing highly efficient custom Deep-Learning primitives"; - homepage = "https://github.com/openai/triton"; - platforms = platforms.linux; - license = licenses.mit; - maintainers = with maintainers; [ + homepage = "https://github.com/triton-lang/triton"; + platforms = lib.platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ SomeoneSerge Madouura + derdennisop ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/triton/prefetch.sh b/third_party/nixpkgs/pkgs/development/python-modules/triton/prefetch.sh deleted file mode 100755 index f218718a5c..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/triton/prefetch.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix-prefetch-scripts - -set -eou pipefail - -version=$1 - -linux_bucket="https://download.pytorch.org/whl" - -url_and_key_list=( - "x86_64-linux-38 $linux_bucket/triton-${version}-0-cp38-cp38-manylinux2014_x86_64.manylinux_2_17_x86_64.whl triton-${version}-cp38-cp38-linux_x86_64.whl" - "x86_64-linux-39 $linux_bucket/triton-${version}-0-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.whl triton-${version}-cp39-cp39-linux_x86_64.whl" - "x86_64-linux-310 $linux_bucket/triton-${version}-0-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.whl triton-${version}-cp310-cp310-linux_x86_64.whl" - "x86_64-linux-311 $linux_bucket/triton-${version}-0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl triton-${version}-cp311-cp311-linux_x86_64.whl" -) - -hashfile=binary-hashes-"$version".nix -echo " \"$version\" = {" >> $hashfile - -for url_and_key in "${url_and_key_list[@]}"; do - key=$(echo "$url_and_key" | cut -d' ' -f1) - url=$(echo "$url_and_key" | cut -d' ' -f2) - name=$(echo "$url_and_key" | cut -d' ' -f3) - - echo "prefetching ${url}..." - hash=$(nix hash to-sri --type sha256 `nix-prefetch-url "$url" --name "$name"`) - - cat << EOF >> $hashfile - $key = { - name = "$name"; - url = "$url"; - hash = "$hash"; - }; -EOF - - echo -done - -echo " };" >> $hashfile -echo "done." diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix index a62a953eda..56520cb07b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix @@ -11,7 +11,7 @@ let self = buildPythonPackage rec { pname = "trove-classifiers"; - version = "2024.7.2"; + version = "2024.9.12"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,14 +19,9 @@ let src = fetchPypi { pname = "trove_classifiers"; inherit version; - hash = "sha256-gyjyrCzj/Xc8uzfHZaDteoP4ncVkx9RS8Dm2kknQrDU="; + hash = "sha256-S0az4TSk0BmZrFvG5SivzBDMSPD3JPGF8mfidgBXaPQ="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace '"calver"' "" - ''; - build-system = [ calver setuptools diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twisted/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twisted/default.nix index cc72a5e866..6a6b752ab8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twisted/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/twisted/default.nix @@ -73,6 +73,13 @@ buildPythonPackage rec { url = "https://github.com/mweinelt/twisted/commit/e69e652de671aac0abf5c7e6c662fc5172758c5a.patch"; hash = "sha256-LmvKUTViZoY/TPBmSlx4S9FbJNZfB5cxzn/YcciDmoI="; }) + + (fetchpatch { + name = "python-3.12.6.patch"; + url = "https://github.com/twisted/twisted/commit/3422f7988e3d42e6e5184acd65f103fd28750648.patch"; + excludes = [ ".github/workflows/test.yaml" ]; + hash = "sha256-/UmrHdWaApytkEDZiISjPGzpWv/Yxe/xjvr9GOjMPmQ="; + }) ]; __darwinAllowLocalNetworking = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/txtai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/txtai/default.nix index 7b08166e1d..75b50c223a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/txtai/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/txtai/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + setuptools, # propagated build input faiss, torch, @@ -47,18 +48,32 @@ openpyxl, requests, xmltodict, + pgvector, + sqlite-vec, + python-multipart, # native check inputs - unittestCheckHook, - - pythonAtLeast, + pytestCheckHook, + # check inputs + httpx, + msgpack, + sqlalchemy, }: let - version = "7.3.0"; + version = "7.4.0"; api = [ aiohttp fastapi + pillow + python-multipart uvicorn ]; + ann = [ + annoy + hnswlib + pgvector + sqlalchemy + sqlite-vec + ]; # cloud = [ apache-libcloud ]; console = [ rich ]; @@ -124,10 +139,11 @@ let requests xmltodict ]; - all = api ++ console ++ database ++ graph ++ model ++ pipeline ++ similarity ++ workflow; + all = api ++ ann ++ console ++ database ++ graph ++ model ++ pipeline ++ similarity ++ workflow; optional-dependencies = { inherit + ann api console database @@ -147,7 +163,8 @@ in buildPythonPackage { pname = "txtai"; inherit version; - format = "setuptools"; + pyproject = true; + disabled = pythonOlder "3.8"; @@ -155,16 +172,17 @@ buildPythonPackage { owner = "neuml"; repo = "txtai"; rev = "refs/tags/v${version}"; - hash = "sha256-tnM6ye0Sxh8P2bm3awE72GvXEY0gXX1Sv+wPr77wRGU="; + hash = "sha256-DQB12mFUMsKJ8cACowI1Vc7k2n1npdTOQknRmHd5EIM="; }; + buildTools = [ setuptools ]; pythonRemoveDeps = [ # We call it faiss, not faiss-cpu. "faiss-cpu" ]; - propagatedBuildInputs = [ + dependencies = [ faiss torch transformers @@ -176,23 +194,52 @@ buildPythonPackage { optional-dependencies = optional-dependencies; - pythonImportsCheck = [ "txtai" ]; - - # some tests hang forever - doCheck = false; - - preCheck = '' - export TRANSFORMERS_CACHE=$(mktemp -d) + # The Python imports check runs huggingface-hub which needs a writable directory. + # `pythonImportsCheck` runs in the installPhase (before checkPhase). + preInstall = '' + export HF_HOME=$(mktemp -d) ''; - nativeCheckInputs = [ - unittestCheckHook - ] ++ optional-dependencies.api ++ optional-dependencies.similarity; + pythonImportsCheck = [ "txtai" ]; - unittestFlagsArray = [ - "-s" - "test/python" - "-v" + nativeCheckInputs = [ + pytestCheckHook + ] ++ optional-dependencies.ann ++ optional-dependencies.api ++ optional-dependencies.similarity; + + checkInputs = [ + httpx + msgpack + python-multipart + sqlalchemy + ]; + + # The deselected paths depend on the huggingface hub and should be run as a passthru test + # disabledTestPaths won't work as the problem is with the classes containing the tests + # (in other words, it fails on __init__) + pytestFlagsArray = [ + "test/python/test*.py" + "--deselect=test/python/testcloud.py" + "--deselect=test/python/testconsole.py" + "--deselect=test/python/testembeddings.py" + "--deselect=test/python/testgraph.py" + "--deselect=test/python/testapi/testembeddings.py" + "--deselect=test/python/testapi/testpipelines.py" + "--deselect=test/python/testapi/testworkflow.py" + "--deselect=test/python/testdatabase/testclient.py" + "--deselect=test/python/testdatabase/testduckdb.py" + "--deselect=test/python/testdatabase/testencoder.py" + "--deselect=test/python/testworkflow.py" + ]; + + disabledTests = [ + # Hardcoded paths + "testInvalidTar" + "testInvalidZip" + # Downloads from Huggingface + "testPipeline" + # Not finding sqlite-vec despite being supplied + "testSQLite" + "testSQLiteCustom" ]; meta = { @@ -201,7 +248,5 @@ buildPythonPackage { homepage = "https://github.com/neuml/txtai"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ happysalada ]; - # This should be addressed in a newer version, but we first need to wait for python311Packages.faiss to be updated - broken = pythonAtLeast "3.12"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typer-shell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typer-shell/default.nix index bed80e5986..eed96f6178 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typer-shell/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typer-shell/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "typer-shell"; - version = "0.1.11"; + version = "0.1.12"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "FergusFettes"; repo = "typer-shell"; rev = "refs/tags/v${version}"; - hash = "sha256-pxi4FGxDRMcW4q6h4lQzqGPLhdcfElMaR6aZV85h2Os="; + hash = "sha256-fnqI+nKMaQocBWd9i/lqq8OzKwFdxJ8+7aYG5sNQ55E="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix index 7e6986f2a9..44e9fcaabd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2024.2.0.20240913"; + version = "2024.2.0.20241003"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-RDO130pvxYe77UFxbYalul2DK0N45Qb0DTS8nIHfLCQ="; + hash = "sha256-V13DjzhakiohK6wAp9bS4W4UETKjyVUHj0pP0T7Wy0Q="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix index 720ff9bba0..e5d9b4bef6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix @@ -2,10 +2,9 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, + setuptools, spark-parser, xdis, - nose, pytestCheckHook, hypothesis, six, @@ -14,20 +13,23 @@ buildPythonPackage rec { pname = "uncompyle6"; version = "3.9.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-b3CYD/4IpksRS2hxgy/QLYbJkDX4l2qPH4Eh2tb8pCU="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ spark-parser xdis ]; + pythonRelaxDeps = [ "spark-parser" ]; + nativeCheckInputs = [ - nose pytestCheckHook hypothesis six @@ -35,7 +37,7 @@ buildPythonPackage rec { # No tests are provided for versions past 3.8, # as the project only targets bytecode of versions <= 3.8 - doCheck = pythonOlder "3.9"; + doCheck = false; meta = { description = "A bytecode decompiler for Python versions 3.8 and below"; 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 dc0b246447..6625de40c8 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.15.13"; + version = "0.15.14"; optional-dependencies = { huggingflace = [ langdetect @@ -100,7 +100,7 @@ buildPythonPackage { owner = "Unstructured-IO"; repo = "unstructured"; rev = "refs/tags/${version}"; - hash = "sha256-DbOuNh+p+4vsEO6AQUeMq25RTLm5Zn9FyzcTKJedbTM="; + hash = "sha256-cIMKaSKG4T832rpiJeiwftqVrcMezD9ICfislGPV/TQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uxsim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uxsim/default.nix index 15d10eb5fe..56800a5199 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uxsim/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uxsim/default.nix @@ -17,14 +17,14 @@ }: buildPythonPackage rec { pname = "uxsim"; - version = "1.6.0"; + version = "1.7.0"; pyproject = true; src = fetchFromGitHub { owner = "toruseo"; repo = "UXsim"; rev = "refs/tags/v${version}"; - hash = "sha256-+nJsP/XAp6F7LZQI559rI3OCFnMTXJ4eFKEEJyEDHDg="; + hash = "sha256-FZ8eGA3sSKaUqAd+jTlIIZDeEoXeqdpsSgJ+ZHuWyJM="; }; patches = [ ./add-qt-plugin-path-to-env.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webassets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webassets/default.nix index 64b45c1715..d64ca27ece 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/webassets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/webassets/default.nix @@ -2,40 +2,72 @@ lib, buildPythonPackage, fetchPypi, + setuptools, pyyaml, - nose, jinja2, mock, - pytest, + fetchpatch2, + pytestCheckHook, + distutils, }: buildPythonPackage rec { pname = "webassets"; version = "2.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "1kc1042jydgk54xpgcp0r1ib4gys91nhy285jzfcxj3pfqrk4w8n"; + hash = "sha256-FnEyM3Z3yM7clwUJD21I2j+yYsjgsnc7KfM1LwUBgc0="; }; - propagatedBuildInputs = [ pyyaml ]; - nativeCheckInputs = [ - nose - jinja2 - mock - pytest + patches = [ + # remove nose and extra mock + (fetchpatch2 { + name = "remove-nose-and-mock.patch"; + url = "https://github.com/miracle2k/webassets/commit/26e203929eebbb4cdbb9967cf47fefa95df8f24d.patch?full_index=1"; + hash = "sha256-+jrMT6Sl/MOLkleUEDZkzRd5tzBTXZYNoCXRrTFVtq4="; + excludes = [ + "requirements-dev.pip" + "tox.ini" + ]; + }) + (fetchpatch2 { + name = "fix-missing-zope-skip.patch"; + url = "https://github.com/miracle2k/webassets/commit/3bfb5ea8223c46c60b922fdbbda36d9b8c5e9c9c.patch?full_index=1"; + hash = "sha256-dV8bp6vYr56mZpzw5C7ac4rXri04o4MrAhwfWUXLe4s="; + }) + ./migrate_test_setup_to_pytest.patch ]; - # Needs Babel CLI tool - doCheck = false; - checkPhase = "py.test"; + build-system = [ setuptools ]; - meta = with lib; { + dependencies = [ pyyaml ]; + + nativeCheckInputs = [ + jinja2 + mock + pytestCheckHook + distutils + ]; + + postPatch = '' + # Fix thread attribute "isAlive" + substituteInPlace tests/test_script.py \ + --replace-fail "isAlive" "is_alive" + ''; + + disabledTests = [ + "TestFilterBaseClass" + "TestAutoprefixer6Filter" + "TestBabel" + ]; + + meta = { description = "Media asset management for Python, with glue code for various web frameworks"; mainProgram = "webassets"; homepage = "https://github.com/miracle2k/webassets/"; - license = licenses.bsd2; - maintainers = with maintainers; [ abbradar ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ abbradar ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webassets/migrate_test_setup_to_pytest.patch b/third_party/nixpkgs/pkgs/development/python-modules/webassets/migrate_test_setup_to_pytest.patch new file mode 100644 index 0000000000..134ba1df20 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/webassets/migrate_test_setup_to_pytest.patch @@ -0,0 +1,591 @@ +diff --git a/src/webassets/test.py b/src/webassets/test.py +index 232806c..a362120 100644 +--- a/src/webassets/test.py ++++ b/src/webassets/test.py +@@ -27,7 +27,7 @@ class TempDirHelper(object): + + default_files = {} + +- def setup(self): ++ def setup_method(self): + self._tempdir_created = tempfile.mkdtemp() + self.create_files(self.default_files) + +@@ -35,7 +35,7 @@ class TempDirHelper(object): + shutil.rmtree(self._tempdir_created) + + def __enter__(self): +- self.setup() ++ self.setup_method() + return self + + def __exit__(self, type, value, traceback): +@@ -136,8 +136,8 @@ class TempEnvironmentHelper(TempDirHelper): + + default_files = {'in1': 'A', 'in2': 'B', 'in3': 'C', 'in4': 'D'} + +- def setup(self): +- TempDirHelper.setup(self) ++ def setup_method(self): ++ TempDirHelper.setup_method(self) + + self.env = self._create_environment() + # Unless we explicitly test it, we don't want to use the cache +diff --git a/tests/__init__.py b/tests/__init__.py +index 7d859d3..363b641 100644 +--- a/tests/__init__.py ++++ b/tests/__init__.py +@@ -1,4 +1,4 @@ +-def setup(): ++def setup_method(): + # For some strange reason (using Python 2.6.6), if a warning has + # already been raised somewhere else before a test attempts to + # capture and verify it using warnings.catch_warnings(), the warning +diff --git a/tests/test_bundle_build.py b/tests/test_bundle_build.py +index 9325bb9..86f69b9 100644 +--- a/tests/test_bundle_build.py ++++ b/tests/test_bundle_build.py +@@ -473,8 +473,8 @@ class TestAutoBuild(TempEnvironmentHelper): + generally everything involving the updater (as used by the build() method). + """ + +- def setup(self): +- TempEnvironmentHelper.setup(self) ++ def setup_method(self): ++ TempEnvironmentHelper.setup_method(self) + + class CustomUpdater(BaseUpdater): + allow = True +diff --git a/tests/test_bundle_urls.py b/tests/test_bundle_urls.py +index 317889e..9bd8753 100644 +--- a/tests/test_bundle_urls.py ++++ b/tests/test_bundle_urls.py +@@ -29,8 +29,8 @@ class BaseUrlsTester(TempEnvironmentHelper): + + default_files = {'a': '', 'b': '', 'c': '', '1': '', '2': ''} + +- def setup(self): +- TempEnvironmentHelper.setup(self) ++ def setup_method(self): ++ TempEnvironmentHelper.setup_method(self) + + self.env.url_expire = False + +@@ -282,8 +282,8 @@ class TestUrlsWithDebugTrue(BaseUrlsTester): + """Test url generation in debug mode. + """ + +- def setup(self): +- BaseUrlsTester.setup(self) ++ def setup_method(self): ++ BaseUrlsTester.setup_method(self) + self.env.debug = True + + def test_simple_bundle(self): +@@ -427,8 +427,8 @@ class TestUrlsWithDebugTrue(BaseUrlsTester): + + class TestUrlsWithDebugMerge(BaseUrlsTester): + +- def setup(self): +- BaseUrlsTester.setup(self) ++ def setup_method(self): ++ BaseUrlsTester.setup_method(self) + self.env.debug = 'merge' + + def test_simple_bundle(self): +diff --git a/tests/test_bundle_various.py b/tests/test_bundle_various.py +index b24a903..6d92eb3 100644 +--- a/tests/test_bundle_various.py ++++ b/tests/test_bundle_various.py +@@ -177,8 +177,8 @@ class TestVersionFeatures(TempEnvironmentHelper): + + default_files = {'in': 'foo'} + +- def setup(self): +- super(TestVersionFeatures, self).setup() ++ def setup_method(self): ++ super(TestVersionFeatures, self).setup_method() + self.env.manifest = DummyManifest() + self.env.versions = DummyVersion() + +@@ -371,8 +371,8 @@ class TestLoadPath(TempEnvironmentHelper): + an optional feature. + """ + +- def setup(self): +- TempEnvironmentHelper.setup(self) ++ def setup_method(self): ++ TempEnvironmentHelper.setup_method(self) + self.env.updater = False + self.env.directory = self.path('dir') + self.env.debug = True +@@ -603,8 +603,8 @@ class TestUrlContents(TempEnvironmentHelper): + """Test bundles containing a URL. + """ + +- def setup(self): +- TempEnvironmentHelper.setup(self) ++ def setup_method(self): ++ TempEnvironmentHelper.setup_method(self) + mock_opener = build_opener(MockHTTPHandler({ + 'http://foo': u'function() {}'})) + install_opener(mock_opener) +diff --git a/tests/test_cache.py b/tests/test_cache.py +index 9afbe3d..f8afb61 100644 +--- a/tests/test_cache.py ++++ b/tests/test_cache.py +@@ -89,8 +89,8 @@ class TestCacheIsUsed(TempEnvironmentHelper): + """Ensure the cache is used during the build process. + """ + +- def setup(self): +- TempEnvironmentHelper.setup(self) ++ def setup_method(self): ++ TempEnvironmentHelper.setup_method(self) + + class MyCache(BaseCache): + def __init__(self): +diff --git a/tests/test_environment.py b/tests/test_environment.py +index bd89ef6..ff36289 100644 +--- a/tests/test_environment.py ++++ b/tests/test_environment.py +@@ -13,7 +13,7 @@ from webassets import Bundle + class TestEnvApi(object): + """General Environment functionality.""" + +- def setup(self): ++ def setup_method(self): + self.m = Environment(None, None) + + def test_register_single_bundle(self): +@@ -186,7 +186,7 @@ class TestEnvConfig(object): + """Custom config values through get_config/set_config. + """ + +- def setup(self): ++ def setup_method(self): + self.m = Environment(None, None) + + def test_initial_values_override_defaults(self): +@@ -216,7 +216,7 @@ class TestSpecialProperties(object): + as a string, and would receive object instances when accessing the property. + """ + +- def setup(self): ++ def setup_method(self): + self.m = Environment('.', None) # we won't create any files + + def test_versioner(self): +diff --git a/tests/test_ext/test_jinja2.py b/tests/test_ext/test_jinja2.py +index 37139bb..155ad40 100644 +--- a/tests/test_ext/test_jinja2.py ++++ b/tests/test_ext/test_jinja2.py +@@ -12,7 +12,7 @@ from webassets.ext.jinja2 import AssetsExtension, Jinja2Loader + + class TestTemplateTag(object): + +- def setup(self): ++ def setup_method(self): + # Setup the assets environment. + assets_env = AssetsEnvironment('', '') + self.foo_bundle = Bundle() +@@ -123,8 +123,8 @@ class TestLoader(TempEnvironmentHelper): + """ + } + +- def setup(self): +- TempEnvironmentHelper.setup(self) ++ def setup_method(self): ++ TempEnvironmentHelper.setup_method(self) + self.jinja_env = JinjaEnvironment() + self.jinja_env.add_extension(AssetsExtension) + self.jinja_env.assets_environment = self.env +diff --git a/tests/test_filters.py b/tests/test_filters.py +index 9976f4e..deec66d 100644 +--- a/tests/test_filters.py ++++ b/tests/test_filters.py +@@ -79,7 +79,7 @@ class TestFilterBaseClass(object): + env = Environment(None, None) + env.config['attr1'] = 'bar' + env.config['attr4'] = 'bar' +- f = TestFilter(); f.ctx = ContextWrapper(env); f.setup() ++ f = TestFilter(); f.ctx = ContextWrapper(env); f.setup_method() + assert f.attr1 == 'bar' + assert f.attr4 is None # Was configured to not support env + +@@ -177,7 +177,7 @@ class TestExternalToolClass(object): + self.__class__.result = \ + argv, data.getvalue() if data is not None else data + +- def setup(self): ++ def setup_method(self): + if not hasattr(str, 'format'): + # A large part of this functionality is not available on Python 2.5 + pytest.skip() +@@ -630,12 +630,12 @@ class TestBuiltinFilters(TempEnvironmentHelper): + + class TestCSSPrefixer(TempEnvironmentHelper): + +- def setup(self): ++ def setup_method(self): + try: + import cssprefixer + except ImportError: + pytest.skip() +- TempEnvironmentHelper.setup(self) ++ TempEnvironmentHelper.setup_method(self) + + def test(self): + self.create_files({'in': """a { border-radius: 1em; }"""}) +@@ -650,10 +650,10 @@ class TestCSSPrefixer(TempEnvironmentHelper): + + class TestCoffeeScript(TempEnvironmentHelper): + +- def setup(self): ++ def setup_method(self): + if not find_executable('coffee'): + pytest.skip() +- TempEnvironmentHelper.setup(self) ++ TempEnvironmentHelper.setup_method(self) + + def test_default_options(self): + self.create_files({'in': "alert \"I knew it!\" if elvis?"}) +@@ -674,12 +674,12 @@ class TestCoffeeScript(TempEnvironmentHelper): + + class TestJinja2(TempEnvironmentHelper): + +- def setup(self): ++ def setup_method(self): + try: + import jinja2 + except ImportError: + pytest.skip() +- TempEnvironmentHelper.setup(self) ++ TempEnvironmentHelper.setup_method(self) + + def test_default_options(self): + self.create_files({'in': """Hi there, {{ name }}!"""}) +@@ -705,13 +705,13 @@ class TestClosure(TempEnvironmentHelper): + """ + } + +- def setup(self): ++ def setup_method(self): + try: + import closure + except ImportError: + pytest.skip() + +- TempEnvironmentHelper.setup(self) ++ TempEnvironmentHelper.setup_method(self) + + def test_closure(self): + self.mkbundle('foo.js', filters='closure_js', output='out.js').build() +@@ -832,10 +832,10 @@ class TestLess(TempEnvironmentHelper): + 'foo.less': "h1 { color: #FFFFFF; }", + } + +- def setup(self): ++ def setup_method(self): + if not find_executable('lessc'): + pytest.skip() +- TempEnvironmentHelper.setup(self) ++ TempEnvironmentHelper.setup_method(self) + + def test(self): + self.mkbundle('foo.less', filters='less', output='out.css').build() +@@ -928,14 +928,14 @@ class TestRubySass(TempEnvironmentHelper): + """, + } + +- def setup(self): ++ def setup_method(self): + if not find_executable('sass'): + pytest.skip() + + if "Ruby" not in check_output(["sass", "--version"]).decode('utf-8'): + pytest.skip() + +- TempEnvironmentHelper.setup(self) ++ TempEnvironmentHelper.setup_method(self) + + def test_sass(self): + sass = get_filter('sass_ruby', debug_info=False) +@@ -1038,10 +1038,10 @@ class TestSass(TempEnvironmentHelper): + """, + } + +- def setup(self): ++ def setup_method(self): + if not find_executable('sass'): + pytest.skip() +- TempEnvironmentHelper.setup(self) ++ TempEnvironmentHelper.setup_method(self) + + def test_sass(self): + sass = get_filter('sass') +@@ -1099,13 +1099,13 @@ class TestPyScss(TempEnvironmentHelper): + 'bar.scss': 'h1{color:red}' + } + +- def setup(self): ++ def setup_method(self): + try: + import scss + self.scss = scss + except ImportError: + pytest.skip() +- TempEnvironmentHelper.setup(self) ++ TempEnvironmentHelper.setup_method(self) + + def test(self): + self.mkbundle('foo.scss', filters='pyscss', output='out.css').build() +@@ -1136,13 +1136,13 @@ class TestLibSass(TempEnvironmentHelper): + 'b.scss': '$foo: foo !default; .test {background-color: $foo;}' + } + +- def setup(self): ++ def setup_method(self): + try: + import sass + self.sass = sass + except ImportError: + pytest.skip() +- TempEnvironmentHelper.setup(self) ++ TempEnvironmentHelper.setup_method(self) + + def test(self): + self.mkbundle('foo.scss', filters='libsass', output='out.css').build() +@@ -1198,10 +1198,10 @@ class TestCompass(TempEnvironmentHelper): + """ + } + +- def setup(self): ++ def setup_method(self): + if not find_executable('compass'): + pytest.skip() +- TempEnvironmentHelper.setup(self) ++ TempEnvironmentHelper.setup_method(self) + + def test_compass(self): + self.mkbundle('foo.sass', filters='compass', output='out.css').build() +@@ -1262,7 +1262,7 @@ class TestCompassConfig(object): + } + } + +- def setup(self): ++ def setup_method(self): + self.compass_config = CompassConfig(self.config).to_string() + + def test_compass_config_is_unicode(self): +@@ -1294,8 +1294,8 @@ class TestJST(TempEnvironmentHelper): + 'templates/bar.html': "
Im an html jst template. Go syntax highlighting!
" + } + +- def setup(self): +- TempEnvironmentHelper.setup(self) ++ def setup_method(self): ++ TempEnvironmentHelper.setup_method(self) + + def test_jst(self): + self.mkbundle('templates/*', filters='jst', output='out.js').build() +@@ -1424,10 +1424,10 @@ class TestHandlebars(TempEnvironmentHelper): + """ + } + +- def setup(self): ++ def setup_method(self): + if not find_executable('handlebars'): + pytest.skip() +- TempEnvironmentHelper.setup(self) ++ TempEnvironmentHelper.setup_method(self) + + def test_basic(self): + self.mkbundle('foo.html', 'dir/bar.html', +@@ -1461,12 +1461,12 @@ class TestJinja2JS(TempEnvironmentHelper): + ) + } + +- def setup(self): ++ def setup_method(self): + try: + import closure_soy + except: + pytest.skip() +- TempEnvironmentHelper.setup(self) ++ TempEnvironmentHelper.setup_method(self) + + def test(self): + self.mkbundle('foo.soy', filters='closure_tmpl', output='out.js').build() +@@ -1490,10 +1490,10 @@ class TestTypeScript(TempEnvironmentHelper): + 'foo.ts': """class X { z: number; }""" + } + +- def setup(self): ++ def setup_method(self): + if not find_executable('tsc'): + pytest.skip() +- TempEnvironmentHelper.setup(self) ++ TempEnvironmentHelper.setup_method(self) + + def test(self): + self.mkbundle('foo.ts', filters='typescript', output='out.js').build() +@@ -1521,10 +1521,10 @@ define("script/utils",[],function(){return{debug:console.log}}),\ + define("script/app",["./utils"],function(e){e.debug("APP")});\ + ''' + +- def setup(self): ++ def setup_method(self): + if not find_executable('r.js'): + pytest.skip('"r.js" executable not found') +- TempEnvironmentHelper.setup(self) ++ TempEnvironmentHelper.setup_method(self) + self.env.config['requirejs_config'] = self.path('requirejs.json') + self.env.config['requirejs_baseUrl'] = self.path('') + +@@ -1573,10 +1573,10 @@ class TestClosureStylesheets(TempEnvironmentHelper): + """ + } + +- def setup(self): ++ def setup_method(self): + if not 'CLOSURE_STYLESHEETS_PATH' in os.environ: + pytest.skip() +- TempEnvironmentHelper.setup(self) ++ TempEnvironmentHelper.setup_method(self) + + def test_compiler(self): + self.mkbundle('test.css', filters = 'closure_stylesheets_compiler', output = 'output.css').build() +diff --git a/tests/test_loaders.py b/tests/test_loaders.py +index f910ecb..5c183a5 100644 +--- a/tests/test_loaders.py ++++ b/tests/test_loaders.py +@@ -14,7 +14,7 @@ from webassets.exceptions import EnvironmentError + + class TestYAML(object): + +- def setup(self): ++ def setup_method(self): + yaml = pytest.importorskip("yaml") + + def loader(self, text, filename=None): +@@ -189,8 +189,8 @@ class TestPython(object): + + class TestYAMLCustomFilters(TestYAML): + +- def setup(self): +- super(TestYAMLCustomFilters, self).setup() ++ def setup_method(self): ++ super(TestYAMLCustomFilters, self).setup_method() + + # If zope.dottedname is not installed, that's OK + pytest.importorskip("zope.dottedname.resolve") +diff --git a/tests/test_script.py b/tests/test_script.py +index 84b9940..479c64b 100644 +--- a/tests/test_script.py ++++ b/tests/test_script.py +@@ -38,8 +38,8 @@ class MockBundle(Bundle): + + class TestCLI(TempEnvironmentHelper): + +- def setup(self): +- super(TestCLI, self).setup() ++ def setup_method(self): ++ super(TestCLI, self).setup_method() + self.assets_env = self.env + self.cmd_env = CommandLineEnvironment(self.assets_env, logging) + +@@ -210,8 +210,8 @@ class TestWatchCommand(TestWatchMixin, TestCLI): + + default_files = {'in': 'foo', 'out': 'bar'} + +- def setup(self): +- super(TestWatchCommand, self).setup() ++ def setup_method(self): ++ super(TestWatchCommand, self).setup_method() + + # Pay particular attention that the watch command works with auto_build + # disabled (since normally this implies no use of the updater, but +diff --git a/tests/test_updaters.py b/tests/test_updaters.py +index aaa5b72..8c5f48a 100644 +--- a/tests/test_updaters.py ++++ b/tests/test_updaters.py +@@ -15,7 +15,7 @@ class TestBundleDefBaseUpdater(object): + changes. + """ + +- def setup(self): ++ def setup_method(self): + self.env = Environment(None, None) # we won't create files + self.env.cache = MemoryCache(capacity=100) + self.bundle = Bundle(output="target") +@@ -65,8 +65,8 @@ class TestTimestampUpdater(TempEnvironmentHelper): + + default_files = {'in': '', 'out': ''} + +- def setup(self): +- TempEnvironmentHelper.setup(self) ++ def setup_method(self): ++ TempEnvironmentHelper.setup_method(self) + + # Test the timestamp updater with cache disabled, so that the + # BundleDefUpdater() base class won't interfere. +diff --git a/tests/test_version.py b/tests/test_version.py +index d83297d..3aab5eb 100644 +--- a/tests/test_version.py ++++ b/tests/test_version.py +@@ -32,8 +32,8 @@ def test_builtin_manifest_accessors(): + + class TestTimestampVersion(TempEnvironmentHelper): + +- def setup(self): +- super(TestTimestampVersion, self).setup() ++ def setup_method(self): ++ super(TestTimestampVersion, self).setup_method() + self.v = TimestampVersion() + + # Create a bunch of files with known mtimes +@@ -95,8 +95,8 @@ class TestTimestampVersion(TempEnvironmentHelper): + + class TestHashVersion(TempEnvironmentHelper): + +- def setup(self): +- super(TestHashVersion, self).setup() ++ def setup_method(self): ++ super(TestHashVersion, self).setup_method() + self.v = HashVersion() + + # Create a bunch of files with known content +@@ -140,8 +140,8 @@ class TestHashVersion(TempEnvironmentHelper): + + class TestFileManifest(TempEnvironmentHelper): + +- def setup(self): +- super(TestFileManifest, self).setup() ++ def setup_method(self): ++ super(TestFileManifest, self).setup_method() + self.bundle = self.mkbundle(output='foo') + + def test_repl(self): +@@ -177,8 +177,8 @@ class TestFileManifest(TempEnvironmentHelper): + + class TestJsonManifest(TempEnvironmentHelper): + +- def setup(self): +- super(TestJsonManifest, self).setup() ++ def setup_method(self): ++ super(TestJsonManifest, self).setup_method() + self.bundle = self.mkbundle(output='foo') + + def test_repl(self): +@@ -200,8 +200,8 @@ class TestJsonManifest(TempEnvironmentHelper): + + class TestCacheManifest(TempEnvironmentHelper): + +- def setup(self): +- super(TestCacheManifest, self).setup() ++ def setup_method(self): ++ super(TestCacheManifest, self).setup_method() + self.bundle = self.mkbundle(output='foo') + + def test_repl(self): diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webob/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webob/default.nix index e574d78da1..1f1ca85873 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/webob/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/webob/default.nix @@ -1,25 +1,31 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, legacy-cgi, pytestCheckHook, pythonAtLeast, pythonOlder, + + # for passthru.tests + pyramid, + routes, + tokenlib, }: buildPythonPackage rec { pname = "webob"; - version = "1.8.7"; + version = "1.8.8"; pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - pname = "WebOb"; - inherit version; - hash = "sha256-tk71FBvlWc+t5EjwRPpFwiYDUe3Lao72t+AMfc7wwyM="; + src = fetchFromGitHub { + owner = "Pylons"; + repo = "webob"; + rev = "refs/tags/${version}"; + hash = "sha256-QN0UMLzO0g8Oalnn5GlOulXUxtXOx89jeeEvJV53rVs="; }; build-system = [ setuptools ]; @@ -37,6 +43,10 @@ buildPythonPackage rec { "tests/test_client_functional.py" ]; + passthru.tests = { + inherit pyramid routes tokenlib; + }; + meta = with lib; { description = "WSGI request and response object"; homepage = "https://webob.org/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix index ebd1983a0c..6da0b68c6c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix @@ -29,19 +29,19 @@ buildPythonPackage rec { pname = "werkzeug"; - version = "3.0.3"; - format = "pyproject"; + version = "3.0.4"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-CX5b/anwq6jaa4VFFG3vSB0Gqn0yZudEjizM9n3YvRg="; + hash = "sha256-NPI3FQayUN9NT4S/57CSHkdiUldiu9k2YUkJ/iXNcwY="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ markupsafe ]; + dependencies = [ markupsafe ]; optional-dependencies = { watchdog = lib.optionals (!stdenv.hostPlatform.isDarwin) [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wxpython/4.2.nix b/third_party/nixpkgs/pkgs/development/python-modules/wxpython/4.2.nix index be3a181da9..89eac63a4a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wxpython/4.2.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wxpython/4.2.nix @@ -30,7 +30,7 @@ mesa, pango, SDL, - webkitgtk, + webkitgtk_4_0, wxGTK, xorgproto, @@ -93,7 +93,7 @@ buildPythonPackage rec { libXxf86vm libglvnd mesa - webkitgtk + webkitgtk_4_0 xorgproto ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/x-wr-timezone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/x-wr-timezone/default.nix index 4d873e9590..5071804395 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/x-wr-timezone/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/x-wr-timezone/default.nix @@ -4,46 +4,43 @@ fetchFromGitHub, setuptools, icalendar, - pytz, + tzdata, pytestCheckHook, restructuredtext-lint, pygments, + pytz, }: buildPythonPackage rec { pname = "x-wr-timezone"; - version = "0.0.7"; + version = "1.0.1"; pyproject = true; src = fetchFromGitHub { owner = "niccokunzmann"; repo = "x-wr-timezone"; rev = "v${version}"; - hash = "sha256-itqsVYYUcpbKTh0BM6IHk6F9xhB+pAQnnJsnZAVpNL4="; + hash = "sha256-MDFniFhgRuNtYITH/IUUP/HHC79coqxgXrlErj+Yrcs="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ icalendar - pytz + tzdata ]; nativeCheckInputs = [ pytestCheckHook restructuredtext-lint pygments + pytz ]; preCheck = '' export PATH=$out/bin:$PATH ''; - disabledTests = [ - "test_input_to_output" - "test_output_stays_the_same" - ]; - pythonImportsCheck = [ "x_wr_timezone" ]; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix index a0abc6074a..2696b25743 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "xarray"; - version = "2024.07.0"; + version = "2024.09.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "pydata"; repo = "xarray"; rev = "refs/tags/v${version}"; - hash = "sha256-pt0qnkgf3E/QQHQAaZLommakhqEJ4NuTyjx5tdk2N1U="; + hash = "sha256-ZrqdpzcNjZMxET355PRWQaUPjvFm+m2y71F7qt8DCjg="; }; build-system = [ @@ -42,10 +42,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "xarray" ]; - meta = with lib; { + meta = { changelog = "https://github.com/pydata/xarray/blob/${src.rev}/doc/whats-new.rst"; description = "N-D labeled arrays and datasets in Python"; homepage = "https://github.com/pydata/xarray"; - license = licenses.asl20; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + doronbehar + ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xknxproject/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xknxproject/default.nix index 1973c26c06..3244c7d0c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xknxproject/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xknxproject/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - cryptography, fetchFromGitHub, pytestCheckHook, pythonOlder, @@ -12,7 +11,7 @@ buildPythonPackage rec { pname = "xknxproject"; - version = "3.8.0"; + version = "3.8.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,13 +20,12 @@ buildPythonPackage rec { owner = "XKNX"; repo = "xknxproject"; rev = "refs/tags/${version}"; - hash = "sha256-TiFeyXgu7JKrCEzGCnamguWEP+HN4DRzYOErmdlWZFY="; + hash = "sha256-iuW83gKDJTgFkfSW32OPOuwyGLyFoZGKQGUDJkVUGAM="; }; build-system = [ setuptools ]; dependencies = [ - cryptography pyzipper striprtf ]; diff --git a/third_party/nixpkgs/pkgs/development/python2-modules/pytest/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/pytest/default.nix index 0edfd30391..fa086eb46c 100644 --- a/third_party/nixpkgs/pkgs/development/python2-modules/pytest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python2-modules/pytest/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { find $out -name .pytest_cache -type d -exec rm -rf {} + } - preDistPhases+=" pytestcachePhase" + appendToVar preDistPhases pytestcachePhase # pytest generates it's own bytecode files to improve assertion messages. # These files similar to cpython's bytecode files but are never laoded @@ -55,7 +55,7 @@ buildPythonPackage rec { # https://github.com/pytest-dev/pytest/blob/4.6.11/src/_pytest/assertion/rewrite.py#L32-L47 find $out -name "*-PYTEST.py[co]" -delete } - preDistPhases+=" pytestRemoveBytecodePhase" + appendToVar preDistPhases pytestRemoveBytecodePhase ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/r-modules/cran-packages.json b/third_party/nixpkgs/pkgs/development/r-modules/cran-packages.json index 5026cbfc19..5ab76e95d3 100644 --- a/third_party/nixpkgs/pkgs/development/r-modules/cran-packages.json +++ b/third_party/nixpkgs/pkgs/development/r-modules/cran-packages.json @@ -100653,8 +100653,8 @@ }, "ragg": { "name": "ragg", - "version": "1.3.2", - "sha256": "0cb9dcp47pl0nizwy0a2ml8hm11bhf7ay20j237hmmgx159a8dw0", + "version": "1.3.3", + "sha256": "sha256-QtuEX/GNZ8rm0pGDPHahNsHvArWyRtTZDB8a6Mwbsq8=", "depends": ["systemfonts", "textshaping"] }, "rags2ridges": { diff --git a/third_party/nixpkgs/pkgs/development/r-modules/default.nix b/third_party/nixpkgs/pkgs/development/r-modules/default.nix index 3ac1f52f2e..d17cf99414 100644 --- a/third_party/nixpkgs/pkgs/development/r-modules/default.nix +++ b/third_party/nixpkgs/pkgs/development/r-modules/default.nix @@ -1084,6 +1084,24 @@ let ''; }); + sf = old.sf.overrideAttrs (attrs: { + configureFlags = [ + "--with-proj-lib=${pkgs.lib.getLib pkgs.proj}/lib" + ]; + }); + + terra = old.terra.overrideAttrs (attrs: { + configureFlags = [ + "--with-proj-lib=${pkgs.lib.getLib pkgs.proj}/lib" + ]; + }); + + vapour = old.vapour.overrideAttrs (attrs: { + configureFlags = [ + "--with-proj-lib=${pkgs.lib.getLib pkgs.proj}/lib" + ]; + }); + rzmq = old.rzmq.overrideAttrs (attrs: { preConfigure = "patchShebangs configure"; }); diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix index 1073eafbc7..36e770b05d 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix @@ -335,7 +335,7 @@ in rustc.unwrapped ]; preBuild = '' - cat ../.cargo/config > ext/fast_mmaped_file_rs/.cargo/config.toml + cat ../.cargo/config.toml > ext/fast_mmaped_file_rs/.cargo/config.toml sed -i "s|cargo-vendor-dir|$PWD/../cargo-vendor-dir|" ext/fast_mmaped_file_rs/.cargo/config.toml ''; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix index 3be56f3fe4..49557a4a1c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.257"; + version = "3.2.267"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-1uUKOIxv9p++p6t0O6RXn/cw3Py06mFxoCae0Bj75bU="; + hash = "sha256-9xAWk5RFpm4sD77exdc3kjXyvW0OR/2gv2Ox+lAONoA="; }; patches = [ ./flake8-compat-5.x.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/cpplint/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/cpplint/default.nix deleted file mode 100644 index b32e1cf4e6..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/cpplint/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, fetchpatch, python3Packages, fetchFromGitHub }: - -python3Packages.buildPythonApplication rec { - pname = "cpplint"; - version = "1.7.0"; - pyproject = true; - - # Fetch from github instead of pypi, since the test cases are not in the pypi archive - src = fetchFromGitHub { - owner = "cpplint"; - repo = "cpplint"; - # Commit where version was bumped to 1.7.0, no tag available - rev = "8f62396aff6dc850415cbe5ed7edf9dc95f4a731"; - hash = "sha256-EKD7vkxJjoKWfPrXEQRA0X3PyAoYXi9wGgUFT1zC4WM="; - }; - - patches = [ - # Whitespace fixes that make the tests pass - (fetchpatch { - url = "https://github.com/cpplint/cpplint/commit/fd257bd78db02888cf6b5985ab8f53d6b765704f.patch"; - hash = "sha256-BNyW8QEY9fUe2zMG4RZzBHASaIsu4d2FJt5rX3VgkrQ="; - }) - ]; - - postPatch = '' - substituteInPlace setup.py \ - --replace-fail '"pytest-runner==5.2"' "" - - patchShebangs cpplint_unittest.py - ''; - - build-system = with python3Packages; [ - setuptools - ]; - - nativeCheckInputs = with python3Packages; [ - pytest - ]; - - checkPhase = '' - ./cpplint_unittest.py - ''; - - meta = { - homepage = "https://github.com/cpplint/cpplint"; - description = "Static code checker for C++"; - mainProgram = "cpplint"; - maintainers = [ lib.maintainers.bhipple ]; - license = [ lib.licenses.bsd3 ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/apko/default.nix b/third_party/nixpkgs/pkgs/development/tools/apko/default.nix index 879d88cf0a..6248c08360 100644 --- a/third_party/nixpkgs/pkgs/development/tools/apko/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/apko/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "apko"; - version = "0.14.1"; + version = "0.19.1"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-O1lU3b3dNmFcV0Dfkpw63Eu6AgLSLBi7MbF47OsjgL4="; + hash = "sha256-uUsNYQPW2MtXxohdenXbNWfikp8TW0chJ5SDYU8ayV4="; # 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; @@ -24,7 +24,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-shnVJ6TcqWxUu1Ib2ewaz2VK4mi1Rt3R0Cmof9ilDJ4="; + vendorHash = "sha256-2Tuhya70R++Nv5KEd+4vjxiTTansraSXQtGm/FqRktk="; nativeBuildInputs = [ installShellFiles ]; @@ -41,9 +41,19 @@ buildGoModule rec { ldflags+=" -X sigs.k8s.io/release-utils/version.buildDate=$(cat SOURCE_DATE_EPOCH)" ''; + preCheck = '' + # some tests require a writable HOME + export HOME=$(mktemp -d) + + # some test data include SOURCE_DATE_EPOCH (which is different from our default) + # and the default version info which we get by unsetting our ldflags + export SOURCE_DATE_EPOCH=0 + ldflags= + ''; + checkFlags = [ - # fails to run on read-only filesystem - "-skip=(TestPublish|TestBuild|TestTarFS)" + # requires networking (apk.chainreg.biz) + "-skip=TestInitDB_ChainguardDiscovery" ]; postInstall = '' @@ -69,6 +79,6 @@ buildGoModule rec { description = "Build OCI images using APK directly without Dockerfile"; mainProgram = "apko"; license = licenses.asl20; - maintainers = with maintainers; [ jk developer-guy ]; + maintainers = with maintainers; [ jk developer-guy emilylange ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/alire/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/alire/default.nix index cfa6e58ff3..17f6f256ed 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/alire/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/alire/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "alire"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "alire-project"; repo = "alire"; rev = "v${finalAttrs.version}"; - hash = "sha256-fJXt3mM/v87hWumML6L3MH1O/uKkzmpE58B9nDRohzM="; + hash = "sha256-m4EPiqh7KCeNgq4G727jrW5ABb+uecvvpmZyskqtml4="; fetchSubmodules = true; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ gprbuild gnat ]; postPatch = '' - patchShebangs ./dev/build.sh + patchShebangs ./dev/build.sh ./scripts/version-patcher.sh ''; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix index 13f16c9171..489181187c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix @@ -1,21 +1,23 @@ -{ lib, stdenv -, fetchFromGitHub -, cmake -, ninja -, pkg-config -, grpc -, protobuf -, openssl -, nlohmann_json -, gtest -, spdlog -, c-ares -, zlib -, sqlite -, re2 -, lit -, python3 -, coreutils +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ninja, + pkg-config, + grpc, + protobuf_25, + openssl, + nlohmann_json, + gtest, + spdlog, + c-ares, + zlib, + sqlite, + re2, + lit, + python3, + coreutils, }: stdenv.mkDerivation rec { @@ -41,7 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ grpc - protobuf + protobuf_25 openssl nlohmann_json gtest diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix index b0d9c72ad2..b6db8634c0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "bloop"; - version = "2.0.2"; + version = "2.0.3"; platform = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then "x86_64-pc-linux" @@ -36,9 +36,9 @@ stdenv.mkDerivation rec { bloop-binary = fetchurl rec { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}"; sha256 = - if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then "sha256-xYVfgi3ANjBiuf4/5FDgSYDL/fPsvuJn4jFxAEVYct4=" - else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then "sha256-lq0S2AsulcUUYDd3qnWonwd/W0/gb7lJwC+QTYTlTdg=" - else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then "sha256-e+9Q7xIEsHloaKOj13vZnGs2vulkOJv7tCOuACobHvk=" + if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then "sha256-aEsEXGaKi+wziNAuuX3s/LWB6/fIjon9NF3w9c/lTUE=" + else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then "sha256-dEVWDwFVsg1eqrAAfuuR5FUFyAt44ev7UP7zxByzW14=" + else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then "sha256-0rYdivIas6ECwGPm3bACMzHhS+yxQNLtEPxPQAXkSg0=" else throw "unsupported platform"; }; @@ -70,6 +70,6 @@ stdenv.mkDerivation rec { description = "Scala build server and command-line tool to make the compile and test developer workflows fast and productive in a build-tool-agnostic way"; mainProgram = "bloop"; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; - maintainers = with maintainers; [ kubukoz tomahna ]; + maintainers = with maintainers; [ agilesteel kubukoz tomahna ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/buck2/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/buck2/default.nix index c1e504a2da..4e92900f12 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/buck2/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/buck2/default.nix @@ -38,7 +38,7 @@ let buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json); # our version of buck2; this should be a git tag - version = "2024-05-15"; + version = "2024-10-15"; # the platform-specific, statically linked binary — which is also # zstd-compressed @@ -63,7 +63,7 @@ let # tooling prelude-src = let - prelude-hash = "4e9e6d50b8b461564a7e351ff60b87fe59d7e53b"; + prelude-hash = "615f852ad43a901d8a09b2cbbb3aefff61626c52"; name = "buck2-prelude-${version}.tar.gz"; hash = buildHashes."_prelude"; url = "https://github.com/facebook/buck2-prelude/archive/${prelude-hash}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/buck2/hashes.json b/third_party/nixpkgs/pkgs/development/tools/build-managers/buck2/hashes.json index 0aa1592ceb..a48ac27b94 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/buck2/hashes.json +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/buck2/hashes.json @@ -1,7 +1,7 @@ { "_comment": "@generated by pkgs/development/tools/build-managers/buck2/update.sh" -, "_prelude": "sha256-r2opeCtXAFxF3PbqKDKK0+pcySe70hUEtMiX7QlWZCQ=" -, "x86_64-linux": "sha256-Ln2FkZDQRKlTLU+EvcEE0VNW0BdnaZRd9nNeY8YgGVA=" -, "x86_64-darwin": "sha256-qSO+eERWWBH7KKBft/cze3sV04QZl3itpFNud6AFrFM=" -, "aarch64-linux": "sha256-KNYsZv5io4NYa/45rxzx+5ta6L7LrxV/GnqNWT4Y5/k=" -, "aarch64-darwin": "sha256-YUMrU5WsRu9ZAMzUS3xS/FFuiXtfbByMtT49CRGQ8do=" +, "_prelude": "sha256-R2aC8tcg21UBEHdQzL4xOnOQc6p48ObvGswGqfmY2WM=" +, "x86_64-linux": "sha256-vyBsK0dj/SYsB36ks8v+ysLC7Pq+Bg1bY3V9Vk+onnE=" +, "x86_64-darwin": "sha256-7QKrAtAiCC8uimA7ttWlTK+JaaHt0p+lYfxGKahQ+Bs=" +, "aarch64-linux": "sha256-Jh+S0eeCZ8DKIZGQWVetQiMshyKgTMPZm9W7U2cpkMk=" +, "aarch64-darwin": "sha256-xEc0DUSjOOthSLCFTq2qZVt4TQL3EpMdl3iaPY6WFgU=" } diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gn/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/gn/default.nix index 508a821d74..c3af8fe72d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/gn/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/gn/default.nix @@ -1,10 +1,10 @@ { callPackage, ... } @ args: callPackage ./generic.nix args { - # Note: Please use the recommended version for Chromium, e.g.: - # https://git.archlinux.org/svntogit/packages.git/tree/trunk/chromium-gn-version.sh?h=packages/gn - rev = "fd3d768bcfd44a8d9639fe278581bd9851d0ce3a"; - revNum = "1718"; # git describe HEAD --match initial-commit | cut -d- -f3 - version = "2020-03-09"; - sha256 = "1asc14y8by7qcn10vbk467hvx93s30pif8r0brissl0sihsaqazr"; + # Note: Please use the recommended version for Chromium stabe, i.e. from + # /pkgs/applications/networking/browsers/chromium/upstream-info.nix + rev = "df98b86690c83b81aedc909ded18857296406159"; + revNum = "2168"; # git describe $rev --match initial-commit | cut -d- -f3 + version = "2024-05-13"; + sha256 = "sha256-mNoQeHSSM+rhR0UHrpbyzLJC9vFqfxK1SD0X8GiRsqw="; } diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gn/generic.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/gn/generic.nix index 71242ceaba..4fc2fd6b53 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/gn/generic.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/gn/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, cctools, darwin, writeText +{ stdenv, lib, fetchgit, fetchpatch, cctools, darwin, writeText , ninja, python3 , ... }: @@ -27,6 +27,15 @@ in stdenv.mkDerivation { inherit rev sha256; }; + patches = [ + (fetchpatch { + name = "LFS64.patch"; + url = "https://gn.googlesource.com/gn/+/b5ff50936a726ff3c8d4dfe2a0ae120e6ce1350d%5E%21/?format=TEXT"; + decode = "base64 -d"; + hash = "sha256-/kh8t/Ip1EG2OIhydS//st/C80KJ4P31vGx7j8QpFh0="; + }) + ]; + nativeBuildInputs = [ ninja python3 ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin; with apple_sdk.frameworks; [ libobjc diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/setup-hook.sh b/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/setup-hook.sh index a16742414b..6c9c927f0c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/setup-hook.sh +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/setup-hook.sh @@ -29,7 +29,9 @@ gradleConfigureHook() { } gradle() { - command gradle $gradleFlags "${gradleFlagsArray[@]}" "$@" + local flagsArray=() + concatTo flagsArray gradleFlags gradleFlagsArray + command gradle "${flagsArray[@]}" "$@" } gradleBuildPhase() { diff --git a/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/Cargo.lock index 10e0ec5363..7c4c52dda1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/Cargo.lock @@ -150,7 +150,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -161,7 +161,35 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", +] + +[[package]] +name = "async-tungstenite" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90e661b6cb0a6eb34d02c520b052daa3aa9ac0cc02495c9d066bbce13ead132b" +dependencies = [ + "futures-io", + "futures-util", + "log", + "native-tls", + "pin-project-lite", + "tokio", + "tokio-native-tls", + "tungstenite", +] + +[[package]] +name = "async_io_stream" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" +dependencies = [ + "futures", + "pharos", + "rustc_version", + "tokio", ] [[package]] @@ -177,6 +205,15 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", +] + [[package]] name = "atomic-shim" version = "0.2.0" @@ -257,6 +294,12 @@ version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "bigdecimal" version = "0.3.1" @@ -400,16 +443,16 @@ dependencies = [ [[package]] name = "bson" -version = "2.8.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88c18b51216e1f74b9d769cead6ace2f82b965b807e3d73330aabe9faec31c84" +checksum = "d8a88e82b9106923b5c4d6edfca9e7db958d4e98a478ec115022e81b9b38e2c8" dependencies = [ "ahash 0.8.7", "base64 0.13.1", "bitvec", "chrono", "hex", - "indexmap 1.9.3", + "indexmap 2.2.2", "js-sys", "once_cell", "rand 0.8.5", @@ -429,6 +472,10 @@ dependencies = [ "memchr", ] +[[package]] +name = "build-utils" +version = "0.1.0" + [[package]] name = "bumpalo" version = "3.13.0" @@ -677,7 +724,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f76990911f2267d837d9d0ad060aa63aaad170af40904b29461734c339030d4d" dependencies = [ "quote", - "syn 2.0.48", + "syn 2.0.58", +] + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", ] [[package]] @@ -867,9 +923,12 @@ dependencies = [ name = "crosstarget-utils" version = "0.1.0" dependencies = [ + "derive_more", + "enumflags2", "futures", "js-sys", "pin-project", + "regex", "tokio", "wasm-bindgen", "wasm-bindgen-futures", @@ -892,7 +951,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f34ba9a9bcb8645379e9de8cb3ecfcf4d1c85ba66d90deb3259206fa5aa193b" dependencies = [ "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -947,6 +1006,16 @@ dependencies = [ "darling_macro 0.13.4", ] +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core 0.20.10", + "darling_macro 0.20.10", +] + [[package]] name = "darling_core" version = "0.10.2" @@ -975,6 +1044,20 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.11.1", + "syn 2.0.58", +] + [[package]] name = "darling_macro" version = "0.10.2" @@ -997,6 +1080,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core 0.20.10", + "quote", + "syn 2.0.58", +] + [[package]] name = "dashmap" version = "5.5.0" @@ -1004,7 +1098,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d" dependencies = [ "cfg-if", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core 0.9.8", @@ -1036,6 +1130,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", + "serde", ] [[package]] @@ -1058,7 +1153,7 @@ dependencies = [ "convert_case 0.4.0", "proc-macro2", "quote", - "rustc_version 0.4.0", + "rustc_version", "syn 1.0.109", ] @@ -1244,14 +1339,14 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" [[package]] name = "enum-as-inner" -version = "0.4.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.58", ] [[package]] @@ -1272,7 +1367,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -1291,6 +1386,17 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + [[package]] name = "expect-test" version = "1.4.1" @@ -1329,6 +1435,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +[[package]] +name = "fallible-iterator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" + [[package]] name = "fallible-streaming-iterator" version = "0.1.9" @@ -1364,6 +1476,17 @@ dependencies = [ "miniz_oxide", ] +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "futures-core", + "futures-sink", + "spin 0.9.8", +] + [[package]] name = "fnv" version = "1.0.7" @@ -1419,7 +1542,7 @@ checksum = "b0fa992f1656e1707946bbba340ad244f0814009ef8c0118eb7b658395f19a2e" dependencies = [ "frunk_proc_macro_helpers", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -1431,7 +1554,7 @@ dependencies = [ "frunk_core", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -1443,7 +1566,7 @@ dependencies = [ "frunk_core", "frunk_proc_macro_helpers", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -1500,6 +1623,17 @@ dependencies = [ "futures-util", ] +[[package]] +name = "futures-intrusive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot 0.12.1", +] + [[package]] name = "futures-io" version = "0.3.28" @@ -1514,7 +1648,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -1633,7 +1767,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.9", "indexmap 2.2.2", "slab", "tokio", @@ -1667,9 +1801,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash 0.8.7", "allocator-api2", @@ -1677,11 +1811,11 @@ dependencies = [ [[package]] name = "hashlink" -version = "0.8.3" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312f66718a2d7789ffef4f4b7b213138ed9f1eb3aa1d0d82fc99f88fb3ffd26f" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -1720,6 +1854,51 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hickory-proto" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.4.0", + "ipnet", + "once_cell", + "rand 0.8.5", + "thiserror", + "tinyvec", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "hickory-resolver" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28757f23aa75c98f254cf0405e6d8c25b831b32921b050a66692427679b1f243" +dependencies = [ + "cfg-if", + "futures-util", + "hickory-proto", + "ipconfig", + "lru-cache", + "once_cell", + "parking_lot 0.12.1", + "rand 0.8.5", + "resolv-conf", + "smallvec", + "thiserror", + "tokio", + "tracing", +] + [[package]] name = "hmac" version = "0.12.1" @@ -1760,6 +1939,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.5" @@ -1767,7 +1957,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", - "http", + "http 0.2.9", "pin-project-lite", ] @@ -1794,7 +1984,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", + "http 0.2.9", "http-body", "httparse", "httpdate", @@ -1863,11 +2053,10 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.2.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ - "matches", "unicode-bidi", "unicode-normalization", ] @@ -1890,6 +2079,7 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", + "serde", ] [[package]] @@ -1899,7 +2089,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "serde", ] @@ -1963,7 +2153,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.3", + "socket2 0.5.7", "widestring", "windows-sys 0.48.0", "winreg 0.50.0", @@ -2166,9 +2356,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.26.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" +checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" dependencies = [ "cc", "pkg-config", @@ -2278,12 +2468,6 @@ dependencies = [ "regex-automata 0.1.10", ] -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - [[package]] name = "md-5" version = "0.10.5" @@ -2455,9 +2639,8 @@ dependencies = [ [[package]] name = "mongodb" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c30763a5c6c52079602be44fa360ca3bfacee55fca73f4734aecd23706a7f2" +version = "3.0.0" +source = "git+https://github.com/prisma/mongo-rust-driver.git?branch=RUST-1994/happy-eyeballs#31e0356391a7871bec000ae35fe0edc35582449e" dependencies = [ "async-trait", "base64 0.13.1", @@ -2471,9 +2654,12 @@ dependencies = [ "futures-io", "futures-util", "hex", + "hickory-proto", + "hickory-resolver", "hmac", - "lazy_static", "md-5", + "mongodb-internal-macros", + "once_cell", "pbkdf2", "percent-encoding", "rand 0.8.5", @@ -2485,16 +2671,14 @@ dependencies = [ "serde_with", "sha-1", "sha2 0.10.7", - "socket2 0.4.9", + "socket2 0.5.7", "stringprep", - "strsim 0.10.0", + "strsim 0.11.1", "take_mut", "thiserror", "tokio", "tokio-rustls 0.24.1", "tokio-util 0.7.8", - "trust-dns-proto", - "trust-dns-resolver", "typed-builder", "uuid", "webpki-roots", @@ -2510,6 +2694,16 @@ dependencies = [ "thiserror", ] +[[package]] +name = "mongodb-internal-macros" +version = "3.0.0" +source = "git+https://github.com/prisma/mongo-rust-driver.git?branch=RUST-1994/happy-eyeballs#31e0356391a7871bec000ae35fe0edc35582449e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + [[package]] name = "mongodb-query-connector" version = "0.1.0" @@ -2548,6 +2742,7 @@ dependencies = [ name = "mongodb-schema-connector" version = "0.1.0" dependencies = [ + "bson", "convert_case 0.6.0", "datamodel-renderer", "dissimilar", @@ -2576,6 +2771,7 @@ dependencies = [ name = "mongodb-schema-describer" version = "0.1.0" dependencies = [ + "bson", "futures", "mongodb", "serde", @@ -2718,7 +2914,7 @@ dependencies = [ "napi-derive-backend", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -2732,8 +2928,8 @@ dependencies = [ "proc-macro2", "quote", "regex", - "semver 1.0.18", - "syn 2.0.48", + "semver", + "syn 2.0.58", ] [[package]] @@ -2934,7 +3130,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -2996,7 +3192,7 @@ dependencies = [ "async-trait", "futures", "futures-util", - "http", + "http 0.2.9", "opentelemetry", "prost", "thiserror", @@ -3046,6 +3242,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + [[package]] name = "parking_lot" version = "0.11.2" @@ -3185,7 +3387,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -3219,6 +3421,16 @@ dependencies = [ "indexmap 1.9.3", ] +[[package]] +name = "pharos" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" +dependencies = [ + "futures", + "rustc_version", +] + [[package]] name = "phf" version = "0.11.2" @@ -3254,7 +3466,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -3306,7 +3518,7 @@ dependencies = [ [[package]] name = "postgres-native-tls" version = "0.5.0" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#a1a2dc6d9584deaf70a14293c428e7b6ca614d98" +source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#54a490bc6afa315abb9867304fb67e8b12a8fbf3" dependencies = [ "native-tls", "tokio", @@ -3317,12 +3529,12 @@ dependencies = [ [[package]] name = "postgres-protocol" version = "0.6.4" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#a1a2dc6d9584deaf70a14293c428e7b6ca614d98" +source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#54a490bc6afa315abb9867304fb67e8b12a8fbf3" dependencies = [ "base64 0.13.1", "byteorder", "bytes", - "fallible-iterator", + "fallible-iterator 0.2.0", "hmac", "md-5", "memchr", @@ -3334,12 +3546,12 @@ dependencies = [ [[package]] name = "postgres-types" version = "0.2.4" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#a1a2dc6d9584deaf70a14293c428e7b6ca614d98" +source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#54a490bc6afa315abb9867304fb67e8b12a8fbf3" dependencies = [ "bit-vec", "bytes", "chrono", - "fallible-iterator", + "fallible-iterator 0.2.0", "postgres-protocol", "serde", "serde_json", @@ -3388,6 +3600,7 @@ dependencies = [ name = "prisma-fmt" version = "0.1.0" dependencies = [ + "build-utils", "colored", "dissimilar", "dmmf", @@ -3609,6 +3822,7 @@ name = "quaint" version = "0.2.0-alpha.13" dependencies = [ "async-trait", + "async-tungstenite", "base64 0.12.3", "bigdecimal", "bit-vec", @@ -3620,6 +3834,7 @@ dependencies = [ "connection-string", "crosstarget-utils", "either", + "enumflags2", "expect-test", "futures", "getrandom 0.2.11", @@ -3640,6 +3855,7 @@ dependencies = [ "postgres-types", "quaint-test-macros", "quaint-test-setup", + "regex", "rusqlite", "serde", "serde_json", @@ -3648,11 +3864,12 @@ dependencies = [ "tiberius", "tokio", "tokio-postgres", - "tokio-util 0.6.10", + "tokio-util 0.7.8", "tracing", "tracing-core", "url", "uuid", + "ws_stream_tungstenite", ] [[package]] @@ -3757,6 +3974,7 @@ dependencies = [ "anyhow", "async-trait", "base64 0.13.1", + "build-utils", "connection-string", "enumflags2", "graphql-parser", @@ -3791,6 +4009,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", + "build-utils", "cbindgen", "chrono", "connection-string", @@ -3869,6 +4088,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", + "build-utils", "connection-string", "driver-adapters", "futures", @@ -3931,6 +4151,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", + "build-utils", "connection-string", "driver-adapters", "futures", @@ -4225,9 +4446,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.3" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick 1.0.3", "memchr", @@ -4318,7 +4539,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", + "http 0.2.9", "http-body", "hyper", "hyper-tls", @@ -4412,13 +4633,13 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" +checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae" dependencies = [ "bitflags 2.4.0", "chrono", - "fallible-iterator", + "fallible-iterator 0.3.0", "fallible-streaming-iterator", "hashlink", "libsqlite3-sys", @@ -4454,32 +4675,23 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - [[package]] name = "rustc_version" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.18", + "semver", ] [[package]] name = "rustc_version_runtime" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d31b7153270ebf48bf91c65ae5b0c00e749c4cfad505f66530ac74950249582f" +checksum = "2dd18cd2bae1820af0b6ad5e54f4a51d0f3fcc53b05f845675074efcc7af071d" dependencies = [ - "rustc_version 0.2.3", - "semver 0.9.0", + "rustc_version", + "semver", ] [[package]] @@ -4648,6 +4860,7 @@ version = "0.1.0" dependencies = [ "backtrace", "base64 0.13.1", + "build-utils", "connection-string", "expect-test", "indoc 2.0.3", @@ -4724,32 +4937,17 @@ dependencies = [ "libc", ] -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - [[package]] name = "semver" version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - [[package]] name = "serde" -version = "1.0.209" +version = "1.0.206" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +checksum = "5b3e4cd94123dd520a128bcd11e34d9e9e423e7e3e50425cb1b4b1e3549d0284" dependencies = [ "serde_derive", ] @@ -4776,13 +4974,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.209" +version = "1.0.206" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +checksum = "fabfb6138d2383ea8208cf98ccf69cdfb1aff4088460681d84189aa259762f97" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -4793,7 +4991,7 @@ checksum = "e578a843d40b4189a4d66bba51d7684f57da5bd7c304c64e14bd63efbef49509" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -4816,7 +5014,7 @@ checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -4833,24 +5031,32 @@ dependencies = [ [[package]] name = "serde_with" -version = "1.14.0" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" +checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" dependencies = [ + "base64 0.22.1", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.2.2", "serde", + "serde_derive", + "serde_json", "serde_with_macros", + "time", ] [[package]] name = "serde_with_macros" -version = "1.5.2" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" +checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" dependencies = [ - "darling 0.13.4", + "darling 0.20.10", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.58", ] [[package]] @@ -4875,7 +5081,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -5012,12 +5218,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -5031,6 +5237,9 @@ name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] [[package]] name = "sql-ddl" @@ -5077,6 +5286,7 @@ dependencies = [ "indoc 2.0.3", "jsonrpc-core", "once_cell", + "paste", "pretty_assertions", "prisma-value", "psl", @@ -5136,6 +5346,7 @@ dependencies = [ "datamodel-renderer", "either", "enumflags2", + "expect-test", "indexmap 2.2.2", "indoc 2.0.3", "once_cell", @@ -5150,6 +5361,8 @@ dependencies = [ "sql-schema-describer", "sqlformat", "sqlparser", + "sqlx-core", + "sqlx-sqlite", "tokio", "tracing", "tracing-futures", @@ -5205,6 +5418,61 @@ dependencies = [ "log", ] +[[package]] +name = "sqlx-core" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a999083c1af5b5d6c071d34a708a19ba3e02106ad82ef7bbd69f5e48266b613b" +dependencies = [ + "atoi", + "byteorder", + "bytes", + "crossbeam-queue", + "either", + "event-listener", + "futures-channel", + "futures-core", + "futures-intrusive", + "futures-io", + "futures-util", + "hashbrown 0.14.5", + "hashlink", + "hex", + "indexmap 2.2.2", + "log", + "memchr", + "once_cell", + "paste", + "percent-encoding", + "smallvec", + "sqlformat", + "thiserror", + "tracing", + "url", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2cdd83c008a622d94499c0006d8ee5f821f36c89b7d625c900e5dc30b5c5ee" +dependencies = [ + "atoi", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde_urlencoded", + "sqlx-core", + "tracing", + "url", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -5248,6 +5516,12 @@ 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 = "structopt" version = "0.3.26" @@ -5301,9 +5575,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", @@ -5362,6 +5636,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", + "build-utils", "colored", "dmmf", "enumflags2", @@ -5433,7 +5708,7 @@ checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -5536,9 +5811,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.30.0" +version = "1.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3ce25f50619af8b0aec2eb23deebe84249e19e2ddd393a6e16e3300a6dadfd" +checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df" dependencies = [ "backtrace", "bytes", @@ -5548,7 +5823,7 @@ dependencies = [ "parking_lot 0.12.1", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.3", + "socket2 0.5.7", "tokio-macros", "windows-sys 0.48.0", ] @@ -5565,13 +5840,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -5587,12 +5862,12 @@ dependencies = [ [[package]] name = "tokio-postgres" version = "0.7.7" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#a1a2dc6d9584deaf70a14293c428e7b6ca614d98" +source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#54a490bc6afa315abb9867304fb67e8b12a8fbf3" dependencies = [ "async-trait", "byteorder", "bytes", - "fallible-iterator", + "fallible-iterator 0.2.0", "futures-channel", "futures-util", "log", @@ -5602,7 +5877,7 @@ dependencies = [ "pin-project-lite", "postgres-protocol", "postgres-types", - "socket2 0.5.3", + "socket2 0.5.7", "tokio", "tokio-util 0.7.8", ] @@ -5647,7 +5922,6 @@ checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" dependencies = [ "bytes", "futures-core", - "futures-io", "futures-sink", "log", "pin-project-lite", @@ -5691,7 +5965,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", + "http 0.2.9", "http-body", "hyper", "hyper-timeout", @@ -5776,7 +6050,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -5866,51 +6140,6 @@ dependencies = [ "tracing-serde", ] -[[package]] -name = "trust-dns-proto" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d" -dependencies = [ - "async-trait", - "cfg-if", - "data-encoding", - "enum-as-inner", - "futures-channel", - "futures-io", - "futures-util", - "idna 0.2.3", - "ipnet", - "lazy_static", - "log", - "rand 0.8.5", - "smallvec", - "thiserror", - "tinyvec", - "tokio", - "url", -] - -[[package]] -name = "trust-dns-resolver" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558" -dependencies = [ - "cfg-if", - "futures-util", - "ipconfig", - "lazy_static", - "log", - "lru-cache", - "parking_lot 0.12.1", - "resolv-conf", - "smallvec", - "thiserror", - "tokio", - "trust-dns-proto", -] - [[package]] name = "try-lock" version = "0.2.4" @@ -5939,7 +6168,26 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.48", + "syn 2.0.58", +] + +[[package]] +name = "tungstenite" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.1.0", + "httparse", + "log", + "native-tls", + "rand 0.8.5", + "sha1", + "thiserror", + "utf-8", ] [[package]] @@ -6083,6 +6331,12 @@ dependencies = [ "user-facing-error-macros", ] +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + [[package]] name = "utf8-width" version = "0.1.6" @@ -6225,7 +6479,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", "wasm-bindgen-shared", ] @@ -6259,7 +6513,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6603,6 +6857,26 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "ws_stream_tungstenite" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed39ff9f8b2eda91bf6390f9f49eee93d655489e15708e3bb638c1c4f07cecb4" +dependencies = [ + "async-tungstenite", + "async_io_stream", + "bitflags 2.4.0", + "futures-core", + "futures-io", + "futures-sink", + "futures-util", + "pharos", + "rustc_version", + "tokio", + "tracing", + "tungstenite", +] + [[package]] name = "wyz" version = "0.5.1" @@ -6644,5 +6918,5 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] diff --git a/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix index 756d5e85ab..c404bed341 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix @@ -2,7 +2,6 @@ , lib , Security , openssl -, git , pkg-config , protobuf , rustPlatform @@ -14,13 +13,13 @@ # function correctly. rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "5.18.0"; + version = "5.21.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - hash = "sha256-ucAOz00dBgX2Bb63ueaBbyu1XtVQD+96EncUyo7STwA="; + hash = "sha256-X5aBrnyZ/tMykJFifyY1LeR/nShBlxm9HazVE0L7RJk="; }; # Use system openssl. @@ -33,21 +32,23 @@ rustPlatform.buildRustPackage rec { "cuid-1.3.2" = "sha256-qBu1k/dJiA6rWBwk4nOOqouIneD9h2TTBT8tvs0TDfA="; "graphql-parser-0.3.0" = "sha256-0ZAsj2mW6fCLhwTETucjbu4rPNzfbNiHu2wVTBlTNe4="; "mysql_async-0.31.3" = "sha256-2wOupQ/LFV9pUifqBLwTvA0tySv+XWbxHiqs7iTzvvg="; - "postgres-native-tls-0.5.0" = "sha256-UYPsxhCkXXWk8yPbqjNS0illwjS5mVm3Z/jFwpVwqfw="; + "postgres-native-tls-0.5.0" = "sha256-4CftieImsG2mBqpoJFfyq0R2yd2EyQX4oddAwyXMDZc="; + "mongodb-3.0.0" = "sha256-1WQgY0zSZhFjt1nrLYTUBrpqBxpCCgKRSeGJLtkE6pw="; }; }; - nativeBuildInputs = [ pkg-config git ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl protobuf ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - # FIXME: Workaround Rust 1.80 support by updating time to 0.3.36 - # https://github.com/prisma/prisma-engines/issues/4989 + # FIXME: fix this upstream and remove this patch with the next version update. postPatch = '' - ln -sfn ${./Cargo.lock} Cargo.lock + file=libs/user-facing-errors/src/schema_engine.rs + echo "#![allow(dead_code)]" | cat - $file > $file.new + mv $file.new $file ''; preBuild = '' @@ -59,6 +60,8 @@ rustPlatform.buildRustPackage rec { export SQLITE_MAX_VARIABLE_NUMBER=250000 export SQLITE_MAX_EXPR_DEPTH=10000 + + export GIT_HASH=0000000000000000000000000000000000000000 ''; cargoBuildFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlc/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqlc/default.nix index 9340132b63..4ec22b7dfc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/sqlc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/sqlc/default.nix @@ -24,6 +24,6 @@ buildGoModule { mainProgram = "sqlc"; homepage = "https://sqlc.dev/"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.adisbladis ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix index 16ae0bbad2..c68e1e00fc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "3.2.0"; + version = "3.2.4"; pyproject = true; src = fetchFromGitHub { owner = "sqlfluff"; repo = "sqlfluff"; rev = "refs/tags/${version}"; - hash = "sha256-7bCfIWJV7gB+WbvMxmhJW1RM1pd3gA/bCuH+o4FGg/A="; + hash = "sha256-7EP2XIbvdB3oCFTY6IS9r00/QEB/eHJth05hVBzZCUI="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix index c90bfbd3b3..ec73d53400 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sqlitebrowser"; - version = "3.13.0"; + version = "3.13.1"; src = fetchFromGitHub { owner = "sqlitebrowser"; repo = "sqlitebrowser"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-2U0jnL2hmrxynMxEiObl10bKFAFlCrY2hulZ/Ggqimw="; + sha256 = "sha256-bpZnO8i8MDgOm0f93pBmpy1sZLJQ9R4o4ZLnGfT0JRg="; }; patches = lib.optional stdenv.hostPlatform.isDarwin ./macos.patch; diff --git a/third_party/nixpkgs/pkgs/development/tools/devbox/default.nix b/third_party/nixpkgs/pkgs/development/tools/devbox/default.nix index 6615bcb71a..5df6117abe 100644 --- a/third_party/nixpkgs/pkgs/development/tools/devbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/devbox/default.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "devbox"; - version = "0.13.3"; + version = "0.13.4"; src = fetchFromGitHub { owner = "jetpack-io"; repo = pname; rev = version; - hash = "sha256-A1dl5bQ7+Qe+MxzplQ2duGqWwgZYHd6M2MQUPPFlx14="; + hash = "sha256-+3AKBhxf1m6cBNtEx8xmUmJ2PUk0LNPaS+cZhsXJoTs="; }; ldflags = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/devpod/default.nix b/third_party/nixpkgs/pkgs/development/tools/devpod/default.nix index 057c0d1e9d..2236d27be2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/devpod/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/devpod/default.nix @@ -18,7 +18,7 @@ , rustPlatform , stdenv , testers -, webkitgtk +, webkitgtk_4_0 }: let @@ -146,7 +146,7 @@ rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 libayatana-appindicator - webkitgtk + webkitgtk_4_0 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa diff --git a/third_party/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix b/third_party/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix index 5aea91699a..6c698c3a51 100644 --- a/third_party/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix @@ -14,7 +14,7 @@ , shared-mime-info , stdenv , unzip -, webkitgtk +, webkitgtk_4_0 , zlib }: @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { # Create wrapper script. Pass -configuration to store settings in ~/.eclipse-mat/ makeWrapper $out/mat/MemoryAnalyzer $out/bin/eclipse-mat \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk ])} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk_4_0 ])} \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-configuration \$HOME/.eclipse-mat/''${version}/configuration" @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { libXtst zlib shared-mime-info - webkitgtk + webkitgtk_4_0 ]; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/errcheck/default.nix b/third_party/nixpkgs/pkgs/development/tools/errcheck/default.nix index be79ea2f57..fe33dff037 100644 --- a/third_party/nixpkgs/pkgs/development/tools/errcheck/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/errcheck/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "errcheck"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "kisielk"; repo = "errcheck"; rev = "v${version}"; - hash = "sha256-hl1EbAO4okfTahl+1WDsFuVgm6Ba98Ji0hxqVe7jGbk="; + hash = "sha256-KEDUXZ720fntrQ8XIpbArU8Q1xEiOw32nYcNhXnQO7Q="; }; vendorHash = "sha256-rO2FoFksN3OdKXwlJBuISs6FmCtepc4FDLdOa5AHvC4="; diff --git a/third_party/nixpkgs/pkgs/development/tools/gcov2lcov/default.nix b/third_party/nixpkgs/pkgs/development/tools/gcov2lcov/default.nix index 0ac499923f..4bc714a6a1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gcov2lcov/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gcov2lcov/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gcov2lcov"; - version = "1.0.6"; + version = "1.1.0"; src = fetchFromGitHub { owner = "jandelgado"; repo = "gcov2lcov"; rev = "v${version}"; - hash = "sha256-S5fAhd0bh1XEeQwaya8LvnKQ/iz4PjAbpjK4uFI6H1g="; + hash = "sha256-E8TPxaKJTd+5OP9e5S1FD5aZP42nJvjiqqNs4xP9gm4="; }; - vendorHash = "sha256-r95PFkTywGiDIEnDfLpzt97SkuDeXo4xg2N7ikG0hs0="; + vendorHash = "sha256-/2OIBWXbNch6lmw0C1jkyJfNefJXOVG9/jNW8CYHTsc="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/glamoroustoolkit/default.nix b/third_party/nixpkgs/pkgs/development/tools/glamoroustoolkit/default.nix index 9f44b74933..3fb6aed7f0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/glamoroustoolkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/glamoroustoolkit/default.nix @@ -28,23 +28,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "glamoroustoolkit"; - version = "1.1.2"; + version = "1.1.4"; src = fetchzip { url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip"; stripRoot = false; - hash = "sha256-C48zAKkkOIHe7ggjtjBVLbfCVRdY6BJGqdvTI/rCfns="; + hash = "sha256-/p/oCE1fmlPjy1Xg36rsczZ74L0M7qWsdcFm6cHPVVY="; }; nativeBuildInputs = [ wrapGAppsHook3 - (patchelf.overrideAttrs (old: { - version = "0.11"; - src = fetchurl { - url = "https://nixos.org/releases/patchelf/patchelf-0.11/patchelf-0.11.tar.bz2"; - sha256 = "16ms3ijcihb88j3x6cl8cbvhia72afmfcphczb9cfwr0gbc22chx"; - }; - })) ]; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix index 09cb7e2a74..4a122d6348 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix @@ -1,7 +1,6 @@ { lib , buildGoModule , fetchFromGitHub -, fetchpatch , installShellFiles , testers , go-task @@ -20,16 +19,6 @@ buildGoModule rec { vendorHash = "sha256-P9J69WJ2C2xgdU9xydiaY8iSKB7ZfexLNYi7dyHDTIk="; - patches = [ - # fix version resolution when passed in though ldflags - # remove on next release - (fetchpatch { - name = "fix-ldflags-version.patch"; - url = "https://github.com/go-task/task/commit/9ee4f21d62382714ac829df6f9bbf1637406eb5b.patch?full_index=1"; - hash = "sha256-wu5//aZ/vzuObb03AjUUlVFjPr175mn1vVAZgqSGIZ0="; - }) - ]; - doCheck = false; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/gotemplate/default.nix b/third_party/nixpkgs/pkgs/development/tools/gotemplate/default.nix index b950f5865c..9e748ba3d8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gotemplate/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gotemplate/default.nix @@ -2,16 +2,20 @@ buildGo123Module rec { pname = "gotemplate"; - version = "3.9.1"; + version = "3.9.2"; src = fetchFromGitHub { owner = "coveooss"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-sRCyOQmj4ti+1Qdap0Q5MLoJZLwjZtw1cYjZMGksvuA="; + hash = "sha256-7FJejArGpnmkAzbN+2BOcewLdlcsh8QblOOZjFu+uSA="; }; - vendorHash = "sha256-xtvexOmzTXjP3QsGp0aL3FdJe3mdBSCnTeM6hLq/tIo="; + vendorHash = "sha256-378oodyQG50l7qkTO5Ryt1NjFBbYW2n9by+ALNfTggI="; + + # This is the value reported when running `gotemplate --version`, + # see https://github.com/coveooss/gotemplate/issues/262 + ldflags = [ "-X main.version=${version}" ]; meta = with lib; { description = "CLI for go text/template"; diff --git a/third_party/nixpkgs/pkgs/development/tools/gptcommit/default.nix b/third_party/nixpkgs/pkgs/development/tools/gptcommit/default.nix index 2c97533a26..1a4036d771 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gptcommit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gptcommit/default.nix @@ -11,7 +11,7 @@ let pname = "gptcommit"; - version = "0.5.16"; + version = "0.5.17"; in rustPlatform.buildRustPackage { inherit pname version; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "zurawiki"; repo = pname; rev = "v${version}"; - hash = "sha256-JhMkK2zw3VL9o7j8DJmjY/im+GyCjfV2TJI3GDo8T8c="; + hash = "sha256-MB78QsJA90Au0bCUXfkcjnvfPagTPZwFhFVqxix+Clw="; }; - cargoHash = "sha256-ye9MAfG3m24ofV95Kr+KTP4FEqfrsm3aTQ464hG9q08="; + cargoHash = "sha256-F4nabUeQZMnmSNC8KlHjx3IcyR2Xn36kovabmJ6g1zo="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/inferno/default.nix b/third_party/nixpkgs/pkgs/development/tools/inferno/default.nix index 9657129fd0..366bc42727 100644 --- a/third_party/nixpkgs/pkgs/development/tools/inferno/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/inferno/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "inferno"; - version = "0.11.20"; + version = "0.11.21"; src = fetchFromGitHub { owner = "jonhoo"; repo = pname; rev = "v${version}"; - hash = "sha256-+A27B50hRAQvk0QrcCP0QQe6zJkVUIX7qggL8kjJmQY="; + hash = "sha256-/tFbizGsgrmeTfd3W6BhVOX8BvOuakWqReQ1vQ0lrjw="; fetchSubmodules = true; }; - cargoHash = "sha256-XmxB18IQh2Bvbez6BowoV+P0qghmOcHpC0ZH4PgsIZo="; + cargoHash = "sha256-BoRlKD34c9RZz9fYMgxTbsbU9XL724PG+CVh9G/tl0M="; # skip flaky tests checkFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/jake/default.nix b/third_party/nixpkgs/pkgs/development/tools/jake/default.nix index b91a779cb5..68e72cf984 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jake/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jake/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "jake"; - version = "10.8.7"; + version = "10.9.1"; src = fetchFromGitHub { owner = "jakejs"; repo = "jake"; rev = "v${version}"; - hash = "sha256-Qado9huQx9MVTFp8t7szB+IUVNWQqT/ni62JnURQqeM="; + hash = "sha256-rYWr/ACr14/WE88Gk6Kpyl2pq1XRHSfZGXHrwbGC8hQ="; }; - npmDepsHash = "sha256-3pOFrH/em/HMTswrZLAeqPAb9U0/odcZPt4AkQkMhZM="; + npmDepsHash = "sha256-BwOfPRiVMpFo9tG9oY2r82w2g3y/7sL3PD5epd2igmI="; dontNpmBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/kubernetes-controller-tools/default.nix b/third_party/nixpkgs/pkgs/development/tools/kubernetes-controller-tools/default.nix index 520b0101bc..d134736899 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kubernetes-controller-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kubernetes-controller-tools/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "controller-tools"; - version = "0.16.3"; + version = "0.16.4"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Txvzp8OcRTDCAB8nFrqj93X+Kk/sNPSSLOI07J3DwcM="; + sha256 = "sha256-+YDYpTfWWPkAXcCNfkk0PTWqOAGwqiABbop/t6is2nM="; }; - vendorHash = "sha256-nwzXlsSG7JF145bf/AJZB1GbGJRHJC7Q73Jty6mHc/w="; + vendorHash = "sha256-zWvFwYHqECga1E2lWVA+wqY744OLXzRxK6JkniTZN70="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/development/tools/kustomize/default.nix b/third_party/nixpkgs/pkgs/development/tools/kustomize/default.nix index e7e9a8d0b0..e7955979a7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kustomize/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kustomize/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kustomize"; - version = "5.4.3"; + version = "5.5.0"; ldflags = let t = "sigs.k8s.io/kustomize/api/provenance"; in [ @@ -15,13 +15,13 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - hash = "sha256-DrdExiGDWBrlbNIY6R9SXD4cuVyLBOE3ePw1J3hymHA="; + hash = "sha256-7mtnSrQQPQnG0COqnzrT5DXFEbTeoc3+GZ2fFhB/lW8="; }; # avoid finding test and development commands modRoot = "kustomize"; proxyVendor = true; - vendorHash = "sha256-cyTZCa1kmNhomkNNnt2Waww4czOZ5YzDBUDx5gqLHtQ="; + vendorHash = "sha256-ddARfbjuSIn2aNFILL4LA28swGBvH6kOqlg4qkw+NGw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/jq-lsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/jq-lsp/default.nix index ad43af981e..e33133c426 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/jq-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/jq-lsp/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "jq-lsp"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "wader"; repo = "jq-lsp"; rev = "refs/tags/v${version}"; - hash = "sha256-c7uK8WPM/h2PLVLFGeN66SztvzjBCgJje7L14+oErVU="; + hash = "sha256-ueSf32C4BznDKBQD0OIJKZhrwLq1xpn6WWEnsqoWkl8="; }; vendorHash = "sha256-8sZGnoP7l09ZzLJqq8TUCquTOPF0qiwZcFhojUnnEIY="; diff --git a/third_party/nixpkgs/pkgs/development/tools/manifest-tool/default.nix b/third_party/nixpkgs/pkgs/development/tools/manifest-tool/default.nix index fe85fb0c45..134caea5ba 100644 --- a/third_party/nixpkgs/pkgs/development/tools/manifest-tool/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/manifest-tool/default.nix @@ -9,14 +9,14 @@ buildGoModule rec { pname = "manifest-tool"; - version = "2.1.7"; + version = "2.1.8"; modRoot = "v2"; src = fetchFromGitHub { owner = "estesp"; repo = "manifest-tool"; rev = "v${version}"; - hash = "sha256-f3rl4ktqvZlqIBmk9WeZ0IUil2bEAdusdCIvtqm9Gwk="; + hash = "sha256-1zsNIG7U389L4hXmQ1XGkWCu2ZpyGimoJkoJatY99E0="; leaveDotGit = true; postFetch = '' git -C $out rev-parse HEAD > $out/.git-revision diff --git a/third_party/nixpkgs/pkgs/development/tools/mask/default.nix b/third_party/nixpkgs/pkgs/development/tools/mask/default.nix index aecc3fb965..78172cb932 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mask/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mask/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mask"; - version = "0.11.4"; + version = "0.11.6"; src = fetchFromGitHub { owner = "jacobdeichert"; repo = pname; rev = "mask/${version}"; - hash = "sha256-pi8dD4Fko39yn1maXNOqm+aDWYJhxE/b4kH7H18InbY="; + hash = "sha256-xGD23pso5iS+9dmfTMNtR6YqUqKnzJTzMl+OnRGpL3g="; }; - cargoHash = "sha256-zbvYSTR0m7S4m0WFQrCqCrMXqMcDW2oIMznD5PDdeHE="; + cargoHash = "sha256-bhf6+nUxg4yIQIjiQYFdtPPF1crFVsofHdEsIOpiH2Q="; # tests require mask to be installed doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/astyle/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/astyle/default.nix index 613209b3a9..e88496ceb9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/astyle/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/astyle/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "astyle"; - version = "3.5.2"; + version = "3.6.3"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha256-2wwKctQOZAwgHjnmRni2/jFvN+fvBfZ84rItVVwKbRI="; + hash = "sha256-EO18j5dOzONcF3jxYW8EypPD07/BoBeqJROWBBtnDvw="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/binutils/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/binutils/default.nix index cbc6351d55..984afa184a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/binutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/binutils/default.nix @@ -33,12 +33,12 @@ assert enableGoldDefault -> enableGold; let inherit (stdenv) buildPlatform hostPlatform targetPlatform; - version = "2.42"; + version = "2.43.1"; srcs = { normal = fetchurl { url = "mirror://gnu/binutils/binutils-${version}.tar.bz2"; - hash = "sha256-qlSFDr2lBkxyzU7C2bBWwpQlKZFIY1DZqXqypt/frxI="; + hash = "sha256-vsqsXSleA3WHtjpC+tV/49nXuD9HjrJLZ/nuxdDxhy8="; }; vc4-none = fetchFromGitHub { owner = "itszor"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix b/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix index 6ba14d3250..fe07298b47 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -15,47 +15,47 @@ let phpMajor = lib.versions.majorMinor php.version; inherit (stdenv.hostPlatform) system; - version = "1.92.23"; + version = "1.92.25"; hashes = { "x86_64-linux" = { system = "amd64"; hash = { - "8.1" = "sha256-/aWW1QY2NVsoMLTv1HOxx+ujhkCx4i+FWcwt9zdfPKI="; - "8.2" = "sha256-VYHxvpFxLBCDHwWQH0HO+3CEiN4zcry7jLn/3KzvENU="; - "8.3" = "sha256-vDJCDCF/COlmqdZVinIK9FUXTS5BiDpjUchabjrlpnA="; + "8.1" = "sha256-owV7Eo/2Qszm5alNppm6DHS7YLZyFDHnQ//jRfM+m1s="; + "8.2" = "sha256-1eECdIo+eET5tZz9neuC8WRtuJpNbJz+A2i0J9lqnms="; + "8.3" = "sha256-rfY849xL5AjWNtzzLIud+8+JWuOpmhNM7pdpR1tnNmo="; }; }; "i686-linux" = { system = "i386"; hash = { - "8.1" = "sha256-CsxaRbLg9j3djLPMbbsrduLXQTp4KJuWPecHWBMWIcA="; - "8.2" = "sha256-oy1FQ+1wSORHOUidQ8fNEXHMX5bLhLYyZ8mQLzKJh+0="; - "8.3" = "sha256-TnEYofVT6vsO3AnpsDvwiqz0LeuFkLGS1befnlSFfT4="; + "8.1" = "sha256-b3Dy18FawjtuiASwYCdS1Q5gOv1WSx6f3ESwow8wj4E="; + "8.2" = "sha256-vFNT/KR1RkxsYwjxLZewSYv2MbG1P7qdcxwzGZho7as="; + "8.3" = "sha256-TtsWgvrw4orrOFTuWPaPlS3LT9d101HiCGIrBKz4MaI="; }; }; "aarch64-linux" = { system = "arm64"; hash = { - "8.1" = "sha256-znvHYCaI08KWVwht83+fv74IY8hotXnww8eJLj/+5us="; - "8.2" = "sha256-Da9/wqFLnSE8GUzB4NrqbIAJ81deTgCpAGOgecIX40A="; - "8.3" = "sha256-Pii1cVwceg+BIbtQ1PhfuqAc60R3gt2o2iel7Zxs7l0="; + "8.1" = "sha256-bCS3gfUDr68KKmWy73G9ripYlCTAZuMssThyEDCGDgM="; + "8.2" = "sha256-FQlfdsVeClSLLCJqQPp0fo1CqpshkTo1iUw/9QI9JBc="; + "8.3" = "sha256-cThRmDf1HTaCT/KuvT3TMcmsCMky407p9u3hwtGtWDQ="; }; }; "aarch64-darwin" = { system = "arm64"; hash = { - "8.1" = "sha256-y40O5YGZJxzZtF03h6cdxvXkWO51bJmykUTlnDZlhzI="; - "8.2" = "sha256-CRy/G84NFguOZhCDwYWtj3r0rjJarBXvWxS+QkHKzoA="; - "8.3" = "sha256-vr05O/MtS6UeD078aUZusmORutTysO711f2+H7gcaMU="; + "8.1" = "sha256-ZbUUtljjvQ0dcly/eTovTECTZn9OOcx3VDe1gKEICyA="; + "8.2" = "sha256-8xjs5IrsdbcjmTfni/hbtN+qFmnUgFK3KG8ntbNgBeI="; + "8.3" = "sha256-kDf+5rATt6/DMH5zZoom2Y5j/6CFFj8claJHlMq285o="; }; }; "x86_64-darwin" = { system = "amd64"; hash = { - "8.1" = "sha256-f4YZEfNDC3PM4vUcLJaUj5kRG/dVjIl5+QyBXBIOYps="; - "8.2" = "sha256-QpfucP0u8+OTPqcB9lrYjg7L7qpLFtyA6Jo+00havRA="; - "8.3" = "sha256-PBxklii6kseqOcGum/bqTfsK0nPUCEn6pje8WYXuGOM="; + "8.1" = "sha256-i1QxRGump5G3eMKjXFokqRr9FD6wsdPoUbjE7w3/a0A="; + "8.2" = "sha256-O7L4LgAbLRsz/F+esGwwnxAdD1gT30QEy3FEOQxTNu0="; + "8.3" = "sha256-a5oCtzCb8T/bA5GOOfyN7dMzeK29ZUBZceEnlqme41I="; }; }; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/chrpath/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/chrpath/default.nix index 32cb4864a3..f4dc6d9148 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/chrpath/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/chrpath/default.nix @@ -1,14 +1,18 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { pname = "chrpath"; - version = "0.16"; + version = "0.17"; src = fetchurl { - url = "https://alioth-archive.debian.org/releases/${pname}/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "0yvfq891mcdkf8g18gjjkn2m5rvs8z4z4cl1vwdhx6f2p9a4q3dv"; + url = "https://codeberg.org/pere/chrpath/archive/release-${version}.tar.gz"; + hash = "sha256-Sh2syR9OrxyMP3Z/2IHrH+OlCaINBii/l2DZCsEkvQw="; }; + nativeBuildInputs = [ + autoreconfHook + ]; + meta = with lib; { description = "Command line tool to adjust the RPATH or RUNPATH of ELF binaries"; mainProgram = "chrpath"; @@ -17,8 +21,8 @@ stdenv.mkDerivation rec { binary. The rpath, or runpath if it is present, is where the runtime linker should look for the libraries needed for a program. ''; - homepage = "https://tracker.debian.org/pkg/chrpath"; - license = licenses.gpl2; + homepage = "https://codeberg.org/pere/chrpath"; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/devspace/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/devspace/default.nix index 33e37cb77e..01da33fd74 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/devspace/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/devspace/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "devspace"; - version = "6.3.13"; + version = "6.3.14"; src = fetchFromGitHub { owner = "devspace-sh"; repo = "devspace"; rev = "v${version}"; - hash = "sha256-MWFDAyr4oHBe1K9ag5mC3iJAyJgs3ePa6W9//6T2G9A="; + hash = "sha256-Qdx7x42QKfyEu2PB350mek2MwYO/ClFAwKC9UHftaKE="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix index 260d385e35..c2c1109e2e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config, musl-fts , musl-obstack, m4, zlib, zstd, bzip2, bison, flex, gettext, xz, setupDebugInfoDirs , argp-standalone -, enableDebuginfod ? true, sqlite, curl, libmicrohttpd, libarchive +, enableDebuginfod ? lib.meta.availableOn stdenv.hostPlatform libarchive, sqlite, curl, libmicrohttpd, libarchive , gitUpdater, autoreconfHook }: @@ -77,6 +77,10 @@ stdenv.mkDerivation rec { "--enable-deterministic-archives" (lib.enableFeature enableDebuginfod "libdebuginfod") (lib.enableFeature enableDebuginfod "debuginfod") + + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766 + # Versioned symbols are nice to have, but we can do without. + (lib.enableFeature (!stdenv.hostPlatform.isMicroBlaze) "symbol-versioning") ] ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "--disable-demangler" ++ lib.optionals stdenv.cc.isClang [ "CFLAGS=-Wno-unused-private-field" diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/lsof/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/lsof/default.nix index 98f7d23987..9355144733 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/lsof/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/lsof/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPackages, perl, which, ncurses, nukeReferences }: +{ lib, stdenv, fetchFromGitHub, buildPackages, perl, which, ncurses, nukeReferences, freebsd, ed }: let dialect = lib.last (lib.splitString "-" stdenv.hostPlatform.system); @@ -26,12 +26,15 @@ stdenv.mkDerivation rec { ''; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ nukeReferences perl which ]; + nativeBuildInputs = [ nukeReferences perl which ed ]; buildInputs = [ ncurses ]; # Stop build scripts from searching global include paths LSOF_INCLUDE = "${lib.getDev stdenv.cc.libc}/include"; - configurePhase = "LINUX_CONF_CC=$CC_FOR_BUILD LSOF_CC=$CC LSOF_AR=\"$AR cr\" LSOF_RANLIB=$RANLIB ./Configure -n ${dialect}"; + configurePhase = let genericFlags = "LSOF_CC=$CC LSOF_AR=\"$AR cr\" LSOF_RANLIB=$RANLIB"; + linuxFlags = lib.optionalString stdenv.isLinux "LINUX_CONF_CC=$CC_FOR_BUILD"; + freebsdFlags = lib.optionalString stdenv.isFreeBSD "FREEBSD_SYS=${freebsd.sys.src}/sys"; + in "${genericFlags} ${linuxFlags} ${freebsdFlags} ./Configure -n ${dialect}"; preBuild = '' for filepath in $(find dialects/${dialect} -type f); do diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix index b9ea426641..0376a12f94 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lttng-tools"; - version = "2.13.13"; + version = "2.13.14"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2"; - sha256 = "sha256-/19PALCB2sZgkq/o5yt8eQZwkxzxwe4N6qf4D7xTiD4="; + sha256 = "sha256-U733xK0H2/5mDuTZr/xj/kSuWemnPG96luD8oUDlrcs="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terramate/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/terramate/default.nix index 5d2be8f5a4..477ef4db8b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/terramate/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/terramate/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "terramate"; - version = "0.10.6"; + version = "0.10.8"; src = fetchFromGitHub { owner = "terramate-io"; repo = "terramate"; rev = "v${version}"; - hash = "sha256-6IG6wIKz13yBR+LZYkabfckUomIEcjpGbHZ7HCvGs7M="; + hash = "sha256-fT1yuFFHI88wUXKguWZD+PHU4j3w5eda7kzCDn+Gg+o="; }; vendorHash = "sha256-kjzpXOoyTwjpYLBqDuB6Eup5Yzgej2U+HUo4z8V+cEI="; @@ -30,6 +30,6 @@ buildGoModule rec { homepage = "https://github.com/terramate-io/terramate"; changelog = "https://github.com/terramate-io/terramate/releases/tag/v${version}"; license = licenses.mpl20; - maintainers = with maintainers; [ dit7ya ]; + maintainers = with maintainers; [ dit7ya asininemonkey ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix index 68e29724eb..8b0026fdf4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix @@ -15,16 +15,21 @@ let in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "5.19.0"; + version = "5.20.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; rev = "refs/tags/v${version}"; - hash = "sha256-iH7KqZddP4uKwTBxLLMURUtWBsuEtLHGQppVgGFaWZQ="; + hash = "sha256-hKQdc9p69L0t2MwCR4Fy20Nl+2qQk5JJoCaB4O43DNY="; }; - cargoHash = "sha256-QW+q869bVAMYv4SCj/2eKrADoDonrvQuaHuanZHIjMo="; + cargoHash = "sha256-A/stdJ1baV0hdDXTdLd9gi8+JO7qPgQbNiYjHkp1GPQ="; + + # https://github.com/latex-lsp/texlab/pull/1237 + preBuild = '' + rm .cargo/config.toml + ''; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; @@ -41,7 +46,7 @@ rustPlatform.buildRustPackage rec { # generate the man page postInstall = lib.optionalString (!isCross) '' # TexLab builds man page separately in CI: - # https://github.com/latex-lsp/texlab/blob/v5.16.1/.github/workflows/publish.yml#L117-L121 + # https://github.com/latex-lsp/texlab/blob/v5.20.0/.github/workflows/publish.yml#L110-L114 help2man --no-info "$out/bin/texlab" > texlab.1 installManPage texlab.1 ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/nufmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/nufmt/default.nix deleted file mode 100644 index e5e656877e..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/nufmt/default.nix +++ /dev/null @@ -1,33 +0,0 @@ - -{ - lib, - stdenv, - fetchFromGitHub, - rustPlatform, - darwin, - ... -}: -rustPlatform.buildRustPackage rec { - pname = "nufmt"; - version = "unstable-2023-09-25"; - - src = fetchFromGitHub { - owner = "nushell"; - repo = "nufmt"; - rev = "796ee834c1e31ead4c5479bf2827a4339c5d61d1"; - hash = "sha256-BwKLl8eMCrqVt9PA5SHAXxu3ypP2ePcSuljKL+wSkvw="; - }; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ - IOKit - ]); - - cargoHash = "sha256-16Z20opeZpoa7h258um+grL3ktPmY4P0M/tqMTr5hYc="; - - meta = with lib; { - description = "Nushell formatter"; - homepage = "https://github.com/nushell/nufmt"; - license = licenses.mit; - maintainers = with maintainers; [iogamaster]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/4.x.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/4.x.nix index f4c97b9642..b156682694 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -1,7 +1,6 @@ { lib , substituteAll , fetchurl -, fetchpatch , ocaml , dune_3 , buildDunePackage @@ -13,23 +12,23 @@ , menhir , menhirLib , menhirSdk -}: - -let # Each releases of Merlin support a limited range of versions of OCaml. - merlinVersions = { +, version ? { "4.12.0" = "4.7-412"; "4.12.1" = "4.7-412"; "4.13.0" = "4.7-413"; "4.13.1" = "4.7-413"; - "4.14.0" = "4.16-414"; - "4.14.1" = "4.16-414"; - "4.14.2" = "4.16-414"; + "4.14.0" = "4.17.1-414"; + "4.14.1" = "4.17.1-414"; + "4.14.2" = "4.17.1-414"; "5.0.0" = "4.14-500"; - "5.1.0" = "4.16-501"; - "5.1.1" = "4.16-501"; - "5.2.0" = "5.1-502"; - }; + "5.1.0" = "4.17.1-501"; + "5.1.1" = "4.17.1-501"; + "5.2.0" = "5.2.1-502"; + }."${ocaml.version}" +}: + +let hashes = { "4.7-412" = "sha256-0U3Ia7EblKULNy8AuXFVKACZvGN0arYJv7BWiBRgT0Y="; @@ -37,17 +36,13 @@ let "4.14-500" = "sha256-7CPzJPh1UgzYiX8wPMbU5ZXz1wAJFNQQcp8WuGrR1w4="; "4.16-414" = "sha256-xekZdfPfVoSeGzBvNWwxcJorE519V2NLjSHkcyZvzy0="; "4.16-501" = "sha256-2lvzCbBAZFwpKuRXLMagpwDb0rz8mWrBPI5cODbCHiY="; - "5.1-502" = "sha256-T9gIvCaSnP/MqOoGNEeQFZwQ4+r5yRTPRu956Rf8rhU="; + "4.17.1-414" = "sha256-vz+AbvSGMgU4YdVLc73vlTm6QhivAh2LCsrY435kX8Y="; + "4.17.1-501" = "sha256-N2cHqocfCeljlFbT++S4miHJrXXHdOlMu75n+EKwpQA="; + "5.2.1-502" = "sha256-XALccbLTG2GYUcFKlluRxlCk281Jv1YATu5h4MWNWEw="; }; - version = lib.getAttr ocaml.version merlinVersions; - in -if !lib.hasAttr ocaml.version merlinVersions -then builtins.throw "merlin is not available for OCaml ${ocaml.version}" -else - buildDunePackage { pname = "merlin"; inherit version; @@ -58,23 +53,14 @@ buildDunePackage { }; patches = let - branch = lib.head (lib.tail (lib.splitString "-" version)); - needsVimPatch = lib.versionOlder version "4.17" || - branch == "502" && lib.versionOlder version "5.2"; + old-patch = lib.versionOlder version "4.17"; in [ (substituteAll { - src = ./fix-paths.patch; + src = if old-patch then ./fix-paths.patch else ./fix-paths2.patch; dot_merlin_reader = "${dot-merlin-reader}/bin/dot-merlin-reader"; dune = "${dune_3}/bin/dune"; }) - ] ++ lib.optionals needsVimPatch [ - # https://github.com/ocaml/merlin/pull/1798 - (fetchpatch { - name = "vim-python-12-syntax-warning-fix.patch"; - url = "https://github.com/ocaml/merlin/commit/9e0c47b0d5fd0c4edc37c4c7ce927b155877557d.patch"; - hash = "sha256-HmdTISE/s45C5cwLgsCHNUW6OAPSsvQ/GcJE6VDEobs="; - }) ]; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/fix-paths2.patch b/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/fix-paths2.patch new file mode 100644 index 0000000000..5bef154a17 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/fix-paths2.patch @@ -0,0 +1,17 @@ +diff --git a/src/kernel/mconfig_dot.ml b/src/kernel/mconfig_dot.ml +index 0a42a1d3..91997190 100644 +--- a/src/kernel/mconfig_dot.ml ++++ b/src/kernel/mconfig_dot.ml +@@ -146,10 +146,10 @@ end = struct + let prog, args = + match cfg with + | Dot_merlin -> +- let prog = "dot-merlin-reader" in ++ let prog = "@dot-merlin-reader@" in + (prog, [| prog |]) + | Dune -> +- let prog = "dune" in ++ let prog = "@dune@" in + (prog, [| prog; "ocaml-merlin"; "--no-print-directory" |]) + in + let cwd = Sys.getcwd () in diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix index 662d6ace13..add9551779 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -27,8 +27,8 @@ let # 2) nix-build -A tree-sitter.updater.update-all-grammars # 3) Set GITHUB_TOKEN env variable to avoid api rate limit (Use a Personal Access Token from https://github.com/settings/tokens It does not need any permissions) # 4) run the ./result script that is output by that (it updates ./grammars) - version = "0.22.6"; - hash = "sha256-jBCKgDlvXwA7Z4GDBJ+aZc52zC+om30DtsZJuHado1s="; + version = "0.23.0"; + hash = "sha256-QNi2u6/jtiMo1dLYoA8Ev1OvZfa8mXCMibSD70J4vVI="; src = fetchFromGitHub { owner = "tree-sitter"; @@ -111,7 +111,7 @@ rustPlatform.buildRustPackage { pname = "tree-sitter"; inherit src version; - cargoHash = "sha256-44FIO0kPso6NxjLwmggsheILba3r9GEhDld2ddt601g="; + cargoHash = "sha256-H4baEmGsQx+W9EXblt8R1CTYfkgR+dQDAsIwPVsqR68="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json index 86ac2bc430..73451c3654 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json @@ -1,10 +1,10 @@ { "url": "https://github.com/polarmutex/tree-sitter-beancount", - "rev": "6c665e7cf15d76a1687959643868a78fb381458d", - "date": "2024-03-09T18:30:23-05:00", - "path": "/nix/store/al4c5f670bl596mlp3vk1njz7w8bhq98-tree-sitter-beancount", - "sha256": "0cwiw69br9y8w5iysdh31i4vlvfgj79zvpkz93y1spyxx6vlylc5", - "hash": "sha256-hVFPt+ndXx38SH/e/dORz226SQwDNu1j4cinvJLhkTM=", + "rev": "321b12d0b02923c36e8cd9768afe6db5ced98e33", + "date": "2024-07-19T21:09:17-04:00", + "path": "/nix/store/v8yv84fm0n134mr5vmwbpr4cpyl71vxz-tree-sitter-beancount", + "sha256": "1milrdb8ka5vkypl0b44xgfdn0haydg2fz7489djcwpjkx7gfrsg", + "hash": "sha256-T2f3Tp/yciZbQuR8J17zCgLb3OuELECvn7uoiVbLNNY=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json index e79396e609..34f5a128ce 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json @@ -1,10 +1,10 @@ { "url": "https://github.com/sogaiu/tree-sitter-clojure", - "rev": "3a1ace906c151dd631cf6f149b5083f2b60e6a9e", - "date": "2024-05-15T19:51:17+09:00", - "path": "/nix/store/naaja1ijjxpsln6fr62sd4m3sgygb309-tree-sitter-clojure", - "sha256": "1j41ba48sid6blnfzn6s9vsl829qxd86lr6yyrnl95m42x8q5cx4", - "hash": "sha256-pLOCUReklkRt9t5kalDrOAlE9U7a2O8sXaZFjYhagcg=", + "rev": "f4236d4da8aa92bc105d9c118746474c608e6af7", + "date": "2024-05-22T23:05:15+09:00", + "path": "/nix/store/vl1d7aql1bcvn65khrgs13rfk90q08ik-tree-sitter-clojure", + "sha256": "16hnb5d8shz216sv9hj5hxpg63ri86w5pf9bzi5z3f37zh7vlljj", + "hash": "sha256-UlK6D/xnuPFL/Cu5W7hBMQ/zbodFwrS1CeJDjVpZFpo=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json index 89afd7990d..12a4b43780 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json @@ -1,10 +1,10 @@ { "url": "https://github.com/uyha/tree-sitter-cmake", - "rev": "20ffd6d3b4da1acdbf2d08204b2130a5b2f7c4b3", - "date": "2024-03-19T09:50:27+02:00", - "path": "/nix/store/2fcf8g6rryigpy6grr284qzgmqw1gkd5-tree-sitter-cmake", - "sha256": "16klinbjr9k5piwqvfvl48wmprk9wlypqnmihryy2wj2m2xzlyqa", - "hash": "sha256-Cnv6u6hCcuF9hrFafD3laeZbOSJ0u415vGWmLJeNdJo=", + "rev": "69d7a8b0f7493b0dbb07d54e8fea96c5421e8a71", + "date": "2024-06-20T12:32:15+07:00", + "path": "/nix/store/ldbzx710y8wy6dwca0hh8l4aa3cihbr2-tree-sitter-cmake", + "sha256": "10lj4f0h8bcbyl03rxgfhizj4vn6fz47jw6clfjz0c1ayxzql9av", + "hash": "sha256-WyWKf/cqMPClo8xwech3xm4if4Tu9TwA9YstBIEjkoI=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json index c5a2a628c4..6fc1c58f66 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-cpp", - "rev": "2369fa991eba294e9238e28280ffcd58132f94bc", - "date": "2024-04-30T23:37:25-04:00", - "path": "/nix/store/6zvwyr1034vawcvw8yra4rcjb6m7shlj-tree-sitter-cpp", - "sha256": "1dbb8w4dyzgp7czqnrdfyjbm6zyyxbxqmfzmrj6kd37vcxldxq5d", - "hash": "sha256-reDeaGf7jDaNzPW7ivvq3n9Tl/SuZYs/O/d93whHa7U=", + "rev": "30f973c2244f0bff444186185f475c3bd76bc3a5", + "date": "2024-09-02T20:54:34-04:00", + "path": "/nix/store/rmnzl3zg6jpqcxlya59xgyvwq53kabk3-tree-sitter-cpp", + "sha256": "0jd6rprbcbc6bd5rppxw21vlg8sv2h8f9bpby45bbb8w3n7ysjmg", + "hash": "sha256-r0rtjx0crbUK8euu5BAUW6NHdxC835tLW4YttvLNpkk=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json index 47cf0bc2a3..a7c098c78b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-css", - "rev": "f6be52c3d1cdb1c5e4dd7d8bce0a57497f55d6af", - "date": "2024-05-05T18:14:34-04:00", - "path": "/nix/store/iw66hs4n4wmf9mjaj4zb78diwfkb8y4d-tree-sitter-css", - "sha256": "1mq5yzcj16bv9jphgj0v16fsa9bzf7y204c78mf79ls2rqsanljp", - "hash": "sha256-V1KrNM5C03RcRYcRIPxxfyWlnQkbyAevTHuZINn3Bdc=", + "rev": "a68fcd1e6b03118d1e92ffa45e7ab7a39d52d3f7", + "date": "2024-09-02T04:29:00-04:00", + "path": "/nix/store/46v1b4mfmsgd7sk48n6l613vjcxpl3gg-tree-sitter-css", + "sha256": "1apypprrqn23ghay11w35vz31crpjdby6imjhnxq9cqj9rvhxgx3", + "hash": "sha256-o78Od04Ss4S7hbJG41eTN7Mw/i6Dh+AVfENYnPO9/qo=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json index 54bbe3214f..4b64224bcb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json @@ -1,10 +1,10 @@ { "url": "https://github.com/thehamsta/tree-sitter-cuda", - "rev": "4ec5afdf98041d137c25b555958a1f825c7c1272", - "date": "2024-04-02T22:40:43+02:00", - "path": "/nix/store/2n6dkgdvhfd34qa48b5824qbw1pc7899-tree-sitter-cuda", - "sha256": "1n840xzsx56w3hys263f216ih901jh456yxdmm0i274ijwngn38h", - "hash": "sha256-EA37LJeRHBFBra17UwiUASQYTRBuGKE9HNyUrn8HBNk=", + "rev": "cbce8aedc6fa35313a4cecd206196011a08a85c4", + "date": "2024-08-22T22:57:54+02:00", + "path": "/nix/store/4ygv7b9ap52kb03cv7mihsq86g6vgfpc-tree-sitter-cuda", + "sha256": "12q2zpfll8n72yccxkqjh36cmmpj2fyivkq6fghzbs9kf4mvwy12", + "hash": "sha256-Ini+K3Ez6fXhcwbPHb0T8tbKzIASz86YF8ciSt39Aos=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json index 40f4c4bab4..57b620e57e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json @@ -1,10 +1,10 @@ { "url": "https://github.com/usernobody14/tree-sitter-dart", - "rev": "ac0bb849ccd1a923963af47573b5e396736ff582", - "date": "2024-04-28T11:52:00-06:00", - "path": "/nix/store/7sfa8zsg3p14rm0dbgv030s86lk8fv3w-tree-sitter-dart", - "sha256": "0vm0yd2km73cyl2dph5qwb1fbgjjambn9mi4k7jxh495wrmk8hn8", - "hash": "sha256-yEI0a+YlEdjlmSTWZFdVUr7lwuK4wNsE9WycOkXzoG4=", + "rev": "9ac03bb2154316624fb4c41fe0f372a5f1597b43", + "date": "2024-09-01T14:20:26-06:00", + "path": "/nix/store/g3q5dd40gjm0iwf19afz3vz5amvr7dsg-tree-sitter-dart", + "sha256": "0nn7in0qr23vjkyk7ynyaw3rlbisx8vsvwf2yqclshdm72qabd7i", + "hash": "sha256-8bSlsDi1QU0Z9sLxrTfqOi6aB1fe+jP9lHuIjIGNx1o=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json index 0241aff6a8..2a025287f9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json @@ -1,10 +1,10 @@ { "url": "https://github.com/glehmann/tree-sitter-earthfile", - "rev": "450546b6db9a37a178fd87aeda93a287301e9570", - "date": "2024-05-16T21:54:01+02:00", - "path": "/nix/store/9fsxiz65a2n0kyy7a10q9lqzhhdz1p6x-tree-sitter-earthfile", - "sha256": "0vhj9x7zr102f363l9kpgb58py3n4c3q3fl1c3b2dh5dadks0r6h", - "hash": "sha256-0GSgZ1OtwCbWYIG6gQcjdviLynp3JjrMcAKE/E9PEm4=", + "rev": "1d637f2002bb8b22d4c08d26ad2bfbc22916f3ce", + "date": "2024-09-07T22:41:52+02:00", + "path": "/nix/store/y2sjzjb5naajjzpshv4y1g38cala5sfw-tree-sitter-earthfile", + "sha256": "1kzl8639pm3pxvkh2flmy5azzi7r48a1mirh2iqkvjc55fv30frb", + "hash": "sha256-KzswtiuFyT1xFDDHGhQi+cT/VfGVOgHn7nfUm4ZB9M8=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json index 405fd17482..cbd66be8cf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json @@ -1,10 +1,10 @@ { "url": "https://github.com/elixir-lang/tree-sitter-elixir", - "rev": "de690fa8a028f122af46d9d2685679fe5f2d7d60", - "date": "2024-04-08T19:02:42+02:00", - "path": "/nix/store/q46fy2kd4gvab4bpfv3zacg4qgkfc6dz-tree-sitter-elixir", - "sha256": "03fg2qj0i3n1dx8abkngg4nxqwpz86m5nr7q70hp5jw5bxccxxkf", - "hash": "sha256-bvbOWF+Fy3IhOPhkW6pB/3LcLXnPzqVQb8GOCCQWzw0=", + "rev": "ac7b59b312ae5c8cc487d10366e11bda2393e31c", + "date": "2024-09-06T23:39:25+07:00", + "path": "/nix/store/nf8lwh6gamwzqnc7mvjy1mh2khx5ijcf-tree-sitter-elixir", + "sha256": "1kciqsj1z8f5bq46jyqscwqa94hqcdwwclg0v0i4ggn6jyxkwq41", + "hash": "sha256-gWA+u5fGvkci2OBRxnljGJKkMGcae2kIXsWhH6TGkc0=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json index e8722c8981..dcfb798353 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-embedded-template", - "rev": "38d5004a797298dc42c85e7706c5ceac46a3f29f", - "date": "2024-05-05T21:28:26-04:00", - "path": "/nix/store/i2kni0fn6yqgags7l329bbg3n45dc9ww-tree-sitter-embedded-template", - "sha256": "178cvdmlvzq2c29n0x8aganqbx3vz6w9m90gwhk63qxa2rxw5wr0", - "hash": "sha256-IPPCexaq42Em5A+kmrj5e/SFrXoKdWCTYAL/TWvbDJ0=", + "rev": "62b0a6e45900a7dff7c37da95fec20a09968ba52", + "date": "2024-09-02T02:11:42-04:00", + "path": "/nix/store/skq9pzdng2gblx99v9mxw3y90qxzs3q6-tree-sitter-embedded-template", + "sha256": "0sn821pbg3gay9v51i6r3xdwi985chzgn6php2svydy82ab2hiqp", + "hash": "sha256-F0colhLIN7+1uPAa+z5kBaXIWx/ZxFB28uqNt24QyGo=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json index d6cc94339f..c29e2b152a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json @@ -1,10 +1,10 @@ { "url": "https://github.com/stadelmanma/tree-sitter-fortran", - "rev": "f73d473e3530862dee7cbb38520f28824e7804f6", - "date": "2023-08-30T10:25:35+01:00", - "path": "/nix/store/mkvh0z39lc89c3bgd91asxjwwiwskyp8-tree-sitter-fortran", - "sha256": "1nvxdrzkzs1hz0fki5g7a2h7did66jghaknfakqn92fa20pagl1b", - "hash": "sha256-K9CnLhDKiWTxVM5OBZ80psV2oFDnlTgd+DDoP39ufds=", + "rev": "8f842945abefb76b9a68c0835619b37060b8f098", + "date": "2024-08-27T18:09:38-04:00", + "path": "/nix/store/j9q4x7llgyq4vc2pri7rqxjvl98anggl-tree-sitter-fortran", + "sha256": "1x20nldx2vi113dsy44g1dmayi0cpnm2vlhq9blbycm0cwal0xgf", + "hash": "sha256-7nVAFWegMr/oShjSLaq9DESvaguPEK/bCCFu0Ru1QPQ=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json index e221099a39..87da016a65 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json @@ -1,10 +1,10 @@ { "url": "https://github.com/alexlafroscia/tree-sitter-glimmer", - "rev": "3e66b67efeba1a2001859f6e02d16e0bbdbf4a9b", - "date": "2023-10-05T16:33:40-04:00", - "path": "/nix/store/sizww81ylny2pnafn3d901qv15k3rlp2-tree-sitter-glimmer", - "sha256": "0ggxs83jq59z6vk4bvr7scfscmak41lgz038pcwczpm3hwfhasjq", - "hash": "sha256-WGoFHYej3s84u2iA/2ggU1WmHdMn70XmNj8VLAfS/T0=", + "rev": "51970d4bb249d918dbd26289cc4208bee4068004", + "date": "2024-08-20T13:58:19-04:00", + "path": "/nix/store/ff20fkmpcslz5b9883gk7q6nlri8x6qd-tree-sitter-glimmer", + "sha256": "135pf610rb5nppn5k5699z5azxa7zqvx17x6v5nrp7fdwsy0whg2", + "hash": "sha256-4kEOvObNnZtt2aaf0Df+R/Wvyk/JlFnsvbasDIJxt4w=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json index 7faba26b25..0d6d9a1274 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json @@ -1,10 +1,10 @@ { "url": "https://github.com/thehamsta/tree-sitter-glsl", - "rev": "8c9fb41836dc202bbbcf0e2369f256055786dedb", - "date": "2024-05-11T23:58:08+02:00", - "path": "/nix/store/knbraa6ipp3gm9b2ja01zlk1i27pswp0-tree-sitter-glsl", - "sha256": "1vpdfpznkh7p47wqya3bqqih2wn1nmyqx4jmyv05v88x5f138hv9", - "hash": "sha256-aUM0gisdoV3A9lWSjn21wXIBI8ZrKI/5IffAaf917e4=", + "rev": "66aec57f7119c7e8e40665b723cd7af5594f15ee", + "date": "2024-09-12T12:52:04+02:00", + "path": "/nix/store/xzxngsr3nhs1586c47iwdx9k20yaansc-tree-sitter-glsl", + "sha256": "0gp3bn31xz5rq52amx059r9sllk3749f1ajmbs1fkjb833f2kvqh", + "hash": "sha256-EO8p3BhoyemCXlWq4BI5Y1KqU04F9KpEwbn8HoZd4z4=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gomod.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gomod.json index 075059a059..4be7f396a7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gomod.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gomod.json @@ -1,10 +1,10 @@ { "url": "https://github.com/camdencheek/tree-sitter-go-mod", - "rev": "bbe2fe3be4b87e06a613e685250f473d2267f430", - "date": "2024-01-16T04:55:23-07:00", - "path": "/nix/store/xi1fr4l79pnqaa7md7gk4nqvg4ccgyzy-tree-sitter-go-mod", - "sha256": "1clw1wyjxiicdjav5g2b9m9q7vlg5k1iy1fqwmf2yc4fxrfnmyrq", - "hash": "sha256-OPtqXe6OMC9c5dgFH8Msj+6DU01LvLKVbCzGLj0PnLI=", + "rev": "3b01edce2b9ea6766ca19328d1850e456fde3103", + "date": "2024-09-11T15:20:34-06:00", + "path": "/nix/store/waxmvqpiild2qbkqx7kmkc60g08822b3-tree-sitter-go-mod", + "sha256": "1vbg4fn54a7lbwcrvjdx3nrwgw5y925chbbb7sd6kwms1434yyhb", + "hash": "sha256-C3pPBgm68mmaPmstyIpIvvDHsx29yZ0ZX/QoUqwjb+0=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json index ed82da289c..597e6e0c02 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-haskell", - "rev": "a50070d5bb5bd5c1281740a6102ecf1f4b0c4f19", - "date": "2024-05-05T18:23:47+02:00", - "path": "/nix/store/knnf5zfxjwnml5cdbp3x6kjkw7q4nhsd-tree-sitter-haskell", - "sha256": "0hi72f7d4y89i6zkzg9r2j16ykxcb4vh4gwaxg9hcqa95wpv9qw6", - "hash": "sha256-huO0Ly9JYQbT64o/AjdZrE9vghQ5vT+/iQl50o4TJ0I=", + "rev": "558b997049fddcb07fc513528189c57d6129a260", + "date": "2024-09-02T05:58:07-04:00", + "path": "/nix/store/gqvq3azd0g60ghzhbqj5ghqb8q8gsvai-tree-sitter-haskell", + "sha256": "1jjknp2l8afggzxrp032998hw66r831069q4vy3i1hn9s4fw5y86", + "hash": "sha256-BvnCHdHJwhCH3wQnA8JA2RgOUUpigJv7f88pRMW1U8o=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json index 132aca585b..4d6137d928 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json @@ -1,10 +1,10 @@ { "url": "https://github.com/ntbbloodbath/tree-sitter-http", - "rev": "b639716df0698940b53de81e6fcefa2b6cd30724", - "date": "2024-03-16T17:35:45-04:00", - "path": "/nix/store/ynn327dwmxxakcbfrpq94b7m6sl5301h-tree-sitter-http", - "sha256": "0l2yzq0j3w20m9vy9z627jgnfylk1d8crldz3n8xmhisaxwl47ia", - "hash": "sha256-Kh5CeVc6wtqRHb/RzFALk3pnnzzC/OR3qkDwIQH+XlA=", + "rev": "b88cd0c7dba0128b8f28fcb25cca13eea0d193b3", + "date": "2024-08-21T01:10:49+09:00", + "path": "/nix/store/l6knlfkxvh3dnmc2asism5qr0xdsfna4-tree-sitter-http", + "sha256": "0k6rkpjjzs3jxgwljya3rjnzz0cpi68bm1xfpar2kf71fydd03m6", + "hash": "sha256-pg7QmnfhuCmyuq6HupCJl4H/rcxDeUn563LoL+Wd2Uw=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json index a68ad7d89d..7673c1c21f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json @@ -1,10 +1,10 @@ { "url": "https://github.com/sogaiu/tree-sitter-janet-simple", - "rev": "25d0687433ed0ed8e320861c2c625711ce1716f9", - "date": "2024-05-17T12:45:28+09:00", - "path": "/nix/store/ffqfh3ggcszd5lnx4gx5d2wpilsv6qz5-tree-sitter-janet-simple", - "sha256": "0xzqllz8gi2lb44y4hiqxk25p96yl7ysy8r6k1c11sv9gjf65ja4", - "hash": "sha256-RMlinHxp6xBYmCYjr/2h3qRbxOw4QuIJWVTEhz6l+Hc=", + "rev": "12bfab7db8a5f5b1d774ef84b5831acd34936071", + "date": "2024-08-27T15:31:21+09:00", + "path": "/nix/store/v5rcba220xk49qj3ghh9ggdpfqc91snv-tree-sitter-janet-simple", + "sha256": "05df573vih9p8nlqahlijgg66xr6rvzjd0g7n0qhdlzkcwd63p4x", + "hash": "sha256-ndxhGmfz0wYxsOeBJv/OJndj3pORQoWpRTfBuMcprhU=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json index 4e5bb91173..7c9b7ffbb6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-javascript", - "rev": "e88537c2703546f3f0887dd3f16898e1749cdba5", - "date": "2024-05-10T14:09:58-04:00", - "path": "/nix/store/s29hw61sfkgxs4pixpnsjbfqi1w73f06-tree-sitter-javascript", - "sha256": "0ly10ib6f7lj6l4za7pz8xz7pn4cjp7d5c56bf4n538zlgv136py", - "hash": "sha256-/poR9qMfjWKJW6aw0s6VjNh7fkf/HvUJNZIeZ1YEwVM=", + "rev": "b6f0624c1447bc209830b195999b78a56b10a579", + "date": "2024-09-02T05:16:11-04:00", + "path": "/nix/store/q6l4f361yzqcnsl29qhm1dcir75fk0hq-tree-sitter-javascript", + "sha256": "03lyqswy7h9iw2mhjlsa7an3g76hqi074c06pvdjb57h637zisf5", + "hash": "sha256-xen4zzDwlCXbvgYwckDE0Jw3rDpKUwmr4DHB47nGng4=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json index d2dce87abb..d886cfd7e9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-jsdoc", - "rev": "49fde205b59a1d9792efc21ee0b6d50bbd35ff14", - "date": "2024-05-05T20:47:41-04:00", - "path": "/nix/store/7i5mj175rsgz6gsxji0hbchxw6mvvsjp-tree-sitter-jsdoc", - "sha256": "030r6ksv6v0wnlb8yi22n0blls21cipzvgi4flnjllpm9vrsxxii", - "hash": "sha256-Mfau8071UiotdSS+/W9kQWhKF7BCRI8WtRxss/U0GQw=", + "rev": "bc09606fc786ead131a301e4b7524888f2d5c517", + "date": "2024-09-02T04:15:15-04:00", + "path": "/nix/store/l1jmw9y271rl00y9lhjwscdmidl3mn31-tree-sitter-jsdoc", + "sha256": "080dzr7547vsapxdd7vs4id3m9mfnzqfzjzkssgyb1vpcdmrhl5m", + "hash": "sha256-tVCYa2N3h+Wf1vPL7/C3rqY6WiR6n9b6VXofUk7+DSA=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json index 785c855a23..9ace481a79 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-json", - "rev": "94f5c527b2965465956c2000ed6134dd24daf2a7", - "date": "2024-05-06T15:10:02-04:00", - "path": "/nix/store/nl87jvkhqfwshind35dvh204bmjkdv1h-tree-sitter-json", - "sha256": "14za39wy4cw0r6r2m5a1i1za9m2wcyrlmh6yi2zl15b86i3dkbyp", - "hash": "sha256-16/ZRjRolUC/iN7ASrNnXNSkfohBlSqyyYAz4nka6pM=", + "rev": "8bfdb43f47ad805bb1ce093203cfcbaa8ed2c571", + "date": "2024-09-02T05:26:12-04:00", + "path": "/nix/store/qcm8dvbv4d4i989b7c8rc11fnbfh9nr6-tree-sitter-json", + "sha256": "0z9nq267cx0c6dpkq3hm24jcxv37l3lhpwabxpmmpmx2f758yjyc", + "hash": "sha256-zEuPynGi11vr7UvxC+mgZ+zOJBEVDjxvMwx0dozANn0=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json index 6a6114aeac..518f0c115f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json @@ -1,10 +1,10 @@ { "url": "https://github.com/sourcegraph/tree-sitter-jsonnet", - "rev": "d34615fa12cc1d1cfc1f1f1a80acc9db80ee4596", - "date": "2023-08-15T11:57:41-04:00", - "path": "/nix/store/4hf1f6klnr5wd4p1va1x5v8ndmcc7z7b-tree-sitter-jsonnet", - "sha256": "0vw4k1hxq6dhy3ahh40h06k67h073ryxl7513cn81lb6sfgf6c4f", - "hash": "sha256-jjDjntNm0YAsG6Ec2n0eB8BjpgEQEAjV8LAZ3GGYhG8=", + "rev": "ddd075f1939aed8147b7aa67f042eda3fce22790", + "date": "2024-08-15T10:26:01+02:00", + "path": "/nix/store/l4ypaa5lbid6qk21kb4b4x6vh6ki97rq-tree-sitter-jsonnet", + "sha256": "1bfdjxp0h95d124bzlhlvc9b5q19cdj716aym41nyl6z5a992c9q", + "hash": "sha256-ODGRkirfUG8DqV6ZcGRjKeCyEtsU0r+ICK0kCG6Xza0=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json index aa993c30c3..0c49037052 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-julia", - "rev": "acd5ca12cc278df7960629c2429a096c7ac4bbea", - "date": "2024-04-17T13:39:34-05:00", - "path": "/nix/store/3cjbxyngm4mbki1mydjv5q34w16kfhgp-tree-sitter-julia", - "sha256": "12dwy7ljhddg804jwkkzh6mn0mbjazihhsbcwn3gd5175qqr9lym", - "hash": "sha256-1dOUMS4nlPaG5WxpCONXclVgq4F/Ti4JQK81KOnxvIk=", + "rev": "3520b57e418f734f582215181ecd926a6178c90f", + "date": "2024-09-05T13:11:36-05:00", + "path": "/nix/store/4zljgvbaih9ds4kcb52qk5r1si4dpy8m-tree-sitter-julia", + "sha256": "0lp3js2dmmfv9bsgsjrxj4j1yaj47hmzrkhv07s9yc8cwq749yr0", + "hash": "sha256-IPtEDuYMMZ/0ARvO/Cs8RCofJJE9S/30StvV2oSW41I=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json index 2d3d164256..7181aeea0d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json @@ -1,10 +1,10 @@ { "url": "https://github.com/IndianBoy42/tree-sitter-just", - "rev": "fd814fc6c579f68c2a642f5e0268cf69daae92d7", - "date": "2024-05-02T02:56:00-04:00", - "path": "/nix/store/4q0rpglj1sa6lay5i1fdnws2pyl8hh71-tree-sitter-just", - "sha256": "09faimq5mhldc91r89707fsmdfjqg6dicc2ccr6q9qn5sy0drr6a", - "hash": "sha256-yuTcgNfF4oRNZkwwFpt5WLpWtTvgJJRDYo3CWnCNyiU=", + "rev": "6648ac1c0cdadaec8ee8bcf9a4ca6ace5102cf21", + "date": "2024-07-30T00:40:16-04:00", + "path": "/nix/store/20pg64wfg1rrl33prc91z19gbpq0cai1-tree-sitter-just", + "sha256": "1a5n6f6ig1qsrac46w5z6ib28kifhaqz23amhf79ws7yva3i4lhi", + "hash": "sha256-EVISh9r+aJ6Og1UN8bGCLk4kVjS/cEOYyhqHF40ztqg=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json index 7cf5bab4e7..44b506fed4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json @@ -1,10 +1,10 @@ { "url": "https://github.com/fwcd/tree-sitter-kotlin", - "rev": "d5dc99a9bdc3fe895e6bcd39caddcfa4820f4c03", - "date": "2024-05-08T00:38:43+02:00", - "path": "/nix/store/gj5w748yk7iyx9s7bzyqj6m9i9sx6rrv-tree-sitter-kotlin", - "sha256": "0lqwjg778xy561hhf90c9m8zdjmv58z5kxgy0cjgys4xqsfbfri6", - "hash": "sha256-Jma3nMadaP8kA/71WT4qu8r2UU0MJAdhMMV3dM6THFM=", + "rev": "e1a2d5ad1f61f5740677183cd4125bb071cd2f30", + "date": "2024-08-03T01:29:18+02:00", + "path": "/nix/store/jppx5kglmzyh10qmy13d5948hl68lxvc-tree-sitter-kotlin", + "sha256": "0bv21rcypi9dx87kgfr89mg8qfc7ik1g1fcb8am7ss17by8badwk", + "hash": "sha256-kze1kF8naH2qQou58MKMhzmMXk0ouzcP6i3F61kOYi8=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json index d0bbf38f3b..b01889fced 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json @@ -1,10 +1,10 @@ { "url": "https://github.com/MunifTanjim/tree-sitter-lua", - "rev": "a24dab177e58c9c6832f96b9a73102a0cfbced4a", - "date": "2024-03-11T11:40:44+02:00", - "path": "/nix/store/dia2ry7m40yxfn4l4191c0by58vb2yn8-tree-sitter-lua", - "sha256": "1184dazb4agqf3v55sz8i7xmynsn4rkddhbph3mgmh5qsnk88mmq", - "hash": "sha256-uFaEptW4wPrqgHfB1mYmVltf+4no61L2cPgpsr5qBIU=", + "rev": "99fc677e6971c425e8d407f59c77ab897e585c92", + "date": "2024-09-09T11:10:03-04:00", + "path": "/nix/store/iiih0sfdls1h8q7ca12y0rhc7g5jl76w-tree-sitter-lua", + "sha256": "0wrbxmb6j8xyckf5jw14jf97cb9fn7yhalap6xxgsag84ypfsqj3", + "hash": "sha256-Q2LtrifoKf16N1dRBf2xLi12kpMkcFncZL4jaVbtK3M=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json index 04d1eeeb50..8d116744df 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json @@ -1,7 +1,7 @@ { "url": "https://github.com/alemuller/tree-sitter-make", "rev": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd", - "date": "2021-12-16T17:14:17+00:00", + "date": "2021-12-16T17:14:17Z", "path": "/nix/store/v01s3lfi1w3bm433gf6zi0wb0r603906-tree-sitter-make", "sha256": "07gz4x12xhigar2plr3jgazb2z4f9xp68nscmvy9a7wafak9l2m9", "hash": "sha256-qQqapnKKH5X8rkxbZG5PjnyxvnpyZHpFVi/CLkIn/x0=", diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json index 6f9a1b4440..250b848c1b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json @@ -1,10 +1,10 @@ { "url": "https://github.com/MDeiml/tree-sitter-markdown", - "rev": "62516e8c78380e3b51d5b55727995d2c511436d8", - "date": "2024-03-22T11:52:05+02:00", - "path": "/nix/store/4hi3bz1ny9dz3yq7mr6d74gsfmcnh9rw-tree-sitter-markdown", - "sha256": "08wl8y8xgrr10m1p6xpmv0jbmnif30wgd2q5m28ghh1v37q2ixfp", - "hash": "sha256-1/Uo8Bk7QPiQqAWL9jgYLtq6JNj1dnNDBSHn15FHlCM=", + "rev": "1c8dea73bc0c996d92dd9ebc30dd388716b1c5db", + "date": "2024-09-11T16:28:36+03:00", + "path": "/nix/store/g4696miy9vzcw0qwd00rar36qn08jn2l-tree-sitter-markdown", + "sha256": "13xfyclim1yql6swbk4y12sxgvn799ldbzjl35n5rrkz7wgnwm9s", + "hash": "sha256-OlVuHz9/5lxsGVT+1WhKx+7XtQiezMW1odiHGinzro8=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json index 90dff573ed..c89064cce7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json @@ -1,10 +1,10 @@ { "url": "https://github.com/nickel-lang/tree-sitter-nickel", - "rev": "58baf89db8fdae54a84bcf22c80ff10ee3f929ed", - "date": "2024-03-07T15:18:26+00:00", - "path": "/nix/store/z386k8b1asbadh303dpzkhydv8r4f6fz-tree-sitter-nickel", - "sha256": "1a62cngravp7pq3gs582larbd0my7k323s48rgidhpd7b5gkmrjs", - "hash": "sha256-WuY6X1mnXdjiy4joIcY8voK2sqICFf0GvudulZ9lwqg=", + "rev": "43433d8477b24cd13acaac20a66deda49b7e2547", + "date": "2024-06-04T11:09:57+01:00", + "path": "/nix/store/w51rb76j8kcqn49bjnb4a7wgxpa5ld72-tree-sitter-nickel", + "sha256": "0lad31wly0m1kri7c6kk4kqkql8746idiwkyi1lay64y5yxv8j7l", + "hash": "sha256-9Ei0uy+eGK9oiH7y2KIhB1E88SRzGnZinqECT3kYTVE=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json index 91c713dae0..3494856f8a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json @@ -1,10 +1,10 @@ { "url": "https://github.com/cstrahan/tree-sitter-nix", - "rev": "b3cda619248e7dd0f216088bd152f59ce0bbe488", - "date": "2024-04-03T09:38:13+02:00", - "path": "/nix/store/5rz41r1yycp0w3s947cjs3m9d9v1082r-tree-sitter-nix", - "sha256": "1xh75z11d1b514qm997br8vmxalir2ah1pk7v3k1ppm28043ggr1", - "hash": "sha256-Ib83CECi3hvm2GfeAJXIkapeN8rrpFQxCWWFFsIvB/Y=", + "rev": "ceaf10eb2ae877175d58e6304f83ec6f4d704295", + "date": "2024-09-16T10:29:29Z", + "path": "/nix/store/khfiac3n03vh4r2aw5p3vmbp3449zv3z-tree-sitter-nix", + "sha256": "00wmm5nnm8qa08dxqaq1p3k728fqgijnmhgg8wg24shy6g5gqiyw", + "hash": "sha256-3Ef8yjMeaiIeR+/BamV82CFx5rgBK9wbAgqjam2plQM=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json index 5253f32efc..74af239932 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json @@ -1,10 +1,10 @@ { "url": "https://github.com/nvim-neorg/tree-sitter-norg", - "rev": "aa1a1a7ded81a094cc3d5cb14bea6f34b86d8688", - "date": "2024-04-19T19:37:12+02:00", - "path": "/nix/store/pas31z7l3x16113qa7k7ywb6hbarnwvs-tree-sitter-norg", - "sha256": "08bsk3v61r0xhracanjv25jccqv80ahipx0mv5a1slzhcyymv8kd", - "hash": "sha256-baJdvWfwUx1U2RX0G6ECaGPGZBFbWsVUhh3kYPaYeiE=", + "rev": "d89d95af13d409f30a6c7676387bde311ec4a2c8", + "date": "2024-09-04T16:57:27+02:00", + "path": "/nix/store/5kp8p7s80rvimcqs3i8syjwsc4459nmf-tree-sitter-norg", + "sha256": "077rds0rq10wjywpj4hmmq9dd6qp6sfwbdjyh587laldrfl7jy6g", + "hash": "sha256-z3h5qMuNKnpQgV62xZ02F5vWEq4VEnm5lxwEnIFu+Rw=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json index 5f43ea1f7a..025b38ddf2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json @@ -1,10 +1,10 @@ { "url": "https://github.com/nushell/tree-sitter-nu", - "rev": "a58513279e98dc3ff9ed149e3b4310cbb7e11068", - "date": "2024-04-20T10:10:30-04:00", - "path": "/nix/store/h4jw0skhik308krrqi7rmhw7ls4vp1rs-tree-sitter-nu", - "sha256": "00vpw8aai4k7bw57pyjwn6b09lb9rr1n88qc4r4nma86rl63y9ic", - "hash": "sha256-LCY/DM0GqWpJJgwjZEPOadEElrFc+nsKX2eSqBTidwM=", + "rev": "0bb9a602d9bc94b66fab96ce51d46a5a227ab76c", + "date": "2024-06-13T06:25:15-05:00", + "path": "/nix/store/z06sq7pwdmabw0jrhx221aj0xjjgz48g-tree-sitter-nu", + "sha256": "1bfhrvm984vqjgmlbi1kq91ywxp3mpz0mb8csg3zsfhkj8xa5483", + "hash": "sha256-A5GiOpITOv3H0wytCv6t43buQ8IzxEXrk3gTlOrO0K0=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json index 385e00ceb5..14f22e9e24 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json @@ -1,10 +1,10 @@ { "url": "https://github.com/ganezdragon/tree-sitter-perl", - "rev": "93bd92a6af01113140f1a0b4c1845d22adae7ab6", - "date": "2024-03-29T09:45:26+05:30", - "path": "/nix/store/v4fhidwmxfihmkkq32a2xj75zs9fs9cd-tree-sitter-perl", - "sha256": "1ldbqjiyc4apls5gfc96lw6l4y53k5adk8knf1pp3ar2x2dl8v6y", - "hash": "sha256-3mxEm+giq3FvcHai2VSZo3hCDacmMfeKplcR5qPEq9E=", + "rev": "8b554de277956a96f3e618b727d0ed4d4e564676", + "date": "2024-05-26T14:22:34Z", + "path": "/nix/store/fr9iacwd8dx2pb138d1q17wk9s64xvw3-tree-sitter-perl", + "sha256": "1ib0vx5dqp54ycisqg2gw72dj2ygin0z4846m2jnckavs7awn6fm", + "hash": "sha256-1RnL1dFbTWalqIYg8oGNzwvZxOFPPKwj86Rc3ErfYMU=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json index 433932e936..a63896e4c3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json @@ -1,10 +1,10 @@ { "url": "https://github.com/rolandwalker/tree-sitter-pgn", - "rev": "c5b2f2346e4148702b1343ec9bcc42b4a9aa88dc", - "date": "2024-04-27T16:35:50-04:00", - "path": "/nix/store/klrbfqwbmrwpgrghr2jijy0yy4yra3c3-tree-sitter-pgn", - "sha256": "1p6vn84f06c38kanv6j7w5pdwxny0gc7vk357s8ykiz0wv6r8ay9", - "hash": "sha256-ySuUzebgx+mRPmXMfdgD3nbebuFHmm3VRIMZ4Aiy29w=", + "rev": "f86a119d21d01f6bf0dcd3247a366554e98dbbe5", + "date": "2024-09-14T21:47:45Z", + "path": "/nix/store/09rxvhnmdq63n4ghk00ngbdgnmqqs1k4-tree-sitter-pgn", + "sha256": "1ahl979ika0pyq4glz6am71hq6y360hcmwhxikn2l2gl8415701k", + "hash": "sha256-M4BTAkH0CSrsjB3yyiAwwxsMw6nKfPoI9heoGdNJFKo=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json index 2d45886a8d..c7006cd0fe 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-php", - "rev": "78a78df5e06b4c13173af2a1f607c9a853d0f240", - "date": "2024-02-25T14:41:06-06:00", - "path": "/nix/store/h63hh37wn6khk4gj4v1yv37w7kxgr595-tree-sitter-php", - "sha256": "07022kisc2r5pfcbv0smh5gnn9v0i7jazfbvckczz15d0wwrpfip", - "hash": "sha256-N7qbOQethP/ZZHu5r+SJYCdrX4FVg72YuyULpuMUAhw=", + "rev": "a1e0befae61715d9e162529b3c2bfd961d183613", + "date": "2024-09-02T16:13:56-04:00", + "path": "/nix/store/j71y2xpajnpq7pp0rv2h0lb0w55vcjg2-tree-sitter-php", + "sha256": "1zpnnmrsgmb802m2zjdnfxz41fq475qk7n2pnjsbc5n61k81dgga", + "hash": "sha256-6r0W0AzGFra0tFfYM3E5BLtAfne2yS+qAGjVp3O19v4=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json index 688de10aa4..299aa72dad 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-python", - "rev": "71778c2a472ed00a64abf4219544edbf8e4b86d7", - "date": "2024-04-30T21:50:21-04:00", - "path": "/nix/store/xqc20db4g26sqsj0jflj4z2jm8hfmd97-tree-sitter-python", - "sha256": "1dmg11dbrddf55xhly813cb6ykxmyam2kjs7lyfi8k8xms03jx44", - "hash": "sha256-hHQ5gK4dTRSdp0fLKarytU9vFhsBeQp7Ka61vFoIr7Y=", + "rev": "8c65e256f971812276ff2a69a2f515c218ed7f82", + "date": "2024-09-02T20:40:41-04:00", + "path": "/nix/store/8mw7g7r8j8n8d8wssjz43nsmkhnlqd0b-tree-sitter-python", + "sha256": "0d51zk7znaxvwcacp5gzm2rwprk8m10wnxhk5g4q7sygbcvl2rzj", + "hash": "sha256-8mdBN1vP64PJKxN2y0GoaObLs6j/lcsU47sr+8/8oTQ=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json index c213aaa449..81b8070b53 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ql-dbscheme", - "rev": "afd8764736bb7ae52b6628618e8b3e7e28224ab7", - "date": "2024-05-07T13:58:04+02:00", - "path": "/nix/store/696rbv0z6i563jjqbwgdavy6kvpkja94-tree-sitter-ql-dbscheme", - "sha256": "1mb87h2gzv3cwswklnnk2s8xmj060j4aj3ccgic7va23n1mm6rbs", - "hash": "sha256-emVTa7BDqH1YfIwNqYgEBsjakRbTWjq55mzs/wQ8aNU=", + "rev": "1980b4b6998a1138d326f863e6168f0f2c0c544d", + "date": "2024-09-02T15:26:46-04:00", + "path": "/nix/store/s3klligl52ag14ai8n1fcwhn7k4m1wdk-tree-sitter-ql-dbscheme", + "sha256": "1k3qz85507xysx2msr1ns44ya3x3xxb9kxfzvpp088w6nrc6cipm", + "hash": "sha256-9UZmWLaGIwTu3d/1mVbvow/lCdE2ZF1F174fUAr6eMw=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json index 6cf9f8045e..901d037b9f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ql", - "rev": "42becd6f8f7bae82c818fa3abb1b6ff34b552310", - "date": "2024-05-07T14:00:59+02:00", - "path": "/nix/store/dknbdl1hrgp0kicx2wx1wjnhb7bay643-tree-sitter-ql", - "sha256": "1gcgs87cas4qd5ppvzjfgzj2ayjnjfxbyg3gl204w8mrvciq2niq", - "hash": "sha256-OFqBI9u5Ik6AoG88v7qTVnol5H9O/n1vaZhoxQ7Sj70=", + "rev": "c73c31c89cb0019ef56fe8bc1723e7c36e0be607", + "date": "2024-09-02T14:59:29-04:00", + "path": "/nix/store/diaw28vzzry46dc5b0fra2xw263lmbhs-tree-sitter-ql", + "sha256": "1lnasix7vb9q7lixy5qayslzw9yk53gll8130d03h0a9vl44dw8b", + "hash": "sha256-C/FGCN1JAThAAyMgSt8o0yf+qfYKF98jPTitfXrUytI=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json index 09390cce1e..c2ab4fb278 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json @@ -1,10 +1,10 @@ { "url": "https://github.com/nvim-treesitter/tree-sitter-query", - "rev": "d25e8d183f319497b8b22a2a1585975b020da722", - "date": "2024-05-06T23:21:15+02:00", - "path": "/nix/store/bj3dsdmf608vwagc1nwwhs5z90p6swzc-tree-sitter-query", - "sha256": "191h311g14aah7wpibpyhpz925506c3l6qyrfra1kd8pjn1nv2vk", - "hash": "sha256-c4ttg5UXtRlUdtljQwczoBSR/oX+rnj5gUqR8EIYMKQ=", + "rev": "f767fb0ac5e711b6d44c5e0c8d1f349687a86ce0", + "date": "2024-05-26T11:54:30+02:00", + "path": "/nix/store/rr9wn6900c73csv01czjnq609nwzyhqk-tree-sitter-query", + "sha256": "0wi01kmvb5axavfm6jp3rd6dd9pnq551w9lgwcgs02amxp6z8ymj", + "hash": "sha256-snr0ze1VCaAf448mHkrB9qbWTMvjSlPdVl2VtesMIHI=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json index c74499796f..4754dba33b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json @@ -1,10 +1,10 @@ { "url": "https://github.com/r-lib/tree-sitter-r", - "rev": "391400572538ff9854341a175ed8ab4b1e45f44b", - "date": "2024-05-03T14:16:03-04:00", - "path": "/nix/store/dkmd92q56snynssaridhzkd7rv8zckq7-tree-sitter-r", - "sha256": "05s0n6qvb3jsx7sv4vzsc794vdxinxf7f8d2sbf9qz3vwwm39kr8", - "hash": "sha256-KM80Kud7fJzc0qIhd1y3sbdN0mH6b7L16VqOtbGxQBc=", + "rev": "ac939363ced63a5fd39a8bd5e7891bbe06b5738d", + "date": "2024-09-06T16:53:09-04:00", + "path": "/nix/store/qj9nyda5grkjqkh23m9a3q3sgkmkgcdh-tree-sitter-r", + "sha256": "1jf14nvrfcznsnmxmlkbnn59bdykpsawxm5grph65p8vghi4fik7", + "hash": "sha256-Z0ZHInwb3WLgza/UzpW+07eVirVr0tqr1fYzl7clwck=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json index fee52809be..db619e4556 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-regex", - "rev": "47007f195752d8e57bda80b0b6cdb2d173a9f7d7", - "date": "2024-05-05T20:53:57-04:00", - "path": "/nix/store/4vlp0kgq09yp9bnjkrsc82mh0c0mb4qa-tree-sitter-regex", - "sha256": "0j9shwv7j8jnkms1f8h9ddg80cj85vp1pivkdcspdifbi69q8l2z", - "hash": "sha256-X1CEk4nLxXY1a3PHG+4uSDKAXmsJIhd0nVYieTaHOkk=", + "rev": "f70251e1f1d72bd6dc1f897f956f9112f8668441", + "date": "2024-09-02T03:31:05-04:00", + "path": "/nix/store/9shrpsgb7rnk24nwc3xr1xv33wxi0ydk-tree-sitter-regex", + "sha256": "08i97gwvf6777h6dkvsd08s2n4pmpz2xghxpn1npn16jcpaknhhv", + "hash": "sha256-G0I71WXSBHttsLfD18W/9RIrNAJN79kMPOcYt/k7KSI=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json index 0cf6618b45..1df81f9139 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json @@ -1,10 +1,10 @@ { "url": "https://github.com/FallenAngel97/tree-sitter-rego", - "rev": "9ac75e71b2d791e0aadeef68098319d86a2a14cf", - "date": "2023-11-03T09:13:53+02:00", - "path": "/nix/store/7v3znqfnq89ik6svp70fzsin8j4ydl4s-tree-sitter-rego", - "sha256": "12napwjsv4hx2k4ad0p2v3mv4lhxgp894riglyqmidxxkikzma9g", - "hash": "sha256-L6n6Z5y9t1ixpy9mktB9HVKy69jigqbIFB2SrSW/yoo=", + "rev": "20b5a5958c837bc9f74b231022a68a594a313f6d", + "date": "2024-06-12T18:01:13+03:00", + "path": "/nix/store/dhpxdwhiwc6dl3gys99g3ax5jmg6s7fw-tree-sitter-rego", + "sha256": "0cmja3gd5nbmi251qc14hh1cbfd7i0mydx74qxs30qvix6q5a2az", + "hash": "sha256-XwlVsOlxYzB0x+T05iuIp7nFAoQkMByKiHXZ0t5QsjI=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json index 12519a98bf..a682053ee9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-rust", - "rev": "9c84af007b0f144954adb26b3f336495cbb320a7", - "date": "2024-05-05T19:28:38-04:00", - "path": "/nix/store/5mmx41c8spdf25jci02lw3vmq117dksv-tree-sitter-rust", - "sha256": "0wjw8wz34c3h624xi0n133pv4ld1gmx4zn60xfkqgv7cmn9f42cv", - "hash": "sha256-mwnikq3s7Ien68DYT3p9oVGy7xjBgtiJMHAwMj5HXHI=", + "rev": "6b7d1fc73ded57f73b1619bcf4371618212208b1", + "date": "2024-09-02T05:17:41-04:00", + "path": "/nix/store/7qazknjwzfdl0jyc7jyqskjagw00i5wy-tree-sitter-rust", + "sha256": "08m0i6ar5gkz1pvz8lh2dfwjff4szzl0q0lzbqp0p5il0arxvbbh", + "hash": "sha256-cK3dswI0lgsuXp8CDOj/mjgnuWsCUvT3DX++kpWJoCI=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json index 719d4ce9e2..c72db67756 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-scala", - "rev": "b3ac6a5d959d3137e7f3146d4d9f7899872177de", - "date": "2024-03-12T14:34:11-04:00", - "path": "/nix/store/zi4bjbmxlhp003lk37pcyf5kg9m2wcf6-tree-sitter-scala", - "sha256": "1j2ivdm21c5db54rcff00n7bqcfrfjc91jwlfl4a2cm363hbrym2", - "hash": "sha256-ovq84DCjMqEIdZTLkJh02TG8jgXAOZZJWa2wIGrbUcg=", + "rev": "62e7506f5ec87e2daf218e3bbd317401768d9963", + "date": "2024-09-12T09:36:24-04:00", + "path": "/nix/store/kcrap980k751mp2mk59z19jcc196pk08-tree-sitter-scala", + "sha256": "0ybj359b21cqy1nqr1psjy244y7d672iik9a3pqxrg67cppwwn26", + "hash": "sha256-RljO72XHvNzxHSrNGMUx7XhChJf6hoxt8JgFsVIZcnk=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json index 7e08f32421..ef5caa8e43 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json @@ -1,10 +1,10 @@ { "url": "https://github.com/6cdh/tree-sitter-scheme", - "rev": "8f9dff3d038f09934db5ea113cebc59c74447743", - "date": "2024-04-12T09:33:55+08:00", - "path": "/nix/store/myg0q8bjsdzgq712skhxk1vf2gqqr7b0-tree-sitter-scheme", - "sha256": "1n9f9zala2mv7bllwjb2nsh2xsr56zjh7j09vxzd77jnb10rjh20", - "hash": "sha256-QECZQVhWntN+3wnIA+U3JesuoLZiSU7pOrsKRdVPLtk=", + "rev": "63e25a4a84142ae7ee0ee01fe3a32c985ca16745", + "date": "2024-09-08T01:23:30+08:00", + "path": "/nix/store/1wk7w5vkxcwqx24qlm203z1z5rw95vn8-tree-sitter-scheme", + "sha256": "12p8g2mnd73lanibk16llhbx7xarlcl2ihngcibhpa4bzppcbb8l", + "hash": "sha256-FK3F7v2LqAtXZM/CKCijWfXTF6TUhLmiVXScZqt46Io=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json index 0c3c6df0b6..6212e7a668 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json @@ -1,7 +1,7 @@ { "url": "https://github.com/serenadeai/tree-sitter-scss", "rev": "c478c6868648eff49eb04a4df90d703dc45b312a", - "date": "2022-02-03T21:48:21+00:00", + "date": "2022-02-03T21:48:21Z", "path": "/nix/store/s49l3jbhjni3l1d0m3xrpzml39aq9yr3-tree-sitter-scss", "sha256": "15r3jiv36hzx2pmjmp63am3pbc01s52z36xfraa1aw4wlx7lqnq4", "hash": "sha256-BFtMT6eccBWUyq6b8UXRAbB1R1XD3CrrFf1DM3aUI5c=", diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json index 609520882b..c95def892a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json @@ -1,7 +1,7 @@ { "url": "https://github.com/indoorvivants/tree-sitter-smithy", "rev": "cf8c7eb9faf7c7049839585eac19c94af231e6a0", - "date": "2023-01-31T21:16:56+00:00", + "date": "2023-01-31T21:16:56Z", "path": "/nix/store/y5j99bx1b6h25k1lnzs6s4gkg0mhll06-tree-sitter-smithy", "sha256": "0k7gfpa3pcj1ji34k0kwk1xbadkgjadfg36xfwns1fmlwzmr7jnx", "hash": "sha256-3cqT6+e0uqAtd92M55qSbza1eph8gklGlEGyO9R170w=", diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json index 42199274dd..3108dc0d12 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json @@ -1,10 +1,10 @@ { "url": "https://github.com/bonabeavis/tree-sitter-sparql", - "rev": "05f949d3c1c15e3261473a244d3ce87777374dec", - "date": "2021-08-16T15:50:03+02:00", - "path": "/nix/store/vvgvb1jcv0qrn3xj0jbf83qwi1lh2m68-tree-sitter-sparql", - "sha256": "012c1pi4vc6hkvllymvl2yah3ix8k4pi7997iydy949fc33aa5i8", - "hash": "sha256-KBalxmAukeSbjyelEy+ZqMcBlRd0V0/pntCwTeINTAQ=", + "rev": "d853661ca680d8ff7f8d800182d5782b61d0dd58", + "date": "2024-06-26T16:15:19+02:00", + "path": "/nix/store/cz22k5dh2fqyfmamdx1mrlwv28shnk1x-tree-sitter-sparql", + "sha256": "1xd0hp2m62ggka46cv2px0507yyl9d9cdqhlpglq6y1jqb5p85fh", + "hash": "sha256-0BV0y8IyeIPpuxTixlJL1PsDCuhXbGaImu8JU8WFoPU=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json index 210646ac4c..ad70caa268 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json @@ -1,10 +1,10 @@ { "url": "https://github.com/derekstride/tree-sitter-sql", - "rev": "7d591a1a14ce4d5caf81ae64284c2dc185544cb2", - "date": "2024-04-20T18:48:13+02:00", - "path": "/nix/store/r6sz2sa4az2p2idl3vjv90nr4zghxmxr-tree-sitter-sql", - "sha256": "1x4kw4fflizwb472n8sfpigqyc8y57m28mawsf999011flzg2dmp", - "hash": "sha256-tzbxPnUhgJSS01xVJOopHjGPX7xOIysOWfxH6hzhk/Q=", + "rev": "53623157a27f787cab12b2545f43ddd34f3fb5f7", + "date": "2024-08-09T22:12:06+02:00", + "path": "/nix/store/vlm9y5gcjih5scd3iyaxynr79gbfqha8-tree-sitter-sql", + "sha256": "1hjb75rsqnrs0ca1zq17bv4r7skmvra7jw69lk94ncjk8sbhh30w", + "hash": "sha256-HAwIl0ZTMkvSpMlweVTedeqTyV4n4B8UAzpbrHM5S8I=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json index baa13c0a37..827afca5f9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json @@ -1,10 +1,10 @@ { "url": "https://github.com/wenkokke/tree-sitter-talon", - "rev": "dafc9fabf7acc1a46d51cce379cec00c07661aa7", - "date": "2023-11-05T13:07:41+00:00", - "path": "/nix/store/df67djinw8sjwf6lbfv6gdckxckv0y65-tree-sitter-talon", - "sha256": "1clmmb3pgvc54fsp83f2jmz6n21pmmjkb15yk9bfqlkzdm12sirw", - "hash": "sha256-PEctQm1/UuxWmr6ENWWtNwhrfpXCDXS1I4Xtd8eqlbI=", + "rev": "53fd1d6102f692ab3040f90a1fe5023b7342ff23", + "date": "2024-06-18T14:14:45+01:00", + "path": "/nix/store/bva5mf6j33icgd2rr4067i50gjjzbd10-tree-sitter-talon", + "sha256": "1kw7axcqpmjbcsl6h8lsvraqv58k0w76rhxcvqqx7kly4jgz1wrm", + "hash": "sha256-NfPwnySeztMx3qzDbA4HE5WNVd6aImioZkvWi1lXh88=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json index 6dbe640896..b9f7b8103f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json @@ -1,10 +1,10 @@ { "url": "https://github.com/vrischmann/tree-sitter-templ", - "rev": "d631f60287c0904770bc41aa865e249594b52422", - "date": "2024-05-09T13:42:17+02:00", - "path": "/nix/store/5h839wwxwjmg799bp79kkcav2ld8k0jy-tree-sitter-templ", - "sha256": "16di98f9xnqdpzb69p8hrgisfhsz0r9p4pv342z0cvkjv5n4s0xc", - "hash": "sha256-rANNbNlybga+IGNfclMGX0On48sQ3WTWvw3bnhxKsZk=", + "rev": "0524da9e1f14b9b7d7d6d36608293f85a550b263", + "date": "2024-09-03T22:47:13+02:00", + "path": "/nix/store/6zjn6rh5mm32cislyl1bi2ad0fxsk297-tree-sitter-templ", + "sha256": "1lxpmp6a00l7rykrgxqdsvsm9iijz4ik3im1xd4gy92zqsj4k8g0", + "hash": "sha256-4KFJpMZfJP9I66HGMSP5MsZU9dYN95enz4cCoMytt9M=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json index f50a35e3f2..35dc26733b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tlaplus-community/tree-sitter-tlaplus", - "rev": "ef18145e7f985f592ad41b04004b24a590f58b71", - "date": "2024-05-15T18:54:24-04:00", - "path": "/nix/store/saczmakjnrwrvn0dad37bfva1m3mvzc5-tree-sitter-tlaplus", - "sha256": "0hnylz5mxsvk1q8bbv7ak4r49l2knx75ln58i4isqs7qr0a2vw6b", - "hash": "sha256-y/AtFMj4aKwjiahYWk63U9BEMpnq7LUQDnPrXsun3kI=", + "rev": "200f9dab6b23f3b9bb8f67fc811221517f56c373", + "date": "2024-05-17T17:21:16-04:00", + "path": "/nix/store/lgxqyxs5l3nilj6a1caznwgmd7fpfc4k-tree-sitter-tlaplus", + "sha256": "0wab31x1p74xgd32yx0jydkz0cay0pwbi8h105apqihv3pxrk350", + "hash": "sha256-oIyZ+x0bRnxVAQGiuPgFXjHwZ/MSdC9Ge52cG3oYS3E=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-turtle.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-turtle.json index 6797d3fc63..8523faec37 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-turtle.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-turtle.json @@ -1,10 +1,10 @@ { "url": "https://github.com/bonabeavis/tree-sitter-turtle", - "rev": "085437f5cb117703b7f520dd92161140a684f092", - "date": "2021-08-16T15:17:50+02:00", - "path": "/nix/store/c90hph3wfyhjmri3qbfb5lpy1bl855zv-tree-sitter-turtle", - "sha256": "1l5djvz90sq9w14kfcrffdigqs61r1p8v17xpj92sxz8z3ngpgmr", - "hash": "sha256-ub777Pjody2SvP2EjW7IwWj8YnMuMzdJ4AlrkP6WrdA=", + "rev": "7f789ea7ef765080f71a298fc96b7c957fa24422", + "date": "2024-07-02T13:41:07+02:00", + "path": "/nix/store/1rscya6w8m579211nsmhhicc3rgk204h-tree-sitter-turtle", + "sha256": "0c3diz97lrnxqkq410s9rlmxddjqgnswyc4spdfny045xgfzp9yg", + "hash": "sha256-z6f73euFAG9du5owz7V9WLbWK81Jg0DwxN1metKPbTA=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json index 874cb0a136..5cbf4b7440 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json @@ -1,10 +1,10 @@ { "url": "https://github.com/maxxnino/tree-sitter-zig", - "rev": "0d08703e4c3f426ec61695d7617415fff97029bd", - "date": "2023-04-25T05:51:06-03:00", - "path": "/nix/store/fzz8x1pa11zksamgk199fw0j7dkbsz0s-tree-sitter-zig", - "sha256": "0whj44fl6hmcyap5bjqhy90rd6xnnxgsy3vn1z3mvq8d2mwbnxbb", - "hash": "sha256-a3W7eBUN4V3HD3YPr1+3tpuWQfIQy1Wu8qxCQx0hEnI=", + "rev": "2bac4cc6c697d46a193905fef6d003bfa0bfabfd", + "date": "2024-06-28T17:20:16+07:00", + "path": "/nix/store/3j7bnhlb5nka1c7sr965pblr2qrdsrn3-tree-sitter-zig", + "sha256": "1ix401wq0raz8sxp88r6wkkzrv6653yk5fi604i026yrm04n9br0", + "hash": "sha256-IK9kCajZGwEiASa6Mv0oxuz85+QmI3S7Rl9lgHkApMc=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix index 6d5db177b8..aa1504f57c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -61,6 +61,12 @@ let "py-tree-sitter" # afl fuzzing for tree sitter "afl-tree-sitter" + # this is the kotlin language bindings, tree-sitter-kotlin is the grammar + "kotlin-tree-sitter" + # this is the go language bindings, tree-sitter-go is the grammar + "go-tree-sitter" + # this is the java language bindings, tree-sitter-java is the grammar + "java-tree-sitter" # archived "highlight-schema" # website diff --git a/third_party/nixpkgs/pkgs/development/tools/pnpm/default.nix b/third_party/nixpkgs/pkgs/development/tools/pnpm/default.nix index aec4eab2e5..67e90744c5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pnpm/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pnpm/default.nix @@ -8,8 +8,8 @@ let hash = "sha256-2qJ6C1QbxjUyP/lsLe2ZVGf/n+bWn/ZwIVWKqa2dzDY="; }; "9" = { - version = "9.12.0"; - hash = "sha256-phtn/2zJevhkVk9EQlVsIqBPLlp3FPvudqEBE2HZtyY="; + version = "9.12.1"; + hash = "sha256-kUUv36RiNK5EfUbVxPxOfgpwWPkElcS293+L7ruxVOM="; }; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go/default.nix index 52a54fbeea..a80430e5a6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "protoc-gen-go"; - version = "1.34.2"; + version = "1.35.1"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "protobuf-go"; rev = "v${version}"; - hash = "sha256-467+AhA3tADBg6+qbTd1SvLW+INL/1QVR8PzfAMYKFA="; + hash = "sha256-SYSGC7LtKHdGuEQnjTzqRo8NxyxYXs4nMMflztRwJok="; }; vendorHash = "sha256-nGI/Bd6eMEoY0sBwWEtyhFowHVvwLKjbT4yfzFz6Z3E="; diff --git a/third_party/nixpkgs/pkgs/development/tools/qc/default.nix b/third_party/nixpkgs/pkgs/development/tools/qc/default.nix index 502d9480bd..02e6cefd9f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/qc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/qc/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "qc"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "qownnotes"; repo = "qc"; rev = "v${version}"; - hash = "sha256-+Mkg8x9f6oqPqPrk6iCHH69+k0jhQGfjtbJwJPLc7Dw="; + hash = "sha256-D45uJk1Hb7k2qOLIbRdo0gQlPovUwcQ3rnYqhouhow0="; }; vendorHash = "sha256-Cg1Op/4okIi2UTtqWnR0N3iMWzrYEaYxmXzvWIibftg="; diff --git a/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix b/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix index 2f29a32e87..54831c7028 100644 --- a/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "qtcreator"; - version = "14.0.1"; + version = "14.0.2"; src = fetchurl { - url = "https://download.qt.io/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - hash = "sha256-lZXS5sZbuRjng3YxQ0HcK+9JHDIApcbVzm8wVQmwsos="; + url = "mirror://qt/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz"; + hash = "sha256-stL4eLtpKKjm4w2HYAvdk89ATCYZoVHGS9zcjNB4OJI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-benchcmp/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-benchcmp/default.nix index 4ab9cb65d6..132aa0bc2f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-benchcmp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-benchcmp/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-benchcmp"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "BurntSushi"; repo = "cargo-benchcmp"; rev = version; - hash = "sha256-pg3/VUC1DQ7GbSQDfVZ0WNisXvzXy0O0pr2ik2ar2h0="; + hash = "sha256-J8KFI0V/mOhUlYtVnFAQgPIpXL9/dLhOFxSly4bR00I="; }; - cargoHash = "sha256-vxy9Ym3Twx034I1E5fWNnbP1ttfLolMbO1IgRiPfhRw="; + cargoHash = "sha256-2V9ILHnDsUI+x3f5o+V7p8rPUKf33PAkpyTabCPdd0g="; patches = [ # patch the binary path so tests can find the binary when `--target` is present diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix index f7b2426612..eb6d5bff00 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.10.5"; + version = "1.10.7"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-VhmyfGVO1rDcorOznovkUu0GHgUSwKHhk/3jqg1pDZk="; + hash = "sha256-bQYKOo11zVIXNHdoD60oEdzSSYeLKppPJBen6wdrXq8="; }; - cargoHash = "sha256-rgr++LD6YsTlrxKmNRtn2gdT5a1ul6A5UrXgKmpWC7w="; + cargoHash = "sha256-Tr++ui715adP1taqj+Sms2yO3hF5SZl7zCrAkPYlSdY="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix index e23844785c..66f9356a6e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-component"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "cargo-component"; rev = "v${version}"; - hash = "sha256-MCsFcEdP8SaT6PiCidUD5DBjRdeS+YIrQHpKsAnL4gA="; + hash = "sha256-j1gQgtse3DQWyR4D5BzQ0aAEGhNKoFT0ACRBVOqDdFE="; }; - cargoHash = "sha256-Eif6e/6HHOLI4dvptQvk1LTIoaalCoVtXwM4CpEivcI="; + cargoHash = "sha256-1YDnqopghS6MpQ2h8e5kQj0bxKAC2B6XzVeC60+M3MM="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deb/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deb/default.nix index 56b46ff8bc..1b3180e338 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deb/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deb/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deb"; - version = "2.5.1"; + version = "2.7.0"; src = fetchFromGitHub { owner = "kornelski"; repo = pname; rev = "v${version}"; - hash = "sha256-COXYXx7C+IDJiw/y+GLY0oJYxtUjnGsikeWUk3z5B48="; + hash = "sha256-ReXDrbFY2qY/0TUYD+EiP9Qa9KwMGb9iLL+tdfDLSpc="; }; - cargoHash = "sha256-5iU6jk8yZLVUjksB4g39zBtfm6LTeBgXOLsw/M5CZZc="; + cargoHash = "sha256-yBMeiYWsb+D8WzWRDDi9JFZTFvQAQ7QUeGDb6yFelD8="; nativeBuildInputs = [ makeWrapper diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-duplicates/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-duplicates/default.nix index 17c9cd7d83..c04dc2ac57 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-duplicates/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-duplicates/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-duplicates"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "Keruspe"; repo = "cargo-duplicates"; rev = "v${version}"; - hash = "sha256-OwytBecRGizkDC2S92FKAy3/mc4Jg/NwaYIPahfiG6k="; + hash = "sha256-VGxBmzMtev+lXGhV9pMefpgX6nPlzMaPbXq5LMdIvrE="; }; - cargoHash = "sha256-LsdzHCQ4uG6+dwiUoC36VPuqUf8oPlcMHxNgdkvYzu8="; + cargoHash = "sha256-xkPvbC/ot4U3gca57pEEze0jaQhUAZV1MEX0E6E1BmE="; nativeBuildInputs = [ curl diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-ndk/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-ndk/default.nix index 1397ffc374..8e38d601c7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-ndk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-ndk/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-ndk"; - version = "3.5.6"; + version = "3.5.7"; src = fetchFromGitHub { owner = "bbqsrc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-piNKtmDssDeB+DznLl0uufT5BFiVCMmYGuRmBUr5QWQ="; + sha256 = "sha256-tzjiq1jjluWqTl+8MhzFs47VRp3jIRJ7EOLhUP8ydbM="; }; - cargoHash = "sha256-sIKan8LnGv4sGVrGOUOKSD3R4fNRu5yBFATm5MWDTSU="; + cargoHash = "sha256-UthI01fLC35BPp550LaDLoo1kjisUmQZqSud8JM/kqM="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreGraphics diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/ravedude/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/ravedude/default.nix index 1e69970653..36777a2075 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/ravedude/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/ravedude/default.nix @@ -3,6 +3,8 @@ , fetchCrate , pkg-config , udev +, avrdude +, makeBinaryWrapper , nix-update-script , testers , ravedude @@ -19,10 +21,14 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-HeFmQsgr6uHrWi6s5sMQ6n63a44Msarb5p0+wUzKFkE="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config makeBinaryWrapper ]; buildInputs = [ udev ]; + postInstall = '' + wrapProgram $out/bin/ravedude --suffix PATH : ${lib.makeBinPath [ avrdude ]} + ''; + passthru = { updateScript = nix-update-script { }; tests.version = testers.testVersion { @@ -36,7 +42,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://crates.io/crates/ravedude"; license = with licenses; [ mit /* or */ asl20 ]; platforms = platforms.linux; - maintainers = with maintainers; [ rvarago ]; + maintainers = with maintainers; [ rvarago liff ]; mainProgram = "ravedude"; }; } 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 7fd2aafb70..986458e90b 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 @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { buildFeatures = lib.optional useMimalloc "mimalloc"; - CFG_RELEASE = version; + env.CFG_RELEASE = version; inherit doCheck; preCheck = lib.optionalString doCheck '' diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix index b01d04ad81..c49435674e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "svd2rust"; - version = "0.33.4"; + version = "0.33.5"; src = fetchCrate { inherit pname version; - hash = "sha256-V7d/lVNL7J/ErBlJUf8btrukGC+KSvk3r9AAethFNyk="; + hash = "sha256-wZfCk8jzTmltpmrp7QWU1uS5ct10iltNFdUCJvnrv98="; }; - cargoHash = "sha256-Wu/F4PU02hrmiL7OaKIP59CfDVWrU5cw60TYngqJYNg="; + cargoHash = "sha256-5m3/5zwjDeDgPuUsTIknXwEMjQs0gtVoksQn4EdPnwM="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/sassc/default.nix b/third_party/nixpkgs/pkgs/development/tools/sassc/default.nix index 84488e0cb8..3501f82689 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sassc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sassc/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { buildInputs = [ libsass ]; + enableParallelBuilding = true; + meta = with lib; { description = "Front-end for libsass"; homepage = "https://github.com/sass/sassc/"; diff --git a/third_party/nixpkgs/pkgs/development/tools/sqldef/default.nix b/third_party/nixpkgs/pkgs/development/tools/sqldef/default.nix index 5b357fb11e..0ace1d81a2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sqldef/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sqldef/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "sqldef"; - version = "0.17.19"; + version = "0.17.20"; src = fetchFromGitHub { owner = "k0kubun"; repo = "sqldef"; rev = "v${version}"; - hash = "sha256-euIP6ev1qc+75MA9vlTZHY7LT03AM8hya+sPWohvCWI="; + hash = "sha256-r175nhzPLoU4CBjEiktsQIuQTgRJ64uW1MhDKHEDR+4="; }; proxyVendor = true; - vendorHash = "sha256-+5vfQoTRCbwY/Ydq21VG/xt6CeOWHIup8bxWI/2v24A="; + vendorHash = "sha256-reYZUuZTNeNFrbrDQPVXwx+UuBGdEmTdSowbneZc/No="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/systemfd/default.nix b/third_party/nixpkgs/pkgs/development/tools/systemfd/default.nix index 041f88111b..da562f2bd5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/systemfd/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/systemfd/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage { mainProgram = "systemfd"; homepage = "https://github.com/mitsuhiko/systemfd"; license = lib.licenses.asl20; - maintainers = [ lib.maintainers.adisbladis ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/ttfb/default.nix b/third_party/nixpkgs/pkgs/development/tools/ttfb/default.nix index e9bc3c11bd..a6e35db3de 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ttfb/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ttfb/default.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "ttfb"; - version = "1.12.0"; + version = "1.13.0"; src = fetchCrate { inherit pname version; - hash = "sha256-Cdup65w31wF1RZu0g4/msHfLESrNTcuCU5kxkk0gnW8="; + hash = "sha256-G5RSnh+S7gbIWJxm778pHN36xghpptcCpfElada0Afo="; }; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - cargoHash = "sha256-U8CG0GqnUwya+ZK0qXtOFZ/MbbqSvB5egX7XJKtl88g="; + cargoHash = "sha256-kgfET2hOw0OAbBcKS7BOvY3nrLNX6CcQ6fOzVJ9rMOU="; # The bin feature activates all dependencies of the binary. Otherwise, # only the library is build. diff --git a/third_party/nixpkgs/pkgs/development/tools/wails/default.nix b/third_party/nixpkgs/pkgs/development/tools/wails/default.nix index de73c6b637..4ae5a8bd63 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wails/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wails/default.nix @@ -9,7 +9,7 @@ , zlib # Linux specific dependencies , gtk3 -, webkitgtk +, webkitgtk_4_0 }: buildGoModule rec { @@ -48,7 +48,7 @@ buildGoModule rec { nodejs ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 - webkitgtk + webkitgtk_4_0 ]; ldflags = [ @@ -60,7 +60,7 @@ buildGoModule rec { postFixup = '' wrapProgram $out/bin/wails \ --prefix PATH : ${lib.makeBinPath [ pkg-config go stdenv.cc nodejs ]} \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath (lib.optionals stdenv.hostPlatform.isLinux [ gtk3 webkitgtk ])}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath (lib.optionals stdenv.hostPlatform.isLinux [ gtk3 webkitgtk_4_0 ])}" \ --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH" \ --set CGO_LDFLAGS "-L${lib.makeLibraryPath [ zlib ]}" ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/xcbuild/setup-hook.sh b/third_party/nixpkgs/pkgs/development/tools/xcbuild/setup-hook.sh index f4b5abf2d8..cd8bfa59f1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/xcbuild/setup-hook.sh +++ b/third_party/nixpkgs/pkgs/development/tools/xcbuild/setup-hook.sh @@ -3,9 +3,12 @@ xcbuildBuildPhase() { runHook preBuild - echo "running xcodebuild" + local flagsArray=() + concatTo flagsArray xcbuildFlags - xcodebuild SYMROOT=$PWD/Products OBJROOT=$PWD/Intermediates $xcbuildFlags build + echoCmd 'running xcodebuild' "${flagsArray[@]}" + + xcodebuild SYMROOT=$PWD/Products OBJROOT=$PWD/Intermediates "${flagsArray[@]}" build runHook postBuild } 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 50db729bca..eb3769f182 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.2"; + version = "6.7.3"; src = fetchurl { url = "https://releases.bootstrapstudio.io/${version}/Bootstrap%20Studio.AppImage"; - sha256 = "sha256-t75lmprCWumwt1wNVNWZSHdk1NBSmFqwjDQZHRpBv9g="; + sha256 = "sha256-Wcqhn4h5UZIYDkC5OcfWLc0hQ3liMD8tcppAva8t62A="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/third_party/nixpkgs/pkgs/development/web/cog/default.nix b/third_party/nixpkgs/pkgs/development/web/cog/default.nix index e9352822b3..7de90857c0 100644 --- a/third_party/nixpkgs/pkgs/development/web/cog/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/cog/default.nix @@ -8,7 +8,7 @@ , libwpe , libwpe-fdo , glib-networking -, webkitgtk +, webkitgtk_4_0 , makeWrapper , wrapGAppsHook3 , adwaita-icon-theme @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { wayland libwpe libwpe-fdo - webkitgtk + webkitgtk_4_0 glib-networking gdk-pixbuf adwaita-icon-theme diff --git a/third_party/nixpkgs/pkgs/development/web/newman/default.nix b/third_party/nixpkgs/pkgs/development/web/newman/default.nix index 8061637417..31805a4b33 100644 --- a/third_party/nixpkgs/pkgs/development/web/newman/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/newman/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "newman"; - version = "6.1.3"; + version = "6.2.1"; src = fetchFromGitHub { owner = "postmanlabs"; repo = "newman"; rev = "refs/tags/v${version}"; - hash = "sha256-I9gpVwrrug1Ygi0UuBIeq16Nyn8rsaDkMDtpxBYJOuY="; + hash = "sha256-p0/uHrLiqw5VnboXzLKF+f56ZfW77m5aoopf2zqIpQE="; }; - npmDepsHash = "sha256-StNu5NHGzivl3+GMBWkbxvsRJ/dYuS0dze+8/i7q9qg="; + npmDepsHash = "sha256-HQ5V0hisolXqWV/oWlroCzC7ZoNw0P9bwTxFyUrL3Hc="; dontNpmBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/gyp-patches-v22-import-sys.patch b/third_party/nixpkgs/pkgs/development/web/nodejs/gyp-patches-v22-import-sys.patch deleted file mode 100644 index 4f1abea901..0000000000 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/gyp-patches-v22-import-sys.patch +++ /dev/null @@ -1,14 +0,0 @@ -For some reason Node.js v22 has two different GYP versions vendored, and -only one of them contains `import sys`. - ---- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py -+++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py -@@ -25,6 +25,7 @@ - import os - import re - import subprocess -+import sys - import gyp - import gyp.common - import gyp.xcode_emulation - diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix index 07c945e2b2..8881d608c9 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix @@ -294,15 +294,11 @@ let "test-child-process-exec-env" "test-child-process-uid-gid" "test-fs-write-stream-eagain" - "test-https-foafssl" "test-process-euid-egid" "test-process-initgroups" "test-process-setgroups" "test-process-uid-gid" "test-setproctitle" - "test-tls-cli-max-version-1.3" - "test-tls-client-auth" - "test-tls-sni-option" # This is a bit weird, but for some reason fs watch tests fail with # sandbox. "test-fs-promises-watch" @@ -323,6 +319,8 @@ let "test-runner-run" "test-runner-watch-mode" "test-watch-mode-files_watcher" + ] ++ lib.optionals (!lib.versionAtLeast version "22") [ + "test-tls-multi-key" ] ++ lib.optionals stdenv.buildPlatform.isDarwin [ # Disable tests that don’t work under macOS sandbox. "test-macos-app-sandbox" @@ -333,6 +331,7 @@ let # TODO: revisit at a later date. "test-fs-readv" "test-fs-readv-sync" + "test-vm-memleak" ])}" ]; @@ -363,7 +362,13 @@ let # assemble a static v8 library and put it in the 'libv8' output mkdir -p $libv8/lib pushd out/Release/obj - find . -path "./torque_*/**/*.o" -or -path "./v8*/**/*.o" | sort -u >files + find . -path "**/torque_*/**/*.o" -or -path "**/v8*/**/*.o" \ + -and -not -name "torque.*" \ + -and -not -name "mksnapshot.*" \ + -and -not -name "gen-regexp-special-case.*" \ + -and -not -name "bytecode_builtins_list_generator.*" \ + | sort -u >files + test -s files # ensure that the list is not empty $AR -cqs $libv8/lib/libv8.a @files popd diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v18.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v18.nix index 811c064695..556e163e3a 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v18.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v18.nix @@ -48,5 +48,103 @@ buildNodejs { url = "https://github.com/nodejs/node/commit/d0a6b605fba6cd69a82e6f12ff0363eef8fe1ee9.patch"; hash = "sha256-TfYal/PikRZHL6zpAlC3SmkYXCe+/8Gs83dLX/X/P/k="; }) + + # Patches for OpenSSL 3.2 + # Patches already in 20.13.0 + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/9f939f5af7d11299796999af3cbfa4845b505c78.patch?full_index=1"; + hash = "sha256-vZJMTI8KR+RoCl4r9dfNdNMKssk4osLS61A/F7gdeWQ="; + }) + # Patches already in 20.16.0 + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/5909cf3b047f708de6a1373232bfcc899fa97a1d.patch?full_index=1"; + hash = "sha256-JidSO/73fjxTcGBiMHC7x10muYtv04inXNVJebFmcgo="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/ce531af0c27acf29dd05ab2fac19b4af88f8780d.patch?full_index=1"; + hash = "sha256-2WD4lVCtfji0AXlIHq4tiQ2TWKVMPjYZjbaVxd3HEFw="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/3e7129e5d60d4f017ad06c006dec7f95d986095c.patch?full_index=1"; + hash = "sha256-2SRoUMswY25GamJ6APVAzDwqopSCpVPKAEIIqyaAmBA="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/da0f19208786cd7c57fec733e4ba24d0454f556a.patch?full_index=1"; + hash = "sha256-AyQe2eHIx0O2jUgMCqWnzLhW8XduPaU4ZmhFA3UQI+Q="; + }) + # Patches already in 20.17.0 + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/53ac448022b7cdfcc09296da88d9a1b59921f6bf.patch?full_index=1"; + hash = "sha256-JcEbluU9k20Q3W915D1O6wWgX5R/UKjxqsuDemjMoTc="; + }) + # Patches already in 22.7.0 + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/bd42e4c6a73f61f7ee47e4426d86708fd80c6c4f.patch?full_index=1"; + hash = "sha256-bsCLVwK5t8dD+wHd1FlFJ1wpCGtNGcwoOfq4fG5MHfo="; + includes = ["test/parallel/test-tls-set-sigalgs.js"]; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/e0634f58aba6a1634fe03107d5be849fd008cc02.patch?full_index=1"; + hash = "sha256-Jh7f4JPS1H2Rpj1nEOW53E66Z+GDNEFXl0jALrvyYXQ="; + }) + # Patches already in 22.8.0 + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/e9cd4766e39d96693320be9ce0a1044c450e8675.patch?full_index=1"; + hash = "sha256-RXRLRznz16B8MrfVrpIHgyqLV2edpJk2p717QBttyK4="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/2bfc9e467cb05578efa4d3db497f368fb144e5fc.patch?full_index=1"; + hash = "sha256-TyHSd+O0T/bFR7YZuxm4HumrMljnJu2a8RRLRvz6KNM="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/01f751b529d126529f1d2019f0dcb13b8e54b787.patch?full_index=1"; + hash = "sha256-m3IaWL7U8fQMnmP2Xch4M8Qn1AJU8Ao9GCqMPcDnqCk="; + }) + # Patches already in 22.9.0 + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/d9ca8b018efd172a99365ada8f536491b19bd87b.patch?full_index=1"; + hash = "sha256-KzoWVXcgjJaMUOXDyLlkwRcN6z3SdFhTJd0KYBYfElE="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/c4f295470392db237c0adfc9832214538a99a034.patch?full_index=1"; + hash = "sha256-sYTY+oiQ5K7bYLcI1+jSTlLFdwpteKGSu7S/bbaslLE="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/a65105ec284023960e93b3a66f6661ddd2f4121f.patch?full_index=1"; + hash = "sha256-ZNkiHlp+UlbnonPBhMUw6rqtjWrC1b9SgI9EcGhDlwY="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/c77bcf018716e97ae35203990bcd51c143840348.patch?full_index=1"; + hash = "sha256-EwrZKpLRzk3Yjen1WVQqKTiHKE2uLTpaPsE13czH2rY="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/18101d83a158b877ac765936aba973c664130ea2.patch?full_index=1"; + hash = "sha256-vpHDj5+340bjYLo7gTWFu7iS4vVveBZAMypQ2eLoQzM="; + }) + # Patches not yet released + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/f8b7a171463e775da304bccf4cf165e634525c7e.patch?full_index=1"; + hash = "sha256-imptUwt2oG8pPGKD3V6m5NQXuahis71UpXiJm4C0E6o="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/6dfa3e46d3d2f8cfba7da636d48a5c41b0132cd7.patch?full_index=1"; + hash = "sha256-ITtGsvZI6fliirCKvbMH9N2Xoy3001bz+hS3NPoqvzg="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/29b9c72b05786061cde58a5ae11cfcb580ab6c28.patch?full_index=1"; + hash = "sha256-xaqtwsrOIyRV5zzccab+nDNG8kUgO6AjrVYJNmjeNP0="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/cfe58cfdc488da71e655d3da709292ce6d9ddb58.patch?full_index=1"; + hash = "sha256-9GblpbQcYfoiE5R7fETsdW7v1Mm2Xdr4+xRNgUpLO+8="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/2cec716c48cea816dcd5bf4997ae3cdf1fe4cd90.patch?full_index=1"; + hash = "sha256-ExIkAj8yRJEK39OfV6A53HiuZsfQOm82/Tvj0nCaI8A="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/0f7bdcc17fbc7098b89f238f4bd8ecad9367887b.patch?full_index=1"; + hash = "sha256-lXx6QyD2anlY9qAwjNMFM2VcHckBshghUF1NaMoaNl4="; + }) ] ++ gypPatches; } diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v20.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v20.nix index bb2a446d6e..9e3c3a3577 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v20.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v20.nix @@ -1,4 +1,4 @@ -{ callPackage, openssl, python3, enableNpm ? true }: +{ callPackage, fetchpatch2, openssl, python3, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { @@ -21,5 +21,76 @@ buildNodejs { ./bypass-darwin-xcrun-node16.patch ./node-npm-build-npm-package-logic.patch ./use-correct-env-in-tests.patch + + # Patches for OpenSSL 3.2 + # Patches already in 22.7.0 + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/bd42e4c6a73f61f7ee47e4426d86708fd80c6c4f.patch?full_index=1"; + hash = "sha256-bsCLVwK5t8dD+wHd1FlFJ1wpCGtNGcwoOfq4fG5MHfo="; + includes = ["test/parallel/test-tls-set-sigalgs.js"]; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/e0634f58aba6a1634fe03107d5be849fd008cc02.patch?full_index=1"; + hash = "sha256-Jh7f4JPS1H2Rpj1nEOW53E66Z+GDNEFXl0jALrvyYXQ="; + }) + # Patches already in 22.8.0 + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/e9cd4766e39d96693320be9ce0a1044c450e8675.patch?full_index=1"; + hash = "sha256-RXRLRznz16B8MrfVrpIHgyqLV2edpJk2p717QBttyK4="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/2bfc9e467cb05578efa4d3db497f368fb144e5fc.patch?full_index=1"; + hash = "sha256-TyHSd+O0T/bFR7YZuxm4HumrMljnJu2a8RRLRvz6KNM="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/01f751b529d126529f1d2019f0dcb13b8e54b787.patch?full_index=1"; + hash = "sha256-m3IaWL7U8fQMnmP2Xch4M8Qn1AJU8Ao9GCqMPcDnqCk="; + }) + # Patches already in 22.9.0 + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/d9ca8b018efd172a99365ada8f536491b19bd87b.patch?full_index=1"; + hash = "sha256-KzoWVXcgjJaMUOXDyLlkwRcN6z3SdFhTJd0KYBYfElE="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/c4f295470392db237c0adfc9832214538a99a034.patch?full_index=1"; + hash = "sha256-sYTY+oiQ5K7bYLcI1+jSTlLFdwpteKGSu7S/bbaslLE="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/a65105ec284023960e93b3a66f6661ddd2f4121f.patch?full_index=1"; + hash = "sha256-ZNkiHlp+UlbnonPBhMUw6rqtjWrC1b9SgI9EcGhDlwY="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/c77bcf018716e97ae35203990bcd51c143840348.patch?full_index=1"; + hash = "sha256-EwrZKpLRzk3Yjen1WVQqKTiHKE2uLTpaPsE13czH2rY="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/18101d83a158b877ac765936aba973c664130ea2.patch?full_index=1"; + hash = "sha256-vpHDj5+340bjYLo7gTWFu7iS4vVveBZAMypQ2eLoQzM="; + }) + # Patches not yet released + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/f8b7a171463e775da304bccf4cf165e634525c7e.patch?full_index=1"; + hash = "sha256-imptUwt2oG8pPGKD3V6m5NQXuahis71UpXiJm4C0E6o="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/6dfa3e46d3d2f8cfba7da636d48a5c41b0132cd7.patch?full_index=1"; + hash = "sha256-ITtGsvZI6fliirCKvbMH9N2Xoy3001bz+hS3NPoqvzg="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/29b9c72b05786061cde58a5ae11cfcb580ab6c28.patch?full_index=1"; + hash = "sha256-xaqtwsrOIyRV5zzccab+nDNG8kUgO6AjrVYJNmjeNP0="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/cfe58cfdc488da71e655d3da709292ce6d9ddb58.patch?full_index=1"; + hash = "sha256-9GblpbQcYfoiE5R7fETsdW7v1Mm2Xdr4+xRNgUpLO+8="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/2cec716c48cea816dcd5bf4997ae3cdf1fe4cd90.patch?full_index=1"; + hash = "sha256-ExIkAj8yRJEK39OfV6A53HiuZsfQOm82/Tvj0nCaI8A="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/0f7bdcc17fbc7098b89f238f4bd8ecad9367887b.patch?full_index=1"; + hash = "sha256-lXx6QyD2anlY9qAwjNMFM2VcHckBshghUF1NaMoaNl4="; + }) ] ++ gypPatches; } diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v22.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v22.nix index 90174977ff..dc4f10b745 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v22.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v22.nix @@ -1,4 +1,4 @@ -{ callPackage, openssl, python3, enableNpm ? true }: +{ callPackage, fetchpatch2, openssl, python3, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { @@ -7,13 +7,12 @@ let }; gypPatches = callPackage ./gyp-patches.nix { } ++ [ - ./gyp-patches-v22-import-sys.patch ]; in buildNodejs { inherit enableNpm; - version = "22.8.0"; - sha256 = "f130e82176d1ee0702d99afc1995d0061bf8ed357c38834a32a08c9ef74f1ac7"; + version = "22.9.0"; + sha256 = "a55aeb368dee93432f610127cf94ce682aac07b93dcbbaadd856df122c9239df"; patches = [ ./configure-emulator.patch ./configure-armv6-vfpv2.patch @@ -22,5 +21,32 @@ buildNodejs { ./node-npm-build-npm-package-logic.patch ./use-correct-env-in-tests.patch ./bin-sh-node-run-v22.patch + + # Patches for OpenSSL 3.2 + # Patches not yet released + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/f8b7a171463e775da304bccf4cf165e634525c7e.patch?full_index=1"; + hash = "sha256-imptUwt2oG8pPGKD3V6m5NQXuahis71UpXiJm4C0E6o="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/6dfa3e46d3d2f8cfba7da636d48a5c41b0132cd7.patch?full_index=1"; + hash = "sha256-ITtGsvZI6fliirCKvbMH9N2Xoy3001bz+hS3NPoqvzg="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/29b9c72b05786061cde58a5ae11cfcb580ab6c28.patch?full_index=1"; + hash = "sha256-xaqtwsrOIyRV5zzccab+nDNG8kUgO6AjrVYJNmjeNP0="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/cfe58cfdc488da71e655d3da709292ce6d9ddb58.patch?full_index=1"; + hash = "sha256-9GblpbQcYfoiE5R7fETsdW7v1Mm2Xdr4+xRNgUpLO+8="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/2cec716c48cea816dcd5bf4997ae3cdf1fe4cd90.patch?full_index=1"; + hash = "sha256-ExIkAj8yRJEK39OfV6A53HiuZsfQOm82/Tvj0nCaI8A="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/0f7bdcc17fbc7098b89f238f4bd8ecad9367887b.patch?full_index=1"; + hash = "sha256-lXx6QyD2anlY9qAwjNMFM2VcHckBshghUF1NaMoaNl4="; + }) ] ++ gypPatches; } diff --git a/third_party/nixpkgs/pkgs/games/exult/default.nix b/third_party/nixpkgs/pkgs/games/exult/default.nix index ab09e4efed..cc32d13617 100644 --- a/third_party/nixpkgs/pkgs/games/exult/default.nix +++ b/third_party/nixpkgs/pkgs/games/exult/default.nix @@ -3,6 +3,8 @@ , fetchFromGitHub , SDL2 , autoconf +, autoconf-archive +, autoreconfHook , automake , libogg , libtool @@ -10,21 +12,31 @@ , pkg-config , zlib , enableTools ? false +# Darwin-specific +, AudioUnit }: stdenv.mkDerivation rec { pname = "exult"; - version = "1.8"; + version = "1.10.1"; src = fetchFromGitHub { owner = "exult"; repo = "exult"; rev = "v${version}"; - hash = "sha256-Y7FpgiGuqR4ZG/PNSfLcNcRWeeC7GebUTighXsCfy+E="; + hash = "sha256-NlvtYtmJNYhOC1BtIxIij3NEQHWAGOeD4XgRq7evjzE="; }; + # We can't use just DESTDIR because with it we'll have /nix/store/...-exult-1.10.1/nix/store/...-exult-1.10.1/bin + postPatch = '' + substituteInPlace macosx/macosx.am \ + --replace-fail DESTDIR NIX_DESTDIR + ''; + nativeBuildInputs = [ autoconf + autoconf-archive + autoreconfHook automake libtool pkg-config @@ -35,12 +47,13 @@ stdenv.mkDerivation rec { libogg libvorbis zlib + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + AudioUnit ]; - preConfigure = '' - ./autogen.sh - ''; + enableParallelBuilding = true; + makeFlags = [ "NIX_DESTDIR=$(out)" ]; # see postPatch configureFlags = lib.optional (!enableTools) "--disable-tools"; meta = with lib; { @@ -58,5 +71,6 @@ stdenv.mkDerivation rec { homepage = "http://exult.info"; license = licenses.gpl2Plus; maintainers = with maintainers; [ azahi ]; + mainProgram = "exult"; }; } diff --git a/third_party/nixpkgs/pkgs/games/gamehub/default.nix b/third_party/nixpkgs/pkgs/games/gamehub/default.nix index 3bfbe71c3c..4367de30f5 100644 --- a/third_party/nixpkgs/pkgs/games/gamehub/default.nix +++ b/third_party/nixpkgs/pkgs/games/gamehub/default.nix @@ -13,7 +13,7 @@ , libsoup , json-glib , sqlite -, webkitgtk +, webkitgtk_4_0 , libmanette , libXtst , wrapGAppsHook3 @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { libsoup libXtst sqlite - webkitgtk + webkitgtk_4_0 ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/games/hedgewars/default.nix b/third_party/nixpkgs/pkgs/games/hedgewars/default.nix index 389beb7b51..24ae078c77 100644 --- a/third_party/nixpkgs/pkgs/games/hedgewars/default.nix +++ b/third_party/nixpkgs/pkgs/games/hedgewars/default.nix @@ -1,4 +1,4 @@ -{ stdenv, SDL2_image_2_6, SDL2_ttf, SDL2_net, fpc, haskell, ffmpeg_7, libglut +{ stdenv, SDL2_image_2_6, SDL2_ttf, SDL2_net, fpc, haskell, ffmpeg, libglut , lib, fetchurl, cmake, pkg-config, lua5_1, SDL2, SDL2_mixer , zlib, libpng, libGL, libGLU, physfs , qtbase, qttools, wrapQtAppsHook @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image_2_6 fpc lua5_1 llvm # hard-requirement on aarch64, for some reason not strictly necessary on x86-64 - ffmpeg_7 libglut physfs + ffmpeg libglut physfs qtbase ] ++ lib.optional withServer ghc; diff --git a/third_party/nixpkgs/pkgs/games/heroic/default.nix b/third_party/nixpkgs/pkgs/games/heroic/default.nix index a9c85e26b5..131dea9c02 100644 --- a/third_party/nixpkgs/pkgs/games/heroic/default.nix +++ b/third_party/nixpkgs/pkgs/games/heroic/default.nix @@ -88,9 +88,9 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace "$out/share/heroic/flatpak/com.heroicgameslauncher.hgl.desktop" \ --replace-fail "Exec=heroic-run" "Exec=heroic" - mkdir -p "$out/share/applications" "$out/share/icons/hicolor/512x512/apps" + mkdir -p "$out/share/applications" "$out/share/icons/hicolor/scalable/apps" ln -s "$out/share/heroic/flatpak/com.heroicgameslauncher.hgl.desktop" "$out/share/applications" - ln -s "$out/share/heroic/flatpak/com.heroicgameslauncher.hgl.png" "$out/share/icons/hicolor/512x512/apps" + ln -s "$out/share/heroic/src/frontend/assets/heroic-icon.svg" "$out/share/icons/hicolor/scalable/apps/com.heroicgameslauncher.hgl.svg" runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/games/heroic/fhsenv.nix b/third_party/nixpkgs/pkgs/games/heroic/fhsenv.nix index 4fe9429193..7b0b67ad30 100644 --- a/third_party/nixpkgs/pkgs/games/heroic/fhsenv.nix +++ b/third_party/nixpkgs/pkgs/games/heroic/fhsenv.nix @@ -135,7 +135,6 @@ buildFHSEnv { udev unixODBC util-linux - v4l-utils vulkan-loader wayland zlib diff --git a/third_party/nixpkgs/pkgs/games/hex-a-hop/default.nix b/third_party/nixpkgs/pkgs/games/hex-a-hop/default.nix index 98c4c5c03c..ea2df33607 100644 --- a/third_party/nixpkgs/pkgs/games/hex-a-hop/default.nix +++ b/third_party/nixpkgs/pkgs/games/hex-a-hop/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.1.0"; src = fetchzip { - url = "https://downloads.sourceforge.net/project/hexahop/${version}/hex-a-hop-${version}.tar.gz"; + url = "mirror://sourceforge/project/hexahop/${version}/hex-a-hop-${version}.tar.gz"; sha256 = "sha256-fBSvNtgNR0aNofbvoYpM1e8ww4ARlXIvrQUvJqVGLlY="; }; diff --git a/third_party/nixpkgs/pkgs/games/minetest/default.nix b/third_party/nixpkgs/pkgs/games/minetest/default.nix index f4ccf5ac71..de566217b1 100644 --- a/third_party/nixpkgs/pkgs/games/minetest/default.nix +++ b/third_party/nixpkgs/pkgs/games/minetest/default.nix @@ -54,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "BUILD_CLIENT" buildClient) (lib.cmakeBool "BUILD_SERVER" buildServer) + (lib.cmakeBool "BUILD_UNITTESTS" (finalAttrs.doCheck or false)) (lib.cmakeBool "ENABLE_PROMETHEUS" buildServer) (lib.cmakeBool "USE_SDL2" useSDL2) # Ensure we use system libraries @@ -91,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { gmp libspatialindex ] ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform luajit) luajit - ++ lib.optionals stdenv.hostPlatform.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv OpenGL OpenAL @@ -118,7 +119,8 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' - substituteInPlace src/filesys.cpp --replace "/bin/rm" "${coreutils}/bin/rm" + substituteInPlace src/filesys.cpp \ + --replace-fail "/bin/rm" "${coreutils}/bin/rm" '' + lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i '/pagezero_size/d;/fixup_bundle/d' src/CMakeLists.txt ''; @@ -130,6 +132,8 @@ stdenv.mkDerivation (finalAttrs: { mv $out/minetest.app $out/Applications ''; + doCheck = true; + passthru.updateScript = gitUpdater { allowedVersions = "\\."; ignoredVersions = "-android$"; @@ -141,5 +145,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.lgpl21Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ pyrolagus fpletz fgaz ]; + mainProgram = if buildClient then "minetest" else "minetestserver"; }; }) diff --git a/third_party/nixpkgs/pkgs/games/openmw/default.nix b/third_party/nixpkgs/pkgs/games/openmw/default.nix index 22bd90a348..6f1e45b1e6 100644 --- a/third_party/nixpkgs/pkgs/games/openmw/default.nix +++ b/third_party/nixpkgs/pkgs/games/openmw/default.nix @@ -11,7 +11,8 @@ , VideoDecodeAcceleration , boost , bullet -, ffmpeg +# Please unpin this on the next OpenMW release. +, ffmpeg_6 , libXt , luajit , lz4 @@ -80,7 +81,7 @@ stdenv.mkDerivation rec { SDL2 boost bullet' - ffmpeg + ffmpeg_6 libXt luajit lz4 diff --git a/third_party/nixpkgs/pkgs/games/openra/build-engine.nix b/third_party/nixpkgs/pkgs/games/openra/build-engine.nix index 31d0f84fce..85644fadef 100644 --- a/third_party/nixpkgs/pkgs/games/openra/build-engine.nix +++ b/third_party/nixpkgs/pkgs/games/openra/build-engine.nix @@ -35,6 +35,9 @@ buildDotnetModule rec { dontDotnetFixup = true; + # Microsoft.NET.Publish.targets(248,5): error MSB3021: Unable to copy file "[...]/Newtonsoft.Json.dll" to "[...]/Newtonsoft.Json.dll". Access to the path '[...]Newtonsoft.Json.dll' is denied. [/build/source/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj] + enableParallelBuilding = false; + preBuild = '' make VERSION=${engine.build}-${version} version ''; diff --git a/third_party/nixpkgs/pkgs/games/openrct2/default.nix b/third_party/nixpkgs/pkgs/games/openrct2/default.nix index 5ed0f6da36..35699d4927 100644 --- a/third_party/nixpkgs/pkgs/games/openrct2/default.nix +++ b/third_party/nixpkgs/pkgs/games/openrct2/default.nix @@ -29,11 +29,11 @@ }: let - openrct2-version = "0.4.14"; + openrct2-version = "0.4.15"; # Those versions MUST match the pinned versions within the CMakeLists.txt # file. The REPLAYS repository from the CMakeLists.txt is not necessary. - objects-version = "1.4.7"; + objects-version = "1.4.8"; openmsx-version = "1.6"; opensfx-version = "1.0.5"; title-sequences-version = "0.4.14"; @@ -42,14 +42,14 @@ let owner = "OpenRCT2"; repo = "OpenRCT2"; rev = "v${openrct2-version}"; - hash = "sha256-d02LXcqoB6lDGdd82IrHi0Br8rjAFpRgQ86344XUeCA="; + hash = "sha256-VumjJGAur+2A7n0pFcNM7brYaoeaVCPBtRGFIZmq5QY="; }; objects-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "objects"; rev = "v${objects-version}"; - hash = "sha256-XtKhgCahGzhuIdwvoz47rlRthZEhb0w+OuGhZnplHSc="; + hash = "sha256-A6iFaWda5qiFirGqOP6H9w0PP5Me8BRr2HXKZPHJImE="; }; openmsx-src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/bin.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/bin.nix deleted file mode 100644 index 89ebe14cb4..0000000000 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/bin.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchzip -, appimageTools -, makeWrapper -}: - -let - pname = "osu-lazer-bin"; - version = "2024.906.2"; - - src = { - aarch64-darwin = fetchzip { - url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - hash = "sha256-KyvC8gEqZvXMATxS2513X0WdlR7nF8tHS4R/TPFrHao="; - stripRoot = false; - }; - x86_64-darwin = fetchzip { - url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - hash = "sha256-ToxDZHL59YPmybvB9tsiOnFEd+FJJE4mNMfaK6btYKo="; - stripRoot = false; - }; - x86_64-linux = fetchurl { - url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - hash = "sha256-zQnR3KwlE1gTWH8f+GDRBsc7Whfn9XpT1D/NLg5TtrU="; - }; - }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); - - meta = { - description = "Rhythm is just a *click* away (AppImage version for score submission and multiplayer, and binary distribution for Darwin systems)"; - homepage = "https://osu.ppy.sh"; - license = with lib.licenses; [ - mit - cc-by-nc-40 - unfreeRedistributable # osu-framework contains libbass.so in repository - ]; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ gepbird stepbrobd ]; - mainProgram = "osu!"; - platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; - }; - - passthru.updateScript = ./update-bin.sh; -in -if stdenv.hostPlatform.isDarwin -then stdenv.mkDerivation { - inherit pname version src meta passthru; - - installPhase = '' - runHook preInstall - APP_DIR="$out/Applications" - mkdir -p "$APP_DIR" - cp -r . "$APP_DIR" - runHook postInstall - ''; -} -else appimageTools.wrapType2 { - inherit pname version src meta passthru; - - extraPkgs = pkgs: with pkgs; [ icu ]; - - extraInstallCommands = - let - contents = appimageTools.extract { inherit pname version src; }; - in - '' - . ${makeWrapper}/nix-support/setup-hook - mv -v $out/bin/${pname} $out/bin/osu! - wrapProgram $out/bin/osu! \ - --set OSU_EXTERNAL_UPDATE_PROVIDER 1 - install -m 444 -D ${contents}/osu!.desktop -t $out/share/applications - for i in 16 32 48 64 96 128 256 512 1024; do - install -D ${contents}/osu!.png $out/share/icons/hicolor/''${i}x$i/apps/osu!.png - done - ''; -} diff --git a/third_party/nixpkgs/pkgs/games/papermc/versions.json b/third_party/nixpkgs/pkgs/games/papermc/versions.json index a8efe02630..0ea8bc830b 100644 --- a/third_party/nixpkgs/pkgs/games/papermc/versions.json +++ b/third_party/nixpkgs/pkgs/games/papermc/versions.json @@ -60,7 +60,7 @@ "version": "1.21-130" }, "1.21.1": { - "hash": "sha256-1oKvRB00bfdJZ7uVsUabv9EAFiT2YwEsLXetQ3BrVvA=", - "version": "1.21.1-110" + "hash": "sha256-/vQuRNBU4elCAkkZxw1DVJcAYUM+wb9p7jjXYHOZ/3o=", + "version": "1.21.1-119" } } diff --git a/third_party/nixpkgs/pkgs/games/scummvm/default.nix b/third_party/nixpkgs/pkgs/games/scummvm/default.nix index 6c6fc7fac0..1125c62c87 100644 --- a/third_party/nixpkgs/pkgs/games/scummvm/default.nix +++ b/third_party/nixpkgs/pkgs/games/scummvm/default.nix @@ -42,6 +42,8 @@ stdenv.mkDerivation rec { --replace aarch64-apple-darwin-ranlib ${cctools}/bin/ranlib ''; + NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; + meta = with lib; { description = "Program to run certain classic graphical point-and-click adventure games (such as Monkey Island)"; mainProgram = "scummvm"; diff --git a/third_party/nixpkgs/pkgs/games/steam/build-wrapped.sh b/third_party/nixpkgs/pkgs/games/steam/build-wrapped.sh deleted file mode 100644 index ddf974671a..0000000000 --- a/third_party/nixpkgs/pkgs/games/steam/build-wrapped.sh +++ /dev/null @@ -1,47 +0,0 @@ -source $stdenv/setup - -outp=$out/lib/steam-runtime - -buildDir() { - paths="$1" - pkgs="$2" - - for pkg in $pkgs; do - echo "adding package $pkg" - for path in $paths; do - if [ -d $pkg/$path ]; then - cd $pkg/$path - for file in *; do - found="" - for i in $paths; do - if [ -e "$outp/$i/$file" ]; then - found=1 - break - fi - done - if [ -z "$found" ]; then - mkdir -p $outp/$path - ln -s "$pkg/$path/$file" $outp/$path - sovers=$(echo $file | perl -ne 'print if s/.*?\.so\.(.*)/\1/') - if [ ! -z "$sovers" ]; then - fname=''${file%.''${sovers}} - for ver in ''${sovers//./ }; do - found="" - for i in $paths; do - if [ -e "$outp/$i/$fname" ]; then - found=1 - break - fi - done - [ -n "$found" ] || ln -s "$pkg/$path/$file" "$outp/$path/$fname" - fname="$fname.$ver" - done - fi - fi - done - fi - done - done -} - -eval "$installPhase" diff --git a/third_party/nixpkgs/pkgs/games/steam/default.nix b/third_party/nixpkgs/pkgs/games/steam/default.nix deleted file mode 100644 index 4d3f2ba714..0000000000 --- a/third_party/nixpkgs/pkgs/games/steam/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ makeScopeWithSplicing', generateSplicesForMkScope -, stdenv, buildFHSEnv, pkgsi686Linux, mesa-demos -}: - -let - steamPackagesFun = self: let - inherit (self) callPackage; - in rec { - steamArch = if stdenv.hostPlatform.system == "x86_64-linux" then "amd64" - else if stdenv.hostPlatform.system == "i686-linux" then "i386" - else throw "Unsupported platform: ${stdenv.hostPlatform.system}"; - - steam-runtime = callPackage ./runtime.nix { }; - steam-runtime-wrapped = callPackage ./runtime-wrapped.nix { }; - steam = callPackage ./steam.nix { }; - steam-fhsenv = callPackage ./fhsenv.nix { - mesa-demos-i686 = - if self.steamArch == "amd64" - then pkgsi686Linux.mesa-demos - else mesa-demos; - steam-runtime-wrapped-i686 = - if self.steamArch == "amd64" - then pkgsi686Linux.steamPackages.steam-runtime-wrapped - else null; - inherit buildFHSEnv; - }; - steam-fhsenv-small = steam-fhsenv.override { withGameSpecificLibraries = false; }; - - # This has to exist so Hydra tries to build all of Steam's dependencies. - # FIXME: Maybe we should expose it as something more generic? - steam-fhsenv-without-steam = steam-fhsenv.override { steam = null; }; - - steamcmd = callPackage ./steamcmd.nix { }; - }; -in makeScopeWithSplicing' { - otherSplices = generateSplicesForMkScope "steamPackages"; - f = steamPackagesFun; -} diff --git a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix b/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix deleted file mode 100644 index 6a4a1e0020..0000000000 --- a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix +++ /dev/null @@ -1,350 +0,0 @@ -{ lib, stdenv, writeShellScript, buildFHSEnv, steam, mesa-demos-i686 -, steam-runtime-wrapped, steam-runtime-wrapped-i686 ? null -, extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs -, extraLibraries ? pkgs: [ ] # extra packages to add to multiPkgs -, extraProfile ? "" # string to append to profile -, extraPreBwrapCmds ? "" # extra commands to run before calling bubblewrap (real default is at usage site) -, extraBwrapArgs ? [ ] # extra arguments to pass to bubblewrap (real default is at usage site) -, extraArgs ? "" # arguments to always pass to steam -, extraEnv ? { } # Environment variables to pass to Steam - -# steamwebhelper deletes unrelated electron programs' singleton cookies from /tmp on startup: -# https://github.com/ValveSoftware/steam-for-linux/issues/9121 -, privateTmp ? true # Whether to separate steam's /tmp from the host system - -, withGameSpecificLibraries ? true # include game specific libraries -}@args: - -let - commonTargetPkgs = pkgs: with pkgs; [ - # Needed for operating system detection until - # https://github.com/ValveSoftware/steam-for-linux/issues/5909 is resolved - lsb-release - # Errors in output without those - pciutils - # run.sh wants ldconfig - glibc_multi.bin - # Games' dependencies - xorg.xrandr - which - # Needed by gdialog, including in the steam-runtime - perl - # Open URLs - xdg-utils - iana-etc - # Steam Play / Proton - python3 - # Steam VR - procps - usbutils - - # It tries to execute xdg-user-dir and spams the log with command not founds - xdg-user-dirs - - # electron based launchers need newer versions of these libraries than what runtime provides - mesa - sqlite - ] ++ extraPkgs pkgs; - - ldPath = lib.optionals stdenv.hostPlatform.is64bit [ "/lib64" ] - ++ [ "/lib32" ] - ++ map (x: "/steamrt/${steam-runtime-wrapped.arch}/" + x) steam-runtime-wrapped.libs - ++ lib.optionals (steam-runtime-wrapped-i686 != null) (map (x: "/steamrt/${steam-runtime-wrapped-i686.arch}/" + x) steam-runtime-wrapped-i686.libs); - - # Zachtronics and a few other studios expect STEAM_LD_LIBRARY_PATH to be present - exportLDPath = '' - export LD_LIBRARY_PATH=${lib.concatStringsSep ":" ldPath}''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH - export STEAM_LD_LIBRARY_PATH="$STEAM_LD_LIBRARY_PATH''${STEAM_LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" - ''; - - # bootstrap.tar.xz has 444 permissions, which means that simple deletes fail - # and steam will not be able to start - fixBootstrap = '' - if [ -r $HOME/.steam/steam/bootstrap.tar.xz ]; then - chmod +w $HOME/.steam/steam/bootstrap.tar.xz - fi - ''; - - envScript = '' - # prevents various error messages - unset GIO_EXTRA_MODULES - - # This is needed for IME (e.g. iBus, fcitx5) to function correctly on non-CJK locales - # https://github.com/ValveSoftware/steam-for-linux/issues/781#issuecomment-2004757379 - GTK_IM_MODULE='xim' - '' + lib.toShellVars extraEnv; - -in buildFHSEnv rec { - name = "steam"; - - # Steam still needs 32bit and various native games do too - multiArch = true; - - targetPkgs = pkgs: with pkgs; [ - steam - # License agreement - zenity - ] ++ commonTargetPkgs pkgs; - - multiPkgs = pkgs: with pkgs; [ - # These are required by steam with proper errors - xorg.libXcomposite - xorg.libXtst - xorg.libXrandr - xorg.libXext - xorg.libX11 - xorg.libXfixes - libGL - libva - pipewire - - # steamwebhelper - harfbuzz - libthai - pango - - lsof # friends options won't display "Launch Game" without it - file # called by steam's setup.sh - - # dependencies for mesa drivers, needed inside pressure-vessel - mesa.llvmPackages.llvm.lib - vulkan-loader - expat - wayland - xorg.libxcb - xorg.libXdamage - xorg.libxshmfence - xorg.libXxf86vm - elfutils - - # Without these it silently fails - xorg.libXinerama - xorg.libXcursor - xorg.libXrender - xorg.libXScrnSaver - xorg.libXi - xorg.libSM - xorg.libICE - curl - nspr - nss - cups - libcap - SDL2 - libusb1 - dbus-glib - gsettings-desktop-schemas - ffmpeg - libudev0-shim - - # Verified games requirements - fontconfig - freetype - xorg.libXt - xorg.libXmu - libogg - libvorbis - SDL - SDL2_image - glew110 - libdrm - libidn - tbb - zlib - - # SteamVR - udev - dbus - - # Other things from runtime - glib - gtk2 - bzip2 - flac - libglut - libjpeg - libpng - libpng12 - libsamplerate - libmikmod - libtheora - libtiff - pixman - speex - SDL_image - SDL_ttf - SDL_mixer - SDL2_ttf - SDL2_mixer - libappindicator-gtk2 - libdbusmenu-gtk2 - libindicator-gtk2 - libcaca - libcanberra - libgcrypt - libunwind - libvpx - librsvg - xorg.libXft - libvdpau - - # required by coreutils stuff to run correctly - # Steam ends up with LD_LIBRARY_PATH=/usr/lib:: - # which overrides DT_RUNPATH in our binaries, so it tries to dynload the - # very old versions of stuff from the runtime. - # FIXME: how do we even fix this correctly - attr - # same thing, but for Xwayland (usually via gamescope), already in the closure - libkrb5 - keyutils - ] ++ lib.optionals withGameSpecificLibraries [ - # Not formally in runtime but needed by some games - at-spi2-atk - at-spi2-core # CrossCode - gst_all_1.gstreamer - gst_all_1.gst-plugins-ugly - gst_all_1.gst-plugins-base - json-glib # paradox launcher (Stellaris) - libxkbcommon # paradox launcher - libvorbis # Dead Cells - libxcrypt # Alien Isolation, XCOM 2, Company of Heroes 2 - mono - ncurses # Crusader Kings III - openssl - xorg.xkeyboardconfig - xorg.libpciaccess - xorg.libXScrnSaver # Dead Cells - icu # dotnet runtime, e.g. Stardew Valley - - # screeps dependencies - gtk3 - zlib - atk - cairo - gdk-pixbuf - - # Prison Architect - libGLU - libuuid - libbsd - alsa-lib - - # Loop Hero - # FIXME: Also requires openssl_1_1, which is EOL. Either find an alternative solution, or remove these dependencies (if not needed by other games) - libidn2 - libpsl - nghttp2.lib - rtmpdump - ] - # This needs to come from pkgs as the passed-in steam-runtime-wrapped may not be the same architecture - ++ pkgs.steamPackages.steam-runtime-wrapped.overridePkgs - ++ extraLibraries pkgs; - - extraInstallCommands = lib.optionalString (steam != null) '' - mkdir -p $out/share/applications - ln -s ${steam}/share/icons $out/share - ln -s ${steam}/share/pixmaps $out/share - ln -s ${steam}/share/applications/steam.desktop $out/share/applications/steam.desktop - ''; - - profile = '' - # Workaround for issue #44254 (Steam cannot connect to friends network) - # https://github.com/NixOS/nixpkgs/issues/44254 - if [ -z ''${TZ+x} ]; then - new_TZ="$(readlink -f /etc/localtime | grep -P -o '(?<=/zoneinfo/).*$')" - if [ $? -eq 0 ]; then - export TZ="$new_TZ" - fi - fi - - # udev event notifications don't work reliably inside containers. - # SDL2 already tries to automatically detect flatpak and pressure-vessel - # and falls back to inotify-based discovery [1]. We make SDL2 do the - # same by telling it explicitly. - # - # [1] - export SDL_JOYSTICK_DISABLE_UDEV=1 - '' + extraProfile; - - runScript = writeShellScript "steam-wrapper.sh" '' - if [ -f /etc/NIXOS ]; then # Check only useful on NixOS - ${mesa-demos-i686}/bin/glxinfo 2>&1 | grep -q Error - # If there was an error running glxinfo, we know something is wrong with the configuration - if [ $? -eq 0 ]; then - cat < /dev/stderr - ** - WARNING: Steam is not set up. Add the following options to /etc/nixos/configuration.nix - and then run \`sudo nixos-rebuild switch\`: - { - hardware.graphics.enable32Bit = true; - hardware.pulseaudio.support32Bit = true; - } - ** - EOF - fi - fi - - ${exportLDPath} - ${fixBootstrap} - - set -o allexport # Export the following env vars - ${envScript} - exec steam ${extraArgs} "$@" - ''; - - inherit privateTmp; - - extraPreBwrapCmds = '' - install -m 1777 -d /tmp/dumps - '' + args.extraPreBwrapCmds or ""; - - extraBwrapArgs = [ - "--bind-try /etc/NIXOS /etc/NIXOS" # required 32bit driver check in runScript - "--bind-try /tmp/dumps /tmp/dumps" - ] ++ args.extraBwrapArgs or []; - - meta = - if steam != null - then - steam.meta // lib.optionalAttrs (!withGameSpecificLibraries) { - description = steam.meta.description + " (without game specific libraries)"; - mainProgram = "steam"; - } - else { - description = "Steam dependencies (dummy package, do not use)"; - }; - - passthru.steamargs = args; - passthru.run = buildFHSEnv { - name = "steam-run"; - - targetPkgs = commonTargetPkgs; - inherit multiArch multiPkgs profile extraInstallCommands extraBwrapArgs; - - runScript = writeShellScript "steam-run" '' - run="$1" - if [ "$run" = "" ]; then - echo "Usage: steam-run command-to-run args..." >&2 - exit 1 - fi - shift - - ${exportLDPath} - ${fixBootstrap} - - set -o allexport # Export the following env vars - ${envScript} - exec -- "$run" "$@" - ''; - - meta = (steam.meta or {}) // { - description = "Run commands in the same FHS environment that is used for Steam"; - mainProgram = "steam-run"; - name = "steam-run"; - # steam-run itself is just a script that lives in nixpkgs (which is licensed under MIT). - # steam is a dependency and already unfree, so normal steam-run will not install without - # allowing unfree packages or appropriate `allowUnfreePredicate` rules. - license = lib.licenses.mit; - }; - }; -} diff --git a/third_party/nixpkgs/pkgs/games/steam/runtime-wrapped.nix b/third_party/nixpkgs/pkgs/games/steam/runtime-wrapped.nix deleted file mode 100644 index 648e012d3f..0000000000 --- a/third_party/nixpkgs/pkgs/games/steam/runtime-wrapped.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, steamArch, lib, perl, pkgs, steam-runtime -, runtimeOnly ? false -}: - -let - overridePkgs = lib.optionals (!runtimeOnly) (with pkgs; [ - libgpg-error - libpulseaudio - alsa-lib - openalSoft - libva1 - libvdpau - vulkan-loader - gcc.cc.lib - nss - nspr - xorg.libxcb - ]); - - allPkgs = overridePkgs ++ [ steam-runtime ]; - - gnuArch = if steamArch == "amd64" then "x86_64-linux-gnu" - else if steamArch == "i386" then "i386-linux-gnu" - else throw "Unsupported architecture"; - - libs = [ "lib/${gnuArch}" "lib" "usr/lib/${gnuArch}" "usr/lib" ]; - bins = [ "bin" "usr/bin" ]; - -in stdenv.mkDerivation { - name = "steam-runtime-wrapped"; - - nativeBuildInputs = [ perl ]; - - builder = ./build-wrapped.sh; - - passthru = { - inherit gnuArch libs bins overridePkgs; - arch = steamArch; - }; - - installPhase = '' - buildDir "${toString libs}" "${toString (map lib.getLib allPkgs)}" - buildDir "${toString bins}" "${toString (map lib.getBin allPkgs)}" - ''; -} diff --git a/third_party/nixpkgs/pkgs/games/steam/runtime.nix b/third_party/nixpkgs/pkgs/games/steam/runtime.nix deleted file mode 100644 index f736ac8daa..0000000000 --- a/third_party/nixpkgs/pkgs/games/steam/runtime.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchurl - -# for update script -, writeShellScript, curl, nix-update -}: - -stdenv.mkDerivation (finalAttrs: { - - pname = "steam-runtime"; - # from https://repo.steampowered.com/steamrt-images-scout/snapshots/latest-steam-client-general-availability/VERSION.txt - version = "0.20240415.84615"; - - src = fetchurl { - url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${finalAttrs.version}/steam-runtime.tar.xz"; - hash = "sha256-C8foNnIVA+O4YwuCrIf9N6Lr/GlApPVgZsYgi+3OZUE="; - name = "scout-runtime-${finalAttrs.version}.tar.gz"; - }; - - buildCommand = '' - mkdir -p $out - tar -C $out --strip=1 -x -f $src - ''; - - passthru = { - updateScript = writeShellScript "update.sh" '' - version=$(${curl}/bin/curl https://repo.steampowered.com/steamrt-images-scout/snapshots/latest-steam-client-general-availability/VERSION.txt) - ${lib.getExe nix-update} --version "$version" steamPackages.steam-runtime - ''; - }; - - meta = { - description = "Official runtime used by Steam"; - homepage = "https://github.com/ValveSoftware/steam-runtime"; - license = lib.licenses.unfreeRedistributable; # Includes NVIDIA CG toolkit - maintainers = with lib.maintainers; [ hrdinka abbradar ]; - }; -}) diff --git a/third_party/nixpkgs/pkgs/games/ultrastardx/default.nix b/third_party/nixpkgs/pkgs/games/ultrastardx/default.nix index 49bb6c44b7..8cc5a5aece 100644 --- a/third_party/nixpkgs/pkgs/games/ultrastardx/default.nix +++ b/third_party/nixpkgs/pkgs/games/ultrastardx/default.nix @@ -13,7 +13,7 @@ , SDL2_gfx , SDL2_mixer , SDL2_net, SDL2_ttf -, ffmpeg_7 +, ffmpeg , sqlite , zlib , libX11 @@ -25,7 +25,7 @@ let sharedLibs = [ pcre portaudio freetype SDL2 SDL2_image SDL2_gfx SDL2_mixer SDL2_net SDL2_ttf - sqlite lua zlib libX11 libGLU libGL ffmpeg_7 + sqlite lua zlib libX11 libGLU libGL ffmpeg ]; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/games/vintagestory/default.nix b/third_party/nixpkgs/pkgs/games/vintagestory/default.nix index 1c5c171895..75df4dd045 100644 --- a/third_party/nixpkgs/pkgs/games/vintagestory/default.nix +++ b/third_party/nixpkgs/pkgs/games/vintagestory/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { ] ++ (with xorg; [ libX11 libXi + libXcursor ])); desktopItems = [ diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/extra-cmake-modules/ecm-hook.sh b/third_party/nixpkgs/pkgs/kde/frameworks/extra-cmake-modules/ecm-hook.sh index 1f60ba1aed..c635816777 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/extra-cmake-modules/ecm-hook.sh +++ b/third_party/nixpkgs/pkgs/kde/frameworks/extra-cmake-modules/ecm-hook.sh @@ -12,60 +12,60 @@ ecmPostHook() { # Because we need to use absolute paths here, we must set *all* the paths. # Keep this in sync with https://github.com/KDE/extra-cmake-modules/blob/master/kde-modules/KDEInstallDirs6.cmake if [ "$(uname)" = "Darwin" ]; then - cmakeFlags+=" -DKDE_INSTALL_BUNDLEDIR=${!outputBin}/Applications/KDE" + appendToVar cmakeFlags "-DKDE_INSTALL_BUNDLEDIR=${!outputBin}/Applications/KDE" fi - cmakeFlags+=" -DKDE_INSTALL_EXECROOTDIR=${!outputBin}" - cmakeFlags+=" -DKDE_INSTALL_BINDIR=${!outputBin}/bin" - cmakeFlags+=" -DKDE_INSTALL_SBINDIR=${!outputBin}/sbin" - cmakeFlags+=" -DKDE_INSTALL_LIBDIR=${!outputLib}/lib" - cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputLib}/libexec" - cmakeFlags+=" -DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake" + appendToVar cmakeFlags "-DKDE_INSTALL_EXECROOTDIR=${!outputBin}" + appendToVar cmakeFlags "-DKDE_INSTALL_BINDIR=${!outputBin}/bin" + appendToVar cmakeFlags "-DKDE_INSTALL_SBINDIR=${!outputBin}/sbin" + appendToVar cmakeFlags "-DKDE_INSTALL_LIBDIR=${!outputLib}/lib" + appendToVar cmakeFlags "-DKDE_INSTALL_LIBEXECDIR=${!outputLib}/libexec" + appendToVar cmakeFlags "-DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake" if [ -n "${qtPluginPrefix-}" ]; then - cmakeFlags+=" -DKDE_INSTALL_QTPLUGINDIR=${!outputBin}/$qtPluginPrefix" - cmakeFlags+=" -DKDE_INSTALL_PLUGINDIR=${!outputBin}/$qtPluginPrefix" + appendToVar cmakeFlags "-DKDE_INSTALL_QTPLUGINDIR=${!outputBin}/$qtPluginPrefix" + appendToVar cmakeFlags "-DKDE_INSTALL_PLUGINDIR=${!outputBin}/$qtPluginPrefix" fi if [ -n "${qtQmlPrefix-}" ]; then - cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputBin}/$qtQmlPrefix" + appendToVar cmakeFlags "-DKDE_INSTALL_QMLDIR=${!outputBin}/$qtQmlPrefix" fi - cmakeFlags+=" -DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include" - cmakeFlags+=" -DKDE_INSTALL_LOCALSTATEDIR=/var" - cmakeFlags+=" -DKDE_INSTALL_SHAREDSTATEDIR=/com" # ??? - cmakeFlags+=" -DKDE_INSTALL_DATAROOTDIR=${!outputBin}/share" - cmakeFlags+=" -DKDE_INSTALL_DATADIR=${!outputBin}/share" - cmakeFlags+=" -DKDE_INSTALL_DOCBUNDLEDIR=${!outputBin}/share/doc/HTML" - cmakeFlags+=" -DKDE_INSTALL_KCFGDIR=${!outputBin}/share/config.kcfg" - cmakeFlags+=" -DKDE_INSTALL_KCONFUPDATEDIR=${!outputBin}/share/kconf_update" - cmakeFlags+=" -DKDE_INSTALL_KAPPTEMPLATESDIR=${!outputDev}/share/kdevappwizard/templates" - cmakeFlags+=" -DKDE_INSTALL_KFILETEMPLATESDIR=${!outputDev}/share/kdevfiletemplates/templates" - cmakeFlags+=" -DKDE_INSTALL_KXMLGUIDIR=${!outputBin}/share/kxmlgui5" # Yes, this needs to be 5 and not 6. Don't ask. - cmakeFlags+=" -DKDE_INSTALL_KNOTIFYRCDIR=${!outputBin}/share/knotifications6" - cmakeFlags+=" -DKDE_INSTALL_ICONDIR=${!outputBin}/share/icons" - cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputLib}/share/locale" - cmakeFlags+=" -DKDE_INSTALL_SOUNDDIR=${!outputBin}/share/sounds" - cmakeFlags+=" -DKDE_INSTALL_TEMPLATEDIR=${!outputBin}/share/templates" - cmakeFlags+=" -DKDE_INSTALL_WALLPAPERDIR=${!outputBin}/share/wallpapers" - cmakeFlags+=" -DKDE_INSTALL_APPDIR=${!outputBin}/share/applications" - cmakeFlags+=" -DKDE_INSTALL_DESKTOPDIR=${!outputBin}/share/desktop-directories" - cmakeFlags+=" -DKDE_INSTALL_MIMEDIR=${!outputBin}/share/mime/packages" - cmakeFlags+=" -DKDE_INSTALL_METAINFODIR=${!outputBin}/share/appdata" - cmakeFlags+=" -DKDE_INSTALL_QTQCHDIR=${!outputLib}/share/doc/qch" - cmakeFlags+=" -DKDE_INSTALL_QCHDIR=${!outputLib}/share/doc/qch" - cmakeFlags+=" -DKDE_INSTALL_MANDIR=${!outputBin}/share/man" - cmakeFlags+=" -DKDE_INSTALL_INFODIR=${!outputBin}/share/info" - cmakeFlags+=" -DKDE_INSTALL_DBUSDIR=${!outputBin}/share/dbus-1" - cmakeFlags+=" -DKDE_INSTALL_DBUSINTERFACEDIR=${!outputBin}/share/dbus-1/interfaces" - cmakeFlags+=" -DKDE_INSTALL_DBUSSERVICEDIR=${!outputBin}/share/dbus-1/services" - cmakeFlags+=" -DKDE_INSTALL_DBUSSYSTEMSERVICEDIR=${!outputBin}/share/dbus-1/system-services" - cmakeFlags+=" -DKDE_INSTALL_SYSCONFDIR=${!outputBin}/etc" - cmakeFlags+=" -DKDE_INSTALL_CONFDIR=${!outputBin}/etc/xdg" - cmakeFlags+=" -DKDE_INSTALL_AUTOSTARTDIR=${!outputBin}/etc/xdg/autostart" - cmakeFlags+=" -DKDE_INSTALL_LOGGINGCATEGORIESDIR=${!outputLib}/share/qlogging-categories6" - cmakeFlags+=" -DKDE_INSTALL_SYSTEMDUNITDIR=${!outputBin}/lib/systemd" - cmakeFlags+=" -DKDE_INSTALL_SYSTEMDUSERUNITDIR=${!outputBin}/share/systemd/user" + appendToVar cmakeFlags "-DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include" + appendToVar cmakeFlags "-DKDE_INSTALL_LOCALSTATEDIR=/var" + appendToVar cmakeFlags "-DKDE_INSTALL_SHAREDSTATEDIR=/com" # ??? + appendToVar cmakeFlags "-DKDE_INSTALL_DATAROOTDIR=${!outputBin}/share" + appendToVar cmakeFlags "-DKDE_INSTALL_DATADIR=${!outputBin}/share" + appendToVar cmakeFlags "-DKDE_INSTALL_DOCBUNDLEDIR=${!outputBin}/share/doc/HTML" + appendToVar cmakeFlags "-DKDE_INSTALL_KCFGDIR=${!outputBin}/share/config.kcfg" + appendToVar cmakeFlags "-DKDE_INSTALL_KCONFUPDATEDIR=${!outputBin}/share/kconf_update" + appendToVar cmakeFlags "-DKDE_INSTALL_KAPPTEMPLATESDIR=${!outputDev}/share/kdevappwizard/templates" + appendToVar cmakeFlags "-DKDE_INSTALL_KFILETEMPLATESDIR=${!outputDev}/share/kdevfiletemplates/templates" + appendToVar cmakeFlags "-DKDE_INSTALL_KXMLGUIDIR=${!outputBin}/share/kxmlgui5" # Yes, this needs to be 5 and not 6. Don't ask. + appendToVar cmakeFlags "-DKDE_INSTALL_KNOTIFYRCDIR=${!outputBin}/share/knotifications6" + appendToVar cmakeFlags "-DKDE_INSTALL_ICONDIR=${!outputBin}/share/icons" + appendToVar cmakeFlags "-DKDE_INSTALL_LOCALEDIR=${!outputLib}/share/locale" + appendToVar cmakeFlags "-DKDE_INSTALL_SOUNDDIR=${!outputBin}/share/sounds" + appendToVar cmakeFlags "-DKDE_INSTALL_TEMPLATEDIR=${!outputBin}/share/templates" + appendToVar cmakeFlags "-DKDE_INSTALL_WALLPAPERDIR=${!outputBin}/share/wallpapers" + appendToVar cmakeFlags "-DKDE_INSTALL_APPDIR=${!outputBin}/share/applications" + appendToVar cmakeFlags "-DKDE_INSTALL_DESKTOPDIR=${!outputBin}/share/desktop-directories" + appendToVar cmakeFlags "-DKDE_INSTALL_MIMEDIR=${!outputBin}/share/mime/packages" + appendToVar cmakeFlags "-DKDE_INSTALL_METAINFODIR=${!outputBin}/share/appdata" + appendToVar cmakeFlags "-DKDE_INSTALL_QTQCHDIR=${!outputLib}/share/doc/qch" + appendToVar cmakeFlags "-DKDE_INSTALL_QCHDIR=${!outputLib}/share/doc/qch" + appendToVar cmakeFlags "-DKDE_INSTALL_MANDIR=${!outputBin}/share/man" + appendToVar cmakeFlags "-DKDE_INSTALL_INFODIR=${!outputBin}/share/info" + appendToVar cmakeFlags "-DKDE_INSTALL_DBUSDIR=${!outputBin}/share/dbus-1" + appendToVar cmakeFlags "-DKDE_INSTALL_DBUSINTERFACEDIR=${!outputBin}/share/dbus-1/interfaces" + appendToVar cmakeFlags "-DKDE_INSTALL_DBUSSERVICEDIR=${!outputBin}/share/dbus-1/services" + appendToVar cmakeFlags "-DKDE_INSTALL_DBUSSYSTEMSERVICEDIR=${!outputBin}/share/dbus-1/system-services" + appendToVar cmakeFlags "-DKDE_INSTALL_SYSCONFDIR=${!outputBin}/etc" + appendToVar cmakeFlags "-DKDE_INSTALL_CONFDIR=${!outputBin}/etc/xdg" + appendToVar cmakeFlags "-DKDE_INSTALL_AUTOSTARTDIR=${!outputBin}/etc/xdg/autostart" + appendToVar cmakeFlags "-DKDE_INSTALL_LOGGINGCATEGORIESDIR=${!outputLib}/share/qlogging-categories6" + appendToVar cmakeFlags "-DKDE_INSTALL_SYSTEMDUNITDIR=${!outputBin}/lib/systemd" + appendToVar cmakeFlags "-DKDE_INSTALL_SYSTEMDUSERUNITDIR=${!outputBin}/share/systemd/user" } postHooks+=(ecmPostHook) diff --git a/third_party/nixpkgs/pkgs/kde/gear/akonadi-search/default.nix b/third_party/nixpkgs/pkgs/kde/gear/akonadi-search/default.nix index 5b8add9abb..de9c6faa95 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/akonadi-search/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/akonadi-search/default.nix @@ -7,7 +7,7 @@ cargo, rustc, # provided as callPackage input to enable easier overrides through overlays - cargoHash ? "sha256-myS9icWi2ZeQCCHZRP3xEMKToAa+afc8C+s3T8y19RE=", + cargoHash ? "sha256-E+QaicYnFF79FDIhhvuEPQLikiLk5oKIjvLA132RUZo=", }: mkKdeDerivation rec { pname = "akonadi-search"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/angelfish/default.nix b/third_party/nixpkgs/pkgs/kde/gear/angelfish/default.nix index f599178ad3..f019064914 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/angelfish/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/angelfish/default.nix @@ -8,7 +8,7 @@ cargo, rustc, # provided as callPackage input to enable easier overrides through overlays - cargoHash ? "sha256-xZkFVINKcJlJizHpBFLsMheQ45GsgWafzlDmxUydf5k=", + cargoHash ? "sha256-B3M5tkmftR4nFbPAQqJDvvPidVGxq/8zH0KRgpBR92w=", qcoro, }: mkKdeDerivation rec { diff --git a/third_party/nixpkgs/pkgs/kde/gear/kalzium/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kalzium/default.nix index 7cdcd1efec..39327304ac 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kalzium/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kalzium/default.nix @@ -1,5 +1,6 @@ { mkKdeDerivation, + fetchpatch, pkg-config, ocaml, eigen, @@ -10,6 +11,15 @@ mkKdeDerivation { pname = "kalzium"; + patches = [ + # Fix build with Qt 6.8 + # FIXME: remove in next major update + (fetchpatch { + url = "https://invent.kde.org/education/kalzium/-/commit/557d9bc96636f413430d0789cbf775915fc0dc45.patch"; + hash = "sha256-KDCT/COqk7OTuF8pN7qrRrIPRU4PSGm+efpCDGbtZwA="; + }) + ]; + # FIXME: look into how to make it find libfacile extraNativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/kde/gear/kdepim-addons/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kdepim-addons/default.nix index 4b800b7c19..8684233a9d 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kdepim-addons/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kdepim-addons/default.nix @@ -8,7 +8,7 @@ corrosion, alpaka, # provided as callPackage input to enable easier overrides through overlays - cargoHash ? "sha256-hIiJEuUk950g29Qkka4oS7EsZDbPvm8Q3CrqxQG40bU=", + cargoHash ? "sha256-t7izRAYjuCYA0YMZaCnvwbVo2UvfTTvdlYUd69T6w/Q=", }: mkKdeDerivation rec { pname = "kdepim-addons"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/kpmcore/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kpmcore/default.nix index 3da512e170..fcbfa4a730 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kpmcore/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kpmcore/default.nix @@ -15,7 +15,6 @@ exfatprogs, f2fs-tools, fatresize, - hfsprogs, jfsutils, nilfs-utils, ntfs3g, @@ -41,7 +40,7 @@ let exfatprogs f2fs-tools fatresize - hfsprogs + # hfsprogs intentionally omitted due to being unmaintained jfsutils nilfs-utils ntfs3g diff --git a/third_party/nixpkgs/pkgs/kde/generated/dependencies.json b/third_party/nixpkgs/pkgs/kde/generated/dependencies.json index 4a330afb00..9bc6f8d4c1 100644 --- a/third_party/nixpkgs/pkgs/kde/generated/dependencies.json +++ b/third_party/nixpkgs/pkgs/kde/generated/dependencies.json @@ -6081,11 +6081,6 @@ "qtkeychain", "selenium-webdriver-at-spi" ], - "trojita": [ - "akonadi-contacts", - "extra-cmake-modules", - "sonnet" - ], "umbrello": [ "extra-cmake-modules", "karchive", @@ -6234,5 +6229,5 @@ "kwindowsystem" ] }, - "version": "55fdd899" + "version": "10b4e2ea" } \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/kde/generated/licenses.json b/third_party/nixpkgs/pkgs/kde/generated/licenses.json index 1b7f74fce5..a4327d496d 100644 --- a/third_party/nixpkgs/pkgs/kde/generated/licenses.json +++ b/third_party/nixpkgs/pkgs/kde/generated/licenses.json @@ -254,6 +254,7 @@ "GPL-2.0-only", "GPL-2.0-or-later", "GPL-3.0-only", + "LGPL-2.0-or-later", "LicenseRef-KDE-Accepted-GPL", "MIT" ], @@ -326,6 +327,7 @@ "GPL-3.0-only", "LGPL-2.0-or-later", "LGPL-2.1-only", + "LGPL-2.1-or-later", "LGPL-3.0-only", "LGPL-3.0-or-later", "LicenseRef-KDE-Accepted-GPL", @@ -2515,6 +2517,19 @@ "LicenseRef-KDE-Accepted-LGPL", "MIT" ], + "plasma-dialer": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], "plasma-disks": [ "BSD-3-Clause", "CC0-1.0", @@ -2582,6 +2597,7 @@ "LicenseRef-KDE-Accepted-LGPL" ], "plasma-pa": [ + "BSD-2-Clause", "BSD-3-Clause", "CC0-1.0", "GPL-2.0-only", @@ -2646,6 +2662,7 @@ "GPL-2.0-only", "GPL-2.0-or-later", "GPL-3.0-only", + "GPL-3.0-or-later", "LGPL-2.0-only", "LGPL-2.0-or-later", "LGPL-2.1-only", @@ -2662,6 +2679,7 @@ "BSD-3-Clause", "CC0-1.0", "GPL-2.0-or-later", + "LGPL-2.0-only", "LGPL-2.0-or-later", "LGPL-2.1-or-later" ], @@ -2687,18 +2705,21 @@ "LGPL-2.0-or-later" ], "powerdevil": [ + "BSD-2-Clause", "BSD-3-Clause", "CC0-1.0", "GPL-2.0-only", "GPL-2.0-or-later", "GPL-3.0-only", + "GPL-3.0-or-later", "LGPL-2.0-only", "LGPL-2.0-or-later", "LGPL-2.1-only", "LGPL-2.1-or-later", "LGPL-3.0-only", "LicenseRef-KDE-Accepted-GPL", - "LicenseRef-KDE-Accepted-LGPL" + "LicenseRef-KDE-Accepted-LGPL", + "MIT" ], "poxml": [ "CC0-1.0" @@ -2808,6 +2829,15 @@ "LGPL-2.0-or-later", "LGPL-2.1-or-later" ], + "spacebar": [ + "BSD-2-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-or-later", + "LicenseRef-KDE-Accepted-GPL" + ], "spectacle": [ "BSD-3-Clause", "CC0-1.0", @@ -2856,13 +2886,15 @@ ], "systemsettings": [ "BSD-2-Clause", + "BSD-3-Clause", "CC0-1.0", "GPL-2.0-only", "GPL-2.0-or-later", "GPL-3.0-only", "LGPL-2.0-only", "LGPL-2.1-or-later", - "LicenseRef-KDE-Accepted-GPL" + "LicenseRef-KDE-Accepted-GPL", + "MIT" ], "telly-skout": [ "BSD-2-Clause", diff --git a/third_party/nixpkgs/pkgs/kde/generated/projects.json b/third_party/nixpkgs/pkgs/kde/generated/projects.json index 1074dd343a..44709ad504 100644 --- a/third_party/nixpkgs/pkgs/kde/generated/projects.json +++ b/third_party/nixpkgs/pkgs/kde/generated/projects.json @@ -779,6 +779,12 @@ "project_path": "unmaintained/cutepaste", "repo_path": "unmaintained/cutepaste" }, + "cxx-kde-frameworks": { + "description": "Extension Crate for cxx-qt which allows the use of KDE Frameworks in Rust software", + "name": "cxx-kde-frameworks", + "project_path": "playground/libs/cxx-kde-frameworks", + "repo_path": "libraries/cxx-kde-frameworks" + }, "cxx11-cmake-modules": { "description": "CMake modules for detecting C++11 features supported by the compiler", "name": "cxx11-cmake-modules", @@ -2694,7 +2700,7 @@ "repo_path": "system/kio-fuse" }, "kio-gdrive": { - "description": "KIO Slave to access Google Drive", + "description": "KIO Worker to access Google Drive", "name": "kio-gdrive", "project_path": "kde/kdenetwork/kio-gdrive", "repo_path": "network/kio-gdrive" @@ -4811,6 +4817,12 @@ "project_path": "kde/pim/mbox-importer", "repo_path": "pim/mbox-importer" }, + "md4qt": { + "description": "Header-only C++ library for parsing Markdown.", + "name": "md4qt", + "project_path": "playground/libs/md4qt", + "repo_path": "libraries/md4qt" + }, "melon": { "description": "Desktop QML file manager", "name": "melon", @@ -5042,7 +5054,7 @@ "nongurigaeru": { "description": "The missing Foundation library for Qt GUI apps.", "name": "nongurigaeru", - "project_path": "kdereview/nongurigaeru", + "project_path": "playground/libs/nongurigaeru", "repo_path": "libraries/nongurigaeru" }, "nota": { @@ -5465,6 +5477,12 @@ "project_path": "unmaintained/plasma-mediacenter", "repo_path": "unmaintained/plasma-mediacenter" }, + "plasma-meetings": { + "description": "Project to track the bi-weekly Plasma team meetings", + "name": "plasma-meetings", + "project_path": "playground/workspace/plasma-meetings", + "repo_path": "plasma/plasma-meetings" + }, "plasma-mobile": { "description": "Plasma shell for mobile devices", "name": "plasma-mobile", @@ -6740,7 +6758,7 @@ "trojita": { "description": "Fast, lightweight and standard-compliant IMAP e-mail client", "name": "trojita", - "project_path": "extragear/pim/trojita", + "project_path": "playground/pim/trojita", "repo_path": "pim/trojita" }, "tupi": { @@ -6959,6 +6977,12 @@ "project_path": "websites/amarok-kde-org", "repo_path": "websites/amarok-kde-org" }, + "websites-api-kde-org": { + "description": "API Documentation Website", + "name": "websites-api-kde-org", + "project_path": "websites/api-kde-org", + "repo_path": "websites/api-kde-org" + }, "websites-apps-kde-org": { "description": "KDE application catalog \u2014 apps.kde.org", "name": "websites-apps-kde-org", @@ -7109,6 +7133,12 @@ "project_path": "websites/docs-kde-org", "repo_path": "websites/docs-kde-org" }, + "websites-dot-kde-org": { + "description": "KDE Dot News Website", + "name": "websites-dot-kde-org", + "project_path": "websites/dot-kde-org", + "repo_path": "websites/dot-kde-org" + }, "websites-download-kde-org": { "description": "MirrorBrain configuration, templates, etc. \u2014 download.kde.org", "name": "websites-download-kde-org", @@ -7373,6 +7403,12 @@ "project_path": "websites/kdemail-net", "repo_path": "websites/kdemail-net" }, + "websites-kdenlive-org": { + "description": "Website for Kdenlive - Kdenlive.org", + "name": "websites-kdenlive-org", + "project_path": "websites/kdenlive-org", + "repo_path": "websites/kdenlive-org" + }, "websites-kdesrc-build-kde-org": { "description": "Website for kdesrc-build \u2014 kdesrc-build.kde.org", "name": "websites-kdesrc-build-kde-org", diff --git a/third_party/nixpkgs/pkgs/kde/generated/sources/frameworks.json b/third_party/nixpkgs/pkgs/kde/generated/sources/frameworks.json index dc6ee319c2..f5a2219941 100644 --- a/third_party/nixpkgs/pkgs/kde/generated/sources/frameworks.json +++ b/third_party/nixpkgs/pkgs/kde/generated/sources/frameworks.json @@ -1,362 +1,362 @@ { "attica": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/attica-6.6.0.tar.xz", - "hash": "sha256-4jcOfwoORyEYDDZDQvR7yXTPO0XEXHzp5wxdm6UjC+M=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/attica-6.7.0.tar.xz", + "hash": "sha256-2qXAe0dImeFrQnEOA9BZCTa84PVIACOdYz1IyqO+DX0=" }, "baloo": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/baloo-6.6.0.tar.xz", - "hash": "sha256-ewl1JtHIyQzbgSapQf9OFZ+AD8//b4EmaDc9e5tbtxk=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/baloo-6.7.0.tar.xz", + "hash": "sha256-zowYoh7XrNWRLH0nPKxfbLGttSSgQV1Wxv3eLpZ/Z8w=" }, "bluez-qt": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/bluez-qt-6.6.0.tar.xz", - "hash": "sha256-GiqAW6EmOcF4TS9Un16Y8hD8jRh4xcp3CTbqyCfI6wA=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/bluez-qt-6.7.0.tar.xz", + "hash": "sha256-sGQBBphiE+Gyjyy6E9nMIu49JZdV8nUh8uhhY0M4+Ts=" }, "breeze-icons": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/breeze-icons-6.6.0.tar.xz", - "hash": "sha256-LYzMQn7IZLZBfqvjqv6bH2hXvypP3NDcXABkExSOZtk=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/breeze-icons-6.7.0.tar.xz", + "hash": "sha256-OQN+P8u7emUBFoXEmMrjH/SWpfJJMmnJVbspyUpoi3Q=" }, "extra-cmake-modules": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/extra-cmake-modules-6.6.0.tar.xz", - "hash": "sha256-IG4j4Fuok0rHonXI/dNwQWX1WIeNPb4ymfmRRzmXzLg=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/extra-cmake-modules-6.7.0.tar.xz", + "hash": "sha256-2B3oJpLT0rt3EQMyplyCZiUr7MLD8wfOgUmQzlYHuNw=" }, "frameworkintegration": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/frameworkintegration-6.6.0.tar.xz", - "hash": "sha256-6llMOVegn9y4VxHUvf9tkjwOPrjsSW5WhlhfxWcj06A=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/frameworkintegration-6.7.0.tar.xz", + "hash": "sha256-iQEBhUu7s5N9Mh8qw1sqCo886DNCIpfd2lm9qMjKxp0=" }, "kapidox": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kapidox-6.6.0.tar.xz", - "hash": "sha256-55ydq7bbMXCDid1HqL3UjRamCgLlyytV80fQOm/H4rc=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kapidox-6.7.0.tar.xz", + "hash": "sha256-czjx4xjrLSTLlbVtUwamHQoZLpCXe+rWBRd0HIMF4kA=" }, "karchive": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/karchive-6.6.0.tar.xz", - "hash": "sha256-UenSHLh+IkG8pqaeFJZmHQXQClgRB7/PmFmqnnCsrBs=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/karchive-6.7.0.tar.xz", + "hash": "sha256-60JD5if1HxIkqZr10Kb44wn55du3R496eONOK4VBOYo=" }, "kauth": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kauth-6.6.0.tar.xz", - "hash": "sha256-BPteP/Zy8x9sPy5ApZ2cdEelJRuZ2+X16mf1SkyYHzo=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kauth-6.7.0.tar.xz", + "hash": "sha256-FzZU7uKJGs1BU40xrOi5165ghjvH+u8crOx+IcfrEiM=" }, "kbookmarks": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kbookmarks-6.6.0.tar.xz", - "hash": "sha256-MtC0ynRtsrK9Kk5SgvSsq6CEucoQRJWitFC5riRWt9c=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kbookmarks-6.7.0.tar.xz", + "hash": "sha256-vUGjnfdlFe40598HsmAOHltnsYEsyVnsUVhfLrzFZXM=" }, "kcalendarcore": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kcalendarcore-6.6.0.tar.xz", - "hash": "sha256-GrY5BBH4aB4FWcx7PC87Q4TWB6QIaBB3U1/5k2BjYvg=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kcalendarcore-6.7.0.tar.xz", + "hash": "sha256-jlKC2NegzgoaG9syEzukEC0GBwEFUT5xLa/nbjJkffs=" }, "kcmutils": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kcmutils-6.6.0.tar.xz", - "hash": "sha256-jxufJs57BVzsRqlSHqt1+RCunDlaraiNbYLPOVRZsnA=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kcmutils-6.7.0.tar.xz", + "hash": "sha256-QRg4j49iql8ROe14gjtYsAnp6/fzdV6alKtfnrpkTL4=" }, "kcodecs": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kcodecs-6.6.0.tar.xz", - "hash": "sha256-2dwuMpSqMmhJkL3gG7iN7bJhCijXwdYqF4o5P6VmEjs=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kcodecs-6.7.0.tar.xz", + "hash": "sha256-mrSUBV4Gvc5FVot8R+2yqp7Kqd7AwPsVI2e0MhkhufI=" }, "kcolorscheme": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kcolorscheme-6.6.0.tar.xz", - "hash": "sha256-ZXg54f+BQf8JcFvpEuJ2otyY3xIvW8wv3D7RHRAQDNE=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kcolorscheme-6.7.0.tar.xz", + "hash": "sha256-G0xuhPHdlrLuYr51X2DaYNYbqA1nCe6zGG2IgucuITA=" }, "kcompletion": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kcompletion-6.6.0.tar.xz", - "hash": "sha256-uAZZsx+tQ30Z7JSGQF1J+NsM6nCWKeO0/w6ykszxC0M=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kcompletion-6.7.0.tar.xz", + "hash": "sha256-ftWparDSqxe7Uh7Kr0TW7Gt8mj1uCUAzYLpJsk2UVg8=" }, "kconfig": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kconfig-6.6.0.tar.xz", - "hash": "sha256-BwvQGbB+FSAeTHBytxM3x19pF0B0BqGnEH/KG/8oVf4=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kconfig-6.7.0.tar.xz", + "hash": "sha256-vi1d22PlZwO8CX5dmRKzmrxROsUWVN4uDYOhrtLFSxs=" }, "kconfigwidgets": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kconfigwidgets-6.6.0.tar.xz", - "hash": "sha256-g7FBhnYJqOY+PL6HTlGfLT2KU/99zpWLgVfGl9XMWHI=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kconfigwidgets-6.7.0.tar.xz", + "hash": "sha256-wHnGfFeJMLqvriQbtPJSxj/dEl5E8fuVLjm648mFnNE=" }, "kcontacts": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kcontacts-6.6.0.tar.xz", - "hash": "sha256-mfBSfUm8az+9yRxLfttnyGk256TIzYgb2dou7fVmbWw=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kcontacts-6.7.0.tar.xz", + "hash": "sha256-KS+BBPnzHWLFkomjqCF2bR7FQPT8UT/8O29xl2AtQsU=" }, "kcoreaddons": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kcoreaddons-6.6.0.tar.xz", - "hash": "sha256-Wrqav5NOLa9fcIN8usCIYH/ovVBeFyxK9s2qzdolxQs=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kcoreaddons-6.7.0.tar.xz", + "hash": "sha256-SFEenasfLoCzxIIruHwumBGG3juJd9kggtNNADsSg8U=" }, "kcrash": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kcrash-6.6.0.tar.xz", - "hash": "sha256-+0rK9nCo4fYberIfzGzxMg0vZkWgNyqUYjxg33sImN4=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kcrash-6.7.0.tar.xz", + "hash": "sha256-HcLGXY72LvmEV/irQjt2ht4+cTdmwG5k1jIqqdsm7qQ=" }, "kdav": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kdav-6.6.0.tar.xz", - "hash": "sha256-gl7Z3l/JTiKPzNSvSM98EBwLvje79jhc+Bggu+r3eOc=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kdav-6.7.0.tar.xz", + "hash": "sha256-ZinyrwBC6x4NwMCLUYCse0ja5rWZnh3Qtniu2Lh0wdc=" }, "kdbusaddons": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kdbusaddons-6.6.0.tar.xz", - "hash": "sha256-UhMV+A0x4ttOQ0Tr8kNqIudUdbcO2r6BV/SvtKLLQq0=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kdbusaddons-6.7.0.tar.xz", + "hash": "sha256-6H0I9tADfY+jPx59FqTjqhfX0LEsaqlvdjI/eDROFRs=" }, "kdeclarative": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kdeclarative-6.6.0.tar.xz", - "hash": "sha256-OooyFeWlrpoufmexeo/qtkEdcp3wNnEC4JTI16X/WLY=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kdeclarative-6.7.0.tar.xz", + "hash": "sha256-8fgE9rrCsilQPP0WXr2K4JNTOIiuFeDmFHTG4yjVNbk=" }, "kded": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kded-6.6.0.tar.xz", - "hash": "sha256-zJY5dfgN4ZBuizmXBXmvIRE4xYKxYw2vKAuimbLT+f4=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kded-6.7.0.tar.xz", + "hash": "sha256-IqobZUO0DglDRhOFFhMcD363inDocpaThFf9E4ZoCi8=" }, "kdesu": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kdesu-6.6.0.tar.xz", - "hash": "sha256-1awSfjshjaenhfpgZJCwUsCdSBvP8CJ7RdQu8OPzSl8=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kdesu-6.7.0.tar.xz", + "hash": "sha256-QQkepFxuIuFBHYnRU4ssi9mL3B841Z3z6cQjqsAiTig=" }, "kdnssd": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kdnssd-6.6.0.tar.xz", - "hash": "sha256-N0PqPxVjWNaUXfaeZ8mMafQ4QTYgxqxyhtBCc0IVf8c=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kdnssd-6.7.0.tar.xz", + "hash": "sha256-6RQEdfxuTuHg/jmiGBajwAP8sQkiIgefQi/QKtKpAqE=" }, "kdoctools": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kdoctools-6.6.0.tar.xz", - "hash": "sha256-FJ4LRCKQ+LydKgyZyOJ6VzWjqDhwqC3gB+SHUp8KrUQ=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kdoctools-6.7.0.tar.xz", + "hash": "sha256-n+U53/7QGDaUD6Twb5U6xO0M1PtfAjL+W2bCI2TBaS8=" }, "kfilemetadata": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kfilemetadata-6.6.0.tar.xz", - "hash": "sha256-IYzLySbh4mdl9yE7iqzn69qnhUZO+tK7YPjmSDYs/qA=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kfilemetadata-6.7.0.tar.xz", + "hash": "sha256-piQqeeZytSPr8bJVTr+DrKep1QZZKbbxUnMemFHQCNA=" }, "kglobalaccel": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kglobalaccel-6.6.0.tar.xz", - "hash": "sha256-SSlepeSgGCIqm0g+fA+458+0t2GpKSCx4TRU/Y+F/oE=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kglobalaccel-6.7.0.tar.xz", + "hash": "sha256-KjW54GxmAdYCs6ReJ4xJ4R5GJ5Oc+s/7H97ggmpvbgs=" }, "kguiaddons": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kguiaddons-6.6.0.tar.xz", - "hash": "sha256-vKo25MBGpK2tvmu7hkkWnBsblqtolT4+oZV9e4fBgzE=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kguiaddons-6.7.0.tar.xz", + "hash": "sha256-rEN8prr1CwF4vIvwtN0ebnDg5O8ax3AllzihxC0DW8w=" }, "kholidays": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kholidays-6.6.0.tar.xz", - "hash": "sha256-cSsr4xiZcCK+KDdBlaSejHyioTApWqtqznuI1+wPKw8=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kholidays-6.7.0.tar.xz", + "hash": "sha256-K1Q9/etqUvQQH9+fFIAt11nQqf/wYOo3Hx87kA3TNas=" }, "ki18n": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/ki18n-6.6.0.tar.xz", - "hash": "sha256-WCtMWLtpgDQSMi09tlb9T1/eFU6sGsibLGvJBcW2Hm4=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/ki18n-6.7.0.tar.xz", + "hash": "sha256-VVtbwZVGw6eRxpck4jjF0XEKlXXPh0ABL4/FRvNUEis=" }, "kiconthemes": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kiconthemes-6.6.0.tar.xz", - "hash": "sha256-LQCxeSnYhkJTlelsTBi/Xo378/HKwtrBmabyrFrzWyI=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kiconthemes-6.7.0.tar.xz", + "hash": "sha256-viW/8fX2Xt1Fsk/5vtpEsEwOItGT5yRYyWpcWRtwuWg=" }, "kidletime": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kidletime-6.6.0.tar.xz", - "hash": "sha256-gkgKbwYDnCt+BKdcafEVGxeE7ce80nCXrGJksaoV9Cc=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kidletime-6.7.0.tar.xz", + "hash": "sha256-YKbHA4e2PmEUcCnOV/FwI3JxQRYwozcqDo1yQLgAaq8=" }, "kimageformats": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kimageformats-6.6.0.tar.xz", - "hash": "sha256-G0zaFPlgiPjeGQyb5/vjUKgKVcPuKo/5ENoNmZLE3a8=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kimageformats-6.7.0.tar.xz", + "hash": "sha256-cihQZIrBZ+TA7mMVcf3knp/RXQBKEn3YBKFPn1ebcx8=" }, "kio": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kio-6.6.0.tar.xz", - "hash": "sha256-l3+fB26vJJ7N2WFyQzQybD86Hn2M/MbKE3DzkMdqJ2Y=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kio-6.7.0.tar.xz", + "hash": "sha256-3yNQGaB6zVeZIPbGVQUOAtrPhHxwb0uCeedVvkb52ZA=" }, "kirigami": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kirigami-6.6.0.tar.xz", - "hash": "sha256-mAnM5wPfqK/ixk4Zb5DANYUOLkMqm9kM4ypAhlNop/4=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kirigami-6.7.0.tar.xz", + "hash": "sha256-TWRaA3TTO5Rl554+FxcIguLL2hUm9FvFtrF22t2nfXY=" }, "kitemmodels": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kitemmodels-6.6.0.tar.xz", - "hash": "sha256-/gZ3vW6vK8zTUOe4DuusOCkI/COIr2cWFxrXdBfueAI=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kitemmodels-6.7.0.tar.xz", + "hash": "sha256-CqAgUyO68tUZ67j5bOftVSSoFkp0QNkF+XdBi/vm00k=" }, "kitemviews": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kitemviews-6.6.0.tar.xz", - "hash": "sha256-p6QwwMN7Z4F3SrfuCEX5vgkBQkpe1R0V5bWzUNDL7m4=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kitemviews-6.7.0.tar.xz", + "hash": "sha256-XmNRYpk8nx4V86EQnKMifQ0s5Xz3BwYVZRtlz3kNsEk=" }, "kjobwidgets": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kjobwidgets-6.6.0.tar.xz", - "hash": "sha256-PI7M2J1BGLbs1hkQb5OpsVbfWJlGW4INS2XZaYE9tRU=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kjobwidgets-6.7.0.tar.xz", + "hash": "sha256-Ftfnq1QjXW+h6yE9PWNxguIvy9vLe0sUAyQwoCoviIo=" }, "knewstuff": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/knewstuff-6.6.0.tar.xz", - "hash": "sha256-P5J1ZLRUwfwa7sBRdLj552MDtNmkWXnXayGIolvUcCU=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/knewstuff-6.7.0.tar.xz", + "hash": "sha256-pBhGItQwtk7HzEx3ET32fIhvNZzInMYxP7zHF2TSP6c=" }, "knotifications": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/knotifications-6.6.0.tar.xz", - "hash": "sha256-KBU9zjjrSI0iiUKi7Rl+V3ORB9sQAkSK1WvdW+EL9g0=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/knotifications-6.7.0.tar.xz", + "hash": "sha256-npcvAV2bMbMoO/hCoy0nAJYiTRJ8E6bnlFD08EUt5ec=" }, "knotifyconfig": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/knotifyconfig-6.6.0.tar.xz", - "hash": "sha256-4DL8jr03XNQG3+8wOOvUnXwdHefHm3ytTMzwAoUAbx8=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/knotifyconfig-6.7.0.tar.xz", + "hash": "sha256-Qifaehj5uoOzS/VLbT/BaNwHJryhSdL4lYW7VKsTgpU=" }, "kpackage": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kpackage-6.6.0.tar.xz", - "hash": "sha256-EtdyQVhtwSuqOqLGW86+oxYEIWuRt22aqqvzcGc+ntI=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kpackage-6.7.0.tar.xz", + "hash": "sha256-kWwR9ZcnYNmlA5ZD+8Vc3p0R7BjyeNPWN5Mzb/pEKGU=" }, "kparts": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kparts-6.6.0.tar.xz", - "hash": "sha256-1JTe92o6TC4ovJ1PiJ1tTZtkRRX/+2EWn0Kc57m7Isc=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kparts-6.7.0.tar.xz", + "hash": "sha256-CxswUFDWH8vvpwJrCW3GtHcJ10NcabGKtWp+LqV9dZ4=" }, "kpeople": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kpeople-6.6.0.tar.xz", - "hash": "sha256-oPEAoyUZCFnHdU9qlMONB85g+J8w4NWN35lkHx8W4rA=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kpeople-6.7.0.tar.xz", + "hash": "sha256-02JGusUPW/QG9oP+YcksteYjpR3p/+0RBGZeXxNe+Ig=" }, "kplotting": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kplotting-6.6.0.tar.xz", - "hash": "sha256-knXdmc7bT9U6AJReRO1pS1onraQWBLKlSyvMW04qP3k=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kplotting-6.7.0.tar.xz", + "hash": "sha256-Ew7twjTw/tryxBXeiVyXlFT2TDsEkEMyfUPNUJ4jhrM=" }, "kpty": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kpty-6.6.0.tar.xz", - "hash": "sha256-Y6HeuVKEyP8vt3QEqBGD3XfZZFjQURC0aHQrOg91XmE=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kpty-6.7.0.tar.xz", + "hash": "sha256-QswbH3DuC9rNJoEoV9MQR9IY4fWFrDX+kWWQhQGplGo=" }, "kquickcharts": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kquickcharts-6.6.0.tar.xz", - "hash": "sha256-2EQQCNYldjv3sgqLFoXQnNaUFsbORgN0PpPBb8U5ekc=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kquickcharts-6.7.0.tar.xz", + "hash": "sha256-ZkBH57YiwLhl10ZoFxeUVfs4UcuxWo8sOLirnPhQmKQ=" }, "krunner": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/krunner-6.6.0.tar.xz", - "hash": "sha256-F9QgG+fOcSBx0p6VKP6v3CviA5GDShEMNYTMFCyfSxE=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/krunner-6.7.0.tar.xz", + "hash": "sha256-GH/+kYDpjoP7rFvTZE7GZxuh6AZspgE6mLTx10Oc/zo=" }, "kservice": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kservice-6.6.0.tar.xz", - "hash": "sha256-ug1jI+/srwVWVbttndBy5/iJ0jlpyk/FVWW9qJmRAfQ=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kservice-6.7.0.tar.xz", + "hash": "sha256-OdJULjj7NDTFQFyS1bReDVumUNJlMJrfk8eHp0HVf6E=" }, "kstatusnotifieritem": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kstatusnotifieritem-6.6.0.tar.xz", - "hash": "sha256-8lIr0d4LAhYPeKrgFQxIqe0pkYaIT7mdCm+4BUnkCd0=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kstatusnotifieritem-6.7.0.tar.xz", + "hash": "sha256-gOriaTzbXaZptO1qgii93DmBasoP3pKPIx5IlIJ9HeA=" }, "ksvg": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/ksvg-6.6.0.tar.xz", - "hash": "sha256-/VdIZraHmAns/ST52Sx85RqtuRUn5R0ffGfeyGR9isY=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/ksvg-6.7.0.tar.xz", + "hash": "sha256-u998eGyVlwfNnGfASmflGhXbzdbv96tSsDwJVE5m8YQ=" }, "ktexteditor": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/ktexteditor-6.6.0.tar.xz", - "hash": "sha256-mZGnj9XPaSlk2EIQuupHLs5WQ02ST55nVhuFf4tIx3c=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/ktexteditor-6.7.0.tar.xz", + "hash": "sha256-7Xb3IyQiWpJuAMLJcNSNfxGldulC5I0JLpg3vaedaZE=" }, "ktexttemplate": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/ktexttemplate-6.6.0.tar.xz", - "hash": "sha256-I2EadyTZzLU0y6ItyIiFdIzy7JA309zK1cxUo9S9uVQ=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/ktexttemplate-6.7.0.tar.xz", + "hash": "sha256-1rdfGT9NjYF883SHKldCdInGFzYSHHKmnE3X7mLh4jM=" }, "ktextwidgets": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/ktextwidgets-6.6.0.tar.xz", - "hash": "sha256-gF3/Mgt1piMW/lCqM+7bNVweLbNtALWMOfw2zmv9iYg=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/ktextwidgets-6.7.0.tar.xz", + "hash": "sha256-I7txRQ459DfAa9mvSOeJMlPDGtEGSbCQHQqOwe4YrgE=" }, "kunitconversion": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kunitconversion-6.6.0.tar.xz", - "hash": "sha256-qHTwk6PmTwjR034RQuF9eKESthPs5c+h90fdHSZ4n5E=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kunitconversion-6.7.0.tar.xz", + "hash": "sha256-swNgHGI81m7bZqZv1y6VdBW43TPnAwW+gTb6a0OxpAo=" }, "kuserfeedback": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kuserfeedback-6.6.0.tar.xz", - "hash": "sha256-O7QiUWee3WQ8zcy8m6vK55C51Rud+u9t7ZtKw0rS31U=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kuserfeedback-6.7.0.tar.xz", + "hash": "sha256-Te+NDW7yJ4B7YGbLdizsNSRSoY4OKLVq7M6O8861J2E=" }, "kwallet": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kwallet-6.6.0.tar.xz", - "hash": "sha256-sxnMTPecwXluckb2G7xWu6Bwql7JlLMOEbH6poXOfVQ=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kwallet-6.7.0.tar.xz", + "hash": "sha256-/7MZzg3+6pU4nhovSDPRCZuJTIHx33q1Dc+3luqH/6I=" }, "kwidgetsaddons": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kwidgetsaddons-6.6.0.tar.xz", - "hash": "sha256-E3zFSdYvm8mhR9goHWFvRBX8WsNUHUjmbFy3mOcRH8M=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kwidgetsaddons-6.7.0.tar.xz", + "hash": "sha256-vTY0KJOGPmEQxfEkX4rgs6M4J19OrxJLFVhdL+SSMpo=" }, "kwindowsystem": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kwindowsystem-6.6.0.tar.xz", - "hash": "sha256-LHcevxopd3QwXfz3lCPbBoTaBmLqy5nldAsA8//jMuU=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kwindowsystem-6.7.0.tar.xz", + "hash": "sha256-YsDwtKlQeTnYSu7aVbvUMAuIwE43lT5RibE5ADMQqPQ=" }, "kxmlgui": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/kxmlgui-6.6.0.tar.xz", - "hash": "sha256-ZH/HUQ0zud6Rlv0sj29qEU3RhVnuIaq3z0f2h7iuBFI=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/kxmlgui-6.7.0.tar.xz", + "hash": "sha256-pFHBbXClkd4TlzB5EV81kF48QjAvXIyK4+x112oG/KE=" }, "modemmanager-qt": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/modemmanager-qt-6.6.0.tar.xz", - "hash": "sha256-6M/4coyD42OKqF0vg3ynXhxQMlYy9LZOXkGF0M1rBxs=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/modemmanager-qt-6.7.0.tar.xz", + "hash": "sha256-/EXc2K2iQ7r3kACZBi8xK2d79pT4jzZ0bVNK/pB7+PM=" }, "networkmanager-qt": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/networkmanager-qt-6.6.0.tar.xz", - "hash": "sha256-Bjktcebgl1jLG0M9Ox3GZ8tZ3XqWs1EPIytcrf8zLkA=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/networkmanager-qt-6.7.0.tar.xz", + "hash": "sha256-VjIxZEWHkYyVC8vl/aC/ajXpehL2sOm/nqpM4xQdMSI=" }, "prison": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/prison-6.6.0.tar.xz", - "hash": "sha256-2LrzMlLPK7Qx+ASMRZoKDEtyzmp8L15zJa0t98p0ulw=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/prison-6.7.0.tar.xz", + "hash": "sha256-CgU6gL6uIyzvXaP2UlsU7mSbJ1zqZN4MD/rUHD8uwmA=" }, "purpose": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/purpose-6.6.0.tar.xz", - "hash": "sha256-0Cxww9Ei7aRznocW8FybtzcHUdBnMNjiPRz0Jm0AwtI=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/purpose-6.7.0.tar.xz", + "hash": "sha256-T4u/GQIscN8dw0Wkq9gWd6UFouj+9kMxEof+jpIS1Wo=" }, "qqc2-desktop-style": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/qqc2-desktop-style-6.6.0.tar.xz", - "hash": "sha256-qCNhp7IGuUp4Tum5GSdu9zP7aUcQoVBa+acdtwgy62I=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/qqc2-desktop-style-6.7.0.tar.xz", + "hash": "sha256-tmAtIbqJGmNGGCeqRROUau8NjgFB9KgxqvssTS4/syk=" }, "solid": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/solid-6.6.0.tar.xz", - "hash": "sha256-iPZ/NpxyCqoNNH7gknNoQzVQXE+Pr192hNGstyKUVfE=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/solid-6.7.0.tar.xz", + "hash": "sha256-NnPxd3bDDZUj/kC4845ivhA3YQBQ94LBNtoawEsg5uc=" }, "sonnet": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/sonnet-6.6.0.tar.xz", - "hash": "sha256-L4pe8tUmSjGvaG76j+MTcoN+3FMX8xAzld04nDcjcxY=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/sonnet-6.7.0.tar.xz", + "hash": "sha256-L5cNSQ7/1mjmTdk//vNEqA235jEwuyPfT6DWsUFQ5Yg=" }, "syndication": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/syndication-6.6.0.tar.xz", - "hash": "sha256-Yn5LMQuHIei0JuxUkvQDandW2Ykz0xhzg1K/3Qp4oNA=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/syndication-6.7.0.tar.xz", + "hash": "sha256-wqSFIp2KQwhY1/Rz/osTNzfZPTOnduRu7fp3u54wuiQ=" }, "syntax-highlighting": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/syntax-highlighting-6.6.0.tar.xz", - "hash": "sha256-v5RtJgbvKTlJpRp0RvFQlU4veBk/9UYbSr0ZiTm58bY=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/syntax-highlighting-6.7.0.tar.xz", + "hash": "sha256-bvUnqUF0C53f4FPrCOrX4RwSooOqiKXd8aGFIM2dLKc=" }, "threadweaver": { - "version": "6.6.0", - "url": "mirror://kde/stable/frameworks/6.6/threadweaver-6.6.0.tar.xz", - "hash": "sha256-GVVUiKvwWp1aFkHxZaZ9NH4jq30UxvlGT/z42yNwMXo=" + "version": "6.7.0", + "url": "mirror://kde/stable/frameworks/6.7/threadweaver-6.7.0.tar.xz", + "hash": "sha256-GsP8gFHzGsT3bf1dFX5cN10YO8B2IVKkThgxz1gWqVY=" } } \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/kde/generated/sources/gear.json b/third_party/nixpkgs/pkgs/kde/generated/sources/gear.json index ccbb924490..918e347772 100644 --- a/third_party/nixpkgs/pkgs/kde/generated/sources/gear.json +++ b/third_party/nixpkgs/pkgs/kde/generated/sources/gear.json @@ -1,1252 +1,1252 @@ { "accessibility-inspector": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/accessibility-inspector-24.08.1.tar.xz", - "hash": "sha256-c/xkVA4gvgDQxi4OHyDDE58UueXZ/cMdTyaKw1Wzl24=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/accessibility-inspector-24.08.2.tar.xz", + "hash": "sha256-fE4pQDnVgVZE/d0F1lndMyWtYCjeFWiv4RDlcE2mMTg=" }, "akonadi": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/akonadi-24.08.1.tar.xz", - "hash": "sha256-1abzT2+XLT4cH2BY5AwjhswEsClINzxOEpkqA+PZlQE=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/akonadi-24.08.2.tar.xz", + "hash": "sha256-iy8RPrxZACC8FNNiu4xksbi7q+XnPKC6O2NkCZnB99M=" }, "akonadi-calendar": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/akonadi-calendar-24.08.1.tar.xz", - "hash": "sha256-4GyJgKbKy//WjHpZrBgHc9xcG9wyKp697CmKk8PAsvk=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/akonadi-calendar-24.08.2.tar.xz", + "hash": "sha256-xq01HIIOQKxpp8X2f98qfVQfdmnT1Xh0ZF9vhfdOv54=" }, "akonadi-calendar-tools": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/akonadi-calendar-tools-24.08.1.tar.xz", - "hash": "sha256-mhZfaW/1qEF0uVpAs98naZWloLu8ioY7eclfiPLFmHk=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/akonadi-calendar-tools-24.08.2.tar.xz", + "hash": "sha256-aGp+tN/XYu+zB6TI4eBmjfbILN04T7tggMbJvVn5tcM=" }, "akonadiconsole": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/akonadiconsole-24.08.1.tar.xz", - "hash": "sha256-oF06JK+cHDZrw2ULku6UDAoheRxOojS4EAqYuIjMa6s=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/akonadiconsole-24.08.2.tar.xz", + "hash": "sha256-ryud7MGLezBVtE/v8zUgpD+gHA9WrfjjioYVjb7Nbzo=" }, "akonadi-contacts": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/akonadi-contacts-24.08.1.tar.xz", - "hash": "sha256-8i9VJMpOMOi6Mrk6BHLlQu40+W+yzOLVEjCDJJQ8oXY=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/akonadi-contacts-24.08.2.tar.xz", + "hash": "sha256-6hrY06Ttbw0wkbFYeGnHvSm0MJXSvac+gsBC4RrDf8g=" }, "akonadi-import-wizard": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/akonadi-import-wizard-24.08.1.tar.xz", - "hash": "sha256-EONChsiO/aBvfjC3IIr+nssu5L2YymdaWdcJwAkPVIE=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/akonadi-import-wizard-24.08.2.tar.xz", + "hash": "sha256-rXGYsdfYZjEFxQpseTHKANFxE2hZqFLfMFw9mNmZkgQ=" }, "akonadi-mime": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/akonadi-mime-24.08.1.tar.xz", - "hash": "sha256-hMvuG4HWxQ//Rl0U62DaUTvv2fEB8V/dQwazmrqnj9Y=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/akonadi-mime-24.08.2.tar.xz", + "hash": "sha256-+9Lgk4WmC/pAn9hPADR/rIv4uZxpAgdwa60F1RVPId0=" }, "akonadi-notes": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/akonadi-notes-24.08.1.tar.xz", - "hash": "sha256-GCDN1GVQlNaKWP7fFrM+ld5D23GxrFZq2DmP3ladmBg=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/akonadi-notes-24.08.2.tar.xz", + "hash": "sha256-LcMOIkvqDztYXLcdbMCZdB3pvtuObj8G16nO+jSeD94=" }, "akonadi-search": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/akonadi-search-24.08.1.tar.xz", - "hash": "sha256-mf427ewIfrsLLJpyOsV/B/chTRa626m57mI/5kz9f8I=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/akonadi-search-24.08.2.tar.xz", + "hash": "sha256-l21oZSW5zVyCfTNc0clkOvoNCdjx3amuWu72fviSnFw=" }, "akregator": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/akregator-24.08.1.tar.xz", - "hash": "sha256-WfEfezNuj5pBMcz64iLp8b9JLve8yCNKmuDSwCxxEUA=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/akregator-24.08.2.tar.xz", + "hash": "sha256-ZHuaCPtYNAL7KQwjTpkhxjQDT7YBwVXHqOV13hb9Wzs=" }, "alligator": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/alligator-24.08.1.tar.xz", - "hash": "sha256-+yeAQzQEYgTa5TU4Dt3sKQSwD7txjtWKJyeMzO4CSCU=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/alligator-24.08.2.tar.xz", + "hash": "sha256-U5w2J6oadXXKgR1nIV/I7qDpdcpohkV3DJHLXa1XMSg=" }, "analitza": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/analitza-24.08.1.tar.xz", - "hash": "sha256-L0lO4m8OIbbeMtESh2jwe8/1ANKs7mVyq8IwztF9pLw=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/analitza-24.08.2.tar.xz", + "hash": "sha256-EWID/f0+sSTOnzoeF59olHe8ODhFF3IByj9shW0Sxjo=" }, "angelfish": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/angelfish-24.08.1.tar.xz", - "hash": "sha256-vVKyD9e2EK3FSpMPJyXd5ktIo5ly1gS1oUbOeoczUqM=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/angelfish-24.08.2.tar.xz", + "hash": "sha256-SCrngjUJodD7egcqcoEG2ID1Q4JRVirzOdpFSKZUlks=" }, "arianna": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/arianna-24.08.1.tar.xz", - "hash": "sha256-cn1NMHtJQrEWveG2NeLLqh9vz96TM74Fn3D1lWAs5F4=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/arianna-24.08.2.tar.xz", + "hash": "sha256-4HpVzGm5ndDtrIasInezV2EhcutA+y/xHMCgeDqzxDc=" }, "ark": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/ark-24.08.1.tar.xz", - "hash": "sha256-CamKNE5t6/k5/yw5c9Z8d5TBXyL6/3uLuvuj0eOqXY0=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/ark-24.08.2.tar.xz", + "hash": "sha256-f98HTZhbufjFHZ/Bh1gPkeA+pxiMjsU2C9Mb1dwVuDw=" }, "artikulate": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/artikulate-24.08.1.tar.xz", - "hash": "sha256-99zL62pvlA6IlP/nLQ/fG3pFbz33Nhiw/nsxg5sYTkM=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/artikulate-24.08.2.tar.xz", + "hash": "sha256-l8gqgXHrns7WouW9BbWPEq+YJOFzletUwzNjUXmiUF0=" }, "audex": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/audex-24.08.1.tar.xz", - "hash": "sha256-42AqObpwROMl+zV9mb0mADsJYy8tBeUUhLnsS6atHJY=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/audex-24.08.2.tar.xz", + "hash": "sha256-eUkqCevK4BH1M8hvqamqmsxcaH77QTh6u9nAT/gfaAM=" }, "audiocd-kio": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/audiocd-kio-24.08.1.tar.xz", - "hash": "sha256-irBJyI1vHXCpj6zQINdYv6YwexgDq3zFZ51uTJykjbE=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/audiocd-kio-24.08.2.tar.xz", + "hash": "sha256-o5DueitrPoJwWcmDafXqJFA0I7rsycQ7vQYsAKZ785M=" }, "audiotube": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/audiotube-24.08.1.tar.xz", - "hash": "sha256-+jhMt2q0k67wWv0togsM0jMkv6jMMxJ896cuovQfVUU=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/audiotube-24.08.2.tar.xz", + "hash": "sha256-NX5Yr9/A7xMMSgeSVYYdtyrsVAI7eUugzQ9mUkVdA98=" }, "baloo-widgets": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/baloo-widgets-24.08.1.tar.xz", - "hash": "sha256-l5/oO2Kn9HtnN35SiLUdgDwGIpVvUFvtLbsJGaxKeWU=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/baloo-widgets-24.08.2.tar.xz", + "hash": "sha256-szeiC0aByC6N1yIxP1e1iqc34tmEIKzBUSQlek0CY/4=" }, "blinken": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/blinken-24.08.1.tar.xz", - "hash": "sha256-JxREVor1VacbWFVY4G3otGXqZ4pXcwgWdXQHxg/kNLg=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/blinken-24.08.2.tar.xz", + "hash": "sha256-QDcvZsQKqCl58hG6PCuy7qtSRWyPz5uq2JwzMDHRFPc=" }, "bomber": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/bomber-24.08.1.tar.xz", - "hash": "sha256-TgAyn/j9fr6v4YatxbT8tuX4jdc76Xm+i23Pdvz5HXg=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/bomber-24.08.2.tar.xz", + "hash": "sha256-phawZVBYIG8//Db0mTxV1gWDtlR+ZMoeI4Iwtp0vXaw=" }, "bovo": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/bovo-24.08.1.tar.xz", - "hash": "sha256-tboqMf7JIYqHGHX3UQpkBeqpdM1UIFPJEGowiwusvy4=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/bovo-24.08.2.tar.xz", + "hash": "sha256-kbAk70v9uXxwY3I2hwSS1KxCXUjIH1uIanZexEbHx6s=" }, "calendarsupport": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/calendarsupport-24.08.1.tar.xz", - "hash": "sha256-jU6QQdvQUSV19vA9MPdDGmFNvS9EJa0HBQvWq/fb84o=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/calendarsupport-24.08.2.tar.xz", + "hash": "sha256-brRVDcxD9FnbHygjd1fklXSF3wgigRgrKJ7vwg0Ya7U=" }, "calindori": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/calindori-24.08.1.tar.xz", - "hash": "sha256-KEJTQlK4OFk7edpGXrQaoPlv4HPANuDr3Df6U42eXOM=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/calindori-24.08.2.tar.xz", + "hash": "sha256-9SFNyfA+S58KYXUozOXkr89pDPAEG/wEtQGJHV2ugz4=" }, "cantor": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/cantor-24.08.1.tar.xz", - "hash": "sha256-GOSuBBLFDgbNX2ZQcqqaMigeLoMV7tjNKs624jNM8Xo=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/cantor-24.08.2.tar.xz", + "hash": "sha256-CAxztAXKLYVJctCMHNvHVU6Z89MU43rm+e8ySagCvHg=" }, "cervisia": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/cervisia-24.08.1.tar.xz", - "hash": "sha256-0oTAd48sWfoUCwIaHayCzxe0PXcl+1vgW1oV4e472M8=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/cervisia-24.08.2.tar.xz", + "hash": "sha256-qTpkcgLCIJwKXDuwILtoEzGjOJS85g3+U4fOim5yJ+s=" }, "colord-kde": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/colord-kde-24.08.1.tar.xz", - "hash": "sha256-am1yTQpiemaZjHVTzNSSf7e1TnVZ3Iq655QCtRNiDyI=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/colord-kde-24.08.2.tar.xz", + "hash": "sha256-f3WouENrUiPzsnkdlH3sPweZcZWkLdQ79o0Eo+z3B20=" }, "dolphin": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/dolphin-24.08.1.tar.xz", - "hash": "sha256-Hbqa+2YXCAwbSTeojsAS+6dxhDJ6zIVz2eNR/u1Tdmg=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/dolphin-24.08.2.tar.xz", + "hash": "sha256-VRUWJwditxpTUC5CyuIhBmQuElPiJyBjKoBSUENBRbE=" }, "dolphin-plugins": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/dolphin-plugins-24.08.1.tar.xz", - "hash": "sha256-yIZimA9qW9BCc1wH1KqilHRSTfUad5GmwDd89ym/CzU=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/dolphin-plugins-24.08.2.tar.xz", + "hash": "sha256-aX7Ggt6w6PfU/BTo645s+0w8CWHY10tZRdPHr9AE6A8=" }, "dragon": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/dragon-24.08.1.tar.xz", - "hash": "sha256-wRkXTxc8jfnoU/WikxHBqHO0uCSNBQmJuw7YCDI0/oo=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/dragon-24.08.2.tar.xz", + "hash": "sha256-3h+fPtM0R13uiJ8qxaiImlNgjZq6nywJD4jdNQrx5IM=" }, "elisa": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/elisa-24.08.1.tar.xz", - "hash": "sha256-zt9tyeHYERPmWZBB0JtS1N3wbJQWe9zcybjLHGbAoko=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/elisa-24.08.2.tar.xz", + "hash": "sha256-+eTurdf9lIbjOPE8nyXF19j7S5Y3uCjW/VJUgWoHp8k=" }, "eventviews": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/eventviews-24.08.1.tar.xz", - "hash": "sha256-IUb+uHifA8DnvWVW/dHfX0qjzloCK+65omUhX6HO270=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/eventviews-24.08.2.tar.xz", + "hash": "sha256-lVH7Tkh0kNv1tdmKOd/6vUo2omFW1iR7Ubf2DQXbBV8=" }, "falkon": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/falkon-24.08.1.tar.xz", - "hash": "sha256-q3y3v8mevszeKqXiUqlp+HE4UAfCiaqxLh3sNoJrkxU=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/falkon-24.08.2.tar.xz", + "hash": "sha256-19zRYVzuYjJVyBhFip2V6sDyDvzj8AOe76z0Yg6u80s=" }, "ffmpegthumbs": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/ffmpegthumbs-24.08.1.tar.xz", - "hash": "sha256-4sagvdIW09GMObvyxyRifCB1Qj4+4WSpBm2vYP3EttQ=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/ffmpegthumbs-24.08.2.tar.xz", + "hash": "sha256-sGrM3S/wBZ1s+hgNLrjX3ZWbmuyU0RY0vQhmkKBqxqw=" }, "filelight": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/filelight-24.08.1.tar.xz", - "hash": "sha256-i9XzR36JKKT0XaN6Pw7i1Gn8/uIPe1GXv6z/R3K7UKI=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/filelight-24.08.2.tar.xz", + "hash": "sha256-XpBM30Vz+luFeOQVfaNIrUbnKBmSv71q9ZyUMOFrqU4=" }, "francis": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/francis-24.08.1.tar.xz", - "hash": "sha256-9kkssY5dsGxmBNnTO44GBG+2ZU8JBrKcGEMx06LsNU0=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/francis-24.08.2.tar.xz", + "hash": "sha256-a4zH84wk4UwueXpiKZ1HCZlls45yBVeOMgaBjHkiroA=" }, "ghostwriter": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/ghostwriter-24.08.1.tar.xz", - "hash": "sha256-0MGFISTFK04+rXoj0zomwdKdXppFGI66MTwaC8UJ6pI=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/ghostwriter-24.08.2.tar.xz", + "hash": "sha256-g+f/Nefc4DoSCt+pmLYDAYI1CwJqn+YCjQqWKRjncuc=" }, "granatier": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/granatier-24.08.1.tar.xz", - "hash": "sha256-nCAHu6MrAZ3ZAtCv2vQhN4lXfgR/mEm9sXqtmqBvo4k=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/granatier-24.08.2.tar.xz", + "hash": "sha256-zOraxrRmB9j5Y4q+tXrC/0uvj51QxkP3dLwfKGhl/P4=" }, "grantlee-editor": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/grantlee-editor-24.08.1.tar.xz", - "hash": "sha256-qf/5M/ZCMh/0sn8gxtB0Zfvp4tNTnHbtM/a4t4FmUxg=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/grantlee-editor-24.08.2.tar.xz", + "hash": "sha256-GYbjU2UGuF+Vt3fUxbG56cPlvCBjn9U9NAhW6VxRXi0=" }, "grantleetheme": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/grantleetheme-24.08.1.tar.xz", - "hash": "sha256-opm5Mdt1PQYLX0Sj/HyJg9u8g8MxWTUZx+/pa5Aq8XI=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/grantleetheme-24.08.2.tar.xz", + "hash": "sha256-wAYB40gpVIHgM+RCjrSLi0H5gV6mjC1hYOK79UqTW0M=" }, "gwenview": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/gwenview-24.08.1.tar.xz", - "hash": "sha256-Q4DF1CF0e1HmDMfYU64IheR1W5qN9OjKNTRmzrYQbU4=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/gwenview-24.08.2.tar.xz", + "hash": "sha256-HVfcSbA05E21rtbijL3CHo43c7DctN52jk8R0duk7DI=" }, "incidenceeditor": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/incidenceeditor-24.08.1.tar.xz", - "hash": "sha256-z92Ob/F7J16pTFojSzLilwGkBUKgRnj0pyUJhaKA0k8=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/incidenceeditor-24.08.2.tar.xz", + "hash": "sha256-l/67wkrUq2j84rQYbfuFCPVevs5q5NNmQy1bnRdU8XM=" }, "isoimagewriter": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/isoimagewriter-24.08.1.tar.xz", - "hash": "sha256-9lApzJlRVZO2yEFdp02Aj9yU3spyOU9jIVUgDkDPW0A=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/isoimagewriter-24.08.2.tar.xz", + "hash": "sha256-djuTSkr6lMw3Sc7q9vh8mdWTyWnvC3K50moICfKa4Ik=" }, "itinerary": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/itinerary-24.08.1.tar.xz", - "hash": "sha256-asCgnKBudz6FgljPyu0zOzMFijnBQRPFP2Emo+JikL4=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/itinerary-24.08.2.tar.xz", + "hash": "sha256-MOhnRn6nnE7bTg34zdHhWj40bPF8qwEROotJfGa6NgQ=" }, "juk": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/juk-24.08.1.tar.xz", - "hash": "sha256-11qpNpcAABo4O2PjJS+nsbsHpfkhx/Ecbk1zy75Qf5g=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/juk-24.08.2.tar.xz", + "hash": "sha256-RZB9GRHIOoVvS/uCBV/v5Q9P+4jpVnEP+gDMXlv9K/w=" }, "k3b": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/k3b-24.08.1.tar.xz", - "hash": "sha256-U5iwgVxi7M11YXOdxFVOe/sVSHk8SoOnkVWoLyP1WCM=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/k3b-24.08.2.tar.xz", + "hash": "sha256-rqgd0ZQsxoPHIulrM6x95YCZ/iTiI0SCcsFI9LiASm8=" }, "kaccounts-integration": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kaccounts-integration-24.08.1.tar.xz", - "hash": "sha256-PJM8nEkbMpSrQrhAVLKyRwMq/WuTSA3xV/m9SUXau2Q=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kaccounts-integration-24.08.2.tar.xz", + "hash": "sha256-Vs40NNILzIlnOCL3uUn1DzL8dTjuckL7l2KFVMksjxY=" }, "kaccounts-providers": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kaccounts-providers-24.08.1.tar.xz", - "hash": "sha256-HNHN5M/2a9WUqie0+UG2HcTW/9e1Ol8/oE1Dup6JZ9w=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kaccounts-providers-24.08.2.tar.xz", + "hash": "sha256-FSgFjcyS+FTjHyf9bIaoLqXfNLw7erlC1p/wrH8A2EM=" }, "kaddressbook": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kaddressbook-24.08.1.tar.xz", - "hash": "sha256-U1I23jS8hihW7lKrer2NRuFj+WyVbvXWMrQ4wrWJf60=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kaddressbook-24.08.2.tar.xz", + "hash": "sha256-Sb5L6wgDxqkrlGci+LHBqEJalxLOzEv9AyB6NRdCwU0=" }, "kajongg": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kajongg-24.08.1.tar.xz", - "hash": "sha256-pHqsB16aKVphfELxShAyeaUMZMJGcgx9m/W+HMk1bmg=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kajongg-24.08.2.tar.xz", + "hash": "sha256-A3yvvln97eZBmjWRwgNdWjz0KXOLe9gctDIJZXu62Zs=" }, "kalarm": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kalarm-24.08.1.tar.xz", - "hash": "sha256-bUacnOaicHR1O34LycYfWO1IQzMrCf3YF/1NhIucJ0I=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kalarm-24.08.2.tar.xz", + "hash": "sha256-oe6wl0PTtQVUSJRGYoAbtpNXO4CXjGBQzrspvVeZSgI=" }, "kalgebra": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kalgebra-24.08.1.tar.xz", - "hash": "sha256-oaI6wTw99k3ScY89qJo1WMCXr26/ycHi+6oZxs1pUic=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kalgebra-24.08.2.tar.xz", + "hash": "sha256-tWCwZESHZQci405yh08c7x8h7EEJ5LLyKUQOpvAxFQ8=" }, "kalk": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kalk-24.08.1.tar.xz", - "hash": "sha256-BRU+AM/eGJdVRgPBEL6HTpzX4KbqndV9UWm2TtAZMUE=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kalk-24.08.2.tar.xz", + "hash": "sha256-ZlfBKmcXhHt4+w56D2agfT+ULwljU3TUwKSk4ADMWs8=" }, "kalm": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kalm-24.08.1.tar.xz", - "hash": "sha256-VMK4O1/mFv4hsyeny5B0R2AJ3lwFgDZ21ZLB+SVvEKk=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kalm-24.08.2.tar.xz", + "hash": "sha256-JquhkpaPF2xMyDJkHs+C1B5a7tZ5AGhfAM9VdtaTYso=" }, "kalzium": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kalzium-24.08.1.tar.xz", - "hash": "sha256-/ybAT+pJCwl2g+SFTvct2moryS9ObAKp/7yegHd2Dvw=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kalzium-24.08.2.tar.xz", + "hash": "sha256-m4yO8wMzwjqym7m849cyTPndGjavSB0ybSx7YySys1c=" }, "kamera": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kamera-24.08.1.tar.xz", - "hash": "sha256-Ql8s6RWcAkqS+zWlOvLPxK0+Gz4a5h4gnBfCMJL7WR8=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kamera-24.08.2.tar.xz", + "hash": "sha256-5OHPBtCyiyvZV1FKRXrn6kid6ZwTV20kBa32ouIHErU=" }, "kamoso": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kamoso-24.08.1.tar.xz", - "hash": "sha256-MwLqpX1YLXWcptZ6DN3GTDsAS2UrzQLhk5iO9jFgq74=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kamoso-24.08.2.tar.xz", + "hash": "sha256-UuCqnIRSMlkyeAvnDf2uWeJTvSf+OsnjubGaMuAtl38=" }, "kanagram": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kanagram-24.08.1.tar.xz", - "hash": "sha256-aS4BtIJXgcgSy9vwdRR0s5cEuqVkXhlXagXm5wMJGIM=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kanagram-24.08.2.tar.xz", + "hash": "sha256-9hxsb6MJ1Tdy/n5RwtFfzqFT35pH3I6y2A2tiGEeuGI=" }, "kapman": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kapman-24.08.1.tar.xz", - "hash": "sha256-AmYN6yBbSazmjPUwcHgLF91d1Se5s2OWLqDCZ6lHuxk=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kapman-24.08.2.tar.xz", + "hash": "sha256-cjhosHjMMQe+qFpdNBsC+ZarXI8dW3XPkIwmf9EG5U4=" }, "kapptemplate": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kapptemplate-24.08.1.tar.xz", - "hash": "sha256-5x+eNNmIaONUW+eSz2prlFZsmhjJ2VKCMSp5E4sH+r4=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kapptemplate-24.08.2.tar.xz", + "hash": "sha256-TSsO+Z7VkBHuurVDUBljNUYwwbT47AmZ8khs/lVy0Ho=" }, "kasts": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kasts-24.08.1.tar.xz", - "hash": "sha256-jyeYFRT0GrQ2q21YJWPGSYfNfYHuriXZpeewjWOPW1w=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kasts-24.08.2.tar.xz", + "hash": "sha256-Vkbz8IkfSYR71Dfgd/4X4Nmb5S7NqedftLveCHicdOM=" }, "kate": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kate-24.08.1.tar.xz", - "hash": "sha256-wQUYskOG8dr19kcjwls/TtfjRGpwkSq+W2yWXv2bLcY=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kate-24.08.2.tar.xz", + "hash": "sha256-2Ft1MYiV3KL0DpbuWOkemmAS81h+Itfz4P4Tvv+uymw=" }, "katomic": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/katomic-24.08.1.tar.xz", - "hash": "sha256-odgFbXiCOw3vg+9A/SowiXsql/0xmr8zcBT42KEJqqI=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/katomic-24.08.2.tar.xz", + "hash": "sha256-5oCtP652mvujZIB77D/KfyDZEGd9kCnx7MnWXTcmYE0=" }, "kbackup": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kbackup-24.08.1.tar.xz", - "hash": "sha256-GSflfY9tJ65sM/RmA4aMemAV5TfCayPtPP2XaAhPK7g=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kbackup-24.08.2.tar.xz", + "hash": "sha256-hxRC7eTkR+xRDb6ki1mDna2SFCEXdnXq1FClRbCvKCE=" }, "kblackbox": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kblackbox-24.08.1.tar.xz", - "hash": "sha256-Oe9PSgJRe3LkPPZnCfiZo8CiFq8j8y0ZpTsupjGzThA=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kblackbox-24.08.2.tar.xz", + "hash": "sha256-X+KB7aM4lOpHCH+6YcP9o7RDHnP1qkd7SNkjstpUYr8=" }, "kblocks": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kblocks-24.08.1.tar.xz", - "hash": "sha256-CXEUA2EcKIqgImChG8nUNDIiXFrkwX1bRwH7X98Eu9o=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kblocks-24.08.2.tar.xz", + "hash": "sha256-pv6IWSnaJM3LL8V4ZuZOZnqRKkZQ9/rbUW1J6ns1KKw=" }, "kbounce": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kbounce-24.08.1.tar.xz", - "hash": "sha256-DPMpvhdXzOkZsrLYiHECSxmqQuWBhadS0JH4lO/noP4=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kbounce-24.08.2.tar.xz", + "hash": "sha256-EMvWygDfil41cUUm0qlEmIOokvdZ0msYL4PhN+pbIdE=" }, "kbreakout": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kbreakout-24.08.1.tar.xz", - "hash": "sha256-5Si9OKFfBlZ8g6XL4YVXrPfyGcBCvOCfQ3FeEgfhgyM=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kbreakout-24.08.2.tar.xz", + "hash": "sha256-0VJCGDbWOiQJiu/WqimEFeStSbj92KXc3HXfMC5vdG4=" }, "kbruch": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kbruch-24.08.1.tar.xz", - "hash": "sha256-W/n8XRqgmFJSw7TdPikGqh41RoTl3mAw4zqfTEjqzEw=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kbruch-24.08.2.tar.xz", + "hash": "sha256-I9KH/azP7/qf47GUmMTbhRyZd8qqwVI5qoYQRA1AFlw=" }, "kcachegrind": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kcachegrind-24.08.1.tar.xz", - "hash": "sha256-BPJMq1/l3IinmYSY3ntstl537xKrHrvjS8oAs7ISuyE=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kcachegrind-24.08.2.tar.xz", + "hash": "sha256-h64CpqnNrtXPlSbtQFtZusxdaHFxX5HQwi0iLVyEdfQ=" }, "kcalc": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kcalc-24.08.1.tar.xz", - "hash": "sha256-huu5s2tfTWIJBIhCBphc7MD/0lNmbycxPse66ZsQqW4=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kcalc-24.08.2.tar.xz", + "hash": "sha256-DyD/62b4XyqRv3RTaO/pQ8XjKsA8Rem34SSv4OSU/Uk=" }, "kcalutils": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kcalutils-24.08.1.tar.xz", - "hash": "sha256-pRrD1dx1xuWlTtrwZ+DUvfWOeucRelCIpPkocng/sJk=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kcalutils-24.08.2.tar.xz", + "hash": "sha256-/4Z0PJJoowu/mYYNG49luhb8QNkmLXWs8HAu+8VfZww=" }, "kcharselect": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kcharselect-24.08.1.tar.xz", - "hash": "sha256-ZdhYIhssUv0QY+pXkkRPdO2trb0iz6baMPTnJXFsl8g=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kcharselect-24.08.2.tar.xz", + "hash": "sha256-iZ6Vb+s8HmLTWixAIEM5k0FuKKcWAOfJfvYn9I5ss4o=" }, "kclock": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kclock-24.08.1.tar.xz", - "hash": "sha256-qZ1bv4ADG2wzyHi9axI9LQLLnIrJ0Gl6PmMyBtTgGYw=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kclock-24.08.2.tar.xz", + "hash": "sha256-vE/mn8oWtQcly5W0cRzBshz4xfAjv3TZ1/AltcaW9ig=" }, "kcolorchooser": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kcolorchooser-24.08.1.tar.xz", - "hash": "sha256-2EYvEtVOcAqm7ENcuK7zn8QtrUhC7m6E+27+u+QncDw=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kcolorchooser-24.08.2.tar.xz", + "hash": "sha256-pjtX2K5XH49WvHZWjdarDFOCzYdkuA7+ie/OGUNJ08s=" }, "kcron": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kcron-24.08.1.tar.xz", - "hash": "sha256-qSy05C9ocXNLV9rs7T9o9KI37ExHwceKa1wlqv9/jCo=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kcron-24.08.2.tar.xz", + "hash": "sha256-hl1G8QYcVnpQ9VmrevH6/Sw/7bOsKJKTZwNVBv8K5tA=" }, "kdebugsettings": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kdebugsettings-24.08.1.tar.xz", - "hash": "sha256-ibanaWiHlfgYaLyFsAAhSAdpBkvsgbIc8FwLC3qtkms=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kdebugsettings-24.08.2.tar.xz", + "hash": "sha256-bu5AlIpmx9xrQii3TfrS7qfaPf4236Kj3GCwKANeyOg=" }, "kdeconnect-kde": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kdeconnect-kde-24.08.1.tar.xz", - "hash": "sha256-+de1XVKujQdDKSKv2ErxnNNz3we0Xrl9OBvNLbTV0eY=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kdeconnect-kde-24.08.2.tar.xz", + "hash": "sha256-1xeNlrRF72YJI/MFqQ/GrszK5AScyZo57mwXrAv1HGk=" }, "kde-dev-scripts": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kde-dev-scripts-24.08.1.tar.xz", - "hash": "sha256-kOmjzmiB9cRlunkmDWaeZtsBvwHezfqZXD8wP+RxaHQ=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kde-dev-scripts-24.08.2.tar.xz", + "hash": "sha256-B0IgBO4xUkQ/z/LUncul58uavGKNbwLhZaSAHMROc7o=" }, "kde-dev-utils": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kde-dev-utils-24.08.1.tar.xz", - "hash": "sha256-zDkPbsPxy8oBJbBy3coI859+fWsVYeuKwdHOjCx1Hak=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kde-dev-utils-24.08.2.tar.xz", + "hash": "sha256-MY5Gn1LAaoasGo8DRZhSJLUTZk0Ra/77k/TejdDdg8g=" }, "kdeedu-data": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kdeedu-data-24.08.1.tar.xz", - "hash": "sha256-8RR38NoL8kLcMJ4LxGGkP6AdlHQ6MEm9M2r1jdlZtOI=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kdeedu-data-24.08.2.tar.xz", + "hash": "sha256-XNf2MDYGKALxk147hXRMYSALKi3CL01JQD+czh+qj1o=" }, "kdegraphics-mobipocket": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kdegraphics-mobipocket-24.08.1.tar.xz", - "hash": "sha256-DZQoX812kENYZwDDMrgqlylZ76Y+H3SozqIhZY/+0DI=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kdegraphics-mobipocket-24.08.2.tar.xz", + "hash": "sha256-Vr/d8kznRVE9bfLClfEZ3mhwmB68z40GoQZoIu1/OZU=" }, "kdegraphics-thumbnailers": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kdegraphics-thumbnailers-24.08.1.tar.xz", - "hash": "sha256-cILM8eT4+mQ74znmTLD/0axenq5hSGllw7flfr+p3XQ=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kdegraphics-thumbnailers-24.08.2.tar.xz", + "hash": "sha256-1SBgDqNVa6IRH/TlzRWHSJpUy05t0aXmJriZwpKeGgs=" }, "kde-inotify-survey": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kde-inotify-survey-24.08.1.tar.xz", - "hash": "sha256-pDRnqWVvACqyspGnR/Z6U9bTFT2dLhgJvECDU26loIg=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kde-inotify-survey-24.08.2.tar.xz", + "hash": "sha256-w470km+siTY+Gn22H/Ofi/dzbtQJoFj+wOUt1rCEoLM=" }, "kdenetwork-filesharing": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kdenetwork-filesharing-24.08.1.tar.xz", - "hash": "sha256-Db0oYRg5RQ55rr2aybfbxFuCuMHNMgbV02DVRfc/cMM=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kdenetwork-filesharing-24.08.2.tar.xz", + "hash": "sha256-elaWVNVNgwbH7GIA4JKxoD+LGnPPS3ylQ1RKx7jUTGU=" }, "kdenlive": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kdenlive-24.08.1.tar.xz", - "hash": "sha256-VbQq9UUwTsJr8gtOnnnonpHWFIH7u5Ol33x06G+64UI=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kdenlive-24.08.2.tar.xz", + "hash": "sha256-FVZonukudpc1tZG79ntBhnGBD+7tCepWXpyKAL2/j7c=" }, "kdepim-addons": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kdepim-addons-24.08.1.tar.xz", - "hash": "sha256-RlftIyEsDu5T5IyHnxc25V9XFYaT+H+sUA5df5Td8t0=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kdepim-addons-24.08.2.tar.xz", + "hash": "sha256-zkUIDKMo/ysCDPjh17CSSg19xIMBEbyUgUHB4lavqRI=" }, "kdepim-runtime": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kdepim-runtime-24.08.1.tar.xz", - "hash": "sha256-KZHdMBhHtvdQB2nBJ8d3lVW4LwmuCFbRqevM4Zh+WSU=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kdepim-runtime-24.08.2.tar.xz", + "hash": "sha256-JA4T/FBvA1csCMDyl/TPJtMTpGfhc8/kCLLSnsbu8Pk=" }, "kdesdk-kio": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kdesdk-kio-24.08.1.tar.xz", - "hash": "sha256-Y/9boahTKccAaUbo/zma++H2TLZmnoWN/hr4/F8RFzI=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kdesdk-kio-24.08.2.tar.xz", + "hash": "sha256-072EF549k2FZ3t+psVaGvY0/8Y7V/mZg4PON9tDXI6E=" }, "kdesdk-thumbnailers": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kdesdk-thumbnailers-24.08.1.tar.xz", - "hash": "sha256-ScTJaB5hQi3rDnA70zLBjRzrIvDI7xo/rUmlMgmq1Eg=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kdesdk-thumbnailers-24.08.2.tar.xz", + "hash": "sha256-f8rNnHRu2fcwKBZ9jEIhvGc29HQB2ofzvoO1+G1kj9o=" }, "kdevelop": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kdevelop-24.08.1.tar.xz", - "hash": "sha256-urE8gll/YOcByuE91aL0BqixGL+padTE+psUeHAJ5Qg=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kdevelop-24.08.2.tar.xz", + "hash": "sha256-Pfw4jzWYoZPWlVVEb5F/RBgeAt6jgA/w5qC56AgdCgw=" }, "kdev-php": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kdev-php-24.08.1.tar.xz", - "hash": "sha256-N4Oq2zSuCSKZq0uEOWvhIXA2hl1nEsxsf5ldQcUv1jE=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kdev-php-24.08.2.tar.xz", + "hash": "sha256-Yqu92NqkVMjq3DnDC+DdnT6hkD0BPfsoc8x8eL07dcU=" }, "kdev-python": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kdev-python-24.08.1.tar.xz", - "hash": "sha256-aQvo1nRZyCg+8CLOPsesBT5V3INKEV6Rous7faISMSA=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kdev-python-24.08.2.tar.xz", + "hash": "sha256-3i87y9312GpnLHgj50Ac83kmWHWGcQRkERdiDRoUk60=" }, "kdf": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kdf-24.08.1.tar.xz", - "hash": "sha256-agXTh2RFk2rOPqLHy67+5r2X6F6gvnCRXH0yHPo2LRo=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kdf-24.08.2.tar.xz", + "hash": "sha256-/H5SFpxijru+cdtu0PM5WmbLoPKQO4Y4IkWH9IoIYec=" }, "kdialog": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kdialog-24.08.1.tar.xz", - "hash": "sha256-N+gAwnAP+R1MYUMnAxaqtIolaXtlIRicQ30Z7uZUYpM=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kdialog-24.08.2.tar.xz", + "hash": "sha256-FtrMEHqOiqdTfptR3a3X2RtaxHYOVRexplrcmnP6fIA=" }, "kdiamond": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kdiamond-24.08.1.tar.xz", - "hash": "sha256-JDWBGhDyl1vHLFxdPoyWrp3UGxEdRuV49zhx4aC/Ubo=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kdiamond-24.08.2.tar.xz", + "hash": "sha256-ijJ/XtNhKu2HB0yidl7u0QWE/TiD9R/9zX4DDuob6qY=" }, "keditbookmarks": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/keditbookmarks-24.08.1.tar.xz", - "hash": "sha256-DM5Tik2QttsXByP9n6mqMjgB0VEm4+kk1jbpe65SJJY=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/keditbookmarks-24.08.2.tar.xz", + "hash": "sha256-0sgvXfWAHsbfE40QRg6U7Dg+79O1dZ7LY0QtkuQDwAU=" }, "keysmith": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/keysmith-24.08.1.tar.xz", - "hash": "sha256-z3677BL9Yx7INiHDQePKx3kqnoWfX5kubiNklaIyMCY=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/keysmith-24.08.2.tar.xz", + "hash": "sha256-TZCj+9bbc/YtMjiDE9HKIrFxM7UiS+3zGL2ZVMIeIVs=" }, "kfind": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kfind-24.08.1.tar.xz", - "hash": "sha256-6Hf6xQi+xojheSMwxvZW//+8vVn+FhoXSwvS1QHYA7s=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kfind-24.08.2.tar.xz", + "hash": "sha256-kgZyhADD7d4ho7w9sE9/cyVYj9atPHjeOxBeP6P1REU=" }, "kfourinline": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kfourinline-24.08.1.tar.xz", - "hash": "sha256-uN/mXbWUjga/RVsholNmjNLnxGSblHbC+RJ/UxzRMs4=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kfourinline-24.08.2.tar.xz", + "hash": "sha256-9e1XGGOG4ZaKa/eVdpzJx4wPVuMAHJqmybHZjXqjTKI=" }, "kgeography": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kgeography-24.08.1.tar.xz", - "hash": "sha256-iZhXtmjxeZPaax5X2OZlYg0KuIWe1uMhCEKgCpXu8tY=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kgeography-24.08.2.tar.xz", + "hash": "sha256-8dx1e9iIDufFxOaelDVWry6FR1s7GGnNdOm6agS+pKI=" }, "kget": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kget-24.08.1.tar.xz", - "hash": "sha256-GvgduQsNtTULqxDJZk0OMSOjY10seg71g5OXc6mmiAQ=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kget-24.08.2.tar.xz", + "hash": "sha256-aQw0IeOLNz6CVzCoMKiBOSwXGfB4zsEh1oYgqn7Sc4s=" }, "kgoldrunner": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kgoldrunner-24.08.1.tar.xz", - "hash": "sha256-AL5ilt3iO/2x4FGOcszSeT4zLP8+/7Zir16GOfMX68U=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kgoldrunner-24.08.2.tar.xz", + "hash": "sha256-BZ0vTWG7jDVA2AwCHh//VWwT0+B75yDRZ61kbyE7rEY=" }, "kgpg": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kgpg-24.08.1.tar.xz", - "hash": "sha256-xhNdZ4VNSyHNKlR01f2a26VEfK0ouCTor1zAAlhjZIU=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kgpg-24.08.2.tar.xz", + "hash": "sha256-CEtAQ/89tflnXDmSo2tp3bPGjp7G8HVT/Mz+40iY8ww=" }, "kgraphviewer": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kgraphviewer-24.08.1.tar.xz", - "hash": "sha256-NdRqvxblLQZKJA6UaQ4HiXGcnlNi61h+pBXuQB2+w8U=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kgraphviewer-24.08.2.tar.xz", + "hash": "sha256-lMg+REm/0cFOVrEX/0NdF6C64Eg0VAU1kHnv3wps3JM=" }, "khangman": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/khangman-24.08.1.tar.xz", - "hash": "sha256-nEY8khR9xjmOSRlP14n3ptFrkFLvgMighp+ctS7xTK0=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/khangman-24.08.2.tar.xz", + "hash": "sha256-m9bXQ3NbrENOON+Q9b6FbQRxg6SUx2tlxKiB70Puu+o=" }, "khealthcertificate": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/khealthcertificate-24.08.1.tar.xz", - "hash": "sha256-VWOHgtRpMqtEO4SchWJWSPVZEkTr12qlvhfvdEQbgTk=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/khealthcertificate-24.08.2.tar.xz", + "hash": "sha256-g0Lr8zupMlyFLKyVPS9fB1Mo27E/BNy8507Xyfo7Z70=" }, "khelpcenter": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/khelpcenter-24.08.1.tar.xz", - "hash": "sha256-dg+iWle5QrpTJlpW/7EmSf+fWU3N/Gfa39m8UcEofnw=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/khelpcenter-24.08.2.tar.xz", + "hash": "sha256-ZYzPiHsHHWnl6y5k3poLMrJj/7Mf45zKlJvUXpvai4Q=" }, "kidentitymanagement": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kidentitymanagement-24.08.1.tar.xz", - "hash": "sha256-3/wCWTKvAIkIDjZ8xnCLIM5vr6GCOSHaSeQ745mmWtc=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kidentitymanagement-24.08.2.tar.xz", + "hash": "sha256-UKbggnbv1eaNJYLB2j+Mjh3aTMRzrP9IRf7AJ9yj9xU=" }, "kig": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kig-24.08.1.tar.xz", - "hash": "sha256-z4qALboiPIqEN98oyCydZHWElAN+XBD1dFIcs6MBTog=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kig-24.08.2.tar.xz", + "hash": "sha256-oNpiWtSK8ipxfEdXQPRCE8mCLMJJKPUWQ7GvLKdbOqk=" }, "kigo": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kigo-24.08.1.tar.xz", - "hash": "sha256-ftJhAt4OF5GcUOFqYvMlelilVUDpCBgj9+AgQzy1Ky4=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kigo-24.08.2.tar.xz", + "hash": "sha256-kxzRX+w1jIC/g1bKoNaTDZI75B3SvNLab4MsM51uPa0=" }, "killbots": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/killbots-24.08.1.tar.xz", - "hash": "sha256-N+t7AZWZ/ZtWkJgM+3wD/Sqb1kZ36EWWGBaY+5ug78c=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/killbots-24.08.2.tar.xz", + "hash": "sha256-k/nu5nE+ieaLElKi2xeLuMpzaZFDPLy/XMHUG9wEot0=" }, "kimagemapeditor": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kimagemapeditor-24.08.1.tar.xz", - "hash": "sha256-h3vdViqMwOUQ/8u7ckxjrxFomeqVYwuh2KlDmKmQs9s=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kimagemapeditor-24.08.2.tar.xz", + "hash": "sha256-r1twJIsYbBxa65hiX2wzJeMqHFKSoI2w8Z6pXExEjOg=" }, "kimap": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kimap-24.08.1.tar.xz", - "hash": "sha256-9hMeZ2TPptVomXlvXztkladQGBV/8Y2I2VX7EXpcfEk=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kimap-24.08.2.tar.xz", + "hash": "sha256-q93DHzE4LiESTQ0EgRgoiTQ7c7kxjcEgQ+1euq+edTU=" }, "kio-admin": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kio-admin-24.08.1.tar.xz", - "hash": "sha256-BnJ3NrmK98JN5GFt0kTZVg2ZUXqlAw+0fBtwww9XV6I=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kio-admin-24.08.2.tar.xz", + "hash": "sha256-9+BSkZmhYaaz0ynwN7AUhulZxe6De53rhdDHzx8YcmM=" }, "kio-extras": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kio-extras-24.08.1.tar.xz", - "hash": "sha256-ZAUd2i8Xo5AUJsCptcpltkQp8AtoIOd5bmBQhLDPzto=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kio-extras-24.08.2.tar.xz", + "hash": "sha256-mab1SMeqwYAX6+K3OsmTJ/JYW0GCV7wcfgZc7YK9LMc=" }, "kio-gdrive": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kio-gdrive-24.08.1.tar.xz", - "hash": "sha256-NZLVghzhXHzdD/8/j1ViHkN0UiFDvAG2MqpJ9GAABIM=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kio-gdrive-24.08.2.tar.xz", + "hash": "sha256-0/qmsTsjiL729aiu2blyKg9q/oC6s8nmWwSnB0xL2v4=" }, "kio-zeroconf": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kio-zeroconf-24.08.1.tar.xz", - "hash": "sha256-npc22mc/+tT9HN3kjIVMRKtv+UX9xWZa4UatxC2+nt8=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kio-zeroconf-24.08.2.tar.xz", + "hash": "sha256-Cv68ADR4ybvVUcSwk5kHx//w7epXkA0hqj1w+AO/6oU=" }, "kirigami-gallery": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kirigami-gallery-24.08.1.tar.xz", - "hash": "sha256-RtnzyDmT+jJ33jpRG9yg1qYKkA6Qkr41ToJxKP6MQcM=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kirigami-gallery-24.08.2.tar.xz", + "hash": "sha256-iESLnXKQaz9qUgmeA7ZX0PIBBoEoFo1VDHM2w1uXX0w=" }, "kiriki": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kiriki-24.08.1.tar.xz", - "hash": "sha256-Fd44QysYqiR1tDFkMvX0Woi9MuCRWUN9Aw32MH22y6g=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kiriki-24.08.2.tar.xz", + "hash": "sha256-NROQyN1YPX6+bXhk0lJf778qGV7BTdqzi72pAqTw+5k=" }, "kiten": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kiten-24.08.1.tar.xz", - "hash": "sha256-lbsIvt97/nMKYIICc3GmLVrWoE4vJV0ana8wtuXUDEM=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kiten-24.08.2.tar.xz", + "hash": "sha256-T2MDF8rJH7bTX3epmHMKK7+dKmhL5t7VU9mrqFpcEes=" }, "kitinerary": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kitinerary-24.08.1.tar.xz", - "hash": "sha256-aeMQJL74CDbhz16vFUP+mgygfXJD1DSfnaCoJ6EjOTM=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kitinerary-24.08.2.tar.xz", + "hash": "sha256-bzyMInh90qk5OC4qQrcczczW8j/KTDHrIIDn2sWFJck=" }, "kjournald": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kjournald-24.08.1.tar.xz", - "hash": "sha256-UVgjC7F6esn9eS7T2uejnmDZTKSjTXLY2GoOuIG3G7Y=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kjournald-24.08.2.tar.xz", + "hash": "sha256-+ynx9UmyxWBuM8Nvt3U7gITn5PmFNkfreddfujHZqlE=" }, "kjumpingcube": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kjumpingcube-24.08.1.tar.xz", - "hash": "sha256-c6gHitp0vTGpzC56uusi6m84OmEyTIepJ+2j1P0n3U0=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kjumpingcube-24.08.2.tar.xz", + "hash": "sha256-RCQ3DCAyCjCDZIyAogMXOFNQLr3JvnXvpjTatIugpOw=" }, "kldap": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kldap-24.08.1.tar.xz", - "hash": "sha256-lLUsSNWaKgeEYefTmP3eigdG+DGTkuSdIBdF8C5G0u8=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kldap-24.08.2.tar.xz", + "hash": "sha256-gjpCxxdpl9m4/b8xQJFs9KikON5322jH6hAx0Muk/us=" }, "kleopatra": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kleopatra-24.08.1.tar.xz", - "hash": "sha256-juW9kggi5PVMm11ap7dzMdKBOyW0PtipwMExygsby2w=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kleopatra-24.08.2.tar.xz", + "hash": "sha256-hgPbehv8Rsi+1diYh9XbVEk923iUH9qgPBIa1pSyw5U=" }, "klettres": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/klettres-24.08.1.tar.xz", - "hash": "sha256-qqD9gS5frocObmIJ+M6jAmKeQP7CJBtAKefOsxSmlxg=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/klettres-24.08.2.tar.xz", + "hash": "sha256-ZdHQfMFj0MAvw6aOSrizZZDYmQ3JoQoHsdIm35qZszE=" }, "klickety": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/klickety-24.08.1.tar.xz", - "hash": "sha256-/nUD35uFODiJC96uo+wTP0gn2qhxZkbLL6/QNpBcDYA=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/klickety-24.08.2.tar.xz", + "hash": "sha256-Si36hCgOwRWeDXN0Q6xjhG4eDcYIX5/X+HbaeBM/vhY=" }, "klines": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/klines-24.08.1.tar.xz", - "hash": "sha256-yj8R/4zLzTXdmvpk6tthFm1lcSqhenm++70YsDeGTMs=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/klines-24.08.2.tar.xz", + "hash": "sha256-GMQLh5yv+QKWfHLgtpO7xnFUimOQXXK0RKprUqS539w=" }, "kmag": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kmag-24.08.1.tar.xz", - "hash": "sha256-hbe0tq2gRm9plDLUun7VpzPhqczTxu2PG/r8+vTERu4=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kmag-24.08.2.tar.xz", + "hash": "sha256-FXPLvIrXR6LHHx8bu8we3pxsabkEnpelM/jK/HrN5HY=" }, "kmahjongg": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kmahjongg-24.08.1.tar.xz", - "hash": "sha256-2LlkBhMLPEH90LMzCRnXWMtZ/kGigZlM0Gdk5BFL7HA=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kmahjongg-24.08.2.tar.xz", + "hash": "sha256-vKnxozJamIxLLu1KWUZjWEyUUXHTrfXzRDBdhObt62A=" }, "kmail": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kmail-24.08.1.tar.xz", - "hash": "sha256-q1q9BXjxmW2vOp+2dPOUkVRM4z5++zyh//Fe9vVzEHI=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kmail-24.08.2.tar.xz", + "hash": "sha256-JpaEbLE9yDRdlkidTtGD3kkyj74jOloVVfS5CFHOY4k=" }, "kmail-account-wizard": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kmail-account-wizard-24.08.1.tar.xz", - "hash": "sha256-0Sz6miBt3l6gHn6iS6oKpJX6Sz1V+oZMZgZP1Q38cLI=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kmail-account-wizard-24.08.2.tar.xz", + "hash": "sha256-bvJ85SRmU3euCCqgx/Y3WJT2AaMhwXRej5qmgbp3pDk=" }, "kmailtransport": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kmailtransport-24.08.1.tar.xz", - "hash": "sha256-J/MiRRtp1EU2LPcKjnySB36O2LJUjhlJBXpNE3y6MG8=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kmailtransport-24.08.2.tar.xz", + "hash": "sha256-9f3gtgXNis+XADBqQGe0Bd86okDcyNBpRoX+icNknWM=" }, "kmbox": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kmbox-24.08.1.tar.xz", - "hash": "sha256-kyjDkwOMGYvlVHx0Nsoar3zfQUZtzMMsjt+SrDPq8I8=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kmbox-24.08.2.tar.xz", + "hash": "sha256-dN6qSzL+PAII8RUpgnnEwtI2+nV3QUnBskDLAx23bN0=" }, "kmime": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kmime-24.08.1.tar.xz", - "hash": "sha256-7EePJhRLHftvDquOjvsMHwatNJy7T1XP8jPcrPY1pIM=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kmime-24.08.2.tar.xz", + "hash": "sha256-Ahj+H6XvAxik6O9igR2qCu3vFeu+ANMarlNYW0VspmE=" }, "kmines": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kmines-24.08.1.tar.xz", - "hash": "sha256-H40mz5Iiirt5DdfC7eTBmnmov8PKeEZ2h9R1WhnNM9o=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kmines-24.08.2.tar.xz", + "hash": "sha256-C6GK0MrBsXTOfiIum0ara4+nlPoUMYTq0KKTBKMm73Q=" }, "kmix": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kmix-24.08.1.tar.xz", - "hash": "sha256-IXOVdWDucSwh895FvK3l/YNJgegmLooyU6NBZlYVuBw=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kmix-24.08.2.tar.xz", + "hash": "sha256-gxQ0bqFj5AQIY5abO49MdL5PrH3WvJsNz70F3Po4i/w=" }, "kmousetool": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kmousetool-24.08.1.tar.xz", - "hash": "sha256-GWRrYdkheqaefPmIzDTyWBXRY2T2LyBeYCmXNiVhEGw=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kmousetool-24.08.2.tar.xz", + "hash": "sha256-/Lr5RH/ua/ADYqbGg3I4ahGiT3Ln5co7mrtwOOXwme8=" }, "kmouth": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kmouth-24.08.1.tar.xz", - "hash": "sha256-T0Ta2Fj+LJYpgfHgh8Sppis5OVCywr2KAgotYjlQcf0=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kmouth-24.08.2.tar.xz", + "hash": "sha256-SyIboErUr/O0YBzss62WSoAGcmfUWCwZXykMzLfC6k4=" }, "kmplot": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kmplot-24.08.1.tar.xz", - "hash": "sha256-eUVVrvF5lzOUQ0ePh1TUq3kdXBxLJkOdRep3BHJMHNk=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kmplot-24.08.2.tar.xz", + "hash": "sha256-AhayVF52HOZFrhl86Iypm7W4d4ze01rduLMclM/TzQc=" }, "knavalbattle": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/knavalbattle-24.08.1.tar.xz", - "hash": "sha256-QLLpz37dyroTfNAL00N6q40OlZFab1rO58HtpXaMI58=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/knavalbattle-24.08.2.tar.xz", + "hash": "sha256-RXAoyJACcl3bj1jh/osvt9t1bhJA3hu4/Kh61yuuATY=" }, "knetwalk": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/knetwalk-24.08.1.tar.xz", - "hash": "sha256-TRvvJ4y70n7W1YoDU4TyVDdzzaWx+OTAL/2lTDhJvtg=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/knetwalk-24.08.2.tar.xz", + "hash": "sha256-qwuShnEQX3YgnijPXSCa9IcA03osLAAMFx6yOrJrVyk=" }, "knights": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/knights-24.08.1.tar.xz", - "hash": "sha256-k8Ns4f0GTDmWVUXck21Qg8q71OdcIqynW4aXpJ+mF1Q=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/knights-24.08.2.tar.xz", + "hash": "sha256-6AOkE+WULrSTBaISHl9+gjUylRreiqcgO+vtGqqki+U=" }, "koko": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/koko-24.08.1.tar.xz", - "hash": "sha256-PGOOXH09hfpsHxgJT9LBJDdOBEwxx+tlB2fJGsEGVRw=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/koko-24.08.2.tar.xz", + "hash": "sha256-9LgcWc2vby6MGsJn6ULUWT695MdQqHFHvZoRQpZtkIo=" }, "kolf": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kolf-24.08.1.tar.xz", - "hash": "sha256-ccoQ9q40xymrFoA2hDARz9IsFtKi4mhAk2yp77Qaw60=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kolf-24.08.2.tar.xz", + "hash": "sha256-7QdOexrxPgWsA2J6cLuPEDpUUByXdXvmri5vZjiEHbo=" }, "kollision": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kollision-24.08.1.tar.xz", - "hash": "sha256-XZ9LgoiftA6kHXhSRUYW5Ky31he8njrYzkFT9SLOlF8=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kollision-24.08.2.tar.xz", + "hash": "sha256-QQLAUw38CcYaoQwECPpu94pdAcWW1lYNw1gDf+3TvTM=" }, "kolourpaint": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kolourpaint-24.08.1.tar.xz", - "hash": "sha256-MOEZLGX50WBi+cx4sJNvBvbrzTR8VuYZn+KT19RWl3U=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kolourpaint-24.08.2.tar.xz", + "hash": "sha256-lCdxvhNMCHGWcBVmLeiLSHcGzXU6b86l/+2VPRL50JU=" }, "kompare": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kompare-24.08.1.tar.xz", - "hash": "sha256-wEJKFqgjilcR8Olge9+eJF0e7/f4LT2h8YSS6yvnWLU=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kompare-24.08.2.tar.xz", + "hash": "sha256-c3szGmxqba/pKyNYSrX8mTAL91aK8a7zRJNnbeWqk4Q=" }, "kongress": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kongress-24.08.1.tar.xz", - "hash": "sha256-2PY4gA9a3q1SP1ynmv0U892lUH55db6ic+eLuEcoJtg=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kongress-24.08.2.tar.xz", + "hash": "sha256-0Dzz9OXJwvb6xneFLYKA2YYontUejC0wkJ7EbWUEjPw=" }, "konqueror": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/konqueror-24.08.1.tar.xz", - "hash": "sha256-lpFvLR8klPKtGkVVDxz7hLDqMNnulK78AhedysW8ah0=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/konqueror-24.08.2.tar.xz", + "hash": "sha256-N6LnTlpBiMTkqTlPeTu7cO5LcBiQ6gssP/A6JAo+Bzg=" }, "konquest": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/konquest-24.08.1.tar.xz", - "hash": "sha256-VOiobACwcPJhfRjdhZqfdqGea7Kn04BUtjlIB+fIDbY=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/konquest-24.08.2.tar.xz", + "hash": "sha256-KZHlAGcCsjReJa9LY/ESSx2O1eunERRQRo2OuBEBd24=" }, "konsole": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/konsole-24.08.1.tar.xz", - "hash": "sha256-ZSGeT2r6Ceryb9PpE3nQfZOWDS9c5BJWhADotxsN1wg=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/konsole-24.08.2.tar.xz", + "hash": "sha256-rnLKTi2RI7m62pnS07ATmP9QgrVJs4V5z5qpTCv/1xk=" }, "kontact": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kontact-24.08.1.tar.xz", - "hash": "sha256-1XMonau/VuJIyPCxYrMtZjbiMhBxoJsXm67Ie7XCG7I=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kontact-24.08.2.tar.xz", + "hash": "sha256-Orw/nc1SbPn96oWc5dfcvIrrEtMvMwQP5INVO8Y5NlA=" }, "kontactinterface": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kontactinterface-24.08.1.tar.xz", - "hash": "sha256-/ju5yF4J/aselLEpYYtDLwY1JadaqpdVthIvpKpD8To=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kontactinterface-24.08.2.tar.xz", + "hash": "sha256-mq2qHgFLoYSCMY6uZ1WcpTwVztY4yFumTNfoW6YZaVc=" }, "kontrast": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kontrast-24.08.1.tar.xz", - "hash": "sha256-0CRFlgNuhhtIyYeIrtOL17mDQQOoXKKIW/aFGgCiyC8=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kontrast-24.08.2.tar.xz", + "hash": "sha256-7WCx4in6SisFEcToonoZR5tpJ09psY93ggkize0LUQQ=" }, "konversation": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/konversation-24.08.1.tar.xz", - "hash": "sha256-Y1zbukUfov8mwzFz/+RGdBgLTJDz13ToZBj9hF5bDG0=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/konversation-24.08.2.tar.xz", + "hash": "sha256-rCLjp9t+iDT3zQrY45hKuErK2IoE/kOz4WyR50NSbK4=" }, "kopeninghours": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kopeninghours-24.08.1.tar.xz", - "hash": "sha256-9NZDVi8Ohy7kyOCpfzGcuUtpoB2UhJtShReMi7pZpwM=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kopeninghours-24.08.2.tar.xz", + "hash": "sha256-Phl+XVjCNZiJgttT1Mm/1BfdbUS+l/2KeRhgfaOOyqY=" }, "korganizer": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/korganizer-24.08.1.tar.xz", - "hash": "sha256-AZ9o2VKqWmYAGI8gs1Fh4etbKQqww52P09lNUxBlTmM=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/korganizer-24.08.2.tar.xz", + "hash": "sha256-44SVgn/vjYNkyNT+cFQyBo+Dy5gcv2mGu32BA/c3rjs=" }, "kosmindoormap": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kosmindoormap-24.08.1.tar.xz", - "hash": "sha256-0uz2Kwl/hp2g0VjkoAoIuwYOdKCvnjS3oa8/2swVV1o=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kosmindoormap-24.08.2.tar.xz", + "hash": "sha256-xnbTm2PDgZkjsCcjryRYSBUI8R4LKl21hO5mDJmWRcY=" }, "kpat": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kpat-24.08.1.tar.xz", - "hash": "sha256-wYkifGsBxoQMKEYwFMQNBcUOvjrSc+oVah8RgCRWfMo=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kpat-24.08.2.tar.xz", + "hash": "sha256-LZ2oYxXkJLSEBA4ZEUO+CpNupDhUPQeNlud9xSg6BPI=" }, "kpimtextedit": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kpimtextedit-24.08.1.tar.xz", - "hash": "sha256-v5QdJFoGJrOzarAcGHIqpS/My5GgF8f/Owb8+ctz0t0=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kpimtextedit-24.08.2.tar.xz", + "hash": "sha256-VVtlkHcxQcTYRdbzoCq7Qjh+rUywD+L+wM4XhbanfIU=" }, "kpkpass": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kpkpass-24.08.1.tar.xz", - "hash": "sha256-iSMVU9aTQ/y+NjaI+km8ngW292lYBP21ISDocSsdgW8=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kpkpass-24.08.2.tar.xz", + "hash": "sha256-PwlaqwtPewP6hKSlnKq0UbVF6aPswi3E/ujttZcAy7s=" }, "kpmcore": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kpmcore-24.08.1.tar.xz", - "hash": "sha256-J0VQpdyNYTuo73lH/k5XwPgjOmCVRWM1nycS4FnwmoA=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kpmcore-24.08.2.tar.xz", + "hash": "sha256-gdMPMyKssuuHUemAr2yLE/w5lGg/T5AuWIImtwpFZ5U=" }, "kpublictransport": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kpublictransport-24.08.1.tar.xz", - "hash": "sha256-y3MFz/jWBY8Xc7hPfiztgmFMl2hUwTtFX6tJcyrWVqc=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kpublictransport-24.08.2.tar.xz", + "hash": "sha256-qkSjVdz7kC70RIDFSUDfdH3uj3+zYwHa+88F7DCiNOE=" }, "kqtquickcharts": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kqtquickcharts-24.08.1.tar.xz", - "hash": "sha256-EoDXakzOtuGHMbyZs7LAeOufzawKA5PfXnoG80JjzWM=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kqtquickcharts-24.08.2.tar.xz", + "hash": "sha256-seLcgMf+J/5VUIxkIaua85DcbjxKvwMVFqGm5GMMzP4=" }, "krdc": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/krdc-24.08.1.tar.xz", - "hash": "sha256-YOVQAFPJW+vq26Y0jWRhGJrVkBkIvP5R+E/7RwIGyDw=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/krdc-24.08.2.tar.xz", + "hash": "sha256-D71VooCV08hGSc/b4S3YaN3swjIF9pjtA+gkWFyLxgs=" }, "krecorder": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/krecorder-24.08.1.tar.xz", - "hash": "sha256-Y6SSwryA8N5Yq3bfudtKvPLK/TmwsD/C8tePYfYx64w=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/krecorder-24.08.2.tar.xz", + "hash": "sha256-6lW1IeWyhnbcASri5Zmodmi7PRIEpm1jIKGeK3cqk5o=" }, "kreversi": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kreversi-24.08.1.tar.xz", - "hash": "sha256-hnwq00iukLRC8QQ59c8InhR5cKHgahOtYSt+jORxZe4=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kreversi-24.08.2.tar.xz", + "hash": "sha256-CumrjLymqw2bBYRwBpVFDSmKa7azg5XklJ6BDaWojOE=" }, "krfb": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/krfb-24.08.1.tar.xz", - "hash": "sha256-7l9Nqy0sBSrwltWHgkYTUfFQ/KGbbsZtrOh8iZVgl1o=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/krfb-24.08.2.tar.xz", + "hash": "sha256-wlCw4RbGk1f3sZQVqsN9eOIogLqffZhbB2doFSNeoS0=" }, "kross-interpreters": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kross-interpreters-24.08.1.tar.xz", - "hash": "sha256-rPySduwB4DsNCB63ubj8p0kA/42h8MqtSKshJ4eCGlA=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kross-interpreters-24.08.2.tar.xz", + "hash": "sha256-k0PPK0U8xZdXgOkMobBOx6fwScCZVMjc2Samu7CTc3Y=" }, "kruler": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kruler-24.08.1.tar.xz", - "hash": "sha256-LVlVGfQdD9UO4pXQF8TbnRFiqwV0K2Sq7JkAVRsqc7I=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kruler-24.08.2.tar.xz", + "hash": "sha256-E742B4bxaTk7R1akC6HxXklEvi/HxKS7T4dEM+VI5lU=" }, "ksanecore": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/ksanecore-24.08.1.tar.xz", - "hash": "sha256-qe7k925CmnzbhoyQFVrZsawBNAXYVp7PpXFcISvN/Uo=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/ksanecore-24.08.2.tar.xz", + "hash": "sha256-+RwD6UWjRgdwZYFLJjeNmTjho5wiyIGFo2YmoFI6R00=" }, "kshisen": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kshisen-24.08.1.tar.xz", - "hash": "sha256-i5U7us2B34vH5nDdApt+syS/Q0Z0dx2GNwiB3/NfwZ0=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kshisen-24.08.2.tar.xz", + "hash": "sha256-i+eVjXDXrXmS9iz2zptphVZKSytg0RfpZWpM9LMNdUo=" }, "ksirk": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/ksirk-24.08.1.tar.xz", - "hash": "sha256-ixOSCC76lYHA1cuddZB4IlL9t5ZzgWNWrntaDUZY9nk=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/ksirk-24.08.2.tar.xz", + "hash": "sha256-t6StiVIRpvRJcx4U9P1SsNR5ZkhYvQpYrEM8pPKOSdU=" }, "ksmtp": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/ksmtp-24.08.1.tar.xz", - "hash": "sha256-3mc85BCk+FeWxaEs5DihsNoNOnX+99L1amt3k8bf7zM=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/ksmtp-24.08.2.tar.xz", + "hash": "sha256-qKzU8s5G23niiUG/8AqO0Mv1Mv8hT0ltFyEnYrBNuGM=" }, "ksnakeduel": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/ksnakeduel-24.08.1.tar.xz", - "hash": "sha256-Rn7rvYP2MqTyUTSWgMKogWVNqxBnEgmFaIYPeMgv+24=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/ksnakeduel-24.08.2.tar.xz", + "hash": "sha256-biJ1mBjUPOf/h67GpwoQniChBBV6/HTYukoJNASQ0CQ=" }, "kspaceduel": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kspaceduel-24.08.1.tar.xz", - "hash": "sha256-uLMh2JxwLWsGU1JQ+bGiklbvWqzJiPun7WENGgQGtwI=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kspaceduel-24.08.2.tar.xz", + "hash": "sha256-uF+cjbpgTOEhN5FefkXQjN7K6e2iAd9r2RqKOlb0+G8=" }, "ksquares": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/ksquares-24.08.1.tar.xz", - "hash": "sha256-b+A4dxS9/XtcODTo9rlIjxb3Xv4mcrTzEKeL/zBDI54=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/ksquares-24.08.2.tar.xz", + "hash": "sha256-whGNtx+TENOcwrQwVm7UC9z0wwF14zEs/bOS0JmWsWk=" }, "ksudoku": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/ksudoku-24.08.1.tar.xz", - "hash": "sha256-UOmy4zgs78Cr9xWvKc7pp8ywmAzVMGZnls+JLPRjRq8=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/ksudoku-24.08.2.tar.xz", + "hash": "sha256-Xoq3Sz9ONmLZcwHoGZwwsIeXNhu5VyEah0tcdvcUkZQ=" }, "ksystemlog": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/ksystemlog-24.08.1.tar.xz", - "hash": "sha256-pMnTIhX4PYSRGOgvNxvKazg2u1Dbtrw6/t66MQquqZ4=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/ksystemlog-24.08.2.tar.xz", + "hash": "sha256-d7jmKc2cwJ/lg+mbuv/q/rN9jtobLGy0CCqUJ/qmqW4=" }, "kteatime": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kteatime-24.08.1.tar.xz", - "hash": "sha256-6C8Jhqc8hRycFZBbxMzrG4rhd1WZvc3dWiBhygggpwg=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kteatime-24.08.2.tar.xz", + "hash": "sha256-c3HLUioLNkBHw+L0UFQpJ7fbM78hmGvjKhNuocyO39s=" }, "ktimer": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/ktimer-24.08.1.tar.xz", - "hash": "sha256-bUK/vpkN4+5FZwreEWTBhxFart6VCuNV1Txv4J4Ed0c=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/ktimer-24.08.2.tar.xz", + "hash": "sha256-y2Y7K86Np7pf2teDp2DKo5RtFtYZ1Ad16Za7D+0UKHY=" }, "ktnef": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/ktnef-24.08.1.tar.xz", - "hash": "sha256-wFoDST3jrgwjsr86exDO24ES1gZuh8CTtcslR2tb074=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/ktnef-24.08.2.tar.xz", + "hash": "sha256-OI4PkxQTQplH5W380a1CnuI/2E3XkiI+uKSLHBKxhyg=" }, "ktorrent": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/ktorrent-24.08.1.tar.xz", - "hash": "sha256-aU98JBF1+vkSVRfOs2knPNq4yR6BxP6rej7D4afkvmE=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/ktorrent-24.08.2.tar.xz", + "hash": "sha256-DCxxzPYJQ6AQF/a6ADYeYNlgjHrfHUTx6WesFlkW1uI=" }, "ktouch": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/ktouch-24.08.1.tar.xz", - "hash": "sha256-jx31T7k+i2+IyGmjvfuxWZYAETFZJcsnUFdN/d3dsg0=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/ktouch-24.08.2.tar.xz", + "hash": "sha256-vH63wPQAH8UIrikFUCAeWBZoSx6JI+So8FcHkboVhbA=" }, "ktrip": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/ktrip-24.08.1.tar.xz", - "hash": "sha256-X997nkQqO3LJ7kSVxz8Dpy66VOuB8ALCDIZmQFe9ipc=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/ktrip-24.08.2.tar.xz", + "hash": "sha256-PinHfz/LMzs7KyF60K6igLWFQkCTBABrhUtK2rY3oSI=" }, "ktuberling": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/ktuberling-24.08.1.tar.xz", - "hash": "sha256-W4nzpWKPOsH4KqV++ml3USxMPgOQBFefrQvSp+aLLCE=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/ktuberling-24.08.2.tar.xz", + "hash": "sha256-YfpiOs/HC3GhfPTrC53vCT1+Jf2b4yLGzL4/NX3jtEg=" }, "kturtle": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kturtle-24.08.1.tar.xz", - "hash": "sha256-OU93eu1iaOieu2ywMaftW9DjQXWfSfxEBn3vlRSqTbw=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kturtle-24.08.2.tar.xz", + "hash": "sha256-YgUCpPW9+QsN6fw2he48KP688UVsIrU4Xx+0bII4rak=" }, "kubrick": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kubrick-24.08.1.tar.xz", - "hash": "sha256-gPuqpzxzlVjiDNkweMz/8RHpotN6WZelw/XeEodS9/8=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kubrick-24.08.2.tar.xz", + "hash": "sha256-WL2MdJ6rB+JQtDeMUc9SJmN1B5AZ82e8mRQc57KG/94=" }, "kwalletmanager": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kwalletmanager-24.08.1.tar.xz", - "hash": "sha256-0Aa5uz1OCjx30qc/v+FQ83s8Kj/lJkQgMazPHcG7OqU=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kwalletmanager-24.08.2.tar.xz", + "hash": "sha256-+hxNM3xo1jVzJ3YLiZ/VSjHCYGPNdWhoqyuMyZgrgLI=" }, "kwave": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kwave-24.08.1.tar.xz", - "hash": "sha256-VcXNXSH8A19huuZvORao1/0IwhjCeT288T/cMzOxu+U=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kwave-24.08.2.tar.xz", + "hash": "sha256-AQQGXKXm8AQgt737Dr2S9SiQfC6WwpB60GkEAyij3P0=" }, "kweather": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kweather-24.08.1.tar.xz", - "hash": "sha256-efVml7TzyJe2tgLo6Gntq+Ld0Vy8nT2VYSg5AlLS2AI=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kweather-24.08.2.tar.xz", + "hash": "sha256-9osHF6CnBwC9oHwGhxH2gYHElKqkvmFUfXgadWby52U=" }, "kweathercore": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kweathercore-24.08.1.tar.xz", - "hash": "sha256-FudSDS/wPNxUnX+xsY+bTuUF+KpZiSZjuWa8rQKshiE=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kweathercore-24.08.2.tar.xz", + "hash": "sha256-PjkMyYg1lSNgxkFvve7tdbhzzC2/wMtf3CxyuTtn+xg=" }, "kwordquiz": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/kwordquiz-24.08.1.tar.xz", - "hash": "sha256-RprRKZmzQxyXEjMn1eUXaF+OMdRPjl4OWA74oqPcOmA=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/kwordquiz-24.08.2.tar.xz", + "hash": "sha256-6M7KqBCTNjmfo11lraebVG7x/8du8lFdhWKDXSENh34=" }, "libgravatar": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/libgravatar-24.08.1.tar.xz", - "hash": "sha256-jU0QOjWxD8gmQeSMW/pWII+9RKNsbhCqZJ1cDqzpU94=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/libgravatar-24.08.2.tar.xz", + "hash": "sha256-W3UVMlJaKfK6VvlXWWxEYqEW6yBYwgCagCYNSo9pXdk=" }, "libkcddb": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/libkcddb-24.08.1.tar.xz", - "hash": "sha256-pgzebMlDJPF+XkHlCf+t3/y1f7xzQR0tFWfAnkxTB74=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/libkcddb-24.08.2.tar.xz", + "hash": "sha256-qdZTAB5hG0dk5PqVnxCnMyDkdeIyshvtxle9zwJF9H0=" }, "libkcompactdisc": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/libkcompactdisc-24.08.1.tar.xz", - "hash": "sha256-RWJLclL8vjD24QX/i8+OhEy1bBzT3iZCXBvawefJLrY=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/libkcompactdisc-24.08.2.tar.xz", + "hash": "sha256-r1CI6BCuv/i+/8WAAVlzXgAybSCEKTFzH4GeQAAnw7Q=" }, "libkdcraw": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/libkdcraw-24.08.1.tar.xz", - "hash": "sha256-3O2i6790ebojLpEI0c9Y1hPfD6dsmQEG7lnbuoycMvY=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/libkdcraw-24.08.2.tar.xz", + "hash": "sha256-TI/jV/L6+5V+UyDWGlWp10ZmWj7q/CTaKFGA63H7re4=" }, "libkdegames": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/libkdegames-24.08.1.tar.xz", - "hash": "sha256-SLIlSmzfOHRLbvQP9H5EMLkmM7sgAwMK7Y7f1JdBT8I=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/libkdegames-24.08.2.tar.xz", + "hash": "sha256-6n2S2qcRm40ww7xeggCZKtILdgkuWJZQHLh4JhdHgEI=" }, "libkdepim": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/libkdepim-24.08.1.tar.xz", - "hash": "sha256-y3b6t+zhTcA8sJCiymopcsy8NPaobExn7Smhj/Mwn20=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/libkdepim-24.08.2.tar.xz", + "hash": "sha256-5Gkrx28BiKP9QJ6q4Rl8bqdi5TISSEHfa4smnxsi1F0=" }, "libkeduvocdocument": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/libkeduvocdocument-24.08.1.tar.xz", - "hash": "sha256-DplQDk46v04XlaOQw3KM6f55m1ZpZdWNTrJQA6EwMpE=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/libkeduvocdocument-24.08.2.tar.xz", + "hash": "sha256-v9e0aKUwlCHIiXCPQ1aDhf3M3vHWUt4VZm/q9Z9ZcqE=" }, "libkexiv2": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/libkexiv2-24.08.1.tar.xz", - "hash": "sha256-J9i2HgWGnP3uaFGDkZyzFELbeF0LRAOZyLqEYpSnvmc=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/libkexiv2-24.08.2.tar.xz", + "hash": "sha256-4pJGU23AryjEZwhkFhTsf54hdOAjPq038z6ZqroJgJM=" }, "libkgapi": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/libkgapi-24.08.1.tar.xz", - "hash": "sha256-wk7cdR9mtsRorB6R3z8sQRSmItk+u6kAuXjprRPbj/M=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/libkgapi-24.08.2.tar.xz", + "hash": "sha256-2XV586ne5xpt3Ta1JaZ6DTs04QbLi8GF3ubNGs0wYxc=" }, "libkleo": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/libkleo-24.08.1.tar.xz", - "hash": "sha256-yYJYD4wbzr8aIUYl3J//iEK+YuR+iVF1X/HKflIuLRg=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/libkleo-24.08.2.tar.xz", + "hash": "sha256-Q72tjs6nGpRK7LEB5wANuPtqDFCK/Y6FawRYhyML9g4=" }, "libkmahjongg": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/libkmahjongg-24.08.1.tar.xz", - "hash": "sha256-L/oISXYIZG33aSnnCRdV7i+NsuwN/IryoyRxKmSjiog=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/libkmahjongg-24.08.2.tar.xz", + "hash": "sha256-oGOgduXkAcL6X0aXS8HGrAXrysEoeyp15TSAiclkrho=" }, "libkomparediff2": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/libkomparediff2-24.08.1.tar.xz", - "hash": "sha256-+6rD4LlVhlwSPF+DBtsZmytcv4pBF83xyZvwu7sI0PI=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/libkomparediff2-24.08.2.tar.xz", + "hash": "sha256-8dyhIR5u2EIS9l1u5PukZ3DGThlasPAF1u5EHdCy5ow=" }, "libksane": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/libksane-24.08.1.tar.xz", - "hash": "sha256-4+cDtO+jNrdKUwn9WJMgUrg8Kh45/x6KkLXPfLm6Mm4=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/libksane-24.08.2.tar.xz", + "hash": "sha256-6vNORJEOqdRvEUmw6393YkIsw5Vn4qArlm72GLlFMJE=" }, "libksieve": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/libksieve-24.08.1.tar.xz", - "hash": "sha256-hYjjTbiC2qAW9GRh5RNcB63kO1zfZZGL5ny4itGnrx0=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/libksieve-24.08.2.tar.xz", + "hash": "sha256-yapayByDfwMBjI1cNXu3+RSlAATyEG08XaZVeaUOHPA=" }, "libktorrent": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/libktorrent-24.08.1.tar.xz", - "hash": "sha256-cwWY05Pxvaanvg8df4vy7SckYG6SVhDyIgJ3Fkn8WwI=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/libktorrent-24.08.2.tar.xz", + "hash": "sha256-gh1IFw8hfnBV7Rh806Qz3w4DhAANEfRI/Dxujv7p6Rc=" }, "lokalize": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/lokalize-24.08.1.tar.xz", - "hash": "sha256-wonzvixrGfX71UwCuR+An/fPNyzty/B48cTxphRx+Fs=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/lokalize-24.08.2.tar.xz", + "hash": "sha256-8iGuejWWdFSjniG4ICaOZmnNACDYTQPgNiYeEsVs/6o=" }, "lskat": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/lskat-24.08.1.tar.xz", - "hash": "sha256-VwyDfV32tL4HmkIOcl+CC/NGBCaUNlpnesu1fdZsY3I=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/lskat-24.08.2.tar.xz", + "hash": "sha256-/JlSqKoouA8D1jBrFKtQXSVYUPT5VjzQLrr9+ge7haM=" }, "mailcommon": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/mailcommon-24.08.1.tar.xz", - "hash": "sha256-LzZeswVktJu4+lT0E/TvSVhw8kSqY3vbbQm28pukM9U=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/mailcommon-24.08.2.tar.xz", + "hash": "sha256-dSHonywH6C+qG16XmU2y9q0uxqiMdRPnGC1ZfhvH0Xc=" }, "mailimporter": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/mailimporter-24.08.1.tar.xz", - "hash": "sha256-XtHepApkb6bCqiHNcFjrXIvFPYrFJqclzvTB4JZ65IM=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/mailimporter-24.08.2.tar.xz", + "hash": "sha256-dE63EAkJJOt5r/vyhar1jjS4F+FXArMttrkwQ8HVeGg=" }, "marble": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/marble-24.08.1.tar.xz", - "hash": "sha256-e+fQQNGNXLVfOzntLxb4I5wx1a0STNHSvBJK5px6THw=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/marble-24.08.2.tar.xz", + "hash": "sha256-dUGw5kDEuUHrhoMDkHkBjQGAzHIlj5/h1Wusmy9oJzs=" }, "markdownpart": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/markdownpart-24.08.1.tar.xz", - "hash": "sha256-A59jxdlixu7xvRS5PJQ3+17nEESO/JqA3YlGehnkDT0=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/markdownpart-24.08.2.tar.xz", + "hash": "sha256-FbM0H3I/lp7tYcFODuxXpdeoqTGskBiwbRGDMRv1ujA=" }, "massif-visualizer": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/massif-visualizer-24.08.1.tar.xz", - "hash": "sha256-zIkB9p7LuXv5EN9wCr9eC0lEykXpEWuMQdRX+GAZQSw=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/massif-visualizer-24.08.2.tar.xz", + "hash": "sha256-SkUWECEUN4zfqIdDxjLiBpYgnDdwg3MwqUUnVxpTRME=" }, "mbox-importer": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/mbox-importer-24.08.1.tar.xz", - "hash": "sha256-45RaecU9MmKBnms06GbZBaN1RCKpDRuQq0QOqryWhmU=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/mbox-importer-24.08.2.tar.xz", + "hash": "sha256-W+dq6hLl6Xc2KUy+rj3JxMD5QmOqy8/I7NOvglcsj4Y=" }, "merkuro": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/merkuro-24.08.1.tar.xz", - "hash": "sha256-h+cTXd1UzXrO2exfxZPF4oPFwsR6gkF2M2iGN78yBqU=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/merkuro-24.08.2.tar.xz", + "hash": "sha256-7zv3e0rFT192IuQ9JGhegl15Hxx2ek4QbdatKm+R8BQ=" }, "messagelib": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/messagelib-24.08.1.tar.xz", - "hash": "sha256-dBSFVm1WwRnZ0atguaBPwoOVw/mDCCSbotUGvahu+5s=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/messagelib-24.08.2.tar.xz", + "hash": "sha256-9yfAX/+3QKCjtRZ0RmoTfCOtYC08oT090HB4B5tLQUk=" }, "mimetreeparser": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/mimetreeparser-24.08.1.tar.xz", - "hash": "sha256-43lifAN816wxbFRXVjJuqHP6w+QwOA4yYjd77gKp7Ew=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/mimetreeparser-24.08.2.tar.xz", + "hash": "sha256-MRJOsi0CL6mCH/tRA+TZpKjrO9Cvx+wQKwdk/+OOYXo=" }, "minuet": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/minuet-24.08.1.tar.xz", - "hash": "sha256-jc00peuH4LYSxrudt3jQ+sx5YYy53I3ePNhyQ5dMDNQ=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/minuet-24.08.2.tar.xz", + "hash": "sha256-OkMJAuinU2FNI+Vzv4AG7Yneq7ArGJGoWge7hOxtsHA=" }, "neochat": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/neochat-24.08.1.tar.xz", - "hash": "sha256-o5TwTPGdVWdDflWAdcn3zlw3v3OUOxPEdzn/VqzeVx0=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/neochat-24.08.2.tar.xz", + "hash": "sha256-hz8I817xBVsXZHCYorpaOSTcD7g1BEHTgMNZjYITwbw=" }, "okular": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/okular-24.08.1.tar.xz", - "hash": "sha256-sFdlXBPk+lZtKIcwrrlhmK74qQy2odalX1ZvpaawLok=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/okular-24.08.2.tar.xz", + "hash": "sha256-QInHfVvmCu29RdoNS6MZ45CbFaZAzVHTYbAdla0zyPs=" }, "palapeli": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/palapeli-24.08.1.tar.xz", - "hash": "sha256-7C0TN9iUk6BTA/vx6AAZDiJx7HqUgrRMx3g0yuFrw2g=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/palapeli-24.08.2.tar.xz", + "hash": "sha256-JFhZ1nkH91hFuq7nA7DlafceA+bH9gGV9WphdZoLoy0=" }, "parley": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/parley-24.08.1.tar.xz", - "hash": "sha256-SHHwS3OYssUKxqaoY5VHCxeHWJx0lKPoQAvw11ERib4=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/parley-24.08.2.tar.xz", + "hash": "sha256-nblLobCcIkhdbAS5pc1IRCZZFQEVMtLkx0EdkmTOxPw=" }, "partitionmanager": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/partitionmanager-24.08.1.tar.xz", - "hash": "sha256-MuRN734ePlesgfIHRK/KpYX/Imnq+2GSJC8KsPNtXNw=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/partitionmanager-24.08.2.tar.xz", + "hash": "sha256-oimr4ialV3dXjDgnZ37CIYxpxaYxpxQ28mid5g9tTqo=" }, "picmi": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/picmi-24.08.1.tar.xz", - "hash": "sha256-AcFyuif12DI4NrRy3EOeM7l1IQPd1dI8AStLkzJZSbE=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/picmi-24.08.2.tar.xz", + "hash": "sha256-JY7O2o/YZkuP1vQqXG3r2PUReukVAAESU2+cxolG1gI=" }, "pimcommon": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/pimcommon-24.08.1.tar.xz", - "hash": "sha256-MV7VWJKzxU6lFDrdx+kuwIvfYVcSlkPI/ZVi3DbsWp0=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/pimcommon-24.08.2.tar.xz", + "hash": "sha256-NVux0isn6x+3tqbOz45daOKIpSrKSnr9NPcj+Q+UI6Y=" }, "pim-data-exporter": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/pim-data-exporter-24.08.1.tar.xz", - "hash": "sha256-q4J4Eo9vcFe0344eThuG7q1UBnUl/upxgMV4Qg6trcU=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/pim-data-exporter-24.08.2.tar.xz", + "hash": "sha256-Oj5tie3p0AplOKylrJNSZjjK4fLripWL5gq5xQ0hNDY=" }, "pim-sieve-editor": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/pim-sieve-editor-24.08.1.tar.xz", - "hash": "sha256-ojtEVNvQjK7tZpksjRBZ16Z8dEqqQi38p0YpPoiZ0qI=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/pim-sieve-editor-24.08.2.tar.xz", + "hash": "sha256-g98WYyHHcj0SI71ibImFnDZciZ6NZRhDtXDOL4VrjxA=" }, "plasmatube": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/plasmatube-24.08.1.tar.xz", - "hash": "sha256-Jmk+Wpwqhitytla0hWTrtquuLolCHNf+ex/9f5j08mQ=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/plasmatube-24.08.2.tar.xz", + "hash": "sha256-b2yaWcQv7t8+TQJ2qtqjwqm68yqGJp/2pOx1sww3kyw=" }, "poxml": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/poxml-24.08.1.tar.xz", - "hash": "sha256-1DCqQqvsG3+k9UcKZbTutT+AtOgJ2yKp0PxcN8XMb7A=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/poxml-24.08.2.tar.xz", + "hash": "sha256-4IVUj6HmzPiM3daefE5oATT1/qiLTrh45FRiqFg6JXw=" }, "qmlkonsole": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/qmlkonsole-24.08.1.tar.xz", - "hash": "sha256-n1WUGOGtT7KJwMvKO5g9yxK1Bkdv0JggNqv9OHI0WAk=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/qmlkonsole-24.08.2.tar.xz", + "hash": "sha256-M873T020YW8TsL/oxd5tgjonV14mNo1rMK3iPLZQi3I=" }, "rocs": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/rocs-24.08.1.tar.xz", - "hash": "sha256-4Xs60rEjlBU/dRbQzd2N87JOsrbf71UL1MbxAoovBoo=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/rocs-24.08.2.tar.xz", + "hash": "sha256-0QAwFhLg0/4+0k2u4oxr0Te0C8sq+cdSZCpghH3FGFI=" }, "signon-kwallet-extension": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/signon-kwallet-extension-24.08.1.tar.xz", - "hash": "sha256-thBohLLk4aS3awPOHwZKfRvOQOj7Hk2ICLKaF9fLFK8=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/signon-kwallet-extension-24.08.2.tar.xz", + "hash": "sha256-1Y2CnbVI8myXtBwgqGR3dwDvRMRCSms0EALIRZCYD/w=" }, "skanlite": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/skanlite-24.08.1.tar.xz", - "hash": "sha256-BtJoQKifmrCj5WMYViMS8jdppb7EBxOQG6XWxuW0DxM=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/skanlite-24.08.2.tar.xz", + "hash": "sha256-fNuWQRIYc5UkG3EbU1EPm2DaPeexO6qT8g1XnqLXMaY=" }, "skanpage": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/skanpage-24.08.1.tar.xz", - "hash": "sha256-SI24TNKnodN7ghoyDyOhk/5Hp/tp9F6UuEh/NBlmock=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/skanpage-24.08.2.tar.xz", + "hash": "sha256-dJ1e2txwGYLstcGHg9L/E9cuplKdnZ6OO8EnE6uwKxk=" }, "skladnik": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/skladnik-24.08.1.tar.xz", - "hash": "sha256-o76i2B2B5vWkbp0SEZtDjJlH97nAxXdB7uzBo+ATGOk=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/skladnik-24.08.2.tar.xz", + "hash": "sha256-daL1m8awJK7puBf4/oLSZup4Drs64eYEGI+VgPVP1b4=" }, "spectacle": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/spectacle-24.08.1.tar.xz", - "hash": "sha256-6DUYuyPFYpT8eGBkNBN2YOAnPBt5QaFbuglXE1TM1Mg=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/spectacle-24.08.2.tar.xz", + "hash": "sha256-P5D4z+M1mtlPW7ACWpJRgFoJLFiSzSqJGWXCGgmEy98=" }, "step": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/step-24.08.1.tar.xz", - "hash": "sha256-aBdO/5L6WKaq94AwvselXWjvVJNPqlJ/MsoiIbGJPvY=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/step-24.08.2.tar.xz", + "hash": "sha256-6f9AC8kvbJViWIwIB2FQVTMLI2RlzHpEDu1ZbCK/csI=" }, "svgpart": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/svgpart-24.08.1.tar.xz", - "hash": "sha256-OAdmUcGQoZnqU4afgaczR/3pBIdTGQ8vFzy11LUbdXQ=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/svgpart-24.08.2.tar.xz", + "hash": "sha256-ymFR/KYkDFL0MbzJj/5OFkku/uGI16IxLwbbZcC1xhg=" }, "sweeper": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/sweeper-24.08.1.tar.xz", - "hash": "sha256-hpe5ZJU9hKKVcQcCAzB4HZ9LhXeWgNst43bVcdhqdt0=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/sweeper-24.08.2.tar.xz", + "hash": "sha256-LSwg7d9nhp58JaWA5PXYgQLexfVT/3B5MF4fANhEVDU=" }, "telly-skout": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/telly-skout-24.08.1.tar.xz", - "hash": "sha256-9biRXD2n9HYtL90FHJ9JXD9DCrDm64ydyclP2qANpPk=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/telly-skout-24.08.2.tar.xz", + "hash": "sha256-y5577kur5lqL/hEXFWnf4qOfBj8SdGUU2XNWrSfGVsY=" }, "tokodon": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/tokodon-24.08.1.tar.xz", - "hash": "sha256-YtuG+0Cow2+IQhoJsN3/7NgmapwlIEuRg3Fd2810Mzs=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/tokodon-24.08.2.tar.xz", + "hash": "sha256-uEHi9gc1YsGohLJAfT2FpiyoQYvcvLk6Fpt/Pabx2SI=" }, "umbrello": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/umbrello-24.08.1.tar.xz", - "hash": "sha256-WiT4p0L4lSsDXfCSMeR58fT93TWSFrgD233+/l74isI=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/umbrello-24.08.2.tar.xz", + "hash": "sha256-HlolgPVSawdxb4spDZTaOT2BiPD+OqCHYySvtn3TPEU=" }, "yakuake": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/yakuake-24.08.1.tar.xz", - "hash": "sha256-sLajoPtOFoaFVA46Go3SpNA89Z3bpv2PwFgFnxVaxhs=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/yakuake-24.08.2.tar.xz", + "hash": "sha256-+wij2zZISxXD0u+ydpRrmr9FqX1X62dqGBcjLUZB8ac=" }, "zanshin": { - "version": "24.08.1", - "url": "mirror://kde/stable/release-service/24.08.1/src/zanshin-24.08.1.tar.xz", - "hash": "sha256-yB7hLZE8irYDA8V8ldeY3FuebePgZ4Mlgy3nCWgprU0=" + "version": "24.08.2", + "url": "mirror://kde/stable/release-service/24.08.2/src/zanshin-24.08.2.tar.xz", + "hash": "sha256-duajViqesjC1O1EZ27/IfSLAPJ2bpiNU2qlvx/lfPqs=" } } \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/kde/generated/sources/plasma.json b/third_party/nixpkgs/pkgs/kde/generated/sources/plasma.json index 6d10817031..4f032415a0 100644 --- a/third_party/nixpkgs/pkgs/kde/generated/sources/plasma.json +++ b/third_party/nixpkgs/pkgs/kde/generated/sources/plasma.json @@ -1,322 +1,332 @@ { "bluedevil": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/bluedevil-6.1.5.tar.xz", - "hash": "sha256-KZWNoIsyQr2kJDiYnuPsuB04bKW+cjMlBuXPDe0LcHc=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/bluedevil-6.2.1.tar.xz", + "hash": "sha256-B0O5qCynj2hayN8tmTCa/c/s2PhnMqltLNZvQZHOSwM=" }, "breeze": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/breeze-6.1.5.tar.xz", - "hash": "sha256-VEkXfJBhP5e0dK53YoXM/G6Gc2kdEgM32VNwyefIPLI=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/breeze-6.2.1.tar.xz", + "hash": "sha256-91X/9z0cTcYbaHIYfO2Mxvho4O9lVlmalzFQhVL43J4=" }, "breeze-grub": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/breeze-grub-6.1.5.tar.xz", - "hash": "sha256-ezzwtCaAG9dLvWuPDcSvN7E3UPl7817c006moU0gCQk=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/breeze-grub-6.2.1.tar.xz", + "hash": "sha256-wmHD53dQHd1lrLKiy90fksVBSKPFwyc0i+XxsPcJCXE=" }, "breeze-gtk": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/breeze-gtk-6.1.5.tar.xz", - "hash": "sha256-lgw98EdCPoXh8zvbYLcb3HSGuZQdideFMQ3r5QG9RtE=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/breeze-gtk-6.2.1.tar.xz", + "hash": "sha256-i1R41rcFaD8MLAdc6D4RN62X7WRNGjOdj5gsTcEj7w4=" }, "breeze-plymouth": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/breeze-plymouth-6.1.5.tar.xz", - "hash": "sha256-Z2H6s/bVdWhjWwfBwjRgqRaBLgSXk3IYAdd6xd+O1gs=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/breeze-plymouth-6.2.1.tar.xz", + "hash": "sha256-esFwowhZ1E2zT4+GOW8APyEJMd8WUgppYkFPsAXqzhI=" }, "discover": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/discover-6.1.5.tar.xz", - "hash": "sha256-biz1n6wst5JCDtbfZT+AMH1uM9bmrpwa8oJ6k7rjy40=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/discover-6.2.1.tar.xz", + "hash": "sha256-ce0t9IFEHvaeHVxvCZfwN22DqHFIUcbQFNEWS8jubZE=" }, "drkonqi": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/drkonqi-6.1.5.tar.xz", - "hash": "sha256-Dhsn5OjrUdEcO9SnyfA5my6qP6tr6H3fQNKL4N6ujb8=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/drkonqi-6.2.1.tar.xz", + "hash": "sha256-Xk260ZoKtwgFsR/tGO7bmhW7F1O8RESKkts8lpRWVVA=" }, "flatpak-kcm": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/flatpak-kcm-6.1.5.tar.xz", - "hash": "sha256-UI99mL0UEkIUdG8kSAT+3c0kWIyw63xYA5B7IlE9KQo=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/flatpak-kcm-6.2.1.tar.xz", + "hash": "sha256-yKHwSAEXPqTEZktkk/8GizkL1AL3GrKBIra75xz5WYc=" }, "kactivitymanagerd": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/kactivitymanagerd-6.1.5.tar.xz", - "hash": "sha256-P4r9onN4eALVzUa/dvjxRn7OHyHIO7qmUTQ1d1UjgQ8=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/kactivitymanagerd-6.2.1.tar.xz", + "hash": "sha256-vdggWWIqm6oB4Y4OS7JRoUyEG52mGjjlVoiGwwk8jM4=" }, "kde-cli-tools": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/kde-cli-tools-6.1.5.tar.xz", - "hash": "sha256-wPM2Bir4AIBFTKOahatgvKHseoVOhMCdSSgwsRB5AxM=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/kde-cli-tools-6.2.1.tar.xz", + "hash": "sha256-8Hc3ImgJg70jdR3nVOl9SmxLfP/I/OzFgPFHK4eRNik=" }, "kdecoration": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/kdecoration-6.1.5.tar.xz", - "hash": "sha256-POFs6mWdhj9465PVZ7+VKz9mRAvs1CSwbSBB/wZ53vc=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/kdecoration-6.2.1.tar.xz", + "hash": "sha256-k4ALPfgtDPf8IuTN99tnyJi7GUMXJR3FkzRL4ELpkIg=" }, "kde-gtk-config": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/kde-gtk-config-6.1.5.tar.xz", - "hash": "sha256-Yx5Z9SYZ3alA0gWU3FUAjC8ZLacF5sXb+m0lF1CHti4=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/kde-gtk-config-6.2.1.tar.xz", + "hash": "sha256-9WPUFglLK5N41LgDNt4N3tA4ddnqxx/4hDwQTLhn5ew=" }, "kdeplasma-addons": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/kdeplasma-addons-6.1.5.tar.xz", - "hash": "sha256-Nrb54cA+UupOXQQJoHhhF8gkcWYWny0KIh8g8a6riGM=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/kdeplasma-addons-6.2.1.tar.xz", + "hash": "sha256-3yAM0Gs+aMZjnX/JJ9OK4vp/n60MtHLfalpuEkqHs1o=" }, "kgamma": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/kgamma-6.1.5.tar.xz", - "hash": "sha256-L0Psa0q6wnJJsQFZTxnyIv5+WUcFT1JSwRqdnsIKtCw=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/kgamma-6.2.1.tar.xz", + "hash": "sha256-PPdzDPFg/WjbNyY++t62BX8fslrfGc2OXoZfS4ju4JE=" }, "kglobalacceld": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/kglobalacceld-6.1.5.tar.xz", - "hash": "sha256-3A4Kl34Lrhd4jnAwvsONZVrvYMzgG3QOSPVXmkcx06o=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/kglobalacceld-6.2.1.tar.xz", + "hash": "sha256-wTPtjyZ/jkDiAp/xh++zByDwPJ5fXk2ozYXaCgDJ7dQ=" }, "kinfocenter": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/kinfocenter-6.1.5.tar.xz", - "hash": "sha256-CXauQ3Vrbdv05w51DLF/Qi2r52BMXi+CSrTx4BYa5dA=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/kinfocenter-6.2.1.tar.xz", + "hash": "sha256-UEFi5sm6kfPRrwiY3r4rapw/UVv/tYkifnOZB7aAYOs=" }, "kmenuedit": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/kmenuedit-6.1.5.tar.xz", - "hash": "sha256-/LJ6g6VVT7VlRjO+0Iy2CJhlcuMPXkJBYHo1TsidZVY=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/kmenuedit-6.2.1.tar.xz", + "hash": "sha256-wRQpdz3j5Z6q5ZWNHHy+ul5o37oObguttYiPFaZSyRE=" }, "kpipewire": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/kpipewire-6.1.5.tar.xz", - "hash": "sha256-JbMs/K/zUvDErNpXRq3/0uOyi1/wZIUhvehijKcUWkk=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/kpipewire-6.2.1.tar.xz", + "hash": "sha256-FnXi8G4gZhpdd0AFM9VSoyotbcwtntoCvKjlrbvCQ8g=" }, "krdp": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/krdp-6.1.5.tar.xz", - "hash": "sha256-qR3iyOi2/oUu3u5QtyLyq+vDs4R31++TX55re3znxrc=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/krdp-6.2.1.tar.xz", + "hash": "sha256-kPS/BBkVS00WEyy5b0G7DUk+U/klPkIZyM5taSW2I48=" }, "kscreen": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/kscreen-6.1.5.tar.xz", - "hash": "sha256-QWap9tWI7v3BntnZqeD4Jlq0mZviSLoRtI7jU+y8UR8=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/kscreen-6.2.1.tar.xz", + "hash": "sha256-PjKubDeHF4qJgxjALVrqmzQe6M4pIgc/6s9Nq+P0lM8=" }, "kscreenlocker": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/kscreenlocker-6.1.5.tar.xz", - "hash": "sha256-oOqDVBIqKOCsxuxgSnZY/uWwDxJcwJ6nWMm5G/PH8Pw=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/kscreenlocker-6.2.1.tar.xz", + "hash": "sha256-w6FzDNdeyPh+2kybWy9JHVnZiz0GyT98NyHupWkLYBk=" }, "ksshaskpass": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/ksshaskpass-6.1.5.tar.xz", - "hash": "sha256-NN1y8r94XdS2yYlEvU5ETb60a7Xy10xblbrtghxnGPE=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/ksshaskpass-6.2.1.tar.xz", + "hash": "sha256-ucB2+ryf+87xcu7ChMGovek7u7YNfefqSqyLxS4ay3I=" }, "ksystemstats": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/ksystemstats-6.1.5.tar.xz", - "hash": "sha256-hCW7nwdiNNFn6vaJt09ynioFYcNnRz6KhPq0pMOcaJM=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/ksystemstats-6.2.1.tar.xz", + "hash": "sha256-wxmKliFrSOh1Tl38cKj2da97Nd7z/gY/cnBEg51FoHM=" }, "kwallet-pam": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/kwallet-pam-6.1.5.tar.xz", - "hash": "sha256-swysTx4mY3dlR5U6YhCTcdX5tDRKjfkgeILx4d3koD8=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/kwallet-pam-6.2.1.tar.xz", + "hash": "sha256-R6vvzbF5B1qA63EMeWzb4ts0MvBb3jbvgallnBK+jzI=" }, "kwayland": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/kwayland-6.1.5.tar.xz", - "hash": "sha256-Z6PhVzC9o2Bz8wQivcIa7ie/IF++7BorgCDJ0al/jak=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/kwayland-6.2.1.tar.xz", + "hash": "sha256-veB00J2Wx0SEFmR8RP8+1HulVGA1OzLAD1UCjqjqDHw=" }, "kwayland-integration": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/kwayland-integration-6.1.5.tar.xz", - "hash": "sha256-I8YQID8b+qzMgnGOYK2qMz4x3UKDfU6E3/DPgOYUxog=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/kwayland-integration-6.2.1.tar.xz", + "hash": "sha256-/L3qETy8AqWynHrVApoLxwXctp+3TTojZDfUebwrV2c=" }, "kwin": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/kwin-6.1.5.tar.xz", - "hash": "sha256-ugqs4yMZW1itv94U7HTN1MKMIR14pWfESvcPM23Ks/c=" + "version": "6.2.1.1", + "url": "mirror://kde/stable/plasma/6.2.1/kwin-6.2.1.1.tar.xz", + "hash": "sha256-Qqc6q2yExt/NdhNoajmkkDIMadbVk6PEwkV4xioZIeg=" }, "kwrited": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/kwrited-6.1.5.tar.xz", - "hash": "sha256-oFnd8o7Oi0OYml6ofkR/o/Ajea7HmKHefLWaWqoqlhg=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/kwrited-6.2.1.tar.xz", + "hash": "sha256-0jTymV4c3aokfGkZO9qqrdfQYJLX8E8aDyzmELHb2/8=" }, "layer-shell-qt": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/layer-shell-qt-6.1.5.tar.xz", - "hash": "sha256-0Ry1X3XW64kE5IzQloVwQ6bamQCxw0t6xXFubkbw7TI=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/layer-shell-qt-6.2.1.tar.xz", + "hash": "sha256-EehtMH+Z6aeGl/TQtLEVKOSgliKCZdxm5Y8pnmw5eUM=" }, "libkscreen": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/libkscreen-6.1.5.tar.xz", - "hash": "sha256-WPUjqd/gely5dY1g9qfxyfQBICifg1UVpOLY1tbaTGU=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/libkscreen-6.2.1.tar.xz", + "hash": "sha256-DPkTb8p5t2fUzaWnBOLaBQdPBfKb/+FUr8IOYz2vLtQ=" }, "libksysguard": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/libksysguard-6.1.5.tar.xz", - "hash": "sha256-rQH6LGZPgs4kt9YXvBmUIGN2Nz+b1krjE7Mof9WKArk=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/libksysguard-6.2.1.tar.xz", + "hash": "sha256-I0yghbqbFGep148OJ79Zwh4AZintLZ43Mvhy/iLhKYM=" }, "libplasma": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/libplasma-6.1.5.tar.xz", - "hash": "sha256-d8K4Ot5pmawOUmmk6HKEQ6fWGUbWjQu0EQarQpKnnMk=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/libplasma-6.2.1.tar.xz", + "hash": "sha256-i6+pBIt0Pe7PWVpjqQeo5vtL1OnLF6rDNgaPp7l7CpM=" }, "milou": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/milou-6.1.5.tar.xz", - "hash": "sha256-QFFIoS7n/siTiPmbxUhVB1SMhRLeIroDAlFURCc1OQo=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/milou-6.2.1.tar.xz", + "hash": "sha256-cVwQrD0e9MbNYwrrlqWsIfkSA5qbLb5/GrzzeT0PjNI=" }, "ocean-sound-theme": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/ocean-sound-theme-6.1.5.tar.xz", - "hash": "sha256-ro+lnDo8PTekOOOrXtEcwAjqBFAZU3cL2euTJwBRKTU=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/ocean-sound-theme-6.2.1.tar.xz", + "hash": "sha256-VBNKaaOPUzHM41ZwBPPGfU133ows7qc1llRxUxQvvNw=" }, "oxygen": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/oxygen-6.1.5.tar.xz", - "hash": "sha256-B0HWside8AtZPvXjHKJniZ1zvD8W0TLJKkLnZ+wCVzU=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/oxygen-6.2.1.tar.xz", + "hash": "sha256-bGvSFwQGLi6HsBHaM/G3Tn8JSWdfSHv8KQ0aMmY0Cyo=" }, "oxygen-sounds": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/oxygen-sounds-6.1.5.tar.xz", - "hash": "sha256-ZpCkniLRWmpogrh/clqdo7xJYXe4mjlSsBVVqYu0RqU=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/oxygen-sounds-6.2.1.tar.xz", + "hash": "sha256-DiDGF8hVzS/ciZBepYZfR5cz7QSWfNkPmIjp4ahGrak=" }, "plasma5support": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/plasma5support-6.1.5.tar.xz", - "hash": "sha256-BWNYUiLFMz4iee/agpw2oTl0HJ4M86024+gJaEDAF9E=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/plasma5support-6.2.1.tar.xz", + "hash": "sha256-TqYzU5ac5euPpfvNPwN4dBqVF+uBp4HNWPYRUztWTns=" }, "plasma-activities": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/plasma-activities-6.1.5.tar.xz", - "hash": "sha256-s1P7564w9qBO9PgdPgJQZUoPmFmp70MhTInHi5JOKEs=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/plasma-activities-6.2.1.tar.xz", + "hash": "sha256-nzufWkr0aqoK7o55Bd8gdHtGyDjWme+niHbD6g0hRtI=" }, "plasma-activities-stats": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/plasma-activities-stats-6.1.5.tar.xz", - "hash": "sha256-JiBQpTiU3gbxND+x1QtuAPeXo+NJMW7d/re1Fs3cDd8=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/plasma-activities-stats-6.2.1.tar.xz", + "hash": "sha256-cGzkdptOthQLCXVcaIp9y2QtF5G0ceK2JZNciTxKhqM=" }, "plasma-browser-integration": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/plasma-browser-integration-6.1.5.tar.xz", - "hash": "sha256-Q2JcNeo57uvtesyXWazGCHGrwdK4jcnnuQivpMAJiqo=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/plasma-browser-integration-6.2.1.tar.xz", + "hash": "sha256-B1j2IJ2myCSpl47vlCfRvz2WGHsfz8MZqMBggr5x7So=" }, "plasma-desktop": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/plasma-desktop-6.1.5.tar.xz", - "hash": "sha256-2eI2yamjMti3tO3eRMZdCw7Djqda3Fu/ohpsTH9CYcI=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/plasma-desktop-6.2.1.tar.xz", + "hash": "sha256-HU/oDE89jrdlZBKV2yjrkXOwdvBbgGZhfHumOig7v7c=" + }, + "plasma-dialer": { + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/plasma-dialer-6.2.1.tar.xz", + "hash": "sha256-ujia8MeIN6TVvcJx8Vm3s5GTnTV4ezhTEu5eVSh2YKE=" }, "plasma-disks": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/plasma-disks-6.1.5.tar.xz", - "hash": "sha256-XXZpwBnovmaLmF1z1/D9sxWYSpCsewzx45ibgJRubEo=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/plasma-disks-6.2.1.tar.xz", + "hash": "sha256-wDvWjl42z5Pakn+S3GDLRLh0qQbJPSoWASVjNTD/wQo=" }, "plasma-firewall": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/plasma-firewall-6.1.5.tar.xz", - "hash": "sha256-TtMb3Y8CEScpR1GM8uvqVHu8RLfPxvbz50fsyRi0r0I=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/plasma-firewall-6.2.1.tar.xz", + "hash": "sha256-riGK+t5sH8/stNSpeBH7ESWtVXtXopimeZ/GPerooG0=" }, "plasma-integration": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/plasma-integration-6.1.5.tar.xz", - "hash": "sha256-FatL93CRJOxP54QiggkByO+3+7kiRVdr5XyEdIKl7Js=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/plasma-integration-6.2.1.tar.xz", + "hash": "sha256-pOorneCR1C/896p3jDvirc68V7gqH142EG8DberdM+k=" }, "plasma-mobile": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/plasma-mobile-6.1.5.tar.xz", - "hash": "sha256-z1vUSN34Lfw6Zh4I6va0al5wa+yzDuwYfppXTokILa0=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/plasma-mobile-6.2.1.tar.xz", + "hash": "sha256-LjH5TzwBDwdgZjBVapOZt8bNMjpnq1ELJZov+udCvyQ=" }, "plasma-nano": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/plasma-nano-6.1.5.tar.xz", - "hash": "sha256-weZFmXGZ/l4kn7JKA4kkhlcL3kgVPVLUkDQ58wlLosY=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/plasma-nano-6.2.1.tar.xz", + "hash": "sha256-MK/GCxMpTCxzVvo60paZSrkmoIbomFHHA8jq/fU5ZN0=" }, "plasma-nm": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/plasma-nm-6.1.5.tar.xz", - "hash": "sha256-ywTdrwDXKOoLS10QizOJ1GLOUHhyb4tlXzjeMw7rIfU=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/plasma-nm-6.2.1.tar.xz", + "hash": "sha256-2XUnnwYRUQ3YAl407uJBnnx37poD9+l7tW2t5po+hyg=" }, "plasma-pa": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/plasma-pa-6.1.5.tar.xz", - "hash": "sha256-ckwFkdvr3l+WxBYxbJAOiPSmbXSJBe0cp05hUjV6dZE=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/plasma-pa-6.2.1.tar.xz", + "hash": "sha256-9k5vtxJClgia3YnWz0P3YWWFTNvNwiz/MbAsxoBugu0=" }, "plasma-sdk": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/plasma-sdk-6.1.5.tar.xz", - "hash": "sha256-jQ1OheR9KCSblR88mX9ghVoQyt7Ze+o0FAc5flUbjEY=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/plasma-sdk-6.2.1.tar.xz", + "hash": "sha256-+0RVKwsk5fGlA7J8gIQ6cW+6+sxqwMjM44VT8V9wkxw=" }, "plasma-systemmonitor": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/plasma-systemmonitor-6.1.5.tar.xz", - "hash": "sha256-C17szwR1FiWfcgXBQ4FC1KglLq3gC7hhtm1IMbsDpwQ=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/plasma-systemmonitor-6.2.1.tar.xz", + "hash": "sha256-bte/HWDba4Kcxz2bZua6PDnopOqsxnWP+/FF8uVkqZo=" }, "plasma-thunderbolt": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/plasma-thunderbolt-6.1.5.tar.xz", - "hash": "sha256-lAKt8+6u1MXvynGXVbWfLShk2prV/YHSKzqPX9bjrmA=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/plasma-thunderbolt-6.2.1.tar.xz", + "hash": "sha256-rFT3T7wBz77WWTQT6Pat29QgYz6ZGnKa9zjlpTR9QdU=" }, "plasma-vault": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/plasma-vault-6.1.5.tar.xz", - "hash": "sha256-ULE1v9sVmUd0QSJ4hwn4kSp2Ew0pIOqXdc5AL3p9xAQ=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/plasma-vault-6.2.1.tar.xz", + "hash": "sha256-eXYlKEZcvY468Pt1/aGE3G3V0J32C0hwECf6LO7JaI8=" }, "plasma-welcome": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/plasma-welcome-6.1.5.tar.xz", - "hash": "sha256-Euzp59YcPsaiP+k1dmdBbiaAKrr9xp8kXMPZagXvnZY=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/plasma-welcome-6.2.1.tar.xz", + "hash": "sha256-oKvYKyCe27g7Qx+GN2R4nGtS4WoXp3fA+Oz0rtWRFPw=" }, "plasma-workspace": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/plasma-workspace-6.1.5.tar.xz", - "hash": "sha256-wp4Vo+1CRG+Ze34WlYZPhev/CE4uzlgckUoNio4mWuc=" + "version": "6.2.1.1", + "url": "mirror://kde/stable/plasma/6.2.1/plasma-workspace-6.2.1.1.tar.xz", + "hash": "sha256-9tzQxRlttLYRsUPQUNwNYqMFxIlO/sEFzRz+jNnQ1QY=" }, "plasma-workspace-wallpapers": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/plasma-workspace-wallpapers-6.1.5.tar.xz", - "hash": "sha256-qOpCuZslRm1S0/5Vcsn7w4cJvxNwVEiOk3+HDzNU7gI=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/plasma-workspace-wallpapers-6.2.1.tar.xz", + "hash": "sha256-XMbV/NJl6uAoWzqbfPoarLYhmr6PcWVqKCTNPuPk8iE=" }, "plymouth-kcm": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/plymouth-kcm-6.1.5.tar.xz", - "hash": "sha256-Bz4D+KhROOBdiGcqXB4GIjjjSz3t5BGPKRHCAMBVWHU=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/plymouth-kcm-6.2.1.tar.xz", + "hash": "sha256-FZ7i2PFpxiB67lyPcFrelSEg6CRq74Ir9v5lFn/HBhE=" }, "polkit-kde-agent-1": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/polkit-kde-agent-1-6.1.5.tar.xz", - "hash": "sha256-CWXl/61DKj5u6eNVQO/Le0CDIApIxp2R5SXAmke5IPY=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/polkit-kde-agent-1-6.2.1.tar.xz", + "hash": "sha256-lwPpP9tpu9qVNBjXSN7b8loWr9EW/FCZ6Kaht+QQEsc=" }, "powerdevil": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/powerdevil-6.1.5.tar.xz", - "hash": "sha256-BQ4cb88H2izXv+IqYYqpFQS7KwC9MapoEhuQPN6dhF0=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/powerdevil-6.2.1.tar.xz", + "hash": "sha256-W/oGj6MfEYeE5oHrl7nEn1qANMBiiwmcAFL9+xKcPmU=" }, "print-manager": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/print-manager-6.1.5.tar.xz", - "hash": "sha256-pJRE4WoHlZUxU2UlF8ZlcamYujjc2IYWa4gjHpbIzhI=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/print-manager-6.2.1.tar.xz", + "hash": "sha256-hQCsuZ1WSvNNT34FhZy7/+kWQcPXifJ4lAKRyCgMc88=" }, "qqc2-breeze-style": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/qqc2-breeze-style-6.1.5.tar.xz", - "hash": "sha256-a0tsDwiy7OO12hyJ3mzhBiHY4mt/q+2/YBA6XyyK+EU=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/qqc2-breeze-style-6.2.1.tar.xz", + "hash": "sha256-dkvHgbyPufm5PPoANCQcdv/5TbHI9ODrLsZUJQKoAls=" }, "sddm-kcm": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/sddm-kcm-6.1.5.tar.xz", - "hash": "sha256-AJI1F003IHnuOq31HgvX2ho4LRhSrmWwuWcQsiZpjpw=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/sddm-kcm-6.2.1.tar.xz", + "hash": "sha256-Wl0xBiI20kFl9FfriCn1RmydKu9KpqnzWG+CU9ZTv8E=" + }, + "spacebar": { + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/spacebar-6.2.1.tar.xz", + "hash": "sha256-5ueaEVK3AJNGCBWpg4e4jqgZNC5h85NT6V3/SiAen1U=" }, "systemsettings": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/systemsettings-6.1.5.tar.xz", - "hash": "sha256-B0J66nzuCzSrzD732q8D1ivfcgXKP5ccjT+u3AunT9c=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/systemsettings-6.2.1.tar.xz", + "hash": "sha256-HgBl2eAAbnAvMmA0bXFujeJkyVQ3Hcw+91qBJnOAdbM=" }, "wacomtablet": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/wacomtablet-6.1.5.tar.xz", - "hash": "sha256-IerMb3eC/fnKcYndlP2OyRAzAs9gWY91chY18N8MREo=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/wacomtablet-6.2.1.tar.xz", + "hash": "sha256-1L0/lWFH0mocuOc5cbEk98FdpGaFOYdnPEJLLNCkJhA=" }, "xdg-desktop-portal-kde": { - "version": "6.1.5", - "url": "mirror://kde/stable/plasma/6.1.5/xdg-desktop-portal-kde-6.1.5.tar.xz", - "hash": "sha256-CdE8DAb93AgySdH1vpB+Jx6jnwH1d9N9JnQ7Ad9aaXg=" + "version": "6.2.1", + "url": "mirror://kde/stable/plasma/6.2.1/xdg-desktop-portal-kde-6.2.1.tar.xz", + "hash": "sha256-hDT9KRapOI2ePorKjysW0MrVJonsPmuboRY9XzVmP28=" } } \ 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 d23cc7175b..4d5bc93632 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.4.0"; + version = "1.5.0"; src = fetchurl { url = "mirror://kde/stable/kirigami-addons/kirigami-addons-${version}.tar.xz"; - hash = "sha256-VuPOtSBVtWAzIOoIsn02c9MqORqNWGRtmYIn2LUfCpM="; + hash = "sha256-+d/RkQIrYz6jNI+Ecw1xWKFZ3+SWaNugqem9Z4rETlQ="; }; extraBuildInputs = [ qtdeclarative ]; diff --git a/third_party/nixpkgs/pkgs/kde/misc/klevernotes/default.nix b/third_party/nixpkgs/pkgs/kde/misc/klevernotes/default.nix index 3998a5a940..ae66125fdd 100644 --- a/third_party/nixpkgs/pkgs/kde/misc/klevernotes/default.nix +++ b/third_party/nixpkgs/pkgs/kde/misc/klevernotes/default.nix @@ -7,11 +7,11 @@ }: mkKdeDerivation rec { pname = "klevernotes"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { url = "mirror://kde/stable/klevernotes/${version}/klevernotes-${version}.tar.xz"; - hash = "sha256-9nXOaa2/DyJO3nXGbnvPaYjXFrVoAgx52th67l5geOU="; + hash = "sha256-YkIBYlTvweSg4CMqj+sHoNyZJXuwpCAMNZUZUyH2dYE="; }; extraBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/kde/misc/mpvqt/default.nix b/third_party/nixpkgs/pkgs/kde/misc/mpvqt/default.nix index c7bd84f174..9c3940af46 100644 --- a/third_party/nixpkgs/pkgs/kde/misc/mpvqt/default.nix +++ b/third_party/nixpkgs/pkgs/kde/misc/mpvqt/default.nix @@ -7,14 +7,14 @@ }: mkKdeDerivation rec { pname = "mpvqt"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "libraries"; repo = "mpvqt"; rev = "v${version}"; - hash = "sha256-XHiCxH7dJxJamloM2SJbiFHDt8j4rVfv/M9PaBzvgM4="; + hash = "sha256-baVTyz3sXfQC7NEO2VoN0bhXpgkKjclwrFN/CLsuoC0="; }; extraBuildInputs = [ qtdeclarative ]; diff --git a/third_party/nixpkgs/pkgs/kde/misc/pulseaudio-qt/default.nix b/third_party/nixpkgs/pkgs/kde/misc/pulseaudio-qt/default.nix index 108824c87f..4b245616fe 100644 --- a/third_party/nixpkgs/pkgs/kde/misc/pulseaudio-qt/default.nix +++ b/third_party/nixpkgs/pkgs/kde/misc/pulseaudio-qt/default.nix @@ -7,11 +7,11 @@ }: mkKdeDerivation rec { pname = "pulseaudio-qt"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { url = "mirror://kde/stable/pulseaudio-qt/pulseaudio-qt-${version}.tar.xz"; - hash = "sha256-zY9RyHAAc9D9kNV4QIOs63PnK6mnBOYF4KZ5CUJqhSA="; + hash = "sha256-G+y62ss2qdakMaDJPNtCj49n83zy0jdoZ1mDMYwK3oQ="; }; extraNativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/kde/plasma/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/default.nix index 4610811b35..fb7846ed86 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/default.nix @@ -40,6 +40,7 @@ plasma-activities-stats = callPackage ./plasma-activities-stats { }; plasma-browser-integration = callPackage ./plasma-browser-integration { }; plasma-desktop = callPackage ./plasma-desktop { }; + plasma-dialer = callPackage ./plasma-dialer { }; plasma-disks = callPackage ./plasma-disks { }; plasma-firewall = callPackage ./plasma-firewall { }; plasma-integration = callPackage ./plasma-integration { }; @@ -61,6 +62,7 @@ print-manager = callPackage ./print-manager { }; qqc2-breeze-style = callPackage ./qqc2-breeze-style { }; sddm-kcm = callPackage ./sddm-kcm { }; + spacebar = callPackage ./spacebar { }; systemsettings = callPackage ./systemsettings { }; wacomtablet = callPackage ./wacomtablet { }; xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde { }; diff --git a/third_party/nixpkgs/pkgs/kde/plasma/discover/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/discover/default.nix index 89d3df6818..6bac065179 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/discover/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/discover/default.nix @@ -9,6 +9,12 @@ mkKdeDerivation { pname = "discover"; + patches = [ + # remove forced QML dependency check + # FIXME: fix the check in ECM instead + ./qml-deps.patch + ]; + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtwebview diff --git a/third_party/nixpkgs/pkgs/kde/plasma/discover/qml-deps.patch b/third_party/nixpkgs/pkgs/kde/plasma/discover/qml-deps.patch new file mode 100644 index 0000000000..3b5527a2cb --- /dev/null +++ b/third_party/nixpkgs/pkgs/kde/plasma/discover/qml-deps.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 04523c97d..945ba6a41 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -59,7 +59,7 @@ find_package(QCoro6 REQUIRED COMPONENTS Core) + + qcoro_enable_coroutines() + +-ecm_find_qmlmodule(org.kde.kitemmodels 1.0 REQUIRED) ++ecm_find_qmlmodule(org.kde.kitemmodels 1.0) + + list(APPEND CMAKE_AUTOMOC_MACRO_NAMES "DISCOVER_BACKEND_PLUGIN") + diff --git a/third_party/nixpkgs/pkgs/kde/plasma/drkonqi/gdb-path.patch b/third_party/nixpkgs/pkgs/kde/plasma/drkonqi/gdb-path.patch index 617b5ed017..c4bf303e7e 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/drkonqi/gdb-path.patch +++ b/third_party/nixpkgs/pkgs/kde/plasma/drkonqi/gdb-path.patch @@ -1,28 +1,44 @@ -diff --git a/src/data/debuggers/internal/gdbrc b/src/data/debuggers/internal/gdbrc -index 0d163d43..8e2f85f1 100644 ---- a/src/data/debuggers/internal/gdbrc -+++ b/src/data/debuggers/internal/gdbrc -@@ -73,17 +73,18 @@ Name[wa]=gdb - Name[x-test]=xxgdbxx - Name[zh_CN]=gdb - Name[zh_TW]=gdb --TryExec=gdb -+TryExec=@gdb@ -+CodeName=gdb - Backends=KCrash|coredump-core +diff --git a/src/debugger.cpp b/src/debugger.cpp +index 946bdd12..afb69e35 100644 +--- a/src/debugger.cpp ++++ b/src/debugger.cpp +@@ -36,15 +36,15 @@ QList Debugger::availableInternalDebuggers(const QString &backend) + result.push_back(std::make_shared( + Data{.displayName = i18nc("@label the debugger called GDB", "GDB"), + .codeName = u"gdb"_s, +- .tryExec = u"gdb"_s, ++ .tryExec = u"@gdb@"_s, + .backendData = +- BackendData{.command = u"gdb -nw -n -batch -x %preamblefile -x %tempfile -p %pid %execpath"_s, ++ BackendData{.command = u"@gdb@ -nw -n -batch -x %preamblefile -x %tempfile -p %pid %execpath"_s, + .supportsCommandWithSymbolResolution = true, + .commandWithSymbolResolution = +- u"gdb -nw -n -batch --init-eval-command='set debuginfod enabled on' -x %preamblefile -x %tempfile -p %pid %execpath"_s, ++ u"@gdb@ -nw -n -batch --init-eval-command='set debuginfod enabled on' -x %preamblefile -x %tempfile -p %pid %execpath"_s, + .backtraceBatchCommands = u"thread\nthread apply all bt"_s, + .preambleCommands = expandCommand( +- u"gdb"_s, ++ u"@gdb@"_s, + u"set width 200\nset backtrace limit 128\nsource %drkonqi_datadir/python/gdb_preamble/preamble.py\npy print_preamble()"_s), + .execInputFile = {}}})); - [KCrash] --Exec=gdb -nw -n -batch -x %preamblefile -x %tempfile -p %pid %execpath --ExecWithSymbolResolution=gdb -nw -n -batch --init-eval-command='set debuginfod enabled on' -x %preamblefile -x %tempfile -p %pid %execpath -+Exec=@gdb@ -nw -n -batch -x %preamblefile -x %tempfile -p %pid %execpath -+ExecWithSymbolResolution=@gdb@ -nw -n -batch --init-eval-command='set debuginfod enabled on' -x %preamblefile -x %tempfile -p %pid %execpath - PreambleCommands=set width 200\nset backtrace limit 128\nsource %drkonqi_datadir/python/gdb_preamble/preamble.py\npy print_preamble() - BatchCommands=thread\nthread apply all bt - - [coredump-core] --Exec=gdb --nw --nx --batch --command=%preamblefile --command=%tempfile --core=%corefile %execpath --ExecWithSymbolResolution=gdb --nw --nx --batch --init-eval-command='set debuginfod enabled on' --command=%preamblefile --command=%tempfile --core=%corefile %execpath -+Exec=@gdb@ --nw --nx --batch --command=%preamblefile --command=%tempfile --core=%corefile %execpath -+ExecWithSymbolResolution=@gdb@ --nw --nx --batch --init-eval-command='set debuginfod enabled on' --command=%preamblefile --command=%tempfile --core=%corefile %execpath - PreambleCommands=set width 200\nset backtrace limit 128\nsource %drkonqi_datadir/python/gdb_preamble/preamble.py\npy print_preamble() - BatchCommands=thread\nthread apply all bt +@@ -63,15 +63,15 @@ QList Debugger::availableInternalDebuggers(const QString &backend) + Data{ + .displayName = i18nc("@label the debugger called GDB", "GDB"), + .codeName = u"gdb"_s, +- .tryExec = u"gdb"_s, ++ .tryExec = u"@gdb@"_s, + .backendData = BackendData{ +- .command = u"gdb --nw --nx --batch --command=%preamblefile --command=%tempfile --core=%corefile %execpath"_s, ++ .command = u"@gdb@ --nw --nx --batch --command=%preamblefile --command=%tempfile --core=%corefile %execpath"_s, + .supportsCommandWithSymbolResolution = true, + .commandWithSymbolResolution = +- u"gdb --nw --nx --batch --init-eval-command='set debuginfod enabled on' --command=%preamblefile --command=%tempfile --core=%corefile %execpath"_s, ++ u"@gdb@ --nw --nx --batch --init-eval-command='set debuginfod enabled on' --command=%preamblefile --command=%tempfile --core=%corefile %execpath"_s, + .backtraceBatchCommands = u"thread\nthread apply all bt"_s, + .preambleCommands = expandCommand( +- u"gdb"_s, ++ u"@gdb@"_s, + u"set width 200\nset backtrace limit 128\nsource %drkonqi_datadir/python/gdb_preamble/preamble.py\npy print_preamble()"_s), + .execInputFile = {}}})); + } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/kwin/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/kwin/default.nix index 85679de861..306498d07e 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/kwin/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/kwin/default.nix @@ -9,11 +9,11 @@ libinput, xorg, xwayland, + libcanberra, libdisplay-info, libei, mesa, lcms2, - libcap, pipewire, krunner, python3, @@ -56,7 +56,7 @@ mkKdeDerivation { mesa # libgbm lcms2 - libcap + libcanberra libdisplay-info libei libinput diff --git a/third_party/nixpkgs/pkgs/kde/plasma/plasma-dialer/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/plasma-dialer/default.nix new file mode 100644 index 0000000000..ca5a7cc221 --- /dev/null +++ b/third_party/nixpkgs/pkgs/kde/plasma/plasma-dialer/default.nix @@ -0,0 +1,23 @@ +{ + mkKdeDerivation, + pkg-config, + qtwayland, + callaudiod, + libphonenumber, + protobuf, +}: +mkKdeDerivation { + pname = "plasma-dialer"; + + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtwayland + callaudiod + libphonenumber + protobuf + ]; + + extraCmakeFlags = [ + "-DQtWaylandScanner_EXECUTABLE=${qtwayland}/libexec/qtwaylandscanner" + ]; +} diff --git a/third_party/nixpkgs/pkgs/kde/plasma/plasma-workspace/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/plasma-workspace/default.nix index 2bb51422b0..2dd596efff 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/plasma-workspace/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/plasma-workspace/default.nix @@ -2,11 +2,13 @@ lib, mkKdeDerivation, substituteAll, + dbus, fontconfig, xorg, lsof, pkg-config, spirv-tools, + qtpositioning, qtsvg, qtwayland, libcanberra, @@ -22,6 +24,7 @@ mkKdeDerivation { patches = [ (substituteAll { src = ./dependency-paths.patch; + dbus-send = lib.getExe' dbus "dbus-send"; fc-match = lib.getExe' fontconfig "fc-match"; lsof = lib.getExe lsof; qdbus = lib.getExe' qttools "qdbus"; @@ -41,6 +44,7 @@ mkKdeDerivation { spirv-tools ]; extraBuildInputs = [ + qtpositioning qtsvg qtwayland @@ -61,7 +65,7 @@ mkKdeDerivation { # Hardcoded as QStrings, which are UTF-16 so Nix can't pick these up automatically postFixup = '' mkdir -p $out/nix-support - echo "${lsof} ${xorg.xmessage} ${xorg.xsetroot}" > $out/nix-support/depends + echo "${lsof} ${xorg.xmessage} ${xorg.xrdb} ${xorg.xsetroot}" > $out/nix-support/depends ''; passthru.providedSessions = [ diff --git a/third_party/nixpkgs/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch b/third_party/nixpkgs/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch index e54aaa131b..d84e6dda72 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch +++ b/third_party/nixpkgs/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch @@ -1,8 +1,8 @@ -diff --git a/applets/devicenotifier/plugin/ksolidnotify.cpp b/applets/devicenotifier/plugin/ksolidnotify.cpp -index bcbb58a034..be2570ce97 100644 ---- a/applets/devicenotifier/plugin/ksolidnotify.cpp -+++ b/applets/devicenotifier/plugin/ksolidnotify.cpp -@@ -169,7 +169,7 @@ void KSolidNotify::queryBlockingApps(const QString &devicePath) +diff --git a/applets/devicenotifier/plugin/deviceerrormonitor_p.cpp b/applets/devicenotifier/plugin/deviceerrormonitor_p.cpp +index 8c2bc13a74..7b3cd72363 100644 +--- a/applets/devicenotifier/plugin/deviceerrormonitor_p.cpp ++++ b/applets/devicenotifier/plugin/deviceerrormonitor_p.cpp +@@ -155,7 +155,7 @@ void DeviceErrorMonitor::queryBlockingApps(const QString &devicePath) Q_EMIT blockingAppsReady(blockApps); p->deleteLater(); }); @@ -25,37 +25,37 @@ index e27e21a7bd..abbf7f32e1 100644 p.write(input); p.closeWriteChannel(); diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp -index 92d8fadd44..2a973d76ef 100644 +index a75f313880..a1e649c1f6 100644 --- a/kcms/fonts/fonts.cpp +++ b/kcms/fonts/fonts.cpp -@@ -135,7 +135,7 @@ void KFonts::save() +@@ -137,7 +137,7 @@ void KFonts::save() if (fontsAASettings()->forceFontDPI() == 0 && forceFontDPIChanged && KWindowSystem::isPlatformX11()) { QProcess proc; proc.setProcessChannelMode(QProcess::ForwardedChannels); -- proc.start("xrdb", -+ proc.start("@xrdb@", - QStringList() << "-quiet" - << "-remove" - << "-nocpp"); +- proc.start(u"xrdb"_s, QStringList{u"-quiet"_s, u"-remove"_s, u"-nocpp"_s}); ++ proc.start(u"@xrdb@"_s, QStringList{u"-quiet"_s, u"-remove"_s, u"-nocpp"_s}); + if (proc.waitForStarted()) { + proc.write("Xft.dpi\n"); + proc.closeWriteChannel(); diff --git a/kcms/kfontinst/kcmfontinst/FcQuery.cpp b/kcms/kfontinst/kcmfontinst/FcQuery.cpp -index 771c790c74..1be64b0527 100644 +index f5034455c9..8ea57813a1 100644 --- a/kcms/kfontinst/kcmfontinst/FcQuery.cpp +++ b/kcms/kfontinst/kcmfontinst/FcQuery.cpp -@@ -44,7 +44,7 @@ void CFcQuery::run(const QString &query) +@@ -46,7 +46,7 @@ void CFcQuery::run(const QString &query) connect(m_proc, SIGNAL(finished(int, QProcess::ExitStatus)), SLOT(procExited())); connect(m_proc, &QProcess::readyReadStandardOutput, this, &CFcQuery::data); -- m_proc->start("fc-match", args); -+ m_proc->start("@fc-match@", args); +- m_proc->start(u"fc-match"_s, args); ++ m_proc->start(u"@fc-match@"_s, args); } void CFcQuery::procExited() diff --git a/kcms/krdb/krdb.cpp b/kcms/krdb/krdb.cpp -index 8fdd99f9ed..1bd7d552a5 100644 +index 39bcb7317d..b0363afde9 100644 --- a/kcms/krdb/krdb.cpp +++ b/kcms/krdb/krdb.cpp @@ -423,7 +423,7 @@ void runRdb(unsigned int flags) - contents += "Xft.dpi: " + QString::number(dpi) + '\n'; + contents += "Xft.dpi: "_L1 + QString::number(dpi) + u'\n'; else { KProcess queryProc; - queryProc << QStringLiteral("xrdb") << QStringLiteral("-query"); @@ -72,17 +72,15 @@ index 8fdd99f9ed..1bd7d552a5 100644 loadProc.start(); if (loadProc.waitForStarted()) { loadProc.write(db); -@@ -461,16 +461,16 @@ void runRdb(unsigned int flags) +@@ -461,14 +461,14 @@ void runRdb(unsigned int flags) KProcess proc; #ifndef NDEBUG - proc << QStringLiteral("xrdb") << QStringLiteral("-merge") << tmpFile.fileName(); + proc << QStringLiteral("@xrdb@") << QStringLiteral("-merge") << tmpFile.fileName(); #else -- proc << "xrdb" -+ proc << "@xrdb@" - << "-quiet" - << "-merge" << tmpFile.fileName(); +- proc << u"xrdb"_s << u"-quiet"_s << u"-merge"_s << tmpFile.fileName(); ++ proc << u"@xrdb@"_s << u"-quiet"_s << u"-merge"_s << tmpFile.fileName(); #endif proc.execute(); @@ -115,7 +113,7 @@ index 7218628ce9..9126475ea4 100644 +ExecStart=@qdbus@ org.kde.kcminit /kcminit org.kde.KCMInit.runPhase1 Slice=session.slice diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp -index 0bd4511189..602b7e9eb0 100644 +index 4d31c6f408..17418b1ff7 100644 --- a/startkde/startplasma.cpp +++ b/startkde/startplasma.cpp @@ -57,7 +57,7 @@ void sigtermHandler(int signalNumber) @@ -127,7 +125,7 @@ index 0bd4511189..602b7e9eb0 100644 } QStringList allServices(const QLatin1String &prefix) -@@ -507,7 +507,7 @@ QProcess *setupKSplash() +@@ -512,7 +512,7 @@ QProcess *setupKSplash() if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) { p = new QProcess; p->setProcessChannelMode(QProcess::ForwardedChannels); @@ -137,13 +135,13 @@ index 0bd4511189..602b7e9eb0 100644 } return p; diff --git a/startkde/systemd/plasma-ksplash-ready.service.in b/startkde/systemd/plasma-ksplash-ready.service.in -index 3f6744f378..c51266794d 100644 +index 1e903130a9..1d807a8526 100644 --- a/startkde/systemd/plasma-ksplash-ready.service.in +++ b/startkde/systemd/plasma-ksplash-ready.service.in @@ -6,5 +6,5 @@ PartOf=graphical-session.target [Service] Type=oneshot --ExecStart=-@QtBinariesDir@/qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage ready -+ExecStart=-@qdbus@ org.kde.KSplash /KSplash org.kde.KSplash.setStage ready +-ExecStart=dbus-send --session --reply-timeout=1 --type=method_call --dest=org.kde.KSplash /KSplash org.kde.KSplash.setStage string:ready ++ExecStart=@dbus-send@ --session --reply-timeout=1 --type=method_call --dest=org.kde.KSplash /KSplash org.kde.KSplash.setStage string:ready Slice=session.slice diff --git a/third_party/nixpkgs/pkgs/kde/plasma/powerdevil/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/powerdevil/default.nix index 3faa5c3841..8326dcaad0 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/powerdevil/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/powerdevil/default.nix @@ -1,11 +1,11 @@ { mkKdeDerivation, pkg-config, - libcap, + qtwayland, }: mkKdeDerivation { pname = "powerdevil"; extraNativeBuildInputs = [ pkg-config ]; - extraBuildInputs = [ libcap ]; + extraBuildInputs = [ qtwayland ]; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/spacebar/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/spacebar/default.nix new file mode 100644 index 0000000000..acccf9b90b --- /dev/null +++ b/third_party/nixpkgs/pkgs/kde/plasma/spacebar/default.nix @@ -0,0 +1,19 @@ +{ + mkKdeDerivation, + pkg-config, + c-ares, + curl, + libphonenumber, + protobuf, +}: +mkKdeDerivation { + pname = "spacebar"; + + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + c-ares + curl + libphonenumber + protobuf + ]; +} diff --git a/third_party/nixpkgs/pkgs/kde/third-party/krohnkite/default.nix b/third_party/nixpkgs/pkgs/kde/third-party/krohnkite/default.nix index 03b3e64adc..d9c85dd224 100644 --- a/third_party/nixpkgs/pkgs/kde/third-party/krohnkite/default.nix +++ b/third_party/nixpkgs/pkgs/kde/third-party/krohnkite/default.nix @@ -9,16 +9,16 @@ }: buildNpmPackage rec { pname = "krohnkite"; - version = "0.9.7"; + version = "0.9.8.2"; src = fetchFromGitHub { owner = "anametologin"; repo = "krohnkite"; rev = "refs/tags/${version}"; - hash = "sha256-8A3zW5tK8jK9fSxYx28b8uXGsvxEoUYybU0GaMD2LNw="; + hash = "sha256-chADfJ1zaufnwi4jHbEN1Oec3XFNw0YsZxLFhnY3T9w="; }; - npmDepsHash = "sha256-My1goFEoZW9kFA3zb8xKPxAPXm6bypyq+ajPM8zVOHQ="; + npmDepsHash = "sha256-3yE2gyyVkLn/dPDG9zDdkHAEb4/hqTJdyMXE5Y6Z5pM="; dontWrapQtApps = true; @@ -40,8 +40,8 @@ buildNpmPackage rec { runHook preInstall substituteInPlace Makefile --replace-fail '7z a -tzip' 'zip -r' - make krohnkite-${version}.kwinscript - kpackagetool6 --type=KWin/Script --install=krohnkite-${version}.kwinscript --packageroot=$out/share/kwin/scripts + make KWINPKG_FILE=krohnkite.kwinscript krohnkite.kwinscript + kpackagetool6 --type=KWin/Script --install=krohnkite.kwinscript --packageroot=$out/share/kwin/scripts runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/kde/third-party/krohnkite/package-lock.json b/third_party/nixpkgs/pkgs/kde/third-party/krohnkite/package-lock.json index 2ac91ccab8..91884ce5f4 100644 --- a/third_party/nixpkgs/pkgs/kde/third-party/krohnkite/package-lock.json +++ b/third_party/nixpkgs/pkgs/kde/third-party/krohnkite/package-lock.json @@ -18,6 +18,7 @@ "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -27,6 +28,7 @@ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -36,6 +38,7 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, + "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -51,6 +54,7 @@ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", "dev": true, + "license": "ISC", "dependencies": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -63,19 +67,22 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true + "dev": true, + "license": "Python-2.0" }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/binary-extensions": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" }, @@ -88,6 +95,7 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } @@ -97,6 +105,7 @@ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, + "license": "MIT", "dependencies": { "fill-range": "^7.1.1" }, @@ -108,13 +117,15 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/camelcase": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -127,6 +138,7 @@ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -143,6 +155,7 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -155,6 +168,7 @@ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", "dev": true, + "license": "MIT", "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", @@ -179,6 +193,7 @@ "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", "dev": true, + "license": "ISC", "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.0", @@ -190,6 +205,7 @@ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, + "license": "MIT", "dependencies": { "color-name": "~1.1.4" }, @@ -201,15 +217,17 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/debug": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", - "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", "dev": true, + "license": "MIT", "dependencies": { - "ms": "2.1.2" + "ms": "^2.1.3" }, "engines": { "node": ">=6.0" @@ -220,17 +238,12 @@ } } }, - "node_modules/debug/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, "node_modules/decamelize": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -243,6 +256,7 @@ "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=0.3.1" } @@ -251,13 +265,15 @@ "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/escalade": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", - "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -267,6 +283,7 @@ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -279,6 +296,7 @@ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, + "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -291,6 +309,7 @@ "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "dev": true, + "license": "MIT", "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" @@ -307,6 +326,7 @@ "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", "dev": true, + "license": "BSD-3-Clause", "bin": { "flat": "cli.js" } @@ -315,7 +335,8 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/fsevents": { "version": "2.3.3", @@ -323,6 +344,7 @@ "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, "hasInstallScript": true, + "license": "MIT", "optional": true, "os": [ "darwin" @@ -336,6 +358,7 @@ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true, + "license": "ISC", "engines": { "node": "6.* || 8.* || >= 10.*" } @@ -346,6 +369,7 @@ "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, + "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -365,6 +389,7 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, + "license": "ISC", "dependencies": { "is-glob": "^4.0.1" }, @@ -377,6 +402,7 @@ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -386,6 +412,7 @@ "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", "dev": true, + "license": "MIT", "bin": { "he": "bin/he" } @@ -396,6 +423,7 @@ "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", "dev": true, + "license": "ISC", "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -405,13 +433,15 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", "dev": true, + "license": "MIT", "dependencies": { "binary-extensions": "^2.0.0" }, @@ -424,6 +454,7 @@ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -433,6 +464,7 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -442,6 +474,7 @@ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, + "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" }, @@ -454,6 +487,7 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.12.0" } @@ -463,6 +497,7 @@ "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -472,6 +507,7 @@ "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -484,6 +520,7 @@ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, + "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -496,6 +533,7 @@ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "dev": true, + "license": "MIT", "dependencies": { "p-locate": "^5.0.0" }, @@ -511,6 +549,7 @@ "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", "dev": true, + "license": "MIT", "dependencies": { "chalk": "^4.1.0", "is-unicode-supported": "^0.1.0" @@ -527,6 +566,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -539,6 +579,7 @@ "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.7.3.tgz", "integrity": "sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==", "dev": true, + "license": "MIT", "dependencies": { "ansi-colors": "^4.1.3", "browser-stdout": "^1.3.1", @@ -573,13 +614,15 @@ "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -589,6 +632,7 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", "dev": true, + "license": "ISC", "dependencies": { "wrappy": "1" } @@ -598,6 +642,7 @@ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, + "license": "MIT", "dependencies": { "yocto-queue": "^0.1.0" }, @@ -613,6 +658,7 @@ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", "dev": true, + "license": "MIT", "dependencies": { "p-limit": "^3.0.2" }, @@ -628,6 +674,7 @@ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -637,6 +684,7 @@ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true, + "license": "MIT", "engines": { "node": ">=8.6" }, @@ -649,6 +697,7 @@ "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", "dev": true, + "license": "MIT", "dependencies": { "safe-buffer": "^5.1.0" } @@ -658,6 +707,7 @@ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", "dev": true, + "license": "MIT", "dependencies": { "picomatch": "^2.2.1" }, @@ -670,6 +720,7 @@ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -692,13 +743,15 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/serialize-javascript": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "randombytes": "^2.1.0" } @@ -708,6 +761,7 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, + "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -722,6 +776,7 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, + "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" }, @@ -734,6 +789,7 @@ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" }, @@ -746,6 +802,7 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -761,6 +818,7 @@ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, + "license": "MIT", "dependencies": { "is-number": "^7.0.0" }, @@ -769,10 +827,11 @@ } }, "node_modules/typescript": { - "version": "5.5.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", - "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", + "version": "5.6.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz", + "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==", "dev": true, + "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -785,13 +844,15 @@ "version": "6.5.1", "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz", "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==", - "dev": true + "dev": true, + "license": "Apache-2.0" }, "node_modules/wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -808,13 +869,15 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", "dev": true, + "license": "ISC", "engines": { "node": ">=10" } @@ -824,6 +887,7 @@ "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", "dev": true, + "license": "MIT", "dependencies": { "cliui": "^7.0.2", "escalade": "^3.1.1", @@ -842,6 +906,7 @@ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", "dev": true, + "license": "ISC", "engines": { "node": ">=10" } @@ -851,6 +916,7 @@ "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz", "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", "dev": true, + "license": "MIT", "dependencies": { "camelcase": "^6.0.0", "decamelize": "^4.0.0", @@ -866,6 +932,7 @@ "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, diff --git a/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix index d15c5d7cfc..4e213a0b4c 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.2.13"; + version = "1.2.18"; src = fetchurl { # To find the most recent version go to # https://support.epson.net/linux/Printer/LSB_distribution_pages/en/escpr2.php # and retreive the download link for source package for x86 CPU - url = "https://download3.ebz.epson.net/dsc/f/03/00/16/00/23/60c57d2774eea9b27d2c636f0c3615b8619291b3/epson-inkjet-printer-escpr2-1.2.13-1.src.rpm"; - sha256 = "sha256-yOZqeNrtC28OucY5HOT6OY6qqvLSGh1LTIXbIB7VNrY="; + url = "https://download3.ebz.epson.net/dsc/f/03/00/16/25/39/fcf17405f25e851f3ee0e5ed3ce97d09f22ecb41/epson-inkjet-printer-escpr2-1.2.18-1.src.rpm"; + sha256 = "sha256-cdCcZzi31jPGmMnlKtPCFVla0YWfrCTbXsXHSeB0Vk4="; }; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/misc/ghostscript/default.nix b/third_party/nixpkgs/pkgs/misc/ghostscript/default.nix index c5cb69bea4..c9557858a1 100644 --- a/third_party/nixpkgs/pkgs/misc/ghostscript/default.nix +++ b/third_party/nixpkgs/pkgs/misc/ghostscript/default.nix @@ -21,6 +21,7 @@ , bash , buildPackages , openjpeg +, fixDarwinDylibNames , cupsSupport ? config.ghostscript.cups or (!stdenv.hostPlatform.isDarwin) , cups , x11Support ? cupsSupport @@ -61,11 +62,11 @@ let in stdenv.mkDerivation rec { pname = "ghostscript${lib.optionalString x11Support "-with-X"}"; - version = "10.03.1"; + version = "10.04.0"; src = fetchurl { url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${lib.replaceStrings ["."] [""] version}/ghostscript-${version}.tar.xz"; - hash = "sha256-FXIS7clrjMxAlHXc4uSYM/tEJ/FQxFUlje2WMsEGq+4="; + hash = "sha256-Un7vC2zQTs8cjXoReWxppS00/+Nq/KhqQAcpovwByIc="; }; patches = [ @@ -82,7 +83,8 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config autoconf zlib ] - ++ lib.optional cupsSupport cups; + ++ lib.optional cupsSupport cups + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ zlib expat openssl @@ -136,17 +138,14 @@ stdenv.mkDerivation rec { mkdir -p $fonts/share/fonts cp -rv ${fonts}/* "$fonts/share/fonts/" ln -s "$fonts/share/fonts" "$out/share/ghostscript/fonts" - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - for file in $out/lib/*.dylib* ; do - install_name_tool -id "$file" $file - done ''; - # dynamic library name only contains maj.min, eg. '9.53' - dylib_version = lib.versions.majorMinor version; + # dynamic library name only contains major version number, eg. '10' + dylib_version = lib.versions.major version; preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' - install_name_tool -change libgs.dylib.$dylib_version $out/lib/libgs.dylib.$dylib_version $out/bin/gs - install_name_tool -change libgs.dylib.$dylib_version $out/lib/libgs.dylib.$dylib_version $out/bin/gsx + for file in $out/bin/{gs,gsc,gsx}; do + install_name_tool -change libgs.$dylib_version.dylib $out/lib/libgs.$dylib_version.dylib $file + done ''; # validate dynamic linkage diff --git a/third_party/nixpkgs/pkgs/misc/present/default.nix b/third_party/nixpkgs/pkgs/misc/present/default.nix index 77ca05b0fa..aa586aded1 100644 --- a/third_party/nixpkgs/pkgs/misc/present/default.nix +++ b/third_party/nixpkgs/pkgs/misc/present/default.nix @@ -1,5 +1,16 @@ { lib, python3Packages, fetchPypi }: +let + # https://github.com/NixOS/nixpkgs/issues/348788 + mistune_2 = python3Packages.mistune.overridePythonAttrs(oldAttrs: rec { + version = "2.0.5"; + src = fetchPypi { + inherit (oldAttrs) pname; + inherit version; + hash = "sha256-AkYRPLJJLbh1xr5Wl0p8iTMzvybNkokchfYxUc7gnTQ="; + }; + }); +in python3Packages.buildPythonPackage rec { pname = "present"; version = "0.6.0"; @@ -14,7 +25,7 @@ python3Packages.buildPythonPackage rec { pyyaml pyfiglet asciimatics - mistune + mistune_2 ]; pythonImportsCheck = [ "present" ]; diff --git a/third_party/nixpkgs/pkgs/misc/riscv-pk/default.nix b/third_party/nixpkgs/pkgs/misc/riscv-pk/default.nix index 66b7321c78..83ce454935 100644 --- a/third_party/nixpkgs/pkgs/misc/riscv-pk/default.nix +++ b/third_party/nixpkgs/pkgs/misc/riscv-pk/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, payload ? null }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "riscv-pk"; - version = "1.0.0"; + version = "1.0.0-unstable-2024-10-09"; src = fetchFromGitHub { owner = "riscv"; repo = "riscv-pk"; - rev = "v${version}"; - sha256 = "1cc0rz4q3a1zw8756b8yysw8lb5g4xbjajh5lvqbjix41hbdx6xz"; + rev = "abadfdc507d5a75b6272dc360e70a80a510c758a"; + sha256 = "sha256-02qcj0TAs7g4CSorWWbUzouS6mNthUOSdeocibw5g2A="; }; nativeBuildInputs = [ autoreconfHook ]; @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "all" ]; + # pk by default installs things in $out/$target_prefix/{bin,include,lib}, + # we want to remove the target prefix directory hierarchy postInstall = '' mv $out/* $out/.cleanup mv $out/.cleanup/* $out diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix index a75c725c0d..2f7038195b 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , autoreconfHook , wxGTK32 -, ffmpeg_7 +, ffmpeg , lua5_1 , curl , libpng @@ -34,7 +34,7 @@ stdenv.mkDerivation { buildInputs = [ wxGTK32 - ffmpeg_7 + ffmpeg lua5_1 curl libpng diff --git a/third_party/nixpkgs/pkgs/misc/seafile-shared/default.nix b/third_party/nixpkgs/pkgs/misc/seafile-shared/default.nix index e4852faeb4..dd4cafbfc8 100644 --- a/third_party/nixpkgs/pkgs/misc/seafile-shared/default.nix +++ b/third_party/nixpkgs/pkgs/misc/seafile-shared/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "seafile-shared"; - version = "9.0.7"; + version = "9.0.8"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; rev = "v${version}"; - sha256 = "sha256-Q2jqwuGhZpASfpLfgfuZKnOrALmctURj845QhxO3o5s="; + sha256 = "sha256-IpRCgPxYy1El4EEvVEfzAlbxP/osQUb7pCP3/BhkecU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix b/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix index d8da9f1016..9cb420ae18 100644 --- a/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix @@ -216,29 +216,29 @@ in rec { extrakto = mkTmuxPlugin { pluginName = "extrakto"; - version = "unstable-2021-04-04"; + version = "0-unstable-2024-08-25"; src = fetchFromGitHub { owner = "laktak"; repo = "extrakto"; - rev = "de8ac3e8a9fa887382649784ed8cae81f5757f77"; - sha256 = "0mkp9r6mipdm7408w7ls1vfn6i3hj19nmir2bvfcp12b69zlzc47"; + rev = "bf9e666f2a6a8172ebe99fff61b574ba740cffc2"; + sha256 = "sha256-kIhJKgo1BDTeFyAPa//f/TrhPfV9Rfk9y4qMhIpCydk="; }; nativeBuildInputs = [ pkgs.makeWrapper ]; + buildInputs = [ pkgs.python3 ]; postInstall = '' - for f in extrakto.sh open.sh tmux-extrakto.sh; do - wrapProgram $target/scripts/$f \ - --prefix PATH : ${with pkgs; lib.makeBinPath ( - [ pkgs.fzf pkgs.python3 pkgs.xclip ] - )} - done + patchShebangs extrakto.py extrakto_plugin.py + wrapProgram $target/scripts/open.sh \ + --prefix PATH : ${ with pkgs; lib.makeBinPath + [ fzf xclip wl-clipboard ] + } ''; meta = { homepage = "https://github.com/laktak/extrakto"; description = "Fuzzy find your text with fzf instead of selecting it by hand "; license = lib.licenses.mit; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ kidd ]; + maintainers = with lib.maintainers; [ kidd fnune ]; }; }; diff --git a/third_party/nixpkgs/pkgs/misc/uboot/default.nix b/third_party/nixpkgs/pkgs/misc/uboot/default.nix index 351c578858..1983157df1 100644 --- a/third_party/nixpkgs/pkgs/misc/uboot/default.nix +++ b/third_party/nixpkgs/pkgs/misc/uboot/default.nix @@ -28,10 +28,10 @@ }: let - defaultVersion = "2024.07"; + defaultVersion = "2024.10"; defaultSrc = fetchurl { url = "https://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; - hash = "sha256-9ZHamrkO89az0XN2bQ3f+QxO1zMGgIl0hhF985DYPI8="; + hash = "sha256-so2vSsF+QxVjYweL9RApdYQTf231D87ZsS3zT2GpL7A="; }; # Dependencies for the tools need to be included as either native or cross, @@ -212,6 +212,14 @@ in { filesToInstall = ["u-boot-with-spl.kwb"]; }; + ubootCM3588NAS = buildUBoot { + defconfig = "cm3588-nas-rk3588_defconfig"; + extraMeta.platforms = [ "aarch64-linux" ]; + BL31 = "${armTrustedFirmwareRK3588}/bl31.elf"; + ROCKCHIP_TPL = rkbin.TPL_RK3588; + filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" ]; + }; + ubootCubieboard2 = buildUBoot { defconfig = "Cubieboard2_defconfig"; extraMeta.platforms = ["armv7l-linux"]; @@ -442,6 +450,14 @@ in { filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; + ubootOrangePi3B = buildUBoot { + defconfig = "orangepi-3b-rk3566_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + ROCKCHIP_TPL = rkbin.TPL_RK3568; + BL31 = rkbin.BL31_RK3568; + filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" "u-boot-rockchip-spi.bin" ]; + }; + ubootPcduino3Nano = buildUBoot { defconfig = "Linksprite_pcDuino3_Nano_defconfig"; extraMeta.platforms = ["armv7l-linux"]; diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/freebsdSetupHook/setup-hook.sh b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/freebsdSetupHook/setup-hook.sh index 96a3d14c80..ac6e9c1222 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/freebsdSetupHook/setup-hook.sh +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/freebsdSetupHook/setup-hook.sh @@ -1,22 +1,22 @@ setFreeBSDSrcTop() { - makeFlags="SRCTOP=$BSDSRCDIR $makeFlags" + prependToVar makeFlags "SRCTOP=$BSDSRCDIR" } addFreeBSDMakeFlags() { - makeFlags="SBINDIR=${!outputBin}/bin $makeFlags" - makeFlags="LIBEXECDIR=${!outputLib}/libexec $makeFlags" - makeFlags="LIBDATADIR=${!outputLib}/data $makeFlags" - makeFlags="INCLUDEDIR=${!outputDev}/include $makeFlags" - makeFlags="CONFDIR=${!outputBin}/etc $makeFlags" - makeFlags="MANDIR=${!outputMan}/share/man/man $makeFlags" + prependToVar makeFlags "SBINDIR=${!outputBin}/bin" + prependToVar makeFlags "LIBEXECDIR=${!outputLib}/libexec" + prependToVar makeFlags "LIBDATADIR=${!outputLib}/data" + prependToVar makeFlags "INCLUDEDIR=${!outputDev}/include" + prependToVar makeFlags "CONFDIR=${!outputBin}/etc" + prependToVar makeFlags "MANDIR=${!outputMan}/share/man/man" if [ -n "$debug" ]; then - makeFlags="DEBUGFILEDIR=${debug}/lib/debug $makeFlags" + prependToVar makeFlags "DEBUGFILEDIR=${debug}/lib/debug" else - makeFlags="DEBUGFILEDIR=${out}/lib/debug $makeFlags" + prependToVar makeFlags "DEBUGFILEDIR=${out}/lib/debug" fi - echo $makeFlags + echoCmd 'FreeBSD makeFlags' "${makeFlags[@]}" } postUnpackHooks+=(setFreeBSDSrcTop) diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix index ad83b06502..f65f901f49 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix @@ -74,7 +74,7 @@ mkDerivation ( # Makefiles only invoke `$OBJCOPY -x/-X`, so cctools strip works here. "OBJCOPY=${cctools}/bin/strip" ]; - RENAME = "-D"; + env.RENAME = "-D"; passthru.tests = { netbsd-install = install; diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/setup-hook.sh b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/setup-hook.sh index 8c3742a765..d05461ad10 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/setup-hook.sh +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/setup-hook.sh @@ -1,6 +1,6 @@ addNetBSDMakeFlags() { - makeFlags="INCSDIR=${!outputDev}/include $makeFlags" - makeFlags="MANDIR=${!outputMan}/share/man $makeFlags" + prependToVar makeFlags "INCSDIR=${!outputDev}/include" + prependToVar makeFlags "MANDIR=${!outputMan}/share/man" } preConfigureHooks+=(addNetBSDMakeFlags) 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 c0fee276fe..e06dbda37c 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 @@ -1,6 +1,6 @@ addOpenBSDMakeFlags() { - makeFlags="INCSDIR=${!outputDev}/include $makeFlags" - makeFlags="MANDIR=${!outputMan}/share/man $makeFlags" + prependToVar makeFlags "INCSDIR=${!outputDev}/include" + prependToVar makeFlags "MANDIR=${!outputMan}/share/man" } fixOpenBSDInstallDirs() { 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 bc8d372ca8..08dfdd4b14 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/setup-hook.sh +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/setup-hook.sh @@ -1,3 +1,5 @@ +# shellcheck shell=bash disable=SC2154,SC2164 + # BSD makefiles should be able to detect this # but without they end up using gcc on Darwin stdenv addMakeFlags() { @@ -35,38 +37,38 @@ addMakeFlags() { export MKUNPRIVED=yes export EXTERNAL_TOOLCHAIN=yes - makeFlags="MACHINE=$MACHINE $makeFlags" - makeFlags="MACHINE_ARCH=$MACHINE_ARCH $makeFlags" - makeFlags="AR=$AR $makeFlags" - makeFlags="CC=$CC $makeFlags" - makeFlags="CPP=$CPP $makeFlags" - makeFlags="CXX=$CXX $makeFlags" - makeFlags="LD=$LD $makeFlags" - makeFlags="STRIP=$STRIP $makeFlags" + prependToVar makeFlags "MACHINE=$MACHINE" + prependToVar makeFlags "MACHINE_ARCH=$MACHINE_ARCH" + prependToVar makeFlags "AR=$AR" + prependToVar makeFlags "CC=$CC" + prependToVar makeFlags "CPP=$CPP" + prependToVar makeFlags "CXX=$CXX" + prependToVar makeFlags "LD=$LD" + prependToVar makeFlags "STRIP=$STRIP" - makeFlags="BINDIR=${!outputBin}/bin $makeFlags" - makeFlags="LIBDIR=${!outputLib}/lib $makeFlags" - makeFlags="SHLIBDIR=${!outputLib}/lib $makeFlags" - makeFlags="SHAREDIR=${!outputLib}/share $makeFlags" - makeFlags="INFODIR=${!outputInfo}/share/info $makeFlags" - makeFlags="DOCDIR=${!outputDoc}/share/doc $makeFlags" - makeFlags="LOCALEDIR=${!outputLib}/share/locale $makeFlags" + prependToVar makeFlags "BINDIR=${!outputBin}/bin" + prependToVar makeFlags "LIBDIR=${!outputLib}/lib" + prependToVar makeFlags "SHLIBDIR=${!outputLib}/lib" + prependToVar makeFlags "SHAREDIR=${!outputLib}/share" + prependToVar makeFlags "INFODIR=${!outputInfo}/share/info" + prependToVar makeFlags "DOCDIR=${!outputDoc}/share/doc" + prependToVar makeFlags "LOCALEDIR=${!outputLib}/share/locale" # Parallel building. Needs the space. - makeFlags="-j $NIX_BUILD_CORES $makeFlags" + prependToVar makeFlags "-j $NIX_BUILD_CORES" } setBSDSourceDir() { sourceRoot=$PWD/$sourceRoot export BSDSRCDIR=$sourceRoot export _SRC_TOP_=$BSDSRCDIR - cd $sourceRoot + cd "$sourceRoot" } cdBSDPath() { if [ -d "$COMPONENT_PATH" ] then sourceRoot=$sourceRoot/$COMPONENT_PATH - cd $COMPONENT_PATH + cd "$COMPONENT_PATH" fi } @@ -74,10 +76,9 @@ includesPhase() { if [ -z "${skipIncludesPhase:-}" ]; then runHook preIncludes - local flagsArray=( - $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} - includes - ) + local flagsArray=() + concatTo flagsArray makeFlags makeFlagsArray + flagsArray+=(includes) echoCmd 'includes flags' "${flagsArray[@]}" make ${makefile:+-f $makefile} "${flagsArray[@]}" @@ -89,19 +90,19 @@ includesPhase() { } moveUsrDir() { - if [ -d $prefix ]; then + if [ -d "$prefix" ]; then # Remove lingering /usr references - if [ -d $prefix/usr ]; then + if [ -d "$prefix/usr" ]; then # Didn't try using rsync yet because per # https://unix.stackexchange.com/questions/127712/merging-folders-with-mv, # it's not neessarily better. - pushd $prefix/usr - find . -type d -exec mkdir -p $out/\{} \; - find . \( -type f -o -type l \) -exec mv \{} $out/\{} \; + pushd "$prefix/usr" + find . -type d -exec mkdir -p "$out/{}" \; + find . \( -type f -o -type l \) -exec mv "{}" "$out/{}" \; popd fi - find $prefix -type d -empty -delete + find "$prefix" -type d -empty -delete fi } diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/moltenvk/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/moltenvk/default.nix index 65e8d93f41..43ede5f950 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/moltenvk/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/moltenvk/default.nix @@ -107,10 +107,7 @@ stdenv.mkDerivation (finalAttrs: { ); env.NIX_LDFLAGS = toString [ - "-lMachineIndependent" - "-lGenericCodeGen" "-lglslang" - "-lOSDependent" "-lSPIRV" "-lSPIRV-Tools" "-lSPIRV-Tools-opt" 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 f22b80a776..6379e9e853 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.83.2"; + version = "1.84.2"; src = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal"; - hash = "sha256-/oFzkC4I4fuHIaw6V6YyhmlHb/nGVeeqnawr3GjgAGw="; + hash = "sha256-9bONKZyOEPj6eGQKx6IyZSf7ZZhwL985AzN/imNsoys="; }; dontPatch = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix index 3fef396208..274047afe9 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix @@ -23,7 +23,7 @@ }: let - apparmor-version = "4.0.1"; + apparmor-version = "4.0.3"; apparmor-meta = component: with lib; { homepage = "https://apparmor.net/"; @@ -37,7 +37,7 @@ let owner = "apparmor"; repo = "apparmor"; rev = "v${apparmor-version}"; - hash = "sha256-0S/P62wi3/aPATvJL6afu+SebjoSHsTMu/WV9m7E1OE="; + hash = "sha256-6RMttvlXepxUyqdZeDujjVGOwuXl/nXnjii4sA/ppc4="; }; aa-teardown = writeShellScript "aa-teardown" '' @@ -59,6 +59,12 @@ let patches = [ ./0001-aa-remove-unknown_empty-ruleset.patch + + (fetchpatch { + name = "basename.patch"; + url = "https://gitlab.com/apparmor/apparmor/-/commit/7fb040bde69ebdfce48cf1a01c1a62fd4f8eef0a.patch"; + hash = "sha256-RZ04nfcV8hTd2CO3mYcfOGCLke8+FhV7DPfmDqSSdWk="; + }) ] ++ lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { url = "https://git.alpinelinux.org/aports/plain/testing/apparmor/0003-Added-missing-typedef-definitions-on-parser.patch?id=74b8427cc21f04e32030d047ae92caa618105b53"; @@ -324,12 +330,16 @@ let , baseRules ? [ "r $path" "r $path/etc/**" - "r $path/share/**" + "mr $path/share/**" # Note that not all libraries are prefixed with "lib", # eg. glibc-2.30/lib/ld-2.30.so "mr $path/lib/**.so*" + "mr $path/lib64/**.so*" # eg. glibc-2.30/lib/gconv/gconv-modules "r $path/lib/**" + "r $path/lib64/**" + # Internal executables + "ixr $path/libexec/**" ] , name ? "" }: rootPaths: runCommand diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/cryptsetup/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/cryptsetup/default.nix index 044daf8484..c6e75de9be 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/cryptsetup/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { pname = "cryptsetup"; - version = "2.7.3"; + version = "2.7.4"; outputs = [ "bin" "out" "dev" "man" ]; separateDebugInfo = true; src = fetchurl { url = "mirror://kernel/linux/utils/cryptsetup/v${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-t3KuT23wzucgCyjOqWDk2q/yogPS/VAr6rPBMXsHpFY="; + hash = "sha256-3OKZA6WPe3dP5hGR5+belV3g9A2eJ7ACj/zzQ4wOlIA="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix index 6514937463..e5ae448284 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.67"; + version = "0.68"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/ell/ell.git"; rev = version; - hash = "sha256-PIxPhKqsxybkLQerkQ15kTRh0oW812lWbCGEig11KQk="; + hash = "sha256-1T2VL/7vSIVVmJQ3n3+swFE/faUTT3mHaskdi/TUJFY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix index 4c3bede4fb..873e0c971d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix @@ -6,15 +6,15 @@ , zlib }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: rec { pname = "ipu6-camera-bins"; - version = "unstable-2023-10-26"; + version = "unstable-2024-09-27"; src = fetchFromGitHub { - owner = "intel"; repo = "ipu6-camera-bins"; - rev = "af5ba0cb4a763569ac7514635013e9d870040bcf"; - hash = "sha256-y0pT5M7AKACbquQWLZPYpTPXRC5hipLNL61nhs+cst4="; + owner = "intel"; + rev = "98ca6f2a54d20f171628055938619972514f7a07"; + hash = "sha256-DAjAzHMqX41mrfQVpDUJLw4Zjb9pz6Uy3TJjTGIkd6o="; }; nativeBuildInputs = [ @@ -33,13 +33,14 @@ stdenv.mkDerivation (finalAttrs: { include \ $out/ - install -m 0644 -D LICENSE $out/share/doc/LICENSE + # There is no LICENSE file in the src + # install -m 0644 -D LICENSE $out/share/doc/LICENSE runHook postInstall ''; postFixup = '' - for pcfile in $out/lib/*/pkgconfig/*.pc; do + for pcfile in $out/lib/pkgconfig/*.pc; do substituteInPlace $pcfile \ --replace 'prefix=/usr' "prefix=$out" done diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix index 9674cea222..931c854708 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation { pname = "ivsc-firmware"; - version = "unstable-2023-08-11"; + version = "unstable-2024-06-14"; src = fetchFromGitHub { owner = "intel"; repo = "ivsc-firmware"; - rev = "10c214fea5560060d387fbd2fb8a1af329cb6232"; - hash = "sha256-kEoA0yeGXuuB+jlMIhNm+SBljH+Ru7zt3PzGb+EPBPw="; + rev = "74a01d1208a352ed85d76f959c68200af4ead918"; + hash = "sha256-kHYfeftMtoOsOtVN6+XoDMDHP7uTEztbvjQLpCnKCh0="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/default.nix index ce75a4e304..a3fa3f511b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/default.nix @@ -1,25 +1,46 @@ { stdenvNoCC , fetchzip +, findutils , lib +, python3 , rdfind , which +, writeShellScriptBin }: - -stdenvNoCC.mkDerivation rec { +let + # check-whence.py attempts to call `git ls-files`, but we don't have a .git, + # because we've just downloaded a snapshot. We do, however, know that we're + # in a perfectly pristine tree, so we can fake just enough of git to run it. + gitStub = writeShellScriptBin "git" '' + if [ "$1" == "ls-files" ]; then + ${lib.getExe findutils} -type f -printf "%P\n" + else + echo "Git stub called with unexpected arguments $@" >&2 + exit 1 + fi + ''; +in stdenvNoCC.mkDerivation rec { pname = "linux-firmware"; - version = "20240909"; + version = "20241017"; src = fetchzip { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${version}.tar.gz"; - hash = "sha256-3nwo4lGTV5PlsxZXa5D/7upaB+5XfXFZHbgEO5jnRrw="; + hash = "sha256-q4StJdoLCHQThFTzhxETDYlQP/ywmb3vwCr13xtrQzc="; }; + postUnpack = '' + patchShebangs . + ''; + nativeBuildInputs = [ + gitStub + python3 rdfind which ]; - installFlags = [ "DESTDIR=$(out)" ]; + installTargets = [ "install" "dedup" ]; + makeFlags = [ "DESTDIR=$(out)" ]; # Firmware blobs do not need fixing and should not be modified dontFixup = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/sof-firmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/sof-firmware/default.nix index b1ad7ce041..35978f1b66 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/sof-firmware/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/sof-firmware/default.nix @@ -22,6 +22,7 @@ stdenvNoCC.mkDerivation rec { cp -av sof-ace-tplg $out/lib/firmware/intel/sof-ace-tplg cp -av sof-ipc4 $out/lib/firmware/intel/sof-ipc4 cp -av sof-ipc4-tplg $out/lib/firmware/intel/sof-ipc4-tplg + cp -av sof-ipc4-lib $out/lib/firmware/intel/sof-ipc4-lib runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/guvcview/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/guvcview/default.nix index 52a71d5719..6007b8869e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/guvcview/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/guvcview/default.nix @@ -5,7 +5,7 @@ , pkg-config , portaudio , SDL2 -, ffmpeg_7 +, ffmpeg , udev , libusb1 , libv4l @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 alsa-lib - ffmpeg_7 + ffmpeg libusb1 libv4l portaudio diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix index 0fd5af8c5d..f730d192fb 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwdata"; - version = "0.385"; + version = "0.387"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - hash = "sha256-IGyERrqlX+VcbDUGykQ8h87uzbOA6DUm6nTZMgYQYKg="; + hash = "sha256-DaoghSLLH795YGFE31eTebPCnWBIQJI6yVI/khywEgc="; }; configureFlags = [ "--datadir=${placeholder "out"}/share" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix index 57adaf0643..9420d37464 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix @@ -13,6 +13,24 @@ stdenv.mkDerivation rec { hash = "sha256-kaYvgnN7RJBaAPqAM2nER9VJ6RTpoqQBj911sdVOjc4="; }; + patches = [ + (fetchurl { + name = "musl-endian.patch"; + url = "https://lore.kernel.org/netdev/20240712191209.31324-1-contact@hacktivis.me/raw"; + hash = "sha256-MX+P+PSEh6XlhoWgzZEBlOV9aXhJNd20Gi0fJCcSZ5E="; + }) + (fetchurl { + name = "musl-msghdr.patch"; + url = "https://lore.kernel.org/netdev/20240712191209.31324-2-contact@hacktivis.me/raw"; + hash = "sha256-X5BYSZBxcvdjtX1069a1GfcpdoVd0loSAe4xTpbCipA="; + }) + (fetchurl { + name = "musl-basename.patch"; + url = "https://lore.kernel.org/netdev/20240804161054.942439-1-dilfridge@gentoo.org/raw"; + hash = "sha256-47obv6mIn/HO47lt47slpTAFDxiQ3U/voHKzIiIGCTM="; + }) + ]; + postPatch = '' substituteInPlace Makefile \ --replace "CC := gcc" "CC ?= $CC" diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ipu6-drivers/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ipu6-drivers/default.nix index 304f27dfb4..d6aafa53a5 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ipu6-drivers/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ipu6-drivers/default.nix @@ -5,17 +5,19 @@ , kernel }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "ipu6-drivers"; - version = "unstable-2023-11-24"; + version = "unstable-2024-10-10"; src = fetchFromGitHub { owner = "intel"; repo = "ipu6-drivers"; - rev = "07f0612eabfdc31df36f5e316a9eae115807804f"; - hash = "sha256-8JRZG6IKJT0qtoqJHm8641kSQMLc4Z+DRzK6FpL9Euk="; + rev = "118952d49ec598f56add50d93fa7bc3ac4a05643"; + hash = "sha256-xdMwINoKrdRHCPMpdZQn86ATi1dAXncMU39LLXS16mc="; }; + patches = [ "${src}/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch" ]; + postPatch = '' cp --no-preserve=mode --recursive --verbose \ ${ivsc-driver.src}/backport-include \ @@ -47,7 +49,7 @@ stdenv.mkDerivation { license = lib.licenses.gpl2Only; maintainers = [ ]; platforms = [ "x86_64-linux" ]; - # requires 6.1.7 https://github.com/intel/ipu6-drivers/pull/84 - broken = kernel.kernelOlder "6.1.7"; + # requires 6.10 + broken = kernel.kernelOlder "6.10"; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ivsc-driver/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ivsc-driver/default.nix index 74ad354a98..d9fa513ede 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ivsc-driver/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ivsc-driver/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation { pname = "ivsc-driver"; - version = "unstable-2023-11-09"; + version = "unstable-2024-09-18"; src = fetchFromGitHub { owner = "intel"; repo = "ivsc-driver"; - rev = "73a044d9633212fac54ea96cdd882ff5ab40573e"; - hash = "sha256-vE5pOtVqjiWovlUMSEoBKTk/qvs8K8T5oY2r7njh0wQ="; + rev = "10f440febe87419d5c82d8fe48580319ea135b54"; + hash = "sha256-jc+8geVquRtaZeIOtadCjY9F162Rb05ptE7dk8kuof0="; }; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix index e7d343f791..49c4a1cbeb 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "2.19"; + version = "2.20"; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - hash = "sha256-LIzcV8OvtHItMpgFVHDQhUisD3kaMPMESd3cgOaIu/8="; + hash = "sha256-jKYF4wW/wKyOMrgxxU7AU0XN677X1vVjrPgjnX/gOqc="; }; outputs = [ "out" "man" "doc" ] diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix index 450e26b4ec..b149b3f08d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix @@ -111,12 +111,12 @@ let in { inherit makeLinuxHeaders; - linuxHeaders = let version = "6.9"; in + linuxHeaders = let version = "6.10"; in makeLinuxHeaders { inherit version; src = fetchurl { url = "mirror://kernel/linux/kernel/v${lib.versions.major version}.x/linux-${version}.tar.xz"; - hash = "sha256-JPoB+5icej4oRT8Rd5kWhxN2bhGcU4HawwEV8Y8mgUk="; + hash = "sha256-d0aYQi7lTF8ecERW83xlwGtRtOmosIZvNFgNhv744iY="; }; patches = [ ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix index ee38620521..9ba5319882 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix @@ -11,6 +11,7 @@ # Configuration { lib, stdenv, version +, rustAvailable , features ? {} }: @@ -32,9 +33,14 @@ let forceRust = features.rust or false; kernelSupportsRust = lib.versionAtLeast version "6.7"; - # Currently not enabling Rust by default, as upstream requires rustc 1.81 - defaultRust = false; - withRust = (forceRust || defaultRust) && kernelSupportsRust; + # Currently only enabling Rust by default on kernel 6.12+, + # which actually has features that use Rust that we want. + defaultRust = lib.versionAtLeast version "6.12" && rustAvailable; + withRust = + assert lib.assertMsg (!(forceRust && !kernelSupportsRust)) '' + Kernels below 6.7 (the kernel being built is ${version}) don't support Rust. + ''; + (forceRust || defaultRust) && kernelSupportsRust; options = { @@ -638,7 +644,10 @@ let NFS_V4_1 = yes; # NFSv4.1 client support NFS_V4_2 = yes; NFS_V4_SECURITY_LABEL = yes; - NFS_LOCALIO = whenAtLeast "6.12" yes; + + # Fails with + # `fs/nfs/localio.o: relocation R_AARCH64_ADR_PREL_PG_HI21 against symbol `nfs_to' which may bind externally can not be used when making a shared object; recompile with -fPIC` + NFS_LOCALIO = lib.mkIf (!stdenv.hostPlatform.isAarch64) (whenAtLeast "6.12" yes); CIFS_XATTR = yes; CIFS_POSIX = option yes; @@ -984,6 +993,7 @@ let JOYSTICK_PSXPAD_SPI_FF = yes; LOGIG940_FF = yes; NINTENDO_FF = whenAtLeast "5.16" yes; + NVIDIA_SHIELD_FF = whenAtLeast "6.5" yes; PLAYSTATION_FF = whenAtLeast "5.12" yes; SONY_FF = yes; SMARTJOYPLUS_FF = yes; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix index fdfc782352..49c9594f8f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix @@ -108,6 +108,11 @@ let commonStructuredConfig = import ./common-config.nix { inherit lib stdenv version; + rustAvailable = + lib.any (lib.meta.platformMatch stdenv.hostPlatform) rustc.targetPlatforms + && lib.all (p: !lib.meta.platformMatch stdenv.hostPlatform p) rustc.badTargetPlatforms + # Known to be broken: https://lore.kernel.org/lkml/31885EDD-EF6D-4EF1-94CA-276BA7A340B7@kernel.org/T/ + && !(stdenv.hostPlatform.isRiscV && stdenv.cc.isGNU); features = kernelFeatures; # Ensure we know of all extra patches, etc. }; 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 bc537d9c7b..e4f61b03c1 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,34 +1,34 @@ { "testing": { - "version": "6.12-rc1", - "hash": "sha256:16zwvjcvgndvr0izx0qs2k7v85nvxwlx6j7y2yrdl3shalsdlmx2" + "version": "6.12-rc3", + "hash": "sha256:11jspf9h3zmqnnyjardyk1g9k09fivwbl267iddb2ildfhgrlvqw" }, "6.1": { - "version": "6.1.112", - "hash": "sha256:094z3wfcxqx2rbi072i5frshpy6rdvk39aahwm9nc07vc8sxxn4b" + "version": "6.1.113", + "hash": "sha256:0c4y8j65b3im0bf4ji4n7nfqaqa7c7ym2515li855k1g363i1bsl" }, "5.15": { - "version": "5.15.167", - "hash": "sha256:0c6s6l5sz9ibws7bymb393ww0z9i3amsk1yx0bahipz3xhc1yxdi" + "version": "5.15.168", + "hash": "sha256:0yp1705rjadv2v7hw2yq9n3bxgqzmlyam2bnp49p10jnfkavpgng" }, "5.10": { - "version": "5.10.226", - "hash": "sha256:19hwwl5sbya65mch7fwmji2cli9b8796zjqbmkybjrarg1j9m8gn" + "version": "5.10.227", + "hash": "sha256:1hknbfxq59731zmxgig7b69lfdmgh5jdg391hapvmlrh07hrvq2j" }, "5.4": { "version": "5.4.284", "hash": "sha256:0axkwfhvq3w2072xjqww476qa3rjglxyqmf72mlp9b5ymswil8kp" }, "6.6": { - "version": "6.6.54", - "hash": "sha256:186ggr0yz7fgp05qav6k6j72aazvwdljdnf2zwb5q194dafqdbjz" + "version": "6.6.57", + "hash": "sha256:1cxpmgbp8hhwa045gappf2wzh3kk1iw2xivsxzhvi6bgz5p45kk6" }, "6.10": { - "version": "6.10.13", - "hash": "sha256:0smimvnivdswiggplz9x65d03vdysgr3v9iijbk4f5fva0iypz2z" + "version": "6.10.14", + "hash": "sha256:0gj2z9ax1qv59n2mld0pg2svwi28lbq92ql98vy7crynd2ybrram" }, "6.11": { - "version": "6.11.2", - "hash": "sha256:0hlwsfq6brdkdcwdq6d1aq2b210hkqgpmy0y1sa5bfyfp6hgg7pc" + "version": "6.11.4", + "hash": "sha256:0mcg1rrw9b0lwj88jkaw6ic2mks8xh8i92v90sbr2x35ljhb0m5x" } } 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 7f4f1aa291..4cdb819a62 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 @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "19631"; - sha256 = "0hydmrdwqrrmrnk6r583m7c2hq1k68c9c8yqjc0bd6q4x7ys32ci"; + rev = "19643"; + sha256 = "1gnji0hglzh6kj9ssawlrix1vlbcyfjdjx5d9qwpnn2p0sgsq7nj"; } , ... } @ args: diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix index 5544409a74..f69de86fd1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix @@ -396,6 +396,9 @@ let requiredSystemFeatures = [ "big-parallel" ]; meta = { + # https://github.com/NixOS/nixpkgs/pull/345534#issuecomment-2391238381 + broken = withRust && lib.versionOlder version "6.12"; + description = "The Linux kernel" + (if kernelPatches == [] then "" else 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 394a22bd8d..d2e86f876c 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 @@ -7,12 +7,12 @@ let # kernel config in the xanmod version commit variants = { lts = { - version = "6.6.54"; - hash = "sha256-i6Rm0Qasgxpw9XcK938IJ+qZ+V2z82zpuly2Au2J18Q="; + version = "6.6.56"; + hash = "sha256-5EgCIMS6eZWPB8t6z6ts5sSHoeawja0diWuh/DNnvqw="; }; main = { - version = "6.11.2"; - hash = "sha256-4BXPZs8lp/O/JGWFIO/J1HyOjByaqWQ9O6/jx76TIDs="; + version = "6.11.3"; + hash = "sha256-Pb/7XToBFZstI1DFgWg4a2HiRuSzA9rEsMBLb6fRvYc="; }; }; 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 9b1dbc3c9b..afca9bb2a4 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 @@ -5,16 +5,16 @@ let variants = { # ./update-zen.py zen zen = { - version = "6.10.9"; #zen + version = "6.11.2"; #zen suffix = "zen1"; #zen - sha256 = "199362jd1waqri6arb8sdfqrzjkdki5vis2z03cpp2blnbqva10b"; #zen + sha256 = "1pwhdx8dcih0q3xj2hndd9vmz1xclrp4dw9yk0p1hi03mb634s40"; #zen isLqx = false; }; # ./update-zen.py lqx lqx = { - version = "6.10.9"; #lqx + version = "6.11.2"; #lqx suffix = "lqx1"; #lqx - sha256 = "0y7r55iy7ylddv7yrlwkz7ps82j447a6m3khq2w4sfh8f0xy86p7"; #lqx + sha256 = "0q5zdzb26azshn1n8fc5zy5n2sa7sz3q4khkjivafz6pyli1wfl8"; #lqx isLqx = true; }; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kexec-tools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kexec-tools/default.nix index fb5911a680..15d26cd7e0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kexec-tools/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kexec-tools/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "kexec-tools"; - version = "2.0.28"; + version = "2.0.29"; src = fetchurl { urls = [ "mirror://kernel/linux/utils/kernel/kexec/${pname}-${version}.tar.xz" "http://horms.net/projects/kexec/kexec-tools/${pname}-${version}.tar.xz" ]; - sha256 = "sha256-0vDvhy854v5LGwH+tisAATgyByObn4BB+YqVVkFh0FM="; + sha256 = "sha256-Z7GsUDqt5FpU2wvHkiiogwo11dT4PO6TLP8+eoGkqew="; }; patches = [ @@ -18,11 +18,6 @@ stdenv.mkDerivation rec { url = "https://raw.githubusercontent.com/void-linux/void-packages/6c1192cbf166698932030c2e3de71db1885a572d/srcpkgs/kexec-tools/patches/ppc64-elfv2.patch"; sha256 = "19wzfwb0azm932v0vhywv4221818qmlmvdfwpvvpfyw4hjsc2s1l"; }) - # binutils-2.42 support - (fetchpatch { - url = "https://github.com/horms/kexec-tools/commit/328de8e00e298f00d7ba6b25dc3950147e9642e6.patch"; - hash = "sha256-wVQI4oV+hBLq3kGIp2+F5J3f6s/TypDu3Xq583KYc3U="; - }) ] ++ lib.optional (stdenv.hostPlatform.useLLVM or false) ./fix-purgatory-llvm-libunwind.patch; hardeningDisable = [ "format" "pic" "relro" "pie" ]; @@ -34,6 +29,8 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ zlib ]; + enableParallelBuilding = true; + meta = with lib; { homepage = "http://horms.net/projects/kexec/kexec-tools"; description = "Tools related to the kexec Linux feature"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/keyutils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/keyutils/default.nix index 342626624c..42ae3f2c03 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/keyutils/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/keyutils/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { # nix-build -E 'with import ./. {}; pkgs.keyutils.override { stdenv = pkgs.clangStdenv; }' ./0001-Remove-unused-function-after_eq.patch + ./pkg-config-static.patch + # Fix build for s390-linux, where size_t is different from ptrdiff_t. (fetchurl { url = "https://lore.kernel.org/keyrings/20230301134250.301819-1-hi@alyssa.is/raw"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/keyutils/pkg-config-static.patch b/third_party/nixpkgs/pkgs/os-specific/linux/keyutils/pkg-config-static.patch new file mode 100644 index 0000000000..a4ba141fd2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/keyutils/pkg-config-static.patch @@ -0,0 +1,28 @@ +From 4e58e9a45b87f9409d80a559984a3405d8d5a975 Mon Sep 17 00:00:00 2001 +From: Daniel Hill +Date: Tue, 28 Feb 2023 16:57:52 +1300 +Subject: Provide a pkgconfig file with libkeyutils.a + +Signed-off-by: Daniel Hill +Signed-off-by: David Howells +Link: https://lore.kernel.org/r/CAMtG=2qKrGC-QzPENXsV8_7VBbi6sEnA6joV=SL8MQP1pfV8KA@mail.gmail.com/ +--- + Makefile | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Makefile b/Makefile +index 599b145..d8d4ee3 100644 +--- a/Makefile ++++ b/Makefile +@@ -201,6 +201,8 @@ ifeq ($(NO_SOLIB),0) + $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) + mkdir -p $(DESTDIR)$(USRLIBDIR) + $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB) ++endif ++ifneq ($(filter 0, $(NO_ARLIB) $(NO_SOLIB)),) + sed \ + -e 's,@VERSION\@,$(VERSION),g' \ + -e 's,@prefix\@,$(PREFIX),g' \ +-- +cgit 1.2.3-korg + diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lenovo-legion/app.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lenovo-legion/app.nix index 66212124e9..22aaaab92b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lenovo-legion/app.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lenovo-legion/app.nix @@ -1,14 +1,20 @@ -{ lib, fetchFromGitHub, xorg, libsForQt5, wrapQtAppsHook, python3 }: +{ + lib, + fetchFromGitHub, + xorg, + wrapQtAppsHook, + python3, +}: python3.pkgs.buildPythonApplication rec { pname = "lenovo-legion-app"; - version = "0.0.12"; + version = "0.0.18"; src = fetchFromGitHub { owner = "johnfanv2"; repo = "LenovoLegionLinux"; - rev = "v${version}-prerelease"; - hash = "sha256-BNrRv9EBmNINQbAw+BzVxKl/XoDgH1tsNZHJxfSpNoU="; + rev = "e9c1d8157a7b25e4334d0b1d887338c670e39f6a"; + hash = "sha256-6JYOTDzz9/flyEDQo1UPjWT5+Cuea5fsdbdc6AooDxU="; }; sourceRoot = "${src.name}/python/legion_linux"; @@ -16,22 +22,24 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ wrapQtAppsHook ]; propagatedBuildInputs = with python3.pkgs; [ - pyqt5 pyqt6 argcomplete pyyaml darkdetect xorg.libxcb - libsForQt5.qtbase ]; postPatch = '' + # only fixup application (legion-linux-gui), service (legiond) currently not installed so do not fixup + # version substituteInPlace ./setup.cfg \ --replace-fail "_VERSION" "${version}" - substituteInPlace ../../extra/service/fancurve-set \ - --replace-fail "FOLDER=/etc/legion_linux/" "FOLDER=$out/share/legion_linux" + + # /etc substituteInPlace ./legion_linux/legion.py \ --replace-fail "/etc/legion_linux" "$out/share/legion_linux" + + # /usr substituteInPlace ./legion_linux/legion_gui.desktop \ --replace-fail "Icon=/usr/share/pixmaps/legion_logo.png" "Icon=legion_logo" ''; @@ -47,8 +55,11 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/johnfanv2/LenovoLegionLinux"; license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.ulrikstrid ]; + maintainers = with lib.maintainers; [ + ulrikstrid + realsnick + chn + ]; mainProgram = "legion_gui"; }; } - diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix index 1875848889..b5e4b22dab 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libbpf"; - version = "1.4.5"; + version = "1.4.6"; src = fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; rev = "v${version}"; - hash = "sha256-GQbx3LaGrFTwEtUsP7V/Y1Keoa4dSmDxhmSTsML+tVk="; + hash = "sha256-TGwGEYapanhp2RjnH6Mo+kQFmqFEX0LcAZTCk6SyIk8="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libcap/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libcap/default.nix index fdeae8dc65..0ff2901229 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libcap/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libcap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPackages, fetchurl, attr, runtimeShell +{ stdenv, lib, buildPackages, fetchurl, runtimeShell , usePam ? !isStatic, pam ? null , isStatic ? stdenv.hostPlatform.isStatic @@ -33,8 +33,6 @@ stdenv.mkDerivation rec { buildInputs = lib.optional usePam pam; - propagatedBuildInputs = [ attr ]; - makeFlags = [ "lib=lib" "PAM_CAP=${if usePam then "yes" else "no"}" diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libnl/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libnl/default.nix index 68f4ee20df..da1b8609bf 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libnl/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libnl/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "libnl"; - version = "3.8.0"; + version = "3.10.0"; src = fetchFromGitHub { repo = "libnl"; owner = "thom311"; rev = "libnl${lib.replaceStrings ["."] ["_"] version}"; - hash = "sha256-zVpoRlB5xDfo6wJkCJGGptuCXkNkriudtZF2Job9YD4="; + hash = "sha256-QwDn7S9lyU+/Pc9daqy1qDZFU03dUQF5PDqFEn03WWc="; }; outputs = [ "bin" "dev" "out" "man" ] ++ lib.optional pythonSupport "py"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libselinux/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libselinux/default.nix index 583f6af2bc..e77c15e7c7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libselinux/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libselinux/default.nix @@ -8,14 +8,14 @@ assert enablePython -> swig != null && python3 != null; stdenv.mkDerivation (rec { pname = "libselinux"; - version = "3.6"; + version = "3.7"; inherit (libsepol) se_url; outputs = [ "bin" "out" "dev" "man" ] ++ lib.optional enablePython "py"; src = fetchurl { url = "${se_url}/${version}/libselinux-${version}.tar.gz"; - hash = "sha256-uk4O80snDnZypeXxtSP+K+qzpAuzPZOJ9K06hyjyG1I="; + hash = "sha256-6gP0LROk+VdXmX26jPCyYyH6xdLxZEGLTMhWqS0rF70="; }; patches = [ @@ -80,11 +80,6 @@ stdenv.mkDerivation (rec { "PYTHON_SETUP_ARGS=--no-build-isolation" ]; - postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' - substituteInPlace src/procattr.c \ - --replace "#include " "" - ''; - preInstall = lib.optionalString enablePython '' mkdir -p $py/${python3.sitePackages}/selinux ''; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lksctp-tools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lksctp-tools/default.nix index 5ddf19c96e..d416ddd14b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lksctp-tools/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lksctp-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lksctp-tools"; - version = "1.0.19"; + version = "1.0.20"; src = fetchFromGitHub { owner = "sctp"; repo = "lksctp-tools"; rev = "v${version}"; - hash = "sha256-QEgk9OPFCI5WknUDkqfswApCFeOF+620frQWMyQq2Mk="; + hash = "sha256-h+wMrnx+u/4feNjZr2Gc+y6/80qJ8IVXsrDvHyixMxo="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lttng-modules/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lttng-modules/default.nix index cfb38f0983..f37c15979f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lttng-modules/default.nix @@ -1,14 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, kernel }: +{ + lib, + stdenv, + fetchFromGitHub, + kernel, +}: stdenv.mkDerivation rec { pname = "lttng-modules-${kernel.version}"; - version = "2.13.13"; + version = "2.13.15"; src = fetchFromGitHub { owner = "lttng"; repo = "lttng-modules"; rev = "v${version}"; - hash = "sha256-iA3B838EUU5rFWCL8BAubkTrTO1itDFp5d1653OPnS0="; + hash = "sha256-cEiv1EjsEvyreRERrCGKKpJdA1IKvuyVmgA7S3EkEnU="; }; nativeBuildInputs = kernel.moduleBuildDependencies; @@ -29,9 +34,15 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linux kernel modules for LTTng tracing"; homepage = "https://lttng.org/"; - license = with licenses; [ lgpl21Only gpl2Only mit ]; + license = with licenses; [ + lgpl21Only + gpl2Only + mit + ]; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; - broken = (lib.versions.majorMinor kernel.modDirVersion) == "5.10" || (lib.versions.majorMinor kernel.modDirVersion) == "5.4"; + broken = + (lib.versions.majorMinor kernel.modDirVersion) == "5.10" + || (lib.versions.majorMinor kernel.modDirVersion) == "5.4"; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/musl/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/musl/default.nix index eb24879366..4bb6382d6a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/musl/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/musl/default.nix @@ -44,11 +44,11 @@ let in stdenv.mkDerivation rec { pname = "musl"; - version = "1.2.3"; + version = "1.2.5"; src = fetchurl { url = "https://musl.libc.org/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-fVsLYGJSHkYn4JnkydyCSNMqMChelZt+7Kp4DPjP1KQ="; + sha256 = "qaEYu+hNh2TaDqDSizqz+uhHf8fkCF2QECuFlvx8deQ="; }; enableParallelBuilding = true; @@ -71,12 +71,6 @@ stdenv.mkDerivation rec { url = "https://raw.githubusercontent.com/openwrt/openwrt/87606e25afac6776d1bbc67ed284434ec5a832b4/toolchain/musl/patches/300-relative.patch"; sha256 = "0hfadrycb60sm6hb6by4ycgaqc9sgrhh42k39v8xpmcvdzxrsq2n"; }) - - # fix parsing lines with optional fields in fstab etc. NOTE: Remove for the next release since it has been merged upstream - (fetchurl { - url = "https://git.musl-libc.org/cgit/musl/patch/?id=751bee0ee727e8d8b003c87cff77ac76f1dbecd6"; - sha256 = "sha256-qCw132TCSaZrkISmtDb8Q8ufyt8sAJdwACkvfwuoi/0="; - }) ]; CFLAGS = [ "-fstack-protector-strong" ] ++ lib.optional stdenv.hostPlatform.isPower "-mlong-double-64"; @@ -151,10 +145,11 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" - "armv7l-linux" "i686-linux" "x86_64-linux" "m68k-linux" - "microblaze-linux" "microblazeel-linux" "mips-linux" "mips64-linux" - "mipsel-linux" "mips64el-linux" "powerpc64-linux" "powerpc64le-linux" - "riscv64-linux" "s390x-linux" + "armv7l-linux" "i686-linux" "loongarch64-linux" "m68k-linux" + "microblaze-linux" "microblazeel-linux" "mips-linux" + "mips64-linux" "mips64el-linux" "mipsel-linux" "powerpc64-linux" + "powerpc64le-linux" "riscv32-linux" "riscv64-linux" + "s390x-linux" "x86_64-linux" ]; maintainers = with maintainers; [ thoughtpolice dtzWill ]; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/_nixos-rebuild b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/_nixos-rebuild index 84e8d223bd..31e2313652 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/_nixos-rebuild +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/_nixos-rebuild @@ -36,6 +36,7 @@ _nixos-rebuild() { --rollback --specialisation -c # name --use-remote-sudo + --no-ssh-tty --build-host # host --target-host # host # Used with list-generations diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 index 9ef46b564d..25ae9efba1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 @@ -37,6 +37,7 @@ .Op Fl -build-host Va host .Op Fl -target-host Va host .Op Fl -use-remote-sudo +.Op Fl -no-ssh-tty .br .Op Fl -verbose | v .Op Fl -quiet @@ -392,6 +393,16 @@ system with .Ic sudo Ns \&. Setting this option allows deploying as a non-root user. . +.It Fl -no-ssh-tty +When set, nixos-rebuild will not request a tty when executing commands on the +.Fl -target-host +system with +.Ic ssh Ns +\&. This may help avoid corrupted terminal output when running multiple +nixos-rebuild commands in parallel, but may also prevent the remote +.Ic sudo +from working properly. +. .It Fl -file Ar path , Fl f Ar path Enable and build the NixOS system from the specified file. The file must evaluate to an attribute set, and it must contain a valid NixOS configuration diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index c5bc19f829..1ab5c8346f 100755 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -32,6 +32,7 @@ specialisation= buildHost= targetHost= remoteSudo= +noSSHTTY= verboseScript= noFlake= attr= @@ -102,21 +103,32 @@ while [ "$#" -gt 0 ]; do --use-substitutes|--substitute-on-destination|-s) copyFlags+=("-s") ;; - -I|--max-jobs|-j|--cores|--builders|--log-format) + -I|--builders) j="$1"; shift 1 extraBuildFlags+=("$i" "$j") ;; - --accept-flake-config|-j*|--quiet|--print-build-logs|-L|--no-build-output|-Q| --show-trace|--keep-going|-k|--keep-failed|-K|--fallback|--refresh|--repair|--impure|--offline|--no-net) + --max-jobs|-j|--cores|--log-format) + j="$1"; shift 1 + extraBuildFlags+=("$i" "$j") + copyFlags+=("$i" "$j") + ;; + --accept-flake-config|-j*|--quiet|--print-build-logs|-L|--no-build-output|-Q|--show-trace|--refresh|--impure|--offline|--no-net) extraBuildFlags+=("$i") ;; + --keep-going|-k|--keep-failed|-K|--fallback|--repair) + extraBuildFlags+=("$i") + copyFlags+=("$i") + ;; --verbose|-v|-vv|-vvv|-vvvv|-vvvvv) verboseScript="true" extraBuildFlags+=("$i") + copyFlags+=("$i") ;; --option) j="$1"; shift 1 k="$1"; shift 1 extraBuildFlags+=("$i" "$j" "$k") + copyFlags+=("$i" "$j" "$k") ;; --fast) buildNix= @@ -152,6 +164,9 @@ while [ "$#" -gt 0 ]; do --use-remote-sudo) remoteSudo=1 ;; + --no-ssh-tty) + noSSHTTY=1 + ;; --flake) flake="$1" shift 1 @@ -227,12 +242,18 @@ targetHostCmd() { } targetHostSudoCmd() { + local t= + if [[ ! "${noSSHTTY:-x}" = 1 ]]; then + t="-t" + fi + if [ -n "$remoteSudo" ]; then - useSudo=1 SSHOPTS="$SSHOPTS -t" targetHostCmd "$@" + useSudo=1 SSHOPTS="$SSHOPTS $t" targetHostCmd "$@" else # While a tty might not be necessary, we apply it to be consistent with # sudo usage, and an experience that is more consistent with local deployment. - SSHOPTS="$SSHOPTS -t" targetHostCmd "$@" + # But if the user really doesn't want it, don't do it. + SSHOPTS="$SSHOPTS $t" targetHostCmd "$@" fi } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix index 15ca9f9212..c6adc9c55f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix @@ -37,13 +37,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prl-tools"; - version = "20.0.1-55659"; + version = "20.1.0-55732"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso src = fetchurl { url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg"; - hash = "sha256-5h8WZB7L6D9KOgIPSstN1sNcf3FZQiOQFB5MUC4YzvA="; + hash = "sha256-WKYsLcr7m6VAjYZu4BNxaarI7x/a7onlalQpV/Qws0w="; }; hardeningDisable = [ "pic" "format" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/update.sh b/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/update.sh old mode 100644 new mode 100755 index 58b7c14c47..fad989127a --- a/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/update.sh +++ b/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/update.sh @@ -12,13 +12,12 @@ kb_url="https://kb.parallels.com/en/130212" content="$(curl -s "$kb_url")" # Match latest version from Parallels knowledge base -regex='' +regex='' if [[ $content =~ $regex ]]; then - major_version="${BASH_REMATCH[1]}" - version="${BASH_REMATCH[2]}-${BASH_REMATCH[3]}" - echo "Found latest version: $version, major version: $major_version" + version="${BASH_REMATCH[1]}-${BASH_REMATCH[2]}" + echo "Found latest version: $version" else - echo "Failed to extract version from $kb_url" + echo "Failed to extract version from $kb_url" >&2 exit 1 fi @@ -30,10 +29,11 @@ if [[ "$old_version" > "$version" || "$old_version" == "$version" ]]; then fi # Update version and hash +major_version=$(echo $version | cut -d. -f1) dmg_url="https://download.parallels.com/desktop/v${major_version}/${version}/ParallelsDesktop-${version}.dmg" sha256="$(nix store prefetch-file $dmg_url --json | jq -r '.hash')" -sed -i -e "s/version = \"$old_version\"/version = \"$version\"/" \ - -e "s/hash = \"sha256-.*\"/hash = \"$sha256\"/" "$path" +sed -i -e "s,version = \"$old_version\",version = \"$version\"," \ + -e "s,hash = \"sha256-.*\",hash = \"$sha256\"," "$path" git commit -qm "linuxPackages_latest.prl-tools: $old_version -> $version" "$path" echo "Updated linuxPackages_latest.prl-tools $old_version -> $version" diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/shadow/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/shadow/default.nix index 682434fa03..803376c2b3 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/shadow/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/shadow/default.nix @@ -2,10 +2,11 @@ , runtimeShell, nixosTests , autoreconfHook, bison, flex , docbook_xml_dtd_45, docbook_xsl -, itstool, libbsd, libxml2, libxslt +, itstool, libxml2, libxslt , libxcrypt, pkg-config , glibcCross ? null , pam ? null +, withLibbsd ? lib.meta.availableOn stdenv.hostPlatform libbsd, libbsd , withTcb ? lib.meta.availableOn stdenv.hostPlatform tcb, tcb }: let @@ -37,8 +38,9 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = [ libbsd libxcrypt ] + buildInputs = [ libxcrypt ] ++ lib.optional (pam != null && stdenv.hostPlatform.isLinux) pam + ++ lib.optional withLibbsd libbsd ++ lib.optional withTcb tcb; patches = [ @@ -66,6 +68,7 @@ stdenv.mkDerivation rec { "--with-group-name-max-length=32" "--with-bcrypt" "--with-yescrypt" + (lib.withFeature withLibbsd "libbsd") ] ++ lib.optional (stdenv.hostPlatform.libc != "glibc") "--disable-nscd" ++ lib.optional withTcb "--with-tcb"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix index e1d681b1a5..6042bb1a3f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix @@ -4,6 +4,7 @@ , lib , nixosTests , pkgsCross +, testers , fetchFromGitHub , fetchzip , fetchpatch2 @@ -184,7 +185,7 @@ assert withBootloader -> withEfi; let wantCurl = withRemote || withImportd; wantGcrypt = withResolved || withImportd; - version = "256.4"; + version = "256.6"; # Use the command below to update `releaseTimestamp` on every (major) version # change. More details in the commentary at mesonFlags. @@ -202,7 +203,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "systemd"; repo = "systemd"; rev = "v${version}"; - hash = "sha256-dugBiRgDFpB0eKhhIT3LkA8FhClM0lvvwCMJ+dKtjPM="; + hash = "sha256-HQ8kO7Y23RZJnT9XaiclVSSNRW/ApA0D5QbMHQkN5FM="; }; # On major changes, or when otherwise required, you *must* : @@ -795,6 +796,7 @@ stdenv.mkDerivation (finalAttrs: { else "aarch64-multiplatform"; in pkgsCross.${systemString}.systemd; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; }; @@ -830,6 +832,7 @@ stdenv.mkDerivation (finalAttrs: { publicDomain ]; maintainers = with lib.maintainers; [ flokli kloenk ]; + pkgConfigModules = [ "libsystemd" "libudev" "systemd" "udev" ]; # See src/basic/missing_syscall_def.h platforms = with lib.platforms; lib.intersectLists linux (aarch ++ x86 ++ loongarch64 ++ m68k ++ mips ++ power ++ riscv ++ s390); diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/upower/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/upower/default.nix index 4ee907fe5a..5b4e4ede7b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/upower/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/upower/default.nix @@ -17,7 +17,6 @@ , libusb1 , glib , gettext -, systemd , nixosTests , useIMobileDevice ? true , libimobiledevice @@ -26,6 +25,8 @@ , withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , buildPackages , gobject-introspection +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd +, systemd }: assert withDocs -> withIntrospection; @@ -34,8 +35,9 @@ stdenv.mkDerivation (finalAttrs: { pname = "upower"; version = "1.90.4"; - outputs = [ "out" "dev" "installedTests" ] - ++ lib.optionals withDocs [ "devdoc" ]; + outputs = [ "out" "dev" ] + ++ lib.optionals withDocs [ "devdoc" ] + ++ lib.optionals withIntrospection [ "installedTests" ]; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; @@ -81,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { libgudev libusb1 udev - systemd + ] ++ lib.optionals withIntrospection [ # Duplicate from nativeCheckInputs until https://github.com/NixOS/nixpkgs/issues/161570 is solved umockdev @@ -92,17 +94,20 @@ stdenv.mkDerivation (finalAttrs: { pp.pygobject3 pp.packaging ])) + ] ++ lib.optionals withSystemd [ + systemd ] ++ lib.optionals useIMobileDevice [ libimobiledevice ]; nativeCheckInputs = [ + libeatmydata + ] ++ lib.optionals withIntrospection [ python3.pkgs.dbus-python python3.pkgs.python-dbusmock python3.pkgs.pygobject3 dbus umockdev - libeatmydata python3.pkgs.packaging ]; @@ -180,7 +185,7 @@ stdenv.mkDerivation (finalAttrs: { ! test -e "$DESTDIR" ''; - postFixup = '' + postFixup = lib.optionalString withIntrospection '' wrapProgram "$installedTests/libexec/upower/integration-test.py" \ --prefix GI_TYPELIB_PATH : "${lib.makeSearchPath "lib/girepository-1.0" [ "$out" diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix index 61b52ede77..6afae4dcc9 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, zlib, shadow +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, zlib, shadow , capabilitiesSupport ? stdenv.hostPlatform.isLinux , libcap_ng , libxcrypt @@ -29,6 +29,12 @@ stdenv.mkDerivation rec { patches = [ ./rtcwake-search-PATH-for-shutdown.patch + + (fetchpatch { + name = "basename.patch"; + url = "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/patch/?id=77454e58d58f904cfdc02d3ca5bb65f1bd8739fc"; + hash = "sha256-ELWC4bYN3rvn9XIN0XgCo55pXNfS2VpbZWuwzRLfO/0="; + }) ]; # We separate some of the utilities into their own outputs. This diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/waydroid/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/waydroid/default.nix deleted file mode 100644 index 5e29b911ca..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/waydroid/default.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ lib -, fetchFromGitHub -, fetchpatch -, python3Packages -, dnsmasq -, gawk -, getent -, gobject-introspection -, gtk3 -, kmod -, lxc -, iproute2 -, iptables -, util-linux -, wrapGAppsHook3 -, wl-clipboard -, runtimeShell -}: - -python3Packages.buildPythonApplication rec { - pname = "waydroid"; - version = "1.4.2"; - format = "other"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = version; - sha256 = "sha256-/dFvhiK3nCOOmAtrYkQEB8Ge8Rf1ea5cDO7puTwS5bI="; - }; - - patches = [ - # https://github.com/waydroid/waydroid/pull/1218 - (fetchpatch { - url = "https://github.com/waydroid/waydroid/commit/595e0e5b309a79fedaa07d90b9073ddcb156314c.patch"; - hash = "sha256-A+rUmJbFFhMZ5WpT+QBCTEcn82wJuvmi8Wbcsio41Nk="; - }) - ]; - - nativeBuildInputs = [ - gobject-introspection - wrapGAppsHook3 - ]; - - buildInputs = [ - gtk3 - ]; - - propagatedBuildInputs = with python3Packages; [ - dbus-python - gbinder-python - pyclip - pygobject3 - ]; - - dontUseSetuptoolsBuild = true; - dontUsePipInstall = true; - dontUseSetuptoolsCheck = true; - dontWrapPythonPrograms = true; - dontWrapGApps = true; - - installPhase = '' - make install PREFIX=$out USE_SYSTEMD=0 - ''; - - preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - - patchShebangs --host $out/lib/waydroid/data/scripts - wrapProgram $out/lib/waydroid/data/scripts/waydroid-net.sh \ - --prefix PATH ":" ${lib.makeBinPath [ dnsmasq getent iproute2 iptables ]} - - wrapPythonProgramsIn $out/lib/waydroid/ "${lib.concatStringsSep " " ([ - "$out" - ] ++ propagatedBuildInputs ++ [ - gawk - kmod - lxc - util-linux - wl-clipboard - ])}" - - substituteInPlace $out/lib/waydroid/tools/helpers/*.py \ - --replace '"sh"' '"${runtimeShell}"' - ''; - - meta = { - description = "Waydroid is a container-based approach to boot a full Android system on a regular GNU/Linux system like Ubuntu"; - mainProgram = "waydroid"; - homepage = "https://github.com/waydroid/waydroid"; - license = lib.licenses.gpl3; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ mcaju ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/wiringpi/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/wiringpi/default.nix index a8eb74217a..57d72b67bc 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/wiringpi/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/wiringpi/default.nix @@ -7,12 +7,12 @@ }: let - version = "3.6"; + version = "3.10"; srcAll = fetchFromGitHub { owner = "WiringPi"; repo = "WiringPi"; rev = version; - sha256 = "sha256-Hw81Ua9LTb/9l3Js1rx8TfCOF59MrrvH6AGsAsG1SoE="; + sha256 = "sha256-OWR+yo+SnYaMd8J+ku9ettZi+rDHcHlGZCoucCiRkCI="; }; mkSubProject = { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/zenmonitor/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/zenmonitor/default.nix index bf9ddbc5fe..837785c4d5 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/zenmonitor/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/zenmonitor/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with lib; { + inherit (src.meta) homepage; description = "Monitoring software for AMD Zen-based CPUs"; mainProgram = "zenmonitor"; - homepage = "https://github.com/Ta180m/zenmonitor3"; license = licenses.mit; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with maintainers; [ alexbakker artturin ]; diff --git a/third_party/nixpkgs/pkgs/pkgs-lib/formats.nix b/third_party/nixpkgs/pkgs/pkgs-lib/formats.nix index c99144d935..03663ad96b 100644 --- a/third_party/nixpkgs/pkgs/pkgs-lib/formats.nix +++ b/third_party/nixpkgs/pkgs/pkgs-lib/formats.nix @@ -109,18 +109,21 @@ rec { singleIniAtom = nullOr (oneOf [ bool int float str ]) // { description = "INI atom (null, bool, int, float or string)"; }; - iniAtom = { listsAsDuplicateKeys, listToValue }: + iniAtom = { listsAsDuplicateKeys, listToValue, atomsCoercedToLists }: + let + singleIniAtomOr = if atomsCoercedToLists then coercedTo singleIniAtom lib.singleton else either singleIniAtom; + in if listsAsDuplicateKeys then - coercedTo singleIniAtom lib.singleton (listOf singleIniAtom) // { + singleIniAtomOr (listOf singleIniAtom) // { description = singleIniAtom.description + " or a list of them for duplicate keys"; } else if listToValue != null then - coercedTo singleIniAtom lib.singleton (nonEmptyListOf singleIniAtom) // { + singleIniAtomOr (nonEmptyListOf singleIniAtom) // { description = singleIniAtom.description + " or a non-empty list of them"; } else singleIniAtom; - iniSection = { listsAsDuplicateKeys, listToValue }@args: + iniSection = { listsAsDuplicateKeys, listToValue, atomsCoercedToLists }@args: attrsOf (iniAtom args) // { description = "section of an INI file (attrs of " + (iniAtom args).description + ")"; }; @@ -133,18 +136,26 @@ rec { # Alternative to listsAsDuplicateKeys, converts list to non-list # listToValue :: [IniAtom] -> IniAtom listToValue ? null, + # Merge multiple instances of the same key into a list + atomsCoercedToLists ? null, ... }@args: assert listsAsDuplicateKeys -> listToValue == null; + assert atomsCoercedToLists != null -> (listsAsDuplicateKeys || listToValue != null); + let + atomsCoercedToLists' = if atomsCoercedToLists == null then false else atomsCoercedToLists; + in { - type = lib.types.attrsOf (iniSection { listsAsDuplicateKeys = listsAsDuplicateKeys; listToValue = listToValue; }); + type = lib.types.attrsOf ( + iniSection { inherit listsAsDuplicateKeys listToValue; atomsCoercedToLists = atomsCoercedToLists'; } + ); generate = name: value: lib.pipe value [ (lib.mapAttrs (_: maybeToList listToValue)) - (lib.generators.toINI (removeAttrs args ["listToValue"])) + (lib.generators.toINI (removeAttrs args ["listToValue" "atomsCoercedToLists"])) (pkgs.writeText name) ]; }; @@ -155,26 +166,34 @@ rec { # Alternative to listsAsDuplicateKeys, converts list to non-list # listToValue :: [IniAtom] -> IniAtom listToValue ? null, + # Merge multiple instances of the same key into a list + atomsCoercedToLists ? null, ... }@args: assert listsAsDuplicateKeys -> listToValue == null; + assert atomsCoercedToLists != null -> (listsAsDuplicateKeys || listToValue != null); + let + atomsCoercedToLists' = if atomsCoercedToLists == null then false else atomsCoercedToLists; + in { type = lib.types.submodule { options = { sections = lib.mkOption rec { - type = lib.types.attrsOf (iniSection { listsAsDuplicateKeys = listsAsDuplicateKeys; listToValue = listToValue; }); + type = lib.types.attrsOf ( + iniSection { inherit listsAsDuplicateKeys listToValue; atomsCoercedToLists = atomsCoercedToLists'; } + ); default = {}; description = type.description; }; globalSection = lib.mkOption rec { - type = iniSection { listsAsDuplicateKeys = listsAsDuplicateKeys; listToValue = listToValue; }; + type = iniSection { inherit listsAsDuplicateKeys listToValue; atomsCoercedToLists = atomsCoercedToLists'; }; default = {}; description = "global " + type.description; }; }; }; generate = name: { sections ? {}, globalSection ? {}, ... }: - pkgs.writeText name (lib.generators.toINIWithGlobalSection (removeAttrs args ["listToValue"]) + pkgs.writeText name (lib.generators.toINIWithGlobalSection (removeAttrs args ["listToValue" "atomsCoercedToLists"]) { globalSection = maybeToList listToValue globalSection; sections = lib.mapAttrs (_: maybeToList listToValue) sections; @@ -186,6 +205,7 @@ rec { atom = iniAtom { listsAsDuplicateKeys = listsAsDuplicateKeys; listToValue = null; + atomsCoercedToLists = false; }; in attrsOf (attrsOf (either atom (attrsOf atom))); diff --git a/third_party/nixpkgs/pkgs/pkgs-lib/tests/formats.nix b/third_party/nixpkgs/pkgs/pkgs-lib/tests/formats.nix index 86a35c6bf2..5f6f3b93e2 100644 --- a/third_party/nixpkgs/pkgs/pkgs-lib/tests/formats.nix +++ b/third_party/nixpkgs/pkgs/pkgs-lib/tests/formats.nix @@ -222,6 +222,67 @@ in runBuildTests { ''; }; + iniCoercedDuplicateKeys = shouldPass rec { + format = formats.ini { + listsAsDuplicateKeys = true; + atomsCoercedToLists = true; + }; + input = format.type.merge [ ] [ + { + file = "format-test-inner-iniCoercedDuplicateKeys"; + value = { foo = { bar = 1; }; }; + } + { + file = "format-test-inner-iniCoercedDuplicateKeys"; + value = { foo = { bar = 2; }; }; + } + ]; + expected = '' + [foo] + bar=1 + bar=2 + ''; + }; + + iniCoercedListToValue = shouldPass rec { + format = formats.ini { + listToValue = lib.concatMapStringsSep ", " (lib.generators.mkValueStringDefault { }); + atomsCoercedToLists = true; + }; + input = format.type.merge [ ] [ + { + file = "format-test-inner-iniCoercedListToValue"; + value = { foo = { bar = 1; }; }; + } + { + file = "format-test-inner-iniCoercedListToValue"; + value = { foo = { bar = 2; }; }; + } + ]; + expected = '' + [foo] + bar=1, 2 + ''; + }; + + iniCoercedNoLists = shouldFail { + format = formats.ini { atomsCoercedToLists = true; }; + input = { + foo = { + bar = 1; + }; + }; + }; + + iniNoCoercedNoLists = shouldFail { + format = formats.ini { atomsCoercedToLists = false; }; + input = { + foo = { + bar = 1; + }; + }; + }; + iniWithGlobalNoSections = shouldPass { format = formats.iniWithGlobalSection {}; input = {}; @@ -317,6 +378,82 @@ in runBuildTests { ''; }; + iniWithGlobalCoercedDuplicateKeys = shouldPass rec { + format = formats.iniWithGlobalSection { + listsAsDuplicateKeys = true; + atomsCoercedToLists = true; + }; + input = format.type.merge [ ] [ + { + file = "format-test-inner-iniWithGlobalCoercedDuplicateKeys"; + value = { + globalSection = { baz = 4; }; + sections = { foo = { bar = 1; }; }; + }; + } + { + file = "format-test-inner-iniWithGlobalCoercedDuplicateKeys"; + value = { + globalSection = { baz = 3; }; + sections = { foo = { bar = 2; }; }; + }; + } + ]; + expected = '' + baz=3 + baz=4 + + [foo] + bar=2 + bar=1 + ''; + }; + + iniWithGlobalCoercedListToValue = shouldPass rec { + format = formats.iniWithGlobalSection { + listToValue = lib.concatMapStringsSep ", " (lib.generators.mkValueStringDefault { }); + atomsCoercedToLists = true; + }; + input = format.type.merge [ ] [ + { + file = "format-test-inner-iniWithGlobalCoercedListToValue"; + value = { + globalSection = { baz = 4; }; + sections = { foo = { bar = 1; }; }; + }; + } + { + file = "format-test-inner-iniWithGlobalCoercedListToValue"; + value = { + globalSection = { baz = 3; }; + sections = { foo = { bar = 2; }; }; + }; + } + ]; + expected = '' + baz=3, 4 + + [foo] + bar=2, 1 + ''; + }; + + iniWithGlobalCoercedNoLists = shouldFail { + format = formats.iniWithGlobalSection { atomsCoercedToLists = true; }; + input = { + globalSection = { baz = 4; }; + foo = { bar = 1; }; + }; + }; + + iniWithGlobalNoCoercedNoLists = shouldFail { + format = formats.iniWithGlobalSection { atomsCoercedToLists = false; }; + input = { + globalSection = { baz = 4; }; + foo = { bar = 1; }; + }; + }; + keyValueAtoms = shouldPass { format = formats.keyValue {}; input = { diff --git a/third_party/nixpkgs/pkgs/servers/authelia/update.sh b/third_party/nixpkgs/pkgs/servers/authelia/update.sh index 21776af2a0..a7f56fc6c5 100755 --- a/third_party/nixpkgs/pkgs/servers/authelia/update.sh +++ b/third_party/nixpkgs/pkgs/servers/authelia/update.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -I nixpkgs=./. -i bash -p coreutils gnused curl nix jq nodePackages.npm +#! nix-shell -I nixpkgs=./. -i bash -p coreutils gnused curl nix jq nodejs set -euo pipefail DRV_DIR="$(dirname "${BASH_SOURCE[0]}")" diff --git a/third_party/nixpkgs/pkgs/servers/clickhouse/default.nix b/third_party/nixpkgs/pkgs/servers/clickhouse/default.nix index 7589ae3630..9a6a4e4713 100644 --- a/third_party/nixpkgs/pkgs/servers/clickhouse/default.nix +++ b/third_party/nixpkgs/pkgs/servers/clickhouse/default.nix @@ -133,9 +133,9 @@ in mkDerivation rec { pushd rust cargoDeps="$rustDeps" cargoSetupPostUnpackHook rustDepsCopy="$cargoDepsCopy" - cat .cargo/config >> .cargo/config.toml.in - cat .cargo/config >> skim/.cargo/config.toml.in - rm .cargo/config + cat .cargo/config.toml >> .cargo/config.toml.in + cat .cargo/config.toml >> skim/.cargo/config.toml.in + rm .cargo/config.toml popd popd 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 5c3c5df262..26f060676d 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "2730b11398944faa5151c51b0655cf26631090343c303597814f2a57df424736"; + sha256 = "252a2b83a9319a605103f7491d73a881e97c63339d09170ac9d525155fa41b1a"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/servers/frr/default.nix b/third_party/nixpkgs/pkgs/servers/frr/default.nix index bcb829d716..29f2d42d28 100644 --- a/third_party/nixpkgs/pkgs/servers/frr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/frr/default.nix @@ -154,7 +154,7 @@ stdenv.mkDerivation (finalAttrs: { "--enable-user=frr" "--enable-vty-group=frrvty" "--localstatedir=/run/frr" - "--sbindir=$(out)/libexec/frr" + "--sbindir=${placeholder "out"}/libexec/frr" "--sysconfdir=/etc/frr" "--with-clippy=${finalAttrs.clippy-helper}/bin/clippy" # general options @@ -198,7 +198,8 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace tools/frr-reload \ - --replace /usr/lib/frr/ $out/libexec/frr/ + --replace-quiet /usr/lib/frr/ $out/libexec/frr/ + sed -i '/^PATH=/ d' tools/frr.in tools/frrcommon.sh.in ''; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/servers/gotosocial/default.nix b/third_party/nixpkgs/pkgs/servers/gotosocial/default.nix index 34d9abbbe7..ef7646e9dd 100644 --- a/third_party/nixpkgs/pkgs/servers/gotosocial/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gotosocial/default.nix @@ -1,18 +1,19 @@ -{ lib -, fetchurl -, fetchFromGitHub -, buildGoModule -, nixosTests +{ + lib, + fetchurl, + fetchFromGitHub, + buildGoModule, + nixosTests, }: let owner = "superseriousbusiness"; repo = "gotosocial"; - version = "0.16.0"; + version = "0.17.0"; web-assets = fetchurl { url = "https://github.com/${owner}/${repo}/releases/download/v${version}/${repo}_${version}_web-assets.tar.gz"; - hash = "sha256-aZQpd5KvoZvXEMVzGbWrtGsc+P1JStjZ6U5mX6q7Vb0="; + hash = "sha256-ASqPIf98qdnkh3j72ifQN3mWnzNCTRcUegmrStvQ08Q="; }; in buildGoModule rec { @@ -22,7 +23,7 @@ buildGoModule rec { src = fetchFromGitHub { inherit owner repo; rev = "refs/tags/v${version}"; - hash = "sha256-QoG09+jmq5e5vxDVtkhY35098W/9B1HsYTuUnz43LV4="; + hash = "sha256-uyqP3zhjcXKejGFAwZoTn2kY8IpX0QAAXNzb1VG6ve8="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/servers/guacamole-client/default.nix b/third_party/nixpkgs/pkgs/servers/guacamole-client/default.nix index e3a142983a..cc02021804 100644 --- a/third_party/nixpkgs/pkgs/servers/guacamole-client/default.nix +++ b/third_party/nixpkgs/pkgs/servers/guacamole-client/default.nix @@ -8,7 +8,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { version = "1.5.5"; src = fetchurl { - url = "https://archive.apache.org/dist/guacamole/${finalAttrs.version}/binary/guacamole-${finalAttrs.version}.war"; + url = "mirror://apache/guacamole/${finalAttrs.version}/binary/guacamole-${finalAttrs.version}.war"; hash = "sha256-QmcwfzYAZjcj8kr5LVlumcg1lCUxUTUFKkLUUflSkgA="; }; diff --git a/third_party/nixpkgs/pkgs/servers/guacamole-server/default.nix b/third_party/nixpkgs/pkgs/servers/guacamole-server/default.nix index 0a6fa5dd89..42bf481e25 100644 --- a/third_party/nixpkgs/pkgs/servers/guacamole-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/guacamole-server/default.nix @@ -6,7 +6,7 @@ , autoPatchelfHook , autoreconfHook , cairo -, ffmpeg_7-headless +, ffmpeg-headless , freerdp , libjpeg_turbo , libpng @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cairo - ffmpeg_7-headless + ffmpeg-headless freerdp libjpeg_turbo libossp_uuid diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.sh b/third_party/nixpkgs/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.sh index 74f29ca399..1fb366d13b 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.sh +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.sh @@ -21,5 +21,5 @@ function manifestCheckPhase() { if [ -z "${dontCheckManifest-}" ] && [ -z "${installCheckPhase-}" ]; then echo "Using manifestCheckPhase" - preDistPhases+=" manifestCheckPhase" + appendToVar preDistPhases manifestCheckPhase fi 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 a593d677fb..58dbbd5cc0 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2024.10.1"; + version = "2024.10.2"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -2414,7 +2414,8 @@ "lirc" = ps: with ps; [ ]; # missing inputs: python-lirc "litejet" = ps: with ps; [ - ]; # missing inputs: pylitejet + pylitejet + ]; "litterrobot" = ps: with ps; [ pylitterbot ]; @@ -5404,6 +5405,7 @@ "light" "linear_garage_door" "linkplay" + "litejet" "litterrobot" "livisi" "local_calendar" diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/adaptive_lighting/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/adaptive_lighting/default.nix index 9c35395d3e..403bb18826 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/adaptive_lighting/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/adaptive_lighting/default.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "basnijholt"; domain = "adaptive_lighting"; - version = "1.22.0"; + version = "1.23.0"; src = fetchFromGitHub { owner = "basnijholt"; repo = "adaptive-lighting"; rev = "refs/tags/${version}"; - hash = "sha256-k5pCgPM5xjVfWjOcr0UDFzYl/8z7yUwgYdBmC3+2F5k="; + hash = "sha256-Yq8mKk2j2CHyHvwyej0GeFQhuy1MFXwt0o+lDOGwrBU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/default.nix index 55e9b7d39f..b2d958812b 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/default.nix @@ -52,6 +52,8 @@ moonraker = callPackage ./moonraker {}; + nest_protect = callPackage ./nest_protect {}; + ntfy = callPackage ./ntfy {}; omnik_inverter = callPackage ./omnik_inverter {}; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/homematicip_local/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/homematicip_local/default.nix index 75778c6434..73924b838e 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/homematicip_local/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/homematicip_local/default.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "danielperna84"; domain = "homematicip_local"; - version = "1.65.0"; + version = "1.67.0"; src = fetchFromGitHub { owner = "danielperna84"; repo = "custom_homematic"; rev = "refs/tags/${version}"; - hash = "sha256-rUiesrVpGZMMo8JSboFTDE2oE0Q9hNYR4AvA/GR5+MY="; + hash = "sha256-lKjBt5oMSdGHXUddaGM+BQOhFnsobvgf2k6qMu2uofY="; }; dependencies = [ diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/mass/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/mass/default.nix index 2e0d893d60..7b8b852532 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/mass/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/mass/default.nix @@ -13,13 +13,13 @@ buildHomeAssistantComponent rec { owner = "music-assistant"; domain = "mass"; - version = "2024.8.1"; + version = "2024.9.1"; src = fetchFromGitHub { owner = "music-assistant"; repo = "hass-music-assistant"; rev = version; - hash = "sha256-lrJx2wsVY0aJ+iVBxbZryC6QRvaXdxjBsTma/4ptl4o="; + hash = "sha256-8YZ77SYv8hDsbKUjxPZnuAycLE8RkIbAq3HXk+OyAmM="; }; dependencies = [ diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/miele/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/miele/default.nix index 4085306205..3b05b714a8 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/miele/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/miele/default.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "astrandb"; domain = "miele"; - version = "2024.3.0"; + version = "2024.8.1"; src = fetchFromGitHub { inherit owner; repo = domain; rev = "refs/tags/v${version}"; - hash = "sha256-J9n4PFcd87L301B2YktrLcxp5Vu1HwDeCYnrMEJ0+TA="; + hash = "sha256-XwaOQJvosCUXMZYrKX7sMWJIrMx36RhuVYUq163vvNg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/moonraker/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/moonraker/default.nix index e975b7515b..15f79d1259 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/moonraker/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/moonraker/default.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "marcolivierarsenault"; domain = "moonraker"; - version = "1.3.5"; + version = "1.3.7"; src = fetchFromGitHub { owner = "marcolivierarsenault"; repo = "moonraker-home-assistant"; rev = "refs/tags/${version}"; - hash = "sha256-DufryUG4+tT77ErD6IzEkClnNJ4Rzz0ojkCZuZzhAlU="; + hash = "sha256-Mz78wCBP3U1CWbr3KajZ5RjQOIqhjFvmL9Walx+xxzQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/nest_protect/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/nest_protect/default.nix new file mode 100644 index 0000000000..b19ee4f99f --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/nest_protect/default.nix @@ -0,0 +1,30 @@ +{ + lib, + fetchFromGitHub, + buildHomeAssistantComponent, +}: +buildHomeAssistantComponent rec { + owner = "iMicknl"; + domain = "nest_protect"; + version = "0.3.12"; + + src = fetchFromGitHub { + inherit owner; + repo = "ha-nest-protect"; + rev = "refs/tags/v${version}"; + hash = "sha256-IiHndx+mQVfpMLisiRwSEhrFJ3mJ4qaWTxZrubowkQs="; + }; + + dontBuild = true; + + # AttributeError: 'async_generator' object has no attribute 'data' + doCheck = false; + + meta = with lib; { + changelog = "https://github.com/iMicknl/ha-nest-protect/releases/tag/v${version}"; + description = "Nest Protect integration for Home Assistant"; + homepage = "https://github.com/iMicknl/ha-nest-protect"; + maintainers = with maintainers; [ jamiemagee ]; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/default.nix index 5ee30efeaa..348b6aa7d2 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/default.nix @@ -9,13 +9,13 @@ buildHomeAssistantComponent rec { owner = "ollo69"; domain = "smartthinq_sensors"; - version = "0.40.0"; + version = "0.40.1"; src = fetchFromGitHub { inherit owner; repo = "ha-smartthinq-sensors"; rev = "v${version}"; - hash = "sha256-2uahTfRmhEqcazz6SzG2abR0e15POsIe/gKs62AITB8="; + hash = "sha256-15s4xQKNsjrhae8Cp6U0Ay3s/o8L9BjLvc+1Tu+ss1s="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/solax_modbus/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/solax_modbus/default.nix index 8780ce2fa2..52ee2d92ec 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/solax_modbus/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/solax_modbus/default.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "wills106"; domain = "solax_modbus"; - version = "2024.09.5"; + version = "2024.10.3"; src = fetchFromGitHub { owner = "wills106"; repo = "homeassistant-solax-modbus"; rev = "refs/tags/${version}"; - hash = "sha256-mpsa+9LBnDfvMbOuEwctoPSg8IHRmkrFalVyg+1KR00=x"; + hash = "sha256-6XLXCD7ItTGCRN9XQUetZfZBuMbFEmho6IOyFs4m0ek="; }; dependencies = [ pymodbus ]; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/yassi/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/yassi/default.nix index 39d8cd5145..3e69dc6ae8 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/yassi/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/yassi/default.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "samuelspagl"; domain = "samsung_soundbar"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { inherit owner; repo = "ha_samsung_soundbar"; rev = version; - hash = "sha256-pkwkXI05zDMEXPoE90YJBxoPYlzmSHH/BLExq0J1JrQ="; + hash = "sha256-uhyUQebAx4g1PT/urbyx8EZNFE9vIY0bUAKmgCwY3aQ="; }; propagatedBuildInputs = [ pysmartthings ]; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix index 1398dc0f2d..d515a1839b 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix @@ -5,18 +5,18 @@ buildNpmPackage rec { pname = "universal-remote-card"; - version = "4.0.6"; + version = "4.1.0"; src = fetchFromGitHub { owner = "Nerwyn"; repo = "android-tv-card"; rev = version; - hash = "sha256-daxuvbjbnB1OZbvVGrA/jRe65x3MCXGFQ3o4L17Bgjk="; + hash = "sha256-ze+bsQbPeqfcZ2pWrI4aH3a1+uxus6wC2G9D+uVMrMU="; }; patches = [ ./dont-call-git.patch ]; - npmDepsHash = "sha256-AQYsXaZ4TyL8QjxOfub24NBxp0U6WMe+Czq+ooXwkIw="; + npmDepsHash = "sha256-X4PuMvQ/ZmyUafLE7ADBPIKIB8ul5M1P23gOQEikTAg="; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index 4baaeb229d..6fc00b593a 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -408,7 +408,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2024.10.1"; + hassVersion = "2024.10.2"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -426,13 +426,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-yEClfdMyN0E+eelSFESVbVDzvZu/rn4qBCjD5L/L6Is="; + hash = "sha256-YHK6SJJok1FGtFfD2C2QFCtWzNK1ZiOGZe/kbQFkMvU="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-M2vuqHoLNVizoCXnQ4RRQ+//TgtoJxJaQFCz9H7UnVs="; + hash = "sha256-mVKokL6EcvLMvOEKIw1dlEQeXaxMLO8ExMOzw6r1eCs="; }; build-system = with python.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix index d56630451d..70c92b8bce 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20241002.2"; + version = "20241002.3"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-9NqPBWcNM288ATdKH+Em0e9g2V2497YJLt8Wx5OL4+k="; + hash = "sha256-O1Yb5bCaKoS/Owwb0I0bF2neN2YTOnu28ruVA1cnFzk="; }; # there is nothing to strip in this package diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix index 286e7dade0..499b4b823e 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pytest-homeassistant-custom-component"; - version = "0.13.154"; + version = "0.13.172"; pyproject = true; disabled = pythonOlder "3.12"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "MatthewFlamm"; repo = "pytest-homeassistant-custom-component"; rev = "refs/tags/${version}"; - hash = "sha256-BmZ12amsa4BzesaxGMdQ2VY2FM5ZfgU32plAl4mG+tE="; + hash = "sha256-azTnNgbdj7AMBLTz+y5BLeQDKUqA5wkxFMG3g30f6wo="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/stubs.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/stubs.nix index c99bedad54..25f33e9fb3 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/stubs.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/stubs.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.10.1"; + version = "2024.10.2"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-uPB9ge7oUjGwKKvg2V+Yf7l2KiwgLLIBH/CKP2erAHY="; + hash = "sha256-6aFZiJKPuUdnC3YzSHyJgn2iTHfP8MCwx17I7uxVTNg="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix index e13d75356a..07fc9a00b9 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix @@ -47,6 +47,9 @@ let xiaomi_miio = [ arrow ]; + zeroconf = [ + aioshelly + ]; zha = [ pydeconz ]; diff --git a/third_party/nixpkgs/pkgs/servers/home-automation/evcc/default.nix b/third_party/nixpkgs/pkgs/servers/home-automation/evcc/default.nix index 5f93c55867..1b33d907af 100644 --- a/third_party/nixpkgs/pkgs/servers/home-automation/evcc/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-automation/evcc/default.nix @@ -1,11 +1,11 @@ { lib , stdenv -, buildGo123Module +, buildGoModule , fetchFromGitHub , fetchNpmDeps , cacert , git -, go_1_23 +, go , enumer , mockgen , nodejs @@ -14,22 +14,22 @@ , nixosTests }: -buildGo123Module rec { +buildGoModule rec { pname = "evcc"; - version = "0.130.9"; + version = "0.130.13"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; rev = version; - hash = "sha256-g3z2yqw/84OMui5mchfqVHoR/6LdwNHgeBodf1jUtj4="; + hash = "sha256-cqw+4/GwdBy8XpAF/ViI5UxaaS17hryJSCw5kMLin4k="; }; - vendorHash = "sha256-C2eoNmv0GSi5DV53aUwGcBOw6n2btU/HhniMyu21vLE="; + vendorHash = "sha256-WP7ao54/PMLI+jAaZQgj1otCHEPHZd1A3oqb0DTgx1c="; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-60F6j87T77JEt3ej4FVTc8rnnpZSGzomrQp8VPWjv6Q="; + hash = "sha256-pec5hsPrvHHTg++NaLb7vL1YIU1e57o8EVxp9OMhm58="; }; nativeBuildInputs = [ @@ -40,7 +40,7 @@ buildGo123Module rec { overrideModAttrs = _: { nativeBuildInputs = [ enumer - go_1_23 + go git cacert mockgen @@ -74,6 +74,7 @@ buildGo123Module rec { # network access "TestOctopusConfigParse" "TestTemplates" + "TestOcpp" ]; in [ "-skip=^${lib.concatStringsSep "$|^" skippedTests}$" ]; diff --git a/third_party/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix b/third_party/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix index f574ae7824..bea5fd3135 100644 --- a/third_party/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { version = "3.7.4"; src = fetchurl { - url = "https://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz"; + url = "mirror://debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz"; sha256 = "0pwsj9rf6a6q7cnfbpcrfq2gjcy7sylqzqqr49g2zi39lrrh8533"; }; diff --git a/third_party/nixpkgs/pkgs/servers/http/unit/default.nix b/third_party/nixpkgs/pkgs/servers/http/unit/default.nix index b292780505..266687920c 100644 --- a/third_party/nixpkgs/pkgs/servers/http/unit/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/unit/default.nix @@ -3,8 +3,7 @@ , withPython3 ? true, python3, ncurses , withPHP81 ? true, php81 , withPHP82 ? false, php82 -, withPerl536 ? false, perl536 -, withPerl538 ? true, perl538 +, withPerl ? true, perl , withRuby_3_1 ? true, ruby_3_1 , withRuby_3_2 ? false, ruby_3_2 , withSSL ? true, openssl ? null @@ -43,8 +42,7 @@ in stdenv.mkDerivation rec { ++ optionals withPython3 [ python3 ncurses ] ++ optional withPHP81 php81-unit ++ optional withPHP82 php82-unit - ++ optional withPerl536 perl536 - ++ optional withPerl538 perl538 + ++ optional withPerl perl ++ optional withRuby_3_1 ruby_3_1 ++ optional withRuby_3_2 ruby_3_2 ++ optional withSSL openssl; @@ -65,13 +63,15 @@ in stdenv.mkDerivation rec { ${optionalString withPython3 "./configure python --module=python3 --config=python3-config --lib-path=${python3}/lib"} ${optionalString withPHP81 "./configure php --module=php81 --config=${php81-unit.unwrapped.dev}/bin/php-config --lib-path=${php81-unit}/lib"} ${optionalString withPHP82 "./configure php --module=php82 --config=${php82-unit.unwrapped.dev}/bin/php-config --lib-path=${php82-unit}/lib"} - ${optionalString withPerl536 "./configure perl --module=perl536 --perl=${perl536}/bin/perl"} - ${optionalString withPerl538 "./configure perl --module=perl538 --perl=${perl538}/bin/perl"} + ${optionalString withPerl "./configure perl --module=perl --perl=${perl}/bin/perl"} ${optionalString withRuby_3_1 "./configure ruby --module=ruby31 --ruby=${ruby_3_1}/bin/ruby"} ${optionalString withRuby_3_2 "./configure ruby --module=ruby32 --ruby=${ruby_3_2}/bin/ruby"} ''; - passthru.tests.unit-php = nixosTests.unit-php; + passthru.tests = { + unit-perl = nixosTests.unit-perl; + unit-php = nixosTests.unit-php; + }; meta = with lib; { description = "Dynamic web and application server, designed to run applications in multiple languages"; diff --git a/third_party/nixpkgs/pkgs/servers/jackett/default.nix b/third_party/nixpkgs/pkgs/servers/jackett/default.nix index b0d5ffaa17..c15904cbe4 100644 --- a/third_party/nixpkgs/pkgs/servers/jackett/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jackett/default.nix @@ -43,6 +43,7 @@ buildDotnetModule rec { meta = with lib; { description = "API Support for your favorite torrent trackers"; + mainProgram = "jackett"; homepage = "https://github.com/Jackett/Jackett/"; changelog = "https://github.com/Jackett/Jackett/releases/tag/v${version}"; license = licenses.gpl2Only; diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/default.nix b/third_party/nixpkgs/pkgs/servers/mastodon/default.nix index 9bc4dd29d6..979dd74635 100644 --- a/third_party/nixpkgs/pkgs/servers/mastodon/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mastodon/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, nodejs-slim, bundlerEnv, nixosTests -, yarn, callPackage, ruby, writeShellScript -, fetchYarnDeps, fixup-yarn-lock -, brotli +, yarn-berry, callPackage, ruby, writeShellScript +, brotli, python3 # Allow building a fork or custom version of Mastodon: , pname ? "mastodon" @@ -28,12 +27,12 @@ stdenv.mkDerivation rec { pname = "${pname}-modules"; inherit src version; - yarnOfflineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; + yarnOfflineCache = callPackage ./yarn.nix { + inherit version src; hash = yarnHash; }; - nativeBuildInputs = [ fixup-yarn-lock nodejs-slim yarn mastodonGems mastodonGems.wrappedRuby brotli ]; + nativeBuildInputs = [ nodejs-slim yarn-berry mastodonGems mastodonGems.wrappedRuby brotli python3 ]; RAILS_ENV = "production"; NODE_ENV = "production"; @@ -42,29 +41,33 @@ stdenv.mkDerivation rec { runHook preBuild export HOME=$PWD - fixup-yarn-lock ~/yarn.lock - yarn config --offline set yarn-offline-mirror $yarnOfflineCache - yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress + export YARN_ENABLE_TELEMETRY=0 + export npm_config_nodedir=${nodejs-slim} + export SECRET_KEY_BASE_DUMMY=1 + + mkdir -p ~/.yarn/berry + ln -s $yarnOfflineCache ~/.yarn/berry/cache + + yarn install --immutable --immutable-cache patchShebangs ~/bin patchShebangs ~/node_modules - # skip running yarn install - rm -rf ~/bin/yarn + bundle exec rails assets:precompile - OTP_SECRET=precompile_placeholder SECRET_KEY_BASE=precompile_placeholder \ - rails assets:precompile - yarn cache clean --offline + yarn cache clean --all rm -rf ~/node_modules/.cache + # Remove execute permissions + find ~/public/assets -type f ! -perm 0555 \ + -exec chmod 0444 {} ';' + # Create missing static gzip and brotli files - gzip --best --keep ~/public/assets/500.html - gzip --best --keep ~/public/packs/report.html - find ~/public/assets -maxdepth 1 -type f -name '.*.json' \ - -exec gzip --best --keep --force {} ';' - brotli --best --keep ~/public/packs/report.html - find ~/public/assets -type f -regextype posix-extended -iregex '.*\.(css|js|json|html)' \ + find ~/public/assets -type f -regextype posix-extended -iregex '.*\.(css|html|js|json|svg)' \ + -exec gzip --best --keep --force {} ';' \ -exec brotli --best --keep {} ';' + gzip --best --keep ~/public/packs/report.html + brotli --best --keep ~/public/packs/report.html runHook postBuild ''; @@ -101,13 +104,14 @@ stdenv.mkDerivation rec { done # Remove execute permissions - chmod 0444 public/emoji/*.svg + find public/emoji -type f ! -perm 0555 \ + -exec chmod 0444 {} ';' # Create missing static gzip and brotli files - find public -maxdepth 1 -type f -regextype posix-extended -iregex '.*\.(css|js|svg|txt|xml)' \ + find public -maxdepth 1 -type f -regextype posix-extended -iregex '.*\.(js|txt)' \ -exec gzip --best --keep --force {} ';' \ -exec brotli --best --keep {} ';' - find public/emoji -type f -name '.*.svg' \ + find public/emoji -type f -name '*.svg' \ -exec gzip --best --keep --force {} ';' \ -exec brotli --best --keep {} ';' ln -s assets/500.html.gz public/500.html.gz @@ -133,7 +137,8 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $out - cp -r * $out/ + mv .{env*,ruby*} $out/ + mv * $out/ ln -s ${run-streaming} $out/run-streaming.sh runHook postInstall diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/gemset.nix b/third_party/nixpkgs/pkgs/servers/mastodon/gemset.nix index 20be6e58e3..429393553e 100644 --- a/third_party/nixpkgs/pkgs/servers/mastodon/gemset.nix +++ b/third_party/nixpkgs/pkgs/servers/mastodon/gemset.nix @@ -1,14 +1,14 @@ { actioncable = { - dependencies = ["actionpack" "activesupport" "nio4r" "websocket-driver"]; + dependencies = ["actionpack" "activesupport" "nio4r" "websocket-driver" "zeitwerk"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c46q4ykf8cqcpzad7zhkrxjhvf92sil0185zvxwzhj95p1zp5vr"; + sha256 = "1g4g7r68h30iw7spypc7hvvd7w1vx05mysmijdy6vkr947hxyhw4"; type = "gem"; }; - version = "7.0.8.4"; + version = "7.1.4"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x100vq4rf2c5ndz8ai00hb5gsb9ax2xqc89dsfzzhxbpa9gs9ik"; + sha256 = "0vzkwsc7k43v5irpydrzrh4v9dmwikj9xcdafz21kvwh8903pgih"; type = "gem"; }; - version = "7.0.8.4"; + version = "7.1.4"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; @@ -27,21 +27,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hds7b6n7vsa64fmma7wl7x9mxscr89myfb13vxni5fcns1agwzr"; + sha256 = "09abzaywpzwnbkpdn8g340pi584k8lpcqzi63m7wahyyyairdqza"; type = "gem"; }; - version = "7.0.8.4"; + version = "7.1.4"; }; actionpack = { - dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; + dependencies = ["actionview" "activesupport" "nokogiri" "racc" "rack" "rack-session" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; groups = ["default" "development" "pam_authentication" "production" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18k05a55i0xgyv60lx0m1psnyncn935j76ivbp9hssqpij00jj1f"; + sha256 = "0c72nzrs3jjag7xbawy8hzzxggmpfp4r23y6viril2xzxffqgy7m"; type = "gem"; }; - version = "7.0.8.4"; + version = "7.1.4"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g54g1kjyrwv9g592gxfz7z6ksmj916l1cgkxk54zhywxf6gpn0y"; + sha256 = "14lvvaq994hihwb63jvdxbq03i5wgfk6llkibzsq1v0csphby1sx"; type = "gem"; }; - version = "7.0.8.4"; + version = "7.1.4"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03rfynhj40270dqhkm4cyaphzb37b4fdiaqh9grvcfq760vx7ha5"; + sha256 = "0lrrb4r6p2wrdbjphkkd482h10hri77d1aj1ddhz3ynvbrkg0ay0"; type = "gem"; }; - version = "7.0.8.4"; + version = "7.1.4"; }; active_model_serializers = { dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xdp7cpj3yj3wl4vj0nqq44kzjavlxi1wq3cf9zp0whkir0ym0gy"; + sha256 = "13n1ipn0dg3k852xhfzdvkr1ljq76xvfnm79qzdix2ishiy1gphl"; type = "gem"; }; - version = "0.10.13"; + version = "0.10.14"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b54didwsg5p8wn30qjwspzh97w7g07hrsdzr7wdrdly4zii7sr1"; + sha256 = "1xhb7hy7dxx5qy8hahdf2gpr65n0xisxrfapzd2g8czb59ammxk5"; type = "gem"; }; - version = "7.0.8.4"; + version = "7.1.4"; }; activemodel = { dependencies = ["activesupport"]; @@ -93,43 +93,43 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mi5cppdmkzgr2z135ibs0bq71qndbnip0vfflz1n4j4hqnhjkpg"; + sha256 = "1dhhsiv2hk1jfqdxx9qqlmzhvshqjs9kqh13gl1jyzfhzmd0b38q"; type = "gem"; }; - version = "7.0.8.4"; + version = "7.1.4"; }; activerecord = { - dependencies = ["activemodel" "activesupport"]; + dependencies = ["activemodel" "activesupport" "timeout"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pkv0jvvjc3grr0rvxni9b3j3hb22jaj0h70g476h9w54p0aljcb"; + sha256 = "1p9cch94h3wj71mldyk85657r4cpr9p3z55bwxqvpiby2fn6svc3"; type = "gem"; }; - version = "7.0.8.4"; + version = "7.1.4"; }; activestorage = { - dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; + dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qdqx20dqkg7iwzb8q5148x5sl9mr2063hxzy4i7i94af2d2vz6b"; + sha256 = "0ihbywjdp57mcnbx2150rpsx79f3pfv313d1zwsz0qwmzdcvpsr3"; type = "gem"; }; - version = "7.0.8.4"; + version = "7.1.4"; }; activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"]; groups = ["default" "development" "pam_authentication" "production" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15z11983ws5svibg6rky9k2mgd4d4chnvddyxfpgn81b81q70139"; + sha256 = "0cm2v3zkr58ljr1fswf67lkm8zwxr100qfdaxzzv46jlwmy1m3is"; type = "gem"; }; - version = "7.0.8.4"; + version = "7.1.4"; }; addressable = { dependencies = ["public_suffix"]; @@ -137,10 +137,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33"; + sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6"; type = "gem"; }; - version = "2.8.5"; + version = "2.8.7"; }; aes_key_wrap = { groups = ["default"]; @@ -152,17 +152,6 @@ }; version = "1.1.0"; }; - airbrussh = { - dependencies = ["sshkit"]; - groups = ["default" "development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0x55y3ynkda76pwnsvrrjlvxfcc7yn1irad8radll9c9cif41jqv"; - type = "gem"; - }; - version = "1.4.1"; - }; android_key_attestation = { groups = ["default"]; platforms = []; @@ -194,26 +183,15 @@ }; version = "2.4.2"; }; - attr_encrypted = { - dependencies = ["encryptor"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "034x6mbrv9apd83v99v9pm8vl3d17w5bbwws26gr4wv95fylmgnc"; - type = "gem"; - }; - version = "4.0.0"; - }; attr_required = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g22axmi2rhhy7w8c3x6gppsawxqavbrnxpnmphh22fk7cwi0kh2"; + sha256 = "16fbwr6nmsn97n0a6k1nwbpyz08zpinhd6g7196lz1syndbgrszh"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; awrence = { groups = ["default"]; @@ -230,20 +208,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz"; + sha256 = "0gvdg4yx4p9av2glmp7vsxhs0n8fj1ga9kq2xdb8f95j7b04qhzi"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; aws-partitions = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m2kha6ip4ynhvl1l8z4vg0j96ngq4f2v6jl4j2y27m2kzmgcxz5"; + sha256 = "1pm4dxz3w1f5ksiid7bxdaxhz0rklci3zfyb4v1f6j9psa11cwh1"; type = "gem"; }; - version = "1.809.0"; + version = "1.978.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -251,10 +229,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xjw9cf6ldbw50xi5ric8d63r8kybpsvaqxh2v6n7374hfady73i"; + sha256 = "0hm87r5ph1mi7n6b5y17hc54x38insbkgbflr7viqigbwy2slw3v"; type = "gem"; }; - version = "3.181.0"; + version = "3.209.0"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -262,10 +240,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zr5w2cjd895abyn7y5gifhq37bxcinssvdx2l1qmlkllbdxbwq0"; + sha256 = "1acx3bhqkhni3kbl7xnjdgy8raq5y7p0zyniq61bsihzkwcj7imh"; type = "gem"; }; - version = "1.71.0"; + version = "1.94.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -273,10 +251,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yymj15nwnvam95lw5fxwxx7b6xm4hkj8z7byzvjmx9aji1x245m"; + sha256 = "0zpww3lxpjg8smmznz2nbx5hrpnkzflbasllxjwprkqr56rrrjap"; type = "gem"; }; - version = "1.133.0"; + version = "1.166.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -284,10 +262,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z889c4c1w7wsjm3szg64ay5j51kjl4pdf94nlr1yks2rlanm7na"; + sha256 = "176zh13m1vhwgys0drlqiw79ljmmx84vva036shsb7rzr4yi36qm"; type = "gem"; }; - version = "1.6.0"; + version = "1.10.0"; }; azure-storage-blob = { dependencies = ["azure-storage-common" "nokogiri"]; @@ -312,14 +290,14 @@ version = "2.0.4"; }; base64 = { - groups = ["default" "development"]; + groups = ["default" "development" "pam_authentication" "production" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cydk9p2cv25qysm0sn2pb97fcpz1isa7n3c8xm1gd99li8x6x8c"; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; type = "gem"; }; - version = "0.1.1"; + version = "0.2.0"; }; bcp47_spec = { groups = ["default"]; @@ -336,10 +314,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "048z3fvcknqx7ikkhrcrykxlqmf9bzc7l0y5h1cnvrc9n2qf0k8m"; + sha256 = "16a0g2q40biv93i1hch3gw8rbmhp77qnnifj1k0a6m7dng3zh444"; type = "gem"; }; - version = "3.1.18"; + version = "3.1.20"; }; better_errors = { dependencies = ["erubi" "rack" "rouge"]; @@ -352,26 +330,25 @@ }; version = "2.10.1"; }; - better_html = { - dependencies = ["actionview" "activesupport" "ast" "erubi" "parser" "smart_properties"]; - groups = ["default" "development"]; + bigdecimal = { + groups = ["default" "development" "pam_authentication" "production" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y090dmgjxr3yzxi3pg5jgirkmyfdrmjhabmzmhg5i8ssiqr2gdz"; + sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; type = "gem"; }; - version = "2.0.1"; + version = "3.1.8"; }; bindata = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04y4zgh4bbcb8wmkxwfqg4saky1d1f3xw8z6yk543q13h8ky8rz5"; + sha256 = "08r67nglsqnxrbn803szf5bdnqhchhq8kf2by94f37fcl65wpp19"; type = "gem"; }; - version = "2.4.15"; + version = "2.5.0"; }; binding_of_caller = { dependencies = ["debug_inspector"]; @@ -379,20 +356,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "078n2dkpgsivcf0pr50981w95nfc2bsrp3wpf9wnxz1qsp8jbb9s"; + sha256 = "16mjj15ks5ws53v2y31hxcmf46d0qjdvdaadpk7xsij2zymh4a9b"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; blurhash = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "057afgqy73n8vm7k3cr4pbwm1hhqnm58lp4x7bgm5wzbs39m7xf8"; + sha256 = "1wni86h2mlb7sj51nq3iwsvkrzlaggls9xlf4p9dzr1ns79dphca"; type = "gem"; }; - version = "0.1.7"; + version = "0.1.8"; }; bootsnap = { dependencies = ["msgpack"]; @@ -400,20 +377,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vcg52gwl64xhhal6kwk1pc01y1klzdlnv1awyk89kb91z010x7q"; + sha256 = "0mdgj9yw1hmx3xh2qxyjc31y8igmxzd9h0c245ay2zkz76pl4k5c"; type = "gem"; }; - version = "1.16.0"; + version = "1.18.4"; }; brakeman = { + dependencies = ["racc"]; groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gliwnyma9f1mpr928c79i36q51yl68dwjd3jgwvsyr4piiiqr1r"; + sha256 = "078syvjnnkbair5ffyvchxj9yd2c8215c1271kfh1gqsmaf70bl6"; type = "gem"; }; - version = "6.0.1"; + version = "6.2.1"; }; browser = { groups = ["default"]; @@ -441,10 +419,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; + sha256 = "0pw3r2lyagsxkm71bf44v5b74f7l9r7di22brbyji9fwz791hya9"; type = "gem"; }; - version = "3.2.4"; + version = "3.3.0"; }; bundler-audit = { dependencies = ["thor"]; @@ -452,65 +430,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gdx0019vj04n1512shhdx7hwphzqmdpw4vva2k551nd47y1dixx"; + sha256 = "0j0h5cgnzk0ms17ssjkzfzwz65ggrs3lsp53a1j46p4616m1s1bk"; type = "gem"; }; - version = "0.9.1"; - }; - capistrano = { - dependencies = ["airbrussh" "i18n" "rake" "sshkit"]; - groups = ["development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "14pflh85rrs2l8k0m286j4vaab5vad2sfqq9dncqb31z05vy29mn"; - type = "gem"; - }; - version = "3.17.3"; - }; - capistrano-bundler = { - dependencies = ["capistrano"]; - groups = ["default" "development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "09rndb1fa9r7mhb2sc6p3k0pcarhg8mv0kfmvd1zdb0ciwwp7514"; - type = "gem"; - }; - version = "2.1.0"; - }; - capistrano-rails = { - dependencies = ["capistrano" "capistrano-bundler"]; - groups = ["development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05lk7y4qyzadzzshjyhgfgx00ggqliq7n561wkx8m331wljv7kx7"; - type = "gem"; - }; - version = "1.6.3"; - }; - capistrano-rbenv = { - dependencies = ["capistrano" "sshkit"]; - groups = ["development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1x9m1i5zd0wx122zw3m40zprlmxk9d47bd6w61k81wr4qsvkk3rw"; - type = "gem"; - }; - version = "2.2.0"; - }; - capistrano-yarn = { - dependencies = ["capistrano"]; - groups = ["development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zdg2s061vl5b8114n909mrjb2hc1qx0i4wqx9nacsrcjgyp07l9"; - type = "gem"; - }; - version = "2.0.2"; + version = "0.9.2"; }; capybara = { dependencies = ["addressable" "matrix" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath"]; @@ -518,10 +441,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "114qm5f5vhwaaw9rj1h2lcamh46zl13v1m18jiw68zl961gwmw6n"; + sha256 = "1vxfah83j6zpw3v5hic0j70h519nvmix2hbszmjwm8cfawhagns2"; type = "gem"; }; - version = "3.39.2"; + version = "3.40.0"; }; case_transform = { dependencies = ["activesupport"]; @@ -549,10 +472,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cym7a0mrgf8wr27x07ka7fsjz3l7l9qiiyqra34f5k5ghira0c0"; + sha256 = "1c1dws56r7p8y363dhyikg7205z59a3bn4amnv2y488rrq8qm7ml"; type = "gem"; }; - version = "0.7.8"; + version = "0.7.9"; }; chewy = { dependencies = ["activesupport" "elasticsearch" "elasticsearch-dsl"]; @@ -560,10 +483,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zca6v8i66jkxfdfjnn9xwg21pk95qn4ic8vzfvrx49d6sb8319y"; + sha256 = "0kgqj7hcs09ln7i1rds1xify08rzjk02ryzvjdvnllg1fkh3vm2b"; type = "gem"; }; - version = "7.3.4"; + version = "7.6.0"; + }; + childprocess = { + dependencies = ["logger"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1v5nalaarxnfdm6rxb7q6fmc6nx097jd630ax6h9ch7xw95li3cs"; + type = "gem"; + }; + version = "5.1.0"; }; chunky_png = { groups = ["default"]; @@ -580,10 +514,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q11v0iabvr6rif0d025xh078ili5frrihlj0m04zfg7lgvagxji"; + sha256 = "198aswdyqlvcw9jkd95b7b8dp3fg0wx89kd1dx9wia1z36b1icin"; type = "gem"; }; - version = "0.2.0"; + version = "1.2.0"; }; cocoon = { groups = ["default"]; @@ -631,21 +565,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00c6x4ha7qiaaf88qdbyf240mk146zz78rbm4qwyaxmwlmk7q933"; + sha256 = "1rbdzl9n8ppyp38y75hw06s17kp922ybj6jfvhz52p83dg6xpm6m"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.1"; }; crack = { - dependencies = ["rexml"]; + dependencies = ["bigdecimal" "rexml"]; groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cr1kfpw3vkhysvkk3wg7c54m75kd68mbm9rs5azdjdq57xid13r"; + sha256 = "0jaa7is4fw1cxigm8vlyhg05bw4nqy4f91zjqxk7pp4c8bdyyfn8"; type = "gem"; }; - version = "0.4.5"; + version = "1.0.0"; }; crass = { groups = ["default" "development" "pam_authentication" "production" "test"]; @@ -663,10 +597,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04q1vin8slr3k8mp76qz0wqgap6f9kdsbryvgfq9fljhrm463kpj"; + sha256 = "0xs3d0ihwg1z4h28d51hb07k926d1rlwy6c2c9ygbicg76srk0qa"; type = "gem"; }; - version = "1.14.0"; + version = "1.19.0"; + }; + csv = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zfn40dvgjk1xv1z8l11hr9jfg3jncwsc9yhzsz4l4rivkpivg8b"; + type = "gem"; + }; + version = "3.3.0"; }; database_cleaner-active_record = { dependencies = ["activerecord" "database_cleaner-core"]; @@ -674,10 +618,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12hdsqnws9gyc9sxiyc8pjiwr0xa7136m1qbhmd1pk3vsrrvk13k"; + sha256 = "1iz1hv2b1z7509dxvxdwzay1hhs24glxls5ldbyh688zxkcdca1j"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; database_cleaner-core = { groups = ["default" "test"]; @@ -699,15 +643,26 @@ }; version = "3.3.4"; }; + debug = { + dependencies = ["irb" "reline"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1z77qyzcmvz3ciny6cb24s79a243jqkybqk30b310yichp02dq28"; + type = "gem"; + }; + version = "1.9.2"; + }; debug_inspector = { groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01l678ng12rby6660pmwagmyg8nccvjfgs3487xna7ay378a59ga"; + sha256 = "18k8x9viqlkh7dbmjzh8crbjy8w480arpa766cw1dnn3xcpa1pwv"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; devise = { dependencies = ["bcrypt" "orm_adapter" "railties" "responders" "warden"]; @@ -715,21 +670,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vpd7d61d4pfmyb2plnnv82wmczzlhw4k4gjhd2fv4r6vq8ilqqi"; + sha256 = "1y57fpcvy1kjd4nb7zk7mvzq62wqcpfynrgblj558k3hbvz4404j"; type = "gem"; }; - version = "4.9.2"; + version = "4.9.4"; }; devise-two-factor = { - dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"]; + dependencies = ["activesupport" "devise" "railties" "rotp"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nk43p339zyp4y5vab3w3s0zbjd4xfs8qn0ymxdnz6d961dbbdm8"; + sha256 = "1yx6ym8a9szwnq9yziljidqjn6gf99blvz1yib9qdd0qcg5x5hp8"; type = "gem"; }; - version = "4.1.0"; + version = "6.0.0"; }; devise_pam_authenticatable2 = { dependencies = ["devise" "rpam2"]; @@ -747,10 +702,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9"; + sha256 = "1znxccz83m4xgpd239nyqxlifdb7m8rlfayk6s259186nkgj6ci7"; type = "gem"; }; - version = "1.5.0"; + version = "1.5.1"; }; discard = { dependencies = ["activerecord"]; @@ -758,31 +713,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xavjhccyyzn9z6fz3034vgvzprc983mbrq6n9sc0drfw7m3vrip"; + sha256 = "0rysimck60hkj1japwb2np75kaf4jq8jvfzijh2izhadrabqj8am"; type = "gem"; }; - version = "1.2.1"; + version = "1.3.0"; }; docile = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lxqxgq71rqwj1lpl9q1mbhhhhhhdkkj7my341f2889pwayk85sz"; + sha256 = "07pj4z3h8wk4fgdn6s62vw1lwvhj0ac0x10vfbdkr9xzk7krn5cn"; type = "gem"; }; - version = "1.4.0"; + version = "1.4.1"; }; domain_name = { - dependencies = ["unf"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0"; + sha256 = "0cyr2xm576gqhqicsyqnhanni47408w2pgvrfi8pd13h2li3nsaz"; type = "gem"; }; - version = "0.5.20190701"; + version = "0.6.20240107"; }; doorkeeper = { dependencies = ["railties"]; @@ -790,41 +744,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q2pywgyn6cbnm0fh3dln5z1qgd1g8hvb4x8rppjc1bpfxnfhi13"; + sha256 = "0a6nbc12nfz355am2vwm1ql2p8zck7mr941glghmnl32djaga24b"; type = "gem"; }; - version = "5.6.6"; + version = "5.7.1"; }; dotenv = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n0pi8x8ql5h1mijvm8lgn6bhq4xjb5a500p5r1krq4s6j9lg565"; + sha256 = "0aanng90ad6vg9sm3qlq1223k456qw2xli9kcx13a3ga33kh5ibd"; type = "gem"; }; - version = "2.8.1"; + version = "3.1.4"; }; - dotenv-rails = { - dependencies = ["dotenv" "railties"]; - groups = ["default"]; + drb = { + groups = ["default" "development" "pam_authentication" "production" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v0gcbxzypcvy6fqq4gp80jb310xvdwj5n8qw9ci67g5yjvq2nxh"; + sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79"; type = "gem"; }; - version = "2.8.1"; - }; - ed25519 = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0zb2dr2ihb1qiknn5iaj1ha1w9p7lj9yq5waasndlfadz225ajji"; - type = "gem"; - }; - version = "1.3.0"; + version = "2.2.1"; }; elasticsearch = { dependencies = ["elasticsearch-api" "elasticsearch-transport"]; @@ -832,10 +775,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0havyxmvl157a653prspnbhgdchlx44xqxl170v1im5ggxwavcaq"; + sha256 = "11pw5x7kg6f6m8rqy2kpbzdlnvijjpmbqkj2gz8237wkbl40y27d"; type = "gem"; }; - version = "7.13.3"; + version = "7.17.11"; }; elasticsearch-api = { dependencies = ["multi_json"]; @@ -843,10 +786,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bmssarkk7lqkjdn8c9j7jvxcnn4hg1zcmhsky8bfvc99k33b3w8"; + sha256 = "01wi43a3zylrq2vca08vir5va142g5m3jcsak3rprjck8jvggn7y"; type = "gem"; }; - version = "7.13.3"; + version = "7.17.11"; }; elasticsearch-dsl = { groups = ["default"]; @@ -859,35 +802,36 @@ version = "0.1.10"; }; elasticsearch-transport = { - dependencies = ["faraday" "multi_json"]; + dependencies = ["base64" "faraday" "multi_json"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0blfii8qvj0m6bg9sbfynxc40in7zfmw2wpi4clv7d9gclk053db"; + sha256 = "00qgyyvjyyv7z22qjd408pby1h7902gdwkh8h3z3jk2y57amg06i"; type = "gem"; }; - version = "7.13.3"; + version = "7.17.11"; }; - encryptor = { - groups = ["default"]; + email_spec = { + dependencies = ["htmlentities" "launchy" "mail"]; + groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s8rvfl0vn8w7k1sgkc234060jh468s3zd45xa64p1jdmfa3zwmb"; + sha256 = "049dhlyy2hcksp1wj9mx2fngk5limkm3afxysnizg1hi2dxbw8yz"; type = "gem"; }; - version = "3.0.0"; + version = "2.3.0"; }; erubi = { groups = ["default" "development" "pam_authentication" "production" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; + sha256 = "0qnd6ff4az22ysnmni3730c41b979xinilahzg86bn7gv93ip9pw"; type = "gem"; }; - version = "1.12.0"; + version = "1.13.0"; }; et-orbi = { dependencies = ["tzinfo"]; @@ -905,31 +849,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08r6qgbpkxxsihjmlspk3l1sr69q5hx35p1l4wp7rmkbzys89867"; + sha256 = "0ala6123d3cv965ss48iyi0q4hcbzrznfwv2f1mr91sy98cigq4h"; type = "gem"; }; - version = "0.100.0"; + version = "0.111.0"; }; fabrication = { - groups = ["test"]; + groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bxssmjp49whzq2zv7w751gr4nkdaiwcxd1vda0byigwyrnj6f5q"; + sha256 = "1al5iv3as21l5clci0b5cg27z136pan7gkj7plp4l0w83c6z2y9c"; type = "gem"; }; - version = "2.30.0"; + version = "2.31.0"; }; faker = { dependencies = ["i18n"]; - groups = ["test"]; + groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ysiqlvyy1351bzx7h92r93a35s32l8giyf9bac6sgr142sh3cnn"; + sha256 = "1xj0xx2snnxzjipxpxwiki7053441jkdg10h0rmjiri040s5lssi"; type = "gem"; }; - version = "3.2.1"; + version = "3.4.2"; }; faraday = { dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"]; @@ -998,10 +942,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + sha256 = "10n6wikd442mfm15hd6gzm0qb527161w1wwch4h5m4iclkz2x6b3"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; faraday-net_http_persistent = { groups = ["default"]; @@ -1079,10 +1023,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; type = "gem"; }; - version = "1.15.5"; + version = "1.16.3"; }; ffi-compiler = { dependencies = ["ffi" "rake"]; @@ -1090,10 +1034,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c2caqm9wqnbidcb8dj4wd3s902z15qmgxplwyfyqbwa0ydki7q1"; + sha256 = "1844j58cdg2q6g0rqfwg4rrambnhf059h4yg9rfmrbrcs60kskx9"; type = "gem"; }; - version = "1.0.1"; + version = "1.3.2"; + }; + flatware = { + dependencies = ["drb" "thor"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13wcwdpdx1asjxvqpyxwlcazzsjisls28jjn28d9cqw9zwszcm1p"; + type = "gem"; + }; + version = "2.3.3"; + }; + flatware-rspec = { + dependencies = ["flatware" "rspec"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dgl20mi9a5iwcy6v9jq148ljy9rrvyjhp1rpd1sgadfw6kxzbhc"; + type = "gem"; + }; + version = "2.3.3"; }; fog-core = { dependencies = ["builder" "excon" "formatador" "mime-types"]; @@ -1101,10 +1067,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1agd6xgzk0rxrsjdpn94v4hy89s0nm2cs4zg2p880w2dan9xgrak"; + sha256 = "1vf21i2qpl1hagapds0qjlfl6gsyrbssifn2br2ifn3fg9j80yxl"; type = "gem"; }; - version = "2.1.0"; + version = "2.5.0"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; @@ -1118,25 +1084,25 @@ version = "1.2.0"; }; fog-openstack = { - dependencies = ["fog-core" "fog-json" "ipaddress"]; + dependencies = ["fog-core" "fog-json"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11j18h61d3p0pcp9k5346lbj1lahab1dqybkrx9338932lmjn7ap"; + sha256 = "1z7k3al9bb5ypzkrvi5szpfyi8sksggq68fwxrxywq6rky5lvhdq"; type = "gem"; }; - version = "0.3.10"; + version = "1.1.3"; }; formatador = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mprf1dwznz5ld0q1jpbyl59fwnwk6azspnd0am7zz7kfg3pxhv5"; + sha256 = "1l06bv4avphbdmr1y4g0rqlczr38k6r65b3zghrbj2ynyhm3xqjl"; type = "gem"; }; - version = "0.3.0"; + version = "1.1.0"; }; fugit = { dependencies = ["et-orbi" "raabro"]; @@ -1149,27 +1115,37 @@ }; version = "1.11.1"; }; - fuubar = { - dependencies = ["rspec-core" "ruby-progressbar"]; - groups = ["test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1028vn7j3kc5qqwswrf3has3qm4j9xva70xmzb3n29i89f0afwmj"; - type = "gem"; - }; - version = "2.5.1"; - }; globalid = { dependencies = ["activesupport"]; groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kqm5ndzaybpnpxqiqkc41k4ksyxl41ln8qqr6kb130cdxsf2dxk"; + sha256 = "1sbw6b66r7cwdx3jhs46s4lr991969hvigkjpbdl7y3i31qpdgvh"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.1"; + }; + google-protobuf = { + groups = ["default" "opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fanhdf3vzghma51w1hqpp8s585mwzxgqkwvxj5is4q9j0pgwcs3"; + type = "gem"; + }; + version = "3.25.5"; + }; + googleapis-common-protos-types = { + dependencies = ["google-protobuf"]; + groups = ["default" "opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sqmmfdxjp3fy7hzvl35bnd0yb0ds9030np5jqh338qz4w661cap"; + type = "gem"; + }; + version = "1.15.0"; }; haml = { dependencies = ["temple" "thor" "tilt"]; @@ -1177,10 +1153,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "154svzqlkdq7gslv3p8mfih28gbw4gsj4pd8wr1wpwz6nyzmhh8m"; + sha256 = "15yxph91zswbnfy7szpdcfbdfqqn595ff290hm4f6fcnhryvhvlf"; type = "gem"; }; - version = "6.1.2"; + version = "6.3.0"; }; haml-rails = { dependencies = ["actionpack" "activesupport" "haml" "railties"]; @@ -1199,20 +1175,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qics7sll6yw7fm499q4b1frfr5f3gav94ach0fwy49zprl9yk33"; + sha256 = "1mf24djxk6968n0ypwbib790nzijcf03m4kw0dnks8csfxj6hy9g"; type = "gem"; }; - version = "0.50.0"; + version = "0.58.0"; }; hashdiff = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nynpl0xbj0nphqx1qlmyggq58ms1phf5i03hk64wcc0a17x1m1c"; + sha256 = "0slky0n6n12gjgimzdbdigpwyg5wgq8fysjwkzzfw33ff8b675n7"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.1"; }; hashie = { groups = ["default"]; @@ -1236,14 +1212,15 @@ version = "7.1.0"; }; highline = { + dependencies = ["reline"]; groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f8cr014j7mdqpdb9q17fp5vb5b8n1pswqaif91s3ylg5x3pygfn"; + sha256 = "1q0f7izfi542sp93gl276spm0xyws1kpqxm0alrwwmz06mz4i0ks"; type = "gem"; }; - version = "2.1.0"; + version = "3.1.1"; }; hiredis = { groups = ["default"]; @@ -1276,15 +1253,15 @@ version = "4.3.4"; }; http = { - dependencies = ["addressable" "http-cookie" "http-form_data" "llhttp-ffi"]; + dependencies = ["addressable" "base64" "http-cookie" "http-form_data" "llhttp-ffi"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bzb8p31kzv6q5p4z5xq88mnqk414rrw0y5rkhpnvpl29x5c3bpw"; + sha256 = "05b1khh7wxga9jviy9yi8z1nckxbm3svlzv40y0zvq3nag3d77mr"; type = "gem"; }; - version = "5.1.1"; + version = "5.2.0"; }; http-cookie = { dependencies = ["domain_name"]; @@ -1333,10 +1310,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zjsgrlvwpqsnrza4ijlxjld4550c661sgbqp2j2wp638nlnls1a"; + sha256 = "098n4dfmiydbm9if52h17kxglbli9gihjgzhcghv274ni2c9ab49"; type = "gem"; }; - version = "1.6.2"; + version = "1.7.0"; }; i18n = { dependencies = ["concurrent-ruby"]; @@ -1344,21 +1321,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16"; + sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw"; type = "gem"; }; - version = "1.14.5"; + version = "1.14.6"; }; i18n-tasks = { - dependencies = ["activesupport" "ast" "better_html" "erubi" "highline" "i18n" "parser" "rails-i18n" "rainbow" "terminal-table"]; + dependencies = ["activesupport" "ast" "erubi" "highline" "i18n" "parser" "rails-i18n" "rainbow" "terminal-table"]; groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19zkcsqwzc3i6vizj26mxxww6m5grv9zmp6yxyswbqq9kyzb081z"; + sha256 = "1v03380ffwwa84xzsc6dhkc57cs156qx5aij4bfdcs1j5bpxmn1s"; type = "gem"; }; - version = "1.0.12"; + version = "1.0.14"; }; idn-ruby = { groups = ["default"]; @@ -1370,15 +1347,37 @@ }; version = "0.1.5"; }; - ipaddress = { + inline_svg = { + dependencies = ["activesupport" "nokogiri"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x86s0s11w202j6ka40jbmywkrx8fhq8xiy8mwvnkhllj57hqr45"; + sha256 = "03x1z55sh7cpb63g46cbd6135jmp13idcgqzqsnzinbg4cs2jrav"; type = "gem"; }; - version = "0.8.3"; + version = "1.10.0"; + }; + io-console = { + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08d2lx42pa8jjav0lcjbzfzmw61b8imxr9041pva8xzqabrczp7h"; + type = "gem"; + }; + version = "0.7.2"; + }; + irb = { + dependencies = ["rdoc" "reline"]; + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1y40dv3caswr81dlsyln6vnmmpzf5jcal2rqjbsglvnkb0xh0xar"; + type = "gem"; + }; + version = "1.14.1"; }; jmespath = { groups = ["default"]; @@ -1395,10 +1394,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6"; + sha256 = "0b4qsi8gay7ncmigr0pnbxyb17y3h8kavdyhsh7nrlqwr35vb60q"; type = "gem"; }; - version = "2.6.3"; + version = "2.7.2"; }; json-canonicalization = { groups = ["default"]; @@ -1422,15 +1421,15 @@ version = "1.15.3.1"; }; json-ld = { - dependencies = ["htmlentities" "json-canonicalization" "link_header" "multi_json" "rack" "rdf"]; + dependencies = ["htmlentities" "json-canonicalization" "link_header" "multi_json" "rack" "rdf" "rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1carfj87p6cpd0xnysg5sj653rqmmwnnacsmjk42xdy40j15gp88"; + sha256 = "09xbw6kc95qgmqcfjp0jjw8dnfm28lw9b5lf8bdh3p2vpy9ihlxr"; type = "gem"; }; - version = "3.3.1"; + version = "3.3.2"; }; json-ld-preloaded = { dependencies = ["json-ld" "rdf"]; @@ -1438,10 +1437,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "004s52m37b2kbw8dv4rdfm2d90h1023z1mw9zfcs0x87v8aq7zyn"; + sha256 = "1f28ipp845xmqkgd0c22lw5fpv4fiama4ms3z1z5p0kbvi22f2c1"; type = "gem"; }; - version = "3.2.2"; + version = "3.3.0"; }; json-schema = { dependencies = ["addressable"]; @@ -1449,10 +1448,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "155rygs093i8i04i38a97hs5icmqk2jkkhx76w31yxyr3bxfbgx3"; + sha256 = "0yn0k02pdb7ds1fszwadxqdsjbkm7xjkfhwpzy7iqij47g0kwv7g"; type = "gem"; }; - version = "4.0.0"; + version = "5.0.0"; }; jsonapi-renderer = { groups = ["default"]; @@ -1523,10 +1522,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14gnkcp924v8sbay7q6vz4kn37jylbnvrhi4y5c5jcffd51fbwid"; + sha256 = "1j8z0757rb4kly4ghdzd6ihch6x5i0d53r543x2y9xa8cyrj7c4m"; type = "gem"; }; - version = "7.2.1"; + version = "7.2.2"; }; language_server-protocol = { groups = ["default" "development"]; @@ -1539,15 +1538,15 @@ version = "3.17.0.3"; }; launchy = { - dependencies = ["addressable"]; - groups = ["default" "development"]; + dependencies = ["addressable" "childprocess"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06r43899384das2bkbrpsdxsafyyqa94il7111053idfalb4984a"; + sha256 = "0b3zi9ydbibyyrrkr6l8mcs6l7yam18a4wg22ivgaz0rl2yn1ymp"; type = "gem"; }; - version = "2.5.2"; + version = "3.0.1"; }; letter_opener = { dependencies = ["launchy"]; @@ -1555,10 +1554,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y5d4ip4l12v58bgazadl45iv3a5j7jp2gwg96b6jy378zn42a1d"; + sha256 = "1cnv3ggnzyagl50vzs1693aacv08bhwlprcvjp8jcg2w7cp3zwrg"; type = "gem"; }; - version = "1.8.1"; + version = "1.10.0"; }; letter_opener_web = { dependencies = ["actionmailer" "letter_opener" "railties" "rexml"]; @@ -1566,10 +1565,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vvvaz2ngaxv0s6sj25gdvp73vd8pfl8q3jharadg18p3va0m1ik"; + sha256 = "0q4qfi5wnn5bv93zjf10agmzap3sn7gkfmdbryz296wb1vz1wf9z"; type = "gem"; }; - version = "2.0.0"; + version = "3.0.0"; }; link_header = { groups = ["default"]; @@ -1587,10 +1586,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00dh6zmqdj59rhcya0l4b9aaxq6n8xizfbil93k0g06gndyk5xz5"; + sha256 = "1yph78m8w8l6i9833fc7shy5krk4mnqjc7ys0bg9kgxw8jnl0vs9"; type = "gem"; }; - version = "0.4.0"; + version = "0.5.0"; + }; + logger = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; + type = "gem"; + }; + version = "1.6.1"; }; lograge = { dependencies = ["actionpack" "activesupport" "railties" "request_store"]; @@ -1598,10 +1607,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01kdw5dbzimb89rq4zf44zf8990czb5qxvib0hzja1l4hrha8cki"; + sha256 = "1qcsvh9k4c0cp6agqm9a8m4x2gg7vifryqr7yxkg2x9ph9silds2"; type = "gem"; }; - version = "0.13.0"; + version = "0.14.0"; }; loofah = { dependencies = ["crass" "nokogiri"]; @@ -1609,10 +1618,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d5p9vg2qkqfy60i93mpd3b25kw4bdxfai034y5a94pxp5fws61c"; + sha256 = "1zkjqf37v2d7s11176cb35cl83wls5gm3adnfkn2zcc61h3nxmqh"; type = "gem"; }; - version = "2.21.4"; + version = "2.22.0"; }; mail = { dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"]; @@ -1672,20 +1681,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c81d68r4wx0ckbmqxlfqc2qpd94jwcmqdm0xgr0s46r48pv9k9q"; + sha256 = "1y58ba08n4lx123c0hjcc752fc4x802mjy39qj1hq50ak3vpv8br"; type = "gem"; }; - version = "1.0.1"; - }; - method_source = { - groups = ["default" "development" "pam_authentication" "production" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp"; - type = "gem"; - }; - version = "1.0.0"; + version = "1.1.0"; }; mime-types = { dependencies = ["mime-types-data"]; @@ -1693,20 +1692,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q8d881k1b3rbsfcdi3fx0b5vpdr5wcrhn88r2d9j7zjdkxp5mw5"; + sha256 = "1r64z0m5zrn4k37wabfnv43wa6yivgdfk6cf2rpmmirlz889yaf1"; type = "gem"; }; - version = "3.5.1"; + version = "3.5.2"; }; mime-types-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17zdim7kzrh5j8c97vjqp4xp78wbyz7smdp4hi5iyzk0s9imdn5a"; + sha256 = "1vdgz66z8kgw9xrwvrzrcjb5dary9k9hwm0pkk5fq6f5h6i73zds"; type = "gem"; }; - version = "3.2023.0808"; + version = "3.2024.0820"; }; mini_mime = { groups = ["default" "development" "test"]; @@ -1733,20 +1732,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jnpsbb2dbcs95p4is4431l2pw1l5pn7dfg3vkgb4ga464j0c5l6"; + sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix"; type = "gem"; }; - version = "5.19.0"; + version = "5.25.1"; }; msgpack = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06n7556vxr3awh92xy1k5bli98bvq4pjm08mnl68ay4fzln7lcsg"; + sha256 = "1a5adcb7bwan09mqhj3wi9ib52hmdzmqg7q08pggn3adibyn5asr"; type = "gem"; }; - version = "1.7.1"; + version = "1.7.2"; }; multi_json = { groups = ["default"]; @@ -1763,10 +1762,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lgyysrpl50wgcb9ahg29i4p01z0irb3p9lirygma0kkfr5dgk9x"; + sha256 = "1a5lrlvmg2kb2dhw3lxcsv6x276bwgsxpnka1752082miqxd0wlq"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.1"; + }; + mutex_m = { + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn"; + type = "gem"; + }; + version = "0.2.0"; }; net-http = { dependencies = ["uri"]; @@ -1774,10 +1783,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y55ib1v2b8prqfi9ij7hca60b1j94s2bzr6vskwi3i5735472wq"; + sha256 = "10n2n9aq00ih8v881af88l1zyrqgs5cl3njdw8argjwbl5ggqvm9"; type = "gem"; }; - version = "0.3.2"; + version = "0.4.1"; }; net-http-persistent = { dependencies = ["connection_pool"]; @@ -1792,24 +1801,24 @@ }; net-imap = { dependencies = ["date" "net-protocol"]; - groups = ["default" "development"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lf7wqg7czhaj51qsnmn28j7jmcxhkh3m28rl1cjrqsgjxhwj7r3"; + sha256 = "0gdmhc6nh8cdq2hdlqyrmnl2pdmvab9j7s6fpfvq5kyga0fi4s74"; type = "gem"; }; - version = "0.3.7"; + version = "0.4.15"; }; net-ldap = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xqcffn3c1564c4fizp10dzw2v5g2pabdzrcn25hq05bqhsckbar"; + sha256 = "0g9gz39bs2iy4ky4fhjphimqd9m9wdsaz50anxgwg3yjrff3famy"; type = "gem"; }; - version = "0.18.0"; + version = "0.19.0"; }; net-pop = { dependencies = ["net-protocol"]; @@ -1833,37 +1842,16 @@ }; version = "0.2.2"; }; - net-scp = { - dependencies = ["net-ssh"]; - groups = ["default" "development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1si2nq9l6jy5n2zw1q59a5gaji7v9vhy8qx08h4fg368906ysbdk"; - type = "gem"; - }; - version = "4.0.0"; - }; net-smtp = { dependencies = ["net-protocol"]; - groups = ["default" "development"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hwiqplhi29kfjl8jm0rhl51qv6wmxfynl4qap1dhv9xdwc4bm1x"; + sha256 = "0amlhz8fhnjfmsiqcjajip57ici2xhw089x7zqyhpk51drg43h2z"; type = "gem"; }; - version = "0.3.4"; - }; - net-ssh = { - groups = ["default" "development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0yx0pb5fmziz92bw8qzbh8vf20lr56nd3s6q8h0gsgr307lki687"; - type = "gem"; - }; - version = "7.1.0"; + version = "0.5.0"; }; nio4r = { groups = ["default"]; @@ -1886,26 +1874,16 @@ }; version = "1.16.7"; }; - nsa = { - dependencies = ["activesupport" "concurrent-ruby" "sidekiq" "statsd-ruby"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1narh0bj0c9pg8cb2jhpydfa9mnm3dclckzk5s6xrwa2gm99hnk4"; - type = "gem"; - }; - version = "0.3.0"; - }; oj = { + dependencies = ["bigdecimal" "ostruct"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m4vsd6i093kmyz9gckvzpnws997laldaiaf86hg5lza1ir82x7n"; + sha256 = "1k2skb0n7mf2azznnbsa6irwghdxlmnhdxv9qs6jqg3gd0k2n4zx"; type = "gem"; }; - version = "3.16.1"; + version = "3.16.6"; }; omniauth = { dependencies = ["hashie" "rack" "rack-protection"]; @@ -1923,13 +1901,11 @@ groups = ["default"]; platforms = []; source = { - fetchSubmodules = false; - rev = "4211e6d05941b4a981f9a36b49ec166cecd0e271"; - sha256 = "1zs0xp062f6wk7xxy8w81838qr855kp7idbgpbrhpl319xzc1xkc"; - type = "git"; - url = "https://github.com/stanhu/omniauth-cas.git"; + remotes = ["https://rubygems.org"]; + sha256 = "13z686dmkdssm4d5b0k45ydavhjrzcaqzyqxvvmaqn3a0vc6klbs"; + type = "gem"; }; - version = "2.0.0"; + version = "3.0.0"; }; omniauth-rails_csrf_protection = { dependencies = ["actionpack" "omniauth"]; @@ -1937,10 +1913,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kwswnkyl8ym6i4wv65qh3qchqbf2n0c6lbhfgbvkds3gpmnlm7w"; + sha256 = "1q2zvkw34vk1vyhn5kp30783w1wzam9i9g5ygsdjn2gz59kzsw0i"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; omniauth-saml = { dependencies = ["omniauth" "ruby-saml"]; @@ -1948,10 +1924,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05idjrc01nmmqz4g7kv16xd9yfzzvyibxzfrxk8rcwd1p0zgsxnb"; + sha256 = "00nn24s74miy7p65y8lwpjfwgcn7fwld61f9ghngal4asgw6pfwa"; type = "gem"; }; - version = "2.1.2"; + version = "2.2.1"; }; omniauth_openid_connect = { dependencies = ["omniauth" "openid_connect"]; @@ -1980,10 +1956,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c649921vg2l939z5cc3jwd8p1v49099pdhxfk7sb9qqx5wi5873"; + sha256 = "054d6ybgjdzxw567m7rbnd46yp6gkdbc5ihr536vxd3p15vbhjrw"; type = "gem"; }; - version = "3.1.0"; + version = "3.2.0"; }; openssl-signature_algorithm = { dependencies = ["openssl"]; @@ -1996,6 +1972,291 @@ }; version = "1.3.0"; }; + opentelemetry-api = { + groups = ["default" "opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dj0cqxz0fl2934pmq4pvnb4wpapjfcsjnzb8vll08bcspjdwcx7"; + type = "gem"; + }; + version = "1.4.0"; + }; + opentelemetry-common = { + dependencies = ["opentelemetry-api"]; + groups = ["default" "opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "160ws06d8mzx3hwjss2i954h8r86dp3sw95k2wrbq81sb121m2gy"; + type = "gem"; + }; + version = "0.21.0"; + }; + opentelemetry-exporter-otlp = { + dependencies = ["google-protobuf" "googleapis-common-protos-types" "opentelemetry-api" "opentelemetry-common" "opentelemetry-sdk" "opentelemetry-semantic_conventions"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yl10v1vvb9krvvks0si5nbjpknz8lcbbcryqkf2g0db3kha072d"; + type = "gem"; + }; + version = "0.29.0"; + }; + opentelemetry-helpers-sql-obfuscation = { + dependencies = ["opentelemetry-common"]; + groups = ["default" "opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0v44n3lgkclnfjg9iz5jaay7fkcqvb35jrkm2b68fr2cyy778mnz"; + type = "gem"; + }; + version = "0.2.0"; + }; + opentelemetry-instrumentation-action_mailer = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-active_support" "opentelemetry-instrumentation-base"]; + groups = ["default" "opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1afibmwprdiqnkin7lb6zdxng36rqa7qbl5fl9wx0lchpc039zjj"; + type = "gem"; + }; + version = "0.1.0"; + }; + opentelemetry-instrumentation-action_pack = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base" "opentelemetry-instrumentation-rack"]; + groups = ["default" "opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16nbkayp8jb2zkqj2rmqd4d1mz4wdf0zg6jx8b0vzkf9mxr89py5"; + type = "gem"; + }; + version = "0.9.0"; + }; + opentelemetry-instrumentation-action_view = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-active_support" "opentelemetry-instrumentation-base"]; + groups = ["default" "opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17qild0js6rgv95rphhs19jhd6ixspv1qvpijchqxmxg8waxmwih"; + type = "gem"; + }; + version = "0.7.2"; + }; + opentelemetry-instrumentation-active_job = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1a5afx39bf0pzi0w75ic8zs8447i96993h056ww4vr23zl585f2x"; + type = "gem"; + }; + version = "0.7.7"; + }; + opentelemetry-instrumentation-active_model_serializers = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yw98f8z6k4c8ns7p8ik2dc68p4vbi12xnavzw0vqhlnny4nx0n7"; + type = "gem"; + }; + version = "0.20.2"; + }; + opentelemetry-instrumentation-active_record = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["default" "opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vr690556iaycwdipr962k3pfv97a2sgv4b6f6jwm9hg3mqfqcpg"; + type = "gem"; + }; + version = "0.7.3"; + }; + opentelemetry-instrumentation-active_support = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["default" "opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q07nn9ipq2yd7xjj24hh00cbvlda269k1l0xfkc8d8iw8mixrsg"; + type = "gem"; + }; + version = "0.6.0"; + }; + opentelemetry-instrumentation-base = { + dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-registry"]; + groups = ["default" "opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0psjpqigi7k0fky1kd54jzf9r779vh2c86ngjppn7ifmnh4n3r9y"; + type = "gem"; + }; + version = "0.22.6"; + }; + opentelemetry-instrumentation-concurrent_ruby = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1khlhzwb37mqnzr1vr49ljhi4bplmq9w8ndm0k8xbfsr8h8wivq4"; + type = "gem"; + }; + version = "0.21.4"; + }; + opentelemetry-instrumentation-excon = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14g6dvk31kz9v9qbr2w6ggxk96v3kaadm8wvnw3qsrsc4pd9ycns"; + type = "gem"; + }; + version = "0.22.4"; + }; + opentelemetry-instrumentation-faraday = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0np6wnckn12df6mwcr695fvjy3x2s6541ywr7ahw8a8dszs0qjsh"; + type = "gem"; + }; + version = "0.24.6"; + }; + opentelemetry-instrumentation-http = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05mrlg8msp59bagpc18ycr9333760kqp780gw8fgqn1798dl02qr"; + type = "gem"; + }; + version = "0.23.4"; + }; + opentelemetry-instrumentation-http_client = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g6f5zv0bq585ppgzhm6acrpkz32j1h7zyrcy1r8n3ha41daip1z"; + type = "gem"; + }; + version = "0.22.7"; + }; + opentelemetry-instrumentation-net_http = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l26f8sqsjjcc72a5xr9as3gibm4sgj8n004y15i5vbvdgzjfx60"; + type = "gem"; + }; + version = "0.22.7"; + }; + opentelemetry-instrumentation-pg = { + dependencies = ["opentelemetry-api" "opentelemetry-helpers-sql-obfuscation" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lgkjp0h0hf51n6afgafqaswvm06ybsvj3yf7dxxkzjpnzgxvjvg"; + type = "gem"; + }; + version = "0.29.0"; + }; + opentelemetry-instrumentation-rack = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1dmfxcc2xz2qa4zp0sks5zrqcfr4fbpbc9xdgvcv8ys0ipf7pwn0"; + type = "gem"; + }; + version = "0.24.6"; + }; + opentelemetry-instrumentation-rails = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-action_mailer" "opentelemetry-instrumentation-action_pack" "opentelemetry-instrumentation-action_view" "opentelemetry-instrumentation-active_job" "opentelemetry-instrumentation-active_record" "opentelemetry-instrumentation-active_support" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12k4s1k9wa257bqfny33byscb4ai86jw4q6ygrzsj3iv2bij07w9"; + type = "gem"; + }; + version = "0.31.2"; + }; + opentelemetry-instrumentation-redis = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qrgnk2x64sks9gqb7fycfa6sass6ddqzh5dms4hdbz1bzag581f"; + type = "gem"; + }; + version = "0.25.7"; + }; + opentelemetry-instrumentation-sidekiq = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cfzw1avv52idxvq02y95g3byxsswccck78zch5hmnnzvp5f59nn"; + type = "gem"; + }; + version = "0.25.7"; + }; + opentelemetry-registry = { + dependencies = ["opentelemetry-api"]; + groups = ["default" "opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pw87n9vpv40hf7f6gyl2vvbl11hzdkv4psbbv3x23jvccs8593k"; + type = "gem"; + }; + version = "0.3.1"; + }; + opentelemetry-sdk = { + dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-registry" "opentelemetry-semantic_conventions"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0div7n5wac7x1l9fwdpb3bllw18cns93c7xccy27r4gmvv02f46s"; + type = "gem"; + }; + version = "1.5.0"; + }; + opentelemetry-semantic_conventions = { + dependencies = ["opentelemetry-api"]; + groups = ["default" "opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10anxw736pg85nw8vb11xnr5faq7qj8a1d8c62qbpjs6m0izi77y"; + type = "gem"; + }; + version = "1.10.1"; + }; orm_adapter = { groups = ["default" "pam_authentication"]; platforms = []; @@ -2006,25 +2267,35 @@ }; version = "0.5.0"; }; + ostruct = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11dsv71gfbhy92yzj3xkckjzdai2bsz5a4fydgimv62dkz4kc5rv"; + type = "gem"; + }; + version = "0.6.0"; + }; ox = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yq0h1niimm8z6z8p1yxb104kxqw69bvbrax84598zfjxifcxhxz"; + sha256 = "0w9gavjrvciip497hpdjpcs2c18vf6cgmlj696ynpaqv96804glr"; type = "gem"; }; - version = "2.14.17"; + version = "2.14.18"; }; parallel = { groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jcc512l38c0c163ni3jgskvq1vc3mr8ly5pvjijzwvfml9lf597"; + sha256 = "1vy7sjs2pgz4i96v5yk9b7aafbffnvq7nn419fgvw55qlavsnsyq"; type = "gem"; }; - version = "1.23.0"; + version = "1.26.3"; }; parser = { dependencies = ["ast" "racc"]; @@ -2032,10 +2303,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1swigds85jddb5gshll1g8lkmbcgbcp9bi1d4nigwvxki8smys0h"; + sha256 = "1cqs31cyg2zp8yx2zzm3zkih0j93q870wasbviy2w343nxqvn3pk"; type = "gem"; }; - version = "3.2.2.3"; + version = "3.3.5.0"; }; parslet = { groups = ["default"]; @@ -2063,10 +2334,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s4vskbydg5k0z86v2g5drf03lslkr4b1l421vz29531jlrsljvy"; + sha256 = "0dsgcmzc55w7i9cpghfkzhmiskzndvp1vijd8c5ryv8xvlwikmzg"; type = "gem"; }; - version = "1.5.5"; + version = "1.5.8"; }; pghero = { dependencies = ["activerecord"]; @@ -2074,10 +2345,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gzbgq392b0z7ma1jrdnzzfppdlgjdl9akc4iajq4g46raqd4899"; + sha256 = "028icy2wr33a5wbh2szar1mf0syh42p3szd4bfxl1zwrby3cpnfa"; type = "gem"; }; - version = "3.3.4"; + version = "3.6.0"; }; premailer = { dependencies = ["addressable" "css_parser" "htmlentities"]; @@ -2085,10 +2356,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10rzwdz43yy20lwzsr2as6aivhvwjvqh4nd48sa0ga57sizf1fb4"; + sha256 = "1ryivdnij1990hcqqmq4s0x1vjvfl0awjc9b91f8af17v2639qhg"; type = "gem"; }; - version = "1.21.0"; + version = "1.27.0"; }; premailer-rails = { dependencies = ["actionmailer" "net-smtp" "premailer"]; @@ -2101,25 +2372,37 @@ }; version = "1.12.0"; }; - private_address_check = { + propshaft = { + dependencies = ["actionpack" "activesupport" "rack" "railties"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05phz0vscfh9chv90yc9091pifw3cpwkh76flnhrmvja1q3na4cy"; + sha256 = "0sqg0xf46xd47zdpm8d12kfnwl0y5jb2hj10imzb3bk6mwgkd2fk"; type = "gem"; }; - version = "0.5.0"; + version = "1.1.0"; + }; + psych = { + dependencies = ["stringio"]; + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0s5383m6004q76xm3lb732bp4sjzb6mxb6rbgn129gy2izsj4wrk"; + type = "gem"; + }; + version = "5.1.2"; }; public_suffix = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n9j7mczl15r3kwqrah09cxj8hxdfawiqxa60kga2bmxl9flfz9k"; + sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31"; type = "gem"; }; - version = "5.0.3"; + version = "6.0.1"; }; puma = { dependencies = ["nio4r"]; @@ -2138,10 +2421,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wb03yzy1j41822rbfh9nn77im3zh1f5v8di05cd8rsrdpws542b"; + sha256 = "0wkm850z17gy5gph5lbmaz62wx7nvkj9r690017w10phkmxd5rj3"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; raabro = { groups = ["default"]; @@ -2207,15 +2490,15 @@ version = "1.21.3"; }; rack-protection = { - dependencies = ["rack"]; + dependencies = ["base64" "rack"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kpm67az1wxlg76h620in2r7agfyhv177ps268j5ggsanzddzih8"; + sha256 = "1zzvivmdb4dkscc58i3gmcyrnypynsjwp6xgc4ylarlhqmzvlx1w"; type = "gem"; }; - version = "3.0.6"; + version = "3.2.0"; }; rack-proxy = { dependencies = ["rack"]; @@ -2223,10 +2506,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a62439xwn5v6hsl9s11hdk4wj58czhcbg7lminv23mnkc0ca147"; + sha256 = "12jw7401j543fj8cc83lmw72d8k6bxvkp9rvbifi88hh01blnsj4"; type = "gem"; }; - version = "0.7.6"; + version = "0.7.7"; + }; + rack-session = { + dependencies = ["rack"]; + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xhxhlsz6shh8nm44jsmd9276zcnyzii364vhcvf0k8b8bjia8d0"; + type = "gem"; + }; + version = "1.0.2"; }; rack-test = { dependencies = ["rack"]; @@ -2239,16 +2533,27 @@ }; version = "2.1.0"; }; + rackup = { + dependencies = ["rack" "webrick"]; + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wbr03334ba9ilcq25wh9913xciwj0j117zs60vsqm0zgwdkwpp9"; + type = "gem"; + }; + version = "1.0.0"; + }; rails = { dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sv5jzd3varqzcqm8zxllwiqzgbgcymszw12ci3f9zbzlliq8hby"; + sha256 = "07n5ijqxlp4jkd29s9v9b7p9rnspi7pffn4rp4h07dvds9w9xkyz"; type = "gem"; }; - version = "7.0.8.4"; + version = "7.1.4"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -2267,10 +2572,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17g05y7q7934z0ib4aph8h71c2qwjmlakkm7nb2ab45q0aqkfgjd"; + sha256 = "0fx9dx1ag0s1lr6lfr34lbx5i1bvn3bhyf3w3mx6h7yz90p725g5"; type = "gem"; }; - version = "2.1.1"; + version = "2.2.0"; }; rails-html-sanitizer = { dependencies = ["loofah" "nokogiri"]; @@ -2289,34 +2594,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bbh5gsw46djmrgddwaq3wsjmj9rsh5dk13wkclwxf1rg9jpkn3g"; + sha256 = "0s8kvic2ia34ngssz6h15wqj0k3wwblhyh0f9v0j3gy7ly0dp161"; type = "gem"; }; - version = "7.0.7"; - }; - rails-settings-cached = { - dependencies = ["rails"]; - groups = ["default"]; - platforms = []; - source = { - fetchSubmodules = false; - rev = "86328ef0bd04ce21cc0504ff5e334591e8c2ccab"; - sha256 = "06r637gimh5miq2i6ywxn9gp7nqk8n8555yw8239mykalbzda69h"; - type = "git"; - url = "https://github.com/mastodon/rails-settings-cached.git"; - }; - version = "0.6.6"; + version = "7.0.9"; }; railties = { - dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor" "zeitwerk"]; + dependencies = ["actionpack" "activesupport" "irb" "rackup" "rake" "thor" "zeitwerk"]; groups = ["default" "development" "pam_authentication" "production" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02z7lqx0y60bzpkd4v67i9sbdh7djs0mm89h343kidx0gmq0kbh0"; + sha256 = "0njacgg01934sd942byyjkcyy3iwidysdbhp8kjrjrinackmyfal"; type = "gem"; }; - version = "7.0.8.4"; + version = "7.1.4"; }; rainbow = { groups = ["default" "development"]; @@ -2333,21 +2625,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; + sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6"; type = "gem"; }; - version = "13.0.6"; + version = "13.2.1"; }; rdf = { - dependencies = ["bcp47_spec" "link_header"]; + dependencies = ["bcp47_spec" "bigdecimal" "link_header"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l515w395kbyz4n7lx102x1nv9yl6l72gvk67p35z4cqa74s59nx"; + sha256 = "1mlalmbj1wkwvjha92f7v91v0pbjar9gdb2ddxdyqd24zcifn3ln"; type = "gem"; }; - version = "3.3.1"; + version = "3.3.2"; }; rdf-normalize = { dependencies = ["rdf"]; @@ -2355,10 +2647,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12slrdq6xch5rqj1m79k1wv09264pmhs76nm300j1jsjpcfmdg0r"; + sha256 = "1glyhg7lmzbq1w7bvvf84g7kvqxcn0mw3gsh1f8w4qfvvnbl8dwj"; type = "gem"; }; - version = "0.6.1"; + version = "0.7.0"; + }; + rdoc = { + dependencies = ["psych"]; + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ygk2zk0ky3d88v3ll7qh6xqvbvw5jin0hqdi1xkv1dhaw7myzdi"; + type = "gem"; + }; + version = "6.7.0"; }; redcarpet = { groups = ["default"]; @@ -2407,10 +2710,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "136br91alxdwh1s85z912dwz23qlhm212vy6i3wkinz3z8mkxxl3"; + sha256 = "0ik40vcv7mqigsfpqpca36hpmnx0536xa825ai5qlkv3mmkyf9ss"; type = "gem"; }; - version = "2.8.1"; + version = "2.9.2"; + }; + reline = { + dependencies = ["io-console"]; + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rl1jmxs7pay58l7lkxkrn6nkdpk52k8rvnfwqsd1swjlxlwjq0n"; + type = "gem"; + }; + version = "0.5.10"; }; request_store = { dependencies = ["rack"]; @@ -2418,10 +2732,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13ppgmsbrqah08j06bybd3cddv6dml79yzyjn7r8j1src78h98h7"; + sha256 = "0kd4w7aa0sbk59b19s39pwhd636r7fjamrqalixsw5d53hs4sb1d"; type = "gem"; }; - version = "1.5.1"; + version = "1.6.0"; }; responders = { dependencies = ["actionpack" "railties"]; @@ -2429,20 +2743,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m9s0mkkprrz02gxhq0ijlwjy0nx1j5yrjf8ssjnhyagnx03lyrx"; + sha256 = "06ilkbbwvc8d0vppf8ywn1f79ypyymlb9krrhqv4g0q215zaiwlj"; type = "gem"; }; - version = "3.1.0"; + version = "3.1.1"; }; rexml = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09shc1dvg88c4yx83d4c9wf26z838nlapa3cmlq8iqdci39a98v2"; + sha256 = "0rr145mvjgc4n28lfy0gw87aw3ab680h83bdi5i102ik8mixk3zn"; type = "gem"; }; - version = "3.3.7"; + version = "3.3.8"; }; rotp = { groups = ["default"]; @@ -2459,10 +2773,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pym2zjwl6dwdfvbn7rbvmds32r70jx9qddhvvi6pqy6987ack1v"; + sha256 = "072qvvrcqj0yfr3b0j932mlhvn41i38bq37z7z07i3ikagndkqwy"; type = "gem"; }; - version = "4.1.2"; + version = "4.3.0"; }; rpam2 = { groups = ["default" "pam_authentication"]; @@ -2495,16 +2809,27 @@ }; version = "1.2.0"; }; + rspec = { + dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14xrp8vq6i9zx37vh0yp4h9m0anx9paw200l1r5ad9fmq559346l"; + type = "gem"; + }; + version = "3.13.0"; + }; rspec-core = { dependencies = ["rspec-support"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l95bnjxdabrn79hwdhn2q1n7mn26pj7y1w5660v5qi81x458nqm"; + sha256 = "0s688wfw77fjldzayvczg8bgwcgh6bh552dw7qcj1rhjk3r4zalx"; type = "gem"; }; - version = "3.12.2"; + version = "3.13.1"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -2512,10 +2837,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05j44jfqlv7j2rpxb5vqzf9hfv7w8ba46wwgxwcwd8p0wzi1hg89"; + sha256 = "0nm4qx9bgfzwfc1q0l3sj50vf88q1mbwkkqndbzc08wrnd5bjpsn"; type = "gem"; }; - version = "3.12.3"; + version = "3.13.2"; + }; + rspec-github = { + dependencies = ["rspec-core"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kqjmd85v2fpb06d0rx43dc51f0igc1gmm8y3nz0wvmy7zg02njm"; + type = "gem"; + }; + version = "2.4.0"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; @@ -2523,10 +2859,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hfm17xakfvwya236graj6c2arr4sb9zasp35q5fykhyz8mhs0w2"; + sha256 = "0f3vgp43hajw716vmgjv6f4ar6f97zf50snny6y3fy9kkj4qjw88"; type = "gem"; }; - version = "3.12.5"; + version = "3.13.1"; }; rspec-rails = { dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; @@ -2534,10 +2870,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "086qdyz7c4s5dslm6j06mq7j4jmj958whc3yinhabnqqmz7i463d"; + sha256 = "1ycjggcmzbgrfjk04v26b43c3fj5jq2qic911qk7585wvav2qaxd"; type = "gem"; }; - version = "6.0.3"; + version = "7.0.1"; }; rspec-sidekiq = { dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks" "sidekiq"]; @@ -2545,41 +2881,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dijmcwjn8k6lrld3yqbqfrqb5g73l57yx98y5frx54p5qxjzbzy"; + sha256 = "08sbi3cdh6pxj0mj34vzr7675rb4n2r2q5yxlgs0w9xnm5c0jpdx"; type = "gem"; }; - version = "4.0.1"; + version = "5.0.0"; }; rspec-support = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ky86j3ksi26ng9ybd7j0qsdf1lpr8mzrmn98yy9gzv801fvhsgr"; + sha256 = "03z7gpqz5xkw9rf53835pa8a9vgj4lic54rnix9vfwmp2m7pv1s8"; type = "gem"; }; - version = "3.12.1"; - }; - rspec_chunked = { - groups = ["test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0h4bsj3m7vb47qnx5bry4v0xscrb3lhg1f1vyxl524znb3i2qqzv"; - type = "gem"; - }; - version = "0.6"; + version = "3.13.1"; }; rubocop = { - dependencies = ["base64" "json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; + dependencies = ["json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3571gchdj3c28znr5kisj0fkppy57208g9j1kv23rhk3p5q5p2"; + sha256 = "1rsyxrl647bz49gpa4flh8igg6wy7qxyh2jrp01x0kqnn5iw4y86"; type = "gem"; }; - version = "1.56.3"; + version = "1.66.1"; }; rubocop-ast = { dependencies = ["parser"]; @@ -2587,10 +2913,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "188bs225kkhrb17dsf3likdahs2p1i1sqn0pr3pvlx50g6r2mnni"; + sha256 = "03zywfpm4540q6hw8srhi8pzp0gg51w65ir8jkaw58vk3j31w820"; type = "gem"; }; - version = "1.29.0"; + version = "1.32.3"; }; rubocop-capybara = { dependencies = ["rubocop"]; @@ -2598,21 +2924,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01fn05a87g009ch1sh00abdmgjab87i995msap26vxq1a5smdck6"; + sha256 = "1aw0n8jwhsr39r9q2k90xjmcz8ai2k7xx2a87ld0iixnv3ylw9jx"; type = "gem"; }; - version = "2.18.0"; - }; - rubocop-factory_bot = { - dependencies = ["rubocop"]; - groups = ["default" "development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0kqchl8f67k2g56sq2h1sm2wb6br5gi47s877hlz94g5086f77n1"; - type = "gem"; - }; - version = "2.23.1"; + version = "2.21.0"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -2620,42 +2935,53 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v3a2g3wk3aqa0k0zzla10qkxlc625zkj3yf4zcsybs86r5bm4xn"; + sha256 = "0yd616imfjvlpwsk7lw5kq9h4iz6qkmf10xlaib6b47fy5x77ncy"; type = "gem"; }; - version = "1.19.0"; + version = "1.22.1"; }; rubocop-rails = { - dependencies = ["activesupport" "rack" "rubocop"]; + dependencies = ["activesupport" "rack" "rubocop" "rubocop-ast"]; groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05r46ds0dm44fb4p67hbz721zck8mdwblzssz2y25yh075hvs36j"; + sha256 = "1bc4xpyx0gldjdmbl9aaqav5bjiqfc2zdw7k2r1zblmgsq4ilmpm"; type = "gem"; }; - version = "2.20.2"; + version = "2.26.2"; }; rubocop-rspec = { - dependencies = ["rubocop" "rubocop-capybara" "rubocop-factory_bot"]; + dependencies = ["rubocop"]; groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ylwy4afnxhbrvlaf8an9nrizj78axnzggiyfcp8v531cv8six5f"; + sha256 = "03vyjxs5rzrsn5graljffgzy1fgbyn99w5fz69y243dhn6gy5a66"; type = "gem"; }; - version = "2.23.2"; + version = "3.0.5"; + }; + rubocop-rspec_rails = { + dependencies = ["rubocop" "rubocop-rspec"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ijc1kw81884k0wjq1sgwaxa854n1fdddscp4fnzfzlx7zl150c8"; + type = "gem"; + }; + version = "2.30.0"; }; ruby-prof = { groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13fsfw43zx9pcix1fzxb95g09yadqjvc8971k74krrjz81vbyh51"; + sha256 = "0hnalxnvli6248g34n0bj8p3v35vpabak34qjg778bbaavbqg5h5"; type = "gem"; }; - version = "1.6.3"; + version = "1.7.0"; }; ruby-progressbar = { groups = ["default" "development" "test"]; @@ -2678,6 +3004,17 @@ }; version = "1.17.0"; }; + ruby-vips = { + dependencies = ["ffi" "logger"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nyxwib3y2fc1lciaac0s03y3i915kyfq1kn9m19hyl5yblyhnxg"; + type = "gem"; + }; + version = "2.2.2"; + }; ruby2_keywords = { groups = ["default"]; platforms = []; @@ -2726,10 +3063,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kymrjdpbmn4yaml3aaqyj1dzj8gqmm9h030dc2rj5mvja7fpi28"; + sha256 = "0lj1jjxn1znxmaf6jnngfrz26rw85smxb69m4jl6a9yq6gwyab54"; type = "gem"; }; - version = "6.0.2"; + version = "6.1.3"; }; scenic = { dependencies = ["activerecord" "railties"]; @@ -2737,21 +3074,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04sd4jmgnwpilr3k061x87yyryya2mj15a8602fip49lfxza5548"; + sha256 = "0w0dafg0gz3snm30247wwai0cy3j235ynwx2karyh05ayfqhm4ii"; type = "gem"; }; - version = "1.7.0"; + version = "1.8.0"; }; selenium-webdriver = { - dependencies = ["rexml" "rubyzip" "websocket"]; + dependencies = ["base64" "logger" "rexml" "rubyzip" "websocket"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ws0mh230l1pvyxcrlcr48w01alfhprjs1jbd8yrn463drsr2yac"; + sha256 = "1md0sixm8dq8a7riv50x4q1z273q47b5jvcbv5hxympxn3ran4by"; type = "gem"; }; - version = "4.11.0"; + version = "4.25.0"; }; semantic_range = { groups = ["default"]; @@ -2763,6 +3100,17 @@ }; version = "3.0.0"; }; + shoulda-matchers = { + dependencies = ["activesupport"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c082vpfdf3865xq6xayxw2hwqswhnc9g030p1gi4hmk9dzvnmch"; + type = "gem"; + }; + version = "6.4.0"; + }; sidekiq = { dependencies = ["connection_pool" "rack" "redis"]; groups = ["default" "test"]; @@ -2791,10 +3139,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p5jjs3x2pa2fy494xs39xbq642pri13809dcr1l3hjsm56qvp1h"; + sha256 = "1gnm98hdw1ndw0sryjimp4a0805yhwhjxg6njhz8xmdh5ycgljda"; type = "gem"; }; - version = "5.0.3"; + version = "5.0.6"; }; sidekiq-unique-jobs = { dependencies = ["brpoplpush-redis_script" "concurrent-ruby" "redis" "sidekiq" "thor"]; @@ -2824,10 +3172,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z4df65w9qpri315lpvzazdxa9xb7yj0j3d77q06wf0jnpvw4mzs"; + sha256 = "0q3lwin7pk5rsxy2a663x6lph5arax9lqqk12fgwdy57i5ma749q"; type = "gem"; }; - version = "5.2.0"; + version = "5.3.1"; }; simplecov = { dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"]; @@ -2850,6 +3198,16 @@ }; version = "0.12.3"; }; + simplecov-lcov = { + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h8kswnshgb9zidvc88f4zjy4gflgz3854sx9wrw8ppgnwfg6581"; + type = "gem"; + }; + version = "0.8.0"; + }; simplecov_json_formatter = { groups = ["default" "test"]; platforms = []; @@ -2860,68 +3218,15 @@ }; version = "0.1.4"; }; - smart_properties = { - groups = ["default" "development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0jrqssk9qhwrpq41arm712226vpcr458xv6xaqbk8cp94a0kycpr"; - type = "gem"; - }; - version = "1.17.0"; - }; - sprockets = { - dependencies = ["concurrent-ruby" "rack"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; - type = "gem"; - }; - version = "3.7.2"; - }; - sprockets-rails = { - dependencies = ["actionpack" "activesupport" "sprockets"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1b9i14qb27zs56hlcc2hf139l0ghbqnjpmfi0054dxycaxvk5min"; - type = "gem"; - }; - version = "3.4.2"; - }; - sshkit = { - dependencies = ["net-scp" "net-ssh"]; - groups = ["default" "development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "14a717mr2cmpgld5fcdd124cvlc5b634f96rhwlnmmc4m8bbkcp9"; - type = "gem"; - }; - version = "1.21.5"; - }; stackprof = { groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bhdgfb0pmw9mav1kw9fn0ka012sa0i3h5ppvqssw5xq48nhxnr8"; + sha256 = "1gdqqwnampxmc54nf6zfy9apkmkpdavzipvfssmjlhnrrjy8qh7f"; type = "gem"; }; - version = "0.2.25"; - }; - statsd-ruby = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "028136c463nbravckxb1qi5c5nnv9r6vh2cyhiry423lac4xz79n"; - type = "gem"; - }; - version = "1.5.0"; + version = "0.2.26"; }; stoplight = { dependencies = ["redlock"]; @@ -2929,10 +3234,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vhqx7q8qpq3x9ba504n7bp0r9dxcck0r0hd73cac2iqkix6khlv"; + sha256 = "0qq3z6mwbgj1q3b9hpxxi98i63jpqycbv13fqb8362ngk7cv06x8"; type = "gem"; }; - version = "3.0.2"; + version = "4.1.0"; + }; + stringio = { + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07mfqb40b2wh53k33h91zva78f9zwcdnl85jiq74wnaw2wa6wiak"; + type = "gem"; + }; + version = "3.1.1"; }; strong_migrations = { dependencies = ["activerecord"]; @@ -2940,10 +3255,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wz4zhsp4xia8zcpi98v4sgjlv2prd515l8jz4f7j0wk45dfkjs1"; + sha256 = "07ahzxbmngwa5v2jhybaxm9zb5f15wgr19pdfk38xq838hlhyxc8"; type = "gem"; }; - version = "0.8.0"; + version = "2.0.0"; }; swd = { dependencies = ["activesupport" "attr_required" "httpclient"]; @@ -2971,10 +3286,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09p32vp94sa1mbr0if0adf02yzc4ns00lsmpwns2xbkncwpzrqm4"; + sha256 = "0fwia5hvc1xz9w7vprzjnsym3v9j5l9ggdvy70jixbvpcpz4acfz"; type = "gem"; }; - version = "0.10.2"; + version = "0.10.3"; }; terminal-table = { dependencies = ["unicode-display_width"]; @@ -2993,40 +3308,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p18f05r0c5s70571gqig3z2ym74wx79s6rd45sprp207bqskzn9"; + sha256 = "0k968xzamd4y92zflrdilvc7wp8cj49n9lz34vnm95rg1j2gbqnx"; type = "gem"; }; - version = "0.6.0"; + version = "1.0.1"; }; test-prof = { groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mhzw33lv7h8d7pyh65lis5svnmm8m6fnszbsfg3j3xk9hcl0an5"; + sha256 = "1mydvmcm4m5501322wyl3pwmc6i5ijvwh4kb242l085j88hiqp4n"; type = "gem"; }; - version = "1.2.3"; + version = "1.4.2"; }; thor = { groups = ["default" "development" "pam_authentication" "production" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps"; + sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f"; type = "gem"; }; - version = "1.3.1"; + version = "1.3.2"; }; tilt = { groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bmjgbv8158klwp2r3klxjwaj93nh1sbl4xvj9wsha0ic478avz7"; + sha256 = "0kds7wkxmb038cwp6ravnwn8k65ixc68wpm8j5jx5bhx8ndg4x6z"; type = "gem"; }; - version = "2.2.0"; + version = "2.4.0"; }; timeout = { groups = ["default" "development"]; @@ -3044,10 +3359,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v8y5dibsyskv1ncdgszhxwzq0gzmvb0zl7sgmx0xvsgy86dhcz1"; + sha256 = "18xc7hyasg5ja2i2vb23d9c5pd6rf316kzwqxqx5d8vbs2z1a4rw"; type = "gem"; }; - version = "0.12.0"; + version = "0.12.1"; }; tty-color = { groups = ["default"]; @@ -3096,10 +3411,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18jr6s1cg8yb26wzkqa6874q0z93rq0y5aw092kdqazk71y6a235"; + sha256 = "0l4vh6g333jxm9lakilkva2gn17j6gb052626r1pdbmy2lhnb460"; type = "gem"; }; - version = "0.8.1"; + version = "0.8.2"; }; twitter-text = { dependencies = ["idn-ruby" "unf"]; @@ -3129,10 +3444,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m2d0gpsgqnv29j5h2d6g57g0rayvd460b8s2vjr8sn46bqf89m5"; + sha256 = "1cw6xv9a525mcs7202bq9768aic1dwx353prm1bss4fp2nq24a3j"; type = "gem"; }; - version = "1.2023.3"; + version = "1.2024.2"; }; unf = { dependencies = ["unf_ext"]; @@ -3150,30 +3465,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yj2nz2l101vr1x9w2k83a0fag1xgnmjwp8w8rw4ik2rwcz65fch"; + sha256 = "1sf6bxvf6x8gihv6j63iakixmdddgls58cpxpg32chckb2l18qcj"; type = "gem"; }; - version = "0.0.8.2"; + version = "0.0.9.1"; }; unicode-display_width = { groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gi82k102q7bkmfi7ggn9ciypn897ylln1jk9q67kjhr39fj043a"; + sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky"; type = "gem"; }; - version = "2.4.2"; + version = "2.5.0"; }; uri = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fa49cdssxllj1j37a56kq27wsibx5lmqxkqdk1rz3452y0bsydy"; + sha256 = "07ndgxyhzd02cg94s6rnfhkb9rwx9z72lzk368sa9j78wc9qnbfz"; type = "gem"; }; - version = "0.12.2"; + version = "0.13.1"; }; validate_email = { dependencies = ["activemodel" "mail"]; @@ -3214,10 +3529,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ri09bf640kkw4v6k2g90q2nw1mx2hsghhngaqgb7958q8id8xrz"; + sha256 = "1dwh2xrpwhbzyncb1wvgzz8fmln3r15iqz53c48q4swagpqzqig5"; type = "gem"; }; - version = "3.0.0"; + version = "3.1.0"; }; webfinger = { dependencies = ["activesupport" "httpclient"]; @@ -3236,10 +3551,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vfispr7wd2p1fs9ckn1qnby1yyp4i1dl7qz8n482iw977iyxrza"; + sha256 = "08kixkdp41dw39kqfxf2wp5m4z9b6fxg6yfa6xin0wy7dxzka0dy"; type = "gem"; }; - version = "3.19.1"; + version = "3.24.0"; }; webpacker = { dependencies = ["activesupport" "rack-proxy" "railties" "semantic_range"]; @@ -3265,15 +3580,25 @@ }; version = "0.3.8"; }; + webrick = { + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "089gy5494j560b242vi173wnbj2913hwlwnjkpzld58r96ilc5s3"; + type = "gem"; + }; + version = "1.8.2"; + }; websocket = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dib6p55sl606qb4vpwrvj5wh881kk4aqn2zpfapf8ckx7g14jw8"; + sha256 = "0dr78vh3ag0d1q5gfd8960g1ca9g6arjd2w54mffid8h4i7agrxp"; type = "gem"; }; - version = "1.2.9"; + version = "1.2.11"; }; websocket-driver = { dependencies = ["websocket-extensions"]; @@ -3332,10 +3657,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08cfb35232p9s1r4jqv8wacv38vxh699mgbr9y03ga89gx9lipqp"; + sha256 = "10cpfdswql21vildiin0q7drg5zfzf2sahnk9hv3nyzzjqwj2bdx"; type = "gem"; }; - version = "2.6.16"; + version = "2.6.18"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/source.nix b/third_party/nixpkgs/pkgs/servers/mastodon/source.nix index dccf253ea9..9c27b1ee32 100644 --- a/third_party/nixpkgs/pkgs/servers/mastodon/source.nix +++ b/third_party/nixpkgs/pkgs/servers/mastodon/source.nix @@ -1,7 +1,7 @@ # This file was generated by pkgs.mastodon.updateScript. { fetchFromGitHub, applyPatches, patches ? [] }: let - version = "4.2.13"; + version = "4.3.0"; in ( applyPatches { @@ -9,10 +9,10 @@ in owner = "mastodon"; repo = "mastodon"; rev = "v${version}"; - hash = "sha256-+HGu02fjYJ1x6Tk9AdqmFN7JHk3UnlvCdiQ/5yMu69M="; + hash = "sha256-nZtxildQmT/7JMCTx89ZSWxb9I7xMLGHTJv7v4gfdd4="; }; patches = patches ++ []; }) // { inherit version; - yarnHash = "sha256-qoLesubmSvRsXhKwMEWHHXcpcqRszqcdZgHQqnTpNPE="; + yarnHash = "sha256-V/kBkxv6akTyzlFzdR1F53b7RD0NYtap58Xt5yOAbYA="; } diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/update.sh b/third_party/nixpkgs/pkgs/servers/mastodon/update.sh index 8e8350431e..6d6be16e33 100755 --- a/third_party/nixpkgs/pkgs/servers/mastodon/update.sh +++ b/third_party/nixpkgs/pkgs/servers/mastodon/update.sh @@ -106,7 +106,5 @@ echo "Creating gemset.nix" bundix --lockfile="$SOURCE_DIR/Gemfile.lock" --gemfile="$SOURCE_DIR/Gemfile" echo "" >> gemset.nix # Create trailing newline to please EditorConfig checks -echo "Creating yarn-hash.nix" -YARN_HASH="$(prefetch-yarn-deps "$SOURCE_DIR/yarn.lock")" -YARN_HASH="$(nix hash to-sri --type sha256 "$YARN_HASH")" -sed -i "s/sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=/$YARN_HASH/g" source.nix +echo "Required manual update of yarn-hash" +exit 1 diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/yarn.nix b/third_party/nixpkgs/pkgs/servers/mastodon/yarn.nix new file mode 100644 index 0000000000..3fb4018906 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/mastodon/yarn.nix @@ -0,0 +1,34 @@ +{ + stdenvNoCC, + yarn-berry, + cacert, + version, + src, + hash, +}: +stdenvNoCC.mkDerivation { + pname = "yarn-deps"; + inherit version src; + + nativeBuildInputs = [ + yarn-berry + ]; + + dontInstall = true; + + NODE_EXTRA_CA_CERTS = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + + buildPhase = '' + export HOME=$(mktemp -d) + export YARN_ENABLE_TELEMETRY=0 + + cache="$(yarn config get cacheFolder)" + yarn install --immutable --mode skip-build + + mkdir -p $out + cp -r $cache/* $out/ + ''; + + outputHash = hash; + outputHashMode = "recursive"; +} diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix index b464696df5..a1002c8477 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -17,20 +17,20 @@ let in python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.116.0"; + version = "1.117.0"; format = "pyproject"; src = fetchFromGitHub { owner = "element-hq"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-TDVqRdp723zq57rb5ZFIX8lqA5D2p9akqNXvoJXSIKg="; + hash = "sha256-fBxvEHkLo736Qp973XeXXG84MuZHOZfBHjKbcJpmtJw="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-GSl4B2EVENspJsQ9jVh+gPJaRlCZwaPStjz5ALSzj/U="; + hash = "sha256-Wqpt42dubiECMPfijtb8EcsKDTsVKseZ8f6VP7QBpoo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/servers/memcached/default.nix b/third_party/nixpkgs/pkgs/servers/memcached/default.nix index 71e77f4940..f1e2c027db 100644 --- a/third_party/nixpkgs/pkgs/servers/memcached/default.nix +++ b/third_party/nixpkgs/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {lib, stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: stdenv.mkDerivation rec { - version = "1.6.27"; + version = "1.6.29"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-dP4UR8hmit+RD6epKftjWKr0pm73NOdRxbgSgHGw97U="; + sha256 = "sha256-JpZD1Ri3uiAzx6H2b9/FYNcnJaKCIZTZDII1QIxEOkk="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix b/third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix index 330665d9a2..dd7bbc54ea 100644 --- a/third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix +++ b/third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix @@ -6,7 +6,7 @@ , perl , openssl , zlib -, ffmpeg_7 +, ffmpeg , libvpx , libopus , libuuid @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ bc pkg-config perl ]; - buildInputs = [ openssl srt zlib ffmpeg_7 libvpx libopus srtp jemalloc pcre2 libuuid hiredis ]; + buildInputs = [ openssl srt zlib ffmpeg libvpx libopus srtp jemalloc pcre2 libuuid hiredis ]; preBuild = '' cd src diff --git a/third_party/nixpkgs/pkgs/servers/misc/virtiofsd/default.nix b/third_party/nixpkgs/pkgs/servers/misc/virtiofsd/default.nix index 4835f46998..a5f93738f6 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.11.1"; + version = "1.12.0"; src = fetchFromGitLab { owner = "virtio-fs"; repo = "virtiofsd"; rev = "v${version}"; - hash = "sha256-4GX+qqnrUuG6jsdnKU/67YOj0X8qyuPIQbPSkE3xTBo="; + hash = "sha256-2+PiorzYHxShatFbfQCry1bjBNL65/TxEj9MmdKmqP0="; }; separateDebugInfo = true; - cargoHash = "sha256-41pgoX/nGLEbMDJvdZt2HvrVMZPXqH6SWgow7A3rTBY="; + cargoHash = "sha256-hXQ/wDDDBV788SvZnYmjiPVrEGCPVusq0O+Uyupgfd0="; LIBCAPNG_LIB_PATH = "${lib.getLib libcap_ng}/lib"; LIBCAPNG_LINK_TYPE = diff --git a/third_party/nixpkgs/pkgs/servers/mlflow-server/default.nix b/third_party/nixpkgs/pkgs/servers/mlflow-server/default.nix index 6916b3b655..82ac934dc8 100644 --- a/third_party/nixpkgs/pkgs/servers/mlflow-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mlflow-server/default.nix @@ -1,31 +1,33 @@ -{ python3, writeText}: +{ python3Packages, writers }: let - py = python3.pkgs; -in -py.toPythonApplication - (py.mlflow.overridePythonAttrs(old: rec { + py = python3Packages; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ + gunicornScript = writers.writePython3 "gunicornMlflow" { } '' + import re + import sys + from gunicorn.app.wsgiapp import run + if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', ''', sys.argv[0]) + sys.exit(run()) + ''; +in +py.toPythonApplication ( + py.mlflow.overridePythonAttrs (old: { + + propagatedBuildInputs = old.dependencies ++ [ py.boto3 py.mysqlclient ]; - postPatch = (old.postPatch or "") + '' - substituteInPlace mlflow/utils/process.py --replace \ - "child = subprocess.Popen(cmd, env=cmd_env, cwd=cwd, universal_newlines=True," \ - "cmd[0]='$out/bin/gunicornMlflow'; child = subprocess.Popen(cmd, env=cmd_env, cwd=cwd, universal_newlines=True," - ''; + postPatch = + (old.postPatch or "") + + '' + cat mlflow/utils/process.py - gunicornScript = writeText "gunicornMlflow" - '' - #!/usr/bin/env python - import re - import sys - from gunicorn.app.wsgiapp import run - if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', ''', sys.argv[0]) - sys.exit(run()) + substituteInPlace mlflow/utils/process.py --replace-fail \ + "process = subprocess.Popen(" \ + "cmd[0]='${gunicornScript}'; process = subprocess.Popen(" ''; postInstall = '' @@ -33,4 +35,5 @@ py.toPythonApplication cp ${gunicornScript} $gpath chmod 555 $gpath ''; -})) + }) +) diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix index 1382302def..951258d63f 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix @@ -1,5 +1,5 @@ { lib -, buildGoModule +, buildGo122Module , fetchFromGitHub , fetchYarnDeps , fixup-yarn-lock @@ -13,7 +13,9 @@ , yarn }: -buildGoModule rec { +# Breaks with Go 1.23: https://github.com/grafana/agent/issues/6972 +# FIXME: unpin when fixed upstream +buildGo122Module rec { pname = "grafana-agent"; version = "0.43.3"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index 89b7cec102..d2b4fc16d4 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, removeReferencesTo +{ lib, stdenv, buildGo122Module, fetchFromGitHub, removeReferencesTo , tzdata, wire , yarn, nodejs, python3, cacert , jq, moreutils @@ -6,9 +6,10 @@ , faketty }: -buildGoModule rec { +# TODO: Go back to using buildGoModule when upgrading to grafana 11.3. +buildGo122Module rec { pname = "grafana"; - version = "11.2.1"; + version = "11.2.2+security-01"; subPackages = [ "pkg/cmd/grafana" "pkg/cmd/grafana-server" "pkg/cmd/grafana-cli" ]; @@ -16,7 +17,7 @@ buildGoModule rec { owner = "grafana"; repo = "grafana"; rev = "v${version}"; - hash = "sha256-rMRzrGdTPfGzMtE3xej5dSOjyyEMn66oPjDUWifMjnQ="; + hash = "sha256-1ZDX0R3t6CAdIfrYfR373olGL5orSDs2iwriAszl7qk="; }; # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22 diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/bsull-console-datasource/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/bsull-console-datasource/default.nix new file mode 100644 index 0000000000..30f38f1c4a --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/bsull-console-datasource/default.nix @@ -0,0 +1,13 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "bsull-console-datasource"; + version = "1.0.1"; + zipHash = "sha256-V6D/VIdwwQvG21nVMXD/xF86Uy8WRecL2RjyDTZr1wQ="; + meta = with lib; { + description = "This is a streaming Grafana data source which can connect to the Tokio console subscriber."; + license = licenses.asl20; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/fetzerch-sunandmoon-datasource/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/fetzerch-sunandmoon-datasource/default.nix new file mode 100644 index 0000000000..3c1c3410f2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/fetzerch-sunandmoon-datasource/default.nix @@ -0,0 +1,13 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "fetzerch-sunandmoon-datasource"; + version = "0.3.3"; + zipHash = "sha256-IJe1OiPt9MxqqPymuH0K27jToSb92M0P4XGZXvk0paE="; + meta = with lib; { + description = "SunAndMoon is a Datasource Plugin for Grafana that calculates the position of Sun and Moon as well as the Moon illumination using SunCalc."; + license = licenses.mit; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix new file mode 100644 index 0000000000..ba37338605 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix @@ -0,0 +1,13 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "frser-sqlite-datasource"; + version = "3.5.0"; + zipHash = "sha256-BwAurFpMyyR318HMzVXCnOEQWM8W2vPPisXhhklFLBY="; + meta = with lib; { + description = "This is a Grafana backend plugin to allow using an SQLite database as a data source. The SQLite database needs to be accessible to the filesystem of the device where Grafana itself is running."; + license = licenses.asl20; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix index 2ebc9834e2..b80f1bedca 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix @@ -2,12 +2,12 @@ grafanaPlugin rec { pname = "grafana-clickhouse-datasource"; - version = "3.3.0"; + version = "4.4.0"; zipHash = { - x86_64-linux = "sha256-FkOX/2vPmLtxe/oOISldlVhayy7AwfFxLeiwJ5TNgYY="; - aarch64-linux = "sha256-4rCj+NaKPZbuVohlKmSf1M6n5ng9HZMrwzBCgLPdiok="; - x86_64-darwin = "sha256-bpey6EwwAqXgxjvjJ6ou4rinidHCpUr+Z89YpAZK7z8="; - aarch64-darwin = "sha256-u/U2lu4szf9JFt/zfhGmWKH2OUqpJDNaSI69EDdi1+w="; + x86_64-linux = "sha256-rh+oTJrW7WxLHG7jSkT1Pog+/tqhE+j/0jdbgaHu1a4="; + aarch64-linux = "sha256-uV+WKh3/jBgOwX2lrwC3Q7TGr3/BH83QZhwmtL4G3qo="; + x86_64-darwin = "sha256-Y6Xp4HCYF+Nkw8CNrfEMOtpNgKunMI/4oVqD8Wq5VEI="; + aarch64-darwin = "sha256-x/Z5BA9N5sZurQ5K1NQCYXQPZ/yF1p/372GPIeVU0ps="; }; meta = with lib; { description = "Connects Grafana to ClickHouse"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix index 61704eaaef..0165770335 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin rec { pname = "grafana-clock-panel"; - version = "2.1.3"; - zipHash = "sha256-ZedeV/SQsBu55jAxFyyXQefir4hEl1/TQDmaTJN9bag="; + version = "2.1.8"; + zipHash = "sha256-QLvq2CSlJuEaYAazn8MoY3XCiXeRILj4dTp/aqrHL/k="; meta = with lib; { description = "Clock panel for Grafana"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-discourse-datasource/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-discourse-datasource/default.nix new file mode 100644 index 0000000000..a1250b353c --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-discourse-datasource/default.nix @@ -0,0 +1,13 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "grafana-discourse-datasource"; + version = "2.0.2"; + zipHash = "sha256-0MTxPe7RJHMA0SwjOcFlbi4VkhlLUFP+5r2DsHAaffc="; + meta = with lib; { + description = "The Discourse data source plugin allows users to search and view topics, posts, users, tags, categories, and reports on a given Discourse forum."; + license = licenses.asl20; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix new file mode 100644 index 0000000000..f76beec186 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix @@ -0,0 +1,18 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "grafana-github-datasource"; + version = "1.9.0"; + zipHash = { + x86_64-linux = "sha256-DQKb8VKa41bL6D9DN8OpL3sqBIlRCa1zgIjduD6AcQc="; + aarch64-linux = "sha256-RHFURMnBF14QCZhVxZQO3JJ3OP6JXD2Hfef8IyVOgBs="; + x86_64-darwin = "sha256-UBwc8CZRRHsEKpzTgn5PNXjxLzETyWKGsDFtXZnkRW4="; + aarch64-darwin = "sha256-xgQ7s3QP7Sq8ni0n54NE/nYlyALIESfXNKncruAWty0="; + }; + meta = with lib; { + description = "The GitHub datasource allows GitHub API data to be visually represented in Grafana dashboards."; + license = licenses.asl20; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix new file mode 100644 index 0000000000..4e258eb813 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix @@ -0,0 +1,18 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "grafana-googlesheets-datasource"; + version = "1.2.14"; + zipHash = { + x86_64-linux = "sha256-N4JZ/aWpvezR9daJKU559GXd+FNGmDA4P9CrlC4RFmQ="; + aarch64-linux = "sha256-HZhyg6NhptFib/3JJ8AnSywF+eaZOwiCij3TlMB0YG8="; + x86_64-darwin = "sha256-EwE6w67ARVp/2GE9pSqaD5TuBnsgwsDLZCrEXPfRfUE="; + aarch64-darwin = "sha256-3UGd/t1k6aZsKsQCplLV9klmjQAga19VaopHx330xUs="; + }; + meta = with lib; { + description = "The Grafana JSON Datasource plugin empowers you to seamlessly integrate JSON data into Grafana."; + license = licenses.asl20; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix new file mode 100644 index 0000000000..e132e831fc --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix @@ -0,0 +1,18 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "grafana-mqtt-datasource"; + version = "1.1.0-beta.2"; + zipHash = { + x86_64-linux = "sha256-QYv+6zDLSYiB767A3ODgZ1HzPd7Hpa90elKDV1+dNx8="; + aarch64-linux = "sha256-cquaTD3e40vj7PuQDHvODHOpXeWx3AaN6Mv+Vu+ikbI="; + x86_64-darwin = "sha256-PZmUkghYawU5aKA536u3/LCzsvkIFVJIzl1FVWcrKTI="; + aarch64-darwin = "sha256-9FP7UbNI4q4nqRTzlNKcEPnJ9mdqzOL4E0nuEAdFNJw="; + }; + meta = with lib; { + description = "The MQTT data source plugin allows you to visualize streaming MQTT data from within Grafana."; + license = licenses.asl20; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix index a1d67c5283..8767f2b51e 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix @@ -2,9 +2,8 @@ grafanaPlugin { pname = "grafana-oncall-app"; - versionPrefix = "v"; - version = "1.8.5"; - zipHash = "sha256-HuZYHPTWm0EPKQbmapALK2j+PzM+J7gcWM9w8vU2yI0="; + version = "1.10.2"; + zipHash = "sha256-wRgzdPKSA24O4kSDhaO/09uOG6lIoJGWUGOgX1vdjlU="; meta = with lib; { description = "Developer-friendly incident response for Grafana"; license = licenses.agpl3Only; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix new file mode 100644 index 0000000000..3a5955efcb --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix @@ -0,0 +1,18 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "grafana-opensearch-datasource"; + version = "2.19.0"; + zipHash = { + x86_64-linux = "sha256-jTeiIbaM2wPBTxFyXPQhBXxxzgRZbaXkqeN9+tHgWPc="; + aarch64-linux = "sha256-8ti5CibWbycAO9o3Wse/CuE07JjwV1Quhy/Vm6BDmyM="; + x86_64-darwin = "sha256-6rqdTsYcqjqcXtM20ekJguT42w5dr4EUHvNuRDIU6k0="; + aarch64-darwin = "sha256-Z4ISwwkFJXXdVcLOspAK8euI4yor4Ii08K7zZffY9tM="; + }; + meta = with lib; { + description = "The Grafana JSON Datasource plugin empowers you to seamlessly integrate JSON data into Grafana."; + license = licenses.asl20; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix index ff06ec2137..05c59191dc 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin rec { pname = "grafana-polystat-panel"; - version = "2.1.4"; - zipHash = "sha256-15mi5NzbbWXJ/69VEwUS058atQ+z2g4C3T9/b+/Exwk="; + version = "2.1.13"; + zipHash = "sha256-O8YOSVLhJ1hDNbBHKwkikNBOjQTrGofGklVTalgDH4I="; meta = with lib; { description = "Hexagonal multi-stat panel for Grafana"; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix new file mode 100644 index 0000000000..cdf6b85c2a --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix @@ -0,0 +1,13 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "marcusolsson-calendar-panel"; + version = "3.7.0"; + zipHash = "sha256-O8EvkS+lWq2qaIj1HJzPagRGhrEENvY1YDBusvUejM0="; + meta = with lib; { + description = "Calendar Panel is a Grafana plugin that displays events from various data sources."; + license = licenses.asl20; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/marcusolsson-csv-datasource/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/marcusolsson-csv-datasource/default.nix new file mode 100644 index 0000000000..bafa044005 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/marcusolsson-csv-datasource/default.nix @@ -0,0 +1,18 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "marcusolsson-csv-datasource"; + version = "0.6.19"; + zipHash = { + x86_64-linux = "sha256-HCwh8v9UeO7eeESZ78Hj6uvLext/x7bPfACe1u2BqTM="; + aarch64-linux = "sha256-2Qtwe34fe8KlIye3RuuNLjlWWgXGJvAmwWUnZD8LdWE="; + x86_64-darwin = "sha256-6sGA06INQbiRCd23ykdtUWAR+oA3YFh57KBT7zWUP44="; + aarch64-darwin = "sha256-gzQRcPeRqLvl27SB18hTTtcHx/namT2V0NOgX5J1mbs="; + }; + meta = with lib; { + description = "The Grafana CSV Datasource plugin is designed to load CSV data into Grafana, expanding your capabilities to visualize and analyze data stored in CSV (Comma-Separated Values) format."; + license = licenses.asl20; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix new file mode 100644 index 0000000000..55b5f39d90 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix @@ -0,0 +1,13 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "marcusolsson-dynamictext-panel"; + version = "5.4.0"; + zipHash = "sha256-IgPON60oRqO52W64UvHuwYoa6UG2NfDWIA4S2HfkGQs="; + meta = with lib; { + description = "Dynamic, data-driven text panel for Grafana"; + license = licenses.asl20; + maintainers = with maintainers; [ herbetom ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix new file mode 100644 index 0000000000..f2ca72a121 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix @@ -0,0 +1,13 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "marcusolsson-json-datasource"; + version = "1.3.17"; + zipHash = "sha256-L1G5s9fEEuvNs5AWXlT00f+dU2/2Rtjm4R3kpFc4NRg="; + meta = with lib; { + description = "The Grafana JSON Datasource plugin empowers you to seamlessly integrate JSON data into Grafana."; + license = licenses.asl20; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/plugins.nix index bd1e775243..0a14dfab15 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/plugins.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/plugins.nix @@ -4,15 +4,33 @@ grafanaPlugin = callPackage ./grafana-plugin.nix { }; + bsull-console-datasource = callPackage ./bsull-console-datasource { }; doitintl-bigquery-datasource = callPackage ./doitintl-bigquery-datasource { }; + fetzerch-sunandmoon-datasource = callPackage ./fetzerch-sunandmoon-datasource { }; + frser-sqlite-datasource = callPackage ./frser-sqlite-datasource { }; grafadruid-druid-datasource = callPackage ./grafadruid-druid-datasource { }; grafana-clickhouse-datasource = callPackage ./grafana-clickhouse-datasource { }; grafana-clock-panel = callPackage ./grafana-clock-panel { }; + grafana-discourse-datasource = callPackage ./grafana-discourse-datasource { }; + grafana-github-datasource = callPackage ./grafana-github-datasource { }; + grafana-googlesheets-datasource = callPackage ./grafana-googlesheets-datasource { }; + grafana-mqtt-datasource = callPackage ./grafana-mqtt-datasource { }; grafana-oncall-app = callPackage ./grafana-oncall-app { }; + grafana-opensearch-datasource = callPackage ./grafana-opensearch-datasource { }; grafana-piechart-panel = callPackage ./grafana-piechart-panel { }; grafana-polystat-panel = callPackage ./grafana-polystat-panel { }; grafana-worldmap-panel = callPackage ./grafana-worldmap-panel { }; + marcusolsson-calendar-panel = callPackage ./marcusolsson-calendar-panel { }; + marcusolsson-csv-datasource = callPackage ./marcusolsson-csv-datasource { }; + marcusolsson-dynamictext-panel = callPackage ./marcusolsson-dynamictext-panel { }; + marcusolsson-json-datasource = callPackage ./marcusolsson-json-datasource { }; redis-app = callPackage ./redis-app { }; redis-datasource = callPackage ./redis-datasource { }; redis-explorer-app = callPackage ./redis-explorer-app { }; + ventura-psychrometric-panel = callPackage ./ventura-psychrometric-panel { }; + volkovlabs-echarts-panel = callPackage ./volkovlabs-echarts-panel { }; + volkovlabs-form-panel = callPackage ./volkovlabs-form-panel { }; + volkovlabs-rss-datasource = callPackage ./volkovlabs-rss-datasource { }; + volkovlabs-variable-panel = callPackage ./volkovlabs-variable-panel { }; + yesoreyeram-infinity-datasource = callPackage ./yesoreyeram-infinity-datasource { }; } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh index dd8f050c63..db1463c733 100755 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh @@ -1,8 +1,46 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq common-updater-scripts +#!nix-shell -i bash -p nix curl jq common-updater-scripts set -eu -o pipefail +cd "${0%/*}"/../../../../../ + + readonly plugin_name="$1" -readonly latest_version="$(curl "https://grafana.com/api/plugins/${plugin_name}" | jq -r .version)" -update-source-version "grafanaPlugins.${plugin_name}" "$latest_version" +readonly api_response="$(curl --silent "https://grafana.com/api/plugins/${plugin_name}")" +readonly latest_version="$(echo "$api_response" | jq -r .version)" + +update() { + local system="${2:+--system=$2}" + local pkg="$(echo "$api_response" | jq -e .packages.\""$1"\")" + if echo "$pkg" | jq -er .sha256 > /dev/null; then + local hash="$(echo "$pkg" | jq -er .sha256)" + else + # Some packages only have an md5 hash. Download the file for hash computation. + local urlPath="$(echo "$pkg" | jq -er .downloadUrl)" + local hash="$(nix-prefetch-url --type sha256 --name "$plugin_name" "https://grafana.com$urlPath")" + fi + hash="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$hash")" + # Set version number to a random number first to force update to happen. + # + # `update-source-version` will exit early if it considers the version number to be the same. + # However we have already downloaded the file and computed the hash, so it makes sense to set + # the newly computed information unconditionally. + # + # As an example of a workflow that was made more complicated than strictly necessary is my own + # attempts to improve this script where I spent multiple hours investigating why the update + # script would refuse to update a hash that I intentionally malformed (in hopes to test the + # operation of this script.) + update-source-version $system "grafanaPlugins.${plugin_name}" $RANDOM "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" + update-source-version $system "grafanaPlugins.${plugin_name}" "$latest_version" "$hash" +} + +if echo "$api_response" | jq -e .packages.any > /dev/null; then + # the package contains an "any" package, so there should be only one zipHash. + update "any" +else + update "linux-amd64" "x86_64-linux" + update "linux-arm64" "aarch64-linux" + update "darwin-amd64" "x86_64-darwin" + update "darwin-arm64" "aarch64-darwin" +fi diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix new file mode 100644 index 0000000000..0b500e6320 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix @@ -0,0 +1,18 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "ventura-psychrometric-panel"; + version = "4.5.1"; + zipHash = "sha256-Y/Eh3eWZkPS8Q1eha7sEJ3wTMI7QxOr7MEbPc25fnGg="; + meta = with lib; { + description = "Grafana plugin to display air conditions on a psychrometric chart."; + license = licenses.bsd3 // { + spdxId = "BSD-3-Clause-LBNL"; + url = "https://spdx.org/licenses/BSD-3-Clause-LBNL.html"; + fullName = "Lawrence Berkeley National Labs BSD variant license"; + shortName = "lbnl-bsd3"; + }; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix new file mode 100644 index 0000000000..ecb8b7f707 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix @@ -0,0 +1,13 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "volkovlabs-echarts-panel"; + version = "6.4.1"; + zipHash = "sha256-RHOfFKplZs0gbD/esvrpXkkPKPfo5R4zjCUJWPpkDNU="; + meta = with lib; { + description = "The Apache ECharts plugin is a visualization panel for Grafana that allows you to incorporate the popular Apache ECharts library into your Grafana dashboard."; + license = licenses.asl20; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix new file mode 100644 index 0000000000..21eb1fb5cf --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix @@ -0,0 +1,13 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "volkovlabs-form-panel"; + version = "4.6.0"; + zipHash = "sha256-ne2dfCr+PBodeaxGfZL0VrAxHLYEAaeQfuZQf2F3s0s="; + meta = with lib; { + description = "The Data Manipulation Panel is the first plugin that allows inserting and updating application data, as well as modifying configuration directly from your Grafana dashboard."; + license = licenses.asl20; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/volkovlabs-rss-datasource/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/volkovlabs-rss-datasource/default.nix new file mode 100644 index 0000000000..06c5b41e79 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/volkovlabs-rss-datasource/default.nix @@ -0,0 +1,13 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "volkovlabs-rss-datasource"; + version = "4.2.0"; + zipHash = "sha256-+3tgvpH6xlJORqN4Sx7qwzsiQZoLwdarzhx6kHvtOoY="; + meta = with lib; { + description = "The RSS/Atom data source is a plugin for Grafana that retrieves RSS/Atom feeds and allows visualizing them using Dynamic Text and other panels."; + license = licenses.asl20; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix new file mode 100644 index 0000000000..abeffe05dc --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix @@ -0,0 +1,13 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "volkovlabs-variable-panel"; + version = "3.5.0"; + zipHash = "sha256-SqMTCdB+8OUo94zJ3eS5NoCeyjc7sdMCR0CTvVe/L1g="; + meta = with lib; { + description = "The Variable panel allows you to have dashboard filters in a separate panel which you can place anywhere on the dashboard."; + license = licenses.asl20; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/yesoreyeram-infinity-datasource/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/yesoreyeram-infinity-datasource/default.nix new file mode 100644 index 0000000000..7c6eab7d49 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/yesoreyeram-infinity-datasource/default.nix @@ -0,0 +1,18 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "yesoreyeram-infinity-datasource"; + version = "2.11.0"; + zipHash = { + x86_64-linux = "sha256-p5qLRImAuV8pqbwn+egbGMiPW6xdy8yQoRWdoiE4+B8="; + aarch64-linux = "sha256-gmmFe2TrhPqTQz4aExx/kAgzqCcEvu2Az7SHmpJaMv8="; + x86_64-darwin = "sha256-BuOMpZK+NoJx32f3pqcDI5szIW4bQl3+yFZI9zjzYE8="; + aarch64-darwin = "sha256-ss/HxouKDZYZvF42KWJgMbOh9kSviH5oz6f/mrlcXk8="; + }; + meta = with lib; { + description = "Visualize data from JSON, CSV, XML, GraphQL and HTML endpoints in Grafana."; + license = licenses.asl20; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/mimir/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/mimir/default.nix index 0a5e12efcb..1656ec909e 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/mimir/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/mimir/default.nix @@ -1,5 +1,7 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests, nix-update-script }: -buildGoModule rec { +{ lib, buildGo122Module, fetchFromGitHub, nixosTests, nix-update-script }: +# Does not build with Go 1.23 +# FIXME: check again for next release +buildGo122Module rec { pname = "mimir"; version = "2.13.0"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/knot-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/knot-exporter.nix index 7b80035544..802db52a31 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/knot-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/knot-exporter.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "knot-exporter"; - version = "3.4.0"; + version = "3.4.1"; pyproject = true; src = fetchPypi { pname = "knot_exporter"; inherit version; - hash = "sha256-YOVLHAJXIgje8Ek7iKGxq4l4PAcWgWnNllRxEJpUcU0="; + hash = "sha256-CkuOO6pOl3/8rLKb5P5a09oNv8rvmy/mURv0b3FRNGA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix index 90ffdb48f0..4bb0c59516 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pgbouncer-exporter"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "prometheus-community"; repo = "pgbouncer_exporter"; rev = "v${version}"; - hash = "sha256-fKoyRHYLwVefsZ014eazVCD5B9eV8/CUkuHE4mbUqVo="; + hash = "sha256-9Sa9BimyKwYTjh0ELlDlUS3kc5gnkK1i7xiO84vVPYA="; }; - vendorHash = "sha256-IxmxfF9WsF0Hbym4G0UecyW8hAvucoaCFUE1kXUljJs="; + vendorHash = "sha256-PjoS56MdYpDOuSTHHo5lGL9KlWlu3ycA08qim8jrnSU="; meta = with lib; { description = "Prometheus exporter for PgBouncer"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/redis-exporter.nix index 3a1aa978a2..9a9806ef82 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "redis_exporter"; - version = "1.63.0"; + version = "1.65.0"; src = fetchFromGitHub { owner = "oliver006"; repo = "redis_exporter"; rev = "v${version}"; - sha256 = "sha256-OqQjKj2WA5AsXm26HAYhbmhDkFU0el8K831i67WMXlI="; + sha256 = "sha256-koUvcWd5AWhkxIfMJc0YOHaurO4evf83xn+bBCbyiPY="; }; - vendorHash = "sha256-wBViyiYj8Duq5KrXi+YFuAUVSAkCZsnhA3fLWRLcKmU="; + vendorHash = "sha256-gTxNuqaGpigtRwYIU69woebze0QoLZE+ArROUsQAUwA="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/third_party/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix b/third_party/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix index 3c3a6199f7..83cd922bc5 100644 --- a/third_party/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix @@ -34,9 +34,9 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "eclipse"; - repo = pname; + repo = "mosquitto"; rev = "v${version}"; - sha256 = "sha256-Vs0blV2IhnlEAm0WtOartz+0vLesJfp78FNJCivRxHk="; + hash = "sha256-Vs0blV2IhnlEAm0WtOartz+0vLesJfp78FNJCivRxHk="; }; patches = lib.optionals stdenv.hostPlatform.isDarwin [ @@ -83,11 +83,13 @@ stdenv.mkDerivation rec { inherit (nixosTests) mosquitto; }; - meta = with lib; { + meta = { description = "Open source MQTT v3.1/3.1.1/5.0 broker"; homepage = "https://mosquitto.org/"; - license = licenses.epl10; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.unix; + changelog = "https://github.com/eclipse/mosquitto/blob/v${version}/ChangeLog.txt"; + license = lib.licenses.epl10; + maintainers = [ lib.maintainers.peterhoeg ]; + platforms = lib.platforms.unix; + mainProgram = "mosquitto"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/news/leafnode/1.nix b/third_party/nixpkgs/pkgs/servers/news/leafnode/1.nix index c68ad1d699..1b744ed322 100644 --- a/third_party/nixpkgs/pkgs/servers/news/leafnode/1.nix +++ b/third_party/nixpkgs/pkgs/servers/news/leafnode/1.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation (finalAttrs: { version = "1.12.0"; src = fetchurl { - url = "https://downloads.sourceforge.net/project/leafnode/leafnode/${finalAttrs.version}/leafnode-${finalAttrs.version}.tar.gz"; + url = "mirror://sourceforge/project/leafnode/leafnode/${finalAttrs.version}/leafnode-${finalAttrs.version}.tar.gz"; sha256 = "sha256-tGfOcyH2F6IeglfY00u199eKusnn6HeqD7or3Oz3ed4="; }; diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix index 7cdda6534d..a63ee485fe 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix @@ -59,14 +59,14 @@ let in { nextcloud28 = generic { - version = "28.0.10"; - hash = "sha256-LoAVJtKJHBhf6sWYXL084pLOcKQl9Tb5GfkBuftMwhA="; + version = "28.0.11"; + hash = "sha256-S6rs7GpvFFgy28PGNdcuIM1IBKytmmZOanS5CnmB40g="; packages = nextcloud28Packages; }; nextcloud29 = generic { - version = "29.0.7"; - hash = "sha256-9TL/wxvlqDdLXgcrhv/4dl7Bn9oMhQnO45hzCB2yxUQ="; + version = "29.0.8"; + hash = "sha256-CrVLUX92zSbyvTi2/hhLn7rtMvc0JGxYwaz4NHPApLk="; packages = nextcloud29Packages; }; diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/28.json b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/28.json index 834225e95e..ef62ba34d4 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/28.json +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/28.json @@ -70,9 +70,9 @@ ] }, "forms": { - "hash": "sha256-OqqorHVWCDicQKnTxEJjeXzDrsj98vWvtWYyaRmDsUs=", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.2.4/forms-v4.2.4.tar.gz", - "version": "4.2.4", + "hash": "sha256-JhLaTXll2kh/TaWXR1DfUCHuxaJlUMU1oY9ry9yoTTg=", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.1/forms-v4.3.1.tar.gz", + "version": "4.3.1", "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": [ @@ -260,9 +260,9 @@ ] }, "spreed": { - "hash": "sha256-eMdFS5yQWJNsTVuHBZX4v0PSocP/nT+JaS7RSTYF8p0=", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v18.0.11/spreed-v18.0.11.tar.gz", - "version": "18.0.11", + "hash": "sha256-pOnL5uz8FcuHUFn7otp9NQinOqm+oCmXRHx4TM2NukI=", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v18.0.12/spreed-v18.0.12.tar.gz", + "version": "18.0.12", "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": [ @@ -311,7 +311,7 @@ }, "unsplash": { "hash": "sha256-kNDQk4HYkrBA+o+5/bNYj65ZJbViBjhnbSA87tsu6YE=", - "url": "https://github.com/nextcloud/unsplash/releases/download/v3.0.1/unsplash.tar.gz", + "url": "https://github.com/nextcloud/unsplash/releases/download/v3.0.2/unsplash.tar.gz", "version": "3.0.1", "description": "Show a new random featured nature photo in your nextcloud. Now with choosable motives!", "homepage": "https://github.com/nextcloud/unsplash/", @@ -330,9 +330,9 @@ ] }, "user_saml": { - "hash": "sha256-+oeTDRomjmfSLIM6eyP6MHg+qtOs8IPqIWUzBofahYQ=", - "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v6.2.0/user_saml-v6.2.0.tar.gz", - "version": "6.2.0", + "hash": "sha256-xxabQU8kZhgI7Q9D0n7hrFygvfZWZDnAQWnB8+A1xwE=", + "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v6.3.0/user_saml-v6.3.0.tar.gz", + "version": "6.3.0", "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.", "homepage": "https://github.com/nextcloud/user_saml", "licenses": [ diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/29.json b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/29.json index df26567169..52a805aed8 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/29.json +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/29.json @@ -70,9 +70,9 @@ ] }, "forms": { - "hash": "sha256-OqqorHVWCDicQKnTxEJjeXzDrsj98vWvtWYyaRmDsUs=", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.2.4/forms-v4.2.4.tar.gz", - "version": "4.2.4", + "hash": "sha256-JhLaTXll2kh/TaWXR1DfUCHuxaJlUMU1oY9ry9yoTTg=", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.1/forms-v4.3.1.tar.gz", + "version": "4.3.1", "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": [ @@ -140,8 +140,8 @@ ] }, "maps": { - "hash": "sha256-FmRhpPRpMnCHkJFaVvQuR6Y7Pd7vpP+tUVih919g/fQ=", - "url": "https://github.com/nextcloud/maps/releases/download/v1.4.0-1-nightly/maps-1.4.0-1-nightly.tar.gz", + "hash": "sha256-BmXs6Oepwnm+Cviy4awm3S8P9AiJTt1BnAQNb4TxVYE=", + "url": "https://github.com/nextcloud/maps/releases/download/v1.4.0/maps-1.4.0.tar.gz", "version": "1.4.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", @@ -260,9 +260,9 @@ ] }, "spreed": { - "hash": "sha256-cZYE528jSNnPFgJSnqosoPyo/7V3zdUAIxnFpcOuvh4=", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.9/spreed-v19.0.9.tar.gz", - "version": "19.0.9", + "hash": "sha256-CWmVARbiZAjgMpZKofWU9FTy/LCz8zXuQdGM6UMHjZ4=", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.10/spreed-v19.0.10.tar.gz", + "version": "19.0.10", "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": [ @@ -311,7 +311,7 @@ }, "unsplash": { "hash": "sha256-kNDQk4HYkrBA+o+5/bNYj65ZJbViBjhnbSA87tsu6YE=", - "url": "https://github.com/nextcloud/unsplash/releases/download/v3.0.1/unsplash.tar.gz", + "url": "https://github.com/nextcloud/unsplash/releases/download/v3.0.2/unsplash.tar.gz", "version": "3.0.1", "description": "Show a new random featured nature photo in your nextcloud. Now with choosable motives!", "homepage": "https://github.com/nextcloud/unsplash/", @@ -330,9 +330,9 @@ ] }, "user_saml": { - "hash": "sha256-+oeTDRomjmfSLIM6eyP6MHg+qtOs8IPqIWUzBofahYQ=", - "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v6.2.0/user_saml-v6.2.0.tar.gz", - "version": "6.2.0", + "hash": "sha256-xxabQU8kZhgI7Q9D0n7hrFygvfZWZDnAQWnB8+A1xwE=", + "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v6.3.0/user_saml-v6.3.0.tar.gz", + "version": "6.3.0", "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.", "homepage": "https://github.com/nextcloud/user_saml", "licenses": [ diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/30.json b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/30.json index f4620a7606..8d32cb8e59 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/30.json +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/30.json @@ -69,6 +69,16 @@ "agpl" ] }, + "forms": { + "hash": "sha256-JhLaTXll2kh/TaWXR1DfUCHuxaJlUMU1oY9ry9yoTTg=", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.1/forms-v4.3.1.tar.gz", + "version": "4.3.1", + "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": { "hash": "sha256-OMH/pnDS/icDVUb56mzxowAhBCaVY60bMGJmwsjEc0k=", "url": "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.10.0/gpoddersync.tar.gz", @@ -120,9 +130,9 @@ ] }, "mail": { - "hash": "sha256-ldrGgqgeRLjYmtWiSAcllaIkTeeUmhjQiXrcpwgb/wk=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v4.0.0/mail-v4.0.0.tar.gz", - "version": "4.0.0", + "hash": "sha256-u0h9zCT/l9cUUFppKazx4oLkHYzlgGcb0OBOy1CXOG8=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v4.0.1/mail-v4.0.1.tar.gz", + "version": "4.0.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": [ @@ -240,9 +250,9 @@ ] }, "spreed": { - "hash": "sha256-p0m4s4ZbWEyiPPBRKvEGFk/0xN+IiYPETDegm/8QDWY=", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v20.0.0/spreed-v20.0.0.tar.gz", - "version": "20.0.0", + "hash": "sha256-mUJmbOMMIkm/83a+7xcW59TTar58D4l0Ek+kZoRdxG8=", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v20.0.1/spreed-v20.0.1.tar.gz", + "version": "20.0.1", "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": [ @@ -290,9 +300,9 @@ ] }, "user_saml": { - "hash": "sha256-+oeTDRomjmfSLIM6eyP6MHg+qtOs8IPqIWUzBofahYQ=", - "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v6.2.0/user_saml-v6.2.0.tar.gz", - "version": "6.2.0", + "hash": "sha256-xxabQU8kZhgI7Q9D0n7hrFygvfZWZDnAQWnB8+A1xwE=", + "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v6.3.0/user_saml-v6.3.0.tar.gz", + "version": "6.3.0", "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.", "homepage": "https://github.com/nextcloud/user_saml", "licenses": [ diff --git a/third_party/nixpkgs/pkgs/servers/nfs-ganesha/default.nix b/third_party/nixpkgs/pkgs/servers/nfs-ganesha/default.nix index 82f9eca8d8..53a5601c51 100644 --- a/third_party/nixpkgs/pkgs/servers/nfs-ganesha/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nfs-ganesha/default.nix @@ -1,18 +1,38 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config -, krb5, xfsprogs, jemalloc, dbus, libcap -, ntirpc, liburcu, bison, flex, nfs-utils, acl -} : +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + sphinx, + krb5, + xfsprogs, + jemalloc, + dbus, + libcap, + ntirpc, + liburcu, + bison, + flex, + nfs-utils, + acl, +}: stdenv.mkDerivation rec { pname = "nfs-ganesha"; version = "6.1"; - outputs = [ "out" "tools" ]; + + outputs = [ + "out" + "man" + "tools" + ]; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "nfs-ganesha"; rev = "V${version}"; - sha256 = "sha256-XQpbQ7NXVGVbm99d1ZEh1ckR5fd81xwZw8HorXHaeBk="; + hash = "sha256-XQpbQ7NXVGVbm99d1ZEh1ckR5fd81xwZw8HorXHaeBk="; }; preConfigure = "cd src"; @@ -23,6 +43,7 @@ stdenv.mkDerivation rec { "-DENABLE_VFS_POSIX_ACL=ON" "-DUSE_ACL_MAPPING=ON" "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON" + "-DUSE_MAN_PAGE=ON" ]; nativeBuildInputs = [ @@ -30,6 +51,7 @@ stdenv.mkDerivation rec { pkg-config bison flex + sphinx ]; buildInputs = [ @@ -63,6 +85,10 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.lgpl3Plus; mainProgram = "ganesha.nfsd"; - outputsToInstall = [ "out" "tools" ]; + outputsToInstall = [ + "out" + "man" + "tools" + ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/binary.nix b/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/binary.nix index 362337ae29..840c1ff488 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/binary.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/binary.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-jena"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { url = "mirror://apache/jena/binaries/apache-jena-${version}.tar.gz"; - hash = "sha256-LsNno/s2KFKykxKN7klTLfmFWu/jtXJCV9TFPX/Osh4="; + hash = "sha256-M2WbqXHAL77fu9khTgb7BOe0mLgmU0Rcf9KN4KmvYAU="; }; nativeBuildInputs = [ makeWrapper diff --git a/third_party/nixpkgs/pkgs/servers/photoprism/default.nix b/third_party/nixpkgs/pkgs/servers/photoprism/default.nix index ab641548b4..61076419ee 100644 --- a/third_party/nixpkgs/pkgs/servers/photoprism/default.nix +++ b/third_party/nixpkgs/pkgs/servers/photoprism/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchzip, darktable, rawtherapee, ffmpeg_7, libheif, exiftool, imagemagick, makeWrapper, testers +{ lib, stdenv, fetchFromGitHub, fetchzip, darktable, rawtherapee, ffmpeg, libheif, exiftool, imagemagick, makeWrapper, testers , callPackage , nixosTests , librsvg }: @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { --set PHOTOPRISM_RAWTHERAPEE_BIN ${rawtherapee}/bin/rawtherapee-cli \ --set PHOTOPRISM_HEIFCONVERT_BIN ${libheif}/bin/heif-dec \ --set PHOTOPRISM_RSVGCONVERT_BIN ${librsvg}/bin/rsvg-convert \ - --set PHOTOPRISM_FFMPEG_BIN ${ffmpeg_7}/bin/ffmpeg \ + --set PHOTOPRISM_FFMPEG_BIN ${ffmpeg}/bin/ffmpeg \ --set PHOTOPRISM_EXIFTOOL_BIN ${exiftool}/bin/exiftool \ --set PHOTOPRISM_IMAGEMAGICK_BIN ${imagemagick}/bin/convert diff --git a/third_party/nixpkgs/pkgs/servers/search/weaviate/default.nix b/third_party/nixpkgs/pkgs/servers/search/weaviate/default.nix index ca7f8e33c7..788e2ddecb 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.26.4"; + version = "1.26.6"; src = fetchFromGitHub { owner = "weaviate"; repo = "weaviate"; rev = "v${version}"; - hash = "sha256-JnzQ+B5zxbKZQ/jzOsD7r58f+TaCivN4BTJyNImi9xE="; + hash = "sha256-Vi8jcWfG3MvzXDcVFd6wC+KEpPQUL1uBCk7GJwyO0gU="; }; - vendorHash = "sha256-QwB97LNUFK8yuKK8JSy1uH2hu+8ZAlvc+9VlTIld83U="; + vendorHash = "sha256-HzEnt/eagDw6/7HV0MRMQDcp56mLv1kE9HCfBouxDRs="; subPackages = [ "cmd/weaviate-server" ]; diff --git a/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix b/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix index 8210e252bd..73b23ce6f9 100644 --- a/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix +++ b/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 lxml ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "3.32.7"; + version = "3.32.10"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - hash = "sha256-7kVT/aBL9EAx7oGeXEY9eL72dZGtuJUGlQ7bPyt/JZg="; + hash = "sha256-dgaSFTrBg3CM320M75AA2qQaKDkh3LycNqNgO8ewSrw="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/servers/sql/percona-server/lts.nix b/third_party/nixpkgs/pkgs/servers/sql/percona-server/8_0.nix similarity index 60% rename from third_party/nixpkgs/pkgs/servers/sql/percona-server/lts.nix rename to third_party/nixpkgs/pkgs/servers/sql/percona-server/8_0.nix index 352b0239c4..1d1a64e316 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/percona-server/lts.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/percona-server/8_0.nix @@ -1,24 +1,63 @@ -{ lib, stdenv, fetchurl, bison, cmake, pkg-config -, boost, icu, libedit, libevent, lz4, ncurses, openssl, perl, protobuf, re2, readline, zlib, zstd, libfido2 -, numactl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools, nixosTests -, coreutils, procps, gnused, gnugrep, hostname, makeWrapper -# Percona-specific deps -, cyrus_sasl, gnumake, openldap +{ + lib, + stdenv, + fetchurl, + bison, + cmake, + pkg-config, + boost, + icu, + libedit, + libevent, + lz4, + ncurses, + openssl, + perl, + protobuf, + re2, + readline, + zlib, + zstd, + libfido2, + numactl, + cctools, + CoreServices, + developer_cmds, + libtirpc, + rpcsvc-proto, + curl, + DarwinTools, + nixosTests, + coreutils, + procps, + gnused, + gnugrep, + hostname, + makeWrapper, + # Percona-specific deps + cyrus_sasl, + gnumake, + openldap, }: stdenv.mkDerivation (finalAttrs: { - pname = "percona-server_lts"; - version = "8.0.36-28"; + pname = "percona-server"; + version = "8.0.37-29"; src = fetchurl { url = "https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-${finalAttrs.version}/source/tarball/percona-server-${finalAttrs.version}.tar.gz"; - hash = "sha256-iktEvZz3mjjmJ16PX51OjSwwiFS3H9W/XRco//Q6aEQ="; + hash = "sha256-zZgq3AxCRYdte3dTUJiuMvVGdl9U01s8jxcAqDxZiNM="; }; nativeBuildInputs = [ - bison cmake pkg-config makeWrapper + bison + cmake + pkg-config + makeWrapper # required for scripts/CMakeLists.txt - coreutils gnugrep procps + coreutils + gnugrep + procps ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]; patches = [ @@ -36,16 +75,41 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "make --" "${gnumake}/bin/make --" ''; - buildInputs = [ - boost (curl.override { inherit openssl; }) icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib - zstd libfido2 openldap perl cyrus_sasl - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - numactl libtirpc - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - cctools CoreServices developer_cmds DarwinTools - ]; + buildInputs = + [ + boost + (curl.override { inherit openssl; }) + icu + libedit + libevent + lz4 + ncurses + openssl + protobuf + re2 + readline + zlib + zstd + libfido2 + openldap + perl + cyrus_sasl + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + numactl + libtirpc + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + cctools + CoreServices + developer_cmds + DarwinTools + ]; - outputs = [ "out" "static" ]; + outputs = [ + "out" + "static" + ]; cmakeFlags = [ # Percona-specific flags. @@ -78,11 +142,39 @@ stdenv.mkDerivation (finalAttrs: { so=${stdenv.hostPlatform.extensions.sharedLibrary} ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so - wrapProgram $out/bin/mysqld_safe --prefix PATH : ${lib.makeBinPath [ coreutils procps gnugrep gnused hostname ]} - wrapProgram $out/bin/mysql_config --prefix PATH : ${lib.makeBinPath [ coreutils gnused ]} - wrapProgram $out/bin/ps_mysqld_helper --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]} - wrapProgram $out/bin/ps-admin --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]} - wrapProgram $out/bin/mysqld_multi --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]} + wrapProgram $out/bin/mysqld_safe --prefix PATH : ${ + lib.makeBinPath [ + coreutils + procps + gnugrep + gnused + hostname + ] + } + wrapProgram $out/bin/mysql_config --prefix PATH : ${ + lib.makeBinPath [ + coreutils + gnused + ] + } + wrapProgram $out/bin/ps_mysqld_helper --prefix PATH : ${ + lib.makeBinPath [ + coreutils + gnugrep + ] + } + wrapProgram $out/bin/ps-admin --prefix PATH : ${ + lib.makeBinPath [ + coreutils + gnugrep + ] + } + wrapProgram $out/bin/mysqld_multi --prefix PATH : ${ + lib.makeBinPath [ + coreutils + gnugrep + ] + } ''; passthru = { @@ -98,8 +190,9 @@ stdenv.mkDerivation (finalAttrs: { description = '' A free, fully compatible, enhanced, open source drop-in replacement for MySQL® that provides superior performance, scalability and instrumentation. + Long-term support release. ''; - license = licenses.gpl2Plus; + license = licenses.gpl2Only; maintainers = teams.flyingcircus.members; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/servers/sql/percona-server/8_4.nix b/third_party/nixpkgs/pkgs/servers/sql/percona-server/8_4.nix new file mode 100644 index 0000000000..0b68f84d4b --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/sql/percona-server/8_4.nix @@ -0,0 +1,221 @@ +{ + lib, + stdenv, + fetchurl, + bison, + cmake, + pkg-config, + boost, + icu, + libedit, + libevent, + lz4, + ncurses, + openssl, + perl, + protobuf, + re2, + readline, + zlib, + zstd, + libfido2, + numactl, + cctools, + CoreServices, + developer_cmds, + libtirpc, + rpcsvc-proto, + curl, + DarwinTools, + nixosTests, + coreutils, + procps, + gnused, + gnugrep, + hostname, + makeWrapper, + systemd, + # Percona-specific deps + cyrus_sasl, + gnumake, + openldap, + # optional: different malloc implementations + withJemalloc ? false, + withTcmalloc ? false, + jemalloc, + gperftools, +}: + +assert !(withJemalloc && withTcmalloc); + +stdenv.mkDerivation (finalAttrs: { + pname = "percona-server"; + version = "8.4.0-1"; + + src = fetchurl { + url = "https://downloads.percona.com/downloads/Percona-Server-${lib.versions.majorMinor finalAttrs.version}/Percona-Server-${finalAttrs.version}/source/tarball/percona-server-${finalAttrs.version}.tar.gz"; + hash = "sha256-76PXXqTNBVsD7RX2vhp7RyESiFpJL0h0zG9ucNfy3uQ="; + }; + + nativeBuildInputs = [ + bison + cmake + pkg-config + makeWrapper + # required for scripts/CMakeLists.txt + coreutils + gnugrep + procps + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]; + + patches = [ + ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch + ]; + + ## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references. + postPatch = '' + substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool + substituteInPlace cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool + # The rocksdb setup script is called with `env -i` and cannot find anything in PATH. + patchShebangs storage/rocksdb/get_rocksdb_files.sh + substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace mktemp ${coreutils}/bin/mktemp + substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "rm $MKFILE" "${coreutils}/bin/rm $MKFILE" + substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "make --" "${gnumake}/bin/make --" + ''; + + buildInputs = + [ + boost + (curl.override { inherit openssl; }) + icu + libedit + libevent + lz4 + ncurses + openssl + protobuf + re2 + readline + zlib + zstd + libfido2 + openldap + perl + cyrus_sasl + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + numactl + libtirpc + systemd + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + cctools + CoreServices + developer_cmds + DarwinTools + ] + ++ lib.optional (stdenv.hostPlatform.isLinux && withJemalloc) jemalloc + ++ lib.optional (stdenv.hostPlatform.isLinux && withTcmalloc) gperftools; + + outputs = [ + "out" + "static" + ]; + + cmakeFlags = + [ + # Percona-specific flags. + "-DPORTABLE=1" + "-DWITH_LDAP=system" + "-DROCKSDB_DISABLE_AVX2=1" + "-DROCKSDB_DISABLE_MARCH_NATIVE=1" + + # Flags taken from mysql package. + "-DFORCE_UNSUPPORTED_COMPILER=1" # To configure on Darwin. + "-DWITH_ROUTER=OFF" # It may be packaged separately. + "-DWITH_SYSTEM_LIBS=ON" + "-DWITH_UNIT_TESTS=OFF" + "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" + "-DMYSQL_DATADIR=/var/lib/mysql" + "-DINSTALL_INFODIR=share/mysql/docs" + "-DINSTALL_MANDIR=share/man" + "-DINSTALL_PLUGINDIR=lib/mysql/plugin" + "-DINSTALL_INCLUDEDIR=include/mysql" + "-DINSTALL_DOCREADMEDIR=share/mysql" + "-DINSTALL_SUPPORTFILESDIR=share/mysql" + "-DINSTALL_MYSQLSHAREDIR=share/mysql" + "-DINSTALL_MYSQLTESTDIR=" + "-DINSTALL_DOCDIR=share/mysql/docs" + "-DINSTALL_SHAREDIR=share/mysql" + + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + "-DWITH_SYSTEMD=1" + "-DWITH_SYSTEMD_DEBUG=1" + ] + ++ lib.optional (stdenv.hostPlatform.isLinux && withJemalloc) "-DWITH_JEMALLOC=1" + ++ lib.optional (stdenv.hostPlatform.isLinux && withTcmalloc) "-DWITH_TCMALLOC=1"; + + postInstall = + '' + moveToOutput "lib/*.a" $static + so=${stdenv.hostPlatform.extensions.sharedLibrary} + ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so + + wrapProgram $out/bin/mysqld_safe --prefix PATH : ${ + lib.makeBinPath [ + coreutils + procps + gnugrep + gnused + hostname + ] + } + wrapProgram $out/bin/mysql_config --prefix PATH : ${ + lib.makeBinPath [ + coreutils + gnused + ] + } + wrapProgram $out/bin/ps_mysqld_helper --prefix PATH : ${ + lib.makeBinPath [ + coreutils + gnugrep + ] + } + wrapProgram $out/bin/ps-admin --prefix PATH : ${ + lib.makeBinPath [ + coreutils + gnugrep + ] + } + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + wrapProgram $out/bin/mysqld_multi --prefix PATH : ${ + lib.makeBinPath [ + coreutils + gnugrep + ] + } + ''; + + passthru = { + client = finalAttrs.finalPackage; + connector-c = finalAttrs.finalPackage; + server = finalAttrs.finalPackage; + mysqlVersion = lib.versions.majorMinor finalAttrs.version; + tests = nixosTests.mysql.percona-server_innovation; + }; + + meta = with lib; { + homepage = "https://www.percona.com/software/mysql-database/percona-server"; + description = '' + A free, fully compatible, enhanced, open source drop-in replacement for + MySQL® that provides superior performance, scalability and instrumentation. + Long-term support release. + ''; + license = licenses.gpl2Only; + maintainers = teams.flyingcircus.members; + platforms = platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/servers/sql/percona-server/default.nix b/third_party/nixpkgs/pkgs/servers/sql/percona-server/default.nix index 002765a04c..aaac48de68 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/percona-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/percona-server/default.nix @@ -1,15 +1,18 @@ pkgs: { - percona-server_lts = pkgs.callPackage ./lts.nix { + # old lts + percona-server_8_0 = pkgs.callPackage ./8_0.nix { inherit (pkgs.darwin) developer_cmds DarwinTools; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; boost = pkgs.boost177; # Configure checks for specific version. icu = pkgs.icu69; + # newer versions cause linking failures against `libabsl_spinlock_wait` protobuf = pkgs.protobuf_21; }; - percona-server_innovation = pkgs.callPackage ./innovation.nix { + percona-server_8_4 = pkgs.callPackage ./8_4.nix { inherit (pkgs.darwin) developer_cmds DarwinTools; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; # newer versions cause linking failures against `libabsl_spinlock_wait` protobuf = pkgs.protobuf_21; }; + percona-server = pkgs.percona-server_8_4; } diff --git a/third_party/nixpkgs/pkgs/servers/sql/percona-server/innovation.nix b/third_party/nixpkgs/pkgs/servers/sql/percona-server/innovation.nix deleted file mode 100644 index 61b2ff7bb4..0000000000 --- a/third_party/nixpkgs/pkgs/servers/sql/percona-server/innovation.nix +++ /dev/null @@ -1,123 +0,0 @@ -{ lib, stdenv, fetchurl, bison, cmake, pkg-config -, boost, icu, libedit, libevent, lz4, ncurses, openssl, perl, protobuf, re2, readline, zlib, zstd, libfido2 -, numactl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools, nixosTests -, coreutils, procps, gnused, gnugrep, hostname, makeWrapper -, systemd -# Percona-specific deps -, cyrus_sasl, gnumake, openldap -# optional: different malloc implementations -, withJemalloc ? false, withTcmalloc ? false, jemalloc, gperftools -}: - -assert !(withJemalloc && withTcmalloc); - - -stdenv.mkDerivation (finalAttrs: { - pname = "percona-server_innovation"; - version = "8.3.0-1"; - - src = fetchurl { - url = "https://downloads.percona.com/downloads/percona-distribution-mysql-ps/percona-distribution-mysql-ps-${builtins.head (lib.strings.split "-" finalAttrs.version)}/source/tarball/percona-server-${finalAttrs.version}.tar.gz"; - hash = "sha256-GeuifzqCkStmb4qYa8147XBHvMogYwfsn0FyHdO4WEg"; - }; - - nativeBuildInputs = [ - bison cmake pkg-config makeWrapper - # required for scripts/CMakeLists.txt - coreutils gnugrep procps - ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]; - - patches = [ - ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch - ]; - - ## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references. - postPatch = '' - substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool - substituteInPlace cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool - # The rocksdb setup script is called with `env -i` and cannot find anything in PATH. - patchShebangs storage/rocksdb/get_rocksdb_files.sh - substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace mktemp ${coreutils}/bin/mktemp - substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "rm $MKFILE" "${coreutils}/bin/rm $MKFILE" - substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "make --" "${gnumake}/bin/make --" - ''; - - buildInputs = [ - boost (curl.override { inherit openssl; }) icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib - zstd libfido2 openldap perl cyrus_sasl - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - numactl libtirpc systemd - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - cctools CoreServices developer_cmds DarwinTools - ] - ++ lib.optional (stdenv.hostPlatform.isLinux && withJemalloc) jemalloc - ++ lib.optional (stdenv.hostPlatform.isLinux && withTcmalloc) gperftools; - - outputs = [ "out" "static" ]; - - cmakeFlags = [ - # Percona-specific flags. - "-DPORTABLE=1" - "-DWITH_LDAP=system" - "-DROCKSDB_DISABLE_AVX2=1" - "-DROCKSDB_DISABLE_MARCH_NATIVE=1" - - # Flags taken from mysql package. - "-DFORCE_UNSUPPORTED_COMPILER=1" # To configure on Darwin. - "-DWITH_ROUTER=OFF" # It may be packaged separately. - "-DWITH_SYSTEM_LIBS=ON" - "-DWITH_UNIT_TESTS=OFF" - "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" - "-DMYSQL_DATADIR=/var/lib/mysql" - "-DINSTALL_INFODIR=share/mysql/docs" - "-DINSTALL_MANDIR=share/man" - "-DINSTALL_PLUGINDIR=lib/mysql/plugin" - "-DINSTALL_INCLUDEDIR=include/mysql" - "-DINSTALL_DOCREADMEDIR=share/mysql" - "-DINSTALL_SUPPORTFILESDIR=share/mysql" - "-DINSTALL_MYSQLSHAREDIR=share/mysql" - "-DINSTALL_MYSQLTESTDIR=" - "-DINSTALL_DOCDIR=share/mysql/docs" - "-DINSTALL_SHAREDIR=share/mysql" - - - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - "-DWITH_SYSTEMD=1" - "-DWITH_SYSTEMD_DEBUG=1" - ] - ++ lib.optional (stdenv.hostPlatform.isLinux && withJemalloc) "-DWITH_JEMALLOC=1" - ++ lib.optional (stdenv.hostPlatform.isLinux && withTcmalloc) "-DWITH_TCMALLOC=1"; - - postInstall = '' - moveToOutput "lib/*.a" $static - so=${stdenv.hostPlatform.extensions.sharedLibrary} - ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so - - wrapProgram $out/bin/mysqld_safe --prefix PATH : ${lib.makeBinPath [ coreutils procps gnugrep gnused hostname ]} - wrapProgram $out/bin/mysql_config --prefix PATH : ${lib.makeBinPath [ coreutils gnused ]} - wrapProgram $out/bin/ps_mysqld_helper --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]} - wrapProgram $out/bin/ps-admin --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]} - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - wrapProgram $out/bin/mysqld_multi --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]} - ''; - - passthru = { - client = finalAttrs.finalPackage; - connector-c = finalAttrs.finalPackage; - server = finalAttrs.finalPackage; - mysqlVersion = lib.versions.majorMinor finalAttrs.version; - tests = nixosTests.mysql.percona-server_innovation; - }; - - - meta = with lib; { - homepage = "https://www.percona.com/software/mysql-database/percona-server"; - description = '' - A free, fully compatible, enhanced, open source drop-in replacement for - MySQL® that provides superior performance, scalability and instrumentation. - ''; - license = licenses.gpl2; - maintainers = teams.flyingcircus.members; - platforms = platforms.unix; - }; -}) diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/rum.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/rum.nix index 0fb6635529..629fddfcbb 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/rum.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/rum.nix @@ -1,14 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ + lib, + stdenv, + fetchFromGitHub, + postgresql, + postgresqlTestHook, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rum"; - version = "1.3.13"; + version = "1.3.14"; src = fetchFromGitHub { owner = "postgrespro"; repo = "rum"; - rev = version; - hash = "sha256-yy2xeDnk3fENN+En0st4mv60nZlqPafIzwf68jwJ5fE="; + rev = finalAttrs.version; + hash = "sha256-VsfpxQqRBu9bIAP+TfMRXd+B3hSjuhU2NsutocNiCt8="; }; buildInputs = [ postgresql ]; @@ -21,6 +27,34 @@ stdenv.mkDerivation rec { install -D -t $out/share/postgresql/extension *.sql ''; + passthru.tests.extension = stdenv.mkDerivation { + inherit (finalAttrs) version; + pname = "rum-test"; + + dontUnpack = true; + doCheck = true; + nativeCheckInputs = [ + postgresqlTestHook + (postgresql.withPackages (_: [ finalAttrs.finalPackage ])) + ]; + failureHook = "postgresqlStop"; + postgresqlTestUserOptions = "LOGIN SUPERUSER"; + passAsFile = [ "sql" ]; + sql = '' + CREATE EXTENSION rum; + CREATE TABLE test_table (t text, v tsvector); + CREATE INDEX test_table_rumindex ON test_table USING rum (v rum_tsvector_ops); + ''; + checkPhase = '' + runHook preCheck + + psql -a -v ON_ERROR_STOP=1 -f $sqlPath + + runHook postCheck + ''; + installPhase = "touch $out"; + }; + meta = with lib; { description = "Full text search index method for PostgreSQL"; homepage = "https://github.com/postgrespro/rum"; @@ -28,4 +62,4 @@ stdenv.mkDerivation rec { platforms = postgresql.meta.platforms; maintainers = with maintainers; [ DeeUnderscore ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 92b6ad4fea..bd2d2d3b74 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -23,12 +23,12 @@ stdenv.mkDerivation rec { postPatch = '' for x in CMakeLists.txt sql/CMakeLists.txt; do substituteInPlace "$x" \ - --replace 'DESTINATION "''${PG_SHAREDIR}/extension"' "DESTINATION \"$out/share/postgresql/extension\"" + --replace-fail 'DESTINATION "''${PG_SHAREDIR}/extension"' "DESTINATION \"$out/share/postgresql/extension\"" done for x in src/CMakeLists.txt src/loader/CMakeLists.txt tsl/src/CMakeLists.txt; do substituteInPlace "$x" \ - --replace 'DESTINATION ''${PG_PKGLIBDIR}' "DESTINATION \"$out/lib\"" + --replace-fail 'DESTINATION ''${PG_PKGLIBDIR}' "DESTINATION \"$out/lib\"" done ''; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/generic.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/generic.nix index 69aa8a3774..07cff1a1ad 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/generic.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/generic.nix @@ -6,7 +6,8 @@ let , glibc, zlib, readline, openssl, icu, lz4, zstd, systemdLibs, libossp_uuid , pkg-config, libxml2, tzdata, libkrb5, substituteAll, darwin , linux-pam - , removeReferencesTo + + , removeReferencesTo, writeShellApplication # This is important to obtain a version of `libpq` that does not depend on systemd. , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemdLibs && !stdenv.hostPlatform.isStatic @@ -54,6 +55,11 @@ let }) else stdenv; + + pg_config = writeShellApplication { + name = "pg_config"; + text = builtins.readFile ./pg_config.sh; + }; in stdenv'.mkDerivation (finalAttrs: { inherit version; pname = pname + lib.optionalString jitSupport "-jit"; @@ -160,6 +166,23 @@ let src = ./patches/locale-binary-path.patch; locale = "${if stdenv.hostPlatform.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale"; }) + + # TODO: Remove this with the next set of minor releases + (fetchpatch ( + if atLeast "14" then { + url = "https://github.com/postgres/postgres/commit/b27622c90869aab63cfe22159a459c57768b0fa4.patch"; + hash = "sha256-7G+BkJULhyx6nlMEjClcr2PJg6awgymZHr2JgGhXanA="; + excludes = [ "doc/*" ]; + } else if atLeast "13" then { + url = "https://github.com/postgres/postgres/commit/b28b9b19bbe3410da4a805ef775e0383a66af314.patch"; + hash = "sha256-meFFskNWlcc/rv4BWo6fNR/tTFgQRgXGqTkJkoX7lHU="; + excludes = [ "doc/*" ]; + } else { + url = "https://github.com/postgres/postgres/commit/205813da4c264d80db3c3215db199cc119e18369.patch"; + hash = "sha256-L8/ns/fxTh2ayfDQXtBIKaArFhMd+v86UxVFWQdmzUw="; + excludes = [ "doc/*" ]; + }) + ) ] ++ lib.optionals stdenv'.hostPlatform.isMusl ( # Using fetchurl instead of fetchpatch on purpose: https://github.com/NixOS/nixpkgs/issues/240141 map fetchurl (lib.attrValues muslPatches) @@ -183,15 +206,10 @@ let moveToOutput "lib/pgxs" "$dev" # Pretend pg_config is located in $out/bin to return correct paths, but - # actually have it in -dev to avoid pulling in all other outputs. + # actually have it in -dev to avoid pulling in all other outputs. See the + # pg_config.sh script's comments for details. moveToOutput "bin/pg_config" "$dev" - # To prevent a "pg_config: could not find own program executable" error, we fake - # pg_config in the default output. - cat << EOF > "$out/bin/pg_config" && chmod +x "$out/bin/pg_config" - #!${stdenv'.shell} - echo The real pg_config can be found in the -dev output. - exit 1 - EOF + install -c -m 755 "${pg_config}"/bin/pg_config "$out/bin/pg_config" wrapProgram "$dev/bin/pg_config" --argv0 "$out/bin/pg_config" # postgres exposes external symbols get_pkginclude_path and similar. Those diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/pg_config.sh b/third_party/nixpkgs/pkgs/servers/sql/postgresql/pg_config.sh new file mode 100644 index 0000000000..9538b213fb --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/pg_config.sh @@ -0,0 +1,35 @@ +# The real pg_config needs to be in the same path as the "postgres" binary +# to return proper paths. However, we want it in the -dev output to prevent +# cyclic references and to prevent blowing up the runtime closure. Thus, we +# have wrapped -dev/bin/pg_config to fake its argv0 to be in the default +# output. Unfortunately, pg_config tries to be smart and tries to find itself - +# which will then fail with: +# pg_config: could not find own program executable +# To counter this, we're creating *this* fake pg_config script and put it into +# the default output. The real pg_config is happy. +# Some extensions, e.g. timescaledb, use the reverse logic and look for pg_config +# in the same path as the "postgres" binary to support multi-version-installs. +# Thus, they will end up calling this script during build, even though the real +# pg_config would be available on PATH, provided by nativeBuildInputs. To help +# this case, we're redirecting the call to pg_config to the one found in PATH, +# iff we can be convinced that it belongs to our -dev output. + +# Avoid infinite recursion +if [[ ! -v PG_CONFIG_CALLED ]]; then + # compares "path of *this* script" with "path, which pg_config on PATH believes it is in" + if [[ "$(readlink -f -- "$0")" == "$(PG_CONFIG_CALLED=1 pg_config --bindir)/pg_config" ]]; then + # The pg_config in PATH returns the same bindir that we're actually called from. + # This means that the pg_config in PATH is the one from "our" -dev output. + # This happens when the -dev output has been put in native build + # inputs and allows us to call the real pg_config without referencing + # the -dev output itself. + exec pg_config "$@" + fi +fi + +# This will happen in one of these cases: +# - *this* script is the first on PATH +# - np pg_config on PATH +# - some other pg_config on PATH, not from our -dev output +echo The real pg_config can be found in the -dev output. +exit 1 diff --git a/third_party/nixpkgs/pkgs/servers/sql/rqlite/default.nix b/third_party/nixpkgs/pkgs/servers/sql/rqlite/default.nix index 0db6ded316..78f998952c 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/rqlite/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/rqlite/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "rqlite"; - version = "8.31.0"; + version = "8.31.2"; src = fetchFromGitHub { owner = "rqlite"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7yuc3W298Fay5A16a74TKuDd3huhtCpbefyI+aobgqM="; + sha256 = "sha256-qxv7HuT7nV0Kr95WH1o02qbtn+oA85b4ZHm/rHGq25A="; }; vendorHash = "sha256-P8v0vqxOfN9JjwsdoM6JmqGujGP5V68OAUc3KB/YU+k="; diff --git a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix index 4ab40c33fc..c01b029142 100644 --- a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix @@ -15,7 +15,7 @@ }: let - version = "1.74.1"; + version = "1.76.0"; in buildGoModule { pname = "tailscale"; @@ -27,7 +27,7 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-672FtDKgz7Nmoufoe4Xg/b8sA8EuKH8X+3n9PAKYjFk="; + hash = "sha256-fCUrZ+rrNJ9+XYjCtgaTUWmWczBbavtPe1pFM3L913w="; }; patches = [ @@ -39,7 +39,7 @@ buildGoModule { }) ]; - vendorHash = "sha256-HJEgBs2GOzXvRa95LdwySQmG4/+QwupFDBGrQT6Y2vE="; + vendorHash = "sha256-xCZ6YMJ0fqVzO+tKbCzF0ftV05NOB+lJbJBovLqlrtQ="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ makeWrapper ] ++ [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/servers/tracing/tempo/default.nix b/third_party/nixpkgs/pkgs/servers/tracing/tempo/default.nix index c4a01d6707..2b5ee20b26 100644 --- a/third_party/nixpkgs/pkgs/servers/tracing/tempo/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tracing/tempo/default.nix @@ -1,6 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGo122Module, fetchFromGitHub }: -buildGoModule rec { +# Does not build with Go 1.23 +# FIXME: check again for next release +buildGo122Module rec { pname = "tempo"; version = "2.6.0"; diff --git a/third_party/nixpkgs/pkgs/servers/unifi/default.nix b/third_party/nixpkgs/pkgs/servers/unifi/default.nix index f207737ed0..4875e072ca 100644 --- a/third_party/nixpkgs/pkgs/servers/unifi/default.nix +++ b/third_party/nixpkgs/pkgs/servers/unifi/default.nix @@ -47,8 +47,8 @@ in rec { # see https://community.ui.com/releases / https://www.ui.com/download/unifi unifi8 = generic { - version = "8.4.62"; - suffix = "-i3q2j125cz"; - sha256 = "sha256-7qEk6zpihJfgxCoVa8fVSMZN87sHG5XhWpuZoBvB5QU="; + version = "8.5.6"; + suffix = "-1x29lm155t"; + sha256 = "sha256-ZpCoE8OPb3FcKzf7Nurf9q+g2BpbjZcp1LvWOsV/tpA="; }; } diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/default.nix index 73810fa139..6fb6aa9223 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/default.nix @@ -406,6 +406,9 @@ let maintainers = with maintainers; [ talyz ]; license = licenses.gpl2Plus; description = "Discourse is an open source discussion platform"; + knownVulnerabilities = [ + "https://meta.discourse.org/t/3-3-2-security-and-maintenance-release/329341/1" + ]; }; passthru = { 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 43f3f399b4..0bfed29633 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.42.1"; + version = "1.42.3"; src = fetchurl { url = "https://releases.wikimedia.org/mediawiki/${lib.versions.majorMinor version}/mediawiki-${version}.tar.gz"; - hash = "sha256-7IevlaNd0Jw01S4CeVZSoDCrcpVeQx8IynIqc3N+ulM="; + hash = "sha256-4FVjA/HYRnnNk5sykMyrP4nLxp02B/8dRJymxZU7ILw="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/servers/webdav/default.nix b/third_party/nixpkgs/pkgs/servers/webdav/default.nix index 9349b9abfe..c1c72db242 100644 --- a/third_party/nixpkgs/pkgs/servers/webdav/default.nix +++ b/third_party/nixpkgs/pkgs/servers/webdav/default.nix @@ -1,17 +1,17 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGo123Module }: -buildGoModule rec { +buildGo123Module rec { pname = "webdav"; - version = "5.1.0"; + version = "5.3.0"; src = fetchFromGitHub { owner = "hacdias"; repo = "webdav"; rev = "v${version}"; - sha256 = "sha256-6hDMu3IgyQeRSxo1z3TAjrEH/XwdfHvoLVjyVwa0LdU="; + sha256 = "sha256-F7ehl7Q/66ah6/N06U8Ld3bUjuF5tpJlNS/aWEorQaI="; }; - vendorHash = "sha256-LQePicQUm55c0lzVCF6au2v3BfXvGIJHNn2SpTQEjpU="; + vendorHash = "sha256-FvTDqGr3B05osuJvLj7J04JMeamZc/X6YeLY24ej7Ak="; meta = with lib; { description = "Simple WebDAV server"; diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix b/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix index a7c5aa884d..7987eae7b4 100644 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix @@ -1358,11 +1358,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXfont2 = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXfont2"; - version = "2.0.6"; + version = "2.0.7"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libXfont2-2.0.6.tar.xz"; - sha256 = "1x5f4w6f94dq9hfcd11xzzjqbz30yn2hdrnmv1b3zyxhgq0j1jkl"; + url = "mirror://xorg/individual/lib/libXfont2-2.0.7.tar.xz"; + sha256 = "1ywfwpirvi7fmd3my3cb6szzd9c4p7xy7s1kjjv6k1x4xgyq4ywb"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1598,11 +1598,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXtst = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXi, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXtst"; - version = "1.2.4"; + version = "1.2.5"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libXtst-1.2.4.tar.xz"; - sha256 = "1j1kr90b7vmpqniqd0pd786kn5924q799c5m2kpgzd2lj85z7xc4"; + url = "mirror://xorg/individual/lib/libXtst-1.2.5.tar.xz"; + sha256 = "0hljblisw72fk60y7zf9214ydn7lk32kj43cf12af2bhp4jlq3dm"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix b/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix index ad631e419a..ebf68e2680 100644 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix @@ -1,6 +1,6 @@ { callPackage, lib, stdenv, makeWrapper, fetchurl, fetchpatch, fetchFromGitLab, buildPackages, - automake, autoconf, libiconv, libtool, intltool, gettext, python3, perl, + automake, autoconf, libiconv, libtool, intltool, gettext, gzip, python3, perl, freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, netbsd, ncompress, updateAutotoolsGnuConfigScriptsHook, @@ -397,6 +397,8 @@ self: super: outputs = [ "bin" "dev" "out" ]; # tiny man in $bin patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in"; XPM_PATH_COMPRESS = lib.makeBinPath [ ncompress ]; + XPM_PATH_GZIP = lib.makeBinPath [ gzip ]; + XPM_PATH_UNCOMPRESS = lib.makeBinPath [ gzip ]; meta = attrs.meta // { mainProgram = "sxpm"; }; }); diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list b/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list index 2575b47dd2..8c190f6d9f 100644 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list @@ -185,7 +185,7 @@ mirror://xorg/individual/lib/libXdmcp-1.1.5.tar.xz mirror://xorg/individual/lib/libXext-1.3.6.tar.xz mirror://xorg/individual/lib/libXfixes-6.0.1.tar.xz mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2 -mirror://xorg/individual/lib/libXfont2-2.0.6.tar.xz +mirror://xorg/individual/lib/libXfont2-2.0.7.tar.xz mirror://xorg/individual/lib/libXft-2.3.8.tar.xz mirror://xorg/individual/lib/libXi-1.8.1.tar.xz mirror://xorg/individual/lib/libXinerama-1.1.5.tar.xz @@ -201,7 +201,7 @@ mirror://xorg/individual/lib/libXScrnSaver-1.2.4.tar.xz mirror://xorg/individual/lib/libxshmfence-1.3.2.tar.xz mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2 mirror://xorg/individual/lib/libXt-1.3.0.tar.xz -mirror://xorg/individual/lib/libXtst-1.2.4.tar.xz +mirror://xorg/individual/lib/libXtst-1.2.5.tar.xz mirror://xorg/individual/lib/libXv-1.0.12.tar.xz mirror://xorg/individual/lib/libXvMC-1.0.14.tar.xz mirror://xorg/individual/lib/libXxf86dga-1.1.6.tar.xz diff --git a/third_party/nixpkgs/pkgs/servers/xandikos/default.nix b/third_party/nixpkgs/pkgs/servers/xandikos/default.nix index c22db465b2..d86ff503e8 100644 --- a/third_party/nixpkgs/pkgs/servers/xandikos/default.nix +++ b/third_party/nixpkgs/pkgs/servers/xandikos/default.nix @@ -1,13 +1,15 @@ -{ lib -, fetchFromGitHub -, python3Packages -, nixosTests +{ + fetchFromGitHub, + fetchpatch2, + lib, + nixosTests, + python3Packages, }: python3Packages.buildPythonApplication rec { pname = "xandikos"; version = "0.2.11"; - format = "pyproject"; + pyproject = true; disabled = python3Packages.pythonOlder "3.9"; @@ -18,12 +20,20 @@ python3Packages.buildPythonApplication rec { hash = "sha256-cBsceJ6tib8OYx5L2Hv2AqRS+ADRSLIuJGIULNpAmEI="; }; - nativeBuildInputs = with python3Packages; [ - setuptools - wheel + patches = [ + (fetchpatch2 { + name = "fix-compatibility-with-icalendar-v6.patch"; + url = "https://github.com/jelmer/xandikos/commit/ae8924c374ed86b2efde5bfbc75e56f6d8318086.patch"; + excludes = [ "requirements.txt" ]; + hash = "sha256-PCKo5C6Ejw9ZsFFLAMw1ZtMoCq9gJxR65K7CM6RUYwU="; + }) ]; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ aiohttp aiohttp-openmetrics dulwich @@ -31,6 +41,7 @@ python3Packages.buildPythonApplication rec { icalendar jinja2 multidict + pytz vobject ]; diff --git a/third_party/nixpkgs/pkgs/shells/nushell/default.nix b/third_party/nixpkgs/pkgs/shells/nushell/default.nix index ef0edeb6a2..52c211b46b 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/default.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/default.nix @@ -21,7 +21,7 @@ }: let - version = "0.98.0"; + version = "0.99.0"; in rustPlatform.buildRustPackage { @@ -32,10 +32,10 @@ rustPlatform.buildRustPackage { owner = "nushell"; repo = "nushell"; rev = version; - hash = "sha256-0XN26onR4Tk8Ejc/UntdL+b5FPBOoBmDQM0DRommIMo="; + hash = "sha256-X/+i4CSGAkNQ7oW1kbDUj/g6Hbrf17IXwpNPVmkE4tU="; }; - cargoHash = "sha256-43V0TnYGG2tyWRIGaohIaoN7dxnY1fle2Bp5lDiFlWg="; + cargoHash = "sha256-6cGzEZdk0zgrRRTHlnlEqZg8AcoUi2GR3wZ3iq4WGKA="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withDefaultFeatures && stdenv.hostPlatform.isLinux) [ python3 ] diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/formats.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/formats.nix index 7d693118ac..057bded72d 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/plugins/formats.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/formats.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_formats"; inherit (nushell) version src; - cargoHash = "sha256-Lcgf6+Li1STl4Sko81oBHAnX09A6F7dwYmHJiF2CZ3s="; + cargoHash = "sha256-dfJ1EgbTygLky2sE6nW5fYiZDAfsrTb4Qw18u1nFNYY="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix index 06a2fb38d9..4f363d8b6c 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_gstat"; inherit (nushell) version src; - cargoHash = "sha256-NLGEaIGUqgyGegzVyZloLckVGYmfMjwhzVXh327kxRA="; + cargoHash = "sha256-1Ct3VjqFuYFVOwb9tNrbEmz0PbIXdQhZqG9hUnYIk2s="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/net.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/net.nix index 981f1d208e..f0af1af660 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/plugins/net.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/net.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "nu-plugin-net"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "fennewald"; repo = "nu_plugin_net"; rev = "refs/tags/${version}"; - hash = "sha256-GOF2CSlsjI8PAmIxj/+mR01X5XMviEM8gj7ZYTbeX7I="; + hash = "sha256-nKcB919M9FkDloulh9IusWYPhf8vlhUmKVs6Gd6w3Bw="; }; - cargoHash = "sha256-2FjKGirjTb6ZjDmhK9ciQzVtWCF8CcYeA+YXcr1oMP4="; + cargoHash = "sha256-3FMalpgKYZ4xM2fHXTFOVu5I8yS06K1bDiKg4we7jF4="; nativeBuildInputs = [ 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 5865af7139..9245876339 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-LfD0b9ZDWA1apKR36eHx1gKFiKSGAr2tqbZKTc2rMIE="; + cargoHash = "sha256-Lwmz3OXezzUzNG4PLCI1W/yvg4hfJAdNgA/2RI3nRUs="; 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 55bd221c8b..f6ad701697 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/plugins/query.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/query.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage { pname = "nushell_plugin_query"; inherit (nushell) version src; - cargoHash = "sha256-7E4CCs4xyNGwjk6B2CwIFf1x0o5uNQArZpyxXEKLXMI="; + cargoHash = "sha256-M55nMYsTlmJZWXaNPZJ3M7w34cxpZx49Ap+u1Pr/Htw="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = diff --git a/third_party/nixpkgs/pkgs/shells/zsh/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/default.nix index 0955c9c47f..90ac2934f1 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/default.nix @@ -45,6 +45,13 @@ stdenv.mkDerivation { hash = "sha256-oA8GC8LmuqNKGuPqGfiQVhL5nWb7ArLWGUI6wjpsIW8="; excludes = [ "ChangeLog" ]; }) + ] ++ lib.optionals stdenv.cc.isGNU [ + # Fixes compilation with gcc >= 14. + (fetchpatch { + url = "https://github.com/zsh-users/zsh/commit/4c89849c98172c951a9def3690e8647dae76308f.patch"; + hash = "sha256-l5IHQuIXo0N6ynLlZoQA7wJd/C7KrW3G7nMzfjQINkw="; + excludes = [ "ChangeLog" ]; + }) ]; 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 f1e7afa8c3..d37b4c8b52 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.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "zimfw"; repo = "zimfw"; rev = "v${version}"; ## zim only needs this one file to be installed. sparseCheckout = [ "zimfw.zsh" ]; - hash = "sha256-JBMrgUMGsvjYasEHJsZ0jZAHmrN3Z0d8T8agI9FiEPs="; + hash = "sha256-8GnxUhBvMy7fhDILDKYEf/9Mhgzz7suaiZ5elRZmT0o="; }; strictDeps = true; dontConfigure = true; @@ -24,17 +24,6 @@ stdenv.mkDerivation rec { runHook postInstall ''; - ## zim automates the downloading of any plugins you specify in the `.zimrc` - ## file. To do that with Nix, you'll need $ZIM_HOME to be writable. - ## `~/.cache/zim` is a good place for that. The problem is that zim also - ## looks for `zimfw.zsh` there, so we're going to tell it here to look for - ## the `zimfw.zsh` where we currently are. - postFixup = '' - substituteInPlace $out/zimfw.zsh \ - --replace "\''${ZIM_HOME}/zimfw.zsh" "$out/zimfw.zsh" \ - --replace "\''${(q-)ZIM_HOME}/zimfw.zsh" "$out/zimfw.zsh" - ''; - meta = with lib; { description = "The Zsh configuration framework with blazing speed and modular extensions"; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-you-should-use/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-you-should-use/default.nix index 222d958be1..0746754ecf 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/zsh-you-should-use/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/zsh-you-should-use/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zsh-you-should-use"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "MichaelAquilina"; repo = pname; rev = version; - sha256 = "sha256-fJX748lwVP1+GF/aIl1J3c6XAy/AtYCpEHsP8weUNo0="; + sha256 = "sha256-+3iAmWXSsc4OhFZqAMTwOL7AAHBp5ZtGGtvqCnEOYc0="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh b/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh index 3c197171e8..0287b3a90a 100644 --- a/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh +++ b/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh @@ -4,9 +4,9 @@ __nixpkgs_setup_set_original=$- set -eu set -o pipefail -if [[ -n "${BASH_VERSINFO-}" && "${BASH_VERSINFO-}" -lt 4 ]]; then +if [[ -n "${BASH_VERSINFO-}" && "${BASH_VERSINFO-}" -lt 5 ]]; then echo "Detected Bash version that isn't supported by Nixpkgs (${BASH_VERSION})" - echo "Please install Bash 4 or greater to continue." + echo "Please install Bash 5 or greater to continue." exit 1 fi @@ -389,6 +389,8 @@ appendToVar() { # Arrays are simply concatenated, strings are split on whitespace. # Default values can be passed via name=default. concatTo() { + local - + set -o noglob local -n targetref="$1"; shift local arg default name type for arg in "$@"; do diff --git a/third_party/nixpkgs/pkgs/stdenv/linux/default.nix b/third_party/nixpkgs/pkgs/stdenv/linux/default.nix index 91ea577570..145af4a1b5 100644 --- a/third_party/nixpkgs/pkgs/stdenv/linux/default.nix +++ b/third_party/nixpkgs/pkgs/stdenv/linux/default.nix @@ -308,7 +308,8 @@ in # This is not an issue for the final stdenv, because this perl # won't be included in the final stdenv and won't be exported to # top-level pkgs as an override either. - perl = super.perl.override { enableThreading = false; enableCrypt = false; }; + # FIXME: Pinning this stage to 538 as 540 doesn't build in stage1 atm + perl = super.perl538.override { enableThreading = false; enableCrypt = false; }; }; # `gettext` comes with obsolete config.sub/config.guess that don't recognize LoongArch64. diff --git a/third_party/nixpkgs/pkgs/test/auto-patchelf-hook/package.nix b/third_party/nixpkgs/pkgs/test/auto-patchelf-hook/package.nix index 7b8fb5fdfc..37413c7301 100644 --- a/third_party/nixpkgs/pkgs/test/auto-patchelf-hook/package.nix +++ b/third_party/nixpkgs/pkgs/test/auto-patchelf-hook/package.nix @@ -60,7 +60,6 @@ stdenv.mkDerivation { # Additional phase performing the actual test. installCheckPhase = let allDeps = runtimeDependencies ++ [ - (lib.getLib stdenv.cc.libc) (lib.getLib freetype) ]; in diff --git a/third_party/nixpkgs/pkgs/test/default.nix b/third_party/nixpkgs/pkgs/test/default.nix index adb112fd36..b34add9483 100644 --- a/third_party/nixpkgs/pkgs/test/default.nix +++ b/third_party/nixpkgs/pkgs/test/default.nix @@ -125,8 +125,6 @@ with pkgs; ld-library-path = callPackage ./ld-library-path {}; - macOSSierraShared = callPackage ./macos-sierra-shared {}; - cross = callPackage ./cross {} // { __attrsFailEvaluation = true; }; php = recurseIntoAttrs (callPackages ./php {}); diff --git a/third_party/nixpkgs/pkgs/test/macos-sierra-shared/default.nix b/third_party/nixpkgs/pkgs/test/macos-sierra-shared/default.nix deleted file mode 100644 index 810d5d9782..0000000000 --- a/third_party/nixpkgs/pkgs/test/macos-sierra-shared/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ lib, clangStdenv, clang-sierraHack-stdenv, stdenvNoCC }: - -let - makeBigExe = stdenv: prefix: rec { - - count = 320; - - sillyLibs = lib.genList (i: stdenv.mkDerivation rec { - name = "${prefix}-fluff-${toString i}"; - unpackPhase = '' - src=$PWD - cat << 'EOF' > ${name}.c - unsigned int asdf_${toString i}(void) { - return ${toString i}; - } - EOF - ''; - buildPhase = '' - $CC -std=c99 -shared ${name}.c -o lib${name}.dylib -Wl,-install_name,$out/lib/lib${name}.dylib - ''; - installPhase = '' - mkdir -p "$out/lib" - mv lib${name}.dylib "$out/lib" - ''; - meta.platforms = lib.platforms.darwin; - }) count; - - finalExe = stdenv.mkDerivation { - name = "${prefix}-final-asdf"; - unpackPhase = '' - src=$PWD - cat << 'EOF' > main.cxx - - #include - #include - - ${toString (lib.genList (i: "extern \"C\" unsigned int asdf_${toString i}(void); ") count)} - - unsigned int (*funs[])(void) = { - ${toString (lib.genList (i: "asdf_${toString i},") count)} - }; - - int main(int argc, char **argv) { - bool ret; - unsigned int i = 0; - for (auto f : funs) { - if (f() != i++) { - std::cerr << "Failed to get expected response from function #" << i << std::endl; - return EXIT_FAILURE; - } - } - return EXIT_SUCCESS; - } - EOF - ''; - buildPhase = '' - $CXX -std=c++11 main.cxx ${toString (map (x: "-l${x.name}") sillyLibs)} -o ${prefix}-asdf - ''; - buildInputs = sillyLibs; - installPhase = '' - mkdir -p "$out/bin" - mv ${prefix}-asdf "$out/bin" - ''; - meta.platforms = lib.platforms.darwin; - }; - - }; - - good = makeBigExe clang-sierraHack-stdenv "good"; - - bad = makeBigExe clangStdenv "bad"; - -in stdenvNoCC.mkDerivation { - name = "macos-sierra-shared-test"; - buildInputs = [ good.finalExe bad.finalExe ]; - # TODO(@Ericson2314): Be impure or require exact MacOS version of builder? - buildCommand = '' - if bad-asdf &> /dev/null - then echo "WARNING: bad-asdf did not fail, not running on sierra?" >&2 - else echo "bad-asdf should fail on sierra, OK" >&2 - fi - - # Must succeed on all supported MacOS versions - good-asdf - echo "good-asdf should succeed on sierra, OK" - - touch $out - ''; - meta.platforms = lib.platforms.darwin; -} diff --git a/third_party/nixpkgs/pkgs/test/stdenv/default.nix b/third_party/nixpkgs/pkgs/test/stdenv/default.nix index a916e9b65a..d8f11f98e9 100644 --- a/third_party/nixpkgs/pkgs/test/stdenv/default.nix +++ b/third_party/nixpkgs/pkgs/test/stdenv/default.nix @@ -101,7 +101,7 @@ let ({ inherit name; - string = "a b"; + string = "a *"; list = ["c" "d"]; passAsFile = [ "buildCommand" ] ++ lib.optionals (extraAttrs ? extraTest) [ "extraTest" ]; @@ -116,7 +116,7 @@ let concatTo flagsArray string list notset=e=f empty_array=g empty_string=h declare -p flagsArray [[ "''${flagsArray[0]}" == "a" ]] || (echo "'\$flagsArray[0]' was not 'a'" && false) - [[ "''${flagsArray[1]}" == "b" ]] || (echo "'\$flagsArray[1]' was not 'b'" && false) + [[ "''${flagsArray[1]}" == "*" ]] || (echo "'\$flagsArray[1]' was not '*'" && false) [[ "''${flagsArray[2]}" == "c" ]] || (echo "'\$flagsArray[2]' was not 'c'" && false) [[ "''${flagsArray[3]}" == "d" ]] || (echo "'\$flagsArray[3]' was not 'd'" && false) [[ "''${flagsArray[4]}" == "e=f" ]] || (echo "'\$flagsArray[4]' was not 'e=f'" && false) @@ -127,7 +127,7 @@ let concatTo nonExistant string list notset=e=f empty_array=g empty_string=h declare -p nonExistant [[ "''${nonExistant[0]}" == "a" ]] || (echo "'\$nonExistant[0]' was not 'a'" && false) - [[ "''${nonExistant[1]}" == "b" ]] || (echo "'\$nonExistant[1]' was not 'b'" && false) + [[ "''${nonExistant[1]}" == "*" ]] || (echo "'\$nonExistant[1]' was not '*'" && false) [[ "''${nonExistant[2]}" == "c" ]] || (echo "'\$nonExistant[2]' was not 'c'" && false) [[ "''${nonExistant[3]}" == "d" ]] || (echo "'\$nonExistant[3]' was not 'd'" && false) [[ "''${nonExistant[4]}" == "e=f" ]] || (echo "'\$nonExistant[4]' was not 'e=f'" && false) @@ -344,7 +344,7 @@ in concatTo flagsWithSpaces string listWithSpaces declare -p flagsWithSpaces [[ "''${flagsWithSpaces[0]}" == "a" ]] || (echo "'\$flagsWithSpaces[0]' was not 'a'" && false) - [[ "''${flagsWithSpaces[1]}" == "b" ]] || (echo "'\$flagsWithSpaces[1]' was not 'b'" && false) + [[ "''${flagsWithSpaces[1]}" == "*" ]] || (echo "'\$flagsWithSpaces[1]' was not '*'" && false) [[ "''${flagsWithSpaces[2]}" == "c c" ]] || (echo "'\$flagsWithSpaces[2]' was not 'c c'" && false) [[ "''${flagsWithSpaces[3]}" == "d d" ]] || (echo "'\$flagsWithSpaces[3]' was not 'd d'" && false) ''; diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix index d7fc15a173..c792563000 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix @@ -13,12 +13,12 @@ let pname = "awscli"; # N.B: if you change this, change botocore and boto3 to a matching version too # check e.g. https://github.com/aws/aws-cli/blob/1.33.21/setup.py - version = "1.33.13"; + version = "1.34.29"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-utRALEoP+CWlmkPnbgByFSSX9Nr39iyTdv5uABT6Kps="; + hash = "sha256-2w9z6f8ThKIISEiExePHObUZzBrdltP3AfZqKh8d1Mo="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/tools/admin/kics/default.nix b/third_party/nixpkgs/pkgs/tools/admin/kics/default.nix index 205e439c22..fcf25f542e 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/kics/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/kics/default.nix @@ -1,22 +1,23 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, testers -, kics +{ + lib, + buildGoModule, + fetchFromGitHub, + kics, + testers, }: buildGoModule rec { pname = "kics"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "Checkmarx"; repo = "kics"; - rev = "v${version}"; - hash = "sha256-UTDqsTW/niTvSTYInM5UD9f7RU3f5R4etuLvoTmNn/M="; + rev = "refs/tags/v${version}"; + hash = "sha256-/trhDDY2jyN0o92fjy/ScEbYpcuBPPIaHx+wNW3cWA0="; }; - vendorHash = "sha256-nUNpiXta+Om0Lmd9z0uaCctv2uBrPDsZ1fhHcd8sSWs="; + vendorHash = "sha256-coX8BenRrGijErDNheD9+vZLOKzMXkcwhIa3BuxrOCM="; subPackages = [ "cmd/console" ]; @@ -25,9 +26,10 @@ buildGoModule rec { ''; ldflags = [ - "-s" "-w" - "-X github.com/Checkmarx/kics/v2/internal/constants.SCMCommit=${version}" - "-X github.com/Checkmarx/kics/v2/internal/constants.Version=${version}" + "-s" + "-w" + "-X=github.com/Checkmarx/kics/v2/internal/constants.SCMCommit=${version}" + "-X=github.com/Checkmarx/kics/v2/internal/constants.Version=${version}" ]; passthru.tests.version = testers.testVersion { @@ -36,11 +38,14 @@ buildGoModule rec { }; meta = with lib; { - description = '' - Find security vulnerabilities, compliance issues, and infrastructure misconfigurations early in the development - cycle of your infrastructure-as-code with KICS by Checkmarx. + description = "Tool to check for vulnerabilities and other issues"; + longDescription = '' + Find security vulnerabilities, compliance issues, and + infrastructure misconfigurations early in the development + cycle of your infrastructure-as-code. ''; homepage = "https://github.com/Checkmarx/kics"; + changelog = "https://github.com/Checkmarx/kics/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ patryk4815 ]; mainProgram = "kics"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix b/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix index 5ff28355bc..10059ac5bd 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lego"; - version = "4.17.4"; + version = "4.19.2"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DF9Bx6CzZLdnyqe8PNWU2I9ym2SBDAjdwG9/zxvSjgs="; + hash = "sha256-O4lzOZUiicmahxcbzPsEU2+tPDTCUun2JLeWZjpTZIQ="; }; - vendorHash = "sha256-tX/QpAZLuQEYhm1I1twlg3TefaLqfiEz9cXID+r6EHA="; + vendorHash = "sha256-BcE/8pxQdJp9vttLo4wDSUswJnaBhIn/mlt3ZcOf2wA="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pebble/default.nix b/third_party/nixpkgs/pkgs/tools/admin/pebble/default.nix index 384cc0f3d9..6820431808 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pebble/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pebble/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildGoModule , fetchFromGitHub , nixosTests @@ -7,27 +6,32 @@ buildGoModule rec { pname = "pebble"; - version = "2.4.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "letsencrypt"; repo = pname; rev = "v${version}"; - sha256 = "0sh67bzq3hlagk73w2kp45viq15g2rcxm760jk9fqshamq784m6m"; + hash = "sha256-YPU/bl7h6rOWg+5ut0Thn2UupeKpJ7u4KXc2svIeZEM="; }; vendorHash = null; + ldflags = [ + "-s" "-w" + "-X main.version=${version}" + ]; + passthru.tests = { smoke-test = nixosTests.acme; }; meta = { - # ca/ca.go:374:67: 9223372038 (untyped int constant) overflows uint - broken = stdenv.hostPlatform.is32bit; homepage = "https://github.com/letsencrypt/pebble"; - description = "Miniature version of Boulder, Pebble is a small RFC 8555 ACME test server not suited for a production CA"; + description = "Small RFC 8555 ACME test server"; + longDescription = "Miniature version of Boulder, Pebble is a small RFC 8555 ACME test server not suited for a production CA"; license = [ lib.licenses.mpl20 ]; + mainProgram = "pebble"; maintainers = lib.teams.acme.members; }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix b/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix index 7643e4a712..ebbae9ad48 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "trivy"; - version = "0.56.1"; + version = "0.56.2"; src = fetchFromGitHub { owner = "aquasecurity"; repo = "trivy"; rev = "refs/tags/v${version}"; - hash = "sha256-gVRmSWcWTO1HZ6K2N1sSZchSq2xMc60W+ImHU0xEnA0="; + hash = "sha256-wqiFUiNZ3VG4c/QkoliU2BtqanyC4GwlwUZomOX3VrU="; }; # Hash mismatch on across Linux and Darwin diff --git a/third_party/nixpkgs/pkgs/tools/audio/loudgain/default.nix b/third_party/nixpkgs/pkgs/tools/audio/loudgain/default.nix index 54c5c457b1..2794ba52e8 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/loudgain/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/loudgain/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, ffmpeg_7, libebur128 +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, ffmpeg, libebur128 , libresample, taglib, zlib }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ ffmpeg_7 libebur128 libresample taglib zlib ]; + buildInputs = [ ffmpeg libebur128 libresample taglib zlib ]; postInstall = '' sed -e "1aPATH=$out/bin:\$PATH" -i "$out/bin/rgbpm" diff --git a/third_party/nixpkgs/pkgs/tools/backup/conserve/default.nix b/third_party/nixpkgs/pkgs/tools/backup/conserve/default.nix index 12250ee2b6..1707321d10 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/conserve/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/conserve/default.nix @@ -1,6 +1,9 @@ -{ lib -, rustPlatform -, fetchFromGitHub +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + darwin }: rustPlatform.buildRustPackage rec { @@ -16,6 +19,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-IP9x3n5RdI+TKOhMBWEfw9P2CROcC0SmEsmMVaXjiDE="; + buildInputs = lib.optionals (stdenv.isDarwin) [ + darwin.apple_sdk.frameworks.Security + ]; + checkFlags = [ # expected to panic if unix user has no secondary group, # which is the case in the nix sandbox diff --git a/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/8_0.nix b/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/8_0.nix new file mode 100644 index 0000000000..c9822f1ec8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/8_0.nix @@ -0,0 +1,20 @@ +{ callPackage, ... }@args: + +callPackage ./generic.nix ( + args + // { + version = "8.0.35-31"; + hash = "sha256-KHfgSi9bQlqsi5aDRBlSpdZgMfOrAwHK51k8KhQ9Udg="; + + # includes https://github.com/Percona-Lab/libkmip.git + fetchSubmodules = true; + + extraPatches = [ + ./abi-check.patch + ]; + + extraPostInstall = '' + rm -r "$out"/docs + ''; + } +) diff --git a/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/8_4.nix b/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/8_4.nix new file mode 100644 index 0000000000..0bfcbb12e2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/8_4.nix @@ -0,0 +1,18 @@ +{ callPackage, ... }@args: + +callPackage ./generic.nix ( + args + // { + version = "8.4.0-1"; + hash = "sha256-2tWRRYH0P0HZsWTxeuvDeVWvDwqjjdv6J7YiZwoTKtM="; + + # includes https://github.com/Percona-Lab/libkmip.git + fetchSubmodules = true; + + extraPatches = + [ + ]; + + extraPostInstall = ''''; + } +) diff --git a/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/default.nix b/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/default.nix index f3466dc9f1..9fd2e627c1 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/default.nix @@ -1,6 +1,7 @@ pkgs: { - percona-xtrabackup_lts = pkgs.callPackage ./lts.nix { + percona-xtrabackup_8_0 = pkgs.callPackage ./8_0.nix { boost = pkgs.boost177; }; - percona-xtrabackup_innovation = pkgs.callPackage ./innovation.nix { }; + percona-xtrabackup_8_4 = pkgs.callPackage ./8_4.nix { }; + percona-xtrabackup = pkgs.percona-xtrabackup_8_4; } diff --git a/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/generic.nix b/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/generic.nix index d81dee6f97..3f4cdd86cf 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/generic.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/generic.nix @@ -1,8 +1,36 @@ -{ lib, stdenv, fetchFromGitHub, bison, boost, cmake, makeWrapper, pkg-config -, curl, cyrus_sasl, libaio, libedit, libev, libevent, libgcrypt, libgpg-error, lz4 -, ncurses, numactl, openssl, procps, protobuf, valgrind, xxd, zlib -, perlPackages -, version, hash, fetchSubmodules ? false, extraPatches ? [], extraPostInstall ? "", ... +{ + lib, + stdenv, + fetchFromGitHub, + bison, + boost, + cmake, + makeWrapper, + pkg-config, + curl, + cyrus_sasl, + libaio, + libedit, + libev, + libevent, + libgcrypt, + libgpg-error, + lz4, + ncurses, + numactl, + openssl, + procps, + protobuf, + valgrind, + xxd, + zlib, + perlPackages, + version, + hash, + fetchSubmodules ? false, + extraPatches ? [ ], + extraPostInstall ? "", + ... }: stdenv.mkDerivation (finalAttrs: { @@ -16,12 +44,39 @@ stdenv.mkDerivation (finalAttrs: { inherit hash fetchSubmodules; }; - nativeBuildInputs = [ bison boost cmake makeWrapper pkg-config ]; + nativeBuildInputs = [ + bison + boost + cmake + makeWrapper + pkg-config + ]; - buildInputs = [ - (curl.override { inherit openssl; }) cyrus_sasl libaio libedit libevent libev libgcrypt libgpg-error lz4 - ncurses numactl openssl procps protobuf valgrind xxd zlib - ] ++ (with perlPackages; [ perl DBI DBDmysql ]); + buildInputs = + [ + (curl.override { inherit openssl; }) + cyrus_sasl + libaio + libedit + libevent + libev + libgcrypt + libgpg-error + lz4 + ncurses + numactl + openssl + procps + protobuf + valgrind + xxd + zlib + ] + ++ (with perlPackages; [ + perl + DBI + DBDmysql + ]); patches = extraPatches; @@ -42,17 +97,19 @@ stdenv.mkDerivation (finalAttrs: { "-DWITH_MAN_PAGES=OFF" ]; - postInstall = '' - wrapProgram "$out"/bin/xtrabackup --prefix PERL5LIB : $PERL5LIB - rm -r "$out"/lib/plugin/debug - '' + extraPostInstall; + postInstall = + '' + wrapProgram "$out"/bin/xtrabackup --prefix PERL5LIB : $PERL5LIB + rm -r "$out"/lib/plugin/debug + '' + + extraPostInstall; passthru.mysqlVersion = lib.versions.majorMinor finalAttrs.version; meta = with lib; { description = "Non-blocking backup tool for MySQL"; homepage = "http://www.percona.com/software/percona-xtrabackup"; - license = licenses.lgpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = teams.flyingcircus.members ++ [ maintainers.izorkin ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/innovation.nix b/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/innovation.nix deleted file mode 100644 index 003df8aa6b..0000000000 --- a/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/innovation.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // { - version = "8.3.0-1"; - hash = "sha256-qZM2AFhpwrN0BR+DdozYn7s2I+c1tWpD5QvppTEfGEY="; - - # includes https://github.com/Percona-Lab/libkmip.git - fetchSubmodules = true; - - extraPatches = [ - ]; - - extraPostInstall = '' - ''; -}) diff --git a/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/lts.nix b/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/lts.nix deleted file mode 100644 index fbb4c045d7..0000000000 --- a/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/lts.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // { - version = "8.0.35-30"; - hash = "sha256-yagqBKU057Gk5pEyT2R3c5DtxNG/+TSPenFgbxUiHPo="; - - # includes https://github.com/Percona-Lab/libkmip.git - fetchSubmodules = true; - - extraPatches = [ - ./abi-check.patch - ]; - - extraPostInstall = '' - rm -r "$out"/docs - ''; -}) diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/brasero/default.nix b/third_party/nixpkgs/pkgs/tools/cd-dvd/brasero/default.nix index c601c05cbb..34225dd8bd 100644 --- a/third_party/nixpkgs/pkgs/tools/cd-dvd/brasero/default.nix +++ b/third_party/nixpkgs/pkgs/tools/cd-dvd/brasero/default.nix @@ -39,6 +39,10 @@ in stdenv.mkDerivation rec { gappsWrapperArgs+=(--prefix PATH : "${binpath}") ''; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + }; + meta = with lib; { description = "Gnome CD/DVD Burner"; homepage = "https://gitlab.gnome.org/GNOME/brasero"; diff --git a/third_party/nixpkgs/pkgs/tools/compression/lz4/0001-Create-a-unified-lz4-target.patch b/third_party/nixpkgs/pkgs/tools/compression/lz4/0001-Create-a-unified-lz4-target.patch deleted file mode 100644 index 4092d232a0..0000000000 --- a/third_party/nixpkgs/pkgs/tools/compression/lz4/0001-Create-a-unified-lz4-target.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 14fca2e93bd783c0ad2362af6d69801c2073765d Mon Sep 17 00:00:00 2001 -From: Tobias Mayer -Date: Sun, 23 Jun 2024 20:16:00 +0200 -Subject: [PATCH] Create a unified lz4 target - -Includes changes from -* https://github.com/lz4/lz4/pull/1372 -* https://github.com/lz4/lz4/pull/1413 ---- - build/cmake/CMakeLists.txt | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt -index eb7007b..07ddd2b 100644 ---- a/build/cmake/CMakeLists.txt -+++ b/build/cmake/CMakeLists.txt -@@ -130,6 +130,14 @@ if(BUILD_STATIC_LIBS) - POSITION_INDEPENDENT_CODE ${LZ4_POSITION_INDEPENDENT_LIB}) - list(APPEND LZ4_LIBRARIES_BUILT lz4_static) - endif() -+# Add unified target. -+add_library(lz4 INTERFACE) -+list(APPEND LZ4_LIBRARIES_BUILT lz4) -+if(BUILD_SHARED_LIBS) -+ target_link_libraries(lz4 INTERFACE lz4_shared) -+else() -+ target_link_libraries(lz4 INTERFACE lz4_static) -+endif() - - if(BUILD_STATIC_LIBS) - set(LZ4_LINK_LIBRARY lz4_static) --- -2.45.1 - diff --git a/third_party/nixpkgs/pkgs/tools/compression/lz4/default.nix b/third_party/nixpkgs/pkgs/tools/compression/lz4/default.nix index 6b2c1a43b2..f729e91604 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/lz4/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/lz4/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lz4"; - version = "1.9.4"; + version = "1.10.0"; src = fetchFromGitHub { repo = "lz4"; owner = "lz4"; rev = "v${finalAttrs.version}"; - hash = "sha256-YiMCD3vvrG+oxBUghSrCmP2LAfAGZrEaKz0YoaQJhpI="; + hash = "sha256-/dG1n59SKBaEBg72pAWltAtVmJ2cXxlFFhP+klrkTos="; }; nativeBuildInputs = [ @@ -23,10 +23,6 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "dev" "lib" "man" "out" ]; - patches = [ - ./0001-Create-a-unified-lz4-target.patch - ]; - cmakeDir = "../build/cmake"; cmakeBuildDir = "build-dist"; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/erofs-utils/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/erofs-utils/default.nix index 93e6fd18f9..5f9b89291f 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/erofs-utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/erofs-utils/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "erofs-utils"; - version = "1.8.1"; + version = "1.8.2"; outputs = [ "out" "man" @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${finalAttrs.version}.tar.gz"; - hash = "sha256-Xb97SS92gkYrl6dxIdQ8p2Cc2Q5l+MlpMa78ggpvDaM="; + hash = "sha256-ZLb/fomfYkgCg87mN4fzfw+cS+emvHoj1zSqqHOmz/Q="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/goofys/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/goofys/default.nix index 06039d529d..bf4deb7c5c 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/goofys/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/goofys/default.nix @@ -29,7 +29,7 @@ buildGoModule { homepage = "https://github.com/kahing/goofys"; description = "High-performance, POSIX-ish Amazon S3 file system written in Go"; license = [ lib.licenses.mit ]; - maintainers = [ lib.maintainers.adisbladis ]; + maintainers = [ ]; broken = stdenv.hostPlatform.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042 mainProgram = "goofys"; }; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/hfsprogs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/hfsprogs/default.nix index 127050f025..17b787b08b 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/hfsprogs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/hfsprogs/default.nix @@ -1,53 +1,35 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, openssl, libbsd }: - -let - version = "332.25"; - - apple_src = fetchFromGitHub { - owner = "apple-oss-distributions"; - repo = "diskdev_cmds"; - rev = "diskdev_cmds-${version}"; - hash = "sha256-cycPGPx2Gbjn4FKGKuQKJkh+dWGbJfy6C+LTz8rrs0A="; - name = "diskdev_cmds-${version}"; - }; -in - +{ + lib, + stdenv, + fetchFromGitHub, + libbsd, + libuuid, + openssl, +}: stdenv.mkDerivation rec { pname = "hfsprogs"; - inherit version; + version = "627.40.1-linux"; - srcs = [ - (fetchurl { - url = "http://ftp.de.debian.org/debian/pool/main/h/hfsprogs/hfsprogs_${version}-11.debian.tar.gz"; - sha256 = "62d9b8599c66ebffbc57ce5d776e20b41341130d9b27341d63bda08460ebde7c"; - }) - apple_src + src = fetchFromGitHub { + owner = "glaubitz"; + repo = "hfs"; + rev = "a9496556b0a5fa805139ea20b44081d48aae912a"; + hash = "sha256-i6fXPWHU03ErUN2irP2cLJbpqi1OrTtcQE+ohAz+Eio="; + }; + + buildInputs = [ + libbsd + libuuid + openssl ]; - postPatch = '' - sed -ie '/sys\/sysctl.h/d' newfs_hfs.tproj/makehfs.c - ''; - - sourceRoot = apple_src.name; - patches = [ "../debian/patches/*.patch" ]; - - buildInputs = [ openssl libbsd ]; - makefile = "Makefile.lnx"; - - # Inspired by PKGBUILD of https://www.archlinux.org/packages/community/x86_64/hfsprogs/ installPhase = '' - # Create required package directories - install -m 755 -d "$out/bin" - install -m 755 -d "$out/share/hfsprogs" - install -m 755 -d "$out/share/man/man8/" # Copy executables - install -m 755 "newfs_hfs.tproj/newfs_hfs" "$out/bin/mkfs.hfsplus" - install -m 755 "fsck_hfs.tproj/fsck_hfs" "$out/bin/fsck.hfsplus" - # Copy shared data - install -m 644 "newfs_hfs.tproj/hfsbootdata.img" "$out/share/hfsprogs/hfsbootdata" + install -Dm 555 "newfs_hfs/newfs_hfs" "$out/bin/mkfs.hfsplus" + install -Dm 555 "fsck_hfs/fsck_hfs" "$out/bin/fsck.hfsplus" # Copy man pages - install -m 644 "newfs_hfs.tproj/newfs_hfs.8" "$out/share/man/man8/mkfs.hfsplus.8" - install -m 644 "fsck_hfs.tproj/fsck_hfs.8" "$out/share/man/man8/fsck.hfsplus.8" + install -Dm 444 "newfs_hfs/newfs_hfs.8" "$out/share/man/man8/mkfs.hfsplus.8" + install -Dm 444 "fsck_hfs/fsck_hfs.8" "$out/share/man/man8/fsck.hfsplus.8" ''; meta = { diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/irods/common.nix b/third_party/nixpkgs/pkgs/tools/filesystems/irods/common.nix index c2e09220a9..aaa96fdec8 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/irods/common.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/irods/common.nix @@ -1,13 +1,71 @@ -{ lib, stdenv, bzip2, zlib, autoconf, automake, cmake, help2man, texinfo, libtool, cppzmq, libarchive -, avro-cpp, boost, zeromq, openssl, pam, libiodbc, libkrb5, gcc, libcxx, which, catch2, nanodbc, fmt -, nlohmann_json, spdlog, curl }: +{ + lib, + stdenv, + bzip2, + zlib, + autoconf, + automake, + cmake, + help2man, + texinfo, + libtool, + cppzmq, + libarchive, + avro-cpp, + boost, + zeromq, + openssl, + pam, + libiodbc, + libkrb5, + gcc, + libcxx, + which, + catch2, + nanodbc, + fmt, + nlohmann_json, + curl, + spdlog_rods, + bison, + flex +}: # Common attributes of irods packages { - nativeBuildInputs = [ autoconf automake cmake help2man texinfo which gcc ]; - buildInputs = [ bzip2 zlib libtool cppzmq libarchive avro-cpp zeromq openssl pam libiodbc libkrb5 boost - libcxx catch2 nanodbc fmt nlohmann_json spdlog curl ]; + nativeBuildInputs = [ + autoconf + automake + cmake + help2man + texinfo + which + gcc + bison + flex + ]; + buildInputs = [ + bzip2 + zlib + libtool + cppzmq + libarchive + avro-cpp + zeromq + openssl + pam + libiodbc + libkrb5 + boost + libcxx + catch2 + nanodbc + fmt + nlohmann_json + spdlog_rods + curl + ]; cmakeFlags = [ "-DIRODS_EXTERNALS_FULLPATH_CLANG=${stdenv.cc}" @@ -21,7 +79,7 @@ "-DIRODS_EXTERNALS_FULLPATH_NANODBC=${nanodbc}" "-DIRODS_EXTERNALS_FULLPATH_FMT=${fmt}" "-DIRODS_EXTERNALS_FULLPATH_JSON=${nlohmann_json}" - "-DIRODS_EXTERNALS_FULLPATH_SPDLOG=${spdlog}" + "-DIRODS_EXTERNALS_FULLPATH_SPDLOG=${spdlog_rods}" "-DIRODS_LINUX_DISTRIBUTION_NAME=nix" "-DIRODS_LINUX_DISTRIBUTION_VERSION_MAJOR=1.0" "-DCPACK_GENERATOR=TGZ" diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/irods/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/irods/default.nix index beddb6959b..ca5fe7fa73 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/irods/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/irods/default.nix @@ -1,89 +1,173 @@ -{ lib, stdenv, fetchFromGitHub, bzip2, zlib, autoconf, automake, cmake, help2man, texinfo, libtool, cppzmq -, libarchive, avro-cpp_llvm, boost, zeromq, openssl, pam, libiodbc, libkrb5, gcc, libcxx, which, catch2 -, nanodbc_llvm, fmt, nlohmann_json, spdlog, curl }: +{ + lib, + stdenv, + fetchFromGitHub, + bzip2, + zlib, + autoconf, + automake, + cmake, + help2man, + texinfo, + libtool, + cppzmq, + libarchive, + avro-cpp_llvm, + boost, + zeromq, + openssl, + pam, + libiodbc, + libkrb5, + gcc, + libcxx, + which, + catch2, + nanodbc_llvm, + fmt, + nlohmann_json, + spdlog_llvm, + curl, + bison, + flex +}: +let + spdlog_rods = spdlog_llvm.overrideAttrs (attrs: { + inherit stdenv; + version = "1.10.0"; + src = attrs.src.override { + rev = "v1.10.0"; + hash = "sha256-c6s27lQCXKx6S1FhZ/LiKh14GnXMhZtD1doltU4Avws="; + }; + postPatch = '' + substituteInPlace cmake/spdlog.pc.in \ + --replace-fail '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ + ''; + }); +in let avro-cpp = avro-cpp_llvm; nanodbc = nanodbc_llvm; common = import ./common.nix { - inherit lib stdenv bzip2 zlib autoconf automake cmake - help2man texinfo libtool cppzmq libarchive - zeromq openssl pam libiodbc libkrb5 gcc libcxx - boost avro-cpp which catch2 nanodbc fmt nlohmann_json - spdlog curl; + inherit + lib + stdenv + bzip2 + zlib + autoconf + automake + cmake + help2man + texinfo + libtool + cppzmq + libarchive + zeromq + openssl + pam + libiodbc + libkrb5 + gcc + libcxx + boost + avro-cpp + which + catch2 + nanodbc + fmt + nlohmann_json + curl + spdlog_rods + bison + flex + ; }; in rec { # irods: libs and server package - irods = stdenv.mkDerivation (finalAttrs: common // { - version = "4.3.1"; - pname = "irods"; + irods = stdenv.mkDerivation ( + finalAttrs: + common + // { + version = "4.3.3"; + pname = "irods"; - src = fetchFromGitHub { - owner = "irods"; - repo = "irods"; - rev = finalAttrs.version; - sha256 = "sha256-gWgNY8+zD2lRCV5ydOTF0qAgZ1dlQSQKxtdw+U235vg="; - fetchSubmodules = true; - }; + src = fetchFromGitHub { + owner = "irods"; + repo = "irods"; + rev = finalAttrs.version; + hash = "sha256-SmN2FzeoA2/gjiDfGs2oifOVj0mK2WdQCgiSdIlENfk="; + fetchSubmodules = true; + }; - # fix build with recent llvm versions - env.NIX_CFLAGS_COMPILE = "-Wno-deprecated-register -Wno-deprecated-declarations"; + # fix build with recent llvm versions + env.NIX_CFLAGS_COMPILE = "-Wno-deprecated-register -Wno-deprecated-declarations"; - cmakeFlags = common.cmakeFlags or [ ] ++ [ - "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,${placeholder "out"}/lib" - "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath,${placeholder "out"}/lib" - "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,${placeholder "out"}/lib" - ]; + cmakeFlags = common.cmakeFlags or [ ] ++ [ + "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,${placeholder "out"}/lib -D_GLIBCXX_USE_CXX11_ABI=0" + "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath,${placeholder "out"}/lib" + "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,${placeholder "out"}/lib" + ]; - postPatch = common.postPatch + '' - patchShebangs ./test - substituteInPlace plugins/database/CMakeLists.txt --replace-fail "COMMAND cpp" "COMMAND ${gcc.cc}/bin/cpp" - for file in unit_tests/cmake/test_config/*.cmake - do - substituteInPlace $file --replace-quiet "CATCH2}/include" "CATCH2}/include/catch2" - done + postPatch = + common.postPatch + + '' + patchShebangs ./test + substituteInPlace plugins/database/CMakeLists.txt --replace-fail "COMMAND cpp" "COMMAND ${gcc.cc}/bin/cpp" + for file in unit_tests/cmake/test_config/*.cmake + do + substituteInPlace $file --replace-quiet "CATCH2}/include" "CATCH2}/include/catch2" + done - substituteInPlace server/auth/CMakeLists.txt --replace-fail SETUID "" - ''; - - meta = common.meta // { - longDescription = common.meta.longDescription + "This package provides the servers and libraries."; - }; - }); + substituteInPlace server/auth/CMakeLists.txt --replace-fail SETUID "" + ''; + meta = common.meta // { + longDescription = common.meta.longDescription + "This package provides the servers and libraries."; + mainProgram = "irodsServer"; + }; + } + ); # icommands (CLI) package, depends on the irods package - irods-icommands = stdenv.mkDerivation (finalAttrs: common // { - version = "4.3.1"; - pname = "irods-icommands"; + irods-icommands = stdenv.mkDerivation ( + finalAttrs: + common + // { + version = "4.3.3"; + pname = "irods-icommands"; - src = fetchFromGitHub { - owner = "irods"; - repo = "irods_client_icommands"; - rev = finalAttrs.version; - sha256 = "sha256-BjBg13KrCGRLOtGnp23qXOLudLctvu2gJ7wxHFjM5Ug="; - }; + src = fetchFromGitHub { + owner = "irods"; + repo = "irods_client_icommands"; + rev = finalAttrs.version; + hash = "sha256-cc0V6BztJk3njobWt27VeJNmQUXyH6aBJkvYIDFEzWY="; + }; - buildInputs = common.buildInputs ++ [ irods ]; + buildInputs = common.buildInputs ++ [ irods ]; - postPatch = common.postPatch + '' - patchShebangs ./bin - ''; + postPatch = + common.postPatch + + '' + patchShebangs ./bin + ''; - cmakeFlags = common.cmakeFlags ++ [ - "-DCMAKE_INSTALL_PREFIX=${stdenv.out}" - "-DIRODS_DIR=${irods}/lib/irods/cmake" - "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,${irods}/lib" - "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath,${irods}/lib" - "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,${irods}/lib" - ]; + cmakeFlags = common.cmakeFlags ++ [ + "-DCMAKE_INSTALL_PREFIX=${stdenv.out}" + "-DIRODS_DIR=${irods}/lib/irods/cmake" + "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,${irods}/lib" + "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath,${irods}/lib" + "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,${irods}/lib" + ]; - meta = common.meta // { - description = common.meta.description + " CLI clients"; - longDescription = common.meta.longDescription + "This package provides the CLI clients, called 'icommands'."; - }; - }); + meta = common.meta // { + description = common.meta.description + " CLI clients"; + longDescription = + common.meta.longDescription + "This package provides the CLI clients, called 'icommands'."; + }; + } + ); } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ssdfs-utils/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/ssdfs-utils/default.nix index 1f5127ae5a..38efbad0f2 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/ssdfs-utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/ssdfs-utils/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation { # as ssdfs-utils, not ssdfs-tools. pname = "ssdfs-utils"; # The version is taken from `configure.ac`, there are no tags. - version = "4.45"; + version = "4.46"; src = fetchFromGitHub { owner = "dubeyko"; repo = "ssdfs-tools"; - rev = "f78ebf2a19eb338ae6858aa4f28133b117507df7"; - hash = "sha256-RKVcXZakYDd7Vfd1w0pNs9/oMRzvzRr8VabpUBRcKc8="; + rev = "7528ee1d923115c1536d97b119fd2a0ee978b59e"; + hash = "sha256-SL5BY+vLxRWRHkIp0hTQsi3w/fXRGe4OHpaapZFZBZo="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/stratis-cli/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/stratis-cli/default.nix index 4de51f0ff8..799a481339 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/stratis-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/stratis-cli/default.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "stratis-cli"; - version = "3.6.2"; + version = "3.7.0"; pyproject = true; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-f2Bjv7Z7+FZejS5plUGKTlGUixgF2pGN1SeszTDh4Ko="; + hash = "sha256-F/RP/bWf2fV1IvNbrkYX3d94om1kACNe+oJI8pXM5P4="; }; nativeBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/stratisd/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/stratisd/default.nix index d6f532643d..89261aeac3 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/stratisd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/stratisd/default.nix @@ -12,6 +12,7 @@ , cryptsetup , util-linux , lvm2 +, python3 , systemd , xfsprogs , thin-provisioning-tools @@ -27,18 +28,18 @@ stdenv.mkDerivation rec { pname = "stratisd"; - version = "3.6.8"; + version = "3.7.2"; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; rev = "refs/tags/stratisd-v${version}"; - hash = "sha256-cYd2oy9reY8eWSdO98cVcz6/Z+MS26NY4U3UNVfMdbg="; + hash = "sha256-pxLf/YLd7vdAjGRQDvJvwhJXpMUiI3dge5Y5x895SPA="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-1KzOKo5Q1uBqO3aCBYUJJxla4873AzrwoFPaNpKKFJU="; + hash = "sha256-btSj69yBbnbK+jdWdMi3rQGKMOLWcwY5Zn3hmEWk/Hs="; }; postPatch = '' @@ -53,6 +54,8 @@ stdenv.mkDerivation rec { --replace-fail udevadm "${systemd}/bin/udevadm" ''; + strictDeps = true; + nativeBuildInputs = [ rustPlatform.cargoSetupHook rustPlatform.bindgenHook @@ -71,6 +74,7 @@ stdenv.mkDerivation rec { util-linux systemd lvm2 + (python3.withPackages (ps: [ ps.dbus-python ])) ]; outputs = [ "out" "initrd" ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix index f062ee261f..4c5dad4590 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "argyllcms"; - version = "3.2.0"; + version = "3.3.0"; src = fetchzip { # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a # while on me. It might be good to find a mirror url = "https://www.argyllcms.com/Argyll_V${version}_src.zip"; - hash = "sha256-t2dvbYFHEz9IUYpcM5HqDju4ugHrD7seG3QxumspxDg="; + hash = "sha256-xpbj15GzpGS0d1UjzvYiZ1nmmTjNIyv0ST2blmi7ZSk="; }; nativeBuildInputs = [ jam unzip ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.nix index ba0dd70254..d2fb26e3e3 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.nix @@ -10,14 +10,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "2.90"; + version = "2.92"; pname = "asymptote"; outputs = [ "out" "man" "info" "doc" "tex" ]; src = fetchurl { url = "mirror://sourceforge/asymptote/${finalAttrs.version}/asymptote-${finalAttrs.version}.src.tgz"; - hash = "sha256-jGlW+4CL9EqPJJcpW0+muumMQYkrQPPuj8dYqSRwc0A="; + hash = "sha256-nZtcb6fg+848HlT+sl4tUdKMT+d5jyTHbNyugpGo6mY="; }; # override with TeX Live containers to avoid building sty, docs from source diff --git a/third_party/nixpkgs/pkgs/tools/graphics/graphviz/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/graphviz/default.nix index e27c35fd72..a13fd158b9 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/graphviz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/graphviz/default.nix @@ -32,13 +32,13 @@ let in stdenv.mkDerivation rec { pname = "graphviz"; - version = "12.1.0"; + version = "12.1.1"; src = fetchFromGitLab { owner = "graphviz"; repo = "graphviz"; rev = version; - hash = "sha256-C+FFmWExEzPsDAmUiu/HmRVmb1Km4dJujagxN+v0uWw="; + hash = "sha256-r4V0iX+7169QG7nW2RjoUfrDh11zm6zdvtGt4E91kIE="; }; nativeBuildInputs = [ 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 5b7356c305..885a17e7a6 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-cts/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-cts/default.nix @@ -3,7 +3,7 @@ , fetchurl , runCommand , cmake -, ffmpeg_7 +, ffmpeg , glslang , libdrm , libglvnd @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { ''; buildInputs = [ - ffmpeg_7 + ffmpeg libdrm libffi libglvnd diff --git a/third_party/nixpkgs/pkgs/tools/graphics/wgpu-utils/Cargo.lock b/third_party/nixpkgs/pkgs/tools/graphics/wgpu-utils/Cargo.lock deleted file mode 100644 index 5b4861ff08..0000000000 --- a/third_party/nixpkgs/pkgs/tools/graphics/wgpu-utils/Cargo.lock +++ /dev/null @@ -1,3588 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom 0.2.8", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anyhow" -version = "1.0.70" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" - -[[package]] -name = "arrayref" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - -[[package]] -name = "arrayvec" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" -dependencies = [ - "serde", -] - -[[package]] -name = "ash" -version = "0.37.2+1.3.238" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28bf19c1f0a470be5fbf7522a308a05df06610252c5bcf5143e1b23f629a9a03" -dependencies = [ - "libloading 0.7.4", -] - -[[package]] -name = "async-executor" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" -dependencies = [ - "async-lock", - "async-task", - "concurrent-queue", - "fastrand", - "futures-lite", - "slab", -] - -[[package]] -name = "async-lock" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685" -dependencies = [ - "event-listener", - "futures-lite", -] - -[[package]] -name = "async-task" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" - -[[package]] -name = "async-trait" -version = "0.1.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.11", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide 0.5.4", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" -dependencies = [ - "byteorder", - "safemem", -] - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64-simd" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" -dependencies = [ - "outref", - "vsimd", -] - -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c70beb79cbb5ce9c4f8e20849978f34225931f665bb49efa6982875a4d5facb3" - -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - -[[package]] -name = "bumpalo" -version = "3.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" - -[[package]] -name = "bytemuck" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" -dependencies = [ - "bytemuck_derive", -] - -[[package]] -name = "bytemuck_derive" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aca418a974d83d40a0c1f0c5cba6ff4bc28d8df099109ca459a2118d40b6322" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" - -[[package]] -name = "calloop" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "595eb0438b3c6d262395fe30e6de9a61beb57ea56290b00a07f227fe6e20cbf2" -dependencies = [ - "log", - "nix", - "slotmap", - "thiserror", - "vec_map", -] - -[[package]] -name = "cargo-run-wasm" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc1e37cf14ef470ed74ec2a8b95e51b8623bcf6f76d24f233ebaeb209f766230" -dependencies = [ - "devserver_lib", - "pico-args", - "serde_json", - "wasm-bindgen-cli-support", -] - -[[package]] -name = "cc" -version = "1.0.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cgl" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ced0551234e87afee12411d535648dd89d2e7f34c78b753395567aff3d447ff" -dependencies = [ - "libc", -] - -[[package]] -name = "cmake" -version = "0.1.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c" -dependencies = [ - "cc", -] - -[[package]] -name = "cocoa" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics", - "foreign-types 0.3.2", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" -dependencies = [ - "bitflags 1.3.2", - "block", - "core-foundation", - "core-graphics-types", - "foreign-types 0.3.2", - "libc", - "objc", -] - -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "com-rs" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642" - -[[package]] -name = "concurrent-queue" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7bef69dc86e3c610e4e7aed41035e2a7ed12e72dd7530f61327a6579a4390b" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "console_error_panic_hook" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" -dependencies = [ - "cfg-if", - "wasm-bindgen", -] - -[[package]] -name = "console_log" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89f72f65e8501878b8a004d5a1afb780987e2ce2b4532c562e367a72c57499f" -dependencies = [ - "log", - "web-sys", -] - -[[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 = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "core-graphics" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", - "foreign-types 0.3.2", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "foreign-types 0.3.2", - "libc", -] - -[[package]] -name = "core-text" -version = "19.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25" -dependencies = [ - "core-foundation", - "core-graphics", - "foreign-types 0.3.2", - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossfont" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21fd3add36ea31aba1520aa5288714dd63be506106753226d0eb387a93bc9c45" -dependencies = [ - "cocoa", - "core-foundation", - "core-foundation-sys", - "core-graphics", - "core-text", - "dwrote", - "foreign-types 0.5.0", - "freetype-rs", - "libc", - "log", - "objc", - "once_cell", - "pkg-config", - "servo-fontconfig", - "winapi", -] - -[[package]] -name = "cts_runner" -version = "0.1.0" -dependencies = [ - "deno_console", - "deno_core", - "deno_url", - "deno_web", - "deno_webgpu", - "deno_webidl", - "termcolor", - "tokio", -] - -[[package]] -name = "cty" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" - -[[package]] -name = "d3d12" -version = "0.6.0" -source = "git+https://github.com/gfx-rs/d3d12-rs?rev=b940b1d71#b940b1d71ab7083ae80eec697872672dc1f2bd32" -dependencies = [ - "bitflags 1.3.2", - "libloading 0.7.4", - "winapi", -] - -[[package]] -name = "darling" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 1.0.105", -] - -[[package]] -name = "darling_macro" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" -dependencies = [ - "darling_core", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "data-encoding" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" - -[[package]] -name = "ddsfile" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "594ecd967c2f40db5dde8da4c356975fc1fe030e951c7c3962f6dc2e80042e87" -dependencies = [ - "bitflags 1.3.2", - "byteorder", - "enum_primitive", -] - -[[package]] -name = "deno_console" -version = "0.92.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55193bcb66a9a9830e1348280acbb9dd65c67d9a9a0586af9730079886408dce" -dependencies = [ - "deno_core", -] - -[[package]] -name = "deno_core" -version = "0.174.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8077367e7e7ab2f52f1bc6285af301a1a6328b984991a3ff22236ad79862fce3" -dependencies = [ - "anyhow", - "bytes", - "deno_ops", - "futures", - "indexmap", - "libc", - "log", - "once_cell", - "parking_lot 0.12.1", - "pin-project", - "serde", - "serde_json", - "serde_v8", - "smallvec", - "sourcemap", - "url", - "v8", -] - -[[package]] -name = "deno_ops" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc9d81c9e5cd9590be6043546f4565670cb6e6a7de1986fd1c354adce04eb9d4" -dependencies = [ - "once_cell", - "pmutil", - "proc-macro-crate", - "proc-macro2", - "quote", - "regex", - "syn 1.0.105", -] - -[[package]] -name = "deno_url" -version = "0.92.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "906895a8ba4a95f48c51a32947061bf82f42da8f7c8df787012503f1a6042685" -dependencies = [ - "deno_core", - "serde", - "serde_repr", - "urlpattern", -] - -[[package]] -name = "deno_web" -version = "0.123.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af75e7ff90a3f719adc074a8789da16687b9e77a97d67eb727b65fae71262637" -dependencies = [ - "async-trait", - "base64-simd", - "deno_core", - "encoding_rs", - "flate2", - "serde", - "tokio", - "uuid", -] - -[[package]] -name = "deno_webgpu" -version = "0.85.0" -dependencies = [ - "deno_core", - "raw-window-handle 0.5.2", - "serde", - "tokio", - "wgpu-core", - "wgpu-types", -] - -[[package]] -name = "deno_webidl" -version = "0.92.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "387a0cfb076580e0237ba6f1b338ee2688779c6a5e531d4a8a2a82b216917ae0" -dependencies = [ - "deno_core", -] - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version 0.4.0", - "syn 1.0.105", -] - -[[package]] -name = "devserver_lib" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edf215dbb8cb1409cca7645aaed35f9e39fb0a21855bba1ac48bc0334903bf66" - -[[package]] -name = "dispatch" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" - -[[package]] -name = "dlib" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794" -dependencies = [ - "libloading 0.7.4", -] - -[[package]] -name = "downcast-rs" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" - -[[package]] -name = "dummy" -version = "0.16.1" -dependencies = [ - "wgpu-core", -] - -[[package]] -name = "dwrote" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b" -dependencies = [ - "lazy_static", - "libc", - "serde", - "serde_derive", - "winapi", - "wio", -] - -[[package]] -name = "either" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" - -[[package]] -name = "encoding_rs" -version = "0.8.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "enum_primitive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4551092f4d519593039259a9ed8daedf0da12e5109c5280338073eaeb81180" -dependencies = [ - "num-traits 0.1.43", -] - -[[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 = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] - -[[package]] -name = "errno" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "expat-sys" -version = "2.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa" -dependencies = [ - "cmake", - "pkg-config", -] - -[[package]] -name = "fastrand" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" -dependencies = [ - "instant", -] - -[[package]] -name = "fdeflate" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] -name = "flate2" -version = "1.0.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" -dependencies = [ - "crc32fast", - "miniz_oxide 0.5.4", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared 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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8469d0d40519bc608ec6863f1cc88f3f1deee15913f2f3b3e573d81ed38cccc" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[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.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "freetype-rs" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74eadec9d0a5c28c54bb9882e54787275152a4e36ce206b45d7451384e5bf5fb" -dependencies = [ - "bitflags 1.3.2", - "freetype-sys", - "libc", -] - -[[package]] -name = "freetype-sys" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a" -dependencies = [ - "cmake", - "libc", - "pkg-config", -] - -[[package]] -name = "fslock" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57eafdd0c16f57161105ae1b98a1238f97645f2f588438b2949c99a2af9616bf" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "futures" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" - -[[package]] -name = "futures-executor" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-intrusive" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a604f7a68fbf8103337523b1fadc8ade7361ee3f112f7c680ad179651616aed5" -dependencies = [ - "futures-core", - "lock_api", - "parking_lot 0.11.2", -] - -[[package]] -name = "futures-io" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" - -[[package]] -name = "futures-lite" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" -dependencies = [ - "fastrand", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-macro" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.11", -] - -[[package]] -name = "futures-sink" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" - -[[package]] -name = "futures-task" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" - -[[package]] -name = "futures-util" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[package]] -name = "gimli" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" - -[[package]] -name = "gl_generator" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" -dependencies = [ - "khronos_api", - "log", - "xml-rs", -] - -[[package]] -name = "glam" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518faa5064866338b013ff9b2350dc318e14cc4fcd6cb8206d7e7c9886c98815" - -[[package]] -name = "glow" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e007a07a24de5ecae94160f141029e9a347282cfe25d1d58d85d845cf3130f1" -dependencies = [ - "js-sys", - "slotmap", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "glutin" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444c9ad294fdcaf20ccf6726b78f380b5450275540c9b68ab62f49726ad1c713" -dependencies = [ - "cgl", - "cocoa", - "core-foundation", - "glutin_egl_sys", - "glutin_gles2_sys", - "glutin_glx_sys", - "glutin_wgl_sys", - "libloading 0.7.4", - "log", - "objc", - "once_cell", - "osmesa-sys", - "parking_lot 0.12.1", - "raw-window-handle 0.5.2", - "wayland-client", - "wayland-egl", - "winapi", - "winit", -] - -[[package]] -name = "glutin_egl_sys" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68900f84b471f31ea1d1355567eb865a2cf446294f06cef8d653ed7bcf5f013d" -dependencies = [ - "gl_generator", - "winapi", -] - -[[package]] -name = "glutin_gles2_sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094e708b730a7c8a1954f4f8a31880af00eb8a1c5b5bf85d28a0a3c6d69103" -dependencies = [ - "gl_generator", - "objc", -] - -[[package]] -name = "glutin_glx_sys" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93d0575865098580c5b3a423188cd959419912ea60b1e48e8b3b526f6d02468" -dependencies = [ - "gl_generator", - "x11-dl", -] - -[[package]] -name = "glutin_wgl_sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3da5951a1569dbab865c6f2a863efafff193a93caf05538d193e9e3816d21696" -dependencies = [ - "gl_generator", -] - -[[package]] -name = "gpu-alloc" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc59e5f710e310e76e6707f86c561dd646f69a8876da9131703b2f717de818d" -dependencies = [ - "bitflags 1.3.2", - "gpu-alloc-types", -] - -[[package]] -name = "gpu-alloc-types" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "gpu-allocator" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce95f9e2e11c2c6fadfce42b5af60005db06576f231f5c92550fdded43c423e8" -dependencies = [ - "backtrace", - "log", - "thiserror", - "winapi", - "windows", -] - -[[package]] -name = "gpu-descriptor" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a" -dependencies = [ - "bitflags 1.3.2", - "gpu-descriptor-types", - "hashbrown", -] - -[[package]] -name = "gpu-descriptor-types" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash", -] - -[[package]] -name = "hassle-rs" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0" -dependencies = [ - "bitflags 1.3.2", - "com-rs", - "libc", - "libloading 0.7.4", - "thiserror", - "widestring", - "winapi", -] - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - -[[package]] -name = "hexf-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "id-arena" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "if_chain" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" - -[[package]] -name = "image" -version = "0.24.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "num-rational", - "num-traits 0.2.15", - "png", -] - -[[package]] -name = "indexmap" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" -dependencies = [ - "autocfg", - "hashbrown", - "serde", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" -dependencies = [ - "libc", - "windows-sys 0.45.0", -] - -[[package]] -name = "is-terminal" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e18b0a45d56fe973d6db23972bf5bc46f988a4a2385deac9cc29572f09daef" -dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix 0.36.8", - "windows-sys 0.45.0", -] - -[[package]] -name = "itoa" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "js-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "khronos-egl" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" -dependencies = [ - "libc", - "libloading 0.7.4", - "pkg-config", -] - -[[package]] -name = "khronos_api" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "leb128" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" - -[[package]] -name = "libc" -version = "0.2.141" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "libloading" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "linux-raw-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" - -[[package]] -name = "linux-raw-sys" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" - -[[package]] -name = "lock_api" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memmap2" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc" -dependencies = [ - "libc", -] - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "metal" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060" -dependencies = [ - "bitflags 1.3.2", - "block", - "core-graphics-types", - "foreign-types 0.3.2", - "log", - "objc", -] - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" -dependencies = [ - "adler", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", - "simd-adler32", -] - -[[package]] -name = "mio" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" -dependencies = [ - "libc", - "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.42.0", -] - -[[package]] -name = "naga" -version = "0.12.0" -source = "git+https://github.com/gfx-rs/naga?rev=b99d58ea435090e561377949f428bce2c18451bb#b99d58ea435090e561377949f428bce2c18451bb" -dependencies = [ - "bit-set", - "bitflags 1.3.2", - "codespan-reporting", - "hexf-parse", - "indexmap", - "log", - "num-traits 0.2.15", - "petgraph", - "pp-rs", - "rustc-hash", - "serde", - "spirv", - "termcolor", - "thiserror", - "unicode-xid", -] - -[[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" - -[[package]] -name = "ndk" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" -dependencies = [ - "bitflags 1.3.2", - "jni-sys", - "ndk-sys", - "num_enum", - "raw-window-handle 0.5.2", - "thiserror", -] - -[[package]] -name = "ndk-context" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" - -[[package]] -name = "ndk-glue" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0434fabdd2c15e0aab768ca31d5b7b333717f03cf02037d5a0a3ff3c278ed67f" -dependencies = [ - "libc", - "log", - "ndk", - "ndk-context", - "ndk-macro", - "ndk-sys", - "once_cell", - "parking_lot 0.12.1", -] - -[[package]] -name = "ndk-macro" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c" -dependencies = [ - "darling", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "ndk-sys" -version = "0.4.1+23.1.7779620" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" -dependencies = [ - "jni-sys", -] - -[[package]] -name = "nix" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset", -] - -[[package]] -name = "noise" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82051dd6745d5184c6efb7bc8be14892a7f6d4f3ad6dbf754d1c7d7d5fe24b43" -dependencies = [ - "rand", - "rand_xorshift", -] - -[[package]] -name = "nom" -version = "7.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits 0.2.15", -] - -[[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 0.2.15", -] - -[[package]] -name = "num-traits" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" -dependencies = [ - "num-traits 0.2.15", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" -dependencies = [ - "hermit-abi 0.2.6", - "libc", -] - -[[package]] -name = "num_enum" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "obj" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "059c95245738cdc7b40078cdd51a23200252a4c0a0a6dd005136152b3f467a4a" - -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", - "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.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" - -[[package]] -name = "osmesa-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88cfece6e95d2e717e0872a7f53a8684712ad13822a7979bc760b9c77ec0013b" -dependencies = [ - "shared_library", -] - -[[package]] -name = "outref" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a" - -[[package]] -name = "parking" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" - -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.5", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core 0.9.5", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "windows-sys 0.42.0", -] - -[[package]] -name = "percent-encoding" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "petgraph" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" -dependencies = [ - "fixedbitset", - "indexmap", -] - -[[package]] -name = "pico-args" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" - -[[package]] -name = "pin-project" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" - -[[package]] -name = "player" -version = "0.16.1" -dependencies = [ - "env_logger", - "log", - "raw-window-handle 0.5.2", - "ron", - "serde", - "wgpu-core", - "wgpu-types", - "winit", -] - -[[package]] -name = "pmutil" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3894e5d549cccbe44afecf72922f277f603cd4bb0219c8342631ef18fffbe004" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "png" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide 0.7.1", -] - -[[package]] -name = "pollster" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5da3b0203fd7ee5720aa0b5e790b591aa5d3f41c3ed2c34a3a393382198af2f7" - -[[package]] -name = "pp-rs" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb458bb7f6e250e6eb79d5026badc10a3ebb8f9a15d1fff0f13d17c71f4d6dee" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "proc-macro-crate" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" -dependencies = [ - "once_cell", - "thiserror", - "toml", -] - -[[package]] -name = "proc-macro2" -version = "1.0.54" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "profiling" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332cd62e95873ea4f41f3dfd6bbbfc5b52aec892d7e8d534197c4720a0bbbab2" - -[[package]] -name = "quote" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" -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", - "rand_core", - "rand_hc", -] - -[[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", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core", -] - -[[package]] -name = "rand_xorshift" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8" -dependencies = [ - "rand_core", -] - -[[package]] -name = "range-alloc" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" - -[[package]] -name = "raw-window-handle" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41" -dependencies = [ - "cty", -] - -[[package]] -name = "raw-window-handle" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" - -[[package]] -name = "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 = "regex" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" - -[[package]] -name = "renderdoc-sys" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" - -[[package]] -name = "ron" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300a51053b1cb55c80b7a9fde4120726ddf25ca241a1cbb926626f62fb136bff" -dependencies = [ - "base64 0.13.1", - "bitflags 1.3.2", - "serde", -] - -[[package]] -name = "run-wasm" -version = "0.16.1" -dependencies = [ - "cargo-run-wasm", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver 1.0.17", -] - -[[package]] -name = "rustix" -version = "0.36.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" -dependencies = [ - "bitflags 1.3.2", - "errno 0.2.8", - "io-lifetimes", - "libc", - "linux-raw-sys 0.1.4", - "windows-sys 0.45.0", -] - -[[package]] -name = "rustix" -version = "0.37.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aae838e49b3d63e9274e1c01833cc8139d3fec468c3b84688c628f44b1ae11d" -dependencies = [ - "bitflags 1.3.2", - "errno 0.3.1", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.1", - "windows-sys 0.45.0", -] - -[[package]] -name = "ryu" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" - -[[package]] -name = "safe_arch" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ff3d6d9696af502cc3110dacce942840fb06ff4514cad92236ecc455f2ce05" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" - -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "sctk-adwaita" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61270629cc6b4d77ec1907db1033d5c2e1a404c412743621981a871dc9c12339" -dependencies = [ - "crossfont", - "log", - "smithay-client-toolkit", - "tiny-skia", -] - -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] -name = "serde" -version = "1.0.160" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_bytes" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.160" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.11", -] - -[[package]] -name = "serde_json" -version = "1.0.96" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" -dependencies = [ - "indexmap", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "serde_v8" -version = "0.85.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dba78050262072324b0b1efba11db7367735251adf7ec734fd75780c598c743b" -dependencies = [ - "bytes", - "derive_more", - "serde", - "serde_bytes", - "smallvec", - "v8", -] - -[[package]] -name = "servo-fontconfig" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e3e22fe5fd73d04ebf0daa049d3efe3eae55369ce38ab16d07ddd9ac5c217c" -dependencies = [ - "libc", - "servo-fontconfig-sys", -] - -[[package]] -name = "servo-fontconfig-sys" -version = "5.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36b879db9892dfa40f95da1c38a835d41634b825fbd8c4c418093d53c24b388" -dependencies = [ - "expat-sys", - "freetype-sys", - "pkg-config", -] - -[[package]] -name = "shared_library" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9e7e0f2bfae24d8a5b5a66c5b257a83c7412304311512a0c054cd5e619da11" -dependencies = [ - "lazy_static", - "libc", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "simd-adler32" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" - -[[package]] -name = "slab" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" -dependencies = [ - "autocfg", -] - -[[package]] -name = "slotmap" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" -dependencies = [ - "version_check", -] - -[[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "smithay-client-toolkit" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f307c47d32d2715eb2e0ece5589057820e0e5e70d07c247d1063e844e107f454" -dependencies = [ - "bitflags 1.3.2", - "calloop", - "dlib", - "lazy_static", - "log", - "memmap2", - "nix", - "pkg-config", - "wayland-client", - "wayland-cursor", - "wayland-protocols", -] - -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "sourcemap" -version = "6.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eed16231c92d0a6f0388f56e0ab2be24ecff1173f8e22f0ea5e074d0525631cb" -dependencies = [ - "data-encoding", - "if_chain", - "rustc_version 0.2.3", - "serde", - "serde_json", - "unicode-id", - "url", -] - -[[package]] -name = "spirv" -version = "0.2.0+1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" -dependencies = [ - "bitflags 1.3.2", - "num-traits 0.2.15", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "syn" -version = "1.0.105" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e3787bb71465627110e7d87ed4faaa36c1f61042ee67badb9e2ef173accc40" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tempfile" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall 0.3.5", - "rustix 0.37.7", - "windows-sys 0.45.0", -] - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "thiserror" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.11", -] - -[[package]] -name = "tiny-skia" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642680569bb895b16e4b9d181c60be1ed136fa0c9c7f11d004daf053ba89bf82" -dependencies = [ - "arrayref", - "arrayvec 0.5.2", - "bytemuck", - "cfg-if", - "png", - "safe_arch", - "tiny-skia-path", -] - -[[package]] -name = "tiny-skia-path" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c114d32f0c2ee43d585367cb013dfaba967ab9f62b90d9af0d696e955e70fa6c" -dependencies = [ - "arrayref", - "bytemuck", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" -dependencies = [ - "autocfg", - "bytes", - "libc", - "memchr", - "mio", - "num_cpus", - "parking_lot 0.12.1", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys 0.42.0", -] - -[[package]] -name = "tokio-macros" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "toml" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" -dependencies = [ - "serde", -] - -[[package]] -name = "unic-char-property" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" -dependencies = [ - "unic-char-range", -] - -[[package]] -name = "unic-char-range" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" - -[[package]] -name = "unic-common" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" - -[[package]] -name = "unic-ucd-ident" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e230a37c0381caa9219d67cf063aa3a375ffed5bf541a452db16e744bdab6987" -dependencies = [ - "unic-char-property", - "unic-char-range", - "unic-ucd-version", -] - -[[package]] -name = "unic-ucd-version" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" -dependencies = [ - "unic-common", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-id" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d70b6494226b36008c8366c288d77190b3fad2eb4c10533139c1c1f461127f1a" - -[[package]] -name = "unicode-ident" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "url" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "urlpattern" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9bd5ff03aea02fa45b13a7980151fe45009af1980ba69f651ec367121a31609" -dependencies = [ - "derive_more", - "regex", - "serde", - "unic-ucd-ident", - "url", -] - -[[package]] -name = "uuid" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b55a3fef2a1e3b3a00ce878640918820d3c51081576ac657d23af9fc7928fdb" -dependencies = [ - "getrandom 0.2.8", - "serde", -] - -[[package]] -name = "v8" -version = "0.64.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2287b485fa902172da3722d7e557e083afd63921777e0c6e5c0fba28e6d59d3" -dependencies = [ - "bitflags 1.3.2", - "fslock", - "lazy_static", - "which", -] - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "vsimd" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" - -[[package]] -name = "waker-fn" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" - -[[package]] -name = "walrus" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb08e48cde54c05f363d984bb54ce374f49e242def9468d2e1b6c2372d291f8" -dependencies = [ - "anyhow", - "id-arena", - "leb128", - "log", - "walrus-macro", - "wasmparser 0.77.0", -] - -[[package]] -name = "walrus-macro" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a6e5bd22c71e77d60140b0bd5be56155a37e5bd14e24f5f87298040d0cc40d7" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 1.0.105", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-cli-support" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d4780c659b883a19ddb7ced365db19f7f45cd182d832ee14de2b7ef52e88a9f" -dependencies = [ - "anyhow", - "base64 0.9.3", - "log", - "rustc-demangle", - "serde_json", - "tempfile", - "unicode-ident", - "walrus", - "wasm-bindgen-externref-xform", - "wasm-bindgen-multi-value-xform", - "wasm-bindgen-shared", - "wasm-bindgen-threads-xform", - "wasm-bindgen-wasm-conventions", - "wasm-bindgen-wasm-interpreter", - "wit-text", - "wit-validator", - "wit-walrus", -] - -[[package]] -name = "wasm-bindgen-externref-xform" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d154c3843bf3b635b602ad41b56f505f8f1a25f8a0133fca4bbd0918d74efdc" -dependencies = [ - "anyhow", - "walrus", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.105", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-multi-value-xform" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00a577fbd4be358ef8095432189b5c2e6b6e71f5081797c2032572f77d65d26" -dependencies = [ - "anyhow", - "walrus", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" - -[[package]] -name = "wasm-bindgen-test" -version = "0.3.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db36fc0f9fb209e88fb3642590ae0205bb5a56216dabd963ba15879fe53a30b" -dependencies = [ - "console_error_panic_hook", - "js-sys", - "scoped-tls", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-bindgen-test-macro", -] - -[[package]] -name = "wasm-bindgen-test-macro" -version = "0.3.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0734759ae6b3b1717d661fe4f016efcfb9828f5edb4520c18eaee05af3b43be9" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "wasm-bindgen-threads-xform" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aa93941bae037b7b4fac4ecfc132294b828036c5990a806d0e6fd9284297d94" -dependencies = [ - "anyhow", - "walrus", - "wasm-bindgen-wasm-conventions", -] - -[[package]] -name = "wasm-bindgen-wasm-conventions" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f5de325048d945c90600fdf66b13521f3340d85971287775c36aa99c04466b" -dependencies = [ - "anyhow", - "walrus", -] - -[[package]] -name = "wasm-bindgen-wasm-interpreter" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f695df44962e3a107436282232a2daa185b8453c16be8ddfb637cd2601f31128" -dependencies = [ - "anyhow", - "log", - "walrus", - "wasm-bindgen-wasm-conventions", -] - -[[package]] -name = "wasmparser" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a950e6a618f62147fd514ff445b2a0b53120d382751960797f85f058c7eda9b9" - -[[package]] -name = "wasmparser" -version = "0.77.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b35c86d22e720a07d954ebbed772d01180501afe7d03d464f413bb5f8914a8d6" - -[[package]] -name = "wast" -version = "21.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b1844f66a2bc8526d71690104c0e78a8e59ffa1597b7245769d174ebb91deb5" -dependencies = [ - "leb128", -] - -[[package]] -name = "wayland-client" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" -dependencies = [ - "bitflags 1.3.2", - "downcast-rs", - "libc", - "nix", - "scoped-tls", - "wayland-commons", - "wayland-scanner", - "wayland-sys", -] - -[[package]] -name = "wayland-commons" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" -dependencies = [ - "nix", - "once_cell", - "smallvec", - "wayland-sys", -] - -[[package]] -name = "wayland-cursor" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661" -dependencies = [ - "nix", - "wayland-client", - "xcursor", -] - -[[package]] -name = "wayland-egl" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "402de949f81a012926d821a2d659f930694257e76dd92b6e0042ceb27be4107d" -dependencies = [ - "wayland-client", - "wayland-sys", -] - -[[package]] -name = "wayland-protocols" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" -dependencies = [ - "bitflags 1.3.2", - "wayland-client", - "wayland-commons", - "wayland-scanner", -] - -[[package]] -name = "wayland-scanner" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" -dependencies = [ - "proc-macro2", - "quote", - "xml-rs", -] - -[[package]] -name = "wayland-sys" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4" -dependencies = [ - "dlib", - "lazy_static", - "pkg-config", -] - -[[package]] -name = "web-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "wgpu" -version = "0.16.1" -dependencies = [ - "arrayvec 0.7.2", - "async-executor", - "bitflags 2.1.0", - "bytemuck", - "cfg-if", - "console_error_panic_hook", - "console_log", - "ddsfile", - "env_logger", - "futures-intrusive", - "glam", - "image", - "js-sys", - "log", - "naga", - "nanorand", - "noise", - "obj", - "parking_lot 0.11.2", - "png", - "pollster", - "profiling", - "raw-window-handle 0.5.2", - "serde", - "smallvec", - "static_assertions", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-bindgen-test", - "web-sys", - "wgpu-core", - "wgpu-hal", - "wgpu-types", - "winit", -] - -[[package]] -name = "wgpu-core" -version = "0.16.1" -dependencies = [ - "arrayvec 0.7.2", - "bit-vec", - "bitflags 2.1.0", - "codespan-reporting", - "log", - "naga", - "parking_lot 0.11.2", - "profiling", - "raw-window-handle 0.5.2", - "ron", - "rustc-hash", - "serde", - "smallvec", - "thiserror", - "web-sys", - "wgpu-hal", - "wgpu-types", -] - -[[package]] -name = "wgpu-hal" -version = "0.16.0" -dependencies = [ - "android_system_properties", - "arrayvec 0.7.2", - "ash", - "bit-set", - "bitflags 2.1.0", - "block", - "core-graphics-types", - "d3d12", - "env_logger", - "foreign-types 0.3.2", - "glow", - "glutin", - "gpu-alloc", - "gpu-allocator", - "gpu-descriptor", - "hassle-rs", - "js-sys", - "khronos-egl", - "libc", - "libloading 0.8.0", - "log", - "metal", - "naga", - "objc", - "parking_lot 0.11.2", - "profiling", - "range-alloc", - "raw-window-handle 0.5.2", - "renderdoc-sys", - "rustc-hash", - "smallvec", - "thiserror", - "wasm-bindgen", - "web-sys", - "wgpu-types", - "winapi", - "winit", -] - -[[package]] -name = "wgpu-info" -version = "0.16.1" -dependencies = [ - "env_logger", - "num-traits 0.2.15", - "wgpu", -] - -[[package]] -name = "wgpu-types" -version = "0.16.0" -dependencies = [ - "bitflags 2.1.0", - "js-sys", - "serde", - "serde_json", - "web-sys", -] - -[[package]] -name = "which" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" -dependencies = [ - "either", - "libc", - "once_cell", -] - -[[package]] -name = "widestring" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows" -version = "0.44.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" -dependencies = [ - "windows-targets 0.42.1", -] - -[[package]] -name = "windows-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", -] - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.1", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm 0.42.1", - "windows_x86_64_msvc 0.42.1", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.1", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.0", -] - -[[package]] -name = "windows-targets" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.1", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm 0.42.1", - "windows_x86_64_msvc 0.42.1", -] - -[[package]] -name = "windows-targets" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" -dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" - -[[package]] -name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" - -[[package]] -name = "winit" -version = "0.27.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb796d6fbd86b2fd896c9471e6f04d39d750076ebe5680a3958f00f5ab97657c" -dependencies = [ - "bitflags 1.3.2", - "cocoa", - "core-foundation", - "core-graphics", - "dispatch", - "instant", - "libc", - "log", - "mio", - "ndk", - "ndk-glue", - "objc", - "once_cell", - "parking_lot 0.12.1", - "percent-encoding", - "raw-window-handle 0.4.3", - "raw-window-handle 0.5.2", - "sctk-adwaita", - "smithay-client-toolkit", - "wasm-bindgen", - "wayland-client", - "wayland-protocols", - "web-sys", - "windows-sys 0.36.1", - "x11-dl", -] - -[[package]] -name = "wio" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" -dependencies = [ - "winapi", -] - -[[package]] -name = "wit-parser" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f5fd97866f4b9c8e1ed57bcf9446f3d0d8ba37e2dd01c3c612c046c053b06f7" -dependencies = [ - "anyhow", - "leb128", - "wit-schema-version", -] - -[[package]] -name = "wit-schema-version" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfee4a6a4716eefa0682e7a3b836152e894a3e4f34a9d6c2c3e1c94429bfe36a" - -[[package]] -name = "wit-text" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33358e95c77d660f1c7c07f4a93c2bd89768965e844e3c50730bb4b42658df5f" -dependencies = [ - "anyhow", - "wast", - "wit-writer", -] - -[[package]] -name = "wit-validator" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c11d93d925420e7872b226c4161849c32be38385ccab026b88df99d8ddc6ba6" -dependencies = [ - "anyhow", - "wasmparser 0.59.0", - "wit-parser", - "wit-schema-version", -] - -[[package]] -name = "wit-walrus" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad559e3e4c6404b2a6a675d44129d62a3836e3b951b90112fa1c5feb852757cd" -dependencies = [ - "anyhow", - "id-arena", - "walrus", - "wit-parser", - "wit-schema-version", - "wit-writer", -] - -[[package]] -name = "wit-writer" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2ad01ba5e9cbcff799a0689e56a153776ea694cec777f605938cb9880d41a09" -dependencies = [ - "leb128", - "wit-schema-version", -] - -[[package]] -name = "x11-dl" -version = "2.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1536d6965a5d4e573c7ef73a2c15ebcd0b2de3347bdf526c34c297c00ac40f0" -dependencies = [ - "lazy_static", - "libc", - "pkg-config", -] - -[[package]] -name = "xcursor" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" -dependencies = [ - "nom", -] - -[[package]] -name = "xml-rs" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" diff --git a/third_party/nixpkgs/pkgs/tools/graphics/wgpu-utils/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/wgpu-utils/default.nix deleted file mode 100644 index 51d4c018e4..0000000000 --- a/third_party/nixpkgs/pkgs/tools/graphics/wgpu-utils/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, makeWrapper, vulkan-loader, QuartzCore }: - -rustPlatform.buildRustPackage rec { - pname = "wgpu-utils"; - version = "0.16.1"; - - src = fetchFromGitHub { - owner = "gfx-rs"; - repo = "wgpu"; - rev = "v${version}"; - hash = "sha256-tGjjjQDcN9zkxQSOrW/D1Pu6cycTKo/lh71mTEpZQIE="; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "d3d12-0.6.0" = "sha256-xCazXUriIQWMVa3DOI1aySBATmYwyDqsVYULRV2l/44="; - "naga-0.12.0" = "sha256-EZ8ZKixOFPT9ZTKIC/UGh2B3F09ENbCTUi+ASamJzMM="; - }; - }; - - nativeBuildInputs = [ - pkg-config - makeWrapper - ]; - - buildInputs = lib.optional stdenv.hostPlatform.isDarwin QuartzCore; - - # Tests fail, as the Nix sandbox doesn't provide an appropriate adapter (e.g. Vulkan). - doCheck = false; - - postInstall = '' - wrapProgram $out/bin/wgpu-info \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]} - ''; - - meta = with lib; { - description = "Safe and portable GPU abstraction in Rust, implementing WebGPU API"; - homepage = "https://wgpu.rs/"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ erictapen ]; - mainProgram = "wgpu-info"; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/default.nix index 7fdee4f166..2a591c0d68 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/default.nix @@ -44,13 +44,13 @@ let in stdenv.mkDerivation rec { pname = "fcitx5"; - version = "5.1.10"; + version = "5.1.11"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-rMtCzFe3imF/uY0kXM2ivyt11r5qNTNab7GkWzdeC/g="; + hash = "sha256-8J2gr2quZvJELd3zzhgwZUowjkOylpM6VZGJ1G3VomI="; }; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix index afe410f9e2..ea9a209441 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "fcitx5-anthy"; - version = "5.1.4"; + version = "5.1.5"; src = fetchurl { url = "https://download.fcitx-im.org/fcitx5/fcitx5-anthy/${pname}-${version}.tar.zst"; - hash = "sha256-e0X00plXfRgoSkhTDVJfububin8h+NiGzrnOSIaSa7g="; + hash = "sha256-heSO2eArdSnOmIg7JG8vOo5y3g5dSPOuXkUfeNqKzSA="; }; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config zstd ]; diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix index d7e03bafdb..550efad626 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-chewing"; - version = "5.1.5"; + version = "5.1.6"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-qXIcIByfgfWRe0rhetTHRyA7RqUHIP6FATwvtrfXNwQ="; + hash = "sha256-WSu78k0udlXxiQ1sAqB/LKmVfThxizshH5C9q2CfZLI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix index 2ad2ef25b9..a9f5cf3116 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix @@ -32,13 +32,13 @@ in stdenv.mkDerivation rec { pname = "fcitx5-chinese-addons"; - version = "5.1.6"; + version = "5.1.7"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-Vq7/5UBoejylXLiUIbpxZ7P3HI8+YNVDweP+uOMnCWc="; + hash = "sha256-vtIzm8ia5hC0JdsGNopIHdAd8RDVgrbtVvj1Jh+gE94="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix index 432ee0a6e7..a34a2e418f 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-configtool"; - version = "5.1.6"; + version = "5.1.7"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-ZB0YH5IYYjYunsVQtFaVVBW+zkTn/bgtMEWE376IoiU="; + hash = "sha256-6Slh1uZglRNBLQ1ziKf2xaP+NK6Abug/6TZcYy2HFPQ="; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix index 96741f898c..b2511be8de 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-hangul"; - version = "5.1.4"; + version = "5.1.5"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-v5XZqsQqA74NSXTPBU77C6GFlnyC/wFFPOOYn8lqidc="; + hash = "sha256-+IXsMT87Dc+Ad4r6/U+NLYo+04j+I58Cqz99v4Yr0uc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix index d1e9609000..ff3c2124a8 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-m17n"; - version = "5.1.1"; + version = "5.1.2"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-5zXLbKHcTMrX+Ux9aN2jl15Go58m7Fr7ZkFyvDGWKaw="; + hash = "sha256-LBFPkkBaKcVtTLKswLlr1EdCoY63nToa8I7ea1/MZeg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index d6e76af14d..4e8eaa7887 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -14,13 +14,13 @@ let in stdenv.mkDerivation rec { pname = "fcitx5-qt${majorVersion}"; - version = "5.1.6"; + version = "5.1.7"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-qt"; rev = version; - hash = "sha256-ptAJNc7zhXQ+nFfjmVQd5nZvN5lyk0jV6AHBKQkUGOM="; + hash = "sha256-C/LRpC6w/2cb/+xAwsmOVEvWmHMtJKD1pAwMoeLVIYY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix index e9a042852b..1b34b1260a 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "fcitx5-rime"; - version = "5.1.8"; + version = "5.1.9"; src = fetchurl { url = "https://download.fcitx-im.org/fcitx5/${pname}/${pname}-${version}.tar.zst"; - hash = "sha256-nnYk/nGbNGbl7Y39AueIltYA2fd43Gb1SmQu5VZRycM="; + hash = "sha256-+aIb7ktmhKb6ixhvzCG6GLeEUfS3QHJmEZ3YGE5YrZg="; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix index ae43cd73e5..c2679dbcd7 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-skk"; - version = "5.1.4"; + version = "5.1.5"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-K+AblsG/LwE1httvRCukMEa1KEDaAUWNLUl7MWyy2ow="; + hash = "sha256-wv5vX9eFlBUY7x4v9U+OuhKgX6V/b3iTaCvAIwJO10o="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix index ef96585705..23b19f21a0 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-unikey"; - version = "5.1.4"; + version = "5.1.5"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-unikey"; rev = version; - hash = "sha256-BwKlhb3nIzBgD3XSuDOH6f2sFbtx8cc4R4qC5ZQrZus="; + hash = "sha256-CcyDK+knBXh2P+g3aB0Cv8F5BX7uCRbYwHjMEYo9k8A="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/m17n-db/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/m17n-db/default.nix index 558d59d0ca..ef3dd0e02e 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/m17n-db/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/m17n-db/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "m17n-db"; - version = "1.8.5"; + version = "1.8.7"; src = fetchurl { url = "https://download.savannah.gnu.org/releases/m17n/m17n-db-${version}.tar.gz"; - sha256 = "sha256-to//QiwKKGTuVuLEUXOCEzuYG7S6ObU/R4lc2LHApzY="; + sha256 = "sha256-4Zuw4nr5+yPFLq8OnIJ7tzv87O7J/qsDjmPUvKibmwg="; }; nativeBuildInputs = [ gettext ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/apkeep/default.nix b/third_party/nixpkgs/pkgs/tools/misc/apkeep/default.nix index 8e31710ff3..e3969844d8 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/apkeep/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/apkeep/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "apkeep"; - version = "0.16.0"; + version = "0.17.0"; src = fetchCrate { inherit pname version; - hash = "sha256-nPeXIzy9tYWeJrq1tIKXMILOjVnsAvsceY5dzz7+pYE="; + hash = "sha256-YjGfnYK22RIVa8D8CWnAxHGDqXENGAPIeQQ606Q3JW8="; }; - cargoHash = "sha256-0NyZmZ00zmGfndz47NMeh76SMmh0ap6ZfkKebX7pMfw="; + cargoHash = "sha256-Fx/XNmml/5opekmH1qs/f3sD45KWfNZjdOxTuNJfZiw="; prePatch = '' rm .cargo/config.toml diff --git a/third_party/nixpkgs/pkgs/tools/misc/archi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/archi/default.nix index 7afbce58c1..9f3edad29a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/archi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/archi/default.nix @@ -4,7 +4,7 @@ , makeWrapper , jdk , libsecret -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 , _7zz , nixosTests @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { install -D -m755 Archi $out/libexec/Archi makeWrapper $out/libexec/Archi $out/bin/Archi \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ webkitgtk ])} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ webkitgtk_4_0 ])} \ --set WEBKIT_DISABLE_DMABUF_RENDERER 1 \ --prefix PATH : ${jdk}/bin '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/birdfont/default.nix b/third_party/nixpkgs/pkgs/tools/misc/birdfont/default.nix index 7b92c9e3e8..866d56b156 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/birdfont/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/birdfont/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, python3, xmlbird, -cairo, gdk-pixbuf, libgee, glib, gtk3, webkitgtk, libnotify, sqlite, vala, +cairo, gdk-pixbuf, libgee, glib, gtk3, webkitgtk_4_0, libnotify, sqlite, vala, gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook3, autoPatchelfHook }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ python3 pkg-config vala gobject-introspection wrapGAppsHook3 autoPatchelfHook ]; - buildInputs = [ xmlbird libgee cairo gdk-pixbuf glib gtk3 webkitgtk libnotify sqlite gsettings-desktop-schemas ]; + buildInputs = [ xmlbird libgee cairo gdk-pixbuf glib gtk3 webkitgtk_4_0 libnotify sqlite gsettings-desktop-schemas ]; postPatch = '' substituteInPlace install.py \ diff --git a/third_party/nixpkgs/pkgs/tools/misc/colord/default.nix b/third_party/nixpkgs/pkgs/tools/misc/colord/default.nix index 986babbf28..da893702d9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/colord/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/colord/default.nix @@ -10,7 +10,9 @@ , gusb , lcms2 , sqlite +, udev , systemd +, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , dbus , gobject-introspection , argyllcms @@ -60,6 +62,11 @@ stdenv.mkDerivation rec { "-Dvapi=true" "-Ddaemon=${lib.boolToString enableDaemon}" "-Ddaemon_user=colord" + (lib.mesonBool "systemd" enableSystemd) + + # The presence of the "udev" pkg-config module (as opposed to "libudev") + # indicates whether rules are supported. + (lib.mesonBool "udev_rules" (lib.elem "udev" udev.meta.pkgConfigModules)) ]; nativeBuildInputs = [ @@ -90,6 +97,8 @@ stdenv.mkDerivation rec { libgudev sane-backends sqlite + udev + ] ++ lib.optionals enableSystemd [ systemd ] ++ lib.optionals enableDaemon [ polkit diff --git a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix index b661d9866e..f070b028f6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix @@ -21,19 +21,22 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2024.9.2"; + version = "2024.10.0"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-i1lrolOrKwa9muXhoknLYATEfLSrVA63VrM3247hVMw="; + hash = "sha256-EdxCq/123OJm63NBfGnt5pfqdUXPti+NmbSVRu/gwqc="; }; - nativeBuildInputs = with python.pkgs; [ + build-systems = with python.pkgs; [ setuptools argcomplete + ]; + + nativeBuildInputs = [ installShellFiles ]; @@ -56,7 +59,7 @@ python.pkgs.buildPythonApplication rec { ''; # Remove esptool and platformio from requirements - ESPHOME_USE_SUBPROCESS = ""; + env.ESPHOME_USE_SUBPROCESS = ""; # esphome has optional dependencies it does not declare, they are # loaded when certain config blocks are used, like `font`, `image` @@ -64,7 +67,7 @@ python.pkgs.buildPythonApplication rec { # They have validation functions like: # - validate_cryptography_installed # - validate_pillow_installed - propagatedBuildInputs = with python.pkgs; [ + dependencies = with python.pkgs; [ aioesphomeapi argcomplete cairosvg @@ -79,9 +82,9 @@ python.pkgs.buildPythonApplication rec { pillow platformio protobuf + puremagic pyparsing pyserial - python-magic pyyaml requests ruamel-yaml @@ -97,7 +100,7 @@ python.pkgs.buildPythonApplication rec { # git is used in esphome/writer.py # inetutils is used in esphome/dashboard/status/ping.py "--prefix PATH : ${lib.makeBinPath [ platformio esptool git inetutils ]}" - "--prefix PYTHONPATH : ${python.pkgs.makePythonPath propagatedBuildInputs}" # will show better error messages + "--prefix PYTHONPATH : ${python.pkgs.makePythonPath dependencies}" # will show better error messages "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" "--set ESPHOME_USE_SUBPROCESS ''" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/expect/default.nix b/third_party/nixpkgs/pkgs/tools/misc/expect/default.nix index ffbfb3a641..e1ddab04bf 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/expect/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/expect/default.nix @@ -38,6 +38,11 @@ tcl.mkTclDerivation rec { nativeBuildInputs = [ autoreconfHook makeWrapper ]; strictDeps = true; + + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + }; + hardeningDisable = [ "format" ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/fcp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fcp/default.nix deleted file mode 100644 index 9d3a7c4074..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/fcp/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ expect, fetchFromGitHub, lib, rustPlatform, stdenv }: - -rustPlatform.buildRustPackage rec { - pname = "fcp"; - version = "0.2.1"; - - src = fetchFromGitHub { - owner = "svetlitski"; - repo = pname; - rev = "v${version}"; - sha256 = "0f242n8w88rikg1srimdifadhggrb2r1z0g65id60ahb4bjm8a0x"; - }; - - cargoHash = "sha256-iS3H87kTS7Iq0FhHE47zBOozPKC1mG9eHiATxp18hz8="; - - nativeBuildInputs = [ expect ]; - - # character_device fails with "File name too long" on darwin - doCheck = !stdenv.hostPlatform.isDarwin; - - postPatch = '' - patchShebangs tests/*.exp - ''; - - meta = with lib; { - description = "Significantly faster alternative to the classic Unix cp(1) command"; - homepage = "https://github.com/svetlitski/fcp"; - changelog = "https://github.com/svetlitski/fcp/releases/tag/v${version}"; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "fcp"; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/misc/hddtemp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hddtemp/default.nix index beaa9018d2..17313e8d17 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hddtemp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/hddtemp/default.nix @@ -22,6 +22,10 @@ stdenv.mkDerivation rec { "--with-db-path=${placeholder "out"}/share/hddtemp/hddtemp.db" ]; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + postInstall = '' install -Dm444 ${db} $out/share/hddtemp/hddtemp.db ''; diff --git a/third_party/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix index f62edf73e4..ea14221e42 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lokalise2-cli"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "lokalise"; repo = "lokalise-cli-2-go"; rev = "v${version}"; - sha256 = "sha256-woRFrw51F9f+dGTkEPuN9ushGfEDwR59uqZIv78PLHE="; + sha256 = "sha256-1pc3XBsBQr9xBFIVOWZnA4YlgFYwJJJyV05W67hXG8k="; }; - vendorHash = "sha256-SDI36+35yFy7Fp+VrnQMyIDUY1kM2tylwdS3I9E2vyk="; + vendorHash = "sha256-cN7YJDw5lOOngXJBeXa7V0Y/CjEydBMk3hvyfd0VL5I="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/man-db/default.nix b/third_party/nixpkgs/pkgs/tools/misc/man-db/default.nix index 9e717cad27..e88a189854 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/man-db/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/man-db/default.nix @@ -5,6 +5,7 @@ , gzip , lib , libiconv +, libiconvReal , libpipeline , makeWrapper , nixosTests @@ -28,8 +29,9 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ autoreconfHook groff makeWrapper pkg-config zstd ]; - buildInputs = [ libpipeline db groff ]; # (Yes, 'groff' is both native and build input) - nativeCheckInputs = [ libiconv /* for 'iconv' binary */ ]; + buildInputs = [ libpipeline db groff ] # (Yes, 'groff' is both native and build input) + ++ lib.optional stdenv.isFreeBSD libiconvReal; + nativeCheckInputs = [ (if stdenv.isFreeBSD then libiconvReal else libiconv) ]; # for 'iconv' binary; make very sure it matches buildinput libiconv patches = [ ./systemwide-man-db-conf.patch @@ -59,6 +61,8 @@ stdenv.mkDerivation rec { "ac_cv_func__set_invalid_parameter_handler=no" "ac_cv_func_posix_fadvise=no" "ac_cv_func_mempcpy=no" + ] ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ + "--enable-mandirs=" ]; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/mise/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mise/default.nix index ace598e053..6964083e63 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mise/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mise/default.nix @@ -1,18 +1,20 @@ -{ lib -, nix-update-script -, rustPlatform -, fetchFromGitHub -, installShellFiles -, stdenv -, coreutils -, bash -, pkg-config -, openssl -, direnv -, Security -, SystemConfiguration -, mise -, testers +{ + lib, + nix-update-script, + rustPlatform, + fetchFromGitHub, + installShellFiles, + stdenv, + coreutils, + bash, + pkg-config, + openssl, + direnv, + Security, + SystemConfiguration, + usage, + mise, + testers, }: rustPlatform.buildRustPackage rec { @@ -34,8 +36,16 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-jGqaGbue+AEK0YjhHMlm84XBgA20p8Um03TjctjXVz0="; - nativeBuildInputs = [ installShellFiles pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; + nativeBuildInputs = [ + installShellFiles + pkg-config + ]; + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + Security + SystemConfiguration + ]; postPatch = '' patchShebangs --build \ @@ -70,6 +80,10 @@ rustPlatform.buildRustPackage rec { postInstall = '' installManPage ./man/man1/mise.1 + substituteInPlace ./completions/{mise.bash,mise.fish,_mise} \ + --replace-fail '-v usage' '-v ${usage}/bin/usage' \ + --replace-fail 'usage complete-word' '${usage}/bin/usage complete-word' + installShellCompletion \ --bash ./completions/mise.bash \ --fish ./completions/mise.fish \ diff --git a/third_party/nixpkgs/pkgs/tools/misc/nb/default.nix b/third_party/nixpkgs/pkgs/tools/misc/nb/default.nix index 4cc68426ce..9d0b069104 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/nb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/nb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nb"; - version = "7.12.1"; + version = "7.14.4"; src = fetchFromGitHub { owner = "xwmx"; repo = "nb"; rev = version; - sha256 = "sha256-vy2WrFh4ukc6f0YFVaHvw0k1Wm9mdhh9p2MKLc/566U="; + sha256 = "sha256-YqqZZnin+aybAZ2dqaxdOrVZ7dLWwnjh2iL77orqHtE="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/opentsdb/default.nix b/third_party/nixpkgs/pkgs/tools/misc/opentsdb/default.nix index abce03cae0..c2156a88b3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/opentsdb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/opentsdb/default.nix @@ -55,7 +55,7 @@ let ]; hamcrest = [ (fetchMavenArtifact { - url = "https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"; + url = "mirror://maven/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"; groupId = "org.hamcrest"; artifactId = "hamcrest-core"; version = "1.3"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix index 7b9d9ac51e..a3fda66261 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , pkg-config , gtk-doc , gobject-introspection @@ -51,19 +50,6 @@ in stdenv.mkDerivation rec { sha256 = "sha256-Y8kZCCEzOsc3Pg2SPkwnZrJevc/fTvtEy1koxlidn8s="; }; - patches = lib.optionals stdenv.hostPlatform.isMusl [ - # > I guess my inclination here is to recommend that musl users - # > carry a downstream patch to revert the commits in #3175 until - # > such time as they can update to the new musl. - # https://github.com/ostreedev/ostree/issues/3200#issuecomment-1974819192 - (fetchpatch { - name = "revert-statx.diff"; - url = "https://github.com/ostreedev/ostree/commit/f46cc0cd85b564e40e03c7438a41c8e57f6b836c.diff"; - excludes = [ "ci/*" ]; - revert = true; - hash = "sha256-LsXbRYh4hfjNdt1S384IPlSvtC5f2rgSTZEkIIBkT0g="; - }) - ]; nativeBuildInputs = [ autoconf diff --git a/third_party/nixpkgs/pkgs/tools/misc/panoply/default.nix b/third_party/nixpkgs/pkgs/tools/misc/panoply/default.nix index 94ff8e10bb..78bd166a5f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/panoply/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/panoply/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "panoply"; - version = "5.5.2"; + version = "5.5.3"; src = fetchurl { url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz"; - hash = "sha256-ff7O3pW8/2CDXrd6CU+ygFeyNoGNCeTHIH7cdm+k8TE="; + hash = "sha256-TCuCLWMVp7t0JpHA6TbwUdURj/aBggzLa9I7llRY0TU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix b/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix index 6c7a371124..00e8b333a4 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "parallel"; - version = "20240722"; + version = "20240922"; src = fetchurl { url = "mirror://gnu/parallel/parallel-${version}.tar.bz2"; - hash = "sha256-xzNUcfd2ryi+qUZK2FpQ8u0SD3j7916tZkeu6o4OU/A="; + hash = "sha256-YyEHFei3xeEp4JjzM8183V/HovMl6OD7ntbtup8ay8Q="; }; outputs = [ "out" "man" "doc" ]; 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 7ad930221c..4eed616d78 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.32.0"; + version = "2.33.1"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-UZ+JvjENTxVJ9DQ/04v3rSCo22bW3s9KaKSGOwnr2IQ="; + sha256 = "sha256-F9uFw0SEUS0uH5cPPBFwx7mWQHX53EtQtauauH3/6p8="; }; - vendorHash = "sha256-+ej8+YXTWGAk/3cBoaCJtOQ6Fk0g5lwMrNmuMjApT6o="; + vendorHash = "sha256-1STRCr8zn6Hhj4Y/QHNo7QX/faN8V8AOmikflv8ipng="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pipectl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pipectl/default.nix index 6612826be2..1854e41409 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pipectl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pipectl/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "pipectl"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "Ferdi265"; repo = pname; rev = "v${version}"; - hash = "sha256-uBKHGR4kv62EMOIT/K+WbvFtdJ0V5IbsxjwQvhUu9f8="; + hash = "sha256-pNBw1ukNaqu40qPXnORUGApYpJ/0EAO9Tq5zAbDe33I="; }; nativeBuildInputs = [ cmake scdoc ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/qmk_hid/default.nix b/third_party/nixpkgs/pkgs/tools/misc/qmk_hid/default.nix index f838f1b8ec..f620dabb19 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/qmk_hid/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/qmk_hid/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "qmk_hid"; - version = "0.1.11"; + version = "0.1.12"; src = fetchFromGitHub { owner = "FrameworkComputer"; repo = "qmk_hid"; rev = "v${version}"; - hash = "sha256-k5cZcrjen7nNJM9mKQEwNTVfBPawXwbwNlCyTARdH/g="; + hash = "sha256-wJi7FQrvMbdTwvbbjBnzmxupMbEuM8TeZ0JIK5ulQKI="; }; - cargoHash = "sha256-GrerrNDoSFtOEAf0vB9MlkBl+yLnzd/szrpFsAmkB6s="; + cargoHash = "sha256-X8pBv4dFiiLDKDjyW3XpVOdzq5c5/4GcRL6jnJ8Rf1A="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/tools/misc/r3ctl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/r3ctl/default.nix index bc0c7837e2..df2665dfcf 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/r3ctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/r3ctl/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , qt5 , qtbase , qttools @@ -7,7 +8,7 @@ , fetchFromGitHub }: -qt5.mkDerivation { +stdenv.mkDerivation { pname = "r3ctl"; version = "a82cb5b3123224e706835407f21acea9dc7ab0f0"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/setconf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/setconf/default.nix deleted file mode 100644 index fd43ad6350..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/setconf/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib -, buildPythonApplication -, fetchFromGitHub -}: - -buildPythonApplication rec { - pname = "setconf"; - version = "0.7.7"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "xyproto"; - repo = "setconf"; - rev = version; - hash = "sha256-HYZdDtDlGrT3zssDdMW3559hhC+cPy8qkmM8d9zEa1A="; - }; - - meta = { - homepage = "https://github.com/xyproto/setconf"; - description = "Small utility for changing settings in configuration textfiles"; - changelog = "https://github.com/xyproto/setconf/releases/tag/${version}"; - maintainers = [ lib.maintainers.AndersonTorres ]; - mainProgram = "setconf"; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/misc/smug/default.nix b/third_party/nixpkgs/pkgs/tools/misc/smug/default.nix index e528b21287..8caf8e4b3f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/smug/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/smug/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "smug"; - version = "0.3.3"; + version = "0.3.5"; subPackages = [ "." ]; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "ivaaaan"; repo = "smug"; rev = "v${version}"; - sha256 = "sha256-dQp9Ov8Si9DfziVtX3dXsJg+BNKYOoL9/WwdalQ5TVw="; + sha256 = "sha256-5n4EmkcHv6pw1gd9VUtJRR3QdRJsu5DYYsozJ25uggs="; }; vendorHash = "sha256-vaDUzVRmpmNn8/vUPeR1U5N6T4llFRIk9A1lum8uauU="; diff --git a/third_party/nixpkgs/pkgs/tools/misc/stow/default.nix b/third_party/nixpkgs/pkgs/tools/misc/stow/default.nix index 143710e3da..eb1430fddc 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/stow/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/stow/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "stow"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { url = "mirror://gnu/stow/stow-${finalAttrs.version}.tar.bz2"; - hash = "sha256-p7rGc9qiRs9U/7SKET6t0gSmFWMOdrU7X2TYGidbd7M="; + hash = "sha256-DYWoUTZ355I2l7zkLNuzPStXr5FaveHQZx566Asu8LQ="; }; nativeBuildInputs = [ perlPackages.perl ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/tbls/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tbls/default.nix index 418ad24116..1a33f54335 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tbls/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tbls/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "tbls"; - version = "1.77.0"; + version = "1.78.0"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-knYAwmxqeHv1XBi/zHf7cOkcLXITGnX0tXlT8/Zs2YQ="; + hash = "sha256-vqt4IlVvqlUjDqvcdiRctt/VuEkZ5YzCXYHvHfc87Ew="; }; - vendorHash = "sha256-m5G0knHmPCz1pZ7LZ4i6Tyq+xSEq32mQFbXEdOY+6ec="; + vendorHash = "sha256-cnACY+NIjsVe6BU7AjTO+yLDn0f1HO1gHnw5SgqKuy4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/tlp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tlp/default.nix index 436e5ba480..8c2e3a9b79 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tlp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tlp/default.nix @@ -24,13 +24,13 @@ , networkmanager }: stdenv.mkDerivation rec { pname = "tlp"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "linrunner"; repo = "TLP"; rev = version; - hash = "sha256-CxO1KU7F6sT5D8vjKOmntjDxcieoRSHTvuSqXfplcHk="; + hash = "sha256-kjtszDLlnIkBi3yU/AyGSV8q7QBuZbDhsqJ8AvULb0M="; }; # XXX: See patch files for relevant explanations. @@ -100,7 +100,6 @@ $out/share/tlp/tlp-pcilist $out/share/tlp/tlp-readconfs $out/share/tlp/tlp-usblist - $out/share/tlp/tpacpi-bat ) for f in "''${fixup_perl[@]}"; do wrapProgram "$f" --prefix PATH : "${paths}" diff --git a/third_party/nixpkgs/pkgs/tools/misc/tlp/patches/0001-makefile-correctly-sed-paths.patch b/third_party/nixpkgs/pkgs/tools/misc/tlp/patches/0001-makefile-correctly-sed-paths.patch index 278cd0b1dd..46ac58f409 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tlp/patches/0001-makefile-correctly-sed-paths.patch +++ b/third_party/nixpkgs/pkgs/tools/misc/tlp/patches/0001-makefile-correctly-sed-paths.patch @@ -1,4 +1,4 @@ -From 5c5d878bf49bae5920c330482217477819ba9bc2 Mon Sep 17 00:00:00 2001 +From 6500d02a70572f94e7b7df4d70b391ac27ac8bcb Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 15 Oct 2021 23:22:50 -0700 Subject: [PATCH 1/2] makefile: correctly sed paths @@ -15,14 +15,14 @@ The reason DESTDIR is used at all, as opposed to the more appropriate PREFIX, is covered in the nix formula, and is (also) due to the Makefile being a bit "different." --- - Makefile | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) + Makefile | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile -index 8042517..1c436ad 100644 +index 41eb38d..df3abb7 100644 --- a/Makefile +++ b/Makefile -@@ -57,20 +57,20 @@ _TPACPIBAT = $(DESTDIR)$(TPACPIBAT) +@@ -57,17 +57,17 @@ _VAR = $(DESTDIR)$(TLP_VAR) SED = sed \ -e "s|@TLPVER@|$(TLPVER)|g" \ @@ -47,12 +47,8 @@ index 8042517..1c436ad 100644 + -e "s|@TLP_CONFDPR@|$(_CONFDPR)|g" \ + -e "s|@TLP_CONF@|$(_CONF)|g" \ -e "s|@TLP_RUN@|$(TLP_RUN)|g" \ - -e "s|@TLP_VAR@|$(TLP_VAR)|g" \ -- -e "s|@TPACPIBAT@|$(TPACPIBAT)|g" -+ -e "s|@TPACPIBAT@|$(_TPACPIBAT)|g" + -e "s|@TLP_VAR@|$(TLP_VAR)|g" - INFILES = \ - tlp \ -- -2.41.0 +2.44.1 diff --git a/third_party/nixpkgs/pkgs/tools/misc/tlp/patches/0002-reintroduce-tlp-sleep-service.patch b/third_party/nixpkgs/pkgs/tools/misc/tlp/patches/0002-reintroduce-tlp-sleep-service.patch index dfea1c6163..cb9330eba0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tlp/patches/0002-reintroduce-tlp-sleep-service.patch +++ b/third_party/nixpkgs/pkgs/tools/misc/tlp/patches/0002-reintroduce-tlp-sleep-service.patch @@ -1,4 +1,4 @@ -From a3506c9bc8929645b7b08859e47039b8cc830d22 Mon Sep 17 00:00:00 2001 +From 4ae0e860aa2c8c056379a7b6cc0f7a735de9ab12 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 15 Oct 2021 23:07:40 -0700 Subject: [PATCH 2/2] tlp-sleep.service: reintroduce @@ -18,10 +18,10 @@ systemd itself to not use the hook scripts. As per the manual: create mode 100644 tlp-sleep.service.in diff --git a/Makefile b/Makefile -index 1c436ad..fd5211b 100644 +index df3abb7..5a47001 100644 --- a/Makefile +++ b/Makefile -@@ -84,6 +84,7 @@ INFILES = \ +@@ -83,6 +83,7 @@ INFILES = \ tlp.rules \ tlp-readconfs \ tlp-run-on \ @@ -29,7 +29,7 @@ index 1c436ad..fd5211b 100644 tlp.service \ tlp-stat \ tlp.upstart \ -@@ -115,7 +116,6 @@ SHFILES = \ +@@ -114,7 +115,6 @@ SHFILES = \ tlp-rdw-udev.in \ tlp-rf.in \ tlp-run-on.in \ @@ -37,7 +37,7 @@ index 1c436ad..fd5211b 100644 tlp-sleep.elogind \ tlp-stat.in \ tlp-usb-udev.in \ -@@ -172,7 +172,7 @@ ifneq ($(TLP_NO_INIT),1) +@@ -170,7 +170,7 @@ ifneq ($(TLP_NO_INIT),1) endif ifneq ($(TLP_WITH_SYSTEMD),0) install -D -m 644 tlp.service $(_SYSD)/tlp.service @@ -46,15 +46,15 @@ index 1c436ad..fd5211b 100644 endif ifneq ($(TLP_WITH_ELOGIND),0) install -D -m 755 tlp-sleep.elogind $(_ELOD)/49-tlp-sleep -@@ -240,7 +240,7 @@ uninstall-tlp: +@@ -253,7 +253,7 @@ uninstall-tlp: rm $(_ULIB)/rules.d/85-tlp.rules rm -f $(_SYSV)/tlp rm -f $(_SYSD)/tlp.service - rm -f $(_SDSL)/tlp-sleep + rm -f $(_SYSD)/tlp-sleep.service rm -f $(_ELOD)/49-tlp-sleep + rm -f $(_SHCPL)/tlp rm -f $(_SHCPL)/tlp-stat - rm -f $(_SHCPL)/bluetooth diff --git a/tlp-sleep.service.in b/tlp-sleep.service.in new file mode 100644 index 0000000..79c202c @@ -81,5 +81,5 @@ index 0000000..79c202c +[Install] +WantedBy=sleep.target -- -2.41.0 +2.44.1 diff --git a/third_party/nixpkgs/pkgs/tools/misc/tmux-sessionizer/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tmux-sessionizer/default.nix index d8749c4115..e60ef9fb4c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tmux-sessionizer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tmux-sessionizer/default.nix @@ -11,7 +11,7 @@ let name = "tmux-sessionizer"; - version = "0.4.2"; + version = "0.4.3"; in rustPlatform.buildRustPackage { @@ -22,10 +22,10 @@ rustPlatform.buildRustPackage { owner = "jrmoulton"; repo = name; rev = "v${version}"; - hash = "sha256-n6DXqsq3TsNob/fEqeOwNTVLPAvCr7CDN9qtXAiOMWQ="; + hash = "sha256-wwu3h2eQrim/RbxTYqt+EnFmn0uD6PQzo1Xs1qCVQ3o="; }; - cargoHash = "sha256-e2U6x7HFoFbZxtJvY/ZpgEWagIrdRxPVZw2rP5aDIqg="; + cargoHash = "sha256-5OIiDz66GD3DrNKzxH+bpyweS7Ycn2IOf4f9mdHAaCo="; passthru.tests.version = testers.testVersion { package = tmux-sessionizer; diff --git a/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix b/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix index 85b24d1745..e077ed9bb2 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 = "16.0.0"; + version = "16.0.1"; src = fetchFromGitHub { owner = "topgrade-rs"; repo = "topgrade"; rev = "v${version}"; - hash = "sha256-MYilhVUaf5+gsRNv3tJm5UL8mH2T49r8jLPkd4vHRTw="; + hash = "sha256-/zSr6PEtfzLI/c32KrBlfHPja34T5DyiiR5a1/GDH/0="; }; - cargoHash = "sha256-RP86Wk4rsM6MBH6zAiZ5JqQhkm0HCEMFrUj9ULqB978="; + cargoHash = "sha256-ANmVdT0irhD3d6E4yNBOWqex3ApdfWgmQHxhGKsI4jA="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/tools/misc/trillian/default.nix b/third_party/nixpkgs/pkgs/tools/misc/trillian/default.nix index 9f0cfb4d51..90017e2186 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/trillian/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/trillian/default.nix @@ -27,6 +27,6 @@ buildGoModule rec { homepage = "https://github.com/google/trillian"; description = "Transparent, highly scalable and cryptographically verifiable data store"; license = [ licenses.asl20 ]; - maintainers = [ maintainers.adisbladis ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/vrc-get/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vrc-get/default.nix index a458e6c309..f0d72de83d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vrc-get/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/vrc-get/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "vrc-get"; - version = "1.8.1"; + version = "1.8.2"; src = fetchCrate { inherit pname version; - hash = "sha256-j8B7g/w1Qtiuj099RlRLmrYTFiE7d2vVg/nTbaa8pRU="; + hash = "sha256-4ZiN9sl4VImb3ufF6L9k5t45tmV1RUSvm3NL52waj0o="; }; nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; - cargoHash = "sha256-WFGY5osZIEYeHQchvuE3ddeqh2wzfZNV+SGqW08zYDI="; + cargoHash = "sha256-uPx9sujuvBp6wJzzqVlS8Rq1S9Cb2su9/gp4pnNJ9zQ="; # Execute the resulting binary to generate shell completions, using emulation if necessary when cross-compiling. # If no emulator is available, then give up on generating shell completions 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 ebfa6875a6..ff4c2a198a 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.217.0"; + version = "1.219.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-nxfYoR0ba0As00WbahSVFNItSlleMmITqs8eJabjD/U="; + hash = "sha256-9FAq6wcTXXFdQ5kcpkj2KqTcd8C8zXmhRWW/ajCJUMI="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-mBSRJYSE3HmeWhnW4nFF8uFnUJaZ6wdqsq+GnL6SZWc="; + cargoHash = "sha256-moBRkUbcIGZaVdcE3yDtREtG4unN4n5yA7edpnrUFg4="; cargoBuildFlags = [ "--package" "wasm-tools" ]; cargoTestFlags = [ "--all" ] ++ # Due to https://github.com/bytecodealliance/wasm-tools/issues/1820 diff --git a/third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix b/third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix index 7ff660e824..75fb358ce4 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "z-lua"; - version = "1.8.18"; + version = "1.8.19"; src = fetchFromGitHub { owner = "skywind3000"; repo = "z.lua"; rev = version; - sha256 = "sha256-QSwZhdBXO+x4vcwRnZjdYdIdWW0Nfu0oImftUgm4wyo="; + sha256 = "sha256-XGDnEKyuvoDzaJINV8ePafKfePc3fYP6vQMqtH1yo4k="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/zabbix-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/zabbix-cli/default.nix deleted file mode 100644 index 49f8d504d7..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/zabbix-cli/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, fetchFromGitHub -, python3 -}: - -python3.pkgs.buildPythonApplication rec { - pname = "zabbix-cli"; - version = "2.3.2"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "usit-gd"; - repo = "zabbix-cli"; - rev = "refs/tags/${version}"; - sha256 = "sha256-B5t/vxCmPdRR9YKOc2htI57Kmk1ZrpwPUln4JoUrK6g="; - }; - - propagatedBuildInputs = with python3.pkgs; [ - packaging - requests - ]; - - nativeCheckInputs = with python3.pkgs; [ - pytestCheckHook - ]; - - disabledTests = [ - # TypeError: option values must be strings - "test_descriptor_del" - "test_initialize" - ]; - - meta = with lib; { - description = "Command-line interface for Zabbix"; - homepage = "https://github.com/unioslo/zabbix-cli"; - license = licenses.gpl3Plus; - maintainers = [ ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/networking/burpsuite/default.nix b/third_party/nixpkgs/pkgs/tools/networking/burpsuite/default.nix index 8bf1f080f2..0880780eb6 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/burpsuite/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/burpsuite/default.nix @@ -9,20 +9,20 @@ }: let - version = "2024.8.2"; + version = "2024.8.4"; product = if proEdition then { productName = "pro"; productDesktop = "Burp Suite Professional Edition"; - hash = "sha256-8CCe/x++0djfLPc/hgDl4hkKexpIcf1tVU7c+kKXdBo="; + hash = "sha256-JWG0iNnQJgMqNsMSZIzFCmss6JhvZ9r7lFHuX46+3Mg="; } else { productName = "community"; productDesktop = "Burp Suite Community Edition"; - hash = "sha256-amaDDHIsdX+8j8ELbFu/etaXWS04XsrHGslJeg04uKU="; + hash = "sha256-a+TozSXpwyBlxPztASb4fqGZGn8Asg2/GxKzhIpEuyE="; }; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/tools/networking/chrony/default.nix b/third_party/nixpkgs/pkgs/tools/networking/chrony/default.nix deleted file mode 100644 index b18cc56422..0000000000 --- a/third_party/nixpkgs/pkgs/tools/networking/chrony/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config -, gnutls, libedit, nspr, nss, readline, texinfo -, libcap, libseccomp, pps-tools -, nixosTests -}: - -stdenv.mkDerivation rec { - pname = "chrony"; - version = "4.5"; - - src = fetchurl { - url = "https://download.tuxfamily.org/chrony/${pname}-${version}.tar.gz"; - hash = "sha256-Gf4dn0Zk1EWmmpbHHo/bYLzY3yTHPROG4CKH9zZq1CI="; - }; - - outputs = [ "out" "man" ]; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ gnutls libedit nspr nss readline texinfo ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap libseccomp pps-tools ]; - - configureFlags = [ - "--enable-ntp-signd" - "--sbindir=$(out)/bin" - "--chronyrundir=/run/chrony" - ] ++ lib.optional stdenv.hostPlatform.isLinux "--enable-scfilter"; - - patches = [ - # Cleanup the installation script - ./makefile.patch - ]; - - postPatch = '' - patchShebangs test - ''; - - hardeningEnable = [ "pie" ]; - - passthru.tests = { inherit (nixosTests) chrony chrony-ptp; }; - - meta = with lib; { - description = "Sets your computer's clock from time servers on the Net"; - homepage = "https://chrony.tuxfamily.org/"; - license = licenses.gpl2Only; - platforms = with platforms; linux ++ freebsd ++ openbsd; - maintainers = with maintainers; [ fpletz thoughtpolice ]; - - longDescription = '' - Chronyd is a daemon which runs in background on the system. It obtains - measurements via the network of the system clock’s offset relative to - time servers on other systems and adjusts the system time accordingly. - For isolated systems, the user can periodically enter the correct time by - hand (using Chronyc). In either case, Chronyd determines the rate at - which the computer gains or loses time, and compensates for this. Chronyd - implements the NTP protocol and can act as either a client or a server. - - Chronyc provides a user interface to Chronyd for monitoring its - performance and configuring various settings. It can do so while running - on the same computer as the Chronyd instance it is controlling or a - different computer. - ''; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/networking/cloudflare-warp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/cloudflare-warp/default.nix index c36ec7c947..fb03bee688 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/cloudflare-warp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/cloudflare-warp/default.nix @@ -11,7 +11,7 @@ , makeWrapper , nftables , nss -, openssl_3_2 +, openssl }: stdenv.mkDerivation rec { @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { dbus gtk3 libpcap - openssl_3_2 + openssl nss stdenv.cc.cc.lib ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix b/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix index d719c3f9b0..ce301d0e34 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.11"; + version = "10.0.13"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - hash = "sha256-vW67Q/11BPRHkDA1m99+PdxQUoylMt2sx6gZFEzgSNY="; + hash = "sha256-GrdJAXHdkJYB+k2RexcCWhIhxY9UNY9IVJbzlLKDcKA="; }; - vendorHash = "sha256-eejDwlovkGLENvNywtFPmqKcwqr+HB+oURL/sDfhOuA="; + vendorHash = "sha256-gTSc2mDNt7K954GXxUjjxPR0NkZwSTCjQDQ9x57ookw="; subPackages = [ "." ]; @@ -38,7 +38,7 @@ buildGoModule rec { ''; homepage = "https://github.com/schollz/croc"; license = licenses.mit; - maintainers = with maintainers; [ hugoreeves equirosa SuperSandro2000 ]; + maintainers = with maintainers; [ equirosa SuperSandro2000 ]; mainProgram = "croc"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix b/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix index 567ddcbf7d..e00aecd50a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix @@ -202,6 +202,7 @@ stdenv.mkDerivation (finalAttrs: { inherit opensslSupport openssl; tests = { withCheck = finalAttrs.finalPackage.overrideAttrs (_: { doCheck = true; }); + fetchpatch = tests.fetchpatch.simple.override { fetchpatch = (fetchpatch.override { fetchurl = useThisCurl fetchurl; }) // { version = 1; }; }; curlpp = useThisCurl curlpp; coeurl = useThisCurl coeurl; haskell-curl = useThisCurl haskellPackages.curl; @@ -215,8 +216,6 @@ stdenv.mkDerivation (finalAttrs: { pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; } // lib.optionalAttrs (stdenv.hostPlatform.system != "x86_64-darwin") { static = pkgsStatic.curl; - } // lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) { - fetchpatch = tests.fetchpatch.simple.override { fetchpatch = (fetchpatch.override { fetchurl = useThisCurl fetchurl; }) // { version = 1; }; }; }; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dae/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dae/default.nix index de31e4dff2..4b26a77eca 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dae/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dae/default.nix @@ -4,21 +4,21 @@ fetchFromGitHub, buildGoModule, nixosTests, - gitUpdater, + nix-update-script, }: buildGoModule rec { pname = "dae"; - version = "0.7.4"; + version = "0.8.0"; src = fetchFromGitHub { owner = "daeuniverse"; repo = "dae"; rev = "v${version}"; - hash = "sha256-bJ/a/SCNCutQDbmxPp36SYY7qhji2XRv6awp7buZVc0="; + hash = "sha256-Vdh5acE5i/bJ8VXOm+9OqZQbxvqv4TS/t0DDfBs/K5g="; fetchSubmodules = true; }; - vendorHash = "sha256-CVQTBJDwu7AYz6q0MnFPMINRShcnS1JOGqH+Ro4lIRo="; + vendorHash = "sha256-0Q+1cXUu4EH4qkGlK6BIpv4dCdtSKjb1RbLi5Xfjcew="; proxyVendor = true; @@ -52,9 +52,7 @@ buildGoModule rec { inherit (nixosTests) dae; }; - passthru.updateScript = gitUpdater { - rev-prefix = "v"; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Linux high-performance transparent proxy solution based on eBPF"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/davix/default.nix b/third_party/nixpkgs/pkgs/tools/networking/davix/default.nix index 209b4e9d7a..55c0355770 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/davix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/davix/default.nix @@ -10,6 +10,7 @@ , libuuid , curl , gsoap +, rapidjson , Security , enableTools ? true # Use libcurl instead of libneon @@ -30,10 +31,11 @@ stdenv.mkDerivation rec { pname = "davix" + lib.optionalString enableThirdPartyCopy "-copy"; nativeBuildInputs = [ cmake pkg-config python3 ]; buildInputs = [ - openssl - libxml2 boost curl + libxml2 + openssl + rapidjson ] ++ lib.optional stdenv.hostPlatform.isDarwin Security ++ lib.optional (!stdenv.hostPlatform.isDarwin) libuuid diff --git a/third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix index d07cc72bed..5d5e4a0b32 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix @@ -7,7 +7,7 @@ , runtimeShellPackage , runtimeShell , nixosTests -, enablePrivSep ? true +, enablePrivSep ? false }: stdenv.mkDerivation rec { @@ -38,30 +38,22 @@ stdenv.mkDerivation rec { configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" - ] - ++ ( - if ! enablePrivSep - then [ "--disable-privsep" ] - else [ - "--enable-privsep" - # dhcpcd disables privsep if it can't find the default user, - # so we explicitly specify a user. - "--privsepuser=dhcpcd" - ] - ); + "--disable-privsep" + "--dbdir=/var/lib/dhcpcd" + (lib.enableFeature enablePrivSep "privsep") + ] ++ lib.optional enablePrivSep "--privsepuser=dhcpcd"; makeFlags = [ "PREFIX=${placeholder "out"}" ]; - # Hack to make installation succeed. dhcpcd will still use /var/db + # Hack to make installation succeed. dhcpcd will still use /var/lib # at runtime. installFlags = [ "DBDIR=$(TMPDIR)/db" "SYSCONFDIR=${placeholder "out"}/etc" ]; # Check that the udev plugin got built. postInstall = lib.optionalString (udev != null && stdenv.hostPlatform.isLinux) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]"; - passthru = { - inherit enablePrivSep; - tests = { inherit (nixosTests.networking.scripted) macvlan dhcpSimple dhcpOneIf; }; + passthru.tests = { + inherit (nixosTests.networking.scripted) macvlan dhcpSimple dhcpOneIf; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/networking/edgedb/Cargo.lock b/third_party/nixpkgs/pkgs/tools/networking/edgedb/Cargo.lock index 16d6440458..1b6d03c166 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/edgedb/Cargo.lock +++ b/third_party/nixpkgs/pkgs/tools/networking/edgedb/Cargo.lock @@ -40,6 +40,18 @@ dependencies = [ "cpufeatures", ] +[[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" @@ -50,10 +62,16 @@ dependencies = [ ] [[package]] -name = "ansi-escapes" -version = "0.1.1" +name = "allocator-api2" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e3c0daaaae24df5995734b689627f8fa02101bc5bbc768be3055b66a010d7af" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + +[[package]] +name = "ansi-escapes" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10b98e9c74265950a28ae39c02e290858714c23071ab4f71c61d2908e2edfe44" [[package]] name = "anstream" @@ -116,6 +134,15 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74d9f7083455f1a474276ccd32374958d2cb591024aac45101c7623b10271347" +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] + [[package]] name = "arc-swap" version = "1.7.1" @@ -144,7 +171,7 @@ dependencies = [ "bstr", "doc-comment", "libc", - "predicates 3.1.2", + "predicates", "predicates-core", "predicates-tree", "wait-timeout", @@ -234,7 +261,7 @@ dependencies = [ "futures-lite 2.3.0", "parking", "polling 3.7.3", - "rustix 0.38.35", + "rustix 0.38.36", "slab", "tracing", "windows-sys 0.59.0", @@ -303,13 +330,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -356,12 +383,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" -[[package]] -name = "base32" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa" - [[package]] name = "base32" version = "0.5.1" @@ -380,12 +401,6 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - [[package]] name = "bigdecimal" version = "0.4.5" @@ -432,7 +447,7 @@ checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" dependencies = [ "arrayref", "arrayvec", - "constant_time_eq 0.3.1", + "constant_time_eq", ] [[package]] @@ -445,7 +460,7 @@ dependencies = [ "arrayvec", "cc", "cfg-if", - "constant_time_eq 0.3.1", + "constant_time_eq", ] [[package]] @@ -522,9 +537,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.15" +version = "1.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" +checksum = "e9d013ecb737093c0e86b151a7b837993cf9ec6c502946cfb44bedc392421e0b" dependencies = [ "jobserver", "libc", @@ -570,21 +585,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.25" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" -dependencies = [ - "bitflags 1.3.2", - "clap_lex 0.2.4", - "indexmap 1.9.3", - "textwrap", -] - -[[package]] -name = "clap" -version = "4.5.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" +checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" dependencies = [ "clap_builder", "clap_derive", @@ -592,33 +595,24 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.15" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" dependencies = [ "anstream", "anstyle", - "clap_lex 0.7.2", - "strsim 0.11.1", - "terminal_size 0.3.0", + "clap_lex", + "strsim", + "terminal_size", ] [[package]] name = "clap_complete" -version = "3.2.5" +version = "4.5.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f7a2e0a962c45ce25afce14220bc24f9dade0a1787f185cecf96bfba7847cd8" +checksum = "205d5ef6d485fa47606b98b0ddc4ead26eb850aaa86abfb562a94fb3280ecba0" dependencies = [ - "clap 3.2.25", -] - -[[package]] -name = "clap_complete" -version = "4.5.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7db6eca8c205649e8d3ccd05aa5042b1800a784e56bc7c43524fde8abbfa9b" -dependencies = [ - "clap 4.5.16", + "clap", ] [[package]] @@ -627,29 +621,10 @@ version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", - "syn 2.0.76", -] - -[[package]] -name = "clap_generate" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e1b28c4a802ac3628604fd267cac62aaea74dc61af3410db6b1c44c03b42599" -dependencies = [ - "clap 3.2.25", - "clap_complete 3.2.5", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", + "syn 2.0.77", ] [[package]] @@ -670,6 +645,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "clipboard-win" +version = "5.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" +dependencies = [ + "error-code", +] + [[package]] name = "codespan-reporting" version = "0.11.1" @@ -698,7 +682,7 @@ dependencies = [ "nom", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -709,9 +693,9 @@ checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "colorful" -version = "0.2.2" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97af0562545a7d7f3d9222fcf909963bec36dcb502afaacab98c6ffac8da47ce" +checksum = "ffb474a9c3219a8254ead020421ecf1b90427f29b55f6aae9a2471fa62c126ef" [[package]] name = "combine" @@ -761,12 +745,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - [[package]] name = "constant_time_eq" version = "0.3.1" @@ -775,9 +753,9 @@ checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "coolor" -version = "0.5.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4d7a805ca0d92f8c61a31c809d4323fdaa939b0b440e544d21db7797c5aaad" +checksum = "691defa50318376447a73ced869862baecfab35f6aabaa91a4cd726b315bfe1a" dependencies = [ "crossterm", ] @@ -799,14 +777,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] -name = "cpufeatures" -version = "0.2.13" +name = "core2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" +dependencies = [ + "memchr", +] + +[[package]] +name = "cpufeatures" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] +[[package]] +name = "crc" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + [[package]] name = "crc16" version = "0.4.0" @@ -822,6 +824,32 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "crokey" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520e83558f4c008ac06fa6a86e5c1d4357be6f994cce7434463ebcdaadf47bb1" +dependencies = [ + "crokey-proc_macros", + "crossterm", + "once_cell", + "serde", + "strict", +] + +[[package]] +name = "crokey-proc_macros" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "370956e708a1ce65fe4ac5bb7185791e0ece7485087f17736d54a23a0895049f" +dependencies = [ + "crossterm", + "proc-macro2", + "quote", + "strict", + "syn 1.0.109", +] + [[package]] name = "crossbeam" version = "0.8.4" @@ -880,15 +908,15 @@ checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crossterm" -version = "0.23.2" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2102ea4f781910f8a5b98dd061f4c2023f479ce7bb1236330099ceb5a93cf17" +checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "crossterm_winapi", - "libc", - "mio 0.8.11", + "mio 1.0.2", "parking_lot 0.12.3", + "rustix 0.38.36", "signal-hook", "signal-hook-mio", "winapi", @@ -923,6 +951,18 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "dary_heap" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7762d17f1241643615821a8455a0b2c3e803784b058693d990b11f2dce25a0ca" + +[[package]] +name = "deflate64" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b" + [[package]] name = "deranged" version = "0.3.11" @@ -932,6 +972,17 @@ dependencies = [ "powerfmt", ] +[[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.77", +] + [[package]] name = "diff" version = "0.1.13" @@ -955,22 +1006,13 @@ dependencies = [ "subtle", ] -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys 0.3.7", -] - [[package]] name = "dirs" version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" dependencies = [ - "dirs-sys 0.4.1", + "dirs-sys", ] [[package]] @@ -983,17 +1025,6 @@ dependencies = [ "dirs-sys-next", ] -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - [[package]] name = "dirs-sys" version = "0.4.1" @@ -1017,6 +1048,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + [[package]] name = "dissimilar" version = "1.0.9" @@ -1037,7 +1079,7 @@ checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "edgedb-cli" -version = "5.3.0" +version = "5.4.1" dependencies = [ "ansi-escapes", "anyhow", @@ -1045,26 +1087,25 @@ dependencies = [ "assert_cmd", "async-listen", "backtrace", - "base32 0.4.0", - "base64 0.21.7", + "base32", + "base64 0.22.1", "bigdecimal", - "bitflags 1.3.2", + "bitflags 2.6.0", "bitvec", "blake2b_simd", "blake3", "bytes", "chrono", - "clap 4.5.16", - "clap_complete 4.5.24", + "clap", + "clap_complete", "clicolors-control", "codespan-reporting", "color-print", "colorful", "combine", "crossbeam-utils", - "crossterm", "ctrlc", - "dirs 4.0.0", + "dirs", "dissimilar", "downcast-rs", "edgedb-cli-derive", @@ -1073,8 +1114,8 @@ dependencies = [ "edgedb-protocol", "edgedb-tokio", "edgeql-parser", - "env_logger 0.10.2", - "fd-lock 3.0.13", + "env_logger", + "fd-lock", "fn-error-context", "fs-err", "fs_extra", @@ -1084,7 +1125,7 @@ dependencies = [ "humantime", "humantime-serde", "immutable-chunkmap", - "indexmap 2.0.0-pre", + "indexmap", "indicatif", "is-terminal", "libc", @@ -1092,7 +1133,7 @@ dependencies = [ "log", "minimad", "native-tls", - "nix 0.26.4", + "nix 0.29.0", "nom", "notify", "num-bigint", @@ -1101,7 +1142,7 @@ dependencies = [ "openssl", "os-release", "pem", - "predicates 2.1.5", + "predicates", "pretty_assertions", "prettytable-rs", "rand", @@ -1127,21 +1168,21 @@ dependencies = [ "shell-escape", "shutdown_hooks", "signal-hook", - "snafu 0.7.5", - "strsim 0.10.0", + "snafu", + "strsim", "tar", "tempfile", - "term", + "term 1.0.0", "termcolor", "termimad", - "terminal_size 0.2.6", + "terminal_size", "test-case", "test-utils", "textwrap", "thiserror", "tokio", "tokio-stream", - "toml 0.5.11", + "toml", "tracing", "unicode-segmentation", "unicode-width", @@ -1156,21 +1197,20 @@ dependencies = [ "winreg", "wslapi", "zip", - "zstd 0.12.4", + "zstd", ] [[package]] name = "edgedb-cli-derive" version = "0.4.0" dependencies = [ - "clap 4.5.16", - "clap_generate", - "heck 0.4.1", - "indexmap 2.0.0-pre", + "clap", + "heck", + "indexmap", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.77", "termimad", "trybuild", ] @@ -1178,18 +1218,18 @@ dependencies = [ [[package]] name = "edgedb-derive" version = "0.5.2" -source = "git+https://github.com/edgedb/edgedb-rust/#9025de8e629584d91aa91135ab7d81712aa66534" +source = "git+https://github.com/edgedb/edgedb-rust/#42c94da5b286d40195a02be55dda679d12115d47" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", "trybuild", ] [[package]] name = "edgedb-errors" version = "0.4.2" -source = "git+https://github.com/edgedb/edgedb-rust/#9025de8e629584d91aa91135ab7d81712aa66534" +source = "git+https://github.com/edgedb/edgedb-rust/#42c94da5b286d40195a02be55dda679d12115d47" dependencies = [ "bytes", ] @@ -1197,7 +1237,7 @@ dependencies = [ [[package]] name = "edgedb-protocol" version = "0.6.1" -source = "git+https://github.com/edgedb/edgedb-rust/#9025de8e629584d91aa91135ab7d81712aa66534" +source = "git+https://github.com/edgedb/edgedb-rust/#42c94da5b286d40195a02be55dda679d12115d47" dependencies = [ "bigdecimal", "bitflags 2.6.0", @@ -1206,14 +1246,14 @@ dependencies = [ "edgedb-errors", "num-bigint", "num-traits", - "snafu 0.8.4", + "snafu", "uuid", ] [[package]] name = "edgedb-tokio" version = "0.5.1" -source = "git+https://github.com/edgedb/edgedb-rust/#9025de8e629584d91aa91135ab7d81712aa66534" +source = "git+https://github.com/edgedb/edgedb-rust/#42c94da5b286d40195a02be55dda679d12115d47" dependencies = [ "anyhow", "arc-swap", @@ -1222,7 +1262,7 @@ dependencies = [ "base64 0.22.1", "bytes", "crc16", - "dirs 5.0.1", + "dirs", "edgedb-derive", "edgedb-errors", "edgedb-protocol", @@ -1250,19 +1290,19 @@ dependencies = [ [[package]] name = "edgeql-parser" version = "0.1.0" -source = "git+https://github.com/edgedb/edgedb#9d6f484ea8a14a7d1f10c7a334c765fa34924337" +source = "git+https://github.com/edgedb/edgedb#9f0195ea2d1b568abf6e56e462734614e1c17419" dependencies = [ "append-only-vec", - "base32 0.5.1", + "base32", "bigdecimal", "bumpalo", - "indexmap 2.5.0", + "indexmap", "memchr", "num-bigint", "phf", "serde_json", "sha2", - "snafu 0.8.4", + "snafu", "thiserror", "unicode-width", ] @@ -1310,19 +1350,6 @@ dependencies = [ "regex", ] -[[package]] -name = "env_logger" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] - [[package]] name = "env_logger" version = "0.11.5" @@ -1352,6 +1379,12 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "error-code" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" + [[package]] name = "event-listener" version = "2.5.3" @@ -1396,23 +1429,13 @@ checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fd-lock" -version = "2.0.0" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0010f02effd88c702318c5dde0463206be67495d0b4d906ba7c0a8f166cc7f06" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "fd-lock" -version = "3.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5" +checksum = "7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947" dependencies = [ "cfg-if", - "rustix 0.38.35", - "windows-sys 0.48.0", + "rustix 0.38.36", + "windows-sys 0.52.0", ] [[package]] @@ -1454,7 +1477,7 @@ checksum = "2cd66269887534af4b0c3e3337404591daa8dc8b9b2b3db71f9523beb4bafb41" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -1601,7 +1624,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -1646,12 +1669,12 @@ dependencies = [ [[package]] name = "gethostname" -version = "0.4.3" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" +checksum = "dc3655aa6818d65bc620d6911f05aa7b6aeb596291e1e9f79e52df85583d1e30" dependencies = [ - "libc", - "windows-targets 0.48.5", + "rustix 0.38.36", + "windows-targets 0.52.6", ] [[package]] @@ -1703,7 +1726,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.5.0", + "indexmap", "slab", "tokio", "tokio-util", @@ -1722,30 +1745,22 @@ dependencies = [ "futures-core", "futures-sink", "http 1.1.0", - "indexmap 2.5.0", + "indexmap", "slab", "tokio", "tokio-util", "tracing", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" - [[package]] name = "hashbrown" version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", + "allocator-api2", +] [[package]] name = "headers" @@ -1771,12 +1786,6 @@ dependencies = [ "http 0.2.12", ] -[[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" @@ -1961,9 +1970,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", "http 1.1.0", @@ -2024,32 +2033,11 @@ dependencies = [ [[package]] name = "immutable-chunkmap" -version = "1.0.5" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7617eb072b88069788fa9d5cadae34faebca64e5325ec5deaa2b4c96510f9e8c" +checksum = "4419f022e55cc63d5bbd6b44b71e1d226b9c9480a47824c706e9d54e5c40c5eb" dependencies = [ "arrayvec", - "packed_struct", - "packed_struct_codegen", -] - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "indexmap" -version = "2.0.0-pre" -source = "git+https://github.com/bluss/indexmap?rev=11ac52c#11ac52c3c828a42d69c5fb3248198511836bfd2f" -dependencies = [ - "hashbrown 0.13.2", - "serde", ] [[package]] @@ -2059,7 +2047,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown", + "serde", ] [[package]] @@ -2133,6 +2122,15 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +[[package]] +name = "is-docker" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" +dependencies = [ + "once_cell", +] + [[package]] name = "is-terminal" version = "0.4.13" @@ -2144,21 +2142,22 @@ dependencies = [ "windows-sys 0.52.0", ] +[[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 = "is_terminal_polyfill" version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "1.0.11" @@ -2212,6 +2211,29 @@ dependencies = [ "log", ] +[[package]] +name = "lazy-regex" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d8e41c97e6bc7ecb552016274b99fbb5d035e8de288c582d9b933af6677bfda" +dependencies = [ + "lazy-regex-proc_macros", + "once_cell", + "regex", +] + +[[package]] +name = "lazy-regex-proc_macros" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76e1d8b05d672c53cb9c7b920bbba8783845ae4f0b076e02a3db1d02c81b4163" +dependencies = [ + "proc-macro2", + "quote", + "regex", + "syn 2.0.77", +] + [[package]] name = "lazy_static" version = "1.5.0" @@ -2226,21 +2248,25 @@ checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libflate" -version = "1.4.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ff4ae71b685bbad2f2f391fe74f6b7659a34871c08b210fdc039e43bee07d18" +checksum = "45d9dfdc14ea4ef0900c1cddbc8dcd553fbaacd8a4a282cf4018ae9dd04fb21e" dependencies = [ "adler32", + "core2", "crc32fast", + "dary_heap", "libflate_lz77", ] [[package]] name = "libflate_lz77" -version = "1.2.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a52d3a8bfc85f250440e4424db7d857e241a3aebbbe301f3eb606ab15c39acbf" +checksum = "e6e0d73b369f386f1c44abd9c570d5318f55ccde816ff4b562fa452e5182863d" dependencies = [ + "core2", + "hashbrown", "rle-decode-fast", ] @@ -2283,6 +2309,12 @@ dependencies = [ "scopeguard", ] +[[package]] +name = "lockfree-object-pool" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" + [[package]] name = "log" version = "0.4.22" @@ -2292,6 +2324,16 @@ dependencies = [ "value-bag", ] +[[package]] +name = "lzma-rs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" +dependencies = [ + "byteorder", + "crc", +] + [[package]] name = "memchr" version = "2.7.4" @@ -2331,9 +2373,9 @@ checksum = "fc0a023a2715164b8a15b7f91a4baa3decc92158a539b96bf0bdb61f18c69366" [[package]] name = "minimad" -version = "0.9.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "277639f0198568f70f8fe4ab88a52a67c96bca12f27ba5c17a76acdcb8b45834" +checksum = "a9c5d708226d186590a7b6d4a9780e2bdda5f689e0d58cd17012a298efd745d2" dependencies = [ "once_cell", ] @@ -2382,6 +2424,7 @@ checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ "hermit-abi 0.3.9", "libc", + "log", "wasi", "windows-sys 0.52.0", ] @@ -2478,20 +2521,21 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] name = "notify" -version = "5.2.0" +version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729f63e1ca555a43fe3efa4f3efdf4801c479da85b432242a7b726f353c88486" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "crossbeam-channel", "filetime", "fsevent-sys", "inotify", "kqueue", "libc", + "log", "mio 0.8.11", "walkdir", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -2552,12 +2596,13 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "open" -version = "3.2.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8" +checksum = "61a877bf6abd716642a53ef1b89fb498923a4afca5c754f9050b4d081c05c4b3" dependencies = [ + "is-wsl", + "libc", "pathdiff", - "windows-sys 0.42.0", ] [[package]] @@ -2583,7 +2628,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -2594,9 +2639,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.3.1+3.3.1" +version = "300.3.2+3.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91" +checksum = "a211a18d945ef7e648cc6e0058f4c548ee46aab922ea203e0d30e966ea23647b" dependencies = [ "cc", ] @@ -2629,33 +2674,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "os_str_bytes" -version = "6.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" - -[[package]] -name = "packed_struct" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36b29691432cc9eff8b282278473b63df73bea49bc3ec5e67f31a3ae9c3ec190" -dependencies = [ - "bitvec", - "packed_struct_codegen", -] - -[[package]] -name = "packed_struct_codegen" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cd6706dfe50d53e0f6aa09e12c034c44faacd23e966ae5a209e8bdb8f179f98" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "parking" version = "2.2.0" @@ -2710,17 +2728,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "rand_core", - "subtle", -] - [[package]] name = "pathdiff" version = "0.2.1" @@ -2729,14 +2736,12 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] name = "pbkdf2" -version = "0.11.0" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ "digest", "hmac", - "password-hash", - "sha2", ] [[package]] @@ -2785,7 +2790,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -2814,7 +2819,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -2872,7 +2877,7 @@ dependencies = [ "concurrent-queue", "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.35", + "rustix 0.38.36", "tracing", "windows-sys 0.59.0", ] @@ -2898,20 +2903,6 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "predicates" -version = "2.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" -dependencies = [ - "difflib", - "float-cmp", - "itertools", - "normalize-line-endings", - "predicates-core", - "regex", -] - [[package]] name = "predicates" version = "3.1.2" @@ -2920,7 +2911,10 @@ checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97" dependencies = [ "anstyle", "difflib", + "float-cmp", + "normalize-line-endings", "predicates-core", + "regex", ] [[package]] @@ -2958,7 +2952,7 @@ dependencies = [ "encode_unicode 1.0.0", "is-terminal", "lazy_static", - "term", + "term 0.7.0", "unicode-width", ] @@ -2971,7 +2965,6 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn 1.0.109", "version_check", ] @@ -3065,15 +3058,6 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.5.3" @@ -3256,14 +3240,23 @@ checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" [[package]] name = "rpassword" -version = "6.0.1" +version = "7.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf099a1888612545b683d2661a1940089f6c2e5a8e38979b2159da876bfd956" +checksum = "80472be3c897911d0137b2d2b9055faf6eeac5b14e324073d83bc17b191d7e3f" dependencies = [ "libc", - "serde", - "serde_json", - "winapi", + "rtoolbox", + "windows-sys 0.48.0", +] + +[[package]] +name = "rtoolbox" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c247d24e63230cdb56463ae328478bd5eac8b8faa8c69461a77e8e323afac90e" +dependencies = [ + "libc", + "windows-sys 0.48.0", ] [[package]] @@ -3288,9 +3281,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.35" +version = "0.38.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" +checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36" dependencies = [ "bitflags 2.6.0", "errno", @@ -3375,24 +3368,24 @@ checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "rustyline" -version = "8.0.0" -source = "git+https://github.com/tailhook/rustyline?branch=edgedb_20210403#8c0afd236b4869f9fbf41a6a322149feacbe49bd" +version = "14.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7803e8936da37efd9b6d4478277f4b2b9bb5cdb37a113e8d63222e58da647e63" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "cfg-if", - "dirs-next", - "fd-lock 2.0.0", + "clipboard-win", + "fd-lock", + "home", "libc", "log", "memchr", - "nix 0.26.4", + "nix 0.28.0", "radix_trie", - "scopeguard", - "smallvec", "unicode-segmentation", "unicode-width", "utf8parse", - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -3501,16 +3494,16 @@ checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.127" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ - "indexmap 2.5.0", + "indexmap", "itoa", "memchr", "ryu", @@ -3594,8 +3587,8 @@ dependencies = [ "assert_cmd", "edgedb-protocol", "hex", - "indexmap 2.0.0-pre", - "predicates 2.1.5", + "indexmap", + "predicates", "serde_json", "sha1", "tempfile", @@ -3636,7 +3629,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" dependencies = [ "libc", - "mio 0.8.11", + "mio 1.0.2", "signal-hook", ] @@ -3649,6 +3642,12 @@ dependencies = [ "libc", ] +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + [[package]] name = "siphasher" version = "0.3.11" @@ -3676,36 +3675,13 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" -[[package]] -name = "snafu" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6" -dependencies = [ - "backtrace", - "doc-comment", - "snafu-derive 0.7.5", -] - [[package]] name = "snafu" version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b835cb902660db3415a672d862905e791e54d306c6e8189168c7f3d9ae1c79d" dependencies = [ - "snafu-derive 0.8.4", -] - -[[package]] -name = "snafu-derive" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "syn 1.0.109", + "snafu-derive", ] [[package]] @@ -3714,10 +3690,10 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38d1e02fca405f6280643174a50c942219f0bbf4dbf7d480f1dd864d6f211ae5" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -3747,10 +3723,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] -name = "strsim" -version = "0.10.0" +name = "strict" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "f42444fea5b87a39db4218d9422087e66a85d0e7a0963a439b07bcdf91804006" [[package]] name = "strsim" @@ -3777,9 +3753,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.76" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -3842,7 +3818,7 @@ dependencies = [ "cfg-if", "fastrand 2.1.1", "once_cell", - "rustix 0.38.35", + "rustix 0.38.36", "windows-sys 0.59.0", ] @@ -3857,6 +3833,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "term" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4df4175de05129f31b80458c6df371a15e7fc3fd367272e6bf938e5c351c7ea0" +dependencies = [ + "home", + "windows-sys 0.52.0", +] + [[package]] name = "termcolor" version = "1.4.1" @@ -3868,35 +3854,27 @@ dependencies = [ [[package]] name = "termimad" -version = "0.20.6" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfab44b4bc17601cf226cce31c87462a4a5bd5d325948c8ebbc9e715660a1287" +checksum = "920e7c4671e79f3d9df269da9c8edf0dbc580044fd727d3594f7bfba5eb6107a" dependencies = [ "coolor", + "crokey", "crossbeam", - "crossterm", + "lazy-regex", "minimad", + "serde", "thiserror", "unicode-width", ] -[[package]] -name = "terminal_size" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" -dependencies = [ - "rustix 0.37.27", - "windows-sys 0.48.0", -] - [[package]] name = "terminal_size" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.38.35", + "rustix 0.38.36", "windows-sys 0.48.0", ] @@ -3908,24 +3886,35 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "test-case" -version = "2.2.2" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21d6cf5a7dffb3f9dceec8e6b8ca528d9bd71d36c9f074defb548ce161f598c0" +checksum = "eb2550dd13afcd286853192af8601920d959b14c401fcece38071d53bf0768a8" dependencies = [ "test-case-macros", ] [[package]] -name = "test-case-macros" -version = "2.2.2" +name = "test-case-core" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e45b7bf6e19353ddd832745c8fcf77a17a93171df7151187f26623f2b75b5b26" +checksum = "adcb7fd841cd518e279be3d5a3eb0636409487998a4aff22f3de87b81e88384f" dependencies = [ "cfg-if", - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.77", +] + +[[package]] +name = "test-case-macros" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", + "test-case-core", ] [[package]] @@ -3961,7 +3950,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" dependencies = [ "smawk", - "terminal_size 0.2.6", "unicode-linebreak", "unicode-width", ] @@ -3983,7 +3971,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -4069,7 +4057,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58d491693b54014df34a52e25519be0f38cd97fe9fc8f2a6c541becab45f808b" dependencies = [ "anyhow", - "env_logger 0.11.5", + "env_logger", "log", "pem", "test-cert-gen-2", @@ -4103,7 +4091,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -4140,9 +4128,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", @@ -4151,9 +4139,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -4162,15 +4150,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - [[package]] name = "toml" version = "0.8.19" @@ -4198,7 +4177,7 @@ version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ - "indexmap 2.5.0", + "indexmap", "serde", "serde_spanned", "toml_datetime", @@ -4252,7 +4231,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -4281,7 +4260,7 @@ dependencies = [ "serde_derive", "serde_json", "termcolor", - "toml 0.8.19", + "toml", ] [[package]] @@ -4493,7 +4472,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", "wasm-bindgen-shared", ] @@ -4527,7 +4506,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4597,32 +4576,32 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.3" +version = "0.26.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" dependencies = [ "rustls-pki-types", ] [[package]] name = "which" -version = "4.4.2" +version = "6.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f" dependencies = [ "either", "home", - "once_cell", - "rustix 0.38.35", + "rustix 0.38.36", + "winsafe", ] [[package]] name = "whoami" -version = "1.5.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" +checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d" dependencies = [ - "redox_syscall 0.4.1", + "redox_syscall 0.5.3", "wasite", "web-sys", ] @@ -4688,30 +4667,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.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" @@ -4739,21 +4694,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - [[package]] name = "windows-targets" version = "0.48.5" @@ -4785,12 +4725,6 @@ dependencies = [ "windows_x86_64_msvc 0.52.6", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -4803,12 +4737,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -4821,12 +4749,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -4845,12 +4767,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -4863,12 +4779,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -4881,12 +4791,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -4899,12 +4803,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -4928,13 +4826,20 @@ dependencies = [ [[package]] name = "winreg" -version = "0.10.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" dependencies = [ - "winapi", + "cfg-if", + "windows-sys 0.48.0", ] +[[package]] +name = "winsafe" +version = "0.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" + [[package]] name = "wslapi" version = "0.1.3" @@ -4963,7 +4868,7 @@ checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", "linux-raw-sys 0.4.14", - "rustix 0.38.35", + "rustix 0.38.36", ] [[package]] @@ -4990,7 +4895,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -4998,62 +4903,79 @@ name = "zeroize" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] [[package]] name = "zip" -version = "0.6.6" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494" dependencies = [ "aes", - "byteorder", + "arbitrary", "bzip2", - "constant_time_eq 0.1.5", + "constant_time_eq", "crc32fast", "crossbeam-utils", + "deflate64", + "displaydoc", "flate2", "hmac", + "indexmap", + "lzma-rs", + "memchr", "pbkdf2", + "rand", "sha1", + "thiserror", "time", - "zstd 0.11.2+zstd.1.5.2", + "zeroize", + "zopfli", + "zstd", +] + +[[package]] +name = "zopfli" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946" +dependencies = [ + "bumpalo", + "crc32fast", + "lockfree-object-pool", + "log", + "once_cell", + "simd-adler32", ] [[package]] name = "zstd" -version = "0.11.2+zstd.1.5.2" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" dependencies = [ - "zstd-safe 5.0.2+zstd.1.5.2", -] - -[[package]] -name = "zstd" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" -dependencies = [ - "zstd-safe 6.0.6", + "zstd-safe", ] [[package]] name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" +version = "7.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-safe" -version = "6.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" -dependencies = [ - "libc", "zstd-sys", ] diff --git a/third_party/nixpkgs/pkgs/tools/networking/edgedb/default.nix b/third_party/nixpkgs/pkgs/tools/networking/edgedb/default.nix index 2308a1266b..00f444d922 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/edgedb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/edgedb/default.nix @@ -19,23 +19,21 @@ }: rustPlatform.buildRustPackage rec { pname = "edgedb"; - version = "5.3.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "edgedb"; repo = "edgedb-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-oG3KxORNppQDa84CXjSxM9Z9GDLby+irUbEncyjoJU4="; + hash = "sha256-qythVPcNijYmdH/IvyoYZIB8WfYiB8ByYLz+VuWGRAM="; fetchSubmodules = true; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "edgedb-derive-0.5.2" = "sha256-9vmaMOoZ5VmbJ0/eN0XdE5hrID/BK4IkLnIwucgRr2w="; - "edgeql-parser-0.1.0" = "sha256-WUNiUgfuzbr+zNYgJivalUK5kPSvkVcgp4Zq3pmoa/w="; - "indexmap-2.0.0-pre" = "sha256-QMOmoUHE1F/sp+NeDpgRGqqacWLHWG02YgZc5vAdXZY="; - "rustyline-8.0.0" = "sha256-CrICwQbHPzS4QdVIEHxt2euX+g+0pFYe84NfMp1daEc="; + "edgedb-derive-0.5.2" = "sha256-mKgJ0Jge/eZHCT89BEOR4/Pzbu63UUoeHSp7w9GgANs="; + "edgeql-parser-0.1.0" = "sha256-v3B7aKEVWweTXxdl6GfutdqHGw+qkI6OPZw7OBPVn0w="; "rexpect-0.5.0" = "sha256-vstAL/fJWWx7WbmRxNItKpzvgGF3SvJDs5isq9ym/OA="; "serde_str-1.0.0" = "sha256-CMBh5lxdQb2085y0jc/DrV6B8iiXvVO2aoZH/lFFjak="; "scram-0.7.0" = "sha256-QTPxyXBpMXCDkRRJEMYly1GKp90khrwwuMI1eHc2H+Y="; diff --git a/third_party/nixpkgs/pkgs/tools/networking/globalping-cli/default.nix b/third_party/nixpkgs/pkgs/tools/networking/globalping-cli/default.nix index 693c98e16e..13a399e13f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/globalping-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/globalping-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "globalping-cli"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "jsdelivr"; repo = pname; rev = "v${version}"; - hash = "sha256-/W/S+oG/3gD/+8mOWy4oWv7TR3IGKZt4cz0vE4nIzM4="; + hash = "sha256-MepnNbRX/smljiR9ysRWExFsfb7Qrz++7Y8S0Xn1Ax8="; }; vendorHash = "sha256-V6DwV2KukFfFK0PK9MacoHH0sB5qNV315jn0T+4rhfA="; @@ -18,6 +18,25 @@ buildGoModule rec { CGO_ENABLED = 0; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; + preCheck = '' + export HOME="$TMPDIR" + ''; + + checkFlags = + let + skippedTests = [ + # Skip tests that require network access + "Test_Authorize" + "Test_TokenIntrospection" + "Test_Logout" + "Test_RevokeToken" + "Test_Limits" + "Test_CreateMeasurement" + "Test_GetMeasurement" + ]; + in + [ "-skip=^${builtins.concatStringsSep "|^" skippedTests}" ]; + postInstall = '' mv $out/bin/${pname} $out/bin/globalping installShellCompletion --cmd globalping \ diff --git a/third_party/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix b/third_party/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix index d2df1709e7..ced815142e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goimapnotify"; - version = "2.3.15"; + version = "2.4"; src = fetchFromGitLab { owner = "shackra"; repo = "goimapnotify"; rev = version; - hash = "sha256-da2Q+glDVWSf574pks6UzvQyzKAU+81ypy5H968Y7HE="; + hash = "sha256-ieaj97CjoSc/qt/JebATHmiJ7RIvNUpFZjEM6mqG9Rk="; }; - vendorHash = "sha256-DphGe9jbKo1aIfpF5kRYNSn/uIYHaRMrygda5t46svw="; + vendorHash = "sha256-rWPXQj0XFS/Mv9ylGv09vol0kkRDNaOAEgnJvSWMvoI="; postPatch = '' for f in command.go command_test.go; do diff --git a/third_party/nixpkgs/pkgs/tools/networking/gp-saml-gui/default.nix b/third_party/nixpkgs/pkgs/tools/networking/gp-saml-gui/default.nix index f28306880f..1426d13ed2 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/gp-saml-gui/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/gp-saml-gui/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , buildPythonPackage -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 , glib-networking , gobject-introspection @@ -29,7 +29,7 @@ buildPythonPackage rec { requests pygobject3 openconnect - ] ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk; + ] ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_0; preFixup = '' gappsWrapperArgs+=( diff --git a/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix index d802662b53..2504ca0ff1 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix @@ -1,5 +1,4 @@ { lib, stdenv, fetchFromGitHub -, fetchpatch2 , installShellFiles , boost, zlib, openssl , upnpSupport ? true, miniupnpc @@ -9,23 +8,15 @@ stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.52.0"; + version = "2.54.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "sha256-0n3cPF3KBuzNOagrn88HeTvFAu1sYTkijpiGr77X5GI="; + sha256 = "sha256-neoIDZNBBDq3tqz1ET3/CS/zb0Lret9niyuU7iWoNIE="; }; - patches = [ - # Support miniupnp-2.2.8 (fixes #2071) - (fetchpatch2 { - url = "https://github.com/PurpleI2P/i2pd/commit/697d8314415b0dc0634fd1673abc589a080e0a31.patch?full_index=1"; - hash = "sha256-B9Ngw1yPrnF5pGLe1a5x0TlyInvQGcq1zQUKO/ELFzA="; - }) - ]; - buildInputs = [ boost zlib openssl ] ++ lib.optional upnpSupport miniupnpc; diff --git a/third_party/nixpkgs/pkgs/tools/networking/minidlna/default.nix b/third_party/nixpkgs/pkgs/tools/networking/minidlna/default.nix index 085a5671d2..78b2140b25 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/minidlna/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/minidlna/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, autoreconfHook, ffmpeg, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite, gettext, nixosTests, zlib }: +{ lib, stdenv, fetchgit, fetchpatch2, autoreconfHook, ffmpeg, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite, gettext, nixosTests, zlib }: let pname = "minidlna"; @@ -13,6 +13,13 @@ stdenv.mkDerivation { hash = "sha256-InsSguoGi1Gp8R/bd4/c16xqRuk0bRsgw7wvcbokgKo="; }; + patches = [ + (fetchpatch2 { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/minidlna/-/raw/affcf0dd1e6f8e33d0ba90b2b0733736fa1aeb71/ffmpeg7.patch"; + hash = "sha256-MZFPY4FywoMkZ//fKml6o5J1QG5qiScgtI+KFw5hENw="; + }) + ]; + preConfigure = '' export makeFlags="INSTALLPREFIX=$out" ''; diff --git a/third_party/nixpkgs/pkgs/tools/networking/nethogs/default.nix b/third_party/nixpkgs/pkgs/tools/networking/nethogs/default.nix index c01e2c2cff..f4d7700b90 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/nethogs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/nethogs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nethogs"; - version = "0.8.7"; + version = "0.8.8"; src = fetchFromGitHub { owner = "raboof"; repo = "nethogs"; rev = "v${version}"; - sha256 = "10shdwvfj90lp2fxz9260342a1c2n1jbw058qy5pyq5kh3xwr9b8"; + sha256 = "sha256-+yVMyGSBIBWYjA9jaGWvrcsNPbJ6S4ax9H1BhWHYUUU="; }; buildInputs = [ ncurses libpcap ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix index 995637e61d..648991ef73 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { callPackage, lib, stdenv, fetchurl, jre, makeWrapper }: let this = stdenv.mkDerivation (finalAttrs: { - version = "7.8.0"; + version = "7.9.0"; pname = "openapi-generator-cli"; jarfilename = "openapi-generator-cli-${finalAttrs.version}.jar"; @@ -12,7 +12,7 @@ let this = stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://maven/org/openapitools/openapi-generator-cli/${finalAttrs.version}/${finalAttrs.jarfilename}"; - sha256 = "sha256-0Yec9C2jH4z2HPaHmLjvJBivDGvZOlwYcOH/VD+7k2U="; + sha256 = "sha256-8Mt4OaLq2QQLIEUZsD8Uc7OcdyX9H0MTS7VQUVyz2+4="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/tools/networking/openssh/common.nix b/third_party/nixpkgs/pkgs/tools/networking/openssh/common.nix index c1cf38dfa8..b92f770018 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openssh/common.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openssh/common.nix @@ -13,6 +13,7 @@ # package without splicing See: https://github.com/NixOS/nixpkgs/pull/107606 , pkgs , fetchurl +, fetchpatch , autoreconfHook , zlib , openssl @@ -47,6 +48,12 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-eFFOd4B2nccRZAQWwdBPBoKWjfEdKEVGJvKZAzLu3HU="; }) + (fetchpatch { + name = "musl.patch"; + url = "https://anongit.mindrot.org/openssh.git/patch/?id=8b664df75966e5aed8dabea00b8838303d3488b8"; + hash = "sha256-siVg1mnGiZ2aP3IIY4y1WAp3nkOk0XKSBDqYfw6lrQg="; + }) + # See discussion in https://github.com/NixOS/nixpkgs/pull/16966 ./dont_create_privsep_path.patch ] ++ extraPatches; diff --git a/third_party/nixpkgs/pkgs/tools/networking/sing-box/default.nix b/third_party/nixpkgs/pkgs/tools/networking/sing-box/default.nix index dbca74f408..9af7b4365c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/sing-box/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/sing-box/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.9.7"; + version = "1.10.1"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-ZqcQe2d4IoF7fA2rMASFvGCuiTL+lqQqCpCt/IviClU="; + hash = "sha256-WGlYaD4u9M1hfT+L6Adc5gClIYOkFsn4c9FAympmscQ="; }; - vendorHash = "sha256-/lp+3mPkGMABpvnxqpuC/7NiKrmcEWYQ80Wb7Ng1eBI="; + vendorHash = "sha256-lyZ2Up1SSaRGvai0gGtq43MSdHfXc2PuxflSbASYZ4A="; tags = [ "with_quic" diff --git a/third_party/nixpkgs/pkgs/tools/networking/tcpdump/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tcpdump/default.nix index 9964669012..b61f42eae3 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tcpdump/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tcpdump/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tcpdump"; - version = "4.99.4"; + version = "4.99.5"; src = fetchurl { url = "https://www.tcpdump.org/release/tcpdump-${version}.tar.gz"; - hash = "sha256-AjIjG7LynWvyQm5woIp+DGOg1ZqbRIY7f14jV6bkn+o="; + hash = "sha256-jHWFbgCt3urfcNrWfJ/z3TaFNrK4Vjq/aFTXx2TNOts="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/vpnc/default.nix b/third_party/nixpkgs/pkgs/tools/networking/vpnc/default.nix index d5fd324719..7a8a6c2b9c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/vpnc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/vpnc/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation { "SCRIPT_PATH=${vpnc-scripts}/bin/vpnc-script" ] ++ lib.optional opensslSupport "OPENSSL_GPL_VIOLATION=yes"; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + postPatch = '' patchShebangs src/makeman.pl ''; diff --git a/third_party/nixpkgs/pkgs/tools/networking/webalizer/default.nix b/third_party/nixpkgs/pkgs/tools/networking/webalizer/default.nix index 93bd4dad00..0ea806f29d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/webalizer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/webalizer/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.23.08"; src = fetchurl { - url = "https://ftp.debian.org/debian/pool/main/w/webalizer/webalizer_${version}.orig.tar.gz"; + url = "mirror://debian/pool/main/w/webalizer/webalizer_${version}.orig.tar.gz"; sha256 = "sha256-7a3bWqQcxKCBoVAOP6lmFdS0G8Eghrzt+ZOAGM557Y0="; }; diff --git a/third_party/nixpkgs/pkgs/tools/nix/fh/default.nix b/third_party/nixpkgs/pkgs/tools/nix/fh/default.nix index bc02bac41d..ba745f60b6 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/fh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/fh/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "fh"; - version = "0.1.17"; + version = "0.1.18"; src = fetchFromGitHub { owner = "DeterminateSystems"; repo = "fh"; rev = "v${version}"; - hash = "sha256-+Q7mZ2uzMjShKWVvYLz9qH8g0w8oP93lNlJiYxFFoAI="; + hash = "sha256-McfJXbr/oadsfQV7hzB6sEMy9sfXthHcjsbOiQs2+rU="; }; - cargoHash = "sha256-DJOj9EJswnPIm66u585k4ZWSi6Su/naQ+myQuLiGLFE="; + cargoHash = "sha256-PGXd4spD2gNyQIloVZuhWZ1VQtacXPLMCQiBekZbEp4="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix index 2eb15ebcfb..69c92320d7 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix @@ -18,7 +18,7 @@ ln -s nom "$out/bin/nom-build" ln -s nom "$out/bin/nom-shell" chmod a+x $out/bin/nom-build - installShellCompletion --zsh --name _nom-build completions/completion.zsh + installShellCompletion completions/* ''; }; raw-pkg = haskellPackages.callPackage ./generated-package.nix {}; diff --git a/third_party/nixpkgs/pkgs/tools/nix/nix-output-monitor/generated-package.nix b/third_party/nixpkgs/pkgs/tools/nix/nix-output-monitor/generated-package.nix index 4e76a51941..d278604484 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/nix-output-monitor/generated-package.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/nix-output-monitor/generated-package.nix @@ -9,10 +9,10 @@ }: mkDerivation { pname = "nix-output-monitor"; - version = "2.1.3"; + version = "2.1.4"; src = fetchzip { - url = "https://code.maralorn.de/maralorn/nix-output-monitor/archive/v2.1.3.tar.gz"; - sha256 = "1xm40pp9lqj2hlwk3ds9zyjd4yqsis2a2ac5kn19z60glxvaijvx"; + url = "https://code.maralorn.de/maralorn/nix-output-monitor/archive/v2.1.4.tar.gz"; + sha256 = "0ghpbq6a1cmh0xy42ipg8l1qi4pjdjn0df5am26587w396r81n5r"; }; isLibrary = true; isExecutable = true; @@ -36,7 +36,7 @@ mkDerivation { strict strict-types terminal-size text time transformers typed-process word8 ]; - homepage = "https://github.com/maralorn/nix-output-monitor"; + homepage = "https://code.maralorn.de/maralorn/nix-output-monitor"; description = "Processes output of Nix commands to show helpful and pretty information"; license = lib.licenses.agpl3Plus; mainProgram = "nom"; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-eval-jobs/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix-eval-jobs/default.nix index 102af325d6..77d3d20624 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix-eval-jobs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix-eval-jobs/default.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { pname = "nix-eval-jobs"; - version = "2.24.0"; + version = "2.24.1"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - hash = "sha256-zqenoufFiPfobw74idorZMG8AXG3DnFzbHplt/Nkvrg="; + hash = "sha256-j/p2ftkP8MXYEK7Vx65jH/Knr2QkEcRSVoDnVOUDe6Q="; }; buildInputs = [ boost 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 2118435903..adfa793f1d 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix @@ -211,8 +211,8 @@ in lib.makeExtensible (self: ({ }; nix_2_24 = (common { - version = "2.24.8"; - hash = "sha256-YPJA0stZucs13Y2DQr3JIL6JfakP//LDbYXNhic/rKk="; + version = "2.24.9"; + hash = "sha256-OwJByTdCz1t91ysBqynK+ifszkoIGEXUn6HE2t82+c8="; self_attribute_name = "nix_2_24"; }).override (lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) { # Fix the following error with the default x86_64-darwin SDK: @@ -266,7 +266,7 @@ in lib.makeExtensible (self: ({ nix; # Read ./README.md before bumping a major release - stable = addFallbackPathsCheck self.nix_2_18; + stable = addFallbackPathsCheck self.nix_2_24; } // lib.optionalAttrs config.allowAliases ( lib.listToAttrs (map ( minor: diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix index 895b4300ac..a0036d6fa7 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -9,6 +9,7 @@ cacert, git, nix, + versionCheckHook, withAutocomplete ? true, withSandboxSupport ? false, @@ -17,14 +18,14 @@ python3Packages.buildPythonApplication rec { pname = "nixpkgs-review"; - version = "2.10.5"; + version = "2.12.0"; pyproject = true; src = fetchFromGitHub { owner = "Mic92"; repo = "nixpkgs-review"; rev = "refs/tags/${version}"; - hash = "sha256-dRTKE8gkV298ZmMokyy3Ufer/Lp1GQYdEhIBoLhloEQ="; + hash = "sha256-yNdBqL3tceuoUHx8/j2y5ZTq1zeVDAm37RZtlCbC6rg="; }; build-system = [ @@ -57,8 +58,6 @@ python3Packages.buildPythonApplication rec { "--unset PYTHONPATH" ]; - doCheck = false; - postInstall = lib.optionalString withAutocomplete '' for cmd in nix-review nixpkgs-review; do installShellCompletion --cmd $cmd \ @@ -68,13 +67,18 @@ python3Packages.buildPythonApplication rec { done ''; - meta = with lib; { + nativeCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + + meta = { changelog = "https://github.com/Mic92/nixpkgs-review/releases/tag/${version}"; description = "Review pull-requests on https://github.com/NixOS/nixpkgs"; homepage = "https://github.com/Mic92/nixpkgs-review"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "nixpkgs-review"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ figsoda mic92 ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/opkg/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/opkg/default.nix index bced64f20d..830a8c4c4d 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/opkg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/opkg/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "opkg"; - version = "0.6.3"; + version = "0.7.0"; src = fetchurl { url = "https://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; - hash = "sha256-85OONZZGtAbEDV1EKhRnx+cjV/kauCLkQml1KWQeBt4="; + hash = "sha256-2XP9DxVo9Y+H1q7NmqlePh9gIUpFzuJnBL+P51fFRWc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/package-management/pdm/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/pdm/default.nix index fe2cf57d19..f1af411fa5 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/pdm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/pdm/default.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { pname = "pdm"; - version = "2.19.1"; + version = "2.19.2"; pyproject = true; disabled = python3.pkgs.pythonOlder "3.8"; @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { owner = "pdm-project"; repo = "pdm"; rev = "refs/tags/${version}"; - hash = "sha256-V2ZcXgRtL8zkCx5/d+L+3o0QQHVrPpFyjvjsc2auWDI="; + hash = "sha256-m+ZVaAZZ4+/qqJs3B8/CEj+in/mrBKgfrx1OD3GpXLU="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/poetry/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/poetry/default.nix index 3317e785d0..dda8d0a132 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/poetry/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/poetry/default.nix @@ -12,13 +12,14 @@ let # We keep the override around even when the versions match, as # it's likely to become relevant again after the next Poetry update. poetry-core = super.poetry-core.overridePythonAttrs (old: rec { - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "python-poetry"; repo = "poetry-core"; rev = "refs/tags/${version}"; - hash = "sha256-vvwKbzGlvv2LTbXfJxQVM3nUXFGntgJxsku6cbRxCzw="; + hash = "sha256-L8lR9sUdRYqjkDCQ0XHXZm5X6xD40t1gxlGiovvb/+8="; }; + patches = [ ]; }); } // (plugins self); python = python3.override (old: { @@ -39,7 +40,7 @@ let withPlugins = selector: let selected = selector (plugins python.pkgs); in python.pkgs.toPythonApplication (python.pkgs.poetry.overridePythonAttrs (old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ selected; + dependencies = old.dependencies ++ selected; # save some build time when adding plugins by disabling tests doCheck = selected == [ ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/poetry/unwrapped.nix b/third_party/nixpkgs/pkgs/tools/package-management/poetry/unwrapped.nix index 4a520f2018..8e24ed705b 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/poetry/unwrapped.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/poetry/unwrapped.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pname = "poetry"; - version = "1.8.3"; + version = "1.8.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -47,9 +47,13 @@ buildPythonPackage rec { owner = "python-poetry"; repo = "poetry"; rev = "refs/tags/${version}"; - hash = "sha256-PPHt9GG5XJzrhnuAS8L+0Pa3El3RNCdEbXbLnHopDWg="; + hash = "sha256-pk57Jxf4hkMKLn1pOa9BtHLwLJ6qmXc55TqQN5Vr2k8="; }; + build-system = [ + poetry-core + ]; + nativeBuildInputs = [ installShellFiles ]; @@ -57,9 +61,10 @@ buildPythonPackage rec { pythonRelaxDeps = [ "dulwich" "keyring" + "virtualenv" ]; - propagatedBuildInputs = [ + dependencies = [ build cachecontrol cleo diff --git a/third_party/nixpkgs/pkgs/tools/security/cdxgen/default.nix b/third_party/nixpkgs/pkgs/tools/security/cdxgen/default.nix index 6ea34ed4a8..c9f85d0327 100644 --- a/third_party/nixpkgs/pkgs/tools/security/cdxgen/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/cdxgen/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cdxgen"; - version = "10.9.6"; + version = "10.10.4"; src = fetchFromGitHub { owner = "CycloneDX"; repo = "cdxgen"; rev = "v${finalAttrs.version}"; - hash = "sha256-WgY0soHwedYbQNDvDIqtaxMSzVcaOVV2/22wOXU2nbA="; + hash = "sha256-5FxH9cAJ9FoSn1euimKOvxlAEny+LUqj/EH80+l1v04="; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-IgmTYmCmZ65Da5zL6Tx7P4bt2o+YhX0UvU0DEONmr7w="; + hash = "sha256-skgRkj6LrzRN5diQVbGU0KeJBklGWM6dksbr2njMDk0="; }; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/cloudfox/default.nix b/third_party/nixpkgs/pkgs/tools/security/cloudfox/default.nix index ebabf683ce..495d85cf0f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/cloudfox/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/cloudfox/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cloudfox"; - version = "1.14.2"; + version = "1.15.0"; src = fetchFromGitHub { owner = "BishopFox"; repo = "cloudfox"; rev = "refs/tags/v${version}"; - hash = "sha256-8z/j1bJT5xccSlyBnx32Dqqg6J9iazTaJgUmjN3Jc8c="; + hash = "sha256-YLZSrBAEf0SXECAdnF2CQAlEd15DJ1Iv+x+RebM5tw4="; }; vendorHash = "sha256-MQ1yoJjAWNx95Eafcarp/JNYq06xu9P05sF2QTW03NY="; diff --git a/third_party/nixpkgs/pkgs/tools/security/cnspec/default.nix b/third_party/nixpkgs/pkgs/tools/security/cnspec/default.nix index fdbbb33d50..62fccb926e 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.24.0"; + version = "11.26.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-CI47eP1e1oXm2WQY89tU3g7DdSwG7UQT46DqOCY7uq0="; + hash = "sha256-dbcTQuaUiVDcPKkYt10CJYHEleNqji1yEE8jEBBJtpg="; }; proxyVendor = true; - vendorHash = "sha256-x1rYRUiYqgi22r7CkOlgHHVImVvQ4sLggLV+hfkeW30="; + vendorHash = "sha256-lG+PssQh/Cyp6Qgibm/OcJqnVecKERJNVLzKscIFnGo="; subPackages = [ "apps/cnspec" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/coercer/default.nix b/third_party/nixpkgs/pkgs/tools/security/coercer/default.nix index c2e8ee3dfe..2c7faee3a3 100644 --- a/third_party/nixpkgs/pkgs/tools/security/coercer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/coercer/default.nix @@ -1,12 +1,13 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { pname = "coercer"; version = "2.4.3"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "p0dalirius"; @@ -15,22 +16,16 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-WeaKToKYIB+jjTNIQvAUQQNb25TsNWALYZwIZuBjkPE="; }; - nativeBuildInputs = with python3.pkgs; [ - poetry-core - ]; + pythonRelaxDeps = [ "impacket" ]; - pythonRelaxDeps = [ - "impacket" - ]; + build-system = with python3.pkgs; [ poetry-core ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ impacket xlsxwriter ]; - pythonImportsCheck = [ - "coercer" - ]; + pythonImportsCheck = [ "coercer" ]; # this file runs into issues on case-insensitive filesystems # ValueError: Both <...>/coercer and <...>/coercer.py exist @@ -40,9 +35,10 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Tool to automatically coerce a Windows server"; - mainProgram = "coercer"; homepage = "https://github.com/p0dalirius/Coercer"; - license = with licenses; [ gpl2Only ]; + changelog = "https://github.com/p0dalirius/Coercer/releases/tag/${version}"; + license = licenses.gpl2Only; maintainers = with maintainers; [ fab ]; + mainProgram = "coercer"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/ecdsautils/default.nix b/third_party/nixpkgs/pkgs/tools/security/ecdsautils/default.nix index 69ce4aa511..efc6f6f8e5 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ecdsautils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ecdsautils/default.nix @@ -2,7 +2,7 @@ let pname = "ecdsautils"; - version = "0.4.1"; + version = "0.4.2"; in stdenv.mkDerivation { inherit pname version; @@ -11,7 +11,7 @@ stdenv.mkDerivation { owner = "freifunk-gluon"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dv0guQTmot5UO1GkMgzvD6uJFyum5kV89LI3xWS1DZA="; + sha256 = "sha256-vGHLAX/XOtePvdT/rljCOdlILHVO20mCt6p+MUi13dg="; }; nativeBuildInputs = with pkgs; [ cmake pkg-config doxygen ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/ggshield/default.nix b/third_party/nixpkgs/pkgs/tools/security/ggshield/default.nix index c909433ba2..f550974f00 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.32.1"; + version = "1.32.2"; pyproject = true; src = fetchFromGitHub { owner = "GitGuardian"; repo = "ggshield"; rev = "refs/tags/v${version}"; - hash = "sha256-9x/Shh7nYPM5BpeVW2xXCD0JIxNwRl1sXi/cE1EhD4o="; + hash = "sha256-8Nrmfbu1ChuJU4lSbaqIxNagkTJoKTeooUWnMKtIVx0="; }; pythonRelaxDeps = true; diff --git a/third_party/nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix b/third_party/nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix index 7792165d25..7c4e03ba06 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix @@ -1,7 +1,6 @@ { lib , stdenv -, fetchurl -, fetchpatch +, fetchFromGitHub , openssl }: let @@ -12,28 +11,18 @@ let in stdenv.mkDerivation rec { pname = "ibm-sw-tpm2"; - version = "1682"; + version = "1682-unstable-2024-08-02"; - src = fetchurl { - url = "mirror://sourceforge/ibmswtpm2/ibmtpm${version}.tar.gz"; - hash = "sha256-PLZC+HGheyPVCwRuX5X0ScIodBX8HnrrS9u4kg28s48="; + src = fetchFromGitHub { + owner = "kgoldman"; + repo = "ibmswtpm2"; + rev = "rev183-2024-08-02"; + hash = "sha256-D2GAkiePBow2iixYMOOeJrnh5hk2lO07dV++lK4X8qE="; }; - patches = [ - # Backport openssl-3.1 from development branch. - # Can be removed with next release. - (fetchpatch { - name = "openssl-3.1.patch"; - url = "https://github.com/kgoldman/ibmswtpm2/commit/15501bf4973d334ca9420fa2fb0f0fe1800871e0.patch"; - includes = [ "TpmToOsslMath.h" ]; - stripLen = 1; - hash = "sha256-8TwyZVy8pQwq5Fl8cy9xJWtdckwL+QK0+DL5EHDLYUY="; - }) - ]; - buildInputs = [ openssl ]; - sourceRoot = "src"; + sourceRoot = "${src.name}/src"; inherit makefile; diff --git a/third_party/nixpkgs/pkgs/tools/security/ldeep/default.nix b/third_party/nixpkgs/pkgs/tools/security/ldeep/default.nix index c9061348d4..229a106b14 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ldeep/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ldeep/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ldeep"; - version = "1.0.69"; + version = "1.0.72"; pyproject = true; src = fetchFromGitHub { owner = "franc-pentest"; repo = "ldeep"; rev = "refs/tags/${version}"; - hash = "sha256-nXDeAi+nf6JTYjSyOUV65ZuqcGlODHvfnwnQl9H7NFE="; + hash = "sha256-WfrQd0P1TegeIwxQVycgx2n+IxqnKLRF1wxzNnjHaEo="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile index 4f192e3a6c..b4c9001f3d 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.29" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.32" diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock index 74f56fe453..2d705c9f86 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: 6f37955454995e39746353a01aeb6d9d58221d1c - ref: refs/tags/6.4.29 + revision: a13f85c09fbf85c2f5f713b5b9a32b6200cc910d + ref: refs/tags/6.4.32 specs: - metasploit-framework (6.4.29) + metasploit-framework (6.4.32) aarch64 abbrev actionpack (~> 7.0.0) @@ -43,9 +43,9 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.166) + metasploit-payloads (= 2.0.183) metasploit_data_models - metasploit_payloads-mettle (= 1.0.31) + metasploit_payloads-mettle (= 1.0.32) mqtt msgpack (~> 1.6.0) mutex_m @@ -271,7 +271,7 @@ GEM activemodel (~> 7.0) activesupport (~> 7.0) railties (~> 7.0) - metasploit-payloads (2.0.166) + metasploit-payloads (2.0.183) metasploit_data_models (6.0.3) activerecord (~> 7.0) activesupport (~> 7.0) @@ -282,7 +282,7 @@ GEM railties (~> 7.0) recog webrick - metasploit_payloads-mettle (1.0.31) + metasploit_payloads-mettle (1.0.32) 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 880cf0eb08..71b6556b10 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.29"; + version = "6.4.32"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = "refs/tags/${version}"; - hash = "sha256-qu5zK/QC9/DapYanw3lvMLdRso8PAndKSJukQaazoZs="; + hash = "sha256-vNJxWj7B7LOWw1hE3bK6dX5kumfspWIaheGHpDit4kM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix index 92ed07649d..a2367cc4b7 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 = "6f37955454995e39746353a01aeb6d9d58221d1c"; - sha256 = "16x1nfk4394v9157f0hgiyr53drhdxww79w6lpdg1xq2yhmp7vma"; + rev = "a13f85c09fbf85c2f5f713b5b9a32b6200cc910d"; + sha256 = "0hz2mlwa91z1hld659gccyx68zkmpardsi2qqfbb7v617rd73lmw"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.4.29"; + version = "6.4.32"; }; metasploit-model = { groups = ["default"]; @@ -746,10 +746,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f8grdgqn9y8wc61k111zlap5vqjika56k4vabkwglljs5bv44nk"; + sha256 = "0bdn7g01a4hvli6ymkl215xmw823jnd5fwv63wy9bgyaih14ysmd"; type = "gem"; }; - version = "2.0.166"; + version = "2.0.183"; }; metasploit_data_models = { groups = ["default"]; @@ -766,10 +766,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19g1mfgv39fqyskkib1f7w2lx7528kpnq90prrmb6jrh1acwaanq"; + sha256 = "0dbdcbqmi7l1y3nw6nv1sabjwy5qpkzl7pg8wqhq33mgnswi4afp"; type = "gem"; }; - version = "1.0.31"; + version = "1.0.32"; }; method_source = { groups = ["default"]; diff --git a/third_party/nixpkgs/pkgs/tools/security/mitmproxy2swagger/default.nix b/third_party/nixpkgs/pkgs/tools/security/mitmproxy2swagger/default.nix index 6731d7c21c..baf318573e 100644 --- a/third_party/nixpkgs/pkgs/tools/security/mitmproxy2swagger/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/mitmproxy2swagger/default.nix @@ -1,29 +1,29 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { pname = "mitmproxy2swagger"; version = "0.13.0"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "alufers"; - repo = pname; + repo = "mitmproxy2swagger"; rev = "refs/tags/${version}"; hash = "sha256-VHxqxee5sQWRS13V4SfY4LWaN0oxxWsNVDOEqUyKHfg="; }; - nativeBuildInputs = with python3.pkgs; [ - poetry-core - ]; - pythonRelaxDeps = [ + "mitmproxy" "ruamel.yaml" ]; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ poetry-core ]; + + dependencies = with python3.pkgs; [ json-stream mitmproxy ruamel-yaml @@ -32,16 +32,14 @@ python3.pkgs.buildPythonApplication rec { # No tests available doCheck = false; - pythonImportsCheck = [ - "mitmproxy2swagger" - ]; + pythonImportsCheck = [ "mitmproxy2swagger" ]; meta = with lib; { description = "Tool to automagically reverse-engineer REST APIs"; - mainProgram = "mitmproxy2swagger"; homepage = "https://github.com/alufers/mitmproxy2swagger"; changelog = "https://github.com/alufers/mitmproxy2swagger/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "mitmproxy2swagger"; }; } 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 f59381cec6..3dd94b1e0f 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.2.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "plattfot"; repo = pname; rev = version; - sha256 = "sha256-E904PLYuIvlew2WHVEwU2bXp6Tc6+lTSVB/m9b9v+z8="; + sha256 = "sha256-GHpVO8FRphVW0+In7TtB39ewwVLU1EHOeVL05pnZdFQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/pinentry/default.nix b/third_party/nixpkgs/pkgs/tools/security/pinentry/default.nix index faf96b7263..7392d39a52 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pinentry/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pinentry/default.nix @@ -62,11 +62,8 @@ let let enableFeaturePinentry = f: lib.enableFeature (lib.elem f buildFlavors) ("pinentry-" + flavorInfo.${f}.flag); - - pinentryMkDerivation = - if (lib.elem "qt5" buildFlavors) then libsForQt5.mkDerivation else stdenv.mkDerivation; in - pinentryMkDerivation rec { + stdenv.mkDerivation rec { pname = "pinentry-${pinentryExtraPname}"; version = "1.3.1"; diff --git a/third_party/nixpkgs/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix b/third_party/nixpkgs/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix index 81091848a9..372749941c 100644 --- a/third_party/nixpkgs/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "sequoia-chameleon-gnupg"; - version = "unstable-2023-11-22"; + version = "0.11.2"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = pname; - rev = "fd9df5a4e1ec3c3ca986a1a25bacf13f024c934a"; - hash = "sha256-OxWlkOQxuuCFyLMx+ucervyqIduUpyJ9lCGFQlfEUFc="; + rev = "v${version}"; + hash = "sha256-XoZA8X6lwziKFECJDPCSpqcFtJe5TsDGWvM+EgpBU3U="; }; - cargoHash = "sha256-4+PA1kYJgn8yDAYr88DQYg6sdgSN3MWzKAUATW3VO6I="; + cargoHash = "sha256-xDQCAte+olmoMbchspNW/02NRkhwWxcgPkIXWBJsbIg="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/third_party/nixpkgs/pkgs/tools/security/ssh-mitm/default.nix b/third_party/nixpkgs/pkgs/tools/security/ssh-mitm/default.nix index 4c59595ec9..7020bcf32d 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ssh-mitm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ssh-mitm/default.nix @@ -25,7 +25,7 @@ let }) ]; - propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ python3.pkgs.icecream ]; + dependencies = oldAttrs.dependencies ++ [ python3.pkgs.icecream ]; }); }; }; diff --git a/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix b/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix index 124115e637..b6be05ef21 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.82.6"; + version = "3.82.11"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-zJVP7uXmGvpI8pyhNiK70iMy+RW+UwenDpXBe98VbMo="; + hash = "sha256-hi7uGVPA9QW22DdfTCui7AMORGgoWH1ogevJqRYM6LQ="; }; - vendorHash = "sha256-69APqkjBNs6FUCeHm6lF8QqAuu76pLdam2LJJrx3WXg="; + vendorHash = "sha256-Ld+TYH2iCreDhueNmu8S5mcyDyWDXMVEwfW9TdVQ9aY="; proxyVendor = true; diff --git a/third_party/nixpkgs/pkgs/tools/system/bfs/default.nix b/third_party/nixpkgs/pkgs/tools/system/bfs/default.nix index e950cd957e..b93dde182c 100644 --- a/third_party/nixpkgs/pkgs/tools/system/bfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/bfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libcap, acl, oniguruma, liburing }: +{ lib, stdenv, fetchFromGitHub, attr, acl, libcap, liburing, oniguruma }: stdenv.mkDerivation rec { pname = "bfs"; @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { hash = "sha256-WIJyCpnlD6/c7PG+ZPmUT8qfPelRY9Od1Dk9Ro1y1yY="; }; - buildInputs = [ oniguruma ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap acl liburing ]; + buildInputs = [ oniguruma ] ++ + lib.optionals stdenv.hostPlatform.isLinux [ acl attr libcap liburing ]; configureFlags = [ "--enable-release" ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/datefudge/default.nix b/third_party/nixpkgs/pkgs/tools/system/datefudge/default.nix index fcc23229a9..a0ba2eafca 100644 --- a/third_party/nixpkgs/pkgs/tools/system/datefudge/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/datefudge/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "datefudge"; - version = "1.26"; + version = "1.27"; src = fetchgit { url = "https://salsa.debian.org/debian/${pname}.git"; rev = "debian/${version}"; - hash = "sha256-CVy5mOX3jNM1cNIn8HhVs8Mhh70pkz9pG08muFuPNfk="; + hash = "sha256-BN/Ct1FRZjvpkRCPpRlXmjeRvrNnuJBXwwI1P2HCisc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/kanata/default.nix b/third_party/nixpkgs/pkgs/tools/system/kanata/default.nix index b55d5227b0..f4b0cbbb62 100644 --- a/third_party/nixpkgs/pkgs/tools/system/kanata/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/kanata/default.nix @@ -5,6 +5,7 @@ , fetchFromGitHub , jq , moreutils +, versionCheckHook , nix-update-script , withCmd ? false }: @@ -51,6 +52,11 @@ rustPlatform.buildRustPackage rec { install -Dm 444 assets/kanata-icon.svg $out/share/icons/hicolor/scalable/apps/kanata.svg ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + passthru = { updateScript = nix-update-script { }; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/natscli/default.nix b/third_party/nixpkgs/pkgs/tools/system/natscli/default.nix index 613976bcbd..68787caff7 100644 --- a/third_party/nixpkgs/pkgs/tools/system/natscli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/natscli/default.nix @@ -1,6 +1,7 @@ { lib , buildGoModule , fetchFromGitHub +, versionCheckHook }: buildGoModule rec { @@ -16,6 +17,14 @@ buildGoModule rec { vendorHash = "sha256-T6VcyklwfRS012ZRzqxkahn9YYrQGky/znTqLIkAoK0="; + ldflags = [ + "-X main.version=${version}" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/nats"; + meta = with lib; { description = "NATS Command Line Interface"; homepage = "https://github.com/nats-io/natscli"; diff --git a/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix b/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix index b8746229d8..c8a729a5af 100644 --- a/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix @@ -53,7 +53,7 @@ let stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; in stdenv'.mkDerivation (finalAttrs: { - version = "1.47.1"; + version = "1.47.4"; pname = "netdata"; src = fetchFromGitHub { @@ -62,10 +62,10 @@ stdenv'.mkDerivation (finalAttrs: { rev = "v${finalAttrs.version}"; hash = if withCloudUi then - "sha256-/iXmIjWpZ0s/LELZM7rYYQ9cjLNdfdisyOvDyLddSY4=" + "sha256-PCaY6J3X4zUUJ8kRCGmLLbk2Pkp5CnH3rxOaoAdsKG4=" # we delete the v2 GUI after fetching else - "sha256-pAqxxsWYgqbmF6wFBfTCYYc3x/Ufyz2Xs4bwB1ToHjo="; + "sha256-W4g/ns+XfBSf6iACIW+6lfzZJLMktTfe5/n3egL27XE="; fetchSubmodules = true; # Remove v2 dashboard distributed under NCUL1. Make sure an empty @@ -242,7 +242,7 @@ stdenv'.mkDerivation (finalAttrs: { rm -rf $out/{var,usr,etc} ''; - enableParallelBuild = true; + enableParallelBuilding = true; passthru = rec { netdata-go-modules = diff --git a/third_party/nixpkgs/pkgs/tools/text/languagetool/default.nix b/third_party/nixpkgs/pkgs/tools/text/languagetool/default.nix index df634c510c..8052dd0b83 100644 --- a/third_party/nixpkgs/pkgs/tools/text/languagetool/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/languagetool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "LanguageTool"; - version = "6.4"; + version = "6.5"; src = fetchzip { url = "https://www.languagetool.org/download/${pname}-${version}.zip"; - sha256 = "sha256-MIP7+K3kmzrqXWcR23Rn+gMYR0zrGnnCYGhv81P2Pc4="; + sha256 = "sha256-+ZZF/k3eTKT2KbWsk5jJtsdcbkOH90ytlSEEdJ2EMbU="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/markdownlint-cli2/default.nix b/third_party/nixpkgs/pkgs/tools/text/markdownlint-cli2/default.nix index d98d3a9f29..4be08fd7ba 100644 --- a/third_party/nixpkgs/pkgs/tools/text/markdownlint-cli2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/markdownlint-cli2/default.nix @@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "markdownlint-cli2"; - version = "0.13.0"; + version = "0.14.0"; # upstream is not interested in including package-lock.json in the source # https://github.com/DavidAnson/markdownlint-cli2/issues/198#issuecomment-1690529976 @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { # so use the tarball from the archlinux mirror src = fetchurl { url = "https://us.mirrors.cicku.me/archlinux/extra/os/x86_64/markdownlint-cli2-${finalAttrs.version}-1-any.pkg.tar.zst"; - hash = "sha256-ioSVse3fS6n2wauZ0VsF6TQKy/ZsyLACQ4anNybIe+I="; + hash = "sha256-yzKIH1RxFXlUoj/83lVEBb3Y4asuh/frPxmX5EV98f0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/text/miller/default.nix b/third_party/nixpkgs/pkgs/tools/text/miller/default.nix index 5107b22fc6..7947944f64 100644 --- a/third_party/nixpkgs/pkgs/tools/text/miller/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/miller/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "miller"; - version = "6.12.0"; + version = "6.13.0"; src = fetchFromGitHub { owner = "johnkerl"; repo = "miller"; rev = "v${version}"; - sha256 = "sha256-0M9wdKn6SdqNAcEcIb4mkkDCUBYQ/mW+0OYt35vq9yw="; + sha256 = "sha256-eHiYIw/sQMXLow2Vy4zFTGeON28LmG0pK2Uca4ooInU="; }; outputs = [ "out" "man" ]; - vendorHash = "sha256-WelwnwsdOhAq4jdmFAYvh4lDMsmaAItdrbC//MfWHjU="; + vendorHash = "sha256-oc6Lp4rQ+MLmQDVcuNJ3CqYH277Vuuwu4zSSO2ICXsw="; postInstall = '' mkdir -p $man/share/man/man1 diff --git a/third_party/nixpkgs/pkgs/tools/text/opencc/default.nix b/third_party/nixpkgs/pkgs/tools/text/opencc/default.nix index 5806a8ab4f..a6e833de76 100644 --- a/third_party/nixpkgs/pkgs/tools/text/opencc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/opencc/default.nix @@ -5,6 +5,8 @@ cmake, python3, opencc, + rapidjson, + gitUpdater, }: stdenv.mkDerivation rec { @@ -27,6 +29,19 @@ stdenv.mkDerivation rec { opencc # opencc_dict ]; + buildInputs = [ + rapidjson + ]; + + # TODO use more system dependencies + cmakeFlags = [ + (lib.cmakeBool "USE_SYSTEM_RAPIDJSON" true) + ]; + + passthru = { + updateScript = gitUpdater { rev-prefix = "ver."; }; + }; + meta = with lib; { homepage = "https://github.com/BYVoid/OpenCC"; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/tools/text/riffdiff/default.nix b/third_party/nixpkgs/pkgs/tools/text/riffdiff/default.nix index 6d8c4cd28c..481a75e1bd 100644 --- a/third_party/nixpkgs/pkgs/tools/text/riffdiff/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/riffdiff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "riffdiff"; - version = "3.3.1"; + version = "3.3.3"; src = fetchFromGitHub { owner = "walles"; repo = "riff"; rev = version; - hash = "sha256-V+YR0j0Dpmsc2psXb/sb/Rp4Eu8/uuBAkmYTPOfkC+g="; + hash = "sha256-IdYQ8vD3ZIzqdNY4JtR8f2huV/DWOhV8FUn7tuRe7IQ="; }; - cargoHash = "sha256-/xUMfORiZVj5RmDweLCDdD6MkgzCIsTdiYpyO3CDT+M="; + cargoHash = "sha256-1on4CTstEvjNLtk1RG6dcNl0XhaPYAy+U0DYn/aVzEg="; meta = with lib; { description = "Diff filter highlighting which line parts have changed"; diff --git a/third_party/nixpkgs/pkgs/tools/text/sgml/opensp/default.nix b/third_party/nixpkgs/pkgs/tools/text/sgml/opensp/default.nix index 2dc71926f2..b69c893975 100644 --- a/third_party/nixpkgs/pkgs/tools/text/sgml/opensp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/sgml/opensp/default.nix @@ -50,6 +50,10 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.cc.isClang autoreconfHook ++ lib.optionals stdenv.hostPlatform.isCygwin [ autoconf automake libtool ]; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-fpermissive"; + }; + doCheck = false; # fails meta = with lib; { 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 a367c61d5b..02f7ca06de 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 = "11.1"; + version = "11.4"; src = fetchurl { url = "http://files.basex.org/releases/${version}/BaseX${builtins.replaceStrings ["."] [""] version}.zip"; - hash = "sha256-Wl6kM3xiWYiQpQZ8/qyotfrs/SvjvnQ0AHOeRms/Io0="; + hash = "sha256-gArcTVD4OoXWB6r9I8q2EXuwCRmbLFE1sO2yfo3AWCQ="; }; nativeBuildInputs = [ unzip copyDesktopItems ]; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/fop/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/fop/default.nix index 94a24211f9..4981ec2a7a 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/fop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/fop/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , ant , jdk , jre @@ -17,6 +18,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-b7Av17wu6Ar/npKOiwYqzlvBFSIuXTpqTacM1sxtBvc="; }; + patches = [ + (fetchpatch { + name = "CVE-2024-28168.patch"; + url = "https://github.com/apache/xmlgraphics-fop/commit/d96ba9a11710d02716b6f4f6107ebfa9ccec7134.patch"; + hash = "sha256-zmUA1Tq6iZtvNECCiXebXodp6AikBn10NTZnVHpPMlw="; + }) + ]; + nativeBuildInputs = [ ant jdk diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/tex-match/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/tex-match/default.nix deleted file mode 100644 index 18dffb657c..0000000000 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/tex-match/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ rustPlatform, fetchFromGitHub, gtk3, pkg-config, glib, lib }: - -rustPlatform.buildRustPackage rec { - pname = "tex-match"; - version = "1.2.0"; - - src = fetchFromGitHub { - owner = "zoeyfyi"; - repo = "TeX-Match"; - rev = "v${version}"; - sha256 = "1yb81j7mbqqb8jcn78dx4ydp7ncbzvaczkli6cqay5jf5j6dbk1z"; - }; - - nativeBuildInputs = [ pkg-config glib ]; - - buildInputs = [ gtk3 ]; - - cargoHash = "sha256-Vgcfir7Mg0mTpN6nx2P2gGcXSoB7iBRVkGTpO1nmMI4="; - - meta = with lib; { - description = "Search through over 1000 different LaTeX symbols by sketching. A desktop version of detexify"; - mainProgram = "tex-match"; - homepage = "https://tex-match.zoey.fyi/"; - license = licenses.mit; - maintainers = [ maintainers.bootstrap-prime ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/video/rtmpdump/default.nix b/third_party/nixpkgs/pkgs/tools/video/rtmpdump/default.nix index 8c5942d852..4ecddd6b68 100644 --- a/third_party/nixpkgs/pkgs/tools/video/rtmpdump/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/rtmpdump/default.nix @@ -31,14 +31,17 @@ stdenv.mkDerivation { }) ]; + preBuild = '' + makeFlagsArray+=(CC="$CC") + ''; + makeFlags = [ "prefix=$(out)" "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ] ++ lib.optional gnutlsSupport "CRYPTO=GNUTLS" ++ lib.optional opensslSupport "CRYPTO=OPENSSL" - ++ lib.optional stdenv.hostPlatform.isDarwin "SYS=darwin" - ++ lib.optional stdenv.cc.isClang "CC=clang"; + ++ lib.optional stdenv.hostPlatform.isDarwin "SYS=darwin"; propagatedBuildInputs = [ zlib ] ++ lib.optionals gnutlsSupport [ gnutls nettle ] diff --git a/third_party/nixpkgs/pkgs/tools/video/svt-av1/default.nix b/third_party/nixpkgs/pkgs/tools/video/svt-av1/default.nix index e9d2c4b571..1b515b792c 100644 --- a/third_party/nixpkgs/pkgs/tools/video/svt-av1/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/svt-av1/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "svt-av1"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitLab { owner = "AOMediaCodec"; repo = "SVT-AV1"; rev = "v${finalAttrs.version}"; - hash = "sha256-LkTcy+CiuhlRnQsjNMA0hTVRVx7pbYs1ujMWjLrhvEU="; + hash = "sha256-/JWFO4eT8bNvhdqJ6S0mGRIP0+aUTbDrlzqzwRqJOog="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/video/untrunc-anthwlock/default.nix b/third_party/nixpkgs/pkgs/tools/video/untrunc-anthwlock/default.nix index 0bdbe29d3e..9598e9a7b1 100644 --- a/third_party/nixpkgs/pkgs/tools/video/untrunc-anthwlock/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/untrunc-anthwlock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ffmpeg_7, libui, unstableGitUpdater, wrapGAppsHook3 }: +{ lib, stdenv, fetchFromGitHub, ffmpeg, libui, unstableGitUpdater, wrapGAppsHook3 }: stdenv.mkDerivation { pname = "untrunc-anthwlock"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ wrapGAppsHook3 ]; - buildInputs = [ ffmpeg_7 libui ]; + buildInputs = [ ffmpeg libui ]; buildPhase = '' runHook preBuild diff --git a/third_party/nixpkgs/pkgs/tools/video/xjadeo/default.nix b/third_party/nixpkgs/pkgs/tools/video/xjadeo/default.nix index 3bda4a8230..7abb717f00 100644 --- a/third_party/nixpkgs/pkgs/tools/video/xjadeo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/xjadeo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, autoreconfHook, fetchFromGitHub, ffmpeg_7, freetype, libGLU +{ lib, stdenv, autoreconfHook, fetchFromGitHub, ffmpeg, freetype, libGLU , libjack2, liblo, libX11, libXv, pkg-config, portmidi, xorg }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ - ffmpeg_7 + ffmpeg libjack2 libX11 xorg.libXext diff --git a/third_party/nixpkgs/pkgs/tools/video/yaydl/default.nix b/third_party/nixpkgs/pkgs/tools/video/yaydl/default.nix index 83463e22c4..a2a7c5d093 100644 --- a/third_party/nixpkgs/pkgs/tools/video/yaydl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/yaydl/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "yaydl"; - version = "0.14.1"; + version = "0.15.5"; src = fetchFromGitHub { owner = "dertuxmalwieder"; repo = pname; rev = "release-${version}"; - sha256 = "sha256-BH+SRr+RYfKsXrzpqggQDJSs+aWJRSi/5tDX5mjpDkk="; + sha256 = "sha256-/GoRMdbTaRDZJaVXdsN+YKpWCgecOhqhRf3iaL0rmE8="; }; - cargoHash = "sha256-q4gwa4KoWiQWKKI3sp00koiH9Ndj23a8F07e72xSF1M="; + cargoHash = "sha256-f81z4ssKyGheuI2WWweFBW8AoafsVgPkX1lYCHDSaaM="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/jumppad/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/jumppad/default.nix index ee521f6b52..4ededb4c28 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/jumppad/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/jumppad/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "jumppad"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "jumppad-labs"; repo = "jumppad"; rev = version; - hash = "sha256-f9V3dws4zvjh3H61FWNv9r/G9EplWR0aA2af2EdjhBs="; + hash = "sha256-UO1a8CoHLNoo74zJkzgSlTkB7XWWHWu2EUiqCvLOQj8="; }; vendorHash = "sha256-S4SyuidH8sxJbuG7yHgSP/iHcuP1h5EHaW8X6gG4GNw="; diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/multipass/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/multipass/default.nix index 053aad4edb..2392246001 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/multipass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/multipass/default.nix @@ -28,7 +28,7 @@ let pname = "multipass"; - version = "1.14.0"; + version = "1.14.1"; # This is done here because a CMakeLists.txt from one of it's submodules tries # to modify a file, so we grab the source for the submodule here, copy it into @@ -48,7 +48,7 @@ stdenv.mkDerivation { owner = "canonical"; repo = "multipass"; rev = "refs/tags/v${version}"; - hash = "sha256-1g5Og4LkNujjT4KCXHmXaiTK58Bgb2KyYLKwTFFVEHE="; + hash = "sha256-i6SKiV4jwiBURx85m3u7km1dhi+fRdVpMBanlZo0VK4="; fetchSubmodules = true; leaveDotGit = true; postFetch = '' diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wl-screenrec/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/wl-screenrec/default.nix index 2ffdbf95de..47fecd9850 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/wl-screenrec/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/wl-screenrec/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , pkg-config , libdrm -, ffmpeg_7 +, ffmpeg , wayland }: @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ wayland libdrm - ffmpeg_7 + ffmpeg ]; doCheck = false; # tests use host compositor, etc diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index 92aa4e134e..87cec31134 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -112,6 +112,7 @@ mapAliases { antennas = throw "antennas has been removed as it only works with tvheadend, which nobody was willing to maintain and was stuck on an unmaintained version that required FFmpeg 4; please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version"; # Added 2024-08-21 androidndkPkgs_23b = lib.warn "The package set `androidndkPkgs_23b` has been renamed to `androidndkPkgs_23`." androidndkPkgs_23; # Added 2024-07-21 ankisyncd = throw "ankisyncd is dead, use anki-sync-server instead"; # Added 2024-08-10 + ao = libfive; # Added 2024-10-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 @@ -127,6 +128,7 @@ mapAliases { archiveopteryx = throw "archiveopteryx depended on an unsupported version of OpenSSL and was unmaintained"; # Added 2024-01-03 ardour_6 = throw "ardour_6 has been removed in favor of newer versions"; # Added 2023-10-13 aria = aria2; # Added 2024-03-26 + armcord = throw "ArmCord was renamed to legcord by the upstream developers. Action is required to migrate configurations between the two applications. Please see this PR for more details: https://github.com/NixOS/nixpkgs/pull/347971"; # Added 2024-10-11 aseprite-unfree = aseprite; # Added 2023-08-26 asls = throw "asls has been removed: abandoned by upstream"; # Added 2023-03-16 asterisk_16 = throw "asterisk_16: Asterisk 16 is end of life and has been removed"; # Added 2023-04-19 @@ -262,6 +264,8 @@ mapAliases { cloog_0_18_0 = throw "cloog_0_18_0 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 cloogppl = throw "cloogppl has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 clang-ocl = throw "'clang-ocl' has been replaced with 'rocmPackages.clang-ocl'"; # Added 2023-10-08 + clang-sierraHack = throw "clang-sierraHack has been removed because it solves a problem that no longer seems to exist. Hey, what were you even doing with that thing anyway?"; # Added 2024-10-05 + clang-sierraHack-stdenv = clang-sierraHack; # Added 2024-10-05 inherit (libsForQt5.mauiPackages) clip; # added 2022-05-17 clpm = throw "'clpm' has been removed from nixpkgs"; # Added 2024-04-01 clwrapperFunction = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 @@ -308,6 +312,7 @@ mapAliases { clang16Stdenv = lowPrio llvmPackages_16.stdenv; clang17Stdenv = lowPrio llvmPackages_17.stdenv; clang18Stdenv = lowPrio llvmPackages_18.stdenv; + clang19Stdenv = lowPrio llvmPackages_19.stdenv; clang-tools_6 = throw "clang-tools_6 has been removed from nixpkgs"; # Added 2024-01-08 clang-tools_7 = throw "clang-tools_7 has been removed from nixpkgs"; # Added 2023-11-19 @@ -329,6 +334,7 @@ mapAliases { clang-tools_16 = llvmPackages_16.clang-tools; # Added 2024-04-22 clang-tools_17 = llvmPackages_17.clang-tools; # Added 2024-04-22 clang-tools_18 = llvmPackages_18.clang-tools; # Added 2024-04-22 + clang-tools_19 = llvmPackages_19.clang-tools; # Added 2024-08-21 cq-editor = throw "cq-editor has been removed, as it use a dependency that was disabled since python 3.8 and was last updated in 2021"; # Added 2024-05-13 @@ -487,6 +493,8 @@ mapAliases { findimagedupes = throw "findimagedupes has been removed because the perl bindings are no longer compatible"; # Added 2023-07-10 finger_bsd = bsd-finger; fingerd_bsd = bsd-fingerd; + firefox-esr-115 = throw "The Firefox 115 ESR series has reached its end of life. Upgrade to `firefox-esr` or `firefox-esr-128` instead."; + firefox-esr-115-unwrapped = throw "The Firefox 115 ESR series has reached its end of life. Upgrade to `firefox-esr-unwrapped` or `firefox-esr-128-unwrapped` instead."; firefox-wayland = firefox; # Added 2022-11-15 firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09 fishfight = jumpy; # Added 2022-08-03 @@ -557,6 +565,12 @@ mapAliases { gmtp = throw "'gmtp' has been removed due to lack of maintenance upstream. Consider using 'gnome-music' instead"; # Added 2024-09-14 gnome-latex = throw "'gnome-latex' has been superseded by 'enter-tex'"; # Added 2024-09-18 gnu-cobol = gnucobol; # Added 2024-09-17 + gogs = throw '' + Gogs development has stalled. Also, it has several unpatched, critical vulnerabilities that + weren't addressed within a year: https://github.com/gogs/gogs/issues/7777 + + Consider migrating to forgejo or gitea. + ''; # Added 2024-10-12 go-dependency-manager = throw "'go-dependency-manager' is unmaintained and the go community now uses 'go.mod' mostly instead"; # Added 2023-10-04 gotktrix = throw "'gotktrix' has been removed, as it was broken and unmaintained"; # Added 2023-12-06 git-backup = throw "git-backup has been removed, as it has been abandoned upstream. Consider using git-backup-go instead."; @@ -709,6 +723,7 @@ mapAliases { hip-common = throw "'hip-common' has been replaced with 'rocmPackages.hip-common'"; # Added 2023-10-08 hip-nvidia = throw "'hip-nvidia' has been removed in favor of 'rocmPackages.clr'"; # Added 2023-10-08 hll2390dw-cups = throw "The hll2390dw-cups package was dropped since it was unmaintained."; # Added 2024-06-21 + hop-cli = throw "hop-cli has been removed as the service has been shut-down"; # Added 2024-08-13 ht-rust = xh; # Added 2021-02-13 hydra_unstable = hydra; # Added 2024-08-22 hydron = throw "hydron has been removed as the project has been archived upstream since 2022 and is affected by a severe remote code execution vulnerability"; @@ -729,6 +744,7 @@ mapAliases { imagemagick7 = imagemagick; # Added 2021-02-22 imagemagick7_light = imagemagick_light; # Added 2021-02-22 imlib = throw "imlib has been dropped due to the lack of maintenance from upstream since 2004"; # Added 2023-01-04 + immersed-vr = lib.warn "'immersed-vr' has been renamed to 'immersed'" immersed; # Added 2024-08-11 indiepass-desktop = throw "indiepass-desktop has been dropped because it does not work with recent Electron versions"; # Added 2024-03-14 indigenous-desktop = throw "'indigenous-desktop' has been renamed to/replaced by 'indiepass-desktop'"; # Added 2023-11-08 input-utils = throw "The input-utils package was dropped since it was unmaintained."; # Added 2024-06-21 @@ -763,6 +779,7 @@ mapAliases { jsawk = throw "'jsawk' has been removed because it is unmaintained upstream"; # Added 2028-08-07 # Julia + julia_16-bin = throw "'julia_16-bin' has been removed from nixpkgs as it has reached end of life"; # Added 2024-10-08 julia_18 = throw "'julia_18' has been removed from nixpkgs as it has reached end of life"; # Added 2024-01-11 julia_18-bin = throw "'julia_18-bin' has been removed from nixpkgs as it has reached end of life"; # Added 2024-01-11 @@ -828,7 +845,6 @@ mapAliases { libbpf_1 = libbpf; # Added 2022-12-06 libbson = mongoc; # Added 2024-03-11 libcap_pam = throw "'libcap_pam' has been replaced with 'libcap'"; # Converted to throw 2023-09-10 - libclc = llvmPackages_18.libclc; # Added 2023-10-28 libcxxabi = throw "'libcxxabi' was merged into 'libcxx'"; # Converted to throw 2024-03-08 libdwarf_20210528 = throw "'libdwarf_20210528' has been removed because it is not used in nixpkgs, move to libdwarf"; # Added 2024-03-23 libgme = game-music-emu; # Added 2022-07-20 @@ -1232,9 +1248,11 @@ mapAliases { pcsxr = throw "pcsxr was removed as it has been abandoned for over a decade; please use DuckStation, Mednafen, or the RetroArch PCSX ReARMed core"; # Added 2024-08-20 pdf2xml = throw "'pdf2xml' was removed: abandoned for years."; # Added 2023-10-22 peach = asouldocs; # Added 2022-08-28 + percona-server_innovation = lib.warn "Percona upstream has decided to skip all Innovation releases of MySQL and only release LTS versions." percona-server; # Added 2024-10-13 + percona-server_lts = percona-server; # Added 2024-10-13 + percona-xtrabackup_innovation = lib.warn "Percona upstream has decided to skip all Innovation releases of MySQL and only release LTS versions." percona-xtrabackup; # Added 2024-10-13 + percona-xtrabackup_lts = percona-xtrabackup; # Added 2024-10-13 pentablet-driver = xp-pen-g430-driver; # Added 2022-06-23 - percona-server_8_0 = percona-server_lts; # Added 2024-05-07 - percona-xtrabackup_8_0 = percona-xtrabackup_lts; # Added 2024-05-07 perldevel = throw "'perldevel' has been dropped due to lack of updates in nixpkgs and lack of consistent support for devel versions by 'perl-cross' releases, use 'perl' instead"; perldevelPackages = perldevel; petrinizer = throw "'petrinizer' has been removed, as it was broken and unmaintained"; # added 2024-05-09 @@ -1275,6 +1293,7 @@ mapAliases { pgtap = postgresqlPackages.pgtap; plv8 = postgresqlPackages.plv8; postgis = postgresqlPackages.postgis; + tex-match = throw "'tex-match' has been removed due to lack of maintenance upstream. Consider using 'hieroglyphic' instead"; # Added 2024-09-24 texinfo5 = throw "'texinfo5' has been removed from nixpkgs"; # Added 2024-09-10 timescaledb = postgresqlPackages.timescaledb; tsearch_extras = postgresqlPackages.tsearch_extras; @@ -1322,6 +1341,7 @@ mapAliases { protobuf3_23 = protobuf_23; protobuf3_21 = protobuf_21; protonup = protonup-ng; # Added 2022-11-06 + protonvpn-gui_legacy = throw "protonvpn-gui_legacy source code was removed from upstream. Use protonvpn-gui instead."; # Added 2024-10-12 proxmark3-rrg = proxmark3; # Added 2023-07-25 proxmark3-unstable = throw "removed in favor of rfidresearchgroup fork"; # Added 2023-07-25 psensor = throw "'psensor' has been removed due to lack of maintenance upstream. Consider using 'mission-center', 'resources' or 'monitorets' instead"; # Added 2024-09-14 @@ -1531,6 +1551,14 @@ mapAliases { ssm-agent = amazon-ssm-agent; # Added 2023-10-17 starboard-octant-plugin = throw "starboard-octant-plugin has been dropped due to needing octant which is archived"; # Added 2023-09-29 starspace = throw "starspace has been removed from nixpkgs, as it was broken"; # Added 2024-07-15 + steamPackages = { + steamArch = throw "`steamPackages.steamArch` has been removed as it's no longer applicable"; + steam = lib.warn "`steamPackages.steam` has been moved to top level as `steam-unwrapped`" steam-unwrapped; + steam-fhsenv = lib.warn "`steamPackages.steam-fhsenv` has been moved to top level as `steam`" steam; + steam-fhsenv-without-steam = lib.warn "`steamPackages.steam-fhsenv-without-steam` has been moved to top level as `steam-fhsenv-without-steam`" steam-fhsenv-without-steam; + steamcmd = lib.warn "`steamPackages.steamcmd` has been moved to top level as `steamcmd`" steamcmd; + }; + steam-small = steam; # Added 2024-09-12 steam-run-native = steam-run; # added 2022-02-21 StormLib = stormlib; # Added 2024-01-21 sumneko-lua-language-server = lua-language-server; # Added 2023-02-07 @@ -1691,6 +1719,7 @@ mapAliases { waypoint = throw "waypoint has been removed from nixpkgs as the upstream project was archived"; # Added 2024-04-24 wcm = throw "'wcm' has been renamed to/replaced by 'wayfirePlugins.wcm'"; # Add 2023-07-29 webkitgtk_5_0 = throw "'webkitgtk_5_0' has been superseded by 'webkitgtk_6_0'"; # Added 2023-02-25 + webkitgtk = lib.warn "Explicitly set the ABI version of 'webkitgtk'" webkitgtk_4_0; wineWayland = wine-wayland; win-qemu = throw "'win-qemu' has been replaced by 'virtio-win'"; # Added 2023-08-16 win-virtio = virtio-win; # Added 2023-10-17 @@ -1710,6 +1739,7 @@ mapAliases { wrapLisp_old = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 wmii_hg = wmii; wrapGAppsHook = wrapGAppsHook3; # Added 2024-03-26 + write_stylus = styluslabs-write-bin; # Added 2024-10-09 wxGTK30 = throw "wxGTK30 has been removed from nixpkgs as it has reached end of life"; # Added 2023-03-22 wxGTK30-gtk2 = wxGTK30; # Added 2022-12-03 wxGTK30-gtk3 = wxGTK30; # Added 2022-12-03 @@ -1732,6 +1762,7 @@ mapAliases { xineUI = xine-ui; # Added 2021-04-27 xmlada = gnatPackages.xmlada; # Added 2024-02-25 xmr-stak = throw "xmr-stak has been removed from nixpkgs because it was broken"; # Added 2024-07-15 + xmake-core-sv = throw "'xmake-core-sv' has been removed, use 'libsv' instead"; # Added 2024-10-10 xonsh-unwrapped = python3Packages.xonsh; # Added 2024-06-18 xprite-editor = throw "'xprite-editor' has been removed due to lack of maintenance upstream. Consider using 'pablodraw' or 'aseprite' instead"; # Added 2024-09-14 xtrt = throw "xtrt has been removed due to being abandoned"; # Added 2023-05-25 diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 2bf494982a..c6e143b53a 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -281,7 +281,9 @@ with pkgs; fission = callPackage ../development/tools/fission { }; - apko = callPackage ../development/tools/apko { }; + apko = callPackage ../development/tools/apko { + buildGoModule = buildGo123Module; + }; melange = callPackage ../development/tools/melange { }; @@ -313,8 +315,6 @@ with pkgs; beeper = callPackage ../applications/networking/instant-messengers/beeper { }; - bakelite = callPackage ../tools/backup/bakelite { }; - bearer = callPackage ../development/tools/bearer { }; benthos = callPackage ../development/tools/benthos { }; @@ -745,8 +745,6 @@ with pkgs; erosmb = callPackage ../tools/security/erosmb { }; - eslint_d = callPackage ../development/tools/eslint_d { }; - oauth2c = callPackage ../tools/security/oauth2c { }; octodns = python3Packages.callPackage ../tools/networking/octodns { }; @@ -1452,7 +1450,9 @@ with pkgs; accuraterip-checksum = callPackage ../tools/audio/accuraterip-checksum { }; - acme-dns = callPackage ../servers/dns/acme-dns/default.nix { }; + acme-dns = callPackage ../servers/dns/acme-dns/default.nix { + buildGoModule = buildGo122Module; # https://github.com/joohoi/acme-dns/issues/365 + }; acme-sh = callPackage ../tools/admin/acme-sh { }; @@ -2191,8 +2191,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; - git-branchstack = python3.pkgs.callPackage ../applications/version-management/git-branchstack { }; - git-bug = callPackage ../applications/version-management/git-bug { }; git-bug-migration = callPackage ../applications/version-management/git-bug-migration { }; @@ -2364,7 +2362,7 @@ with pkgs; gitls = callPackage ../applications/version-management/gitls { }; - gitmux = callPackage ../applications/version-management/gitmux { }; + gitmux = callPackage ../applications/version-management/gitmux { buildGoModule = buildGo122Module; }; gitnuro = callPackage ../applications/version-management/gitnuro { }; @@ -2382,8 +2380,6 @@ with pkgs; gitweb = callPackage ../applications/version-management/gitweb { }; - glab = callPackage ../applications/version-management/glab { }; - glitter = callPackage ../applications/version-management/glitter { }; globalping-cli = callPackage ../tools/networking/globalping-cli { }; @@ -3218,8 +3214,6 @@ with pkgs; boxxy = callPackage ../tools/misc/boxxy { }; - boundary = callPackage ../tools/networking/boundary { }; - chamber = callPackage ../tools/admin/chamber { }; chaos = callPackage ../tools/networking/chaos { }; @@ -3826,8 +3820,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon; }; - waydroid = callPackage ../os-specific/linux/waydroid { }; - wgo = callPackage ../development/tools/wgo { }; wiiload = callPackage ../development/tools/wiiload { }; @@ -4422,8 +4414,6 @@ with pkgs; clapboard = callPackage ../tools/wayland/clapboard { }; - cliphist = callPackage ../tools/wayland/cliphist { }; - clipman = callPackage ../tools/wayland/clipman { }; kabeljau = callPackage ../games/kabeljau { }; @@ -5006,8 +4996,6 @@ with pkgs; tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; }; - tex-match = callPackage ../tools/typesetting/tex/tex-match { }; - texFunctions = callPackage ../tools/typesetting/tex/nix pkgs; # TeX Live; see https://nixos.org/nixpkgs/manual/#sec-language-texlive @@ -5164,12 +5152,6 @@ with pkgs; buildGoModule = buildGo123Module; }; - gscan2pdf = callPackage ../applications/graphics/gscan2pdf { - # needs this fork of libtiff, because original libtiff - # stopped packaging required tools with version 4.6 - libtiff = libtiff_t; - }; - gsctl = callPackage ../applications/misc/gsctl { }; gsocket = callPackage ../tools/networking/gsocket { }; @@ -5482,9 +5464,7 @@ with pkgs; medusa = callPackage ../tools/security/medusa { }; - megasync = libsForQt5.callPackage ../applications/misc/megasync { - ffmpeg = ffmpeg_7; - }; + megasync = libsForQt5.callPackage ../applications/misc/megasync { }; megacmd = callPackage ../applications/misc/megacmd { }; @@ -5623,6 +5603,10 @@ with pkgs; nltk-data = callPackage ../tools/text/nltk-data { }; + seabios-coreboot = seabios.override { ___build-type = "coreboot"; }; + seabios-csm = seabios.override { ___build-type = "csm"; }; + seabios-qemu = seabios.override { ___build-type = "qemu"; }; + seaborn-data = callPackage ../tools/misc/seaborn-data { }; nodepy-runtime = with python3.pkgs; toPythonApplication nodepy-runtime; @@ -6273,8 +6257,6 @@ with pkgs; chkrootkit = callPackage ../tools/security/chkrootkit { }; - chrony = callPackage ../tools/networking/chrony { }; - chunkfs = callPackage ../tools/filesystems/chunkfs { }; chunksync = callPackage ../tools/backup/chunksync { }; @@ -6843,6 +6825,8 @@ with pkgs; deer = callPackage ../shells/zsh/zsh-deer { }; + deno_1 = callPackage ../by-name/de/deno/1/package.nix { }; + deqp-runner = callPackage ../tools/graphics/deqp-runner { }; detox = callPackage ../tools/misc/detox { }; @@ -7268,8 +7252,6 @@ with pkgs; z-lua = callPackage ../tools/misc/z-lua { }; - zabbix-cli = callPackage ../tools/misc/zabbix-cli { }; - zabbixctl = callPackage ../tools/misc/zabbixctl { }; zee = callPackage ../applications/editors/zee { @@ -7901,8 +7883,6 @@ with pkgs; gitqlient = libsForQt5.callPackage ../applications/version-management/gitqlient { }; - gogs = callPackage ../applications/version-management/gogs { }; - git-latexdiff = callPackage ../tools/typesetting/git-latexdiff { }; gokart = callPackage ../development/tools/gokart { }; @@ -8296,9 +8276,7 @@ with pkgs; gvproxy = callPackage ../tools/networking/gvproxy { }; - gyroflow = qt6Packages.callPackage ../applications/video/gyroflow { - ffmpeg = ffmpeg_7; - }; + gyroflow = qt6Packages.callPackage ../applications/video/gyroflow { }; gzip = callPackage ../tools/compression/gzip { }; @@ -8561,12 +8539,6 @@ with pkgs; hybridreverb2 = callPackage ../applications/audio/hybridreverb2 { }; - hylafaxplus = callPackage ../servers/hylafaxplus { - # needs this fork of libtiff, because original libtiff - # stopped packaging required tools with version 4.6 - libtiff = libtiff_t; - }; - hyphen = callPackage ../development/libraries/hyphen { }; hyphenDicts = recurseIntoAttrs (callPackages ../development/libraries/hyphen/dictionaries.nix {}); @@ -8630,6 +8602,7 @@ with pkgs; fmt = fmt_8.override { inherit stdenv; }; nanodbc_llvm = nanodbc.override { inherit stdenv; }; avro-cpp_llvm = avro-cpp.override { inherit stdenv boost; }; + spdlog_llvm = spdlog.override { inherit stdenv fmt; }; }) irods irods-icommands; @@ -8860,7 +8833,9 @@ with pkgs; jmespath = callPackage ../development/tools/jmespath { }; - juicefs = callPackage ../tools/filesystems/juicefs { }; + juicefs = callPackage ../tools/filesystems/juicefs { + buildGoModule = buildGo122Module; + }; juicity = callPackage ../tools/networking/juicity { }; @@ -9181,7 +9156,7 @@ with pkgs; lesspipe = callPackage ../tools/misc/lesspipe { }; liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { - ffmpeg = ffmpeg-full; + ffmpeg = ffmpeg_6-full; ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; @@ -10174,8 +10149,6 @@ with pkgs; ms-sys = callPackage ../tools/misc/ms-sys { }; - mtdutils = callPackage ../tools/filesystems/mtdutils { }; - mtools = callPackage ../tools/filesystems/mtools { }; mtr = callPackage ../tools/networking/mtr { }; @@ -11028,10 +11001,8 @@ with pkgs; perceptualdiff = callPackage ../tools/graphics/perceptualdiff { }; - inherit (import ../servers/sql/percona-server pkgs) percona-server_lts percona-server_innovation; - percona-server = percona-server_lts; - inherit (import ../tools/backup/percona-xtrabackup pkgs) percona-xtrabackup_lts percona-xtrabackup_innovation; - percona-xtrabackup = percona-xtrabackup_lts; + inherit (import ../servers/sql/percona-server pkgs) percona-server_8_0 percona-server_8_4 percona-server; + inherit (import ../tools/backup/percona-xtrabackup pkgs) percona-xtrabackup_8_0 percona-xtrabackup_8_4 percona-xtrabackup; pick = callPackage ../tools/misc/pick { }; @@ -12423,8 +12394,6 @@ with pkgs; soundkonverter = libsForQt5.soundkonverter; - soundwireserver = callPackage ../applications/audio/soundwireserver { }; - sozu = callPackage ../servers/sozu { }; spacer = callPackage ../tools/misc/spacer { }; @@ -13672,6 +13641,10 @@ with pkgs; vul = callPackage ../applications/misc/vul { }; + vuls = callPackage ../by-name/vu/vuls/package.nix { + buildGoModule = buildGo123Module; + }; + xarchive = callPackage ../tools/archivers/xarchive { }; xarchiver = callPackage ../tools/archivers/xarchiver { }; @@ -13814,10 +13787,6 @@ with pkgs; wget2 = callPackage ../tools/networking/wget2 { }; - wgpu-utils = callPackage ../tools/graphics/wgpu-utils { - inherit (darwin.apple_sdk.frameworks) QuartzCore; - }; - wg-bond = callPackage ../applications/networking/wg-bond { }; wgcf = callPackage ../applications/networking/wgcf { }; @@ -14409,13 +14378,6 @@ with pkgs; libclang = llvmPackages.libclang; clang-manpages = llvmPackages.clang-manpages; - clang-sierraHack = clang.override { - name = "clang-wrapper-with-reexport-hack"; - bintools = darwin.binutils.override { - useMacosReexportHack = true; - }; - }; - clang = llvmPackages.clang; clang_12 = llvmPackages_12.clang; clang_13 = llvmPackages_13.clang; @@ -14438,7 +14400,6 @@ with pkgs; #Use this instead of stdenv to build with clang clangStdenv = if stdenv.cc.isClang then stdenv else lowPrio llvmPackages.stdenv; - clang-sierraHack-stdenv = overrideCC stdenv buildPackages.clang-sierraHack; libcxxStdenv = if stdenv.hostPlatform.isDarwin then stdenv else lowPrio llvmPackages.libcxxStdenv; clean = callPackage ../development/compilers/clean { }; @@ -14553,6 +14514,7 @@ with pkgs; flutterPackages-source = recurseIntoAttrs (callPackage ../development/compilers/flutter { useNixpkgsEngine = true; }); flutterPackages = flutterPackages-bin; flutter = flutterPackages.stable; + flutter326 = flutterPackages.v3_26; flutter324 = flutterPackages.v3_24; flutter319 = flutterPackages.v3_19; @@ -14577,9 +14539,7 @@ with pkgs; gbforth = callPackage ../development/compilers/gbforth { }; - default-gcc-version = - if (with stdenv.targetPlatform; isVc4 || libc == "relibc") then 6 - else 13; + default-gcc-version = 13; gcc = pkgs.${"gcc${toString default-gcc-version}"}; gccFun = callPackage ../development/compilers/gcc; gcc-unwrapped = gcc.cc; @@ -15009,8 +14969,6 @@ with pkgs; hop = callPackage ../development/compilers/hop { }; - hop-cli = throw "hop-cli has been removed as the service has been shut-down"; #Added 2024-08-13 - falcon = callPackage ../development/interpreters/falcon { stdenv = gcc10Stdenv; }; @@ -15188,18 +15146,19 @@ with pkgs; juniper = callPackage ../development/compilers/juniper { }; inherit (callPackage ../development/compilers/julia { }) - julia_16-bin julia_19-bin julia_110-bin + julia_111-bin julia_19 - julia_110; + julia_110 + julia_111; - julia-lts = julia_16-bin; - julia-stable = julia_110; + julia-lts = julia_110-bin; + julia-stable = julia_111; julia = julia-stable; - julia-lts-bin = julia_16-bin; - julia-stable-bin = julia_110-bin; + julia-lts-bin = julia_110-bin; + julia-stable-bin = julia_111-bin; julia-bin = julia-stable-bin; kind2 = darwin.apple_sdk_11_0.callPackage ../development/compilers/kind2 { }; @@ -15280,6 +15239,7 @@ with pkgs; mlir_16 = llvmPackages_16.mlir; mlir_17 = llvmPackages_17.mlir; + libclc = llvmPackages.libclc; libllvm = llvmPackages.libllvm; llvm-manpages = llvmPackages.llvm-manpages; @@ -15527,11 +15487,11 @@ with pkgs; wrapRustcWith = { rustc-unwrapped, ... } @ args: callPackage ../build-support/rust/rustc-wrapper args; wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; }; - rust_1_80 = callPackage ../development/compilers/rust/1_80.nix { + rust_1_81 = callPackage ../development/compilers/rust/1_81.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; llvm_18 = llvmPackages_18.libllvm; }; - rust = rust_1_80; + rust = rust_1_81; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; @@ -15539,8 +15499,8 @@ with pkgs; openssl = openssl_1_1; }; - rustPackages_1_80 = rust_1_80.packages.stable; - rustPackages = rustPackages_1_80; + rustPackages_1_81 = rust_1_81.packages.stable; + rustPackages = rustPackages_1_81; inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform; @@ -17306,8 +17266,6 @@ with pkgs; cl-launch = callPackage ../development/tools/misc/cl-launch { }; - clean-css-cli = callPackage ../development/tools/clean-css-cli { }; - cloud-nuke = callPackage ../development/tools/cloud-nuke { }; cloudcompare = libsForQt5.callPackage ../applications/graphics/cloudcompare { }; @@ -17388,8 +17346,6 @@ with pkgs; cov-build = callPackage ../development/tools/analysis/cov-build { }; - cpplint = callPackage ../development/tools/analysis/cpplint { }; - credstash = with python3Packages; toPythonApplication credstash; creduce = callPackage ../development/tools/misc/creduce { @@ -18437,8 +18393,6 @@ with pkgs; smc = callPackage ../tools/misc/smc { }; - snakemake = callPackage ../applications/science/misc/snakemake { }; - snore = callPackage ../tools/misc/snore { }; snzip = callPackage ../tools/archivers/snzip { }; @@ -19085,7 +19039,7 @@ with pkgs; captive-browser = callPackage ../applications/networking/browsers/captive-browser { }; - catboost = callPackage ../development/libraries/catboost { + catboost = callPackage ../by-name/ca/catboost/package.nix { # https://github.com/catboost/catboost/issues/2540 cudaPackages = cudaPackages_11; }; @@ -19189,8 +19143,6 @@ with pkgs; protobuf = protobuf_21; }; - coeurl = callPackage ../development/libraries/coeurl { }; - coercer = callPackage ../tools/security/coercer { }; cogl = callPackage ../development/libraries/cogl { @@ -19952,9 +19904,11 @@ with pkgs; gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { }; - gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { + gst_all_1 = recurseIntoAttrs (callPackage ../development/libraries/gstreamer { callPackage = newScope gst_all_1; - inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Cocoa CoreFoundation CoreMedia CoreServices CoreVideo DiskArbitration Foundation IOKit MediaToolbox OpenGL Security SystemConfiguration VideoToolbox; + stdenv = if stdenv.isDarwin then overrideSDK stdenv "12.3" else stdenv; + inherit (darwin.apple_sdk_12_3.frameworks) AudioToolbox AVFoundation Cocoa CoreFoundation CoreMedia CoreServices CoreVideo DiskArbitration Foundation IOKit MediaToolbox OpenGL Security SystemConfiguration VideoToolbox; + inherit (darwin.apple_sdk_12_3.libs) xpc; }); gusb = callPackage ../development/libraries/gusb { }; @@ -20248,7 +20202,7 @@ with pkgs; hwloc = callPackage ../development/libraries/hwloc { }; - hydra = callPackage ../by-name/hy/hydra/package.nix { nix = nixVersions.nix_2_23; }; + hydra = callPackage ../by-name/hy/hydra/package.nix { nix = nixVersions.nix_2_24; }; hydra-cli = callPackage ../development/tools/misc/hydra-cli { }; @@ -20566,10 +20520,7 @@ with pkgs; libantlr3c = callPackage ../development/libraries/libantlr3c { }; - libaom = callPackage ../development/libraries/libaom { - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116737 - stdenv = if stdenv.hostPlatform.isAarch64 && stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "14" then gcc13Stdenv else stdenv; - }; + libaom = callPackage ../development/libraries/libaom { }; libappindicator-gtk2 = libappindicator.override { gtkVersion = "2"; }; libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; }; @@ -20721,8 +20672,6 @@ with pkgs; libcomps = callPackage ../tools/package-management/libcomps { python = python3; }; - libcpr = callPackage ../development/libraries/libcpr { }; - libcredis = callPackage ../development/libraries/libcredis { }; libctb = callPackage ../development/libraries/libctb { }; @@ -21617,15 +21566,6 @@ with pkgs; libtifiles2 = callPackage ../development/libraries/libtifiles2 { }; - inherit - ({ - libtiff = callPackage ../development/libraries/libtiff { }; - libtiff_t = callPackage ../development/libraries/libtiff/libtiff_t.nix { }; - }) - libtiff - libtiff_t - ; - libtiger = callPackage ../development/libraries/libtiger { }; libtommath = callPackage ../development/libraries/libtommath { }; @@ -21761,10 +21701,7 @@ with pkgs; libvisual = callPackage ../development/libraries/libvisual { }; - libvmaf = callPackage ../development/libraries/libvmaf { - # See libaom - stdenv = if stdenv.hostPlatform.isAarch64 && stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "14" then gcc13Stdenv else stdenv; - }; + libvmaf = callPackage ../development/libraries/libvmaf { }; libvncserver = callPackage ../development/libraries/libvncserver { inherit (darwin.apple_sdk.frameworks) Carbon; @@ -22171,8 +22108,6 @@ with pkgs; mtpfs = callPackage ../tools/filesystems/mtpfs { }; - mtxclient = callPackage ../development/libraries/mtxclient { }; - mu = callPackage ../tools/networking/mu { }; mueval = callPackage ../development/tools/haskell/mueval { }; @@ -22359,6 +22294,13 @@ with pkgs; url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz"; hash = "sha256-n3KFrN/mN1SVXfuhEUAQ1fJzrCvhiclxfEIouyj9Z18="; }; + patches = [ + # Backport GCC 14 build fix + (fetchpatch { + url = "https://github.com/Open-Cascade-SAS/OCCT/commit/7236e83dcc1e7284e66dc61e612154617ef715d6.patch"; + hash = "sha256-NoC2mE3DG78Y0c9UWonx1vmXoU4g5XxFUT3eVXqLU60="; + }) + ]; }; opencl-headers = callPackage ../development/libraries/opencl-headers { }; @@ -22464,7 +22406,7 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) Security; }; - openssl = openssl_3; + openssl = openssl_3_3; openssl_legacy = openssl.override { conf = ../development/libraries/openssl/3.0/legacy.cnf; @@ -22473,7 +22415,6 @@ with pkgs; inherit (callPackages ../development/libraries/openssl { }) openssl_1_1 openssl_3 - openssl_3_2 openssl_3_3; opensubdiv = callPackage ../development/libraries/opensubdiv { }; @@ -22618,7 +22559,7 @@ with pkgs; prospector = callPackage ../development/tools/prospector { }; - protobuf = protobuf_25; + protobuf = protobuf_28; inherit ({ @@ -23288,8 +23229,6 @@ with pkgs; tagparser = callPackage ../development/libraries/tagparser { }; - taskflow = callPackage ../development/libraries/taskflow { }; - tclap = tclap_1_2; tclap_1_2 = callPackage ../development/libraries/tclap/1.2.nix { }; @@ -23545,17 +23484,17 @@ with pkgs; wcslib = callPackage ../development/libraries/science/astronomy/wcslib { }; - webkitgtk = callPackage ../development/libraries/webkitgtk { + webkitgtk_4_0 = callPackage ../development/libraries/webkitgtk { harfbuzz = harfbuzzFull; inherit (gst_all_1) gst-plugins-base gst-plugins-bad; inherit (darwin) apple_sdk; }; - webkitgtk_4_1 = webkitgtk.override { + webkitgtk_4_1 = webkitgtk_4_0.override { libsoup = libsoup_3; }; - webkitgtk_6_0 = webkitgtk.override { + webkitgtk_6_0 = webkitgtk_4_0.override { libsoup = libsoup_3; gtk3 = gtk4; }; @@ -23648,8 +23587,6 @@ with pkgs; xgeometry-select = callPackage ../tools/X11/xgeometry-select { }; - xmake-core-sv = callPackage ../development/libraries/xmake-core-sv { }; - xmlrpc_c = callPackage ../development/libraries/xmlrpc-c { }; xmlsec = callPackage ../development/libraries/xmlsec { }; @@ -23858,9 +23795,9 @@ with pkgs; ### DEVELOPMENT / GO # the unversioned attributes should always point to the same go version - go = go_1_22; - buildGoModule = buildGo122Module; - buildGoPackage = buildGo122Package; + go = go_1_23; + buildGoModule = buildGo123Module; + buildGoPackage = buildGo123Package; # requires a newer Apple SDK go_1_22 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.22.nix { @@ -24000,13 +23937,13 @@ with pkgs; ### DEVELOPMENT / PERL MODULES perlInterpreters = import ../development/interpreters/perl { inherit callPackage; }; - inherit (perlInterpreters) perl536 perl538; + inherit (perlInterpreters) perl538 perl540; - perl536Packages = recurseIntoAttrs perl536.pkgs; perl538Packages = recurseIntoAttrs perl538.pkgs; + perl540Packages = recurseIntoAttrs perl540.pkgs; - perl = perl538; - perlPackages = perl538Packages; + perl = perl540; + perlPackages = perl540Packages; ack = perlPackages.ack; @@ -24528,8 +24465,10 @@ with pkgs; maker-panel = callPackage ../tools/misc/maker-panel { }; mastodon = callPackage ../servers/mastodon { - nodejs-slim = nodejs-slim_20; - ruby = ruby_3_2; + nodejs-slim = nodejs-slim_22; + python3 = python311; + ruby = ruby_3_3; + yarn-berry = yarn-berry.override { nodejs = nodejs-slim_22; }; }; gotosocial = callPackage ../servers/gotosocial { }; @@ -24541,9 +24480,6 @@ with pkgs; matrix-alertmanager = callPackage ../servers/monitoring/matrix-alertmanager { }; - mattermost = callPackage ../servers/mattermost { }; - matterircd = callPackage ../servers/mattermost/matterircd.nix { }; - mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { }; memcached = callPackage ../servers/memcached { }; @@ -25533,8 +25469,6 @@ with pkgs; coredns = callPackage ../servers/dns/coredns { }; - corerad = callPackage ../tools/networking/corerad { }; - cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { }; cpupower-gui = python3Packages.callPackage ../os-specific/linux/cpupower-gui { @@ -26007,8 +25941,6 @@ with pkgs; kmod = callPackage ../os-specific/linux/kmod { }; - kmod-blacklist-ubuntu = callPackage ../os-specific/linux/kmod-blacklist-ubuntu { }; - kmod-debian-aliases = callPackage ../os-specific/linux/kmod-debian-aliases { }; libcap = callPackage ../os-specific/linux/libcap { }; @@ -26381,8 +26313,6 @@ with pkgs; rojo = callPackage ../development/tools/rojo { }; - mediamtx = callPackage ../servers/mediamtx { }; - rtkit = callPackage ../os-specific/linux/rtkit { }; rt-tests = callPackage ../os-specific/linux/rt-tests { }; @@ -26587,6 +26517,7 @@ with pkgs; ubootBananaPim64 ubootAmx335xEVM ubootClearfog + ubootCM3588NAS ubootCubieboard2 ubootGuruplug ubootJetsonTK1 @@ -26599,6 +26530,7 @@ with pkgs; ubootOlimexA64Olinuxino ubootOlimexA64Teres1 ubootOrangePi3 + ubootOrangePi3B ubootOrangePi5 ubootOrangePi5Plus ubootOrangePiPc @@ -27335,8 +27267,6 @@ with pkgs; inherit (plasma5Packages) breeze-icons; }; - lxgw-wenkai = callPackage ../data/fonts/lxgw-wenkai { }; - maia-icon-theme = libsForQt5.callPackage ../data/icons/maia-icon-theme { }; mailcap = callPackage ../data/misc/mailcap { }; @@ -28124,8 +28054,6 @@ with pkgs; anytone-emu = callPackage ../applications/radio/anytone-emu { }; - ao = libfive; - apache-directory-studio = callPackage ../applications/networking/apache-directory-studio { }; apkeep = callPackage ../tools/misc/apkeep { @@ -28189,10 +28117,6 @@ with pkgs; audacious = audacious.override { audacious-plugins = null; }; }; - audacity = callPackage ../applications/audio/audacity { - inherit (darwin.apple_sdk.frameworks) AppKit CoreAudioKit; - }; - audio-recorder = callPackage ../applications/audio/audio-recorder { }; auto-multiple-choice = callPackage ../applications/misc/auto-multiple-choice { }; @@ -28217,8 +28141,6 @@ with pkgs; ax25-tools = callPackage ../applications/radio/ax25-tools { }; - azpainter = callPackage ../applications/graphics/azpainter { }; - bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv @@ -28276,9 +28198,6 @@ with pkgs; boost = boost175; }; - - armcord = callPackage ../applications/networking/instant-messengers/armcord { }; - autopanosiftc = callPackage ../applications/graphics/autopanosiftc { }; ausweisapp = qt6Packages.callPackage ../applications/misc/ausweisapp { }; @@ -28454,7 +28373,7 @@ with pkgs; cardo = callPackage ../data/fonts/cardo { }; cage = callPackage ../applications/window-managers/cage { - wlroots = wlroots_0_17; + wlroots = wlroots_0_18; }; calf = callPackage ../applications/audio/calf { @@ -29177,11 +29096,6 @@ with pkgs; foliate = callPackage ../applications/office/foliate { }; - font-manager = callPackage ../by-name/fo/font-manager/package.nix { - libsoup = libsoup_3; - webkitgtk = webkitgtk_6_0; - }; - fontfinder = callPackage ../applications/misc/fontfinder { }; fontpreview = callPackage ../applications/misc/fontpreview { }; @@ -29389,7 +29303,7 @@ with pkgs; wavrsocvt = callPackage ../applications/misc/audio/wavrsocvt { }; - welle-io = libsForQt5.callPackage ../applications/radio/welle-io { }; + welle-io = qt6Packages.callPackage ../applications/radio/welle-io { }; wireshark = qt6Packages.callPackage ../applications/networking/sniffers/wireshark { inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices SystemConfiguration; @@ -29415,8 +29329,6 @@ with pkgs; fclones-gui = darwin.apple_sdk_11_0.callPackage ../tools/misc/fclones/gui.nix { }; - fcp = callPackage ../tools/misc/fcp { }; - fdupes = callPackage ../tools/misc/fdupes { }; feh = callPackage ../applications/graphics/feh { @@ -29441,7 +29353,6 @@ with pkgs; firefox-unwrapped = firefoxPackages.firefox; firefox-beta-unwrapped = firefoxPackages.firefox-beta; firefox-devedition-unwrapped = firefoxPackages.firefox-devedition; - firefox-esr-115-unwrapped = firefoxPackages.firefox-esr-115; firefox-esr-128-unwrapped = firefoxPackages.firefox-esr-128; firefox-esr-unwrapped = firefoxPackages.firefox-esr-128; @@ -29467,12 +29378,6 @@ with pkgs; wmClass = "firefox-esr"; icon = "firefox-esr"; }; - firefox-esr-115 = wrapFirefox firefox-esr-115-unwrapped { - nameSuffix = "-esr"; - desktopName = "Firefox ESR"; - wmClass = "firefox-esr"; - icon = "firefox-esr"; - }; firefox-esr = firefox-esr-128; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { @@ -30771,10 +30676,7 @@ with pkgs; lifelines = callPackage ../applications/misc/lifelines { }; - liferea = callPackage ../applications/networking/newsreaders/liferea { - libsoup = libsoup_3; - webkitgtk = webkitgtk_4_1; - }; + liferea = callPackage ../applications/networking/newsreaders/liferea { }; lightworks = callPackage ../applications/video/lightworks { }; @@ -30836,10 +30738,6 @@ with pkgs; lime = callPackage ../development/libraries/lime { }; - luakit = callPackage ../applications/networking/browsers/luakit { - inherit (luajitPackages) luafilesystem; - }; - looking-glass-client = callPackage ../applications/virtualization/looking-glass-client { }; ltc-tools = callPackage ../applications/audio/ltc-tools { }; @@ -31329,9 +31227,7 @@ with pkgs; netmaker = callPackage ../applications/networking/netmaker {subPackages = ["."];}; netmaker-full = callPackage ../applications/networking/netmaker { }; - newsflash = callPackage ../applications/networking/feedreaders/newsflash { - webkitgtk = webkitgtk_6_0; - }; + newsflash = callPackage ../applications/networking/feedreaders/newsflash { }; nice-dcv-client = callPackage ../applications/networking/remote/nice-dcv-client { }; @@ -31589,15 +31485,6 @@ with pkgs; ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { }; - ncspot = callPackage ../applications/audio/ncspot { - inherit (darwin.apple_sdk.frameworks) Cocoa; - - withALSA = stdenv.hostPlatform.isLinux; - withPulseAudio = config.pulseaudio or stdenv.hostPlatform.isLinux; - withPortAudio = stdenv.hostPlatform.isDarwin; - withMPRIS = stdenv.hostPlatform.isLinux; - }; - ncview = callPackage ../tools/X11/ncview { } ; ne = callPackage ../applications/editors/ne { }; @@ -31606,8 +31493,6 @@ with pkgs; ngt = callPackage ../development/libraries/ngt { }; - nheko = qt6Packages.callPackage ../applications/networking/instant-messengers/nheko { }; - notepad-next = libsForQt5.callPackage ../applications/editors/notepad-next { }; notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { }; @@ -31616,7 +31501,6 @@ with pkgs; pythonPackages = python3Packages; }; - notmuch-mailmover = callPackage ../applications/networking/mailreaders/notmuch/notmuch-mailmover.nix { }; notmuch-mutt = callPackage ../applications/networking/mailreaders/notmuch/mutt.nix { }; @@ -32014,7 +31898,6 @@ with pkgs; protonvpn-cli_2 = python3Packages.callPackage ../applications/networking/protonvpn-cli/2.nix { }; protonvpn-gui = python3Packages.callPackage ../applications/networking/protonvpn-gui { }; - protonvpn-gui_legacy = python3Packages.callPackage ../applications/networking/protonvpn-gui/legacy.nix { }; ps2client = callPackage ../applications/networking/ps2client { }; @@ -32201,7 +32084,7 @@ with pkgs; }; quodlibet-full = quodlibet.override { - inherit gtksourceview webkitgtk; + inherit gtksourceview webkitgtk_4_0; kakasi = kakasi; keybinder3 = keybinder3; libappindicator-gtk3 = libappindicator-gtk3; @@ -32416,8 +32299,6 @@ with pkgs; secretscanner = callPackage ../tools/security/secretscanner { }; - setconf = python3.pkgs.callPackage ../tools/misc/setconf { }; - semiphemeral = callPackage ../tools/misc/semiphemeral { }; semver = callPackage ../applications/misc/semver { }; @@ -33602,8 +33483,6 @@ with pkgs; wings = callPackage ../applications/graphics/wings { }; - write_stylus = libsForQt5.callPackage ../applications/graphics/write_stylus { }; - wlc = callPackage ../tools/misc/wlc { }; wlclock = callPackage ../applications/misc/wlclock { }; @@ -33965,8 +33844,6 @@ with pkgs; yuview = libsForQt5.yuview; - wallust = callPackage ../applications/misc/wallust { }; - zam-plugins = callPackage ../applications/audio/zam-plugins { }; zammad = callPackage ../applications/networking/misc/zammad { }; @@ -34456,10 +34333,6 @@ with pkgs; opensearch = callPackage ../servers/search/opensearch { }; - osu-lazer = callPackage ../games/osu-lazer { }; - - osu-lazer-bin = callPackage ../games/osu-lazer/bin.nix { }; - pro-office-calculator = libsForQt5.callPackage ../games/pro-office-calculator { }; qgo = libsForQt5.callPackage ../games/qgo { }; @@ -34641,8 +34514,8 @@ with pkgs; deliantra-server = callPackage ../games/deliantra/server.nix { # perl538 defines 'struct object' in sv.h. many conflicts result - perl = perl536; - perlPackages = perl536Packages; + perl = perl540; + perlPackages = perl540Packages; }; deliantra-arch = callPackage ../games/deliantra/arch.nix { }; deliantra-maps = callPackage ../games/deliantra/maps.nix { }; @@ -34704,7 +34577,9 @@ with pkgs; extremetuxracer = callPackage ../games/extremetuxracer { }; - exult = callPackage ../games/exult { }; + exult = callPackage ../games/exult { + inherit (darwin.apple_sdk.frameworks) AudioUnit; + }; fallout-ce = callPackage ../games/fallout-ce/fallout-ce.nix { }; fallout2-ce = callPackage ../games/fallout-ce/fallout2-ce.nix { }; @@ -35319,19 +35194,15 @@ with pkgs; stockfish = callPackage ../games/stockfish { }; - steamPackages = recurseIntoAttrs (callPackage ../games/steam { }); - - steam = steamPackages.steam-fhsenv; - steam-small = steamPackages.steam-fhsenv-small; - steam-run = steam.run; - steam-run-free = steamPackages.steam-fhsenv-without-steam.run; + # This exists so Hydra tries to build all of Steam's dependencies. + steam-fhsenv-without-steam = steam.override { steam-unwrapped = null; }; + + steam-run-free = steam-fhsenv-without-steam.run; steam-tui = callPackage ../games/steam-tui { }; - steamcmd = steamPackages.steamcmd; - steam-acf = callPackage ../tools/games/steam-acf { }; steamback = python311.pkgs.callPackage ../tools/games/steamback { }; @@ -36324,8 +36195,6 @@ with pkgs; fftw = fftwSinglePrec; }); - zegrapher = libsForQt5.callPackage ../applications/science/math/zegrapher { }; - ### SCIENCE/MEDICINE dcmtk = callPackage ../applications/science/medicine/dcmtk { }; @@ -36893,7 +36762,6 @@ with pkgs; curl ]; }); - perl = perl536; }; megam = callPackage ../applications/science/misc/megam { @@ -38097,7 +37965,9 @@ with pkgs; tusk = callPackage ../applications/office/tusk { }; - trufflehog = callPackage ../tools/security/trufflehog { }; + trufflehog = callPackage ../tools/security/trufflehog { + buildGoModule = buildGo123Module; + }; tunnelx = callPackage ../applications/gis/tunnelx { }; @@ -38210,7 +38080,9 @@ with pkgs; wcalc = callPackage ../applications/misc/wcalc { }; - webkit2-sharp = callPackage ../development/libraries/webkit2-sharp { }; + webkit2-sharp = callPackage ../development/libraries/webkit2-sharp { + webkitgtk = webkitgtk_4_0; + }; websocketd = callPackage ../applications/networking/websocketd { }; @@ -38737,8 +38609,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; - nufmt = callPackage ../development/tools/nufmt { }; - bottom = darwin.apple_sdk_11_0.callPackage ../tools/system/bottom { }; cagebreak = callPackage ../applications/window-managers/cagebreak { diff --git a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix index 792a26d973..7b6dd161bd 100644 --- a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix @@ -57,6 +57,7 @@ let coqprime = callPackage ../development/coq-modules/coqprime {}; coqtail-math = callPackage ../development/coq-modules/coqtail-math {}; coquelicot = callPackage ../development/coq-modules/coquelicot {}; + coqutil = callPackage ../development/coq-modules/coqutil {}; corn = callPackage ../development/coq-modules/corn {}; deriving = callPackage ../development/coq-modules/deriving {}; dpdgraph = callPackage ../development/coq-modules/dpdgraph {}; @@ -126,6 +127,7 @@ let reglang = callPackage ../development/coq-modules/reglang {}; relation-algebra = callPackage ../development/coq-modules/relation-algebra {}; rewriter = callPackage ../development/coq-modules/rewriter {}; + RustExtraction = callPackage ../development/coq-modules/RustExtraction {}; semantics = callPackage ../development/coq-modules/semantics {}; serapi = callPackage ../development/coq-modules/serapi {}; simple-io = callPackage ../development/coq-modules/simple-io { }; diff --git a/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix b/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix index f0bdad863e..919e027026 100644 --- a/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix @@ -245,7 +245,7 @@ impure-cmds // appleSourcePackages // chooseLibs // { nixos = import ../../nixos { configuration = { imports = [ - ../../nixos/modules/profiles/macos-builder.nix + ../../nixos/modules/profiles/nix-builder-vm.nix ] ++ modules; # If you need to override this, consider starting with the right Nixpkgs diff --git a/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix b/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix index 4255d0c036..8099591d0c 100644 --- a/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix +++ b/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix @@ -367,10 +367,7 @@ in { intel-speed-select = if lib.versionAtLeast kernel.version "5.3" then callPackage ../os-specific/linux/intel-speed-select { } else null; - ipu6-drivers = - if kernelOlder "6.10" - then callPackage ../os-specific/linux/ipu6-drivers {} - else null; + ipu6-drivers = callPackage ../os-specific/linux/ipu6-drivers {}; ivsc-driver = callPackage ../os-specific/linux/ivsc-driver {}; @@ -519,12 +516,8 @@ in { system76-acpi = callPackage ../os-specific/linux/system76-acpi { }; - system76-power = callPackage ../os-specific/linux/system76-power { }; - system76-io = callPackage ../os-specific/linux/system76-io { }; - system76-scheduler = callPackage ../os-specific/linux/system76-scheduler { }; - tmon = callPackage ../os-specific/linux/tmon { }; tp_smapi = callPackage ../os-specific/linux/tp_smapi { }; @@ -613,6 +606,8 @@ in { xmm7360-pci = throw "Support for the XMM7360 WWAN card was added to the iosm kmod in mainline kernel version 5.18"; amdgpu-pro = throw "amdgpu-pro was removed due to lack of maintenance"; # Added 2024-06-16 kvdo = throw "kvdo was removed, because it was added to mainline in kernel version 6.9"; # Added 2024-07-08 + system76-power = lib.warn "kernelPackages.system76-power is now pkgs.system76-power" pkgs.system76-power; # Added 2024-10-16 + system76-scheduler = lib.warn "kernelPackages.system76-scheduler is now pkgs.system76-scheduler" pkgs.system76-scheduler; # Added 2024-10-16 }); hardenedPackagesFor = kernel: overrides: packagesFor (hardenedKernelFor kernel overrides); diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index efa7e382b1..e9ce03cc67 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -516,31 +516,31 @@ let ffmpeg = callPackage ../development/ocaml-modules/ffmpeg { }; ffmpeg-av = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-av.nix { - inherit (pkgs) ffmpeg; + ffmpeg = pkgs.ffmpeg_6; inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox VideoToolbox; }; ffmpeg-avcodec = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix { - inherit (pkgs) ffmpeg; + ffmpeg = pkgs.ffmpeg_6; inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox VideoToolbox; }; ffmpeg-avdevice = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix { - inherit (pkgs) ffmpeg; + ffmpeg = pkgs.ffmpeg_6; inherit (pkgs.darwin.apple_sdk.frameworks) AppKit AudioToolbox AVFoundation Cocoa CoreImage ForceFeedback OpenGL VideoToolbox; }; ffmpeg-avfilter = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix { - inherit (pkgs) ffmpeg; + ffmpeg = pkgs.ffmpeg_6; inherit (pkgs.darwin.apple_sdk.frameworks) AppKit CoreImage OpenGL VideoToolbox; }; ffmpeg-avutil = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix { - inherit (pkgs) ffmpeg; + ffmpeg = pkgs.ffmpeg_6; inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox VideoToolbox; }; ffmpeg-swresample = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix { - inherit (pkgs) ffmpeg; + ffmpeg = pkgs.ffmpeg_6; inherit (pkgs.darwin.apple_sdk.frameworks) VideoToolbox; }; ffmpeg-swscale = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix { - inherit (pkgs) ffmpeg; + ffmpeg = pkgs.ffmpeg_6; inherit (pkgs.darwin.apple_sdk.frameworks) VideoToolbox; }; diff --git a/third_party/nixpkgs/pkgs/top-level/packages-config.nix b/third_party/nixpkgs/pkgs/top-level/packages-config.nix index bd88c98df9..51c2b44fc5 100644 --- a/third_party/nixpkgs/pkgs/top-level/packages-config.nix +++ b/third_party/nixpkgs/pkgs/top-level/packages-config.nix @@ -21,7 +21,6 @@ rPackages roundcubePlugins sourceHanPackages - steamPackages ut2004Packages zabbix50 zabbix60 diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index 440852ab94..f1d40ccc83 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -699,6 +699,7 @@ with self; { meta = { description = "Run the interactive Perl debugger under mod_perl"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + broken = true; # DB.c:(.text+0x153): undefined reference to `Perl_init_debugger' }; }; @@ -861,10 +862,10 @@ with self; { Appcpm = buildPerlModule { pname = "App-cpm"; - version = "0.997014"; + version = "0.997018"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SK/SKAJI/App-cpm-0.997014.tar.gz"; - hash = "sha256-LdTAPFQDnC0CzN0u+VvG/1bPvbdGzQdvywqVR8UEmQg="; + url = "mirror://cpan/authors/id/S/SK/SKAJI/App-cpm-0.997018.tar.gz"; + hash = "sha256-ePvZawR9A4O2p/iJWxk/CziworVQuS8YwH91Lql8Tv0="; }; buildInputs = [ ModuleBuildTiny ]; propagatedBuildInputs = [ CPAN02PackagesSearch CPANCommonIndex CPANDistnameInfo ClassTiny CommandRunner ExtUtilsInstall ExtUtilsInstallPaths FileCopyRecursive Filepushd HTTPTinyish MenloLegacy Modulecpmfile ModuleCPANfile ParsePMFile ParallelPipes locallib ]; @@ -898,13 +899,13 @@ with self; { AppMusicChordPro = buildPerlPackage { pname = "App-Music-ChordPro"; - version = "6.030"; + version = "6.050.7"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JV/JV/App-Music-ChordPro-6.030.tar.gz"; - hash = "sha256-a+5H8U5gmYPkrBUyxxwajPQy9m6sWeDlaeHTfg2cwnc="; + url = "mirror://cpan/authors/id/J/JV/JV/App-Music-ChordPro-6.050.7.tar.gz"; + hash = "sha256-tpNsqhoWOPIwprK3ou5tb9oXKih3HEQjm/2c5F9rOoQ="; }; buildInputs = [ ObjectPad ]; - propagatedBuildInputs = [ AppPackager FileLoadLines FileHomeDir IOString ImageInfo PDFAPI2 StringInterpolateNamed TextLayout ] + propagatedBuildInputs = [ AppPackager DataPrinter FileLoadLines FileHomeDir IOString ImageInfo PDFAPI2 StringInterpolateNamed TextLayout ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ Wx ]; nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; @@ -1164,7 +1165,7 @@ with self; { pname = "ArrayUtils"; version = "0.5"; src = fetchurl { - url = "https://cpan.metacpan.org/authors/id/Z/ZM/ZMIJ/Array/Array-Utils-0.5.tar.gz"; + url = "mirror://cpan/authors/id/Z/ZM/ZMIJ/Array/Array-Utils-0.5.tar.gz"; hash = "sha256-id0bf82bQ3lJKjp3SW45/mzTebdz/QOmsWDdJu3mN3A="; }; meta = { @@ -1417,6 +1418,7 @@ with self; { # -dss1 doesn't exist for dgst in openssl 1.1, -sha1 can also handle DSA keys now sed -i 's|-dss1|-sha1|' lib/Authen/ModAuthPubTkt.pm ''; + preCheck = "rm t/04-verify-dsa.t"; # remove unstable test: https://rt.cpan.org/Ticket/Display.html?id=110752 meta = { description = "Generate Tickets (Signed HTTP Cookies) for mod_auth_pubtkt protected websites"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -1663,6 +1665,9 @@ with self; { hash = "sha256-BFKmEdNDrfnZX86ra6a2YXbjrX/MzlKAkiwOQx9RSf8="; }; propagatedBuildInputs = [ BFlags IPCRun Opcodes ]; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + }; doCheck = false; /* test fails */ meta = { description = "Perl compiler"; @@ -1856,10 +1861,10 @@ with self; { BKeywords = buildPerlPackage { pname = "B-Keywords"; - version = "1.26"; + version = "1.27"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-1.26.tar.gz"; - hash = "sha256-LaoVXS8mf7De3Yf4pMT7VmOHn8EGUXse4lg1Pvh67TQ="; + url = "mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-1.27.tar.gz"; + hash = "sha256-7xC5CF5nTqpBfMt9aS+2zZj3u2feKhJ+ujRX2K5YfP8="; }; meta = { description = "Lists of reserved barewords and symbol names"; @@ -3130,6 +3135,7 @@ with self; { }; propagatedBuildInputs = [ Filepushd SubName ]; buildInputs = [ CGI CaptureTiny ModuleBuildTiny SubIdentify Switch TestNoWarnings TestRequires TryTiny ]; + preCheck = "rm t/race-conditions.t"; # this test is unstable meta = { description = "Compile .cgi scripts to a code reference like ModPerl::Registry"; homepage = "https://github.com/miyagawa/CGI-Compile"; @@ -4021,10 +4027,10 @@ with self; { CodeTidyAll = buildPerlPackage { pname = "Code-TidyAll"; - version = "0.83"; + version = "0.84"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.83.tar.gz"; - hash = "sha256-FqBS0DprF/xYqEqZb68p5C7O124sQMRyc+uKsxzBXKE="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.84.tar.gz"; + hash = "sha256-s8AU4e3X9EBHkJjkHkeHNhBy9QE6ZqX4j5a05Tyisfc="; }; propagatedBuildInputs = [ CaptureTiny ConfigINI FileWhich Filepushd IPCRun3 IPCSystemSimple ListCompare ListSomeUtils LogAny Moo ScopeGuard SpecioLibraryPathTiny TextDiff TimeDate TimeDurationParse ]; buildInputs = [ TestClass TestClassMost TestDeep TestDifferences TestException TestFatal TestMost TestWarn TestWarnings librelative ]; @@ -7305,10 +7311,16 @@ with self; { DBI = buildPerlPackage { pname = "DBI"; version = "1.644"; + src = fetchurl { url = "mirror://cpan/authors/id/H/HM/HMBRAND/DBI-1.644.tar.gz"; hash = "sha256-Ipe5neCeZwhmQLWQaZ4OmC+0adpjqT/ijcFHgtt6U8g="; }; + + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + }; + postInstall = lib.optionalString (perl ? crossVersion) '' mkdir -p $out/${perl.libPrefix}/cross_perl/${perl.version}/DBI cat > $out/${perl.libPrefix}/cross_perl/${perl.version}/DBI.pm <4.9.4."; privacyidea-ldap-proxy = throw "privacyidea-ldap-proxy has been removed from nixpkgs"; # added 2023-10-31 proboscis = throw "proboscis has been removed since it has not been maintained for 11 years"; # added 2024-05-20 prometheus_client = prometheus-client; # added 2021-06-10 diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index c026d04370..f945961903 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -1902,8 +1902,6 @@ self: super: with self; { bugz = callPackage ../development/python-modules/bugz { }; - bugzilla = callPackage ../development/python-modules/bugzilla { }; - buienradar = callPackage ../development/python-modules/buienradar { }; build = callPackage ../development/python-modules/build { }; @@ -2514,6 +2512,8 @@ self: super: with self; { conda = callPackage ../development/python-modules/conda { }; + conda-inject = callPackage ../development/python-modules/conda-inject { }; + conda-libmamba-solver = callPackage ../development/python-modules/conda-libmamba-solver { }; conda-package-handling = callPackage ../development/python-modules/conda-package-handling { }; @@ -2886,6 +2886,8 @@ self: super: with self; { databricks-sql-connector = callPackage ../development/python-modules/databricks-sql-connector { }; + databricks-sdk = callPackage ../development/python-modules/databricks-sdk { }; + dataclass-factory = callPackage ../development/python-modules/dataclass-factory { }; dataclass-wizard = callPackage ../development/python-modules/dataclass-wizard { }; @@ -3734,6 +3736,8 @@ self: super: with self; { dremel3dpy = callPackage ../development/python-modules/dremel3dpy { }; + drf-extra-fields = callPackage ../development/python-modules/drf-extra-fields { }; + drf-jwt = callPackage ../development/python-modules/drf-jwt { }; drf-nested-routers = callPackage ../development/python-modules/drf-nested-routers { }; @@ -4575,6 +4579,8 @@ self: super: with self; { flask-silk = callPackage ../development/python-modules/flask-silk { }; + flask-simpleldap = callPackage ../development/python-modules/flask-simpleldap { }; + flask-sock = callPackage ../development/python-modules/flask-sock { }; flask-socketio = callPackage ../development/python-modules/flask-socketio { }; @@ -5387,7 +5393,9 @@ self: super: with self; { graphrag = callPackage ../development/python-modules/graphrag { }; - graph-tool = callPackage ../development/python-modules/graph-tool { }; + graph-tool = callPackage ../development/python-modules/graph-tool { + inherit (pkgs) cgal; + }; graphtage = callPackage ../development/python-modules/graphtage { }; @@ -5492,7 +5500,9 @@ self: super: with self; { qemu = pkgs.qemu; }; - gudhi = callPackage ../development/python-modules/gudhi { }; + gudhi = callPackage ../development/python-modules/gudhi { + inherit (pkgs) cgal; + }; guidance = callPackage ../development/python-modules/guidance { }; @@ -5710,8 +5720,6 @@ self: super: with self; { hkavr = callPackage ../development/python-modules/hkavr { }; - hkdf = callPackage ../development/python-modules/hkdf { }; - hledger-utils = callPackage ../development/python-modules/hledger-utils { }; hlk-sw16 = callPackage ../development/python-modules/hlk-sw16 { }; @@ -5988,7 +5996,7 @@ self: super: with self; { ifconfig-parser = callPackage ../development/python-modules/ifconfig-parser { }; ifcopenshell = callPackage ../development/python-modules/ifcopenshell { - inherit (pkgs) libxml2; + inherit (pkgs) cgal libxml2; }; ignite = callPackage ../development/python-modules/ignite { }; @@ -6327,6 +6335,8 @@ self: super: with self; { jaeger-client = callPackage ../development/python-modules/jaeger-client { }; + jalali-core = callPackage ../development/python-modules/jalali-core { }; + jamo = callPackage ../development/python-modules/jamo { }; janus = callPackage ../development/python-modules/janus { }; @@ -8859,6 +8869,8 @@ self: super: with self; { netapp-ontap = callPackage ../development/python-modules/netapp-ontap { }; + netbox-documents = callPackage ../development/python-modules/netbox-documents { }; + netbox-reorder-rack = callPackage ../development/python-modules/netbox-reorder-rack { }; netcdf4 = callPackage ../development/python-modules/netcdf4 { }; @@ -9015,8 +9027,6 @@ self: super: with self; { normality = callPackage ../development/python-modules/normality { }; - nose = callPackage ../development/python-modules/nose { }; - nose2 = callPackage ../development/python-modules/nose2 { }; nose2pytest = callPackage ../development/python-modules/nose2pytest { }; @@ -9123,6 +9133,8 @@ self: super: with self; { plugp100 = callPackage ../development/python-modules/plugp100 {}; + python-bugzilla = callPackage ../development/python-modules/python-bugzilla { }; + python-hcl2 = callPackage ../development/python-modules/python-hcl2 { }; python-ndn = callPackage ../development/python-modules/python-ndn { }; @@ -9272,7 +9284,9 @@ self: super: with self; { onlykey-solo-python = callPackage ../development/python-modules/onlykey-solo-python { }; - onnx = callPackage ../development/python-modules/onnx { }; + onnx = callPackage ../development/python-modules/onnx { + protobuf-core = pkgs.protobuf; + }; onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common { inherit (pkgs) protobuf; @@ -9389,6 +9403,10 @@ self: super: with self; { opentelemetry-instrumentation-asgi = callPackage ../development/python-modules/opentelemetry-instrumentation-asgi { }; + opentelemetry-instrumentation-celery = callPackage ../development/python-modules/opentelemetry-instrumentation-celery { }; + + opentelemetry-instrumentation-botocore = callPackage ../development/python-modules/opentelemetry-instrumentation-botocore { }; + opentelemetry-instrumentation-dbapi = callPackage ../development/python-modules/opentelemetry-instrumentation-dbapi { }; opentelemetry-instrumentation-django = callPackage ../development/python-modules/opentelemetry-instrumentation-django { }; @@ -9399,12 +9417,18 @@ self: super: with self; { opentelemetry-instrumentation-grpc = callPackage ../development/python-modules/opentelemetry-instrumentation-grpc { }; + opentelemetry-instrumentation-logging = callPackage ../development/python-modules/opentelemetry-instrumentation-logging { }; + opentelemetry-instrumentation-psycopg2 = callPackage ../development/python-modules/opentelemetry-instrumentation-psycopg2 { }; opentelemetry-instrumentation-requests = callPackage ../development/python-modules/opentelemetry-instrumentation-requests { }; + opentelemetry-instrumentation-redis = callPackage ../development/python-modules/opentelemetry-instrumentation-redis { }; + opentelemetry-instrumentation-wsgi = callPackage ../development/python-modules/opentelemetry-instrumentation-wsgi { }; + opentelemetry-propagator-aws-xray = callPackage ../development/python-modules/opentelemetry-propagator-aws-xray { }; + opentelemetry-proto = callPackage ../development/python-modules/opentelemetry-proto { }; opentelemetry-semantic-conventions = callPackage ../development/python-modules/opentelemetry-semantic-conventions { }; @@ -10628,8 +10652,6 @@ self: super: with self; { preggy = callPackage ../development/python-modules/preggy { }; - premailer = callPackage ../development/python-modules/premailer { }; - preprocess-cancellation = callPackage ../development/python-modules/preprocess-cancellation { }; preshed = callPackage ../development/python-modules/preshed { }; @@ -10695,14 +10717,14 @@ self: super: with self; { # Protobuf 4.x protobuf4 = callPackage ../development/python-modules/protobuf/4.nix { - protobuf = pkgs.protobuf; + protobuf = pkgs.protobuf_25; }; # Protobuf 5.x protobuf5 = callPackage ../development/python-modules/protobuf/default.nix { }; # If a protobuf upgrade causes many Python packages to fail, please pin it here to the previous version. - protobuf = protobuf4; + protobuf = protobuf5; protobuf3-to-dict = callPackage ../development/python-modules/protobuf3-to-dict { }; @@ -11605,6 +11627,8 @@ self: super: with self; { pylion = callPackage ../development/python-modules/pylion { }; + pylitejet = callPackage ../development/python-modules/pylitejet { }; + pylitterbot = callPackage ../development/python-modules/pylitterbot { }; py-libzfs = callPackage ../development/python-modules/py-libzfs { }; @@ -11752,6 +11776,7 @@ self: super: with self; { }; pymupdf = callPackage ../development/python-modules/pymupdf { }; + pymupdf-fonts = callPackage ../development/python-modules/pymupdf-fonts { }; pymvglive = callPackage ../development/python-modules/pymvglive { }; @@ -13939,6 +13964,8 @@ self: super: with self; { sagemaker-core = callPackage ../development/python-modules/sagemaker-core { }; + sagemaker-mlflow = callPackage ../development/python-modules/sagemaker-mlflow { }; + salib = callPackage ../development/python-modules/salib { }; salmon-mail = callPackage ../development/python-modules/salmon-mail { }; @@ -14511,7 +14538,7 @@ self: super: with self; { }); snakemake = toPythonModule (pkgs.snakemake.override { - python3 = python; + python3Packages = self; }); snakemake-executor-plugin-cluster-generic = callPackage ../development/python-modules/snakemake-executor-plugin-cluster-generic { }; @@ -14636,7 +14663,18 @@ self: super: with self; { libsoxr = pkgs.soxr; }; - spacy = callPackage ../development/python-modules/spacy { }; + spacy = callPackage ../development/python-modules/spacy { + # fix error: ‘_PyCFrame’ has no member named ‘use_tracing’ + # see: https://aur.archlinux.org/packages/python-spacy + cython_0 = cython_0.overridePythonAttrs (old: rec { + version = "0.29.37"; + src = pkgs.fetchPypi { + pname = "Cython"; + inherit version; + hash = "sha256-+BPUpt2Ure5dT/JmGR0dlb9tQWSk+sxTVCLAIbJQTPs="; + }; + }); + }; spacy-alignments = callPackage ../development/python-modules/spacy-alignments { }; @@ -14854,6 +14892,8 @@ self: super: with self; { splinter = callPackage ../development/python-modules/splinter { }; + spotifyaio = callPackage ../development/python-modules/spotifyaio { }; + spotipy = callPackage ../development/python-modules/spotipy { }; spsdk = callPackage ../development/python-modules/spsdk { }; @@ -15383,7 +15423,7 @@ self: super: with self; { ).override { protobuf = protobufTF; }; - protobuf-pythonTF = self.protobuf.override { + protobuf-pythonTF = self.protobuf4.override { protobuf = protobufTF; }; grpcioTF = self.grpcio.override { @@ -15717,10 +15757,10 @@ self: super: with self; { toposort = callPackage ../development/python-modules/toposort { }; - torch = callPackage ../development/python-modules/torch { - inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate CoreServices; - inherit (pkgs.darwin) libobjc; - }; + torch = callPackage ../development/python-modules/torch { }; + + # Required to test triton + torch-no-triton = self.torch.override { tritonSupport = false; }; torch-audiomentations = callPackage ../development/python-modules/torch-audiomentations { }; diff --git a/third_party/nixpkgs/pkgs/top-level/release-perl.nix b/third_party/nixpkgs/pkgs/top-level/release-perl.nix new file mode 100644 index 0000000000..2443c7efa6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/top-level/release-perl.nix @@ -0,0 +1,19 @@ +/* + This is the Hydra jobset for the `perl-updates` branch in Nixpkgs. + The jobset can be tested by: + + $ hydra-eval-jobs pkgs/top-level/release-perl.nix +*/ + +{ + supportedSystems ? [ + "x86_64-linux" + "aarch64-linux" + ], +}: + +let + inherit (import ./release-lib.nix { inherit supportedSystems; }) mapTestOn packagePlatforms pkgs; + +in +mapTestOn { perlPackages = packagePlatforms pkgs.perlPackages; } diff --git a/third_party/nixpkgs/pkgs/top-level/release-small.nix b/third_party/nixpkgs/pkgs/top-level/release-small.nix index 57c07c1bde..d2a1f8a258 100644 --- a/third_party/nixpkgs/pkgs/top-level/release-small.nix +++ b/third_party/nixpkgs/pkgs/top-level/release-small.nix @@ -143,7 +143,7 @@ in util-linux = linux; util-linuxMinimal = linux; w3m = all; - webkitgtk = linux; + webkitgtk_4_0 = linux; wget = all; which = all; wirelesstools = linux; diff --git a/third_party/nixpkgs/pkgs/top-level/release.nix b/third_party/nixpkgs/pkgs/top-level/release.nix index 0f5974d83c..bf69d13c98 100644 --- a/third_party/nixpkgs/pkgs/top-level/release.nix +++ b/third_party/nixpkgs/pkgs/top-level/release.nix @@ -31,6 +31,11 @@ , nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; + # Exceptional unsafe packages that we still build and distribute, + # so users choosing to allow don't have to rebuild them every time. + permittedInsecurePackages = [ + "olm-3.2.16" # see PR #347899 + ]; }; } # This flag, if set to true, will inhibit the use of `mapTestOn`