diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9981fcfb9aea..684986d9a7c7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11504,6 +11504,13 @@ githubId = 72767437; name = "Ian Holloway"; }; + iank = { + email = "iank@iank.org"; + github = "iank"; + githubId = 109598; + name = "Ian Kilgore"; + keys = [ { fingerprint = "21F7 244E 095F 619E 8E3E 1EB4 9F3A 4AAB 4D90 D879"; } ]; + }; ianliu = { email = "ian.liu88@gmail.com"; github = "ianliu"; diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 96fce08754c9..240020c19374 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -1832,11 +1832,6 @@ let else config.users.motdFile; - makePAMService = name: service: { - name = "pam.d/${name}"; - value.source = pkgs.writeText "${name}.pam" service.text; - }; - optionalSudoConfigForSSHAgentAuth = lib.optionalString (config.security.pam.sshAgentAuth.enable || config.security.pam.rssh.enable) '' @@ -2648,7 +2643,26 @@ in }; }; - environment.etc = lib.mapAttrs' makePAMService enabledServices; + environment.etc = + let + # Write all pam config in a single derivation for performance + pamd = + pkgs.runCommand "pam.d" + { + __structuredAttrs = true; + services = lib.mapAttrs (_: svc: svc.text) enabledServices; + } + '' + mkdir $out + for i in "''${!services[@]}"; do + printf '%s' "''${services[$i]}" > "$out/$i" + done + ''; + in + lib.mapAttrs' (name: service: { + name = "pam.d/${name}"; + value.source = "${pamd}/${name}"; + }) enabledServices; systemd = lib.mkIf (lib.any (service: service.lastlog.enable) (lib.attrValues config.security.pam.services)) diff --git a/nixos/modules/services/hardware/sane_extra_backends/brscan5_etc_files.nix b/nixos/modules/services/hardware/sane_extra_backends/brscan5_etc_files.nix index 074126518b45..fe156c0c9e32 100644 --- a/nixos/modules/services/hardware/sane_extra_backends/brscan5_etc_files.nix +++ b/nixos/modules/services/hardware/sane_extra_backends/brscan5_etc_files.nix @@ -58,17 +58,17 @@ stdenv.mkDerivation { dontConfigure = true; buildPhase = '' - TARGET_DIR="$out/etc/opt/brother/scanner/brscan5" + TARGET_DIR="$out/tmp" mkdir -p "$TARGET_DIR" cp -rp "./models" "$TARGET_DIR" cp -rp "./brscan5.ini" "$TARGET_DIR" cp -rp "./brsanenetdevice.cfg" "$TARGET_DIR" - export NIX_REDIRECTS="/etc/opt/brother/scanner/brscan5/=$TARGET_DIR/" - printf '${addAllNetDev netDevices}\n' - ${addAllNetDev netDevices} + + mkdir -p "$out/etc/opt/brother/scanner/brscan5" + mv -T "$TARGET_DIR" "$out/etc/opt/brother/scanner/brscan5" ''; dontInstall = true; diff --git a/nixos/modules/services/monitoring/traccar.nix b/nixos/modules/services/monitoring/traccar.nix index e1e73dc93e02..12622da99eb8 100644 --- a/nixos/modules/services/monitoring/traccar.nix +++ b/nixos/modules/services/monitoring/traccar.nix @@ -102,7 +102,7 @@ in ${lib.getExe pkgs.envsubst} \ -i ${configuration} \ -o ${configFilePath} - umask $old_umask + umask "$old_umask" ''; serviceConfig = { diff --git a/nixos/modules/system/boot/systemd/fido2.nix b/nixos/modules/system/boot/systemd/fido2.nix index 02b4a1389fba..e665d1bbb793 100644 --- a/nixos/modules/system/boot/systemd/fido2.nix +++ b/nixos/modules/system/boot/systemd/fido2.nix @@ -27,6 +27,8 @@ in "${cfg.package}/lib/udev/fido_id" "${cfg.package}/lib/cryptsetup/libcryptsetup-token-systemd-fido2.so" "${pkgs.libfido2}/lib/libfido2.so.1" + # dlopened by the libpcsclite.so.1 shim, invisible to make-initrd-ng + "${lib.getLib pkgs.pcsclite}/lib/libpcsclite_real.so.1" ]; }; } diff --git a/nixos/modules/system/boot/systemd/tpm2.nix b/nixos/modules/system/boot/systemd/tpm2.nix index de0f72e5a543..3537dab80f13 100644 --- a/nixos/modules/system/boot/systemd/tpm2.nix +++ b/nixos/modules/system/boot/systemd/tpm2.nix @@ -45,6 +45,7 @@ "systemd-tpm2-setup.service" "systemd-pcrextend.socket" "systemd-pcrextend@.service" + "systemd-pcrlogin@.service" ]; } ) diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix index a38756a2b825..a904c082fdde 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -21,22 +21,22 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-pPgl7MTzkBqZ/KatgAme7F6w873GLxZ1ZTYfkXzD4kw="; + hash = "sha256-/RKpbsdp7MjakNvKWvq2OiwLJ7mftHKKrb5xwKlM76Y="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-gnaECK1yMNatDn/ZJ6od8wBQYMlJJ/Q49Z+Ur4SxWU8="; + hash = "sha256-mdgzM0dymFjSYFm018wsuWzzUJJsA896YmRwoH1wLmM="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-g0DEP2f+ooEgYz8TFUYTMoVV83HGR2eK2dL5MWa92F8="; + hash = "sha256-0EFuSvcSLTfrR74Uxpwiq2K39cWqi33q80AhtlilCnQ="; }; }; in { name = "claude-code"; publisher = "anthropic"; - version = "2.1.212"; + version = "2.1.214"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/applications/video/kodi/addons/arteplussept/default.nix b/pkgs/applications/video/kodi/addons/arteplussept/default.nix index e6a700cd0a51..959698c9404f 100644 --- a/pkgs/applications/video/kodi/addons/arteplussept/default.nix +++ b/pkgs/applications/video/kodi/addons/arteplussept/default.nix @@ -12,11 +12,11 @@ buildKodiAddon rec { pname = "arteplussept"; namespace = "plugin.video.arteplussept"; - version = "1.4.4"; + version = "1.5.2"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; - hash = "sha256-jFIcLhglfOqkFLtlIJKB1o++mWfnpWKS3w1wD0S3+CE="; + hash = "sha256-kYIN9I+hSWBYbaUsFRDkcU3FngQRzxmGrjN7rnsWiaA="; }; propagatedBuildInputs = [ diff --git a/pkgs/by-name/_1/_1password-gui/sources.json b/pkgs/by-name/_1/_1password-gui/sources.json index 5aabcd7861f1..7ab8898f017c 100644 --- a/pkgs/by-name/_1/_1password-gui/sources.json +++ b/pkgs/by-name/_1/_1password-gui/sources.json @@ -1,28 +1,28 @@ { "stable": { "linux": { - "version": "8.12.26", + "version": "8.12.28", "sources": { "x86_64": { - "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.12.26.x64.tar.gz", - "hash": "sha256-xInPbZ1mE0ZqUrBr1EIR1UtvAy/fYSzVxkf8iO7d2uQ=" + "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.12.28.x64.tar.gz", + "hash": "sha256-JpXXLpjAOfBh+oc1YIBxqBZha02IuzclVhQRiF29V6c=" }, "aarch64": { - "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.12.26.arm64.tar.gz", - "hash": "sha256-J6ejEEWioo3WPvtK8ra7wnM+r1pOWJ2KbAHpgzJ1zYg=" + "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.12.28.arm64.tar.gz", + "hash": "sha256-lbiIXeyexz6XpXD7/57U/T//JDEBDikm9HaNR1t7cps=" } } }, "darwin": { - "version": "8.12.26", + "version": "8.12.28", "sources": { "x86_64": { - "url": "https://downloads.1password.com/mac/1Password-8.12.26-x86_64.zip", - "hash": "sha256-TZrnrxq71ImKDBqtUnABaIQTmrnTXAnFoEIYp7Rgejw=" + "url": "https://downloads.1password.com/mac/1Password-8.12.28-x86_64.zip", + "hash": "sha256-ONY0M48v4wJe9LBlvjJY4BqfbQf5evtRijbbSDGQFpE=" }, "aarch64": { - "url": "https://downloads.1password.com/mac/1Password-8.12.26-aarch64.zip", - "hash": "sha256-bZD8LCLTGXRpNF/FqoSHvI69pquAcQGa1mdagWypgDU=" + "url": "https://downloads.1password.com/mac/1Password-8.12.28-aarch64.zip", + "hash": "sha256-utESL4dUIe/jD9gu3YIF+HWnGUlWr54tSI1Jtrruxsc=" } } } diff --git a/pkgs/by-name/al/altus/package.nix b/pkgs/by-name/al/altus/package.nix index c6af256397ba..c8e89b4e075f 100644 --- a/pkgs/by-name/al/altus/package.nix +++ b/pkgs/by-name/al/altus/package.nix @@ -7,12 +7,12 @@ let pname = "altus"; - version = "5.8.0"; + version = "5.8.1"; src = fetchurl { name = "altus-${version}.AppImage"; url = "https://github.com/amanharwara/altus/releases/download/${version}/Altus-${version}.AppImage"; - hash = "sha256-TA1AhWO8TDKbl7ukG1KzPvHP1AZ0leAENLVQ/W+GsrE="; + hash = "sha256-FSyXs9thTQ5T5bvCfg/+QXBZMIOyoijAw0dUsvLRGH8="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/by-name/aw/aws-cdk-cli/missing-hashes.json b/pkgs/by-name/aw/aws-cdk-cli/missing-hashes.json index 07816f807684..d4e3201c1a22 100644 --- a/pkgs/by-name/aw/aws-cdk-cli/missing-hashes.json +++ b/pkgs/by-name/aw/aws-cdk-cli/missing-hashes.json @@ -25,16 +25,16 @@ "@esbuild/win32-arm64@npm:0.28.1": "551ada5396e1f10e3d3592dd60a148a7257af1ab2317bba09e9ed18a6d7ee7e5961c68eb1fbaee4e8c1961b504807493e1b8f5c700dd1fb990f0cb36b240ad57", "@esbuild/win32-ia32@npm:0.28.1": "2676ace6b4d63721da34873974152e869aed9fc8bd9fdff4b8df14a3a3e68b78a9b4566e643b90b948b4e85773cbf288a33a59d13979caaadd43b5adad68312c", "@esbuild/win32-x64@npm:0.28.1": "8d658b74ed9b7494b3799093551d4c928a7916865ed42d00a135156cbd08612b53072e9e424f0687c10a93a444d30d6b0294b6a1d5fdba78078d706646ba558f", - "@nx/nx-darwin-arm64@npm:22.7.5": "4f8435566c4b7ea0de0c8953f994849b91ad85867f6cdfce67fc0bb7404a760131dad7bdb7c789f82980d349c1a6df255be03807da260cbc5396284395865f28", - "@nx/nx-darwin-x64@npm:22.7.5": "3d63123766ce58602f08c5c2e9e896d9bbba402c53f3918a0ea5eebab25cd2f48fb992ac654ea648088564b1347f920509f7a20ad25c538d227a11292024ce64", - "@nx/nx-freebsd-x64@npm:22.7.5": "6fa6ba0ab68e6fd9742c5bdc8cacbd67d3be6334b967c9dfa3a3fa5e64b689fa1d7b50f807420227ad470c53ad5cf8343240d35ed89ca8d3e62a921a4857e8b9", - "@nx/nx-linux-arm-gnueabihf@npm:22.7.5": "7fd2f207688a8353012f8363cc28868e927840c2378dba466a67dff50eabbf24362e6654e183c1308479d435e8326444ae4ab803e3f5bdf84061915124183f4f", - "@nx/nx-linux-arm64-gnu@npm:22.7.5": "03c8fa25e5833fe4746995624b15e72258b7050ee70a6d80ed4c2b0f5e8b740774264d1decf70eea61387028886b2360953675d554f2ee8b4ae784adf738ed7b", - "@nx/nx-linux-arm64-musl@npm:22.7.5": "ea449f0b82c027b6eae5f2a060d26624bee91b487b601ccb5ab250ff33140f4bd60cf004e8f5f1e495b9bd391c17bda4758635ddb80f1af29b234eb067517b2c", - "@nx/nx-linux-x64-gnu@npm:22.7.5": "96aad2912ef8a607147cb5831ddbfc6f08b3c657c44879c738055fde274259e2dfc7e507485c52c194e79445ca2410cf618e31e2d2af00f7563f04055beea3c7", - "@nx/nx-linux-x64-musl@npm:22.7.5": "1f61915a2e93a6b930b81b8205407e2c961f7878a5131f136027b86bd35a579fe65b52a47088c4818c6e6426b3aa79ece8ce30119a3e44dd4d5a681efd7cde4a", - "@nx/nx-win32-arm64-msvc@npm:22.7.5": "3f4668ce48fd341f487b99c72e7678ebdfa0964591a58947752bf050a4bb21bf27ee920ac4554433e0efd73beca923a17a6dfc90e35c8b5ee1f92fd4a7f2caa0", - "@nx/nx-win32-x64-msvc@npm:22.7.5": "c44700bd537a0f2571d75285302d332c0fa31a648a822937cd81362c7b4fcb8c8ecabb98559c0b7bcdb537acd051b4f3926bcd9e369095260fc6aa8d079e3c04", + "@nx/nx-darwin-arm64@npm:22.7.6": "b336dcf04ce9c07d4bfe908fadb6bf5cc791342b4991439f5a7c0075d587c3d4570696c44b5d595735accda2bdf29c04a56dd0705b499f6a6b70f9886d833097", + "@nx/nx-darwin-x64@npm:22.7.6": "391780c2f14249c92a32b1245099e3d98241719f2cdf0b81289dc28948d011f18089ba94e272394b28aa2fbe5904119b954a633fc8bf82e8250bb00821e06d28", + "@nx/nx-freebsd-x64@npm:22.7.6": "bebebd506d74cbb62e3cbf3afbcb66e125e2ad3e3cd346e1ee51bf11167561649c6e60db751292e64f3b3a8c8a424d803979392c78a191c08ef510093ff93ab0", + "@nx/nx-linux-arm-gnueabihf@npm:22.7.6": "56d67d7536b0e89c08949bba7f94c071ced817195c37f3d947113888e0f624a8b21d31aad13107c86ac2225705298112ac593c359675540fcc47f74adb25f6eb", + "@nx/nx-linux-arm64-gnu@npm:22.7.6": "e61ff5c461d96294182c0ee823f627c37e925972a50375a4499b3089dcbadd9249cdbc995d5f573271a5aa7cb7a82690575a4ee51e149b6e3959559172d390ff", + "@nx/nx-linux-arm64-musl@npm:22.7.6": "0c0e5ba1583a49063779edd776555e11dbaf85f11600756b62774283ca1d8c2a84ddfdfe7c0f175275d0401a6aedc84deac831534bb3e5588841d719429477ee", + "@nx/nx-linux-x64-gnu@npm:22.7.6": "d65682bc14813e0f1e8e1bc5356081b6ecfde7a2fc3236e1d813f0da8ffc712b3b1641c8ebd4389e577348db549757efa2084fd16119fc6393e242331b2bad9e", + "@nx/nx-linux-x64-musl@npm:22.7.6": "924ed33a107b6647abe10acd77fe41f113e82dd83961b05d73c8b3a3c7c85d60cb35cae3a976497a8ef4fd48ab574d4ae5b683efd225fd4c404408b0ab87c1f9", + "@nx/nx-win32-arm64-msvc@npm:22.7.6": "feda72abfa06e7143a795993888ff2da73936a3bab4e2ca787b102322494abb3b3f24a944dd51c1de409afc19e921c6c98879d80f27921e848254d2a432cdc09", + "@nx/nx-win32-x64-msvc@npm:22.7.6": "5066816d70bcb55051259fc3acde32fef67f9359e15810e64dd3c93e11db40632e11a517dd3b1993a468632a8d75335ce550499711a23b5e7166f3130175bcda", "@unrs/resolver-binding-android-arm-eabi@npm:1.11.1": "04dd38b694c1680bfec192b499e188700398a414886a08a8a7c72815db56ac147df03d88c73ff6fff7ac3e0a01dc41978054b3622b49463e0d684c5168557fcc", "@unrs/resolver-binding-android-arm64@npm:1.11.1": "763626adc34dd2b4af677b5ced6493e7b2b1935351a5c9137f1c9561d11faf97b94015e6876e57e85c33ff563564314c92c0882a4780a57f2225cbbd779a695d", "@unrs/resolver-binding-darwin-arm64@npm:1.11.1": "03b477fdfec55dbabe488fe0962417bddaa38b028d2670053469f1d24163907b097aac15b565f6974449bee398a38d5e3e1525f2b515ce57e243149021b7aa2f", diff --git a/pkgs/by-name/aw/aws-cdk-cli/package.nix b/pkgs/by-name/aw/aws-cdk-cli/package.nix index 8cc53b5a19ad..7a9edef0e3fc 100644 --- a/pkgs/by-name/aw/aws-cdk-cli/package.nix +++ b/pkgs/by-name/aw/aws-cdk-cli/package.nix @@ -10,7 +10,6 @@ python3, unzip, testers, - nix-update-script, }: let @@ -18,19 +17,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "aws-cdk-cli"; - version = "2.1129.0"; + version = "2.1131.0"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cdk-cli"; tag = "cdk@v${finalAttrs.version}"; - hash = "sha256-KXbNrzylyY+RSp4Da9rMSEn7UdPTHU9iDID/qXGL+io="; + hash = "sha256-66kMwa9IJN0Culc+oAUazKBlXE3nRoPJ2/0/OaTRxjI="; }; missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes; - hash = "sha256-jh/EW+scTCJ698jKr1eRYeckRhgE+SmOjfUUgJ7GbFU="; + hash = "sha256-BVjva74w/6zHv6JKAPCBt5Pu72ztGSJYX5h4QffABkk="; }; nativeBuildInputs = [ @@ -129,12 +128,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; - updateScript = nix-update-script { - extraArgs = [ - "--version-regex" - "cdk@v(.*)" - ]; - }; + updateScript = ./update.sh; }; meta = { diff --git a/pkgs/by-name/aw/aws-cdk-cli/update.sh b/pkgs/by-name/aw/aws-cdk-cli/update.sh new file mode 100755 index 000000000000..e035b03d31b2 --- /dev/null +++ b/pkgs/by-name/aw/aws-cdk-cli/update.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p coreutils nix nix-update yarn-berry_4.yarn-berry-fetcher + +set -euo pipefail + +package_dir=$(realpath "$(dirname "$0")") + +# Update the source first. offlineCache cannot be updated until the hashes +# missing from the new yarn.lock have been regenerated below. +nix-update "$UPDATE_NIX_PNAME" --src-only --version-regex 'cdk@v(.*)' "$@" + +updated_version=$(nix-instantiate --eval --strict --attr "$UPDATE_NIX_PNAME.version" --raw) + +if [[ "$updated_version" == "$UPDATE_NIX_OLD_VERSION" ]]; then + echo "Package is already up to date: $updated_version" + exit 0 +fi + +src_path=$(nix-build --attr "$UPDATE_NIX_PNAME.src" --no-link) +yarn-berry-fetcher missing-hashes "$src_path/yarn.lock" >"$package_dir/missing-hashes.json" + +# Regenerate the hash of the Yarn offline cache after updating its missing hashes. +nix-update "$UPDATE_NIX_PNAME" --version skip diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index ff7db4ee1495..0766f2781f09 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -9,6 +9,7 @@ ceres-solver, cmake, config, + cudaArches ? cudaPackages.flags.realArches, cudaPackages, cudaSupport ? config.cudaSupport, dbus, @@ -201,6 +202,7 @@ stdenv'.mkDerivation (finalAttrs: { (lib.cmakeFeature "ALEMBIC_LIBRARY" "${lib.getLib alembic}/lib/libAlembic${stdenv.hostPlatform.extensions.sharedLibrary}") ] ++ lib.optionals cudaSupport [ + (lib.cmakeFeature "CYCLES_CUDA_BINARIES_ARCH" (lib.concatStringsSep ";" cudaArches)) (lib.cmakeFeature "OPTIX_ROOT_DIR" "${optix}") (lib.cmakeBool "WITH_CYCLES_CUDA_BINARIES" true) ] diff --git a/pkgs/by-name/br/brscan5/package.nix b/pkgs/by-name/br/brscan5/package.nix index 688d12caa454..67fc343b3148 100644 --- a/pkgs/by-name/br/brscan5/package.nix +++ b/pkgs/by-name/br/brscan5/package.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { makeWrapper \ "$out/$PATH_TO_BRSCAN5/brsaneconfig5" \ "$out/bin/brsaneconfig5" \ - --suffix-each NIX_REDIRECT ":" "/etc/opt/brother/scanner/brscan5=$out/opt/brother/scanner/brscan5 /opt/brother/scanner/brscan5=$out/opt/brother/scanner/brscan5" \ + --suffix-each NIX_REDIRECTS ":" "/etc/opt/brother/scanner/brscan5=$out/opt/brother/scanner/brscan5 /opt/brother/scanner/brscan5=$out/opt/brother/scanner/brscan5" \ --set LD_PRELOAD ${libredirect}/lib/libredirect.so mkdir -p $out/etc/sane.d/dll.d diff --git a/pkgs/by-name/ca/calibre-web/package.nix b/pkgs/by-name/ca/calibre-web/package.nix index 4f67ba476f80..e857a3ccb0db 100644 --- a/pkgs/by-name/ca/calibre-web/package.nix +++ b/pkgs/by-name/ca/calibre-web/package.nix @@ -127,6 +127,8 @@ python3Packages.buildPythonApplication rec { pythonRelaxDeps = [ "apscheduler" "bleach" + "certifi" + "chardet" "cryptography" "flask" "flask-limiter" diff --git a/pkgs/by-name/ch/chirpstack-gateway-bridge/package.nix b/pkgs/by-name/ch/chirpstack-gateway-bridge/package.nix index aebc5f9851f3..9b7a71a28ccf 100644 --- a/pkgs/by-name/ch/chirpstack-gateway-bridge/package.nix +++ b/pkgs/by-name/ch/chirpstack-gateway-bridge/package.nix @@ -7,16 +7,16 @@ }: buildGoModule (finalAttrs: { pname = "chirpstack-gateway-bridge"; - version = "4.1.1"; + version = "4.1.2"; src = fetchFromGitHub { owner = "chirpstack"; repo = "chirpstack-gateway-bridge"; rev = "v${finalAttrs.version}"; - hash = "sha256-zMD5vbdnfkGHhnw7fG88n6JY1RSrj2mMgMICR7n0cUo="; + hash = "sha256-3rdpIqiO6D5+JntJm2GQlnH6zh3s3DOzpaxr06PR+K4="; }; - vendorHash = "sha256-y1NYYyRS5L7QzV/bcm43EJ2OCHg+vPSTSwhHO0AwqD8="; + vendorHash = "sha256-nDbUem9WV2DClrUBTjDvz+jUqqkQI+QGuv8h39EBs9E="; ldflags = [ "-s" diff --git a/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix b/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix index c662d9a56071..93dfb45c5c24 100644 --- a/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix +++ b/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage rec { pname = "chirpstack-mqtt-forwarder"; - version = "4.5.1"; + version = "4.6.0"; src = fetchFromGitHub { owner = "chirpstack"; repo = "chirpstack-mqtt-forwarder"; rev = "v${version}"; - hash = "sha256-AFyvXLXGs1jeOJM8tSKBNbTVYr5SRUscqnUlSvU9iuA="; + hash = "sha256-frEwQrGfB1J7ZY5jSkmgAyyCJwWUyu29QuZqMWlOPSk="; }; - cargoHash = "sha256-mRmvKOqfzqUvPexRbd9TRS2lunpne7+wO57bsYZ3dXw="; + cargoHash = "sha256-5/8f5eSLfCu8fOfT+jTEfJj+fSB6rJt34C6eJwyFIfo="; nativeBuildInputs = [ protobuf ]; diff --git a/pkgs/by-name/cl/claude-code/manifest.json b/pkgs/by-name/cl/claude-code/manifest.json index dd54af081d6b..0eca8f79f4cb 100644 --- a/pkgs/by-name/cl/claude-code/manifest.json +++ b/pkgs/by-name/cl/claude-code/manifest.json @@ -1,47 +1,47 @@ { - "version": "2.1.212", - "commit": "8b2783a8f907ce5c5ad1241ecdbab0ff3301c617", - "buildDate": "2026-07-16T16:50:33Z", + "version": "2.1.214", + "commit": "e158e55a79995c80ed463a5d2de322bc0ac2f711", + "buildDate": "2026-07-17T23:32:51Z", "platforms": { "darwin-arm64": { "binary": "claude", - "checksum": "09ecba2ab2df9b6ee5b0695e26f65dea60fb3b6af3d3542ee09f466838d1e574", - "size": 244530512 + "checksum": "59796dd18e9d77f1256f367db6d28ce4bd9cd5968e402ad3a327aac36abc6dec", + "size": 247091504 }, "darwin-x64": { "binary": "claude", - "checksum": "7681a0634c89fa4474e53c0c794e992944aebf3409a7a2b87ea9f9b0194ea341", - "size": 254080272 + "checksum": "d979ba15662828969e5d0f39f1367798a07ef6e031b524efdad37fe7caf84010", + "size": 256507024 }, "linux-arm64": { "binary": "claude", - "checksum": "66e88634a8573a002702e6a9de0d80cb9bb7c9072f9e6f4486778539057dfd3c", - "size": 260946672 + "checksum": "4c38f26a57a42619ee813f15dc39fc1fa4fe0bb403215c3cdc342b58fa689c3c", + "size": 261995424 }, "linux-x64": { "binary": "claude", - "checksum": "044a88cf3a5180776617fd3da1238dcbf9141ddec449a39cf7d2af1ac78e684e", - "size": 264096568 + "checksum": "3c029136f7c81f54ed4a38e9d52e655aad536433dbbde50519c8c31bb646ad14", + "size": 265210864 }, "linux-arm64-musl": { "binary": "claude", - "checksum": "6996b65fc90aa1e0b8f80824df77295d93fa43b12388915a762b58fd982a1d16", - "size": 254194872 + "checksum": "bbcdec27500f1c7f04a8697fa1d55cdae183ba9054b984ac95d82ccdcccaec3e", + "size": 255243624 }, "linux-x64-musl": { "binary": "claude", - "checksum": "a17757970a1f7ef0c47a31ea8fa40798fd7796854ba9422e1a4175f3f149de2c", - "size": 258756992 + "checksum": "1744afe6baa7d5321917bc6f807883daf4f0abda8e9e5d006c03356eb3df8945", + "size": 259838544 }, "win32-x64": { "binary": "claude.exe", - "checksum": "fe639693fd7e9a881c799867711abb7666dec2a5fefbaba41af6a09e71bcbefa", - "size": 255334560 + "checksum": "da26afacbc58d6f569d0921ff6825772220c734327f5f976c0c73bd0b7dd3cf8", + "size": 256220832 }, "win32-arm64": { "binary": "claude.exe", - "checksum": "adaa6e3dadb8016755ccd1907a5f249c1bc9bdb6c71d3f7dcea7d5db8f72d0a5", - "size": 249684640 + "checksum": "4c62218523c562991ef05985af3cffa1a69a588bbcfb3b3bf7b59e9bcb69e963", + "size": 250596512 } }, "sdkCompat": { @@ -58,6 +58,7 @@ "0.3.196", "0.3.197", "0.3.198", + "0.3.200", "0.3.201", "0.3.202", "0.3.204", diff --git a/pkgs/by-name/cl/clickhouse-cpp/clickhouse-cpp.pc.in b/pkgs/by-name/cl/clickhouse-cpp/clickhouse-cpp.pc.in new file mode 100644 index 000000000000..7d7fde74d07b --- /dev/null +++ b/pkgs/by-name/cl/clickhouse-cpp/clickhouse-cpp.pc.in @@ -0,0 +1,11 @@ +prefix=@out@ +includedir=${prefix}/include +libdir=${prefix}/lib + +Name: clickhouse-cpp +Description: Library to interact with ClickHouse Database from C++ code +URL: https://github.com/ClickHouse/clickhouse-cpp +Version: @version@ +Cflags: -pthread -isystem${includedir} +Libs: -pthread -L${libdir} -Wl,-rpath,${libdir} -lclickhouse-cpp-lib +Requires: absl_int128 diff --git a/pkgs/by-name/cl/clickhouse-cpp/package.nix b/pkgs/by-name/cl/clickhouse-cpp/package.nix new file mode 100644 index 000000000000..76230e9b3711 --- /dev/null +++ b/pkgs/by-name/cl/clickhouse-cpp/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + abseil-cpp, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "clickhouse-cpp"; + version = "2.6.2"; + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "clickhouse"; + repo = "clickhouse-cpp"; + tag = "v${finalAttrs.version}"; + hash = "sha256-szvRPqj2xarzGTVyycPlSTJkWSxwLO4EKXADS1DpO7Q="; + }; + + flattenPackagesPrefix = "absl_"; + flattenPcLookupDir = "${abseil-cpp}/lib/pkgconfig"; + + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = [ + "-DWITH_SYSTEM_ABSEIL=1" + "-DBUILD_SHARED_LIBS=1" + ]; + + propagatedBuildInputs = [ abseil-cpp ]; + + postInstall = '' + mkdir -p $out/lib/pkgconfig + substituteAll ${./clickhouse-cpp.pc.in} $out/lib/pkgconfig/clickhouse-cpp.pc + ''; + + meta = { + description = "C++ client library for ClickHouse"; + homepage = "https://github.com/clickhouse/clickhouse-cpp"; + changelog = "https://github.com/clickhouse/clickhouse-cpp/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ jlesquembre ]; + mainProgram = "clickhouse-cpp"; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/co/colima/package.nix b/pkgs/by-name/co/colima/package.nix index b3532a64a7ca..038eeaa827b0 100644 --- a/pkgs/by-name/co/colima/package.nix +++ b/pkgs/by-name/co/colima/package.nix @@ -10,6 +10,7 @@ makeWrapper, procps, qemu, + docker, testers, colima, }: @@ -66,6 +67,7 @@ buildGoModule (finalAttrs: { # Suppress warning on `colima start`: https://github.com/abiosoft/colima/issues/1333 lima-full qemu + docker ] ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform krunkit) krunkit ) diff --git a/pkgs/by-name/co/commitizen/package.nix b/pkgs/by-name/co/commitizen/package.nix index 9bbdda3ad1bd..8eb4bf5fb525 100644 --- a/pkgs/by-name/co/commitizen/package.nix +++ b/pkgs/by-name/co/commitizen/package.nix @@ -12,19 +12,19 @@ python3Packages.buildPythonPackage rec { pname = "commitizen"; - version = "4.13.9"; + version = "4.16.4"; pyproject = true; src = fetchFromGitHub { owner = "commitizen-tools"; repo = "commitizen"; tag = "v${version}"; - hash = "sha256-bT154qRnZCf3StYs+acv4Be/SUCA5ovGjY/j2EDmUEc="; + hash = "sha256-lVc1Kdy/IWRa8uoPZfOSSa379bDDknE3dpm0U7DVv0s="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "uv_build >= 0.9.17, <0.10.0" "uv-build" + --replace-fail "uv_build >= 0.9.17, <0.12" "uv-build" ''; pythonRelaxDeps = [ @@ -54,6 +54,13 @@ python3Packages.buildPythonPackage rec { tomlkit ]; + makeWrapperArgs = [ + "--prefix" + "PATH" + ":" + (lib.makeBinPath [ gitMinimal ]) + ]; + nativeCheckInputs = [ gitMinimal versionCheckHook diff --git a/pkgs/by-name/d2/d2/package.nix b/pkgs/by-name/d2/d2/package.nix index a5a867984735..b590b73de755 100644 --- a/pkgs/by-name/d2/d2/package.nix +++ b/pkgs/by-name/d2/d2/package.nix @@ -11,8 +11,13 @@ libgbm, makeWrapper, playwright-driver, + withImageSupport ? lib.meta.availableOn stdenv.hostPlatform libdrm, }: +assert lib.assertMsg ( + withImageSupport -> lib.meta.availableOn stdenv.hostPlatform libdrm +) "d2: withImageSupport is not supported on ${stdenv.hostPlatform.system} (requires libdrm)"; + buildGoModule (finalAttrs: { pname = "d2"; version = "0.7.1"; @@ -39,7 +44,8 @@ buildGoModule (finalAttrs: { makeWrapper ]; - buildInputs = lib.optionals (lib.meta.availableOn stdenv.hostPlatform libdrm) [ + # playwright-drivers.browsers pulls down ~2GB+ for Webkit, Chrome, Firefox etc + buildInputs = lib.optionals withImageSupport [ libgbm playwright-driver.browsers ]; @@ -50,7 +56,7 @@ buildGoModule (finalAttrs: { installManPage ci/release/template/man/d2.1 '' # Wrap the d2 executable to set LD_LIBRARY_PATH for Playwright - + lib.optionalString (finalAttrs.buildInputs != [ ]) '' + + lib.optionalString withImageSupport '' wrapProgram $out/bin/d2 \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath finalAttrs.buildInputs} ''; diff --git a/pkgs/by-name/ex/explo/package.nix b/pkgs/by-name/ex/explo/package.nix new file mode 100644 index 000000000000..2c9a2864ccb8 --- /dev/null +++ b/pkgs/by-name/ex/explo/package.nix @@ -0,0 +1,92 @@ +{ + lib, + buildGoModule, + buildNpmPackage, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "explo"; + version = "1.1.2"; + + strictDeps = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "LumePart"; + repo = "Explo"; + tag = "v${finalAttrs.version}"; + hash = "sha256-7FIDRNZn+Yh2c/oLU3Ggb4A9y+5q3vv17eVLmGR2Zeo="; + }; + + webui = buildNpmPackage { + inherit (finalAttrs) + pname + version + src + meta + ; + + sourceRoot = "${finalAttrs.src.name}/src/web/frontend"; + + npmDepsHash = "sha256-N+i+VFHKJ9OxHyQKJ3vSw50N3tLjvFVPeG5aU0hLzqw="; + + buildPhase = '' + runHook preBuild + + npx vite build --outDir dist + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -r dist/* $out + + runHook postInstall + ''; + }; + + vendorHash = "sha256-pa3WaVJU4WY/EyE3VttfEVOwwaxvkfxQj0wrwOmefYQ="; + + ldflags = [ + "-X explo/src/config.Version=${finalAttrs.version}" + ]; + + preBuild = '' + mkdir -p src/web/dist + cp -r ${finalAttrs.webui}/* src/web/dist + ''; + + postInstall = '' + mv $out/bin/main $out/bin/explo + mkdir -p $out/share/explo + cp src/downloader/youtube_music/search_ytmusic.py $out/share/explo/ + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--subpackage" + "webui" + ]; + }; + + meta = { + description = "Spotify's \"Discover Weekly\" for self-hosted music systems"; + homepage = "https://github.com/LumePart/Explo/"; + changelog = "https://github.com/LumePart/Explo/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + lilacious + arunoruto + ]; + mainProgram = "explo"; + }; +}) diff --git a/pkgs/by-name/fc/fcitx5-lotus/package.nix b/pkgs/by-name/fc/fcitx5-lotus/package.nix new file mode 100644 index 000000000000..64c578ad4f57 --- /dev/null +++ b/pkgs/by-name/fc/fcitx5-lotus/package.nix @@ -0,0 +1,121 @@ +{ + lib, + stdenv, + acl, + buildGoModule, + cmake, + fcitx5, + fetchFromGitHub, + gettext, + go, + hicolor-icon-theme, + kdePackages, + libinput, + libx11, + nix-update-script, + pkg-config, + python3, + qt6, + udev, +}: + +let + pythonEnv = python3.withPackages ( + ps: with ps; [ + dbus-python + pyqt6 + qtpy + ] + ); +in +stdenv.mkDerivation (finalAttrs: { + pname = "fcitx5-lotus"; + version = "3.4.0"; + + src = fetchFromGitHub { + owner = "LotusInputMethod"; + repo = "fcitx5-lotus"; + rev = "v${finalAttrs.version}"; + hash = "sha256-MN83U0/o+vDGCxpYgFxfXAf+Iw59OaXyB7770ppLmEQ="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + gettext + go + hicolor-icon-theme + kdePackages.extra-cmake-modules + pkg-config + qt6.wrapQtAppsHook + ]; + + buildInputs = [ + acl + fcitx5 + kdePackages.extra-cmake-modules + libinput + libx11 + pythonEnv + qt6.qtbase + udev + ]; + + strictDeps = true; + __structuredAttrs = true; + + dontWrapQtApps = true; + + vendorDir = + (buildGoModule { + pname = "fcitx5-lotus-go-modules"; + inherit (finalAttrs) version src; + modRoot = "bamboo"; + vendorHash = "sha256-HjVMGil4bNMTFifxFYtHELdkeKhrumHGrde4msbxvJc="; + }).goModules; + + preConfigure = '' + export GOCACHE=$TMPDIR/go-cache + export GOPATH=$TMPDIR/go + + rm -rf bamboo/vendor + cp -r $vendorDir bamboo/vendor + ''; + + postPatch = '' + substituteInPlace src/lotus-monitor.cpp \ + --replace-fail 'strcmp(exe_path, "/usr/bin/fcitx5-lotus-server") == 0' \ + '(strncmp(exe_path, "/nix/store/", 11) == 0 && strlen(exe_path) >= 24 && strcmp(exe_path + strlen(exe_path) - 24, "/bin/fcitx5-lotus-server") == 0)' + + substituteInPlace server/lotus-server.cpp \ + --replace-fail 'strcmp(exe_path, "/usr/bin/fcitx5") == 0' \ + '(strncmp(exe_path, "/nix/store/", 11) == 0 && strlen(exe_path) >= 11 && strcmp(exe_path + strlen(exe_path) - 11, "/bin/fcitx5") == 0)' + ''; + + postInstall = '' + substituteInPlace $out/lib/udev/rules.d/99-lotus.rules \ + --replace-fail "/usr/bin/setfacl" "${acl}/bin/setfacl" + + substituteInPlace $out/lib/systemd/system/fcitx5-lotus-server@.service \ + --replace-fail "/usr/bin/setfacl" "${acl}/bin/setfacl" \ + --replace-fail "/usr/bin/fcitx5-lotus-server" "$out/bin/fcitx5-lotus-server" + ''; + + postFixup = '' + patchShebangs $out/share/fcitx5-lotus/settings-gui + wrapQtApp $out/bin/fcitx5-lotus-settings + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Vietnamese input method engine for Fcitx5"; + homepage = "https://github.com/LotusInputMethod/fcitx5-lotus"; + license = with lib.licenses; [ + gpl3Plus + lgpl21Plus + ]; + maintainers = with lib.maintainers; [ imcvampire ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/fi/firefly-iii/package.nix b/pkgs/by-name/fi/firefly-iii/package.nix index ea54f90bc1aa..82f9ef9be386 100644 --- a/pkgs/by-name/fi/firefly-iii/package.nix +++ b/pkgs/by-name/fi/firefly-iii/package.nix @@ -13,13 +13,13 @@ }: let php = php85; - version = "6.6.3"; + version = "6.6.6"; # Release tarball contains translations downloaded from crowdin releaseTarball = fetchzip { url = "https://github.com/firefly-iii/firefly-iii/releases/download/v${version}/FireflyIII-v${version}.tar.gz"; stripRoot = false; - hash = "sha256-vPuLCjU8MzV5odoDl9QQXj4kKnT6QBSAPwvekMxJtEM="; + hash = "sha256-ejXSfrsmHfbR5KpVo9VxXEsJWZ2ejS55JPl9P/6QzH8="; }; in stdenvNoCC.mkDerivation (finalAttrs: { @@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "firefly-iii"; repo = "firefly-iii"; tag = "v${finalAttrs.version}"; - hash = "sha256-MPBWurmtaIaKHRLf4TPCdgTVWRZ0JdZ0Ix2N7d80s8c="; + hash = "sha256-OfdMx0qiEszFRsgZlF7KILLNA+XBzcD4c2oWIzdIGfk="; }; buildInputs = [ php ]; @@ -48,13 +48,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { inherit (finalAttrs) pname src version; composerStrictValidation = true; strictDeps = true; - vendorHash = "sha256-qjMDZbPpyTkKxvZhgNERe2ZuRFj7LmRW7XZoeezizbk="; + vendorHash = "sha256-pdgXnNTE3iQ/v6t23nc7FojvVbB74W1AhiP7Z1XACUA="; }; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; - name = "${finalAttrs.pname}-npm-deps"; - hash = "sha256-QlLFhrD94mpfoe9mmCVmem9E4oPsLAGMMf+MbI/5Vx0="; + name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; + hash = "sha256-7RvuwFI7NrPwjkS0Lz56ItcHAPt2Sp3iarod+FrNon0="; }; preInstall = '' diff --git a/pkgs/by-name/fl/flyway/package.nix b/pkgs/by-name/fl/flyway/package.nix index b743bdcb3637..7fe3f1e1ccd1 100644 --- a/pkgs/by-name/fl/flyway/package.nix +++ b/pkgs/by-name/fl/flyway/package.nix @@ -9,10 +9,10 @@ stdenv.mkDerivation (finalAttrs: { pname = "flyway"; - version = "12.10.0"; + version = "12.11.0"; src = fetchurl { url = "https://github.com/flyway/flyway/releases/download/flyway-${finalAttrs.version}/flyway-commandline-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-JZ0qKGqaNzND+oKMn/mQc0SBzNUxpIzX4C86Znl/9Fo="; + sha256 = "sha256-2IVSuzrtwqsvqpj7KlCQblD7j7HCK3HMOs1tkcL0ClU="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/by-name/fz/fzf/package.nix b/pkgs/by-name/fz/fzf/package.nix index 639ace6fe6b4..36c51ab58110 100644 --- a/pkgs/by-name/fz/fzf/package.nix +++ b/pkgs/by-name/fz/fzf/package.nix @@ -11,7 +11,7 @@ buildGoModule (finalAttrs: { pname = "fzf"; - version = "0.74.0"; + version = "0.74.1"; __structuredAttrs = true; @@ -19,7 +19,7 @@ buildGoModule (finalAttrs: { owner = "junegunn"; repo = "fzf"; tag = "v${finalAttrs.version}"; - hash = "sha256-fsD/usMUfnjxpn5R/Bv4xuP32excEDgtZDEvikjDCY8="; + hash = "sha256-Dmd/Vpw/W/pz9Hhkwb22zPQyHGLbs3cDjDHVM8ymkrc="; }; vendorHash = "sha256-MLuoKPEAqrpCbUphYOCpHdo8MdW5kvueeDU/3loK33Q="; diff --git a/pkgs/by-name/ga/gallery-dl/package.nix b/pkgs/by-name/ga/gallery-dl/package.nix index 6a5f21ee7b89..18adde6d3ff9 100644 --- a/pkgs/by-name/ga/gallery-dl/package.nix +++ b/pkgs/by-name/ga/gallery-dl/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "gallery-dl"; - version = "1.32.5"; + version = "1.32.6"; pyproject = true; src = fetchFromCodeberg { owner = "mikf"; repo = "gallery-dl"; tag = "v${finalAttrs.version}"; - hash = "sha256-6E4PgJ6VWI0c6TyQOZ0siqsMxNNLpymy8/rANWaBVnU="; + hash = "sha256-EWNKcFMrZG3WAcuKyVBk1u+4qn/a9gWt3QMc5Lu82es="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/gi/gitlab-duo/missing-hashes.patch b/pkgs/by-name/gi/gitlab-duo/missing-hashes.patch deleted file mode 100644 index b6718bdca087..000000000000 --- a/pkgs/by-name/gi/gitlab-duo/missing-hashes.patch +++ /dev/null @@ -1,4631 +0,0 @@ -diff --git c/package-lock.json i/package-lock.json -index 342d56e..b6d464b 100644 ---- c/package-lock.json -+++ i/package-lock.json -@@ -152,6 +152,7 @@ - "eslint-import-resolver-typescript": "^4.4.4", - "eslint-plugin-import": "^2.32.0", - "execa": "^9.3.1", -+ "extra-deps": "workspace:*", - "fs-extra": "^11.3.2", - "http-server": "^14.1.1", - "ink": "^6.5.1", -@@ -225,7 +226,9 @@ - "license": "MIT", - "engines": { - "node": ">=0.10.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", -+ "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==" - }, - "node_modules/@adobe/css-tools": { - "version": "4.4.4", -@@ -557,18 +560,24 @@ - "license": "ISC", - "dependencies": { - "yallist": "^3.0.2" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", -+ "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==" - }, - "node_modules/@babel/helper-compilation-targets/node_modules/semver": { - "version": "6.3.1", - "license": "ISC", - "bin": { - "semver": "bin/semver.js" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", -+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" - }, - "node_modules/@babel/helper-compilation-targets/node_modules/yallist": { - "version": "3.1.1", -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", -+ "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" - }, - "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.27.1", -@@ -596,7 +605,9 @@ - "license": "ISC", - "bin": { - "semver": "bin/semver.js" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", -+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" - }, - "node_modules/@babel/helper-create-regexp-features-plugin": { - "version": "7.27.1", -@@ -620,7 +631,9 @@ - "license": "ISC", - "bin": { - "semver": "bin/semver.js" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", -+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" - }, - "node_modules/@babel/helper-define-polyfill-provider": { - "version": "0.6.3", -@@ -932,7 +945,9 @@ - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz", -+ "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==" - }, - "node_modules/@babel/plugin-syntax-async-generators": { - "version": "7.8.4", -@@ -943,7 +958,9 @@ - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", -+ "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==" - }, - "node_modules/@babel/plugin-syntax-bigint": { - "version": "7.8.3", -@@ -954,7 +971,9 @@ - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", -+ "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==" - }, - "node_modules/@babel/plugin-syntax-class-properties": { - "version": "7.12.13", -@@ -965,7 +984,9 @@ - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", -+ "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==" - }, - "node_modules/@babel/plugin-syntax-decorators": { - "version": "7.27.1", -@@ -1022,7 +1043,9 @@ - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", -+ "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==" - }, - "node_modules/@babel/plugin-syntax-json-strings": { - "version": "7.8.3", -@@ -1033,7 +1056,9 @@ - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", -+ "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==" - }, - "node_modules/@babel/plugin-syntax-jsx": { - "version": "7.27.1", -@@ -1060,7 +1085,9 @@ - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", -+ "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==" - }, - "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": { - "version": "7.8.3", -@@ -1071,7 +1098,9 @@ - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", -+ "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==" - }, - "node_modules/@babel/plugin-syntax-numeric-separator": { - "version": "7.10.4", -@@ -1082,7 +1111,9 @@ - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", -+ "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==" - }, - "node_modules/@babel/plugin-syntax-object-rest-spread": { - "version": "7.8.3", -@@ -1093,7 +1124,9 @@ - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", -+ "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==" - }, - "node_modules/@babel/plugin-syntax-optional-catch-binding": { - "version": "7.8.3", -@@ -1104,7 +1137,9 @@ - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", -+ "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==" - }, - "node_modules/@babel/plugin-syntax-optional-chaining": { - "version": "7.8.3", -@@ -1115,7 +1150,9 @@ - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", -+ "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==" - }, - "node_modules/@babel/plugin-syntax-top-level-await": { - "version": "7.14.5", -@@ -1129,7 +1166,9 @@ - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", -+ "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==" - }, - "node_modules/@babel/plugin-syntax-typescript": { - "version": "7.27.1", -@@ -1159,7 +1198,9 @@ - }, - "peerDependencies": { - "@babel/core": "^7.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz", -+ "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==" - }, - "node_modules/@babel/plugin-transform-arrow-functions": { - "version": "7.27.1", -@@ -1297,7 +1338,9 @@ - "license": "MIT", - "engines": { - "node": ">=4" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", -+ "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" - }, - "node_modules/@babel/plugin-transform-computed-properties": { - "version": "7.27.1", -@@ -4269,7 +4312,9 @@ - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", -+ "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==" - }, - "node_modules/@humanwhocodes/object-schema": { - "version": "2.0.3", -@@ -4539,7 +4584,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", -+ "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==" - }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": { - "version": "1.0.10", -@@ -4547,7 +4594,9 @@ - "license": "MIT", - "dependencies": { - "sprintf-js": "~1.0.2" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", -+ "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==" - }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/camelcase": { - "version": "5.3.1", -@@ -4555,7 +4604,9 @@ - "license": "MIT", - "engines": { - "node": ">=6" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", -+ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" - }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": { - "version": "4.1.0", -@@ -4567,7 +4618,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", -+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==" - }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": { - "version": "3.14.2", -@@ -4592,7 +4645,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", -+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==" - }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": { - "version": "2.3.0", -@@ -4606,7 +4661,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", -+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==" - }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": { - "version": "4.1.0", -@@ -4617,7 +4674,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", -+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==" - }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": { - "version": "5.0.0", -@@ -4625,7 +4684,9 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", -+ "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==" - }, - "node_modules/@istanbuljs/schema": { - "version": "0.1.3", -@@ -4633,7 +4694,9 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", -+ "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==" - }, - "node_modules/@jest/console": { - "version": "29.7.0", -@@ -5040,7 +5103,9 @@ - "license": "MIT", - "engines": { - "node": ">=6.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", -+ "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==" - }, - "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.5.5", -@@ -5323,14 +5388,18 @@ - }, - "engines": { - "node": ">= 8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", -+ "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==" - }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "license": "MIT", - "engines": { - "node": ">= 8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", -+ "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==" - }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", -@@ -5341,7 +5410,9 @@ - }, - "engines": { - "node": ">= 8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", -+ "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==" - }, - "node_modules/@octokit/auth-token": { - "version": "5.1.1", -@@ -8561,7 +8632,9 @@ - "dependencies": { - "@emnapi/wasi-threads": "1.1.0", - "tslib": "^2.4.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.7.1.tgz", -+ "integrity": "sha512-o1uhUASyo921r2XtHYOHy7gdkGLge8ghBEQHMWmyJFoXlpU58kIrhhN3w26lpQb6dspetweapMn2CSNwQ8I4wg==" - }, - "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/runtime": { - "version": "1.7.1", -@@ -8571,7 +8644,9 @@ - "optional": true, - "dependencies": { - "tslib": "^2.4.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.7.1.tgz", -+ "integrity": "sha512-PVtJr5CmLwYAU9PZDMITZoR5iAOShYREoR45EyyLrbntV50mdePTgUn4AmOw90Ifcj+x2kRjdzr1HP3RrNiHGA==" - }, - "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/wasi-threads": { - "version": "1.1.0", -@@ -8581,7 +8656,9 @@ - "optional": true, - "dependencies": { - "tslib": "^2.4.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.1.0.tgz", -+ "integrity": "sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ==" - }, - "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@napi-rs/wasm-runtime": { - "version": "1.1.0", -@@ -8593,7 +8670,9 @@ - "@emnapi/core": "^1.7.1", - "@emnapi/runtime": "^1.7.1", - "@tybys/wasm-util": "^0.10.1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.0.tgz", -+ "integrity": "sha512-Fq6DJW+Bb5jaWE69/qOE0D1TUN9+6uWhCeZpdnSBk14pjLcCWR7Q8n49PTSPHazM37JqrsdpEthXy2xn6jWWiA==" - }, - "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@tybys/wasm-util": { - "version": "0.10.1", -@@ -8603,14 +8682,18 @@ - "optional": true, - "dependencies": { - "tslib": "^2.4.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.1.tgz", -+ "integrity": "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==" - }, - "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/tslib": { - "version": "2.8.1", - "dev": true, - "inBundle": true, - "license": "0BSD", -- "optional": true -+ "optional": true, -+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", -+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==" - }, - "node_modules/@tailwindcss/oxide-win32-arm64-msvc": { - "version": "4.1.18", -@@ -9087,7 +9170,9 @@ - }, - "node_modules/@tootallnate/quickjs-emscripten": { - "version": "0.23.0", -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz", -+ "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==" - }, - "node_modules/@ts-stack/markdown": { - "version": "1.5.0", -@@ -9306,7 +9391,9 @@ - "node_modules/@types/istanbul-lib-coverage": { - "version": "2.0.4", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", -+ "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==" - }, - "node_modules/@types/istanbul-lib-report": { - "version": "3.0.0", -@@ -9314,7 +9401,9 @@ - "license": "MIT", - "dependencies": { - "@types/istanbul-lib-coverage": "*" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", -+ "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==" - }, - "node_modules/@types/istanbul-reports": { - "version": "3.0.1", -@@ -9322,7 +9411,9 @@ - "license": "MIT", - "dependencies": { - "@types/istanbul-lib-report": "*" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz", -+ "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==" - }, - "node_modules/@types/jest": { - "version": "29.5.14", -@@ -9557,7 +9648,9 @@ - "node_modules/@types/stack-utils": { - "version": "2.0.1", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz", -+ "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==" - }, - "node_modules/@types/statuses": { - "version": "2.0.6", -@@ -9642,7 +9735,9 @@ - "node_modules/@types/yargs-parser": { - "version": "21.0.0", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz", -+ "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==" - }, - "node_modules/@types/yauzl": { - "version": "2.10.3", -@@ -11038,7 +11133,9 @@ - "node_modules/add-stream": { - "version": "1.0.0", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz", -+ "integrity": "sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ==" - }, - "node_modules/agent-base": { - "version": "6.0.2", -@@ -11048,7 +11145,9 @@ - }, - "engines": { - "node": ">= 6.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", -+ "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==" - }, - "node_modules/aggregate-error": { - "version": "3.1.0", -@@ -11089,7 +11188,9 @@ - "ajv": { - "optional": true - } -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ajv-draft-04/-/ajv-draft-04-1.0.0.tgz", -+ "integrity": "sha512-mv00Te6nmYbRp5DCwclxtt7yV/joXJPGS7nM+97GdxvuttCOfgI3K4U25zboyeX0O+myI8ERluxQe5wljMmVIw==" - }, - "node_modules/ajv-formats": { - "version": "3.0.1", -@@ -11184,7 +11285,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", -+ "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==" - }, - "node_modules/ansi-escapes/node_modules/type-fest": { - "version": "0.21.3", -@@ -11195,14 +11298,18 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", -+ "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==" - }, - "node_modules/ansi-regex": { - "version": "5.0.1", - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", -+ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" - }, - "node_modules/ansi-styles": { - "version": "4.3.0", -@@ -11215,7 +11322,9 @@ - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", -+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==" - }, - "node_modules/ansis": { - "version": "4.1.0", -@@ -11241,7 +11350,9 @@ - }, - "engines": { - "node": ">= 8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", -+ "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==" - }, - "node_modules/anymatch/node_modules/picomatch": { - "version": "2.3.2", -@@ -11864,7 +11975,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", -+ "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==" - }, - "node_modules/babel-plugin-jest-hoist": { - "version": "29.6.3", -@@ -11955,7 +12068,9 @@ - }, - "peerDependencies": { - "@babel/core": "^7.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz", -+ "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==" - }, - "node_modules/babel-preset-jest": { - "version": "29.6.3", -@@ -12099,7 +12214,9 @@ - }, - "node_modules/balanced-match": { - "version": "1.0.2", -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" - }, - "node_modules/bare-events": { - "version": "2.6.1", -@@ -12845,7 +12962,9 @@ - "license": "MIT", - "engines": { - "node": ">=6" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", -+ "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==" - }, - "node_modules/camelcase": { - "version": "6.3.0", -@@ -13076,7 +13195,9 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz", -+ "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==" - }, - "node_modules/cjs-module-lexer": { - "version": "1.2.3", -@@ -13338,7 +13459,9 @@ - }, - "engines": { - "node": ">=12" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", -+ "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==" - }, - "node_modules/clone": { - "version": "2.1.2", -@@ -13427,7 +13550,9 @@ - }, - "engines": { - "node": ">=7.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", -+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==" - }, - "node_modules/color-interpolate": { - "version": "2.0.0", -@@ -13441,7 +13566,9 @@ - }, - "node_modules/color-name": { - "version": "1.1.4", -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", -+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "node_modules/color-parse": { - "version": "2.0.2", -@@ -13482,13 +13609,13 @@ - }, - "node_modules/commander": { - "version": "14.0.2", -- "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.2.tgz", -- "integrity": "sha512-TywoWNNRbhoD0BXs1P3ZEScW8W5iKrnbithIl0YH+uCmBd0QpPOA8yc82DS3BIE5Ma6FnBVUsJ7wVUDz4dvOWQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=20" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.2.tgz", -+ "integrity": "sha512-TywoWNNRbhoD0BXs1P3ZEScW8W5iKrnbithIl0YH+uCmBd0QpPOA8yc82DS3BIE5Ma6FnBVUsJ7wVUDz4dvOWQ==" - }, - "node_modules/compare-func": { - "version": "2.0.0", -@@ -13605,7 +13732,9 @@ - "dependencies": { - "ini": "^1.3.4", - "proto-list": "~1.2.1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", -+ "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==" - }, - "node_modules/config-chain/node_modules/ini": { - "version": "1.3.8", -@@ -13971,7 +14100,9 @@ - }, - "node_modules/convert-source-map": { - "version": "2.0.0", -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", -+ "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==" - }, - "node_modules/convert-to-spaces": { - "version": "2.0.1", -@@ -14039,7 +14170,9 @@ - "node_modules/core-util-is": { - "version": "1.0.3", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", -+ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" - }, - "node_modules/cors": { - "version": "2.8.5", -@@ -14425,7 +14558,9 @@ - "license": "MIT", - "engines": { - "node": ">= 14" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-5.0.1.tgz", -+ "integrity": "sha512-a9l6T1qqDogvvnw0nKlfZzqsyikEBZBClF39V3TFoKhDtGBqHu2HkuomJc02j5zft8zrUaXEuoicLeW54RkzPg==" - }, - "node_modules/data-urls": { - "version": "3.0.2", -@@ -14637,7 +14772,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", -+ "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==" - }, - "node_modules/dedent": { - "version": "1.6.0", -@@ -14669,12 +14806,16 @@ - "license": "MIT", - "engines": { - "node": ">=4.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", -+ "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==" - }, - "node_modules/deep-is": { - "version": "0.1.4", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", -+ "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==" - }, - "node_modules/deepmerge": { - "version": "4.3.1", -@@ -14986,7 +15127,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", -+ "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==" - }, - "node_modules/dlv": { - "version": "1.1.3", -@@ -15331,7 +15474,9 @@ - }, - "node_modules/emoji-regex": { - "version": "8.0.0", -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", -+ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, - "node_modules/emojilib": { - "version": "2.4.0", -@@ -15611,7 +15756,9 @@ - "license": "MIT", - "dependencies": { - "is-arrayish": "^0.2.1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", -+ "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==" - }, - "node_modules/error-stack-parser-es": { - "version": "1.0.5", -@@ -16635,7 +16782,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", -+ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==" - }, - "node_modules/escodegen": { - "version": "2.1.0", -@@ -16654,7 +16803,9 @@ - }, - "optionalDependencies": { - "source-map": "~0.6.1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", -+ "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==" - }, - "node_modules/eslint": { - "version": "9.32.0", -@@ -17333,7 +17484,9 @@ - }, - "engines": { - "node": ">=4" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", -+ "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" - }, - "node_modules/esquery": { - "version": "1.5.0", -@@ -17344,7 +17497,9 @@ - }, - "engines": { - "node": ">=0.10" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", -+ "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==" - }, - "node_modules/esrecurse": { - "version": "4.3.0", -@@ -17377,7 +17532,9 @@ - "license": "BSD-2-Clause", - "engines": { - "node": ">=0.10.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", -+ "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" - }, - "node_modules/etag": { - "version": "1.8.1", -@@ -17398,7 +17555,9 @@ - "license": "MIT", - "engines": { - "node": ">=0.8.x" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", -+ "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==" - }, - "node_modules/eventsource": { - "version": "3.0.7", -@@ -17465,7 +17624,9 @@ - "dev": true, - "engines": { - "node": ">= 0.8.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", -+ "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==" - }, - "node_modules/expect": { - "version": "29.7.0", -@@ -17513,6 +17674,10 @@ - "node": ">=0.10.0" - } - }, -+ "node_modules/extra-deps": { -+ "resolved": "packages/extra-deps", -+ "link": true -+ }, - "node_modules/extract-from-css": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/extract-from-css/-/extract-from-css-0.4.4.tgz", -@@ -17571,7 +17736,9 @@ - }, - "node_modules/fast-deep-equal": { - "version": "3.1.3", -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", -+ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" - }, - "node_modules/fast-diff": { - "version": "1.3.0", -@@ -17610,12 +17777,16 @@ - }, - "engines": { - "node": ">= 6" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", -+ "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==" - }, - "node_modules/fast-json-stable-stringify": { - "version": "2.1.0", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", -+ "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" - }, - "node_modules/fast-json-stringify": { - "version": "6.0.1", -@@ -17644,7 +17815,9 @@ - "node_modules/fast-levenshtein": { - "version": "2.0.6", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", -+ "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==" - }, - "node_modules/fast-querystring": { - "version": "1.1.2", -@@ -18005,7 +18178,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", -+ "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==" - }, - "node_modules/find-up-simple": { - "version": "1.0.0", -@@ -18202,7 +18377,9 @@ - "dependencies": { - "inherits": "^2.0.1", - "readable-stream": "^2.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", -+ "integrity": "sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==" - }, - "node_modules/fs-extra": { - "version": "11.3.2", -@@ -18221,7 +18398,9 @@ - }, - "node_modules/fs.realpath": { - "version": "1.0.0", -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", -+ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" - }, - "node_modules/fsevents": { - "version": "2.3.3", -@@ -18232,7 +18411,9 @@ - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", -+ "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==" - }, - "node_modules/function-bind": { - "version": "1.1.2", -@@ -18295,14 +18476,18 @@ - "license": "MIT", - "engines": { - "node": ">=6.9.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", -+ "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==" - }, - "node_modules/get-caller-file": { - "version": "2.0.5", - "license": "ISC", - "engines": { - "node": "6.* || 8.* || >= 10.*" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", -+ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" - }, - "node_modules/get-east-asian-width": { - "version": "1.3.1", -@@ -18346,7 +18531,9 @@ - "license": "MIT", - "engines": { - "node": ">=8.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", -+ "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==" - }, - "node_modules/get-proto": { - "version": "1.0.1", -@@ -18366,7 +18553,9 @@ - "license": "MIT", - "dependencies": { - "npm-conf": "~1.1.3" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/get-proxy-settings/-/get-proxy-settings-0.1.13.tgz", -+ "integrity": "sha512-67HvLHFnPpg6JIHq0z4TwW0iXOuX+H51FtEe9xSkEiRwrY0jYNAawtbGrUVFIEDcp4I0sRkm8pIRik8dss8OZw==" - }, - "node_modules/get-stream": { - "version": "9.0.1", -@@ -18426,7 +18615,9 @@ - }, - "engines": { - "node": ">= 14" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.1.tgz", -+ "integrity": "sha512-7ZqONUVqaabogsYNWlYj0t3YZaL6dhuEueZXGF+/YVmf6dHmaFg8/6psJKqhx9QykIDKzpGcy2cn4oV4YC7V/Q==" - }, - "node_modules/get-uri/node_modules/fs-extra": { - "version": "8.1.0", -@@ -18438,21 +18629,27 @@ - }, - "engines": { - "node": ">=6 <7 || >=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", -+ "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==" - }, - "node_modules/get-uri/node_modules/jsonfile": { - "version": "4.0.0", - "license": "MIT", - "optionalDependencies": { - "graceful-fs": "^4.1.6" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", -+ "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==" - }, - "node_modules/get-uri/node_modules/universalify": { - "version": "0.1.2", - "license": "MIT", - "engines": { - "node": ">= 4.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", -+ "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" - }, - "node_modules/git-log-parser": { - "version": "1.2.1", -@@ -18528,7 +18725,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", -+ "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==" - }, - "node_modules/glob-parent": { - "version": "6.0.2", -@@ -18538,7 +18737,9 @@ - }, - "engines": { - "node": ">=10.13.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", -+ "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==" - }, - "node_modules/glob/node_modules/brace-expansion": { - "version": "1.1.14", -@@ -18759,12 +18960,16 @@ - }, - "node_modules/graceful-fs": { - "version": "4.2.11", -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", -+ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" - }, - "node_modules/graphemer": { - "version": "1.4.0", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", -+ "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==" - }, - "node_modules/graphql": { - "version": "16.11.0", -@@ -18872,7 +19077,9 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", -+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" - }, - "node_modules/has-property-descriptors": { - "version": "1.0.2", -@@ -19099,7 +19306,9 @@ - }, - "engines": { - "node": ">= 14" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz", -+ "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==" - }, - "node_modules/http-proxy/node_modules/eventemitter3": { - "version": "4.0.7", -@@ -19188,7 +19397,9 @@ - }, - "engines": { - "node": ">= 6" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", -+ "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==" - }, - "node_modules/human-signals": { - "version": "8.0.0", -@@ -19329,7 +19540,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", -+ "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==" - }, - "node_modules/import-meta-resolve": { - "version": "4.1.0", -@@ -19347,7 +19560,9 @@ - "license": "MIT", - "engines": { - "node": ">=0.8.19" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", -+ "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==" - }, - "node_modules/indent-string": { - "version": "4.0.0", -@@ -19377,11 +19592,15 @@ - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", -+ "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==" - }, - "node_modules/inherits": { - "version": "2.0.4", -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", -+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "node_modules/ini": { - "version": "4.1.3", -@@ -19646,7 +19865,9 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz", -+ "integrity": "sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==" - }, - "node_modules/ipaddr.js": { - "version": "1.9.1", -@@ -19703,7 +19924,9 @@ - "node_modules/is-arrayish": { - "version": "0.2.1", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", -+ "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==" - }, - "node_modules/is-async-function": { - "version": "2.1.1", -@@ -19961,7 +20184,9 @@ - "license": "MIT", - "engines": { - "node": ">=0.10.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", -+ "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==" - }, - "node_modules/is-finalizationregistry": { - "version": "1.1.1", -@@ -19984,7 +20209,9 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", -+ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" - }, - "node_modules/is-generator-fn": { - "version": "2.1.0", -@@ -20022,7 +20249,9 @@ - }, - "engines": { - "node": ">=0.10.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", -+ "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==" - }, - "node_modules/is-hexadecimal": { - "version": "1.0.4", -@@ -20367,7 +20596,9 @@ - "node_modules/is-url": { - "version": "1.2.4", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz", -+ "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==" - }, - "node_modules/is-weakmap": { - "version": "2.0.2", -@@ -20464,16 +20695,22 @@ - }, - "engines": { - "node": ">=v0.10.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/is2/-/is2-2.0.9.tgz", -+ "integrity": "sha512-rZkHeBn9Zzq52sd9IUIV3a5mfwBY+o2HePMh0wkGBM4z4qjvy2GwVxQ6nNXSfw6MmVP6gf1QIlWjiOavhM3x5g==" - }, - "node_modules/isarray": { - "version": "1.0.0", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", -+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==" - }, - "node_modules/isexe": { - "version": "2.0.0", -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", -+ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" - }, - "node_modules/isomorphic-git": { - "version": "1.32.3", -@@ -20580,7 +20817,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", -+ "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==" - }, - "node_modules/istanbul-lib-instrument/node_modules/semver": { - "version": "6.3.1", -@@ -20588,7 +20827,9 @@ - "license": "ISC", - "bin": { - "semver": "bin/semver.js" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", -+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" - }, - "node_modules/istanbul-lib-report": { - "version": "3.0.1", -@@ -21163,7 +21404,9 @@ - }, - "engines": { - "node": ">=10.12.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/jest-junit/-/jest-junit-16.0.0.tgz", -+ "integrity": "sha512-A94mmw6NfJab4Fg/BlvVOUXzXgF0XIH6EmTgJ5NDPp4xoKq0Kr7sErb+4Xs9nZvu58pJojz5RFGpqnZYJTrRfQ==" - }, - "node_modules/jest-junit/node_modules/uuid": { - "version": "8.3.2", -@@ -21171,7 +21414,9 @@ - "license": "MIT", - "bin": { - "uuid": "dist/bin/uuid" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", -+ "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" - }, - "node_modules/jest-leak-detector": { - "version": "29.7.0", -@@ -21946,7 +22191,9 @@ - }, - "node_modules/json-schema-traverse": { - "version": "1.0.0", -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", -+ "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" - }, - "node_modules/json-schema-typed": { - "version": "8.0.2", -@@ -21976,7 +22223,9 @@ - "node_modules/json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", -+ "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==" - }, - "node_modules/json-stable-stringify/node_modules/isarray": { - "version": "2.0.5", -@@ -21999,7 +22248,9 @@ - }, - "engines": { - "node": ">=6" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", -+ "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==" - }, - "node_modules/jsonfile": { - "version": "6.1.0", -@@ -22009,7 +22260,9 @@ - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", -+ "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==" - }, - "node_modules/jsonify": { - "version": "0.0.1", -@@ -22280,7 +22533,9 @@ - }, - "engines": { - "node": ">= 0.8.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", -+ "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==" - }, - "node_modules/light-my-request": { - "version": "6.6.0", -@@ -22670,7 +22925,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", -+ "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==" - }, - "node_modules/lodash": { - "version": "4.18.1", -@@ -22729,7 +22986,9 @@ - "node_modules/lodash.merge": { - "version": "4.6.2", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", -+ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" - }, - "node_modules/lodash.uniqby": { - "version": "4.7.0", -@@ -23218,14 +23477,18 @@ - "node_modules/merge-stream": { - "version": "2.0.0", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", -+ "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" - }, - "node_modules/merge2": { - "version": "1.4.1", - "license": "MIT", - "engines": { - "node": ">= 8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", -+ "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==" - }, - "node_modules/micromark": { - "version": "2.11.4", -@@ -23405,7 +23668,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", -+ "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==" - }, - "node_modules/min-indent": { - "version": "1.0.1", -@@ -23457,7 +23722,9 @@ - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/ljharb" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", -+ "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==" - }, - "node_modules/minimisted": { - "version": "2.0.1", -@@ -23502,7 +23769,9 @@ - }, - "engines": { - "node": ">=10" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", -+ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" - }, - "node_modules/mocha": { - "version": "11.7.5", -@@ -23696,7 +23965,9 @@ - }, - "node_modules/ms": { - "version": "2.1.2", -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", -+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, - "node_modules/msw": { - "version": "2.11.2", -@@ -23843,7 +24114,9 @@ - "node_modules/natural-compare": { - "version": "1.4.0", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", -+ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==" - }, - "node_modules/negotiator": { - "version": "0.6.3", -@@ -23962,7 +24235,9 @@ - "encoding": { - "optional": true - } -- } -+ }, -+ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", -+ "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==" - }, - "node_modules/node-html-parser": { - "version": "6.1.13", -@@ -24020,7 +24295,9 @@ - "license": "MIT", - "engines": { - "node": ">=0.10.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", -+ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" - }, - "node_modules/normalize-url": { - "version": "8.0.1", -@@ -24204,7 +24481,9 @@ - }, - "engines": { - "node": ">=4" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz", -+ "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==" - }, - "node_modules/npm-run-path": { - "version": "5.3.0", -@@ -24248,7 +24527,9 @@ - }, - "engines": { - "node": ">=12" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", -+ "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==" - }, - "node_modules/npm/node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.2.2", -@@ -24260,13 +24541,17 @@ - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", -+ "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==" - }, - "node_modules/npm/node_modules/@isaacs/cliui/node_modules/emoji-regex": { - "version": "9.2.2", - "dev": true, - "inBundle": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", -+ "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" - }, - "node_modules/npm/node_modules/@isaacs/cliui/node_modules/string-width": { - "version": "5.1.2", -@@ -24283,7 +24568,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", -+ "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==" - }, - "node_modules/npm/node_modules/@isaacs/cliui/node_modules/strip-ansi": { - "version": "7.2.0", -@@ -24298,7 +24585,9 @@ - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", -+ "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==" - }, - "node_modules/npm/node_modules/@isaacs/fs-minipass": { - "version": "4.0.1", -@@ -24310,13 +24599,17 @@ - }, - "engines": { - "node": ">=18.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz", -+ "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==" - }, - "node_modules/npm/node_modules/@isaacs/string-locale-compare": { - "version": "1.1.0", - "dev": true, - "inBundle": true, -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz", -+ "integrity": "sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ==" - }, - "node_modules/npm/node_modules/@npmcli/agent": { - "version": "3.0.0", -@@ -24332,7 +24625,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-3.0.0.tgz", -+ "integrity": "sha512-S79NdEgDQd/NGCay6TCoVzXSj74skRZIKJcpJjC5lOq34SZzyI6MqtiiWoiVWoVrTcGjNeC4ipbh1VIHlpfF5Q==" - }, - "node_modules/npm/node_modules/@npmcli/arborist": { - "version": "8.0.5", -@@ -24382,7 +24677,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-8.0.5.tgz", -+ "integrity": "sha512-dFby80JSC3e8825FRGRuhOMWFeKFHokz8j8osLOujmjOSKm6smGu/b1/gbgW0lP8d84iMZO+RxpqBbC5KgL6DQ==" - }, - "node_modules/npm/node_modules/@npmcli/config": { - "version": "9.0.0", -@@ -24401,7 +24698,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@npmcli/config/-/config-9.0.0.tgz", -+ "integrity": "sha512-P5Vi16Y+c8E0prGIzX112ug7XxqfaPFUVW/oXAV+2VsxplKZEnJozqZ0xnK8V8w/SEsBf+TXhUihrEIAU4CA5Q==" - }, - "node_modules/npm/node_modules/@npmcli/fs": { - "version": "4.0.0", -@@ -24413,7 +24712,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-4.0.0.tgz", -+ "integrity": "sha512-/xGlezI6xfGO9NwuJlnwz/K14qD1kCSAGtacBHnGzeAIuJGazcp45KP5NuyARXoKb7cwulAGWVsbeSxdG/cb0Q==" - }, - "node_modules/npm/node_modules/@npmcli/git": { - "version": "6.0.3", -@@ -24432,7 +24733,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-6.0.3.tgz", -+ "integrity": "sha512-GUYESQlxZRAdhs3UhbB6pVRNUELQOHXwK9ruDkwmCv2aZ5y0SApQzUJCg02p3A7Ue2J5hxvlk1YI53c00NmRyQ==" - }, - "node_modules/npm/node_modules/@npmcli/installed-package-contents": { - "version": "3.0.0", -@@ -24448,7 +24751,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-3.0.0.tgz", -+ "integrity": "sha512-fkxoPuFGvxyrH+OQzyTkX2LUEamrF4jZSmxjAtPPHHGO0dqsQ8tTKjnIS8SAnPHdk2I03BDtSMR5K/4loKg79Q==" - }, - "node_modules/npm/node_modules/@npmcli/map-workspaces": { - "version": "4.0.2", -@@ -24463,7 +24768,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-4.0.2.tgz", -+ "integrity": "sha512-mnuMuibEbkaBTYj9HQ3dMe6L0ylYW+s/gfz7tBDMFY/la0w9Kf44P9aLn4/+/t3aTR3YUHKoT6XQL9rlicIe3Q==" - }, - "node_modules/npm/node_modules/@npmcli/metavuln-calculator": { - "version": "8.0.1", -@@ -24479,7 +24786,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@npmcli/metavuln-calculator/-/metavuln-calculator-8.0.1.tgz", -+ "integrity": "sha512-WXlJx9cz3CfHSt9W9Opi1PTFc4WZLFomm5O8wekxQZmkyljrBRwATwDxfC9iOXJwYVmfiW1C1dUe0W2aN0UrSg==" - }, - "node_modules/npm/node_modules/@npmcli/metavuln-calculator/node_modules/pacote": { - "version": "20.0.1", -@@ -24510,7 +24819,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/pacote/-/pacote-20.0.1.tgz", -+ "integrity": "sha512-jTMLD/QK7JMUKg3g7K3M/DEqIbGm7sxclj12eQYIkL3viutSiefTs26IrqIqgGlFsviF/9dlDUZxnpGvkRXtjw==" - }, - "node_modules/npm/node_modules/@npmcli/name-from-folder": { - "version": "3.0.0", -@@ -24519,7 +24830,9 @@ - "license": "ISC", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@npmcli/name-from-folder/-/name-from-folder-3.0.0.tgz", -+ "integrity": "sha512-61cDL8LUc9y80fXn+lir+iVt8IS0xHqEKwPu/5jCjxQTVoSCmkXvw4vbMrzAMtmghz3/AkiBjhHkDKUH+kf7kA==" - }, - "node_modules/npm/node_modules/@npmcli/node-gyp": { - "version": "4.0.0", -@@ -24528,7 +24841,9 @@ - "license": "ISC", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-4.0.0.tgz", -+ "integrity": "sha512-+t5DZ6mO/QFh78PByMq1fGSAub/agLJZDRfJRMeOSNCt8s9YVlTjmGpIPwPhvXTGUIJk+WszlT0rQa1W33yzNA==" - }, - "node_modules/npm/node_modules/@npmcli/package-json": { - "version": "6.2.0", -@@ -24546,7 +24861,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-6.2.0.tgz", -+ "integrity": "sha512-rCNLSB/JzNvot0SEyXqWZ7tX2B5dD2a1br2Dp0vSYVo5jh8Z0EZ7lS9TsZ1UtziddB1UfNUaMCc538/HztnJGA==" - }, - "node_modules/npm/node_modules/@npmcli/promise-spawn": { - "version": "8.0.3", -@@ -24558,7 +24875,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-8.0.3.tgz", -+ "integrity": "sha512-Yb00SWaL4F8w+K8YGhQ55+xE4RUNdMHV43WZGsiTM92gS+lC0mGsn7I4hLug7pbao035S6bj3Y3w0cUNGLfmkg==" - }, - "node_modules/npm/node_modules/@npmcli/query": { - "version": "4.0.1", -@@ -24570,7 +24889,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@npmcli/query/-/query-4.0.1.tgz", -+ "integrity": "sha512-4OIPFb4weUUwkDXJf4Hh1inAn8neBGq3xsH4ZsAaN6FK3ldrFkH7jSpCc7N9xesi0Sp+EBXJ9eGMDrEww2Ztqw==" - }, - "node_modules/npm/node_modules/@npmcli/redact": { - "version": "3.2.2", -@@ -24579,7 +24900,9 @@ - "license": "ISC", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@npmcli/redact/-/redact-3.2.2.tgz", -+ "integrity": "sha512-7VmYAmk4csGv08QzrDKScdzn11jHPFGyqJW39FyPgPuAp3zIaUmuCo1yxw9aGs+NEJuTGQ9Gwqpt93vtJubucg==" - }, - "node_modules/npm/node_modules/@npmcli/run-script": { - "version": "9.1.0", -@@ -24596,7 +24919,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-9.1.0.tgz", -+ "integrity": "sha512-aoNSbxtkePXUlbZB+anS1LqsJdctG5n3UVhfU47+CDdwMi6uNTBMF9gPcQRnqghQd2FGzcwwIFBruFMxjhBewg==" - }, - "node_modules/npm/node_modules/@pkgjs/parseargs": { - "version": "0.11.0", -@@ -24606,7 +24931,9 @@ - "optional": true, - "engines": { - "node": ">=14" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", -+ "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==" - }, - "node_modules/npm/node_modules/@sigstore/bundle": { - "version": "3.1.0", -@@ -24618,7 +24945,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-3.1.0.tgz", -+ "integrity": "sha512-Mm1E3/CmDDCz3nDhFKTuYdB47EdRFRQMOE/EAbiG1MJW77/w1b3P7Qx7JSrVJs8PfwOLOVcKQCHErIwCTyPbag==" - }, - "node_modules/npm/node_modules/@sigstore/core": { - "version": "2.0.0", -@@ -24627,7 +24956,9 @@ - "license": "Apache-2.0", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@sigstore/core/-/core-2.0.0.tgz", -+ "integrity": "sha512-nYxaSb/MtlSI+JWcwTHQxyNmWeWrUXJJ/G4liLrGG7+tS4vAz6LF3xRXqLH6wPIVUoZQel2Fs4ddLx4NCpiIYg==" - }, - "node_modules/npm/node_modules/@sigstore/protobuf-specs": { - "version": "0.4.3", -@@ -24636,7 +24967,9 @@ - "license": "Apache-2.0", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.4.3.tgz", -+ "integrity": "sha512-fk2zjD9117RL9BjqEwF7fwv7Q/P9yGsMV4MUJZ/DocaQJ6+3pKr+syBq1owU5Q5qGw5CUbXzm+4yJ2JVRDQeSA==" - }, - "node_modules/npm/node_modules/@sigstore/sign": { - "version": "3.1.0", -@@ -24653,7 +24986,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-3.1.0.tgz", -+ "integrity": "sha512-knzjmaOHOov1Ur7N/z4B1oPqZ0QX5geUfhrVaqVlu+hl0EAoL4o+l0MSULINcD5GCWe3Z0+YJO8ues6vFlW0Yw==" - }, - "node_modules/npm/node_modules/@sigstore/tuf": { - "version": "3.1.1", -@@ -24666,7 +25001,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-3.1.1.tgz", -+ "integrity": "sha512-eFFvlcBIoGwVkkwmTi/vEQFSva3xs5Ot3WmBcjgjVdiaoelBLQaQ/ZBfhlG0MnG0cmTYScPpk7eDdGDWUcFUmg==" - }, - "node_modules/npm/node_modules/@sigstore/verify": { - "version": "2.1.1", -@@ -24680,7 +25017,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-2.1.1.tgz", -+ "integrity": "sha512-hVJD77oT67aowHxwT4+M6PGOp+E2LtLdTK3+FC0lBO9T7sYwItDMXZ7Z07IDCvR1M717a4axbIWckrW67KMP/w==" - }, - "node_modules/npm/node_modules/@tufjs/canonical-json": { - "version": "2.0.0", -@@ -24689,7 +25028,9 @@ - "license": "MIT", - "engines": { - "node": "^16.14.0 || >=18.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-2.0.0.tgz", -+ "integrity": "sha512-yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA==" - }, - "node_modules/npm/node_modules/abbrev": { - "version": "3.0.1", -@@ -24698,7 +25039,9 @@ - "license": "ISC", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-3.0.1.tgz", -+ "integrity": "sha512-AO2ac6pjRB3SJmGJo+v5/aK6Omggp6fsLrs6wN9bd35ulu4cCwaAU9+7ZhXjeqHVkaHThLuzH0nZr0YpCDhygg==" - }, - "node_modules/npm/node_modules/agent-base": { - "version": "7.1.4", -@@ -24707,7 +25050,9 @@ - "license": "MIT", - "engines": { - "node": ">= 14" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz", -+ "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==" - }, - "node_modules/npm/node_modules/ansi-regex": { - "version": "5.0.1", -@@ -24716,7 +25061,9 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", -+ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" - }, - "node_modules/npm/node_modules/ansi-styles": { - "version": "6.2.3", -@@ -24728,25 +25075,33 @@ - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", -+ "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==" - }, - "node_modules/npm/node_modules/aproba": { - "version": "2.1.0", - "dev": true, - "inBundle": true, -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.1.0.tgz", -+ "integrity": "sha512-tLIEcj5GuR2RSTnxNKdkK0dJ/GrC7P38sUkiDmDuHfsHmbagTFAxDVIBltoklXEVIQ/f14IL8IMJ5pn9Hez1Ew==" - }, - "node_modules/npm/node_modules/archy": { - "version": "1.0.0", - "dev": true, - "inBundle": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", -+ "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==" - }, - "node_modules/npm/node_modules/balanced-match": { - "version": "1.0.2", - "dev": true, - "inBundle": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" - }, - "node_modules/npm/node_modules/bin-links": { - "version": "5.0.0", -@@ -24762,7 +25117,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/bin-links/-/bin-links-5.0.0.tgz", -+ "integrity": "sha512-sdleLVfCjBtgO5cNjA2HVRvWBJAHs4zwenaCPMNJAJU0yNxpzj80IpjOIimkpkr+mhlA+how5poQtt53PygbHA==" - }, - "node_modules/npm/node_modules/binary-extensions": { - "version": "2.3.0", -@@ -24774,7 +25131,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", -+ "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==" - }, - "node_modules/npm/node_modules/brace-expansion": { - "version": "2.0.2", -@@ -24783,7 +25142,9 @@ - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", -+ "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==" - }, - "node_modules/npm/node_modules/cacache": { - "version": "19.0.1", -@@ -24806,7 +25167,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/cacache/-/cacache-19.0.1.tgz", -+ "integrity": "sha512-hdsUxulXCi5STId78vRVYEtDAjq99ICAUktLTeTYsLoTE6Z8dS0c8pWNCxwdrk9YfJeobDZc2Y186hD/5ZQgFQ==" - }, - "node_modules/npm/node_modules/chalk": { - "version": "5.6.2", -@@ -24818,7 +25181,9 @@ - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz", -+ "integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==" - }, - "node_modules/npm/node_modules/chownr": { - "version": "3.0.0", -@@ -24827,7 +25192,9 @@ - "license": "BlueOak-1.0.0", - "engines": { - "node": ">=18" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz", -+ "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==" - }, - "node_modules/npm/node_modules/ci-info": { - "version": "4.4.0", -@@ -24842,7 +25209,9 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.4.0.tgz", -+ "integrity": "sha512-77PSwercCZU2Fc4sX94eF8k8Pxte6JAwL4/ICZLFjJLqegs7kCuAsqqj/70NQF6TvDpgFjkubQB2FW2ZZddvQg==" - }, - "node_modules/npm/node_modules/cidr-regex": { - "version": "4.1.3", -@@ -24854,7 +25223,9 @@ - }, - "engines": { - "node": ">=14" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/cidr-regex/-/cidr-regex-4.1.3.tgz", -+ "integrity": "sha512-86M1y3ZeQvpZkZejQCcS+IaSWjlDUC+ORP0peScQ4uEUFCZ8bEQVz7NlJHqysoUb6w3zCjx4Mq/8/2RHhMwHYw==" - }, - "node_modules/npm/node_modules/cli-columns": { - "version": "4.0.0", -@@ -24867,7 +25238,9 @@ - }, - "engines": { - "node": ">= 10" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/cli-columns/-/cli-columns-4.0.0.tgz", -+ "integrity": "sha512-XW2Vg+w+L9on9wtwKpyzluIPCWXjaBahI7mTcYjx+BVIYD9c3yqcv/yKC7CmdCZat4rq2yiE1UMSJC5ivKfMtQ==" - }, - "node_modules/npm/node_modules/cmd-shim": { - "version": "7.0.0", -@@ -24876,7 +25249,9 @@ - "license": "ISC", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-7.0.0.tgz", -+ "integrity": "sha512-rtpaCbr164TPPh+zFdkWpCyZuKkjpAzODfaZCf/SVJZzJN+4bHQb/LP3Jzq5/+84um3XXY8r548XiWKSborwVw==" - }, - "node_modules/npm/node_modules/color-convert": { - "version": "2.0.1", -@@ -24888,19 +25263,25 @@ - }, - "engines": { - "node": ">=7.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", -+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==" - }, - "node_modules/npm/node_modules/color-name": { - "version": "1.1.4", - "dev": true, - "inBundle": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", -+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "node_modules/npm/node_modules/common-ancestor-path": { - "version": "1.0.1", - "dev": true, - "inBundle": true, -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/common-ancestor-path/-/common-ancestor-path-1.0.1.tgz", -+ "integrity": "sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w==" - }, - "node_modules/npm/node_modules/cross-spawn": { - "version": "7.0.6", -@@ -24914,7 +25295,9 @@ - }, - "engines": { - "node": ">= 8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", -+ "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==" - }, - "node_modules/npm/node_modules/cross-spawn/node_modules/which": { - "version": "2.0.2", -@@ -24929,7 +25312,9 @@ - }, - "engines": { - "node": ">= 8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", -+ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==" - }, - "node_modules/npm/node_modules/cssesc": { - "version": "3.0.0", -@@ -24941,7 +25326,9 @@ - }, - "engines": { - "node": ">=4" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", -+ "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==" - }, - "node_modules/npm/node_modules/debug": { - "version": "4.4.3", -@@ -24958,7 +25345,9 @@ - "supports-color": { - "optional": true - } -- } -+ }, -+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", -+ "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==" - }, - "node_modules/npm/node_modules/diff": { - "version": "5.2.2", -@@ -24967,19 +25356,25 @@ - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.3.1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.2.tgz", -+ "integrity": "sha512-vtcDfH3TOjP8UekytvnHH1o1P4FcUdt4eQ1Y+Abap1tk/OB2MWQvcwS2ClCd1zuIhc3JKOx6p3kod8Vfys3E+A==" - }, - "node_modules/npm/node_modules/eastasianwidth": { - "version": "0.2.0", - "dev": true, - "inBundle": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", -+ "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" - }, - "node_modules/npm/node_modules/emoji-regex": { - "version": "8.0.0", - "dev": true, - "inBundle": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", -+ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, - "node_modules/npm/node_modules/encoding": { - "version": "0.1.13", -@@ -24989,7 +25384,9 @@ - "optional": true, - "dependencies": { - "iconv-lite": "^0.6.2" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", -+ "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==" - }, - "node_modules/npm/node_modules/env-paths": { - "version": "2.2.1", -@@ -24998,19 +25395,25 @@ - "license": "MIT", - "engines": { - "node": ">=6" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", -+ "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==" - }, - "node_modules/npm/node_modules/err-code": { - "version": "2.0.3", - "dev": true, - "inBundle": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", -+ "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==" - }, - "node_modules/npm/node_modules/exponential-backoff": { - "version": "3.1.3", - "dev": true, - "inBundle": true, -- "license": "Apache-2.0" -+ "license": "Apache-2.0", -+ "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.3.tgz", -+ "integrity": "sha512-ZgEeZXj30q+I0EN+CbSSpIyPaJ5HVQD18Z1m+u1FXbAeT94mr1zw50q4q6jiiC447Nl/YTcIYSAftiGqetwXCA==" - }, - "node_modules/npm/node_modules/fastest-levenshtein": { - "version": "1.0.16", -@@ -25019,7 +25422,9 @@ - "license": "MIT", - "engines": { - "node": ">= 4.9.1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", -+ "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==" - }, - "node_modules/npm/node_modules/fdir": { - "version": "6.5.0", -@@ -25036,7 +25441,9 @@ - "picomatch": { - "optional": true - } -- } -+ }, -+ "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", -+ "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==" - }, - "node_modules/npm/node_modules/foreground-child": { - "version": "3.3.1", -@@ -25052,7 +25459,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", -+ "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==" - }, - "node_modules/npm/node_modules/fs-minipass": { - "version": "3.0.3", -@@ -25064,7 +25473,9 @@ - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", -+ "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==" - }, - "node_modules/npm/node_modules/glob": { - "version": "10.5.0", -@@ -25084,13 +25495,17 @@ - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz", -+ "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==" - }, - "node_modules/npm/node_modules/graceful-fs": { - "version": "4.2.11", - "dev": true, - "inBundle": true, -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", -+ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" - }, - "node_modules/npm/node_modules/hosted-git-info": { - "version": "8.1.0", -@@ -25102,13 +25517,17 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-8.1.0.tgz", -+ "integrity": "sha512-Rw/B2DNQaPBICNXEm8balFz9a6WpZrkCGpcWFpy7nCj+NyhSdqXipmfvtmWt9xGfp0wZnBxB+iVpLmQMYt47Tw==" - }, - "node_modules/npm/node_modules/http-cache-semantics": { - "version": "4.2.0", - "dev": true, - "inBundle": true, -- "license": "BSD-2-Clause" -+ "license": "BSD-2-Clause", -+ "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz", -+ "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==" - }, - "node_modules/npm/node_modules/http-proxy-agent": { - "version": "7.0.2", -@@ -25121,7 +25540,9 @@ - }, - "engines": { - "node": ">= 14" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", -+ "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==" - }, - "node_modules/npm/node_modules/https-proxy-agent": { - "version": "7.0.6", -@@ -25134,7 +25555,9 @@ - }, - "engines": { - "node": ">= 14" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", -+ "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==" - }, - "node_modules/npm/node_modules/iconv-lite": { - "version": "0.6.3", -@@ -25147,7 +25570,9 @@ - }, - "engines": { - "node": ">=0.10.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", -+ "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==" - }, - "node_modules/npm/node_modules/ignore-walk": { - "version": "7.0.0", -@@ -25159,7 +25584,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-7.0.0.tgz", -+ "integrity": "sha512-T4gbf83A4NH95zvhVYZc+qWocBBGlpzUXLPGurJggw/WIOwicfXJChLDP/iBZnN5WqROSu5Bm3hhle4z8a8YGQ==" - }, - "node_modules/npm/node_modules/imurmurhash": { - "version": "0.1.4", -@@ -25168,7 +25595,9 @@ - "license": "MIT", - "engines": { - "node": ">=0.8.19" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", -+ "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==" - }, - "node_modules/npm/node_modules/ini": { - "version": "5.0.0", -@@ -25177,7 +25606,9 @@ - "license": "ISC", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ini/-/ini-5.0.0.tgz", -+ "integrity": "sha512-+N0ngpO3e7cRUWOJAS7qw0IZIVc6XPrW4MlFBdD066F2L4k1L6ker3hLqSq7iXxU5tgS4WGkIUElWn5vogAEnw==" - }, - "node_modules/npm/node_modules/init-package-json": { - "version": "7.0.2", -@@ -25195,7 +25626,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-7.0.2.tgz", -+ "integrity": "sha512-Qg6nAQulaOQZjvaSzVLtYRqZmuqOi7gTknqqgdhZy7LV5oO+ppvHWq15tZYzGyxJLTH5BxRTqTa+cPDx2pSD9Q==" - }, - "node_modules/npm/node_modules/ip-address": { - "version": "10.1.0", -@@ -25204,7 +25637,9 @@ - "license": "MIT", - "engines": { - "node": ">= 12" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.1.0.tgz", -+ "integrity": "sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==" - }, - "node_modules/npm/node_modules/ip-regex": { - "version": "5.0.0", -@@ -25216,7 +25651,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-5.0.0.tgz", -+ "integrity": "sha512-fOCG6lhoKKakwv+C6KdsOnGvgXnmgfmp0myi3bcNwj3qfwPAxRKWEuFhvEFF7ceYIz6+1jRZ+yguLFAmUNPEfw==" - }, - "node_modules/npm/node_modules/is-cidr": { - "version": "5.1.1", -@@ -25228,7 +25665,9 @@ - }, - "engines": { - "node": ">=14" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/is-cidr/-/is-cidr-5.1.1.tgz", -+ "integrity": "sha512-AwzRMjtJNTPOgm7xuYZ71715z99t+4yRnSnSzgK5err5+heYi4zMuvmpUadaJ28+KCXCQo8CjUrKQZRWSPmqTQ==" - }, - "node_modules/npm/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", -@@ -25237,13 +25676,17 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", -+ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" - }, - "node_modules/npm/node_modules/isexe": { - "version": "2.0.0", - "dev": true, - "inBundle": true, -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", -+ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" - }, - "node_modules/npm/node_modules/jackspeak": { - "version": "3.4.3", -@@ -25258,7 +25701,9 @@ - }, - "optionalDependencies": { - "@pkgjs/parseargs": "^0.11.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", -+ "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==" - }, - "node_modules/npm/node_modules/json-parse-even-better-errors": { - "version": "4.0.0", -@@ -25267,7 +25712,9 @@ - "license": "MIT", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-4.0.0.tgz", -+ "integrity": "sha512-lR4MXjGNgkJc7tkQ97kb2nuEMnNCyU//XYVH0MKTGcXEiSudQ5MKGKen3C5QubYy0vmq+JGitUg92uuywGEwIA==" - }, - "node_modules/npm/node_modules/json-stringify-nice": { - "version": "1.1.4", -@@ -25276,7 +25723,9 @@ - "license": "ISC", - "funding": { - "url": "https://github.com/sponsors/isaacs" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/json-stringify-nice/-/json-stringify-nice-1.1.4.tgz", -+ "integrity": "sha512-5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw==" - }, - "node_modules/npm/node_modules/jsonparse": { - "version": "1.3.1", -@@ -25285,19 +25734,25 @@ - "node >= 0.2.0" - ], - "inBundle": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", -+ "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==" - }, - "node_modules/npm/node_modules/just-diff": { - "version": "6.0.2", - "dev": true, - "inBundle": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/just-diff/-/just-diff-6.0.2.tgz", -+ "integrity": "sha512-S59eriX5u3/QhMNq3v/gm8Kd0w8OS6Tz2FS1NG4blv+z0MuQcBRJyFWjdovM0Rad4/P4aUPFtnkNjMjyMlMSYA==" - }, - "node_modules/npm/node_modules/just-diff-apply": { - "version": "5.5.0", - "dev": true, - "inBundle": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/just-diff-apply/-/just-diff-apply-5.5.0.tgz", -+ "integrity": "sha512-OYTthRfSh55WOItVqwpefPtNt2VdKsq5AnAK6apdtR6yCH8pr0CmSr710J0Mf+WdQy7K/OzMy7K2MgAfdQURDw==" - }, - "node_modules/npm/node_modules/libnpmaccess": { - "version": "9.0.0", -@@ -25310,7 +25765,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-9.0.0.tgz", -+ "integrity": "sha512-mTCFoxyevNgXRrvgdOhghKJnCWByBc9yp7zX4u9RBsmZjwOYdUDEBfL5DdgD1/8gahsYnauqIWFbq0iK6tO6CQ==" - }, - "node_modules/npm/node_modules/libnpmdiff": { - "version": "7.0.5", -@@ -25329,7 +25786,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/libnpmdiff/-/libnpmdiff-7.0.5.tgz", -+ "integrity": "sha512-pQ9Hg/j1DcHoY2tbkMKK8mIuEuDlwL9sYKmhY8foofBC8isgtjfrzXDjm4teoy91Pa2ukpnV8dXqKmFb04mc4A==" - }, - "node_modules/npm/node_modules/libnpmexec": { - "version": "9.0.5", -@@ -25350,7 +25809,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/libnpmexec/-/libnpmexec-9.0.5.tgz", -+ "integrity": "sha512-XAuPuoQhSgv8FEI03zvnxgr7ueeClSLUfHRwG+xtE9Ue2gjny7CIgpJsjd2a6evS0yHu8CcqtEumq50WzQ/UtQ==" - }, - "node_modules/npm/node_modules/libnpmfund": { - "version": "6.0.5", -@@ -25362,7 +25823,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/libnpmfund/-/libnpmfund-6.0.5.tgz", -+ "integrity": "sha512-8tGUrvobGjeAmbUxFI7ivjgWpeGsSz9CmI7FtrMdu7iGbtAcTESszl2J+R1+Pu0M+TO9fQIbyeovWGM6lI0akA==" - }, - "node_modules/npm/node_modules/libnpmhook": { - "version": "11.0.0", -@@ -25375,7 +25838,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/libnpmhook/-/libnpmhook-11.0.0.tgz", -+ "integrity": "sha512-Xc18rD9NFbRwZbYCQ+UCF5imPsiHSyuQA8RaCA2KmOUo8q4kmBX4JjGWzmZnxZCT8s6vwzmY1BvHNqBGdg9oBQ==" - }, - "node_modules/npm/node_modules/libnpmorg": { - "version": "7.0.0", -@@ -25388,7 +25853,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/libnpmorg/-/libnpmorg-7.0.0.tgz", -+ "integrity": "sha512-DcTodX31gDEiFrlIHurBQiBlBO6Var2KCqMVCk+HqZhfQXqUfhKGmFOp0UHr6HR1lkTVM0MzXOOYtUObk0r6Dg==" - }, - "node_modules/npm/node_modules/libnpmpack": { - "version": "8.0.5", -@@ -25403,7 +25870,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/libnpmpack/-/libnpmpack-8.0.5.tgz", -+ "integrity": "sha512-j1Zyacp6VRe1HsmOH4MWpEOLMzPKwBkmSgMn5ep83wbALPIwD7LcAvhyjM9sEFjKyFuqmX56XUvNLcF8sUayOg==" - }, - "node_modules/npm/node_modules/libnpmpublish": { - "version": "10.0.2", -@@ -25422,7 +25891,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-10.0.2.tgz", -+ "integrity": "sha512-Q+PlGO6vOZDlZ6jKPDqDLYbARfV5OBusmJZj9GPbNUiys8OK6/yrwJ8ty8ibbc4GkMspqgOMdJ/1dcJwhtpkDg==" - }, - "node_modules/npm/node_modules/libnpmsearch": { - "version": "8.0.0", -@@ -25434,7 +25905,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/libnpmsearch/-/libnpmsearch-8.0.0.tgz", -+ "integrity": "sha512-W8FWB78RS3Nkl1gPSHOlF024qQvcoU/e3m9BGDuBfVZGfL4MJ91GXXb04w3zJCGOW9dRQUyWVEqupFjCrgltDg==" - }, - "node_modules/npm/node_modules/libnpmteam": { - "version": "7.0.0", -@@ -25447,7 +25920,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/libnpmteam/-/libnpmteam-7.0.0.tgz", -+ "integrity": "sha512-PKLOoVukN34qyJjgEm5DEOnDwZkeVMUHRx8NhcKDiCNJGPl7G/pF1cfBw8yicMwRlHaHkld1FdujOzKzy4AlwA==" - }, - "node_modules/npm/node_modules/libnpmversion": { - "version": "7.0.0", -@@ -25463,13 +25938,17 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/libnpmversion/-/libnpmversion-7.0.0.tgz", -+ "integrity": "sha512-0xle91R6F8r/Q/4tHOnyKko+ZSquEXNdxwRdKCPv4kC1cOVBMFXRsKKrVtRKtXcFn362U8ZlJefk4Apu00424g==" - }, - "node_modules/npm/node_modules/lru-cache": { - "version": "10.4.3", - "dev": true, - "inBundle": true, -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", -+ "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==" - }, - "node_modules/npm/node_modules/make-fetch-happen": { - "version": "14.0.3", -@@ -25491,7 +25970,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-14.0.3.tgz", -+ "integrity": "sha512-QMjGbFTP0blj97EeidG5hk/QhKQ3T4ICckQGLgz38QF7Vgbk6e6FTARN8KhKxyBbWn8R0HU+bnw8aSoFPD4qtQ==" - }, - "node_modules/npm/node_modules/minimatch": { - "version": "9.0.9", -@@ -25506,7 +25987,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz", -+ "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==" - }, - "node_modules/npm/node_modules/minipass": { - "version": "7.1.3", -@@ -25515,7 +25998,9 @@ - "license": "BlueOak-1.0.0", - "engines": { - "node": ">=16 || 14 >=14.17" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz", -+ "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==" - }, - "node_modules/npm/node_modules/minipass-collect": { - "version": "2.0.1", -@@ -25527,7 +26012,9 @@ - }, - "engines": { - "node": ">=16 || 14 >=14.17" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz", -+ "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==" - }, - "node_modules/npm/node_modules/minipass-fetch": { - "version": "4.0.1", -@@ -25544,7 +26031,9 @@ - }, - "optionalDependencies": { - "encoding": "^0.1.13" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-4.0.1.tgz", -+ "integrity": "sha512-j7U11C5HXigVuutxebFadoYBbd7VSdZWggSe64NVdvWNBqGAiXPL2QVCehjmw7lY1oF9gOllYbORh+hiNgfPgQ==" - }, - "node_modules/npm/node_modules/minipass-flush": { - "version": "1.0.5", -@@ -25556,7 +26045,9 @@ - }, - "engines": { - "node": ">= 8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", -+ "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==" - }, - "node_modules/npm/node_modules/minipass-flush/node_modules/minipass": { - "version": "3.3.6", -@@ -25568,13 +26059,17 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", -+ "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==" - }, - "node_modules/npm/node_modules/minipass-flush/node_modules/yallist": { - "version": "4.0.0", - "dev": true, - "inBundle": true, -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", -+ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - }, - "node_modules/npm/node_modules/minipass-pipeline": { - "version": "1.2.4", -@@ -25586,7 +26081,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", -+ "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==" - }, - "node_modules/npm/node_modules/minipass-pipeline/node_modules/minipass": { - "version": "3.3.6", -@@ -25598,13 +26095,17 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", -+ "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==" - }, - "node_modules/npm/node_modules/minipass-pipeline/node_modules/yallist": { - "version": "4.0.0", - "dev": true, - "inBundle": true, -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", -+ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - }, - "node_modules/npm/node_modules/minipass-sized": { - "version": "1.0.3", -@@ -25616,7 +26117,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", -+ "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==" - }, - "node_modules/npm/node_modules/minipass-sized/node_modules/minipass": { - "version": "3.3.6", -@@ -25628,13 +26131,17 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", -+ "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==" - }, - "node_modules/npm/node_modules/minipass-sized/node_modules/yallist": { - "version": "4.0.0", - "dev": true, - "inBundle": true, -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", -+ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - }, - "node_modules/npm/node_modules/minizlib": { - "version": "3.1.0", -@@ -25646,13 +26153,17 @@ - }, - "engines": { - "node": ">= 18" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz", -+ "integrity": "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==" - }, - "node_modules/npm/node_modules/ms": { - "version": "2.1.3", - "dev": true, - "inBundle": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", -+ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" - }, - "node_modules/npm/node_modules/mute-stream": { - "version": "2.0.0", -@@ -25661,7 +26172,9 @@ - "license": "ISC", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-2.0.0.tgz", -+ "integrity": "sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA==" - }, - "node_modules/npm/node_modules/negotiator": { - "version": "1.0.0", -@@ -25670,7 +26183,9 @@ - "license": "MIT", - "engines": { - "node": ">= 0.6" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz", -+ "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==" - }, - "node_modules/npm/node_modules/node-gyp": { - "version": "11.5.0", -@@ -25694,7 +26209,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-11.5.0.tgz", -+ "integrity": "sha512-ra7Kvlhxn5V9Slyus0ygMa2h+UqExPqUIkfk7Pc8QTLT956JLSy51uWFwHtIYy0vI8cB4BDhc/S03+880My/LQ==" - }, - "node_modules/npm/node_modules/nopt": { - "version": "8.1.0", -@@ -25709,7 +26226,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/nopt/-/nopt-8.1.0.tgz", -+ "integrity": "sha512-ieGu42u/Qsa4TFktmaKEwM6MQH0pOWnaB3htzh0JRtx84+Mebc0cbZYN5bC+6WTZ4+77xrL9Pn5m7CV6VIkV7A==" - }, - "node_modules/npm/node_modules/normalize-package-data": { - "version": "7.0.1", -@@ -25723,7 +26242,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-7.0.1.tgz", -+ "integrity": "sha512-linxNAT6M0ebEYZOx2tO6vBEFsVgnPpv+AVjk0wJHfaUIbq31Jm3T6vvZaarnOeWDh8ShnwXuaAyM7WT3RzErA==" - }, - "node_modules/npm/node_modules/npm-audit-report": { - "version": "6.0.0", -@@ -25732,7 +26253,9 @@ - "license": "ISC", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/npm-audit-report/-/npm-audit-report-6.0.0.tgz", -+ "integrity": "sha512-Ag6Y1irw/+CdSLqEEAn69T8JBgBThj5mw0vuFIKeP7hATYuQuS5jkMjK6xmVB8pr7U4g5Audbun0lHhBDMIBRA==" - }, - "node_modules/npm/node_modules/npm-bundled": { - "version": "4.0.0", -@@ -25744,7 +26267,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-4.0.0.tgz", -+ "integrity": "sha512-IxaQZDMsqfQ2Lz37VvyyEtKLe8FsRZuysmedy/N06TU1RyVppYKXrO4xIhR0F+7ubIBox6Q7nir6fQI3ej39iA==" - }, - "node_modules/npm/node_modules/npm-install-checks": { - "version": "7.1.2", -@@ -25756,7 +26281,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-7.1.2.tgz", -+ "integrity": "sha512-z9HJBCYw9Zr8BqXcllKIs5nI+QggAImbBdHphOzVYrz2CB4iQ6FzWyKmlqDZua+51nAu7FcemlbTc9VgQN5XDQ==" - }, - "node_modules/npm/node_modules/npm-normalize-package-bin": { - "version": "4.0.0", -@@ -25765,7 +26292,9 @@ - "license": "ISC", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-4.0.0.tgz", -+ "integrity": "sha512-TZKxPvItzai9kN9H/TkmCtx/ZN/hvr3vUycjlfmH0ootY9yFBzNOpiXAdIn1Iteqsvk4lQn6B5PTrt+n6h8k/w==" - }, - "node_modules/npm/node_modules/npm-package-arg": { - "version": "12.0.2", -@@ -25780,7 +26309,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-12.0.2.tgz", -+ "integrity": "sha512-f1NpFjNI9O4VbKMOlA5QoBq/vSQPORHcTZ2feJpFkTHJ9eQkdlmZEKSjcAhxTGInC7RlEyScT9ui67NaOsjFWA==" - }, - "node_modules/npm/node_modules/npm-packlist": { - "version": "9.0.0", -@@ -25792,7 +26323,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-9.0.0.tgz", -+ "integrity": "sha512-8qSayfmHJQTx3nJWYbbUmflpyarbLMBc6LCAjYsiGtXxDB68HaZpb8re6zeaLGxZzDuMdhsg70jryJe+RrItVQ==" - }, - "node_modules/npm/node_modules/npm-pick-manifest": { - "version": "10.0.0", -@@ -25807,7 +26340,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-10.0.0.tgz", -+ "integrity": "sha512-r4fFa4FqYY8xaM7fHecQ9Z2nE9hgNfJR+EmoKv0+chvzWkBcORX3r0FpTByP+CbOVJDladMXnPQGVN8PBLGuTQ==" - }, - "node_modules/npm/node_modules/npm-profile": { - "version": "11.0.1", -@@ -25820,7 +26355,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/npm-profile/-/npm-profile-11.0.1.tgz", -+ "integrity": "sha512-HP5Cw9WHwFS9vb4fxVlkNAQBUhVL5BmW6rAR+/JWkpwqcFJid7TihKUdYDWqHl0NDfLd0mpucheGySqo8ysyfw==" - }, - "node_modules/npm/node_modules/npm-registry-fetch": { - "version": "18.0.2", -@@ -25839,7 +26376,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-18.0.2.tgz", -+ "integrity": "sha512-LeVMZBBVy+oQb5R6FDV9OlJCcWDU+al10oKpe+nsvcHnG24Z3uM3SvJYKfGJlfGjVU8v9liejCrUR/M5HO5NEQ==" - }, - "node_modules/npm/node_modules/npm-user-validate": { - "version": "3.0.0", -@@ -25848,7 +26387,9 @@ - "license": "BSD-2-Clause", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-3.0.0.tgz", -+ "integrity": "sha512-9xi0RdSmJ4mPYTC393VJPz1Sp8LyCx9cUnm/L9Qcb3cFO8gjT4mN20P9FAsea8qDHdQ7LtcN8VLh2UT47SdKCw==" - }, - "node_modules/npm/node_modules/p-map": { - "version": "7.0.4", -@@ -25860,13 +26401,17 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.4.tgz", -+ "integrity": "sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ==" - }, - "node_modules/npm/node_modules/package-json-from-dist": { - "version": "1.0.1", - "dev": true, - "inBundle": true, -- "license": "BlueOak-1.0.0" -+ "license": "BlueOak-1.0.0", -+ "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", -+ "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==" - }, - "node_modules/npm/node_modules/pacote": { - "version": "19.0.2", -@@ -25897,7 +26442,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/pacote/-/pacote-19.0.2.tgz", -+ "integrity": "sha512-iNInrWMS+PzYbaef5EW/mU8OiCPxGuTmYn6ht5ImeXd5TZIVY4+dDmIrbpB6v0MKG/KIMMvj2UD7eKU9GbTGHA==" - }, - "node_modules/npm/node_modules/parse-conflict-json": { - "version": "4.0.0", -@@ -25911,7 +26458,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/parse-conflict-json/-/parse-conflict-json-4.0.0.tgz", -+ "integrity": "sha512-37CN2VtcuvKgHUs8+0b1uJeEsbGn61GRHz469C94P5xiOoqpDYJYwjg4RY9Vmz39WyZAVkR5++nbJwLMIgOCnQ==" - }, - "node_modules/npm/node_modules/path-key": { - "version": "3.1.1", -@@ -25920,7 +26469,9 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", -+ "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" - }, - "node_modules/npm/node_modules/path-scurry": { - "version": "1.11.1", -@@ -25936,7 +26487,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", -+ "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==" - }, - "node_modules/npm/node_modules/picomatch": { - "version": "4.0.3", -@@ -25948,7 +26501,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", -+ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==" - }, - "node_modules/npm/node_modules/postcss-selector-parser": { - "version": "7.1.1", -@@ -25961,7 +26516,9 @@ - }, - "engines": { - "node": ">=4" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.1.tgz", -+ "integrity": "sha512-orRsuYpJVw8LdAwqqLykBj9ecS5/cRHlI5+nvTo8LcCKmzDmqVORXtOIYEEQuL9D4BxtA1lm5isAqzQZCoQ6Eg==" - }, - "node_modules/npm/node_modules/proc-log": { - "version": "5.0.0", -@@ -25970,7 +26527,9 @@ - "license": "ISC", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-5.0.0.tgz", -+ "integrity": "sha512-Azwzvl90HaF0aCz1JrDdXQykFakSSNPaPoiZ9fm5qJIMHioDZEi7OAdRwSm6rSoPtY3Qutnm3L7ogmg3dc+wbQ==" - }, - "node_modules/npm/node_modules/proggy": { - "version": "3.0.0", -@@ -25979,7 +26538,9 @@ - "license": "ISC", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/proggy/-/proggy-3.0.0.tgz", -+ "integrity": "sha512-QE8RApCM3IaRRxVzxrjbgNMpQEX6Wu0p0KBeoSiSEw5/bsGwZHsshF4LCxH2jp/r6BU+bqA3LrMDEYNfJnpD8Q==" - }, - "node_modules/npm/node_modules/promise-all-reject-late": { - "version": "1.0.1", -@@ -25988,7 +26549,9 @@ - "license": "ISC", - "funding": { - "url": "https://github.com/sponsors/isaacs" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/promise-all-reject-late/-/promise-all-reject-late-1.0.1.tgz", -+ "integrity": "sha512-vuf0Lf0lOxyQREH7GDIOUMLS7kz+gs8i6B+Yi8dC68a2sychGrHTJYghMBD6k7eUcH0H5P73EckCA48xijWqXw==" - }, - "node_modules/npm/node_modules/promise-call-limit": { - "version": "3.0.2", -@@ -25997,7 +26560,9 @@ - "license": "ISC", - "funding": { - "url": "https://github.com/sponsors/isaacs" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/promise-call-limit/-/promise-call-limit-3.0.2.tgz", -+ "integrity": "sha512-mRPQO2T1QQVw11E7+UdCJu7S61eJVWknzml9sC1heAdj1jxl0fWMBypIt9ZOcLFf8FkG995ZD7RnVk7HH72fZw==" - }, - "node_modules/npm/node_modules/promise-retry": { - "version": "2.0.1", -@@ -26010,7 +26575,9 @@ - }, - "engines": { - "node": ">=10" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", -+ "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==" - }, - "node_modules/npm/node_modules/promzard": { - "version": "2.0.0", -@@ -26022,7 +26589,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/promzard/-/promzard-2.0.0.tgz", -+ "integrity": "sha512-Ncd0vyS2eXGOjchIRg6PVCYKetJYrW1BSbbIo+bKdig61TB6nH2RQNF2uP+qMpsI73L/jURLWojcw8JNIKZ3gg==" - }, - "node_modules/npm/node_modules/qrcode-terminal": { - "version": "0.12.0", -@@ -26030,7 +26599,9 @@ - "inBundle": true, - "bin": { - "qrcode-terminal": "bin/qrcode-terminal.js" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz", -+ "integrity": "sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ==" - }, - "node_modules/npm/node_modules/read": { - "version": "4.1.0", -@@ -26042,7 +26613,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/read/-/read-4.1.0.tgz", -+ "integrity": "sha512-uRfX6K+f+R8OOrYScaM3ixPY4erg69f8DN6pgTvMcA9iRc8iDhwrA4m3Yu8YYKsXJgVvum+m8PkRboZwwuLzYA==" - }, - "node_modules/npm/node_modules/read-cmd-shim": { - "version": "5.0.0", -@@ -26051,7 +26624,9 @@ - "license": "ISC", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-5.0.0.tgz", -+ "integrity": "sha512-SEbJV7tohp3DAAILbEMPXavBjAnMN0tVnh4+9G8ihV4Pq3HYF9h8QNez9zkJ1ILkv9G2BjdzwctznGZXgu/HGw==" - }, - "node_modules/npm/node_modules/read-package-json-fast": { - "version": "4.0.0", -@@ -26064,7 +26639,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-4.0.0.tgz", -+ "integrity": "sha512-qpt8EwugBWDw2cgE2W+/3oxC+KTez2uSVR8JU9Q36TXPAGCaozfQUs59v4j4GFpWTaw0i6hAZSvOmu1J0uOEUg==" - }, - "node_modules/npm/node_modules/retry": { - "version": "0.12.0", -@@ -26073,14 +26650,18 @@ - "license": "MIT", - "engines": { - "node": ">= 4" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", -+ "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==" - }, - "node_modules/npm/node_modules/safer-buffer": { - "version": "2.1.2", - "dev": true, - "inBundle": true, - "license": "MIT", -- "optional": true -+ "optional": true, -+ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", -+ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" - }, - "node_modules/npm/node_modules/semver": { - "version": "7.7.4", -@@ -26092,7 +26673,9 @@ - }, - "engines": { - "node": ">=10" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz", -+ "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==" - }, - "node_modules/npm/node_modules/shebang-command": { - "version": "2.0.0", -@@ -26104,7 +26687,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", -+ "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==" - }, - "node_modules/npm/node_modules/shebang-regex": { - "version": "3.0.0", -@@ -26113,7 +26698,9 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", -+ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" - }, - "node_modules/npm/node_modules/signal-exit": { - "version": "4.1.0", -@@ -26125,7 +26712,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", -+ "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==" - }, - "node_modules/npm/node_modules/sigstore": { - "version": "3.1.0", -@@ -26142,7 +26731,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-3.1.0.tgz", -+ "integrity": "sha512-ZpzWAFHIFqyFE56dXqgX/DkDRZdz+rRcjoIk/RQU4IX0wiCv1l8S7ZrXDHcCc+uaf+6o7w3h2l3g6GYG5TKN9Q==" - }, - "node_modules/npm/node_modules/smart-buffer": { - "version": "4.2.0", -@@ -26152,7 +26743,9 @@ - "engines": { - "node": ">= 6.0.0", - "npm": ">= 3.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", -+ "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==" - }, - "node_modules/npm/node_modules/socks": { - "version": "2.8.7", -@@ -26166,7 +26759,9 @@ - "engines": { - "node": ">= 10.0.0", - "npm": ">= 3.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz", -+ "integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==" - }, - "node_modules/npm/node_modules/socks-proxy-agent": { - "version": "8.0.5", -@@ -26180,7 +26775,9 @@ - }, - "engines": { - "node": ">= 14" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz", -+ "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==" - }, - "node_modules/npm/node_modules/spdx-correct": { - "version": "3.2.0", -@@ -26190,7 +26787,9 @@ - "dependencies": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", -+ "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==" - }, - "node_modules/npm/node_modules/spdx-correct/node_modules/spdx-expression-parse": { - "version": "3.0.1", -@@ -26200,13 +26799,17 @@ - "dependencies": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", -+ "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==" - }, - "node_modules/npm/node_modules/spdx-exceptions": { - "version": "2.5.0", - "dev": true, - "inBundle": true, -- "license": "CC-BY-3.0" -+ "license": "CC-BY-3.0", -+ "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz", -+ "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==" - }, - "node_modules/npm/node_modules/spdx-expression-parse": { - "version": "4.0.0", -@@ -26216,13 +26819,17 @@ - "dependencies": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-4.0.0.tgz", -+ "integrity": "sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==" - }, - "node_modules/npm/node_modules/spdx-license-ids": { - "version": "3.0.23", - "dev": true, - "inBundle": true, -- "license": "CC0-1.0" -+ "license": "CC0-1.0", -+ "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.23.tgz", -+ "integrity": "sha512-CWLcCCH7VLu13TgOH+r8p1O/Znwhqv/dbb6lqWy67G+pT1kHmeD/+V36AVb/vq8QMIQwVShJ6Ssl5FPh0fuSdw==" - }, - "node_modules/npm/node_modules/ssri": { - "version": "12.0.0", -@@ -26234,7 +26841,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ssri/-/ssri-12.0.0.tgz", -+ "integrity": "sha512-S7iGNosepx9RadX82oimUkvr0Ct7IjJbEbs4mJcTxst8um95J3sDYU1RBEOvdu6oL1Wek2ODI5i4MAw+dZ6cAQ==" - }, - "node_modules/npm/node_modules/string-width": { - "version": "4.2.3", -@@ -26248,7 +26857,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", -+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==" - }, - "node_modules/npm/node_modules/string-width-cjs": { - "name": "string-width", -@@ -26263,7 +26874,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", -+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==" - }, - "node_modules/npm/node_modules/strip-ansi": { - "version": "6.0.1", -@@ -26275,7 +26888,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", -+ "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==" - }, - "node_modules/npm/node_modules/strip-ansi-cjs": { - "name": "strip-ansi", -@@ -26288,7 +26903,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", -+ "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==" - }, - "node_modules/npm/node_modules/supports-color": { - "version": "9.4.0", -@@ -26300,7 +26917,9 @@ - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.4.0.tgz", -+ "integrity": "sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw==" - }, - "node_modules/npm/node_modules/tar": { - "version": "7.5.11", -@@ -26316,19 +26935,25 @@ - }, - "engines": { - "node": ">=18" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.11.tgz", -+ "integrity": "sha512-ChjMH33/KetonMTAtpYdgUFr0tbz69Fp2v7zWxQfYZX4g5ZN2nOBXm1R2xyA+lMIKrLKIoKAwFj93jE/avX9cQ==" - }, - "node_modules/npm/node_modules/text-table": { - "version": "0.2.0", - "dev": true, - "inBundle": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", -+ "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==" - }, - "node_modules/npm/node_modules/tiny-relative-date": { - "version": "1.3.0", - "dev": true, - "inBundle": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz", -+ "integrity": "sha512-MOQHpzllWxDCHHaDno30hhLfbouoYlOI8YlMNtvKe1zXbjEVhbcEovQxvZrPvtiYW630GQDoMMarCnjfyfHA+A==" - }, - "node_modules/npm/node_modules/tinyglobby": { - "version": "0.2.15", -@@ -26344,7 +26969,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/SuperchupuDev" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz", -+ "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==" - }, - "node_modules/npm/node_modules/treeverse": { - "version": "3.0.0", -@@ -26353,7 +26980,9 @@ - "license": "ISC", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/treeverse/-/treeverse-3.0.0.tgz", -+ "integrity": "sha512-gcANaAnd2QDZFmHFEOF4k7uc1J/6a6z3DJMd/QwEyxLoKGiptJRwid582r7QIsFlFMIZ3SnxfS52S4hm2DHkuQ==" - }, - "node_modules/npm/node_modules/tuf-js": { - "version": "3.1.0", -@@ -26367,7 +26996,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-3.1.0.tgz", -+ "integrity": "sha512-3T3T04WzowbwV2FDiGXBbr81t64g1MUGGJRgT4x5o97N+8ArdhVCAF9IxFrxuSJmM3E5Asn7nKHkao0ibcZXAg==" - }, - "node_modules/npm/node_modules/tuf-js/node_modules/@tufjs/models": { - "version": "3.0.1", -@@ -26380,7 +27011,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-3.0.1.tgz", -+ "integrity": "sha512-UUYHISyhCU3ZgN8yaear3cGATHb3SMuKHsQ/nVbHXcmnBf+LzQ/cQfhNG+rfaSHgqGKNEm2cOCLVLELStUQ1JA==" - }, - "node_modules/npm/node_modules/unique-filename": { - "version": "4.0.0", -@@ -26392,7 +27025,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-4.0.0.tgz", -+ "integrity": "sha512-XSnEewXmQ+veP7xX2dS5Q4yZAvO40cBN2MWkJ7D/6sW4Dg6wYBNwM1Vrnz1FhH5AdeLIlUXRI9e28z1YZi71NQ==" - }, - "node_modules/npm/node_modules/unique-slug": { - "version": "5.0.0", -@@ -26404,13 +27039,17 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-5.0.0.tgz", -+ "integrity": "sha512-9OdaqO5kwqR+1kVgHAhsp5vPNU0hnxRa26rBFNfNgM7M6pNtgzeBn3s/xbyCQL3dcjzOatcef6UUHpB/6MaETg==" - }, - "node_modules/npm/node_modules/util-deprecate": { - "version": "1.0.2", - "dev": true, - "inBundle": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", -+ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" - }, - "node_modules/npm/node_modules/validate-npm-package-license": { - "version": "3.0.4", -@@ -26420,7 +27059,9 @@ - "dependencies": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", -+ "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==" - }, - "node_modules/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse": { - "version": "3.0.1", -@@ -26430,7 +27071,9 @@ - "dependencies": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", -+ "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==" - }, - "node_modules/npm/node_modules/validate-npm-package-name": { - "version": "6.0.2", -@@ -26439,13 +27082,17 @@ - "license": "ISC", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-6.0.2.tgz", -+ "integrity": "sha512-IUoow1YUtvoBBC06dXs8bR8B9vuA3aJfmQNKMoaPG/OFsPmoQvw8xh+6Ye25Gx9DQhoEom3Pcu9MKHerm/NpUQ==" - }, - "node_modules/npm/node_modules/walk-up-path": { - "version": "3.0.1", - "dev": true, - "inBundle": true, -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/walk-up-path/-/walk-up-path-3.0.1.tgz", -+ "integrity": "sha512-9YlCL/ynK3CTlrSRrDxZvUauLzAswPCrsaCgilqFevUYpeEW0/3ScEjaa3kbW/T0ghhkEr7mv+fpjqn1Y1YuTA==" - }, - "node_modules/npm/node_modules/which": { - "version": "5.0.0", -@@ -26460,7 +27107,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz", -+ "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==" - }, - "node_modules/npm/node_modules/which/node_modules/isexe": { - "version": "3.1.5", -@@ -26469,7 +27118,9 @@ - "license": "BlueOak-1.0.0", - "engines": { - "node": ">=18" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.5.tgz", -+ "integrity": "sha512-6B3tLtFqtQS4ekarvLVMZ+X+VlvQekbe4taUkf/rhVO3d/h0M2rfARm/pXLcPEsjjMsFgrFgSrhQIxcSVrBz8w==" - }, - "node_modules/npm/node_modules/wrap-ansi": { - "version": "8.1.0", -@@ -26486,7 +27137,9 @@ - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", -+ "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==" - }, - "node_modules/npm/node_modules/wrap-ansi-cjs": { - "name": "wrap-ansi", -@@ -26504,7 +27157,9 @@ - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", -+ "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==" - }, - "node_modules/npm/node_modules/wrap-ansi-cjs/node_modules/ansi-styles": { - "version": "4.3.0", -@@ -26519,7 +27174,9 @@ - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", -+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==" - }, - "node_modules/npm/node_modules/wrap-ansi/node_modules/ansi-regex": { - "version": "6.2.2", -@@ -26531,13 +27188,17 @@ - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", -+ "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==" - }, - "node_modules/npm/node_modules/wrap-ansi/node_modules/emoji-regex": { - "version": "9.2.2", - "dev": true, - "inBundle": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", -+ "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" - }, - "node_modules/npm/node_modules/wrap-ansi/node_modules/string-width": { - "version": "5.1.2", -@@ -26554,7 +27215,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", -+ "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==" - }, - "node_modules/npm/node_modules/wrap-ansi/node_modules/strip-ansi": { - "version": "7.2.0", -@@ -26569,7 +27232,9 @@ - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", -+ "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==" - }, - "node_modules/npm/node_modules/write-file-atomic": { - "version": "6.0.0", -@@ -26582,7 +27247,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-6.0.0.tgz", -+ "integrity": "sha512-GmqrO8WJ1NuzJ2DrziEI2o57jKAVIQNf8a18W3nCYU3H7PNWqCCVTeH6/NQE93CIllIgQS98rrmVkYgTX9fFJQ==" - }, - "node_modules/npm/node_modules/yallist": { - "version": "5.0.0", -@@ -26591,7 +27258,9 @@ - "license": "BlueOak-1.0.0", - "engines": { - "node": ">=18" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", -+ "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==" - }, - "node_modules/nth-check": { - "version": "2.1.1", -@@ -26763,7 +27432,9 @@ - "license": "ISC", - "dependencies": { - "wrappy": "1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", -+ "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==" - }, - "node_modules/onetime": { - "version": "5.1.2", -@@ -26779,6 +27450,19 @@ - "url": "https://github.com/sponsors/sindresorhus" - } - }, -+ "node_modules/only-allow": { -+ "version": "1.2.2", -+ "resolved": "https://registry.npmjs.org/only-allow/-/only-allow-1.2.2.tgz", -+ "integrity": "sha512-uxyNYDsCh5YIJ780G7hC5OHjVUr9reHsbZNMM80L9tZlTpb3hUzb36KXgW4ZUGtJKQnGA3xegmWg1BxhWV0jJA==", -+ "dev": true, -+ "license": "MIT", -+ "dependencies": { -+ "which-pm-runs": "1.1.0" -+ }, -+ "bin": { -+ "only-allow": "bin.js" -+ } -+ }, - "node_modules/open": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/open/-/open-10.2.0.tgz", -@@ -26835,7 +27519,9 @@ - }, - "engines": { - "node": ">= 0.8.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", -+ "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==" - }, - "node_modules/orderedmap": { - "version": "2.1.1", -@@ -26949,7 +27635,9 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-3.0.0.tgz", -+ "integrity": "sha512-Wo8VsW4IRQSKVXsJCn7TomUaVtyfjVDn3nUP7kE967BQk0CwFpdbZs0X0uk5sW9mkBa9eNM7hCMaG93WUAwxYQ==" - }, - "node_modules/p-limit": { - "version": "3.1.0", -@@ -26962,7 +27650,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", -+ "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==" - }, - "node_modules/p-locate": { - "version": "5.0.0", -@@ -26975,7 +27665,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", -+ "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==" - }, - "node_modules/p-map": { - "version": "7.0.3", -@@ -27031,7 +27723,9 @@ - "license": "MIT", - "engines": { - "node": ">=6" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", -+ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" - }, - "node_modules/pac-proxy-agent": { - "version": "7.1.0", -@@ -27439,7 +28133,9 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", -+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" - }, - "node_modules/path-is-absolute": { - "version": "1.0.1", -@@ -27447,7 +28143,9 @@ - "license": "MIT", - "engines": { - "node": ">=0.10.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", -+ "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==" - }, - "node_modules/path-is-inside": { - "version": "1.0.2", -@@ -27461,11 +28159,15 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", -+ "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" - }, - "node_modules/path-parse": { - "version": "1.0.7", -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", -+ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" - }, - "node_modules/path-scurry": { - "version": "1.11.1", -@@ -27498,7 +28200,9 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", -+ "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==" - }, - "node_modules/pathe": { - "version": "2.0.3", -@@ -27582,7 +28286,9 @@ - "license": "MIT", - "engines": { - "node": ">=4" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", -+ "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==" - }, - "node_modules/pikaday": { - "version": "1.8.2", -@@ -27656,7 +28362,9 @@ - "license": "MIT", - "engines": { - "node": ">= 6" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", -+ "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==" - }, - "node_modules/pixelmatch": { - "version": "7.1.0", -@@ -27769,7 +28477,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", -+ "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==" - }, - "node_modules/pkg-dir/node_modules/find-up": { - "version": "4.1.0", -@@ -27781,7 +28491,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", -+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==" - }, - "node_modules/pkg-dir/node_modules/locate-path": { - "version": "5.0.0", -@@ -27792,7 +28504,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", -+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==" - }, - "node_modules/pkg-dir/node_modules/p-limit": { - "version": "2.3.0", -@@ -27806,7 +28520,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", -+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==" - }, - "node_modules/pkg-dir/node_modules/p-locate": { - "version": "4.1.0", -@@ -27817,7 +28533,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", -+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==" - }, - "node_modules/playwright": { - "version": "1.56.1", -@@ -28115,7 +28833,9 @@ - "license": "MIT", - "engines": { - "node": ">= 0.8.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", -+ "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==" - }, - "node_modules/prepend-http": { - "version": "1.0.4", -@@ -28193,7 +28913,9 @@ - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", -+ "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==" - }, - "node_modules/pretty-ms": { - "version": "9.0.0", -@@ -28213,7 +28935,9 @@ - "node_modules/process-nextick-args": { - "version": "2.0.1", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", -+ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" - }, - "node_modules/process-warning": { - "version": "5.0.0", -@@ -28481,7 +29205,9 @@ - }, - "node_modules/proto-list": { - "version": "1.2.4", -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", -+ "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==" - }, - "node_modules/protobufjs": { - "version": "7.5.0", -@@ -28581,7 +29307,9 @@ - }, - "node_modules/proxy-from-env": { - "version": "1.1.0", -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", -+ "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" - }, - "node_modules/pseudomap": { - "version": "1.0.2", -@@ -28750,7 +29478,9 @@ - "license": "MIT", - "engines": { - "node": ">=6" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", -+ "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==" - }, - "node_modules/punycode.js": { - "version": "2.3.1", -@@ -28881,7 +29611,9 @@ - "url": "https://feross.org/support" - } - ], -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", -+ "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==" - }, - "node_modules/quick-format-unescaped": { - "version": "4.0.4", -@@ -28962,7 +29694,9 @@ - }, - "bin": { - "rc": "cli.js" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", -+ "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==" - }, - "node_modules/rc/node_modules/ini": { - "version": "1.3.8", -@@ -28976,7 +29710,9 @@ - "license": "MIT", - "engines": { - "node": ">=0.10.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", -+ "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==" - }, - "node_modules/react": { - "version": "19.2.0", -@@ -29100,7 +29836,9 @@ - "node_modules/react-is": { - "version": "18.2.0", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", -+ "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==" - }, - "node_modules/react-reconciler": { - "version": "0.33.0", -@@ -29327,12 +30065,16 @@ - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", -+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==" - }, - "node_modules/readable-stream/node_modules/safe-buffer": { - "version": "5.1.2", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", -+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - }, - "node_modules/readdirp": { - "version": "3.6.0", -@@ -29606,14 +30348,18 @@ - "license": "MIT", - "engines": { - "node": ">=0.10.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", -+ "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==" - }, - "node_modules/require-from-string": { - "version": "2.0.2", - "license": "MIT", - "engines": { - "node": ">=0.10.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", -+ "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==" - }, - "node_modules/require-in-the-middle": { - "version": "7.5.1", -@@ -29666,7 +30412,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", -+ "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==" - }, - "node_modules/resolve-cwd/node_modules/resolve-from": { - "version": "5.0.0", -@@ -29674,7 +30422,9 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", -+ "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==" - }, - "node_modules/resolve-from": { - "version": "4.0.0", -@@ -29691,7 +30441,9 @@ - "license": "MIT", - "funding": { - "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", -+ "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==" - }, - "node_modules/resolve-url": { - "version": "0.2.1", -@@ -29771,7 +30523,9 @@ - "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", -+ "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==" - }, - "node_modules/rfdc": { - "version": "1.4.1", -@@ -30030,7 +30784,9 @@ - "license": "MIT", - "dependencies": { - "queue-microtask": "^1.2.2" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", -+ "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==" - }, - "node_modules/rxjs": { - "version": "7.8.1", -@@ -30084,7 +30840,9 @@ - "url": "https://feross.org/support" - } - ], -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", -+ "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" - }, - "node_modules/safe-push-apply": { - "version": "1.0.0", -@@ -30687,14 +31445,18 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", -+ "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==" - }, - "node_modules/shebang-regex": { - "version": "3.0.0", - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", -+ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" - }, - "node_modules/shell-quote": { - "version": "1.8.3", -@@ -30794,7 +31556,9 @@ - }, - "node_modules/signal-exit": { - "version": "3.0.7", -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", -+ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" - }, - "node_modules/signale": { - "version": "1.4.0", -@@ -30909,7 +31673,9 @@ - "url": "https://feross.org/support" - } - ], -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz", -+ "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==" - }, - "node_modules/simple-get": { - "version": "4.0.1", -@@ -30932,7 +31698,9 @@ - "decompress-response": "^6.0.0", - "once": "^1.3.1", - "simple-concat": "^1.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz", -+ "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==" - }, - "node_modules/simple-git": { - "version": "3.36.0", -@@ -31028,7 +31796,9 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", -+ "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==" - }, - "node_modules/slice-ansi": { - "version": "7.1.0", -@@ -31260,7 +32030,9 @@ - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", -+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - }, - "node_modules/source-map-js": { - "version": "1.2.1", -@@ -31359,12 +32131,16 @@ - "license": "ISC", - "engines": { - "node": ">= 10.x" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz", -+ "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==" - }, - "node_modules/sprintf-js": { - "version": "1.0.3", - "dev": true, -- "license": "BSD-3-Clause" -+ "license": "BSD-3-Clause", -+ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", -+ "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==" - }, - "node_modules/ssh-config": { - "version": "5.0.4", -@@ -31390,14 +32166,18 @@ - }, - "engines": { - "node": ">=10" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", -+ "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==" - }, - "node_modules/stack-utils/node_modules/escape-string-regexp": { - "version": "2.0.0", - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", -+ "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==" - }, - "node_modules/stackback": { - "version": "0.0.2", -@@ -31604,11 +32384,15 @@ - "license": "MIT", - "dependencies": { - "safe-buffer": "~5.1.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", -+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==" - }, - "node_modules/string_decoder/node_modules/safe-buffer": { - "version": "5.1.2", -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", -+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - }, - "node_modules/string-argv": { - "version": "0.3.2", -@@ -31643,7 +32427,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", -+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==" - }, - "node_modules/string-width-cjs": { - "name": "string-width", -@@ -31726,7 +32512,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", -+ "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==" - }, - "node_modules/strip-ansi-cjs": { - "name": "strip-ansi", -@@ -31792,7 +32580,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", -+ "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==" - }, - "node_modules/strip-literal": { - "version": "3.1.0", -@@ -31944,7 +32734,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", -+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==" - }, - "node_modules/supports-hyperlinks": { - "version": "3.1.0", -@@ -31969,7 +32761,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", -+ "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==" - }, - "node_modules/symbol-tree": { - "version": "3.2.4", -@@ -32111,7 +32905,9 @@ - "dependencies": { - "debug": "4.3.1", - "is2": "^2.0.6" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/tcp-port-used/-/tcp-port-used-1.0.2.tgz", -+ "integrity": "sha512-l7ar8lLUD3XS1V2lfoJlCBaeoaWo/2xfYt81hM7VlvR4RrMVFqfmzfhLVk40hAb368uitje5gPtBRL1m/DGvLA==" - }, - "node_modules/tcp-port-used/node_modules/debug": { - "version": "4.3.1", -@@ -32127,7 +32923,9 @@ - "supports-color": { - "optional": true - } -- } -+ }, -+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", -+ "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==" - }, - "node_modules/temp-dir": { - "version": "3.0.0", -@@ -32135,7 +32933,9 @@ - "license": "MIT", - "engines": { - "node": ">=14.16" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-3.0.0.tgz", -+ "integrity": "sha512-nHc6S/bwIilKHNRgK/3jlhDoIHcp45YgyiwcAk46Tr0LfEqGBVpmiAyuiuxeVE44m3mXnEeVhaipLOEWmH+Njw==" - }, - "node_modules/tempfile": { - "version": "5.0.0", -@@ -32149,7 +32949,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/tempfile/-/tempfile-5.0.0.tgz", -+ "integrity": "sha512-bX655WZI/F7EoTDw9JvQURqAXiPHi8o8+yFxPF2lWYyz1aHnmMRuXWqL6YB6GmeO0o4DIYWHLgGNi/X64T+X4Q==" - }, - "node_modules/tempy": { - "version": "3.1.0", -@@ -32338,7 +33140,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", -+ "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==" - }, - "node_modules/test-exclude/node_modules/brace-expansion": { - "version": "1.1.14", -@@ -32650,7 +33454,9 @@ - }, - "node_modules/tr46": { - "version": "0.0.3", -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", -+ "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" - }, - "node_modules/traverse": { - "version": "0.6.8", -@@ -33016,7 +33822,9 @@ - }, - "engines": { - "node": ">= 0.8.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", -+ "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==" - }, - "node_modules/type-detect": { - "version": "4.0.8", -@@ -33474,7 +34282,9 @@ - "license": "MIT", - "engines": { - "node": ">= 10.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", -+ "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==" - }, - "node_modules/unpipe": { - "version": "1.0.0", -@@ -33728,7 +34538,9 @@ - "license": "BSD-2-Clause", - "dependencies": { - "punycode": "^2.1.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", -+ "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==" - }, - "node_modules/urix": { - "version": "0.1.0", -@@ -33779,7 +34591,9 @@ - }, - "node_modules/util-deprecate": { - "version": "1.0.2", -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", -+ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" - }, - "node_modules/uuid": { - "version": "10.0.0", -@@ -34490,7 +35304,9 @@ - }, - "bin": { - "installServerIntoExtension": "bin/installServerIntoExtension" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-9.0.1.tgz", -+ "integrity": "sha512-woByF3PDpkHFUreUa7Hos7+pUWdeWMXRd26+ZX2A8cFx6v/JPTtd4/uN0/jB6XQHYaOlHbio03NTHCqrgG5n7g==" - }, - "node_modules/vscode-languageserver-protocol": { - "version": "3.17.5", -@@ -34498,7 +35314,9 @@ - "dependencies": { - "vscode-jsonrpc": "8.2.0", - "vscode-languageserver-types": "3.17.5" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz", -+ "integrity": "sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==" - }, - "node_modules/vscode-languageserver-protocol/node_modules/vscode-jsonrpc": { - "version": "8.2.0", -@@ -34516,7 +35334,9 @@ - }, - "node_modules/vscode-languageserver-types": { - "version": "3.17.5", -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz", -+ "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==" - }, - "node_modules/vscode-uri": { - "version": "3.1.0", -@@ -35035,7 +35855,9 @@ - }, - "node_modules/webidl-conversions": { - "version": "3.0.1", -- "license": "BSD-2-Clause" -+ "license": "BSD-2-Clause", -+ "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", -+ "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" - }, - "node_modules/webpack-sources": { - "version": "3.3.3", -@@ -35081,7 +35903,9 @@ - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", -+ "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==" - }, - "node_modules/which": { - "version": "2.0.2", -@@ -35094,7 +35918,9 @@ - }, - "engines": { - "node": ">= 8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", -+ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==" - }, - "node_modules/which-boxed-primitive": { - "version": "1.1.1", -@@ -35170,6 +35996,16 @@ - "url": "https://github.com/sponsors/ljharb" - } - }, -+ "node_modules/which-pm-runs": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.1.0.tgz", -+ "integrity": "sha512-n1brCuqClxfFfq/Rb0ICg9giSZqCS+pLtccdag6C2HyufBrh3fBOiy9nb6ggRMvWOVH5GrdJskj5iGTZNxd7SA==", -+ "dev": true, -+ "license": "MIT", -+ "engines": { -+ "node": ">=4" -+ } -+ }, - "node_modules/which-typed-array": { - "version": "1.1.19", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz", -@@ -35315,7 +36151,9 @@ - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", -+ "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==" - }, - "node_modules/wrap-ansi-cjs": { - "name": "wrap-ansi", -@@ -35336,7 +36174,9 @@ - }, - "node_modules/wrappy": { - "version": "1.0.2", -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", -+ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" - }, - "node_modules/write-file-atomic": { - "version": "4.0.2", -@@ -35348,7 +36188,9 @@ - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", -+ "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==" - }, - "node_modules/ws": { - "version": "8.18.3", -@@ -35400,7 +36242,9 @@ - "node_modules/xml": { - "version": "1.0.1", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz", -+ "integrity": "sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw==" - }, - "node_modules/xml-name-validator": { - "version": "4.0.0", -@@ -35440,7 +36284,9 @@ - "license": "ISC", - "engines": { - "node": ">=10" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", -+ "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==" - }, - "node_modules/yallist": { - "version": "2.1.2", -@@ -35478,14 +36324,18 @@ - }, - "engines": { - "node": ">=12" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", -+ "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==" - }, - "node_modules/yargs-parser": { - "version": "20.2.9", - "license": "ISC", - "engines": { - "node": ">=10" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", -+ "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==" - }, - "node_modules/yargs-unparser": { - "version": "2.0.0", -@@ -35518,7 +36368,9 @@ - "license": "ISC", - "engines": { - "node": ">=12" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", -+ "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==" - }, - "node_modules/yauzl": { - "version": "2.10.0", -@@ -35547,7 +36399,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", -+ "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==" - }, - "node_modules/yoctocolors": { - "version": "2.0.0", -@@ -35809,6 +36663,84 @@ - "version": "0.0.0", - "devDependencies": {} - }, -+ "packages/extra-deps": { -+ "devDependencies": { -+ "only-allow": "*" -+ }, -+ "optionalDependencies": { -+ "esbuild": "0.15.18" -+ } -+ }, -+ "packages/extra-deps/node_modules/@esbuild/android-arm": { -+ "version": "0.15.18", -+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.18.tgz", -+ "integrity": "sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==", -+ "cpu": [ -+ "arm" -+ ], -+ "license": "MIT", -+ "optional": true, -+ "os": [ -+ "android" -+ ], -+ "engines": { -+ "node": ">=12" -+ } -+ }, -+ "packages/extra-deps/node_modules/@esbuild/linux-loong64": { -+ "version": "0.15.18", -+ "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.18.tgz", -+ "integrity": "sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==", -+ "cpu": [ -+ "loong64" -+ ], -+ "license": "MIT", -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "node": ">=12" -+ } -+ }, -+ "packages/extra-deps/node_modules/esbuild": { -+ "version": "0.15.18", -+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.18.tgz", -+ "integrity": "sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==", -+ "hasInstallScript": true, -+ "license": "MIT", -+ "optional": true, -+ "bin": { -+ "esbuild": "bin/esbuild" -+ }, -+ "engines": { -+ "node": ">=12" -+ }, -+ "optionalDependencies": { -+ "@esbuild/android-arm": "0.15.18", -+ "@esbuild/linux-loong64": "0.15.18", -+ "esbuild-android-64": "0.15.18", -+ "esbuild-android-arm64": "0.15.18", -+ "esbuild-darwin-64": "0.15.18", -+ "esbuild-darwin-arm64": "0.15.18", -+ "esbuild-freebsd-64": "0.15.18", -+ "esbuild-freebsd-arm64": "0.15.18", -+ "esbuild-linux-32": "0.15.18", -+ "esbuild-linux-64": "0.15.18", -+ "esbuild-linux-arm": "0.15.18", -+ "esbuild-linux-arm64": "0.15.18", -+ "esbuild-linux-mips64le": "0.15.18", -+ "esbuild-linux-ppc64le": "0.15.18", -+ "esbuild-linux-riscv64": "0.15.18", -+ "esbuild-linux-s390x": "0.15.18", -+ "esbuild-netbsd-64": "0.15.18", -+ "esbuild-openbsd-64": "0.15.18", -+ "esbuild-sunos-64": "0.15.18", -+ "esbuild-windows-32": "0.15.18", -+ "esbuild-windows-64": "0.15.18", -+ "esbuild-windows-arm64": "0.15.18" -+ } -+ }, - "packages/lib_ai_configuration": { - "name": "@gitlab-org/ai-configuration", - "version": "0.0.0", -@@ -41495,4 +42427,4 @@ - } - } - } --} -+} -\ No newline at end of file -diff --git c/package.json i/package.json -index a5f3bd6..0aa8b3e 100644 ---- c/package.json -+++ i/package.json -@@ -184,7 +184,8 @@ - "ts-node": "^10.9.2", - "tsx": "^4.20.4", - "type-fest": "^4.41.0", -- "ws": "^8.18.1" -+ "ws": "^8.18.1", -+ "extra-deps": "workspace:*" - }, - "scripts": { - "prepare": "node scripts/git_blame_ignore.mjs && lefthook install", -diff --git c/packages/extra-deps/package.json i/packages/extra-deps/package.json -new file mode 100644 -index 0000000..6099867 ---- /dev/null -+++ i/packages/extra-deps/package.json -@@ -0,0 +1,8 @@ -+{ -+ "devDependencies": { -+ "only-allow": "*" -+ }, -+ "optionalDependencies": { -+ "esbuild": "0.15.18" -+ } -+} diff --git a/pkgs/by-name/gi/gitlab-duo/package.nix b/pkgs/by-name/gi/gitlab-duo/package.nix index 3aadd7bfbbc3..72498b1fd603 100644 --- a/pkgs/by-name/gi/gitlab-duo/package.nix +++ b/pkgs/by-name/gi/gitlab-duo/package.nix @@ -1,65 +1,136 @@ { - buildNpmPackage, - bun, - concurrently, - fetchFromGitLab, lib, + stdenvNoCC, + bun, + fetchFromGitLab, + makeBinaryWrapper, + nix-update-script, nodejs_22, - patch-package, - stdenv, - versionCheckHook, ripgrep, + versionCheckHook, + writableTmpDirAsHomeHook, }: -buildNpmPackage (finalAttrs: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "gitlab-duo"; - version = "8.89.0"; + version = "9.3.0"; - # DOCS https://gitlab.com/gitlab-org/editor-extensions/gitlab-lsp#node-version - nodejs = nodejs_22; + __structuredAttrs = true; + strictDeps = true; src = fetchFromGitLab { group = "gitlab-org"; owner = "editor-extensions"; repo = "gitlab-lsp"; tag = "v${finalAttrs.version}"; - hash = "sha256-AiC0xxk8d/2rvRGm31vWqRuJ7nzMrITTGabv7v1LpOA="; + hash = "sha256-D4WNlmZeMG47Y6AHcwk38PFrO0NMX9mxM781Jy7YDFM="; }; - patches = [ - # HACK https://github.com/NixOS/nixpkgs/issues/408720 - # Fix packages locked but without hash, or even missing - ./missing-hashes.patch - ]; + # Upstream migrated from npm to bun (bun.lock) in v8.90.0. Vendor the fully + # resolved node_modules via a fixed-output derivation running `bun install`. + node_modules = stdenvNoCC.mkDerivation { + pname = "${finalAttrs.pname}-node_modules"; + inherit (finalAttrs) version src; + + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ + "GIT_PROXY_COMMAND" + "SOCKS_SERVER" + ]; + + nativeBuildInputs = [ + bun + writableTmpDirAsHomeHook + ]; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + + export BUN_INSTALL_CACHE_DIR=$(mktemp -d) + bun install \ + --cpu="*" \ + --os="*" \ + --frozen-lockfile \ + --ignore-scripts \ + --no-progress + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + find . -type d -name node_modules -exec cp -R --parents {} $out \; + + runHook postInstall + ''; + + # Required: keeping store paths out of the FOD output keeps the hash stable. + dontFixup = true; + + outputHash = "sha256-SgLb1b43FJ8EYdRrdkpgA6MgYcAZD56e2u+4y3mKbpI="; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + }; - npmFlags = [ "--install-links" ]; - npmDepsHash = "sha256-U/dwfYZqy/1CM+Emz1w44mAzY24Z8vKWBXSzSqeVmnY="; - npmRebuildFlags = [ "--ignore-scripts" ]; - npmBuildScript = "build:binary"; - npmWorkspace = "@gitlab/duo-cli"; nativeBuildInputs = [ bun - concurrently - patch-package + nodejs_22 + makeBinaryWrapper + writableTmpDirAsHomeHook ]; - env.ELECTRON_SKIP_BINARY_DOWNLOAD = "true"; - env.PUPPETEER_SKIP_DOWNLOAD = "true"; - env.TARGET = "${stdenv.targetPlatform.node.platform}-${stdenv.targetPlatform.node.arch}"; - env.SUPPORTED_TARGETS = "bun-${stdenv.targetPlatform.node.platform}-${stdenv.targetPlatform.node.arch}"; - env.SKIP_RIPGREP_BUNDLE = 1; + # Workspace packages export built `dist/` under the default condition and their + # TypeScript sources under `_ts-source`. Upstream's release build relies on a + # turbo remote cache to supply every dependency's `dist/`; offline we instead + # bundle straight from source by resolving the `_ts-source` condition. + configurePhase = '' + runHook preConfigure - postConfigure = '' - patchShebangs --build ./packages/cli/scripts - npmBuildScript=build:bundle runHook npmBuildHook + cp -R ${finalAttrs.node_modules}/. . + patchShebangs node_modules + patchShebangs packages/*/node_modules + + runHook postConfigure ''; + buildPhase = '' + runHook preBuild + + # Use --target=bun instead of a platform-specific target (e.g. + # bun-linux-x64-baseline) to avoid bun downloading that platform's runtime + # from npm, which is blocked by the Nix sandbox. --target=bun uses the + # running bun binary itself as the standalone-executable template, which is + # already patchelfd for NixOS. + bun build packages/cli/src/index.tsx \ + --compile \ + --target=bun \ + --minify \ + --conditions _ts-source \ + --define 'BUNDLER_INJECTED_GITLAB_LANGUAGE_SERVER_VERSION="${finalAttrs.version}"' \ + --define 'BUNDLER_INJECTED_ENVIRONMENT="production"' \ + --define 'BUNDLER_INJECTED_DISTRIBUTION="binary"' \ + --no-compile-autoload-dotenv \ + --no-compile-autoload-bunfig \ + --compile-exec-argv=--use-system-ca \ + --sourcemap=inline \ + --outfile packages/cli/bin/duo + + runHook postBuild + ''; + + # bun build --compile appends the JS bundle to the bun binary; strip would + # discard it and break the resulting executable. + dontStrip = true; + installPhase = '' runHook preInstall - install -Dm755 packages/cli/bin/duo-$TARGET $out/bin/duo + install -Dm755 packages/cli/bin/duo $out/bin/duo wrapProgram $out/bin/duo \ - --prefix PATH : ${lib.getExe ripgrep} + --prefix PATH : ${lib.makeBinPath [ ripgrep ]} runHook postInstall ''; @@ -68,7 +139,12 @@ buildNpmPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; - passthru.updateScript = ./update.sh; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--subpackage" + "node_modules" + ]; + }; meta = { changelog = "https://gitlab.com/gitlab-org/editor-extensions/gitlab-lsp/-/blob/main/CHANGELOG.md"; @@ -78,5 +154,12 @@ buildNpmPackage (finalAttrs: { license = lib.licenses.mit; mainProgram = "duo"; maintainers = with lib.maintainers; [ afontaine ]; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; + platforms = [ + "aarch64-linux" + "x86_64-linux" + "aarch64-darwin" + "x86_64-darwin" + ]; }; }) diff --git a/pkgs/by-name/gi/gitlab-duo/update.sh b/pkgs/by-name/gi/gitlab-duo/update.sh deleted file mode 100755 index 784b159efc01..000000000000 --- a/pkgs/by-name/gi/gitlab-duo/update.sh +++ /dev/null @@ -1,55 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -I nixpkgs=./. -i bash -p git jaq prefetch-npm-deps nix-update npm-lockfile-fix nodejs_22 -set -euo pipefail - -# Get new Gitlab Duo release -nix-update --src-only "$UPDATE_NIX_ATTR_PATH" - -# Clone new sources -dir="$(mktemp -d --suffix="$UPDATE_NIX_PNAME")" -git clone --depth 1 \ - --branch "$(nix-instantiate --eval --raw -E "with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.tag")" \ - "$(nix-instantiate --eval --raw -E "with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.gitRepoUrl")" \ - "$dir" -pushd "$dir" - -# HACK https://github.com/npm/cli/issues/4460 -# Different dependencies require different versions of esbuild. Vite's lacks -# some integrity hashes. We add a dummy "extra-deps" package to the workspace -# to force recording those hashes. -esbuild_version=$(jaq -r '.packages["node_modules/vite/node_modules/esbuild"].version' ./package-lock.json) -mkdir packages/extra-deps -cat > packages/extra-deps/package.json < missing-hashes.patch -sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'"$npmDepsHash"'"#' -i package.nix -popd diff --git a/pkgs/by-name/go/gokapi/package.nix b/pkgs/by-name/go/gokapi/package.nix index d70c6a626bab..689de8190e4c 100644 --- a/pkgs/by-name/go/gokapi/package.nix +++ b/pkgs/by-name/go/gokapi/package.nix @@ -42,6 +42,7 @@ buildGoModule (finalAttrs: { ''; subPackages = [ + "cmd/cli-uploader" "cmd/gokapi" ]; @@ -50,6 +51,10 @@ buildGoModule (finalAttrs: { "-w" ]; + postInstall = '' + mv $out/bin/cli-uploader $out/bin/gokapi-cli + ''; + nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/gs/gssproxy/package.nix b/pkgs/by-name/gs/gssproxy/package.nix new file mode 100644 index 000000000000..cb8cc73ab931 --- /dev/null +++ b/pkgs/by-name/gs/gssproxy/package.nix @@ -0,0 +1,84 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + nix-update-script, + pkg-config, + ding-libs, + krb5, + libverto, + popt, + libxml2, + libxslt, + docbook-xsl-nons, + docbook_xml_dtd_44, + versionCheckHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gssproxy"; + version = "0.9.2"; + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "gssapi"; + repo = "gssproxy"; + tag = "v${finalAttrs.version}"; + hash = "sha256-RcT1ge/XxhTaT9hrvcHElAEAbvOtjqep3kdEw5e7WZY="; + }; + + nativeBuildInputs = [ + autoreconfHook + docbook-xsl-nons + docbook_xml_dtd_44 + libxml2 + libxslt + pkg-config + ]; + + doInstallCheck = true; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + makeFlags = [ + "SGML_CATALOG_FILES=${docbook-xsl-nons}/xml/xsl/docbook/catalog.xml ${docbook_xml_dtd_44}/xml/dtd/docbook/catalog.xml" + "VERTO_CFLAGS=${libverto}/include" + "VERTO_LIBS=${libverto}/lib/libverto.so" + ]; + + postInstall = '' + find $out -type d -empty -delete + ''; + + buildInputs = [ + ding-libs + krb5 + libverto + popt + ]; + + configureFlags = [ + "--with-pubconf-path=${placeholder "out"}/etc/gssproxy" + "--with-initscript=none" + "--without-selinux" + # Use REMOTE_FIRST behavior: try gssproxy daemon first, fall back to local credentials + "--with-gpp-default-behavior=REMOTE_FIRST" + "--with-xml-catalog-path=${docbook-xsl-nons}/xml/xsl/docbook/catalog.xml" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "GSS-API proxy client library for credential isolation"; + homepage = "https://github.com/gssapi/gssproxy"; + changelog = "https://github.com/gssapi/gssproxy/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jlesquembre ]; + mainProgram = "gssproxy"; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/ho/homerow/package.nix b/pkgs/by-name/ho/homerow/package.nix new file mode 100644 index 000000000000..920f9afb5066 --- /dev/null +++ b/pkgs/by-name/ho/homerow/package.nix @@ -0,0 +1,37 @@ +{ + lib, + fetchzip, + stdenvNoCC, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "homerow"; + version = "1.5.3"; + + strictDeps = true; + __structuredAttrs = true; + + src = fetchzip { + url = "https://builds.homerow.app/v${finalAttrs.version}/Homerow.zip"; + hash = "sha256-zqa1QYq7UF80z0cvMZJMgTQFo3vqGdwzuLVMwgyuMME="; + stripRoot = false; + }; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/Applications" + cp -R *.app "$out/Applications" + + runHook postInstall + ''; + + meta = { + description = "Keyboard shortcuts for every button in macOS"; + homepage = "https://www.homerow.app/"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ shunueda ]; + platforms = lib.platforms.darwin; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/in/incus-ui-canonical/package.nix b/pkgs/by-name/in/incus-ui-canonical/package.nix index 98e384369006..bf67d6bd68d0 100644 --- a/pkgs/by-name/in/incus-ui-canonical/package.nix +++ b/pkgs/by-name/in/incus-ui-canonical/package.nix @@ -20,14 +20,14 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "incus-ui-canonical"; - version = "0.21.4"; + version = "0.21.5"; src = fetchFromGitHub { owner = "zabbly"; repo = "incus-ui-canonical"; # only use tags prefixed by incus- they are the tested fork versions tag = "incus-${finalAttrs.version}"; - hash = "sha256-EMf723WZKyVYDpvdmzjdp61rIZVsoj6gRMiMF323K/A="; + hash = "sha256-HUx5QAXFtW+l3LYNWgiGWyOQzbHRbFQ1OpI0cSVLkd8="; }; offlineCache = fetchYarnDeps { diff --git a/pkgs/by-name/ki/kind/package.nix b/pkgs/by-name/ki/kind/package.nix index 5a5d0303a46e..ee1ea69f2044 100644 --- a/pkgs/by-name/ki/kind/package.nix +++ b/pkgs/by-name/ki/kind/package.nix @@ -3,6 +3,7 @@ stdenv, buildGoModule, fetchFromGitHub, + fetchpatch, installShellFiles, testers, nix-update-script, @@ -11,18 +12,24 @@ buildGoModule (finalAttrs: { pname = "kind"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { rev = "v${finalAttrs.version}"; owner = "kubernetes-sigs"; repo = "kind"; - hash = "sha256-3icwtfwlSkYOEw9bzEhKJC7OtE1lnBjZSYp+cC/2XNc="; + hash = "sha256-ii0VhS1Nib+r2ZFIIkRvkcGY1fLxev6WnhbqvaZW7j8="; }; patches = [ # fix kernel module path used by kind ./kernel-module-path.patch + + # fix apiserver connection loss after envoy lb container restart + (fetchpatch { + url = "https://github.com/kubernetes-sigs/kind/commit/9a24e6c1ae3d59f8de052ee5c3842820450a369a.patch"; + hash = "sha256-BP2Ub8b1GA7V0CGvhcoGuHRm7u+IMRTmN3mDc2rePnY="; + }) ]; vendorHash = "sha256-tRpylYpEGF6XqtBl7ESYlXKEEAt+Jws4x4VlUVW8SNI="; diff --git a/pkgs/by-name/la/lammps-mpi/package.nix b/pkgs/by-name/la/lammps-mpi/package.nix index 79c0ebddfd0f..04ad2decc7a3 100644 --- a/pkgs/by-name/la/lammps-mpi/package.nix +++ b/pkgs/by-name/la/lammps-mpi/package.nix @@ -6,8 +6,11 @@ lib.lowPrio ( lammps.override { - extraBuildInputs = [ + extraNativeBuildInputs = [ mpi ]; + extraCmakeFlags = { + BUILD_MPI = "ON"; + }; } ) diff --git a/pkgs/by-name/la/lammps/package.nix b/pkgs/by-name/la/lammps/package.nix index d25664c8f85e..4b23520c0002 100644 --- a/pkgs/by-name/la/lammps/package.nix +++ b/pkgs/by-name/la/lammps/package.nix @@ -40,12 +40,12 @@ SRD = true; REAXFF = true; PYTHON = true; - MPIIO = true; }, # Extra cmakeFlags to add as "-D${attr}=${value}" extraCmakeFlags ? { }, # Extra `buildInputs` - meant for packages that require more inputs extraBuildInputs ? [ ], + extraNativeBuildInputs ? [ ], }: stdenv.mkDerivation (finalAttrs: { @@ -69,21 +69,17 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config - # Although not always needed, it is needed if cmakeFlags include - # GPU_API=cuda, and it doesn't users that don't enable the GPU package. - autoAddDriverRunpath ] + ++ extraNativeBuildInputs ++ lib.optionals packages.PYTHON [ python3 - ] - ++ lib.optionals packages.MPIIO [ - mpich ]; passthru = { inherit packages; inherit extraCmakeFlags; inherit extraBuildInputs; + inherit extraNativeBuildInputs; }; cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" true) diff --git a/pkgs/by-name/li/libsignal-ffi/package.nix b/pkgs/by-name/li/libsignal-ffi/package.nix index c221dd578486..d5f380fb9654 100644 --- a/pkgs/by-name/li/libsignal-ffi/package.nix +++ b/pkgs/by-name/li/libsignal-ffi/package.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "libsignal-ffi"; # must match the version used in mautrix-signal # see https://github.com/mautrix/signal/issues/401 - version = "0.94.4"; + version = "0.97.2"; src = fetchFromGitHub { fetchSubmodules = true; owner = "signalapp"; repo = "libsignal"; tag = "v${finalAttrs.version}"; - hash = "sha256-Uh/j8cXUWgWgSo9UBfYOFuC8i+2YdMwGHcXf55PkGgU="; + hash = "sha256-p9NIt+n7MTsYWAFS+FOuSGMJUZi8rBlTb6ATgVJ+uU8="; }; postPatch = @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: { NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++"; }; - cargoHash = "sha256-st6zTKvxSsyMce22E8nFsJMGjQkk9sEAzSCmyZP8x20="; + cargoHash = "sha256-JtNGubDMrUINCCiawrAW63L1trcBCAIibFpojK8mzhc="; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 65c77a6ce7ed..23d9e48f3ef4 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -80,7 +80,7 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "9925"; + version = "10063"; outputs = [ "out" @@ -91,7 +91,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { owner = "ggml-org"; repo = "llama.cpp"; tag = "b${finalAttrs.version}"; - hash = "sha256-yX8BrHA0fIgIozBGOXnN72KlfqIcR/mnO5ttUBLvxZE="; + hash = "sha256-mkvRK5vn0qK6iE8kMyN9Zo/zaaaKTzp6WV9QfrKrHWc="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT diff --git a/pkgs/by-name/ma/mautrix-meta/package.nix b/pkgs/by-name/ma/mautrix-meta/package.nix index a5851f3ecfe6..81703b68f81f 100644 --- a/pkgs/by-name/ma/mautrix-meta/package.nix +++ b/pkgs/by-name/ma/mautrix-meta/package.nix @@ -15,8 +15,8 @@ buildGoModule rec { pname = "mautrix-meta"; - version = "26.06"; - tag = "v0.2606.0"; + version = "26.07"; + tag = "v0.2607.0"; subPackages = [ "cmd/mautrix-meta" ]; @@ -24,13 +24,13 @@ buildGoModule rec { owner = "mautrix"; repo = "meta"; inherit tag; - hash = "sha256-fpuJc2OAAvOPd/mbkboyx1cwXgMhBYZgILbbBS2R2ko="; + hash = "sha256-/NwO6B3IevmkP6nOgZ+Zjg12PvY/cGmH++7pKsJjaAk="; }; buildInputs = lib.optional (!withGoolm) olm; tags = lib.optional withGoolm "goolm"; - vendorHash = "sha256-IW+xQbw+YQ5thqyIV5amfUSbOe543meXCNytzHf4p6A="; + vendorHash = "sha256-ykTk6JQ6cMBH0HYK7n1FWxhAJkD7HVKrg9HChtvuCMk="; ldflags = [ "-s" diff --git a/pkgs/by-name/ma/mautrix-signal/package.nix b/pkgs/by-name/ma/mautrix-signal/package.nix index a5aa11b57755..27d3f2040855 100644 --- a/pkgs/by-name/ma/mautrix-signal/package.nix +++ b/pkgs/by-name/ma/mautrix-signal/package.nix @@ -20,14 +20,14 @@ let in buildGoModule rec { pname = "mautrix-signal"; - version = "26.06"; - tag = "v0.2606.0"; + version = "26.07"; + tag = "v0.2607.0"; src = fetchFromGitHub { owner = "mautrix"; repo = "signal"; inherit tag; - hash = "sha256-DSOf6kyNcsknwKM77vUQs6pWX8hMo4mU9dOGai62QR0="; + hash = "sha256-l6IIL2bClC6t5+P0/AkFIjkD/eDpQnnmA8x4i5ROaY4="; }; buildInputs = @@ -46,7 +46,7 @@ buildGoModule rec { CGO_LDFLAGS = toString [ cppStdLib ]; }; - vendorHash = "sha256-e9Et97QEn12kkiqrQTaDtwECLhwvxwDUF6IcWoL/+Mg="; + vendorHash = "sha256-0ifGza94s4+ED5OrlrqoDKIDZIYJWJhB2q3LJRpKiJs="; ldflags = [ "-X" diff --git a/pkgs/by-name/ma/mautrix-whatsapp/package.nix b/pkgs/by-name/ma/mautrix-whatsapp/package.nix index 78f8d40bb024..237445a9e328 100644 --- a/pkgs/by-name/ma/mautrix-whatsapp/package.nix +++ b/pkgs/by-name/ma/mautrix-whatsapp/package.nix @@ -14,20 +14,20 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "26.06"; - tag = "v0.2606.0"; + version = "26.07"; + tag = "v0.2607.0"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; inherit tag; - hash = "sha256-xxUsFrBX6wwANKECwL6ITDkc88XpCyGpWDPjGQlH3fI="; + hash = "sha256-cl3nJY9ui9J9fE9T1hBUV/o8lH0usrsUcpj9OwXxgtY="; }; buildInputs = lib.optional (!withGoolm) olm; tags = lib.optional withGoolm "goolm"; - vendorHash = "sha256-H8dSwOPVJ3TofAJDupYhX6/Vm5qshhFXaMtUDWM/0mw="; + vendorHash = "sha256-fVs5su6UkjvQEkoWJH6WL1FCZNdwj0jzrjfpbWOHWDU="; ldflags = [ "-s" diff --git a/pkgs/by-name/me/melos/add-generic-main.patch b/pkgs/by-name/me/melos/add-generic-main.patch index 8e90ac427171..815f2163e7dc 100644 --- a/pkgs/by-name/me/melos/add-generic-main.patch +++ b/pkgs/by-name/me/melos/add-generic-main.patch @@ -1,8 +1,8 @@ diff --git a/bin/melos.dart b/bin/melos.dart -index 2476436..bd79fad 100644 +index 2476436..ee6adb0 100644 --- a/packages/melos/bin/melos.dart +++ b/packages/melos/bin/melos.dart -@@ -1,11 +1,72 @@ +@@ -1,11 +1,74 @@ import 'package:cli_launcher/cli_launcher.dart'; import 'package:melos/src/command_runner.dart'; +import 'dart:io'; @@ -19,31 +19,29 @@ index 2476436..bd79fad 100644 -); +final ExecutableName executableName = ExecutableName('melos'); + ++// Substituted at build time to the package's install location in the ++// nix store (see preBuild in package.nix). ++const _globalPackageRoot = '__NIX_MELOS_PACKAGE_ROOT__'; ++ +Future main(List arguments) async { -+ final workspaceRoot = _findLocalInstallation(Directory.current); ++ final localInstallation = _findLocalInstallation(Directory.current); + -+ if (workspaceRoot == null) { -+ print("Error: Could not find your work "); -+ return; -+ } -+ -+ melosEntryPoint( ++ await melosEntryPoint( + arguments, + LaunchContext( + directory: Directory.current, -+ localInstallation: ExecutableInstallation( ++ globalInstallation: ExecutableInstallation( + name: executableName, + isSelf: false, -+ packageRoot: workspaceRoot, ++ packageRoot: Directory(_globalPackageRoot), + ), ++ localInstallation: localInstallation, + ), + ); +} + +// Stolen then simplified from https://github.com/blaugold/cli_launcher/blob/dcdf11c42b77ddc8e38e7e2445c8cff9b55658ec/lib/cli_launcher.dart#L249 -+Directory? _findLocalInstallation( -+ Directory start, -+) { ++ExecutableInstallation? _findLocalInstallation(Directory start) { + if (path.equals(start.path, start.parent.path)) { + return null; + } @@ -72,12 +70,16 @@ index 2476436..bd79fad 100644 + + final isSelf = name == executableName.package; + -+ if ((isSelf) || ++ if (isSelf || + (dependencies != null && + dependencies.containsKey(executableName.package)) || + (devDependencies != null && + devDependencies.containsKey(executableName.package))) { -+ return start; ++ return ExecutableInstallation( ++ name: executableName, ++ isSelf: isSelf, ++ packageRoot: start, ++ ); + } + } + diff --git a/pkgs/by-name/me/melos/package.nix b/pkgs/by-name/me/melos/package.nix index 8335bd112b58..dddc41cefcb5 100644 --- a/pkgs/by-name/me/melos/package.nix +++ b/pkgs/by-name/me/melos/package.nix @@ -27,6 +27,8 @@ buildDartApplication (finalAttrs: { --replace-fail "final melosPackageFileUri = await Isolate.resolvePackageUri(melosPackageUri);" "return \"$out\";" substituteInPlace packages/melos/lib/src/common/utils.dart \ --replace-fail "return p.normalize('\''${melosPackageFileUri!.toFilePath()}/../..');" " " + substituteInPlace packages/melos/bin/melos.dart \ + --replace-fail "__NIX_MELOS_PACKAGE_ROOT__" "$out" mkdir --parents $out cp --recursive packages/melos/templates $out/ ''; diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix index 508c6154dcee..c9bf314d2e64 100644 --- a/pkgs/by-name/mu/music-assistant/package.nix +++ b/pkgs/by-name/mu/music-assistant/package.nix @@ -16,10 +16,10 @@ let music-assistant-frontend = prev.callPackage ./frontend.nix { }; music-assistant-models = final.music-assistant-models.overridePythonAttrs (oldAttrs: { - version = "1.1.129"; + version = "1.1.129.post1"; src = oldAttrs.src.override { - hash = "sha256-6gVHlFTt/bsj4nUGPS6HDUQ7zczpfos75U6l4Yk9W6k="; + hash = "sha256-86BmUmduNcSbEHxK+/he78b5fAM/XBhnNEc28Uv74GI="; }; }); } @@ -40,7 +40,7 @@ assert pythonPackages.buildPythonApplication (finalAttrs: { pname = "music-assistant"; - version = "2.9.8"; + version = "2.9.9"; pyproject = true; __structuredAttrs = true; @@ -48,7 +48,7 @@ pythonPackages.buildPythonApplication (finalAttrs: { owner = "music-assistant"; repo = "server"; tag = finalAttrs.version; - hash = "sha256-Zk9jgcGwksMQo45qzzlE2Dqw1IQr0rsBkzMnFHTdl1U="; + hash = "sha256-ooe+QW+7S5LCgpin5/2g4L8+UDtr4TGZRpeR5F/tqZo="; }; patches = [ @@ -203,6 +203,7 @@ pythonPackages.buildPythonApplication (finalAttrs: { "snapcast" "sonic_analysis" "sonic_similarity" + "sonos_s1" "tidal" "wiim" "ytmusic" @@ -227,6 +228,7 @@ pythonPackages.buildPythonApplication (finalAttrs: { "tests/providers/kion_music" "tests/providers/nicovideo" "tests/providers/qqmusic" + "tests/providers/siriusxm" "tests/providers/yandex_music" "tests/providers/yandex_ynison" "tests/providers/zvuk_music" diff --git a/pkgs/by-name/mu/music-assistant/providers.nix b/pkgs/by-name/mu/music-assistant/providers.nix index da5c0fc054f9..9ac2b0a5ec6f 100644 --- a/pkgs/by-name/mu/music-assistant/providers.nix +++ b/pkgs/by-name/mu/music-assistant/providers.nix @@ -1,7 +1,7 @@ # Do not edit manually, run ./update-providers.py { - version = "2.9.8"; + version = "2.9.9"; builtins = [ "builtin" "coverartarchive" diff --git a/pkgs/by-name/ne/nextvi/package.nix b/pkgs/by-name/ne/nextvi/package.nix index 5611001eac0e..16ecd75d1520 100644 --- a/pkgs/by-name/ne/nextvi/package.nix +++ b/pkgs/by-name/ne/nextvi/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nextvi"; - version = "6.1"; + version = "7.0"; src = fetchFromGitHub { owner = "kyx0r"; repo = "nextvi"; tag = finalAttrs.version; - hash = "sha256-SysBH4+Rp1M9HtdGUAHErmc+148/fTAtYrY/QQG2OS4="; + hash = "sha256-corF/cPmkCkpqg2UVLrMHL33pgp3ffBohbQzq95b+Ws="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ni/nixos-option/package.nix b/pkgs/by-name/ni/nixos-option/package.nix index cd936c7380a6..fce09f3ff798 100644 --- a/pkgs/by-name/ni/nixos-option/package.nix +++ b/pkgs/by-name/ni/nixos-option/package.nix @@ -13,7 +13,8 @@ }: stdenvNoCC.mkDerivation { - name = "nixos-option"; + pname = "nixos-option"; + version = lib.trivial.release; src = ./nixos-option.sh; diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index aa63de856fee..fd9815394802 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -302,6 +302,7 @@ goBuild (finalAttrs: { -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \ -DFETCHCONTENT_SOURCE_DIR_LLAMA_CPP="$TMPDIR/llama-cpp-src" \ -DOLLAMA_MLX_BACKENDS="" \ + $cmakeFlags \ ${cmakeFlagsCudaArchitectures} \ ${cmakeFlagsRocmTargets} \ ${cmakeFlagsBackend} @@ -393,5 +394,7 @@ goBuild (finalAttrs: { maintainers = with maintainers; [ prusnak ]; + # install TARGETS RUNTIME_DEPENDENCIES is not supported when cross-compiling. + broken = stdenv.buildPlatform != stdenv.hostPlatform; }; }) diff --git a/pkgs/games/openra/build-engine.nix b/pkgs/by-name/op/openra/build-engine.nix similarity index 100% rename from pkgs/games/openra/build-engine.nix rename to pkgs/by-name/op/openra/build-engine.nix diff --git a/pkgs/games/openra/engines/bleed/default.nix b/pkgs/by-name/op/openra/engines/bleed/default.nix similarity index 100% rename from pkgs/games/openra/engines/bleed/default.nix rename to pkgs/by-name/op/openra/engines/bleed/default.nix diff --git a/pkgs/games/openra/engines/bleed/deps.json b/pkgs/by-name/op/openra/engines/bleed/deps.json similarity index 100% rename from pkgs/games/openra/engines/bleed/deps.json rename to pkgs/by-name/op/openra/engines/bleed/deps.json diff --git a/pkgs/by-name/op/openra/engines/default.nix b/pkgs/by-name/op/openra/engines/default.nix new file mode 100644 index 000000000000..877b96287d99 --- /dev/null +++ b/pkgs/by-name/op/openra/engines/default.nix @@ -0,0 +1,14 @@ +{ + callPackage, +}: +let + openRaUpdater = callPackage ../updater.nix { }; + buildOpenRAEngine = callPackage ../build-engine.nix { inherit openRaUpdater; }; + callPackage' = path: callPackage path { inherit buildOpenRAEngine; }; +in +{ + engines = { + release = callPackage' ./release; + bleed = callPackage' ./bleed; + }; +} diff --git a/pkgs/games/openra/engines/release/default.nix b/pkgs/by-name/op/openra/engines/release/default.nix similarity index 100% rename from pkgs/games/openra/engines/release/default.nix rename to pkgs/by-name/op/openra/engines/release/default.nix diff --git a/pkgs/games/openra/engines/release/deps.json b/pkgs/by-name/op/openra/engines/release/deps.json similarity index 100% rename from pkgs/games/openra/engines/release/deps.json rename to pkgs/by-name/op/openra/engines/release/deps.json diff --git a/pkgs/by-name/op/openra/package.nix b/pkgs/by-name/op/openra/package.nix new file mode 100644 index 000000000000..27b321a478d4 --- /dev/null +++ b/pkgs/by-name/op/openra/package.nix @@ -0,0 +1,4 @@ +{ + openraPackages, +}: +openraPackages.engines.release diff --git a/pkgs/games/openra/updater.nix b/pkgs/by-name/op/openra/updater.nix similarity index 100% rename from pkgs/games/openra/updater.nix rename to pkgs/by-name/op/openra/updater.nix diff --git a/pkgs/games/openra/updater.sh b/pkgs/by-name/op/openra/updater.sh similarity index 91% rename from pkgs/games/openra/updater.sh rename to pkgs/by-name/op/openra/updater.sh index e353c254d10c..d8b06d17c2e2 100644 --- a/pkgs/games/openra/updater.sh +++ b/pkgs/by-name/op/openra/updater.sh @@ -1,17 +1,17 @@ if [[ -z "${UPDATE_NIX_ATTR_PATH:-}" ]]; then - echo "Missing UPDATE_NIX_ATTR_PATH - make sure you use mainters/scripts/update.nix to run this script!" 1>&2 + echo "Missing UPDATE_NIX_ATTR_PATH - make sure you use maintainers/scripts/update.nix to run this script!" 1>&2 exit 1 fi attrPath="$UPDATE_NIX_ATTR_PATH" -nixFilePath="$(pwd)/pkgs/games/openra/engines/$build/default.nix" +nixFilePath="$(pwd)/pkgs/by-name/op/openra/engines/$build/default.nix" if [[ ! -f "$nixFilePath" ]]; then echo "$nixFilePath does not exist!" 1>&2 exit 1 fi -depsFilePath="$(pwd)/pkgs/games/openra/engines/$build/deps.json" +depsFilePath="$(pwd)/pkgs/by-name/op/openra/engines/$build/deps.json" if [[ ! -f "$depsFilePath" ]]; then echo "$depsFilePath does not exist!" 1>&2 exit 1 diff --git a/pkgs/by-name/pi/pi-coding-agent/package.nix b/pkgs/by-name/pi/pi-coding-agent/package.nix index 4f6ca2cfe83b..1433c9a3dc9d 100644 --- a/pkgs/by-name/pi/pi-coding-agent/package.nix +++ b/pkgs/by-name/pi/pi-coding-agent/package.nix @@ -12,16 +12,16 @@ }: buildNpmPackage (finalAttrs: { pname = "pi-coding-agent"; - version = "0.80.8"; + version = "0.80.10"; src = fetchFromGitHub { owner = "earendil-works"; repo = "pi"; tag = "v${finalAttrs.version}"; - hash = "sha256-wCsZA1gb9sFri6OdTWBf0UCXYxqxlbImG8iE6K+D9u4="; + hash = "sha256-Vs/ndHYzFyfN4CjPV2zMYblLXe9IuM13UrPJI1VsZEQ="; }; - npmDepsHash = "sha256-WdSQHKKOVzEFxUQH3QnSVzs+HpJPATnCQ701nbRB0lc="; + npmDepsHash = "sha256-XGvDNH+eilsgc0Z7ITqbitB/9RVc+WuDfCcr1pibNqk="; npmWorkspace = "packages/coding-agent"; diff --git a/pkgs/by-name/qe/qemu/package.nix b/pkgs/by-name/qe/qemu/package.nix index 978d4e21cecc..15bb2b5f402c 100644 --- a/pkgs/by-name/qe/qemu/package.nix +++ b/pkgs/by-name/qe/qemu/package.nix @@ -99,6 +99,8 @@ capstone, valgrindSupport ? false, valgrind-light, + brlttySupport ? !minimal, + brltty, pluginsSupport ? !stdenv.hostPlatform.isStatic, enableDocs ? !minimal || toolsOnly, enableTools ? !minimal || toolsOnly, @@ -253,6 +255,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals u2fEmuSupport [ libu2f-emu ] ++ lib.optionals capstoneSupport [ capstone ] ++ lib.optionals valgrindSupport [ valgrind-light ] + ++ lib.optionals brlttySupport [ brltty ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ]; dontUseMesonConfigure = true; # meson's configurePhase isn't compatible with qemu build @@ -338,6 +341,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional canokeySupport "--enable-canokey" ++ lib.optional u2fEmuSupport "--enable-u2f" ++ lib.optional capstoneSupport "--enable-capstone" + ++ lib.optional brlttySupport "--enable-brlapi" ++ lib.optional (!pluginsSupport) "--disable-plugins" ++ lib.optional (!enableBlobs) "--disable-install-blobs" ++ lib.optional userOnly "--disable-system" diff --git a/pkgs/by-name/qu/quantlib/package.nix b/pkgs/by-name/qu/quantlib/package.nix index ea6872b643f9..4655b4bc9574 100644 --- a/pkgs/by-name/qu/quantlib/package.nix +++ b/pkgs/by-name/qu/quantlib/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "quantlib"; - version = "1.42.1"; + version = "1.43"; outputs = [ "out" @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "lballabio"; repo = "QuantLib"; rev = "v${finalAttrs.version}"; - hash = "sha256-sc+CZzDNITOBSUG0ZkJEmrSLv/cr5LvLRdqD0LAfe8I="; + hash = "sha256-Bl+Q5BKUg9WCzktaeCr9Zdw38arg3K4/wqBC8tS8ghM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/qx/qxmpp/package.nix b/pkgs/by-name/qx/qxmpp/package.nix index e2d934d1d762..afc6aba94b68 100644 --- a/pkgs/by-name/qx/qxmpp/package.nix +++ b/pkgs/by-name/qx/qxmpp/package.nix @@ -5,22 +5,24 @@ cmake, pkg-config, kdePackages, + ctestCheckHook, withGstreamer ? true, gst_all_1, withOmemo ? true, libomemo-c, + withEncryption ? true, }: stdenv.mkDerivation (finalAttrs: { pname = "qxmpp"; - version = "1.15.1"; + version = "1.16.1"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "libraries"; repo = "qxmpp"; tag = "v${finalAttrs.version}"; - hash = "sha256-PkdzEQKI0NiLvDyI+SEoKainF7UiAU3UVJQjgwYKHuo="; + hash = "sha256-JuGSLi0oqlUTbJnjlqd9qo0Dk2yCY1hfryQy0CuEjLo="; }; nativeBuildInputs = [ @@ -46,21 +48,30 @@ stdenv.mkDerivation (finalAttrs: { libomemo-c ]; cmakeFlags = [ - "-DBUILD_EXAMPLES=false" - "-DBUILD_TESTS=false" - ] - ++ lib.optionals withGstreamer [ - "-DWITH_GSTREAMER=ON" - ] - ++ lib.optionals withOmemo [ - "-DBUILD_OMEMO=ON" + (lib.cmakeBool "BUILD_DOCUMENTATION" false) + (lib.cmakeBool "BUILD_EXAMPLES" false) + (lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck) + (lib.cmakeBool "BUILD_OMEMO" withOmemo) + (lib.cmakeBool "WITH_ENCRYPTION" withEncryption) + (lib.cmakeBool "WITH_GSTREAMER" withGstreamer) + ]; + + doCheck = true; + nativeCheckInputs = [ ctestCheckHook ]; + disabledTests = [ + "tst_QXmppIceConnection" + "tst_QXmppTransferManager" ]; meta = { description = "Cross-platform C++ XMPP client and server library"; + changelog = "https://invent.kde.org/libraries/qxmpp/-/blob/${finalAttrs.src.tag}/CHANGELOG.md"; homepage = "https://invent.kde.org/libraries/qxmpp"; license = lib.licenses.lgpl21Plus; - maintainers = with lib.maintainers; [ astro ]; + maintainers = with lib.maintainers; [ + astro + haansn08 + ]; platforms = with lib.platforms; linux; }; }) diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index d6140bf99b75..866f615d0339 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ruff"; - version = "0.15.21"; + version = "0.15.22"; __structuredAttrs = true; @@ -24,12 +24,12 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "astral-sh"; repo = "ruff"; tag = finalAttrs.version; - hash = "sha256-dhBdz4jgE2ZoQsTdKmzyzGHC1fDQ54sz2g5m01TETSY="; + hash = "sha256-pa42J3M5iwSjfnuatqOOR9DEqzyVtdBbMk6JIRbu12Q="; }; cargoBuildFlags = [ "--package=ruff" ]; - cargoHash = "sha256-usviiAc7tWy/fqxE5fD/1B8rsUY0UnSA5EKgk0JLDpA="; + cargoHash = "sha256-jDm0pIrq09ETU+djMLsKSFZJzRx0lKSUx6kjJ4hAkvE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sn/snyk/package.nix b/pkgs/by-name/sn/snyk/package.nix index 780528547fa5..81bdd8ba7795 100644 --- a/pkgs/by-name/sn/snyk/package.nix +++ b/pkgs/by-name/sn/snyk/package.nix @@ -10,13 +10,13 @@ buildNpmPackage (finalAttrs: { pname = "snyk"; - version = "1.1306.0"; + version = "1.1306.1"; src = fetchFromGitHub { owner = "snyk"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-SYF5o/yx8A3u81yCwIU3njVSLG2vZskhZhJSAXAEioA="; + hash = "sha256-L2aR09o2FVYKDXdbRr9cw93cerWybw3b6Tdvs5Q1atQ="; # TODO: Remove once https://github.com/snyk/cli/pull/6924 is released. postFetch = '' @@ -26,7 +26,7 @@ buildNpmPackage (finalAttrs: { npmDepsFetcherVersion = 3; - npmDepsHash = "sha256-6re7WgeeuiHSJJmr+3wWyHYEq+jcVy9FvkwwVwwdnBg="; + npmDepsHash = "sha256-AmJNFEw7IF9PjgeRma6vp3I7a60ZkekfRkPXJtjVIik="; nodejs = nodejs_24; diff --git a/pkgs/by-name/sv/sview/package.nix b/pkgs/by-name/sv/sview/package.nix index b6ed4983857c..5b5ca6de1f33 100644 --- a/pkgs/by-name/sv/sview/package.nix +++ b/pkgs/by-name/sv/sview/package.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "sview"; - version = "26_02"; + version = "26.07"; src = fetchFromGitHub { owner = "gkv311"; repo = "sview"; - tag = version; - hash = "sha256-UIA8bDGYVN8Zw23PkKprYrvcMubHzoquaSArLShu+aw="; + tag = lib.replaceString "." "_" version; + hash = "sha256-Kyz+FHYpBKKAyHMEM0DTKNNIAw4/tORxeCOFOLySspY="; }; droidSansFallback = fetchurl { diff --git a/pkgs/by-name/te/terminal-notifier/package.nix b/pkgs/by-name/te/terminal-notifier/package.nix index ecfea7c2fb1d..e67ee46020da 100644 --- a/pkgs/by-name/te/terminal-notifier/package.nix +++ b/pkgs/by-name/te/terminal-notifier/package.nix @@ -1,5 +1,4 @@ { - apple-sdk, fetchFromGitHub, ibtool, lib, @@ -19,32 +18,30 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Hd9cI3R2nQK2deBb5CBYz4DTHAEcO4vzqtA5qZwa1Ao="; }; + __structuredAttrs = true; + + strictDeps = true; + nativeBuildInputs = [ ibtool makeBinaryWrapper xcbuildHook ]; - buildInputs = [ - apple-sdk - ]; - xcbuildFlags = [ "-target" "terminal-notifier" - "-configuration" - "Release" ]; installPhase = '' runHook preInstall - mkdir -p $out/{Applications,bin} + mkdir -p $out/Applications cp -r Products/Release/terminal-notifier.app $out/Applications/ + makeWrapper \ $out/Applications/terminal-notifier.app/Contents/MacOS/terminal-notifier \ - $out/bin/terminal-notifier \ - --chdir $out/Applications/terminal-notifier.app + $out/bin/terminal-notifier runHook postInstall ''; diff --git a/pkgs/by-name/th/thunar-unwrapped/package.nix b/pkgs/by-name/th/thunar-unwrapped/package.nix index cc96494e8c95..7a87bbecba64 100644 --- a/pkgs/by-name/th/thunar-unwrapped/package.nix +++ b/pkgs/by-name/th/thunar-unwrapped/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "thunar"; - version = "4.20.8"; + version = "4.20.9"; outputs = [ "out" @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "xfce"; repo = "thunar"; tag = "thunar-${finalAttrs.version}"; - hash = "sha256-gcNo9HNBY5NGhJ8N8DBTXYb5gsNAXrItvWuo3XdSBRg="; + hash = "sha256-rKKxCl7hoIcEDcKVaaRJfU+hyDHE/vpL0gxXExX6NeI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/to/tombi/package.nix b/pkgs/by-name/to/tombi/package.nix index 3e420d81c7fe..bc82d13e2aee 100644 --- a/pkgs/by-name/to/tombi/package.nix +++ b/pkgs/by-name/to/tombi/package.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tombi"; - version = "1.2.1"; + version = "1.2.2"; __structuredAttrs = true; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "tombi-toml"; repo = "tombi"; tag = "v${finalAttrs.version}"; - hash = "sha256-aK2Y9knJwJCaRFifGpsEvH5hm0ZqtDPLHYnabxAEZZQ="; + hash = "sha256-F7YQy+p0nsC4rKBs8CUG39FrK7fI8JE71YhHV6RaFZg="; }; # Tests relies on the presence of network diff --git a/pkgs/by-name/to/tootik/package.nix b/pkgs/by-name/to/tootik/package.nix index bdef72ed0628..cc20249751fd 100644 --- a/pkgs/by-name/to/tootik/package.nix +++ b/pkgs/by-name/to/tootik/package.nix @@ -4,20 +4,25 @@ buildGoModule, fetchFromGitHub, openssl, + versionCheckHook, + nix-update-script, }: buildGoModule (finalAttrs: { pname = "tootik"; - version = "0.20.2"; + version = "0.23.3"; src = fetchFromGitHub { owner = "dimkr"; repo = "tootik"; tag = "v${finalAttrs.version}"; - hash = "sha256-zkKkHzgIBHg0FH07KNr7jGNZU4QUbl6udoD7hLaDOL0="; + hash = "sha256-YcpRt17X9EHTCDhyFRnUriin4Y5vllLItKPGbrzUr8Y="; }; - vendorHash = "sha256-UZQw63KPs7GzOv5Ls69DLqJqc/taWwC5UCYdNlq9fXc="; + proxyVendor = true; + vendorHash = "sha256-VeMTiOL4JQGzDN4Nan6nZbujDnX2Ksby2W+AK7kAs+M="; + + subPackages = [ "cmd/tootik" ]; nativeBuildInputs = [ openssl ]; @@ -31,6 +36,11 @@ buildGoModule (finalAttrs: { doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + __darwinAllowLocalNetworking = true; meta = { diff --git a/pkgs/by-name/tu/turso/package.nix b/pkgs/by-name/tu/turso/package.nix index 6198ddf53428..18e1525d5f28 100644 --- a/pkgs/by-name/tu/turso/package.nix +++ b/pkgs/by-name/tu/turso/package.nix @@ -7,7 +7,7 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "turso"; - version = "0.6.1"; + version = "0.7.0"; __structuredAttrs = true; @@ -15,10 +15,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "tursodatabase"; repo = "turso"; tag = "v${finalAttrs.version}"; - hash = "sha256-32bYI3pWKlQTWZr/AS5aULZt4sgBHMswMBViGlRiwjk="; + hash = "sha256-eRB8IM7cda7UaYfX5dIubIK4K0M6ydrTxyLAUPB9/WM="; }; - cargoHash = "sha256-bmyMjjjmKeDySDzyOJCtDHF9HD/u/A4Jt2qxpZgHVqY="; + cargoHash = "sha256-94lXY24XnURv6ebr4I/O8Rzk/iqflo7fib18S7XPhdU="; cargoBuildFlags = [ "--bin" diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix index f31ab1a8747e..16b4548f0ad9 100644 --- a/pkgs/by-name/ty/ty/package.nix +++ b/pkgs/by-name/ty/ty/package.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ty"; - version = "0.0.59"; + version = "0.0.60"; __structuredAttrs = true; src = fetchFromGitHub { @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { repo = "ty"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-9wk1Nl1ObVfGbjGFzvMYLnVP9PjGdI7I9HACeGfZ0d0="; + hash = "sha256-9sD0xtxtw9hAOvWM0UkCARjwUe/lJw+KdqC7O1o7o6s="; }; # For Darwin platforms, remove the integration test for file notifications, @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = [ "--package=ty" ]; - cargoHash = "sha256-MdzVg+FzY3AmNt2WaSeWbBxkWABedMlr2+hJXYZEmJo="; + cargoHash = "sha256-r8GvyK9gWryKdCVGzfYzDGJ2DH4H5A693aGA5DyNDZc="; nativeBuildInputs = [ installShellFiles ]; buildInputs = [ rust-jemalloc-sys ]; diff --git a/pkgs/by-name/un/unifly/package.nix b/pkgs/by-name/un/unifly/package.nix new file mode 100644 index 000000000000..6b08538ccda6 --- /dev/null +++ b/pkgs/by-name/un/unifly/package.nix @@ -0,0 +1,58 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + llvmPackages, + installShellFiles, + dbus, + versionCheckHook, + stdenv, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + __structuredAttrs = true; + + pname = "unifly"; + version = "0.9.2"; + + src = fetchFromGitHub { + owner = "hyperb1iss"; + repo = "unifly"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Hw/zm9OjBcAI0H2vvwnAj4tjF0E+d6RHpWIexhPBuy8="; + }; + + nativeBuildInputs = [ + pkg-config + llvmPackages.bintools + installShellFiles + ]; + + buildInputs = [ dbus ]; + + cargoHash = "sha256-4nLfMzlN5KQK3JvmoHbktI/tyc3aaI78Oa5RtQN4xLo="; + + doCheck = false; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd unifly \ + --bash <($out/bin/unifly completions bash) \ + --fish <($out/bin/unifly completions fish) \ + --zsh <($out/bin/unifly completions zsh) + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Elegant UniFi network management CLI & TUI - for humans and agents"; + homepage = "https://hyperb1iss.github.io/unifly"; + changelog = "https://github.com/hyperb1iss/unifly/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.apsl20; + maintainers = with lib.maintainers; [ britter ]; + mainProgram = "unifly"; + }; +}) diff --git a/pkgs/by-name/ze/zepp-simulator/package.nix b/pkgs/by-name/ze/zepp-simulator/package.nix index 6e565b6c33dc..afeeec14a8d3 100644 --- a/pkgs/by-name/ze/zepp-simulator/package.nix +++ b/pkgs/by-name/ze/zepp-simulator/package.nix @@ -6,8 +6,7 @@ copyDesktopItems, autoPatchelfHook, - # Upstream is officially built with Electron 18 - # (but it works with latest Electron with minor changes, see HACK below) + # Upstream is built with older Electron electron, asar, dpkg, @@ -40,19 +39,14 @@ }: let - # CDN links for 2.0.2: - # MacOS: https://upload-cdn.zepp.com/zepp-applet-and-wechat-applet/20240927/ecb6ca54f4dc97a2f91e53358bbb532d.dmg - # Windows: https://upload-cdn.zepp.com/zepp-applet-and-wechat-applet/20240927/9db7ae1c60c26836a447a71a6fb25b3b.exe - # Linux ARM64: https://upload-cdn.zepp.com/zepp-applet-and-wechat-applet/20240927/02ec69e6a2f3b744d964fd7ba4f40fc3.deb - # Linux AMD64: https://upload-cdn.zepp.com/zepp-applet-and-wechat-applet/20240927/3e688d423cd0cd31a8a589b8325a309e.deb srcs = { x86_64-linux = { - url = "https://upload-cdn.zepp.com/zepp-applet-and-wechat-applet/20240927/3e688d423cd0cd31a8a589b8325a309e.deb"; - sha256 = "sha256-ZHqaEL8FoSnRtuqGWpTyJka7D0dHtRADZthq8DG2k24="; + url = "https://upload-cdn.zepp.com/zepp-applet-and-wechat-applet/20260410/simulator_2.1.1_linux_amd64.deb"; + hash = "sha256-+cRt2jZexe3hI+jN2Lp58uM8GBDvEDqt/u3rp5F0wPo="; }; aarch64-linux = { - url = "https://upload-cdn.zepp.com/zepp-applet-and-wechat-applet/20240927/02ec69e6a2f3b744d964fd7ba4f40fc3.deb"; - sha256 = "sha256-J5Y4wLiFOM9D2MIMiRyUtHIZ19rt65ktVCOMZQQwBCI="; + url = "https://upload-cdn.zepp.com/zepp-applet-and-wechat-applet/20260509/simulator_2.1.1_arm64.deb"; + hash = "sha256-JnMfiKmA3tyMYDtO2XoeGYOLE2wANKixcfz9wesXoLk="; }; }; @@ -60,7 +54,7 @@ in stdenv.mkDerivation { pname = "zepp-simulator"; - version = "2.0.2"; + version = "2.1.1"; src = fetchurl srcs.${stdenv.hostPlatform.system}; diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 164d1e56bc2a..fc26db38dca7 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -80,9 +80,9 @@ major = "3"; minor = "15"; patch = "0"; - suffix = "b3"; + suffix = "b4"; }; - hash = "sha256-apNa4jSmfmVJiUNzsM/rg2EYLQOyFEIyiulZirdCISc="; + hash = "sha256-k++5yI17ZjM2jn97j4226YmI9/dhwJt3hJRHJihBzjo="; inherit passthruFun; }; diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix index 583d44001d91..6b4ce1c17233 100644 --- a/pkgs/development/libraries/liquid-dsp/default.nix +++ b/pkgs/development/libraries/liquid-dsp/default.nix @@ -1,48 +1,50 @@ { lib, stdenv, + cmake, fetchFromGitHub, autoreconfHook, - cctools, autoSignDarwinBinariesHook, fixDarwinDylibNames, }: stdenv.mkDerivation rec { pname = "liquid-dsp"; - version = "1.6.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "jgaeddert"; repo = "liquid-dsp"; rev = "v${version}"; - sha256 = "sha256-3UKAwhYaYZ42+d+wiW/AB6x5TSOel8d++d3HeZqAg/8="; + sha256 = "sha256-IvWtoXuuIvpJfY4cyRUsPHgax2/aytYShSdxEStiPYI="; }; - configureFlags = - lib.optionals stdenv.hostPlatform.isDarwin [ - "LIBTOOL=${cctools}/bin/libtool" - ] - ++ [ - # Prevent native cpu arch from leaking into binaries. This might lead to - # poor performance, but having portable and working executables is more - # important. - (lib.enableFeature true "simdoverride") - ]; + cmakeFlags = [ + # Prevent native cpu arch from leaking into binaries. + (lib.cmakeBool "ENABLE_SIMD" false) + (lib.cmakeBool "FIND_SIMD" false) + ]; nativeBuildInputs = [ - autoreconfHook + cmake ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - cctools autoSignDarwinBinariesHook fixDarwinDylibNames ]; + patches = [ + ./fix-cmake-pc-paths.patch + ./include-stdarg.patch + ]; + + doCheck = true; + meta = { homepage = "https://liquidsdr.org/"; description = "Digital signal processing library for software-defined radios"; license = lib.licenses.mit; platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ iank ]; }; } diff --git a/pkgs/development/libraries/liquid-dsp/fix-cmake-pc-paths.patch b/pkgs/development/libraries/liquid-dsp/fix-cmake-pc-paths.patch new file mode 100644 index 000000000000..ed4d01061dc3 --- /dev/null +++ b/pkgs/development/libraries/liquid-dsp/fix-cmake-pc-paths.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 07c123889..a6640515c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -564,6 +564,9 @@ if (fftw3f_FOUND) + string(APPEND LIQUID_PC_LIBS_PRIVATE " -lfftw3f") + endif() + ++cmake_path(APPEND libdir_for_pc_file "\${prefix}" "${CMAKE_INSTALL_LIBDIR}") ++cmake_path(APPEND includedir_for_pc_file "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}") ++ + configure_file( + cmake/liquid-dsp.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/liquid-dsp.pc +diff --git a/cmake/liquid-dsp.pc.in b/cmake/liquid-dsp.pc.in +index 93597a7e4..06de85dee 100644 +--- a/cmake/liquid-dsp.pc.in ++++ b/cmake/liquid-dsp.pc.in +@@ -2,8 +2,8 @@ + + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@libdir_for_pc_file@ ++includedir=@includedir_for_pc_file@ + + Name: liquid-dsp + Description: Software-defined radio digital signal processing library diff --git a/pkgs/development/libraries/liquid-dsp/include-stdarg.patch b/pkgs/development/libraries/liquid-dsp/include-stdarg.patch new file mode 100644 index 000000000000..3eb68b99e636 --- /dev/null +++ b/pkgs/development/libraries/liquid-dsp/include-stdarg.patch @@ -0,0 +1,12 @@ +diff --git a/include/liquid.h b/include/liquid.h +index 290778b50..52d898d07 100644 +--- a/include/liquid.h ++++ b/include/liquid.h +@@ -34,6 +34,7 @@ extern "C" { + #include + #include + #include ++#include + + // compile-time short file path: use __FILE_NAME__ if available (Clang 9+, GCC 12+) + #ifdef __FILE_NAME__ diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index 7ea95c0ff856..81261040032a 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,8 +5,8 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.125"; - hash = "sha256-pIRoFJYsQZzI+hJcNzTX+WT91tfXDygWE0RrirfyBPc="; + version = "3.126"; + hash = "sha256-+yiBEc8WLZ6qiO8MBQBiIXfm4OEJ9EFgmw2rY+U/bp8="; filename = "latest.nix"; versionRegex = "NSS_(\\d+)_(\\d+)(?:_(\\d+))?_RTM"; } diff --git a/pkgs/development/python-modules/agentic-threat-hunting-framework/default.nix b/pkgs/development/python-modules/agentic-threat-hunting-framework/default.nix index 8ab717e97e7f..422fc20dd437 100644 --- a/pkgs/development/python-modules/agentic-threat-hunting-framework/default.nix +++ b/pkgs/development/python-modules/agentic-threat-hunting-framework/default.nix @@ -16,14 +16,14 @@ buildPythonPackage (finalAttrs: { pname = "agentic-threat-hunting-framework"; - version = "0.13.0"; + version = "0.16.0"; pyproject = true; src = fetchFromGitHub { owner = "Nebulock-Inc"; repo = "agentic-threat-hunting-framework"; tag = "v${finalAttrs.version}"; - hash = "sha256-5E9nUSGwEuGdt04M0rRoHES8Klco6j5X1TLa/E7KdgM="; + hash = "sha256-KyrWJlfrpb7vjOVZvIw9f4KZCxpFZtwhmD0oFxQJ7RE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/click-log/default.nix b/pkgs/development/python-modules/click-log/default.nix index 1eac7a94e3a6..2a3daa4e370d 100644 --- a/pkgs/development/python-modules/click-log/default.nix +++ b/pkgs/development/python-modules/click-log/default.nix @@ -2,20 +2,28 @@ lib, buildPythonPackage, fetchPypi, + setuptools, click, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "click-log"; version = "0.4.0"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + pname = "click-log"; + inherit (finalAttrs) version; hash = "sha256-OXD4VwrFRJEje82z2KtePu9sBX3yn4w9EVGlGpwjuXU="; }; - propagatedBuildInputs = [ click ]; + build-system = [ setuptools ]; + + dependencies = [ click ]; + + pythonImportsCheck = [ "click_log" ]; meta = { homepage = "https://github.com/click-contrib/click-log/"; @@ -23,4 +31,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/cligj/default.nix b/pkgs/development/python-modules/cligj/default.nix index cf91b206452c..69231498e0b1 100644 --- a/pkgs/development/python-modules/cligj/default.nix +++ b/pkgs/development/python-modules/cligj/default.nix @@ -2,23 +2,28 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, click, pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cligj"; version = "0.7.2"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "mapbox"; repo = "cligj"; - rev = version; + tag = finalAttrs.version; hash = "sha256-0f9+I6ozX93Vn0l7+WR0mpddDZymJQ3+Krovt6co22Y="; }; - propagatedBuildInputs = [ click ]; + build-system = [ setuptools ]; + + dependencies = [ click ]; nativeCheckInputs = [ pytest @@ -28,10 +33,12 @@ buildPythonPackage rec { pytest tests ''; + pythonImportsCheck = [ "cligj" ]; + meta = { description = "Click params for command line interfaces to GeoJSON"; homepage = "https://github.com/mapbox/cligj"; license = lib.licenses.bsd3; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/cmdline/default.nix b/pkgs/development/python-modules/cmdline/default.nix index 142400367073..797bb24169f4 100644 --- a/pkgs/development/python-modules/cmdline/default.nix +++ b/pkgs/development/python-modules/cmdline/default.nix @@ -2,26 +2,33 @@ lib, buildPythonPackage, fetchPypi, + setuptools, pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cmdline"; version = "0.2.0"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; - sha256 = "7cf6af53549892b2218c2f56a199dff54a733be5c5515c0fd626812070b0a86a"; + inherit (finalAttrs) pname version; + hash = "sha256-fPavU1SYkrIhjC9WoZnf9UpzO+XFUVwP1iaBIHCwqGo="; }; + build-system = [ setuptools ]; + # No tests, https://github.com/rca/cmdline/issues/1 doCheck = false; - propagatedBuildInputs = [ pyyaml ]; + dependencies = [ pyyaml ]; + + pythonImportsCheck = [ "cmdline" ]; meta = { description = "Utilities for consistent command line tools"; homepage = "https://github.com/rca/cmdline"; license = lib.licenses.asl20; }; -} +}) diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index df4ab4e625dc..ca6486394888 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "iamdata"; - version = "0.1.202607171"; + version = "0.1.202607181"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-i4/vmq7Adxrmb6Ad/eFU5NwOseHo/uBMsN5UyyqDyqY="; + hash = "sha256-p9wgcA6POyOpEJk6DrtTRFsxnFFB3Szay+JVNSGAFnQ="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/pip-chill/default.nix b/pkgs/development/python-modules/pip-chill/default.nix index af2f90af0b5d..313332565413 100644 --- a/pkgs/development/python-modules/pip-chill/default.nix +++ b/pkgs/development/python-modules/pip-chill/default.nix @@ -1,29 +1,25 @@ { lib, - fetchFromGitHub, + fetchPypi, buildPythonPackage, setuptools, pip, - pythonAtLeast, pytestCheckHook, }: buildPythonPackage rec { pname = "pip-chill"; - version = "1.0.3"; + version = "1.0.5"; pyproject = true; - src = fetchFromGitHub { - owner = "rbanffy"; - repo = "pip-chill"; - tag = "v${version}"; - hash = "sha256-oWq3UWBL5nsCBUkaElashZKvm7pN3StJNubgU++8YFs="; + src = fetchPypi { + pname = "pip_chill"; + inherit version; + hash = "sha256-55vFFKv+FE8u9SKQ9ZZ30nnLBbQIT6n4FLvlzA6gTBw="; }; build-system = [ setuptools ]; - dependencies = lib.optionals (pythonAtLeast "3.12") [ setuptools ]; - nativeCheckInputs = [ pip pytestCheckHook @@ -39,7 +35,6 @@ buildPythonPackage rec { meta = { description = "More relaxed `pip freeze`"; homepage = "https://github.com/rbanffy/pip-chill"; - changelog = "https://github.com/rbanffy/pip-chill/releases/tag/v${version}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ tochiaha ]; mainProgram = "pip-chill"; diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix index 4b4b5cdbaa0a..55893eabc8c3 100644 --- a/pkgs/development/python-modules/pyinfra/default.nix +++ b/pkgs/development/python-modules/pyinfra/default.nix @@ -68,6 +68,11 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "pyinfra" ]; + pythonRelaxDeps = [ + "paramiko" + "types-paramiko" + ]; + disabledTests = [ # Test requires SSH binary "test_load_ssh_config" @@ -83,7 +88,10 @@ buildPythonPackage (finalAttrs: { downloadPage = "https://pyinfra.com/Fizzadar/pyinfra/releases"; changelog = "https://github.com/Fizzadar/pyinfra/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ totoroot ]; + maintainers = with lib.maintainers; [ + robsliwi + totoroot + ]; mainProgram = "pyinfra"; }; }) diff --git a/pkgs/development/python-modules/rembg/default.nix b/pkgs/development/python-modules/rembg/default.nix index 10e4abee1a27..eae7ff3567e9 100644 --- a/pkgs/development/python-modules/rembg/default.nix +++ b/pkgs/development/python-modules/rembg/default.nix @@ -46,14 +46,14 @@ let in buildPythonPackage (finalAttrs: { pname = "rembg"; - version = "2.0.76"; + version = "2.0.77"; pyproject = true; src = fetchFromGitHub { owner = "danielgatis"; repo = "rembg"; tag = "v${finalAttrs.version}"; - hash = "sha256-Iv98z6LdQCkfndBOZubyUtN8teTlZsi8fmQ/Vec18yI="; + hash = "sha256-N7G9jYERoFAj3GBuGypuWqeOMmspKr3lzVY/3mb58Mw="; }; env.POETRY_DYNAMIC_VERSIONING_BYPASS = finalAttrs.version; diff --git a/pkgs/development/python-modules/scverse-misc/default.nix b/pkgs/development/python-modules/scverse-misc/default.nix index 1ebdb5c30a37..5f999bb621c3 100644 --- a/pkgs/development/python-modules/scverse-misc/default.nix +++ b/pkgs/development/python-modules/scverse-misc/default.nix @@ -29,7 +29,7 @@ buildPythonPackage (finalAttrs: { pname = "scverse-misc"; - version = "0.1.1"; + version = "0.1.2"; pyproject = true; __structuredAttrs = true; @@ -37,7 +37,7 @@ buildPythonPackage (finalAttrs: { owner = "scverse"; repo = "scverse-misc"; tag = "v${finalAttrs.version}"; - hash = "sha256-PkvOaxGbZ1i10xgghdvGLCKiXcwg/eZzYvQ7Gp3K+JE="; + hash = "sha256-ARiC/7yBm4n08RyTAOVc/PnBivhBY/NqJEauCL4QQZA="; }; build-system = [ diff --git a/pkgs/development/python-modules/textnets/default.nix b/pkgs/development/python-modules/textnets/default.nix index 91b2a380b5f3..65e5d7e3dea4 100644 --- a/pkgs/development/python-modules/textnets/default.nix +++ b/pkgs/development/python-modules/textnets/default.nix @@ -47,6 +47,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "toolz" + "pandas" ]; dependencies = [ diff --git a/pkgs/development/python-modules/types-decorator/default.nix b/pkgs/development/python-modules/types-decorator/default.nix index 660ded79dd37..09a7050380ed 100644 --- a/pkgs/development/python-modules/types-decorator/default.nix +++ b/pkgs/development/python-modules/types-decorator/default.nix @@ -7,13 +7,13 @@ buildPythonPackage (finalAttrs: { pname = "types-decorator"; - version = "5.2.0.20260519"; + version = "5.2.0.20260712"; pyproject = true; src = fetchPypi { pname = "types_decorator"; inherit (finalAttrs) version; - hash = "sha256-tbI7Lw0RwGdIeAaX00XIpoT8LQx1PwjugGNmDZ16I9k="; + hash = "sha256-KJDwX+PGVUa69QAP1fHu1NHJW65VFuI+FzW3taTdmMY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/tools/mysql-shell/8.nix b/pkgs/development/tools/mysql-shell/8.nix index 196d6c009d50..238742bd3ebf 100644 --- a/pkgs/development/tools/mysql-shell/8.nix +++ b/pkgs/development/tools/mysql-shell/8.nix @@ -38,8 +38,8 @@ let pyyaml ]; - mysqlShellVersion = "8.4.9"; - mysqlServerVersion = "8.4.9"; + mysqlShellVersion = "8.4.10"; + mysqlServerVersion = "8.4.10"; in stdenv.mkDerivation (finalAttrs: { pname = "mysql-shell"; @@ -48,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: { srcs = [ (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz"; - hash = "sha256-5KqLOeQtH+B48zu9c2lfrCtU28e7E38L2+Y/e+GgLWs="; + hash = "sha256-1XpnMLrvFK4Rj39KbgKEW1tQkzdY32H7BuEE8nzMj5Y="; }) (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-btYUh/akFRCSOXDL1C5xuXLysHS1lm4H74kqY+4zyiQ="; + hash = "sha256-2pOMjkr8y1lCuh5EC34kI9V8vcQpAotJPHWHkMbgET4="; }) ]; diff --git a/pkgs/development/tools/mysql-shell/9.nix b/pkgs/development/tools/mysql-shell/9.nix index 54ec76ca3c3b..14843a23f189 100644 --- a/pkgs/development/tools/mysql-shell/9.nix +++ b/pkgs/development/tools/mysql-shell/9.nix @@ -38,8 +38,8 @@ let pyyaml ]; - mysqlShellVersion = "9.7.0"; - mysqlServerVersion = "9.7.0"; + mysqlShellVersion = "9.7.1"; + mysqlServerVersion = "9.7.1"; in stdenv.mkDerivation (finalAttrs: { pname = "mysql-shell"; @@ -48,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: { srcs = [ (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz"; - hash = "sha256-dLV0urxWsOy2MqvTWdITxnlOz0Qq5Ekov8WB+z1iMG0="; + hash = "sha256-2r/yYwIr5qCRUcIYEjIoc0N+DXeuyMTMc4GILD6hrq4="; }) (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-s/omxSFTC/n3B8OtYddDqXzCd4GE4b5O8NUKbLdvwRI="; + hash = "sha256-7bRgb3CBu3oQiZm5xe6U6DvX5xd9iWqqeNPDwI+BYRQ="; }) ]; diff --git a/pkgs/development/tools/mysql-shell/innovation.nix b/pkgs/development/tools/mysql-shell/innovation.nix deleted file mode 100644 index 0417d36a1527..000000000000 --- a/pkgs/development/tools/mysql-shell/innovation.nix +++ /dev/null @@ -1,157 +0,0 @@ -{ - lib, - stdenv, - pkg-config, - cmake, - fetchurl, - git, - cctools, - darwin, - makeWrapper, - bison, - openssl, - protobuf, - curl, - zlib, - libssh, - zstd, - lz4, - readline, - libtirpc, - rpcsvc-proto, - libedit, - libevent, - icu, - re2, - ncurses, - libfido2, - python3, - cyrus_sasl, - openldap, - antlr, -}: - -let - pythonDeps = with python3.pkgs; [ - certifi - paramiko - pyyaml - ]; - - mysqlShellVersion = "9.7.0"; - mysqlServerVersion = "9.7.0"; -in -stdenv.mkDerivation (finalAttrs: { - pname = "mysql-shell-innovation"; - version = mysqlShellVersion; - - srcs = [ - (fetchurl { - url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz"; - hash = "sha256-dLV0urxWsOy2MqvTWdITxnlOz0Qq5Ekov8WB+z1iMG0="; - }) - (fetchurl { - url = "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-s/omxSFTC/n3B8OtYddDqXzCd4GE4b5O8NUKbLdvwRI="; - }) - ]; - - sourceRoot = "mysql-shell-${finalAttrs.version}-src"; - - postUnpack = '' - mv mysql-${mysqlServerVersion} mysql - ''; - - patches = [ - # No openssl bundling on macOS. It's not working. - # See https://github.com/mysql/mysql-shell/blob/5b84e0be59fc0e027ef3f4920df15f7be97624c1/cmake/ssl.cmake#L53 - ./no-openssl-bundling.patch - ]; - - postPatch = '' - substituteInPlace ../mysql/cmake/libutils.cmake --replace-fail /usr/bin/libtool libtool - substituteInPlace ../mysql/cmake/os/Darwin.cmake --replace-fail /usr/bin/libtool libtool - - substituteInPlace cmake/libutils.cmake --replace-fail /usr/bin/libtool libtool - - ${lib.optionalString stdenv.hostPlatform.isDarwin '' - patch -d .. -p1 < ${./mysql-server-libcxx-21.patch} - ''} - ''; - - nativeBuildInputs = [ - pkg-config - cmake - git - bison - makeWrapper - ] - ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - cctools - darwin.DarwinTools - ]; - - buildInputs = [ - curl - libedit - libssh - lz4 - openssl - protobuf - readline - zlib - zstd - libevent - icu - re2 - ncurses - libfido2 - cyrus_sasl - openldap - python3 - antlr.runtime.cpp - ] - ++ pythonDeps - ++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ]; - - env = lib.optionalAttrs stdenv.cc.isGNU { - NIX_CFLAGS_COMPILE = "-Wno-error=maybe-uninitialized -Wno-error=array-bounds"; - }; - - preConfigure = '' - # Build MySQL - echo "Building mysqlclient mysqlxclient" - - cmake -DWITH_SYSTEM_LIBS=ON -DWITH_FIDO=system -DWITH_ROUTER=ON -DWITH_UNIT_TESTS=OFF \ - -DFORCE_UNSUPPORTED_COMPILER=1 -S ../mysql -B ../mysql/build - - cmake --build ../mysql/build --parallel ''${NIX_BUILD_CORES:-1} \ - --target mysqlclient mysqlxclient mysqlbinlog mysql_binlog_event_standalone mysqlrouter_all - - cmakeFlagsArray+=( - "-DMYSQL_SOURCE_DIR=''${NIX_BUILD_TOP}/mysql" - "-DMYSQL_BUILD_DIR=''${NIX_BUILD_TOP}/mysql/build" - "-DMYSQL_CONFIG_EXECUTABLE=''${NIX_BUILD_TOP}/mysql/build/scripts/mysql_config" - "-DWITH_ZSTD=system" - "-DWITH_LZ4=system" - "-DWITH_ZLIB=system" - "-DWITH_PROTOBUF=system" - "-DHAVE_PYTHON=1" - ) - ''; - - postFixup = '' - wrapProgram $out/bin/mysqlsh --set PYTHONPATH "${lib.makeSearchPath python3.sitePackages pythonDeps}" - ''; - - meta = { - homepage = "https://dev.mysql.com/doc/mysql-shell/${lib.versions.majorMinor finalAttrs.version}/en/"; - description = "New command line scriptable shell for MySQL"; - license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ aaronjheng ]; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - mainProgram = "mysqlsh"; - }; -}) diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix deleted file mode 100644 index a164013d3b8c..000000000000 --- a/pkgs/games/openra/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ callPackage }: - -let - openRaUpdater = callPackage ./updater.nix { }; - buildOpenRAEngine = callPackage ./build-engine.nix { inherit openRaUpdater; }; - callPackage' = path: callPackage path { inherit buildOpenRAEngine; }; -in -{ - engines = { - release = callPackage' ./engines/release; - bleed = callPackage' ./engines/bleed; - }; -} diff --git a/pkgs/misc/barebox/default.nix b/pkgs/misc/barebox/default.nix new file mode 100644 index 000000000000..bc9c04a62f2c --- /dev/null +++ b/pkgs/misc/barebox/default.nix @@ -0,0 +1,121 @@ +{ + stdenv, + lib, + fetchurl, + bison, + dtc, + flex, + libusb1, + lzop, + openssl, + pkg-config, + buildPackages, + lz4, +}: + +let + defaultVersion = "2026.06.1"; + defaultSrc = fetchurl { + url = "https://www.barebox.org/download/barebox-${defaultVersion}.tar.bz2"; + sha256 = "sha256-h1KzdSgZ7EqvhIodBt8FJCpklUUl+xW2zwezw91+vX8="; + }; + + buildBarebox = lib.makeOverridable ( + { + version ? null, + src ? null, + filesToInstall, + installDir ? "$out", + defconfig, + extraMeta ? { }, + ... + }@args: + stdenv.mkDerivation (finalAttrs: { + pname = "barebox-${defconfig}"; + strictDeps = true; + + version = if version == null then defaultVersion else version; + src = if src == null then defaultSrc else src; + + postPatch = '' + patchShebangs scripts + ''; + + nativeBuildInputs = [ + bison + dtc + flex + lz4 + lzop + openssl + pkg-config + ]; + + buildInputs = [ + libusb1 + lzop + openssl + ]; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + hardeningDisable = [ "all" ]; + + makeFlags = [ + "DTC=dtc" + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" + ]; + + configurePhase = '' + runHook preConfigure + + make ${defconfig} + + runHook postConfigure + ''; + + installPhase = '' + runHook preInstall + + mkdir -p ${installDir} + cp ${lib.concatStringsSep " " filesToInstall} ${installDir} + + runHook postInstall + ''; + + enableParallelBuilding = true; + + __structuredAttrs = true; + + dontStrip = true; + + meta = + with lib; + { + homepage = "https://www.barebox.org"; + description = "Swiss Army Knive for bare metal"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ emantor ]; + } + // extraMeta; + }) + // removeAttrs args [ "extraMeta" ] + ); +in +{ + inherit buildBarebox; + + bareboxTools = buildBarebox { + defconfig = "hosttools_defconfig"; + installDir = "$out/bin"; + extraMeta.platforms = lib.platforms.linux; + filesToInstall = [ + "scripts/bareboximd" + "scripts/imx/imx-usb-loader" + "scripts/omap4_usbboot" + "scripts/omap3-usb-loader" + "scripts/kwboot" + "scripts/rk-usb-loader" + ]; + }; +} diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index c76095e59333..a62db4fe6473 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -25,18 +25,18 @@ "lts": true }, "6.12": { - "version": "6.12.95", - "hash": "sha256:1xmrsi0kimirky4cailnkkrbd72pp9n8irfx6lfmss8yrcgwbs59", + "version": "6.12.96", + "hash": "sha256:1hapz6xz7plq56jc0drbzcsfcm1amlnphwbfhl0klsxkb9finbkx", "lts": true }, "6.18": { - "version": "6.18.38", - "hash": "sha256:0igh9xy1lk2hv2jni00dqyy27j4zqh86waw7i65ryvnmmc4fa9mc", + "version": "6.18.39", + "hash": "sha256:1c4c3wf00pb8x4kxxrmn46n7mgpnnm78sfi2jx0yg5cxmv9f79x7", "lts": true }, "7.1": { - "version": "7.1.3", - "hash": "sha256:1p6iknvzmd04alrf49zn8mxw863v0yzgznyckfhl4llgx1lc0hdy", + "version": "7.1.4", + "hash": "sha256:0blfl34vi6vlcdjxd7mbhskl2p7i0zpgdy707a7d6xcn24m94qqw", "lts": false } } diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/fold-entity-row/add-babel-core-dependency.patch b/pkgs/servers/home-assistant/custom-lovelace-modules/fold-entity-row/add-babel-core-dependency.patch new file mode 100644 index 000000000000..7e3be994d38d --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/fold-entity-row/add-babel-core-dependency.patch @@ -0,0 +1,12 @@ +diff --git a/package.json b/package.json +index 1ec793b..74e538e 100644 +--- a/package.json ++++ b/package.json +@@ -12,6 +12,7 @@ + "author": "Thomas Lovén", + "license": "MIT", + "devDependencies": { ++ "@babel/core": "^7.0.0", + "@rollup/plugin-babel": "^6.0.4", + "@rollup/plugin-json": "^6.1.0", + "@rollup/plugin-node-resolve": "^16.0.1", diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/fold-entity-row/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/fold-entity-row/package.nix new file mode 100644 index 000000000000..2565249d66b2 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/fold-entity-row/package.nix @@ -0,0 +1,41 @@ +{ + buildNpmPackage, + fetchFromGitHub, + lib, +}: + +buildNpmPackage (finalAttrs: { + pname = "fold-entity-row"; + version = "2.3.2"; + + src = fetchFromGitHub { + owner = "thomasloven"; + repo = "lovelace-fold-entity-row"; + tag = "v.${finalAttrs.version}"; + hash = "sha256-pbH2XNVrZEq3U9Kugq0X5U/CT9LNaWP9su4qWk6oob0="; + }; + + patches = [ ./add-babel-core-dependency.patch ]; + + npmDepsFetcherVersion = 2; + npmFlags = [ "--legacy-peer-deps" ]; + npmDepsHash = "sha256-/pm5K088cOa1M/NqlOJ7RtrxKik95Me/d68yzem9ktI="; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp fold-entity-row.js $out + + runHook postInstall + ''; + + meta = { + description = "Fold away and hide rows in lovelace entities cards."; + homepage = "https://github.com/thomasloven/lovelace-fold-entity-row"; + changelog = "https://github.com/thomasloven/lovelace-fold-entity-row/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ rhoriguchi ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 378471172e4b..dbbd83852db0 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,15 +2,15 @@ builtins.mapAttrs (_: callPackage ./generic.nix) rec { wordpress = wordpress_7_0; wordpress_6_8 = { - version = "6.8.5"; - hash = "sha256-N/WVUQxI0W3t4L+lr6KcuK8S2/Dj00WyXElMFfjIHYE="; + version = "6.8.6"; + hash = "sha256-ID5C12xn+GprUynX8WLS5dl9iJyv13yDxYbqMDPB8P4="; }; wordpress_6_9 = { - version = "6.9.4"; - hash = "sha256-22EK2fVJ4Ku1rz49XGcpxY2HRDllTN8K/qQlsuqJXzU="; + version = "6.9.5"; + hash = "sha256-01h7VJpvXZDG5PQmj/xsI2cUY2Jc+ImiyBWnB86fXEE="; }; wordpress_7_0 = { - version = "7.0.1"; - hash = "sha256-3BBZLam1gMdSVjKFDgzO03GxMIGFOsKa/pO11bsA25g="; + version = "7.0.2"; + hash = "sha256-1KTSGd6mTGxo5i8v/D8zHFR1UQJG1sRPYftS83fSlbk="; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6c57e50796d..6b5218382f8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -505,13 +505,7 @@ with pkgs; mysql-shell_9 ; - mysql-shell-innovation = callPackage ../development/tools/mysql-shell/innovation.nix { - antlr = antlr4_10; - icu = icu77; - protobuf = protobuf_25.override { - abseil-cpp = abseil-cpp_202407; - }; - }; + mysql-shell-innovation = mysql-shell_9; # this is used by most `fetch*` functions repoRevToNameMaybe = lib.repoRevToName config.fetchedSourceNameDefault; @@ -8180,6 +8174,12 @@ with pkgs; ubootWandboard ; + # Upstream Barebox: + inherit (callPackage ../misc/barebox { }) + buildBarebox + bareboxTools + ; + usbrelay = callPackage ../os-specific/linux/usbrelay { }; usbrelayd = callPackage ../os-specific/linux/usbrelay/daemon.nix { }; @@ -10038,9 +10038,7 @@ with pkgs; openra_2019 = openraPackages_2019.engines.release; - openraPackages = recurseIntoAttrs (callPackage ../games/openra { }); - - openra = openraPackages.engines.release; + openraPackages = recurseIntoAttrs (callPackage ../by-name/op/openra/engines { }); papermcServers = callPackages ../games/papermc { };