diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 12731f8d80a1..bbc18fdeebea 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -24,6 +24,8 @@ jobs: with: app-id: ${{ vars.NIXPKGS_CI_APP_ID }} private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }} + permission-contents: write + permission-pull-requests: write - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml index 7b97922104bb..d2b33755687e 100644 --- a/.github/workflows/codeowners-v2.yml +++ b/.github/workflows/codeowners-v2.yml @@ -68,6 +68,8 @@ jobs: with: app-id: ${{ vars.OWNER_RO_APP_ID }} private-key: ${{ secrets.OWNER_RO_APP_PRIVATE_KEY }} + permission-administration: read + permission-members: read - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: @@ -101,6 +103,9 @@ jobs: with: app-id: ${{ vars.OWNER_APP_ID }} private-key: ${{ secrets.OWNER_APP_PRIVATE_KEY }} + permission-administration: read + permission-members: read + permission-pull-requests: write - name: Build review request package run: nix-build ci -A requestReviews diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index 44b5cabbd4b6..cf4b06557756 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -249,6 +249,9 @@ jobs: with: app-id: ${{ vars.OWNER_APP_ID }} private-key: ${{ secrets.OWNER_APP_PRIVATE_KEY }} + permission-administration: read + permission-members: read + permission-pull-requests: write - name: Download process result uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 diff --git a/.github/workflows/periodic-merge.yml b/.github/workflows/periodic-merge.yml index a64983022777..4a083b050e22 100644 --- a/.github/workflows/periodic-merge.yml +++ b/.github/workflows/periodic-merge.yml @@ -24,6 +24,8 @@ jobs: with: app-id: ${{ vars.NIXPKGS_CI_APP_ID }} private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }} + permission-contents: write + permission-pull-requests: write - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b87aa571356d..8f9192196fba 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6976,6 +6976,12 @@ githubId = 30512529; name = "Evils"; }; + evythedemon = { + name = "Evy Garden"; + github = "EvysGarden"; + githubId = 92547295; + email = "evysgarden@protonmail.com"; + }; ewok = { email = "ewok@ewok.ru"; github = "ewok-old"; diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index afd233d9efe4..f94370d3bebf 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -67,7 +67,11 @@ let hasAttrByPath (splitString "." component) cfg.config || useComponentPlatform component || useExplicitComponent component - || builtins.elem component (cfg.extraComponents ++ cfg.defaultIntegrations); + || builtins.elem component ( + cfg.extraComponents + ++ cfg.defaultIntegrations + ++ map (builtins.getAttr "domain") cfg.customComponents + ); # Final list of components passed into the package to include required dependencies extraComponents = filter useComponent availableComponents; @@ -718,6 +722,7 @@ in # Custom components, maintained manually. "amshan" + "benqprojector" ]; in { diff --git a/nixos/modules/services/web-apps/immich.nix b/nixos/modules/services/web-apps/immich.nix index b81e27d245f5..fa80c47305ba 100644 --- a/nixos/modules/services/web-apps/immich.nix +++ b/nixos/modules/services/web-apps/immich.nix @@ -37,6 +37,7 @@ let RestrictNamespaces = true; RestrictRealtime = true; RestrictSUIDSGID = true; + UMask = "0077"; }; inherit (lib) types @@ -353,6 +354,21 @@ in }; }; + systemd.tmpfiles.settings = { + immich = { + # Redundant to the `UMask` service config setting on new installs, but installs made in + # early 24.11 created world-readable media storage by default, which is a privacy risk. This + # fixes those installs. + "${cfg.mediaLocation}" = { + e = { + user = cfg.user; + group = cfg.group; + mode = "0700"; + }; + }; + }; + }; + users.users = mkIf (cfg.user == "immich") { immich = { name = "immich"; diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 3079a20c5176..c30755d32ab3 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -142,7 +142,7 @@ let 'class' => '\\OC\\Files\\ObjectStore\\S3', 'arguments' => [ 'bucket' => '${s3.bucket}', - 'autocreate' => ${boolToString s3.autocreate}, + 'verify_bucket_exists' => ${boolToString s3.verify_bucket_exists}, 'key' => '${s3.key}', 'secret' => nix_read_secret('${s3.secretFile}'), ${optionalString (s3.hostname != null) "'hostname' => '${s3.hostname}',"} @@ -277,6 +277,10 @@ in [ "services" "nextcloud" "extraOptions" ] [ "services" "nextcloud" "settings" ] ) + (mkRenamedOptionModule + [ "services" "nextcloud" "config" "objectstore" "s3" "autocreate" ] + [ "services" "nextcloud" "config" "objectstore" "s3" "verify_bucket_exists" ] + ) ]; options.services.nextcloud = { @@ -568,10 +572,11 @@ in The name of the S3 bucket. ''; }; - autocreate = mkOption { + verify_bucket_exists = mkOption { type = types.bool; + default = true; description = '' - Create the objectstore if it does not exist. + Create the objectstore bucket if it does not exist. ''; }; key = mkOption { diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index 44f40069bd34..fa379dbd53a0 100644 --- a/pkgs/applications/audio/qpwgraph/default.nix +++ b/pkgs/applications/audio/qpwgraph/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "qpwgraph"; - version = "0.8.3"; + version = "0.9.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-adgUpX2xfjf61//SUfhUU4NCP048q0WsTM4YkUny0UE="; + sha256 = "sha256-KNYP/290UdgjuduOnRfI71VSHIuO+7kTeCJo+Qs8Nks="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 4663e96610eb..9a38a6069739 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -32,11 +32,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "8.2"; + version = "8.4"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - hash = "sha256-1a0H3YYvrK4DBRxUxlNeVMftdAcxh4P8rRrS1wdv/+s="; + hash = "sha256-WtKSIrvVViTYfqZ3kosxBqdDEU1sb5tB82yXviqOYo0="; }; nativeBuildInputs = [ texinfo ] ++ lib.optional enableNls gettext; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 2d99e49f783a..9742d7b61790 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -71,7 +71,7 @@ let in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "7.3.3635.7"; + version = "7.3.3635.11"; suffix = { @@ -84,8 +84,8 @@ stdenv.mkDerivation rec { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-E/tvarNTUm0VZMxFM/FcZKM3U/psTyq4bJl2r6orpeY="; - x86_64-linux = "sha256-8Jy7L5BSWZVIFizW11pOfXhgeT9rP1Z2T0aDmC79fbQ="; + aarch64-linux = "sha256-w1/wWP3lZUQ5tBvv6XOCkoR1OCoByURBEvaaemsY19U="; + x86_64-linux = "sha256-kJNFPXiZekjofGtKFbGc85c8yQymhntkCBuhylwQBpE="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 31f27b230a7f..7e5913649b39 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -81,8 +81,8 @@ rec { thunderbird = thunderbird-esr; thunderbird-latest = common { - version = "137.0.1"; - sha512 = "387f04aff9380c7261c574e7ef2e4972d63ebfb2768e25aa41a5ee2f3a755780a84099532cf4c1b5635db3412ab543e9b17b0a0476ec06c547b2dc678f19795f"; + version = "137.0.2"; + sha512 = "6cc631d14780f1bf9224208881c14834cef078688ffa006f50dfdd3a4e81c95255fb455f530a09a0f296dc494af104aefe2414ac53c6b8c9956ca1a9d7a7e053"; updateScript = callPackage ./update.nix { attrPath = "thunderbirdPackages.thunderbird-latest"; diff --git a/pkgs/by-name/am/amazon-q-cli/package.nix b/pkgs/by-name/am/amazon-q-cli/package.nix index a5432f353e58..fb941a20c72e 100644 --- a/pkgs/by-name/am/amazon-q-cli/package.nix +++ b/pkgs/by-name/am/amazon-q-cli/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "amazon-q-cli"; - version = "1.7.3"; + version = "1.8.0"; src = fetchFromGitHub { owner = "aws"; repo = "amazon-q-developer-cli"; tag = "v${version}"; - hash = "sha256-Hi0klNNxtWlZvcqobb8Y2hLsw/Pck1YQZB4AYBmcNKI="; + hash = "sha256-fOz9oz+xNwX2Bzl6szgQ9oai6lqP+EzbaCNzHPUT2cA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-XK6B2OTCnWMow3KHWU6OK1HsyQW7apcLoYRP7viTte0="; + cargoHash = "sha256-H9bCke3vQDuS6RDEg8dzeFiBWCex64A8KSRhfgyp8e8="; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix index 552c128d38fa..108073ed580f 100644 --- a/pkgs/by-name/au/authentik/package.nix +++ b/pkgs/by-name/au/authentik/package.nix @@ -7,6 +7,7 @@ buildNpmPackage, buildGoModule, runCommand, + bash, chromedriver, openapi-generator-cli, nodejs, @@ -340,6 +341,8 @@ stdenvNoCC.mkDerivation { pname = "authentik"; inherit src version; + buildInputs = [ bash ]; + postPatch = '' rm Makefile patchShebangs lifecycle/ak diff --git a/pkgs/by-name/bo/boatswain/package.nix b/pkgs/by-name/bo/boatswain/package.nix index c5ee5f941cfa..0337b0fe65b3 100644 --- a/pkgs/by-name/bo/boatswain/package.nix +++ b/pkgs/by-name/bo/boatswain/package.nix @@ -1,68 +1,73 @@ { lib, stdenv, - fetchFromGitLab, - meson, - ninja, - pkg-config, - gtk4, - libgee, - libadwaita, - wrapGAppsHook4, - appstream-glib, + appstream, desktop-file-utils, - libpeas, - libportal-gtk4, + fetchFromGitLab, + glib, + graphene, + gtk4, gusb, hidapi, json-glib, + libadwaita, + libpeas2, + libportal-gtk4, libsecret, libsoup_3, - libpeas2, + meson, + ninja, + pkg-config, + wrapGAppsHook4, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "boatswain"; - version = "0.4.0"; + version = "5.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "boatswain"; - rev = version; - hash = "sha256-Yqf7NJMyE6mg1zJJCLrIr6Emwt/nvlLHLAEtCXqFT8M="; + tag = finalAttrs.version; + hash = "sha256-XE4MxaV9BXl5EQjumO/6HhRHfAyjjc5BeYFPAa+mdWY="; }; + strictDeps = true; + nativeBuildInputs = [ + appstream + desktop-file-utils + glib + gtk4 + json-glib + libpeas2 meson ninja pkg-config wrapGAppsHook4 - appstream-glib - desktop-file-utils ]; buildInputs = [ + graphene gtk4 - libadwaita - libgee - libpeas - libportal-gtk4 gusb hidapi - json-glib + libadwaita + libpeas2 + libportal-gtk4 libsecret libsoup_3 - libpeas2 ]; - meta = with lib; { + meta = { description = "Control Elgato Stream Deck devices"; homepage = "https://gitlab.gnome.org/World/boatswain"; + changelog = "https://gitlab.gnome.org/World/boatswain/-/releases/${finalAttrs.version}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ _0xMRTT ]; mainProgram = "boatswain"; - license = licenses.gpl3Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ _0xMRTT ]; + platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix index 0d11a4b64ec5..86bede7a095f 100644 --- a/pkgs/by-name/br/brave/package.nix +++ b/pkgs/by-name/br/brave/package.nix @@ -3,24 +3,24 @@ let pname = "brave"; - version = "1.77.97"; + version = "1.77.101"; allArchives = { aarch64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-1MIcibP89EMCOK4A9lbXxGgwvMKCB+3UxrT+UYiwmtk="; + hash = "sha256-/JY1eBLw3xTxeAinctlpTSbwk6QibPdMVhZcBkbe7G4="; }; x86_64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-6JO67t5yR2psvlYhOMERnMgta+YYTIQx/zen7y3B1Ec="; + hash = "sha256-mRbRGCsvkrNVfwYrlfgGyU94dEezFTI/ittkbVynp7Q="; }; aarch64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip"; - hash = "sha256-d2MQMf1twOhcAouIPpdjG5jB/tZ7FGi/lrRJZ/A/ibs="; + hash = "sha256-tn5HdMLoVRY1oLAYc/O2v2mVblb6KYud53yoHloEQ44="; }; x86_64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip"; - hash = "sha256-vEF26I1+nqBERFdZEKLcDZBDru0RXcwytvblRuqL8/M="; + hash = "sha256-HJel3HVz5MoOWXGTEH8Gu+Fq2Xur7xHXeZTUmWcWksk="; }; }; diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix index 86cb3cfe303c..70ff15a73817 100644 --- a/pkgs/by-name/cl/clash-verge-rev/package.nix +++ b/pkgs/by-name/cl/clash-verge-rev/package.nix @@ -87,6 +87,9 @@ let Guanran928 bot-wxt1221 ]; + knownVulnerabilities = [ + "https://github.com/clash-verge-rev/clash-verge-rev/issues/3428" + ]; platforms = [ "x86_64-linux" "aarch64-linux" diff --git a/pkgs/by-name/do/domination/package.nix b/pkgs/by-name/do/domination/package.nix index 4b236657ba25..d4d43547ffbf 100644 --- a/pkgs/by-name/do/domination/package.nix +++ b/pkgs/by-name/do/domination/package.nix @@ -30,16 +30,18 @@ let in stdenv.mkDerivation { pname = "domination"; - version = "1.3.1"; + version = "1.3.3"; # The .zip releases do not contain the build.xml file src = fetchsvn { url = "https://svn.code.sf.net/p/domination/code/Domination"; # There are no tags in the repository. - # Look for commits like "new version x.y.z info on website" - # or "website update for x.y.z". - rev = "2538"; - hash = "sha256-wsLBHkQc1SW+PToyCXIek6qRrRga2nLLkM+5msrnsBo="; + # Look for "(svn rev X)" at + # https://sourceforge.net/p/domination/code/HEAD/tree/Domination/ChangeLog.txt + # Alternatively, look for revs like "changelog update", + # "new version x.y.z info on website", or "website update for x.y.z". + rev = "2616"; + hash = "sha256-/h9TstRxMpeoEsIeSN0MRmyRsiBHomguIPch1Zda8s8="; }; nativeBuildInputs = [ @@ -96,6 +98,8 @@ stdenv.mkDerivation { domination-starts = nixosTests.domination; }; + passthru.updateScript = ./update.tcl; + meta = with lib; { homepage = "https://domination.sourceforge.net/"; downloadPage = "https://domination.sourceforge.net/download.shtml"; diff --git a/pkgs/by-name/do/domination/update.tcl b/pkgs/by-name/do/domination/update.tcl new file mode 100755 index 000000000000..3df285bd29b8 --- /dev/null +++ b/pkgs/by-name/do/domination/update.tcl @@ -0,0 +1,8 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i tclsh -p tcl common-updater-scripts curl + +set changelog_url https://sourceforge.net/p/domination/code/HEAD/tree/Domination/ChangeLog.txt?format=raw + +set changelog [exec -ignorestderr curl -Ls $changelog_url] +regexp {(\d+(\.\d+)*) \(\d+\.\d+\.\d+\) \(svn rev (\d+)\)} $changelog _ version _ rev +exec -ignorestderr update-source-version domination $version --rev=$rev diff --git a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix index 732b2cc0676d..2cf6c048791f 100644 --- a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix +++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix @@ -1,7 +1,7 @@ { - "version" = "1.11.97"; + "version" = "1.11.99"; "hashes" = { - "desktopSrcHash" = "sha256-4ea5C1I/bdGsy4CxsNB1GWL8RQnJpHr/MbIOB5Z+gFA="; - "desktopYarnHash" = "sha256-HI/aRf9pGao8m8z3oA0wdbjDQth3zijJeskV2D+KsgM="; + "desktopSrcHash" = "sha256-vfbCcRd2vwdH45qDpavSJksU71S3adnK6KYS4jwKUkk="; + "desktopYarnHash" = "sha256-AP/qoYiOfq7Etc9TqeNjXM1nAJ1FlgzT2fPIimybeEk="; }; } diff --git a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix index efbc4f9e8d79..a795680799a2 100644 --- a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix +++ b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix @@ -1,7 +1,7 @@ { - "version" = "1.11.97"; + "version" = "1.11.99"; "hashes" = { - "webSrcHash" = "sha256-x7VS4l2uwXq2wjZeGwnaENHlhwnVz5Gt3f55kiH2Zhk="; - "webYarnHash" = "sha256-uwuBwAZYjt3WsbUCM8q9PaiV5WxKSpyJyVzM8gJOhPo="; + "webSrcHash" = "sha256-yTOvvoTt6HnXq+QFshYjpt0q5hpcR8cjpxgoyBtS2X0="; + "webYarnHash" = "sha256-kgwM1zo7/lRS2g/4fHuT/Z/fExOg6hWAJ7xoKt7vYA8="; }; } diff --git a/pkgs/by-name/fc/fcgi/package.nix b/pkgs/by-name/fc/fcgi/package.nix index 95ab22961ce4..d9882080e7f5 100644 --- a/pkgs/by-name/fc/fcgi/package.nix +++ b/pkgs/by-name/fc/fcgi/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fcgi"; - version = "2.4.2"; + version = "2.4.5"; src = fetchFromGitHub { owner = "FastCGI-Archives"; repo = "fcgi2"; rev = finalAttrs.version; - hash = "sha256-4U/Mc2U7tK/fo4B9NBwYKzDuLApvSzWR4mqWzZ00H8o="; + hash = "sha256-DsL44onRIUnf99Y+hTjMOaEVp6cjbdqksm4V+1od6pU="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/by-name/gp/gpredict-unstable/package.nix b/pkgs/by-name/gp/gpredict-unstable/package.nix new file mode 100644 index 000000000000..b048563a747b --- /dev/null +++ b/pkgs/by-name/gp/gpredict-unstable/package.nix @@ -0,0 +1,26 @@ +{ + lib, + fetchFromGitHub, + goocanvas3, + nix-update-script, + gpredict, +}: + +(gpredict.override { + goocanvas2 = goocanvas3; +}).overrideAttrs + (finalAttrs: { + # Next version is 2.4.0 + version = "2.4.0-unstable-2024-09-17"; + + src = fetchFromGitHub { + owner = "csete"; + repo = "gpredict"; + rev = "91a4a3fb15e7eab0374d1bb7c859d386818b48ee"; + hash = "sha256-/XCJ+jCSY4o0OLVVY6OGvnmMw6aI/iQOhjyLYWPj7Ec="; + }; + + patches = [ ]; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + }) diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/by-name/gp/gpredict/package.nix similarity index 92% rename from pkgs/applications/science/astronomy/gpredict/default.nix rename to pkgs/by-name/gp/gpredict/package.nix index 7f0e0836d9ca..efefa509f622 100644 --- a/pkgs/applications/science/astronomy/gpredict/default.nix +++ b/pkgs/by-name/gp/gpredict/package.nix @@ -11,18 +11,18 @@ curl, goocanvas2, gpsd, - hamlib, + hamlib_4, wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gpredict"; version = "2.2.1"; src = fetchFromGitHub { owner = "csete"; repo = "gpredict"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+hgjImfT3nWMBYwde7+KC/hzd84pwQbpoJvaJSNG4E8="; }; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { gtk3 goocanvas2 gpsd - hamlib + hamlib_4 ]; meta = { @@ -69,12 +69,13 @@ stdenv.mkDerivation rec { well. Gpredict uses the SGP4/SDP4 algorithms, which are compatible with the NORAD Keplerian elements. ''; - license = lib.licenses.gpl2Only; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; homepage = "http://gpredict.oz9aec.net/"; maintainers = with lib.maintainers; [ markuskowa cmcdragonkai + pandapip1 ]; }; -} +}) diff --git a/pkgs/by-name/je/jetbrains-toolbox/package.nix b/pkgs/by-name/je/jetbrains-toolbox/package.nix index 02041695eb18..d52400feecd1 100644 --- a/pkgs/by-name/je/jetbrains-toolbox/package.nix +++ b/pkgs/by-name/je/jetbrains-toolbox/package.nix @@ -1,88 +1,114 @@ { - stdenv, lib, - fetchzip, - copyDesktopItems, - makeWrapper, - runCommand, + stdenv, appimageTools, + fetchzip, + fetchurl, + makeWrapper, icu, - genericUpdater, - writeShellScript, + undmg, }: + let pname = "jetbrains-toolbox"; - version = "2.5.1.34629"; + version = "2.6.1.40902"; - src = fetchzip { - url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz"; - hash = "sha256-YaMlvgktoa738grHarJX2Uh5PZ7qHuASyJBcUhMssEI="; - stripRoot = false; - }; + updateScript = ./update.sh; - appimageContents = - runCommand "${pname}-extracted" - { - nativeBuildInputs = [ appimageTools.appimage-exec ]; - } - '' - appimage-exec.sh -x $out ${src}/jetbrains-toolbox-${version}/jetbrains-toolbox - - # JetBrains ship a broken desktop file. Despite registering a custom - # scheme handler for jetbrains:// URLs, they never mark the command as - # being suitable for passing URLs to. Ergo, the handler never receives - # its payload. This causes various things to break, including login. - # Reported upstream at: https://youtrack.jetbrains.com/issue/TBX-11478/ - sed -Ei '/^Exec=/s/( %U)?$/ %U/' $out/jetbrains-toolbox.desktop - ''; - - appimage = appimageTools.wrapAppImage { - inherit pname version; - src = appimageContents; - }; -in -stdenv.mkDerivation { - inherit - pname - version - src - appimage - ; - - nativeBuildInputs = [ - makeWrapper - copyDesktopItems - ]; - - installPhase = '' - runHook preInstall - - install -Dm644 ${appimageContents}/.DirIcon $out/share/icons/hicolor/scalable/apps/jetbrains-toolbox.svg - makeWrapper ${appimage}/bin/jetbrains-toolbox $out/bin/jetbrains-toolbox \ - --append-flags "--update-failed" \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ icu ]} - - runHook postInstall - ''; - - desktopItems = [ "${appimageContents}/jetbrains-toolbox.desktop" ]; - - # Disabling the tests, this seems to be very difficult to test this app. - doCheck = false; - - passthru.updateScript = genericUpdater { - versionLister = writeShellScript "jetbrains-toolbox-versionLister" '' - curl -Ls 'https://data.services.jetbrains.com/products?code=TBA&release.type=release' \ - | jq -r '.[] | .releases | flatten[] | .build' - ''; - }; - - meta = with lib; { + meta = { description = "Jetbrains Toolbox"; homepage = "https://jetbrains.com/"; - license = licenses.unfree; - maintainers = with maintainers; [ AnatolyPopov ]; - platforms = [ "x86_64-linux" ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ AnatolyPopov ]; + platforms = [ + "aarch64-linux" + "aarch64-darwin" + "x86_64-linux" + "x86_64-darwin" + ]; mainProgram = "jetbrains-toolbox"; }; -} + + selectSystem = + attrs: + attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + linux = appimageTools.wrapAppImage rec { + inherit pname version meta; + + source = + let + arch = selectSystem { + x86_64-linux = ""; + aarch64-linux = "-arm64"; + }; + in + fetchzip { + url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}${arch}.tar.gz"; + hash = selectSystem { + x86_64-linux = "sha256-P4kv6ca6mGtl334HKNkdo9Iib/Cgu3ROrbQKlQqxUj4="; + aarch64-linux = "sha256-mG8GAVPi2I0A13rKhXoXxiRIHK1QOWPv4gZxfm0+DKs="; + }; + }; + + src = appimageTools.extractType2 { + inherit pname version; + src = source + "/jetbrains-toolbox"; + postExtract = '' + patchelf --add-rpath ${lib.makeLibraryPath [ icu ]} $out/jetbrains-toolbox + ''; + }; + + nativeBuildInputs = [ makeWrapper ]; + + extraInstallCommands = '' + install -Dm644 ${src}/jetbrains-toolbox.desktop $out/share/applications/jetbrains-toolbox.desktop + install -Dm644 ${src}/.DirIcon $out/share/icons/hicolor/scalable/apps/jetbrains-toolbox.svg + wrapProgram $out/bin/jetbrains-toolbox \ + --append-flags "--update-failed" + ''; + + passthru = { + src = source; + inherit updateScript; + }; + }; + + darwin = stdenv.mkDerivation (finalAttrs: { + inherit pname version meta; + + src = + let + arch = selectSystem { + x86_64-darwin = ""; + aarch64-darwin = "-arm64"; + }; + in + fetchurl { + url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${finalAttrs.version}${arch}.dmg"; + hash = selectSystem { + x86_64-darwin = "sha256-Dw1CqthgvKIlHrcQIoOpYbAG5c6uvq/UgzaO4n25YJY="; + aarch64-darwin = "sha256-b/z8Pq8h6n34junSMyxRS3Y/TQ3tu05Bh77xlvMvEtI="; + }; + }; + + nativeBuildInputs = [ undmg ]; + + sourceRoot = "JetBrains Toolbox.app"; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications $out/bin + cp -r . $out/Applications/"JetBrains Toolbox.app" + ln -s $out/Applications/"JetBrains Toolbox.app"/Contents/MacOS/jetbrains-toolbox $out/bin/jetbrains-toolbox + + runHook postInstall + ''; + + passthru = { + inherit updateScript; + }; + }); +in +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/by-name/je/jetbrains-toolbox/update.sh b/pkgs/by-name/je/jetbrains-toolbox/update.sh new file mode 100755 index 000000000000..a6b1d812c9d9 --- /dev/null +++ b/pkgs/by-name/je/jetbrains-toolbox/update.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash nix curl coreutils jq common-updater-scripts + +set -eou pipefail + +latestVersion=$(curl -Ls 'https://data.services.jetbrains.com/products?code=TBA&release.type=release' | jq -r '.[0].releases | flatten | .[0].build') +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; jetbrains-toolbox.version or (lib.getVersion jetbrains-toolbox)" | tr -d '"') + +echo "latest version: $latestVersion" +echo "current version: $currentVersion" + +if [[ "$latestVersion" == "$currentVersion" ]]; then + echo "package is up-to-date" + exit 0 +fi + +linux_systems=( + "x86_64-linux:" + "aarch64-linux:-arm64" +) + +for entry in "${linux_systems[@]}"; do + arch="${entry%%:*}" + suffix="${entry#*:}" + prefetch=$(nix-prefetch-url --unpack "https://download.jetbrains.com/toolbox/jetbrains-toolbox-$latestVersion$suffix.tar.gz") + hash=$(nix hash convert --hash-algo sha256 --to sri $prefetch) + update-source-version jetbrains-toolbox $latestVersion $hash --system=$arch --ignore-same-version +done + +darwin_systems=( + "x86_64-darwin:" + "aarch64-darwin:-arm64" +) + +for entry in "${darwin_systems[@]}"; do + arch="${entry%%:*}" + suffix="${entry#*:}" + prefetch=$(nix-prefetch-url "https://download.jetbrains.com/toolbox/jetbrains-toolbox-$latestVersion$suffix.dmg") + hash=$(nix hash convert --hash-algo sha256 --to sri $prefetch) + update-source-version jetbrains-toolbox $latestVersion $hash --system=$arch --ignore-same-version +done diff --git a/pkgs/by-name/lo/lockbook-desktop/package.nix b/pkgs/by-name/lo/lockbook-desktop/package.nix index e50876658ad2..06e6a6f40b87 100644 --- a/pkgs/by-name/lo/lockbook-desktop/package.nix +++ b/pkgs/by-name/lo/lockbook-desktop/package.nix @@ -18,17 +18,17 @@ let in rustPlatform.buildRustPackage rec { pname = "lockbook-desktop"; - version = "0.9.21"; + version = "0.9.22"; src = fetchFromGitHub { owner = "lockbook"; repo = "lockbook"; tag = version; - hash = "sha256-SRmfLxF78jR1a/37pU1TLM6nFpmYLRbHJzQIVQtM8/M="; + hash = "sha256-akCtnPLJupoo7n3Vfyl37fjCmK4dHB0bt92rie6k0dQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-faqbsxXF2AjDE+FMkD1PihacPAvQlD6nkczN4QdsCeM="; + cargoHash = "sha256-xH3GIwh3zaLbpZqvzM+KM+K14fWj241RTwUM7dWRCKA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/lo/lockbook/package.nix b/pkgs/by-name/lo/lockbook/package.nix index bf9c911ae031..d4d5da794911 100644 --- a/pkgs/by-name/lo/lockbook/package.nix +++ b/pkgs/by-name/lo/lockbook/package.nix @@ -7,17 +7,17 @@ }: rustPlatform.buildRustPackage rec { pname = "lockbook"; - version = "0.9.21"; + version = "0.9.22"; src = fetchFromGitHub { owner = "lockbook"; repo = "lockbook"; tag = version; - hash = "sha256-SRmfLxF78jR1a/37pU1TLM6nFpmYLRbHJzQIVQtM8/M="; + hash = "sha256-akCtnPLJupoo7n3Vfyl37fjCmK4dHB0bt92rie6k0dQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-faqbsxXF2AjDE+FMkD1PihacPAvQlD6nkczN4QdsCeM="; + cargoHash = "sha256-xH3GIwh3zaLbpZqvzM+KM+K14fWj241RTwUM7dWRCKA="; doCheck = false; # there are no cli tests cargoBuildFlags = [ diff --git a/pkgs/by-name/ma/mattermostLatest/package.nix b/pkgs/by-name/ma/mattermostLatest/package.nix index 42ae07ad0b6c..17814c92d431 100644 --- a/pkgs/by-name/ma/mattermostLatest/package.nix +++ b/pkgs/by-name/ma/mattermostLatest/package.nix @@ -11,8 +11,8 @@ mattermost.override { # and make sure the version regex is up to date here. # Ensure you also check ../mattermost/package.nix for ESR releases. regex = "^v(10\\.[0-9]+\\.[0-9]+)$"; - version = "10.7.0"; - srcHash = "sha256-T8lLF5AsJYALVijXOUxkSACa6h8W4HcqoML2+BPsEsY="; + version = "10.7.1"; + srcHash = "sha256-pUVy/l6C3ygwX2JMQmHEpiHwYEUBl1/k37gq2fLM0Os="; vendorHash = "sha256-B2vfHszOVKbkN7h0tQGeGzLdeuxQDgaFv9QWkQgGCWs="; npmDepsHash = "sha256-ZMgsfdmGtU3PgdmiY0xMCHh8dAOAmEFNbKcxXKO7CJc="; lockfileOverlay = '' diff --git a/pkgs/by-name/pd/pdm/package.nix b/pkgs/by-name/pd/pdm/package.nix index d12aeb100aeb..90f26352bfef 100644 --- a/pkgs/by-name/pd/pdm/package.nix +++ b/pkgs/by-name/pd/pdm/package.nix @@ -19,6 +19,12 @@ let hash = "sha256-UBdgFN+fvbjz+rp8+rog8FW2jwO/jCfUPV7UehJKiV8="; }; }); + # pdm requires hishel and subsequentially pytest-regressions -> matplotlib -> ghostscript -> jbig2dec which is AGPL only + matplotlib = super.matplotlib.override ({ enableGhostscript = false; }); + # avoid many extra dependencies + moto = super.moto.overridePythonAttrs (old: rec { + doCheck = false; + }); }; }; in diff --git a/pkgs/by-name/sd/sdl3-image/package.nix b/pkgs/by-name/sd/sdl3-image/package.nix new file mode 100644 index 000000000000..70754f72b4d0 --- /dev/null +++ b/pkgs/by-name/sd/sdl3-image/package.nix @@ -0,0 +1,84 @@ +{ + lib, + sdl3, + libavif, + libtiff, + libwebp, + stdenv, + cmake, + fetchFromGitHub, + validatePkgConfig, + libpng, + libjpeg, + nix-update-script, + # Boolean flags + enableTests ? true, + enableSTB ? true, + enableImageIO ? stdenv.hostPlatform.isDarwin, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "sdl3-image"; + version = "3.2.4"; + + outputs = [ + "lib" + "dev" + "out" + ]; + + src = fetchFromGitHub { + owner = "libsdl-org"; + repo = "SDL_image"; + tag = "release-${finalAttrs.version}"; + hash = "sha256-/orQ+YfH0CV8DOqXFMF9fOT4YaVpC1t55xM3j520Png="; + }; + + strictDeps = true; + doCheck = true; + + nativeBuildInputs = [ + cmake + validatePkgConfig + ]; + + buildInputs = + [ + sdl3 + libtiff + libwebp + libavif + ] + ++ (lib.optionals (!enableSTB) [ + libpng + libjpeg + ]); + + cmakeFlags = [ + # fail when a dependency could not be found + (lib.cmakeBool "SDLIMAGE_STRICT" true) + # disable shared dependencies as they're opened at runtime using SDL_LoadObject otherwise. + (lib.cmakeBool "SDLIMAGE_DEPS_SHARED" false) + # disable stbi + (lib.cmakeBool "SDLIMAGE_BACKEND_STB" enableSTB) + # enable imageio backend + (lib.cmakeBool "SDLIMAGE_BACKEND_IMAGEIO" enableImageIO) + # enable tests + (lib.cmakeBool "SDLIMAGE_TESTS" enableTests) + ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "release-(3\\..*)" + ]; + }; + + meta = { + description = "SDL image library"; + homepage = "https://github.com/libsdl-org/SDL_image"; + license = lib.licenses.zlib; + maintainers = [ lib.maintainers.evythedemon ]; + inherit (sdl3.meta) platforms; + }; +}) diff --git a/pkgs/by-name/sq/sql-formatter/package.nix b/pkgs/by-name/sq/sql-formatter/package.nix index aff70b2e0896..b0d04027dab2 100644 --- a/pkgs/by-name/sq/sql-formatter/package.nix +++ b/pkgs/by-name/sq/sql-formatter/package.nix @@ -11,18 +11,18 @@ }: stdenv.mkDerivation rec { pname = "sql-formatter"; - version = "15.4.3"; + version = "15.4.9"; src = fetchFromGitHub { owner = "sql-formatter-org"; repo = "sql-formatter"; rev = "v${version}"; - hash = "sha256-FMzNf++PXV136yetXlYJIXkP/i2iWLrcmar5/6NrXJk="; + hash = "sha256-rCM/RDyWGBAobsiODIujkcjkqM4uSFPdRfvPqgIJQaY="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-R3PDDWxNtPK18adtHB4Jjp451Mp2p+5Fw6A1xkC58oY="; + hash = "sha256-w+riBFsxqQ3BY2MF5yih1www+TMChneuTOS+sKWmlus="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix index 01119fde15a4..e4edb91ac049 100644 --- a/pkgs/by-name/st/stats/package.nix +++ b/pkgs/by-name/st/stats/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "stats"; - version = "2.11.21"; + version = "2.11.41"; src = fetchurl { url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg"; - hash = "sha256-EqgWHxiSpMpzxQkogfMX8wTlzIhlfcUIlTARlihjwgw="; + hash = "sha256-iW22uCyfx9sCX3GyVmYzyJIHylxIpgJLns2oHVFBwc4="; }; sourceRoot = "."; diff --git a/pkgs/by-name/ua/uair/package.nix b/pkgs/by-name/ua/uair/package.nix index 8dcdd62844fe..4b5f169e522f 100644 --- a/pkgs/by-name/ua/uair/package.nix +++ b/pkgs/by-name/ua/uair/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "uair"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "metent"; repo = pname; rev = "v${version}"; - hash = "sha256-s6st4rBuviH1DACui3dakRt90z3TphIS4ptMN3eHpr8="; + hash = "sha256-VytbtTQch8O5hCg3L3ANNOfFOyiQY1V7DvGMEKr1R04="; }; - cargoHash = "sha256-n7Kaha22Rh/5AGoHUiAxnaZvHtZ+rPsmLHiUYfA0YPE="; + cargoHash = "sha256-+926OTJ5rM791KzmAieemwBAQ0HJg85rYK7viHb1N/U="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/libraries/goocanvas/3.x.nix b/pkgs/development/libraries/goocanvas/3.x.nix index d1f6aaee52a8..4844be9c4a3a 100644 --- a/pkgs/development/libraries/goocanvas/3.x.nix +++ b/pkgs/development/libraries/goocanvas/3.x.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, pkg-config, gettext, gobject-introspection, @@ -13,7 +14,7 @@ gnome, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "goocanvas"; version = "3.0.0"; @@ -24,10 +25,21 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/goocanvas/${lib.versions.majorMinor version}/goocanvas-${version}.tar.xz"; + url = "mirror://gnome/sources/goocanvas/${lib.versions.majorMinor finalAttrs.version}/goocanvas-${finalAttrs.version}.tar.xz"; sha256 = "06j05g2lmwvklmv51xsb7gm7rszcarhm01sal41jfp0qzrbpa2k7"; }; + patches = [ + # This broke due to the introduction of anubis + /* + (fetchpatch { + url = "https://gitlab.gnome.org/Archive/goocanvas/-/commit/d025d0eeae1c5266063bdc1476dbdff121bcfa57.patch"; + hash = "sha256-9uqqC1uKZF9TDz5dfDTKSRCmjEiuvqkLnZ9w6U+q2TI="; + }) + */ + ./gcc14-fix.patch + ]; + nativeBuildInputs = [ pkg-config gettext @@ -47,17 +59,20 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - attrPath = "${pname}${lib.versions.major version}"; - packageName = pname; + attrPath = "${finalAttrs.pname}${lib.versions.major finalAttrs.version}"; + packageName = finalAttrs.pname; versionPolicy = "odd-unstable"; }; }; - meta = with lib; { + meta = { description = "Canvas widget for GTK based on the the Cairo 2D library"; homepage = "https://gitlab.gnome.org/Archive/goocanvas"; - license = licenses.lgpl2; # https://gitlab.gnome.org/GNOME/goocanvas/-/issues/12 - maintainers = with maintainers; [ bobby285271 ]; - platforms = platforms.unix; + license = lib.licenses.lgpl2Plus; # The license contains the "or later" clause + maintainers = with lib.maintainers; [ + bobby285271 + pandapip1 + ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/goocanvas/gcc14-fix.patch b/pkgs/development/libraries/goocanvas/gcc14-fix.patch new file mode 100644 index 000000000000..9745d83c421b --- /dev/null +++ b/pkgs/development/libraries/goocanvas/gcc14-fix.patch @@ -0,0 +1,36 @@ +From d025d0eeae1c5266063bdc1476dbdff121bcfa57 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Wed, 31 Jan 2024 17:44:59 +0100 +Subject: [PATCH] Fix building with GCC 14 + +GCC 14 becomes stricter regarging pointer types: + +goocanvasitemsimple.c: In function 'goo_canvas_item_simple_set_model': +goocanvasitemsimple.c:1539:15: error: assignment to 'GooCanvasItemModelSimple *' {aka 'struct _GooCanvasItemModelSimple *'} from incompatible pointer type 'GooCanvasItemModel *' {aka 'struct _GooCanvasItemModel *'} [-Wincompatible-pointer-types] + 1539 | item->model = g_object_ref (model); + | ^ +make[3]: *** [Makefile:595: goocanvasitemsimple.lo] Error 1 + +It looks like missing a pointer cast. + + +--- + src/goocanvasitemsimple.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/goocanvasitemsimple.c b/src/goocanvasitemsimple.c +index 19b3424..28edc77 100644 +--- a/src/goocanvasitemsimple.c ++++ b/src/goocanvasitemsimple.c +@@ -1536,7 +1536,7 @@ goo_canvas_item_simple_set_model (GooCanvasItemSimple *item, + goo_canvas_item_simple_free_data (item->simple_data); + g_slice_free (GooCanvasItemSimpleData, item->simple_data); + +- item->model = g_object_ref (model); ++ item->model = (GooCanvasItemModelSimple *) g_object_ref (model); + item->simple_data = &item->model->simple_data; + + if (accessibility_enabled) +-- +GitLab + diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix index 66bda00fe566..98f59e94943f 100644 --- a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix @@ -7,6 +7,7 @@ stdenv, lib, pkgsBuildBuild, + fetchpatch2, }: qtModule { @@ -20,12 +21,20 @@ qtModule { ]; strictDeps = true; - patches = [ - # prevent headaches from stale qmlcache data - ./disable-disk-cache.patch - # add version specific QML import path - ./use-versioned-import-path.patch - ]; + patches = + [ + # prevent headaches from stale qmlcache data + ./disable-disk-cache.patch + # add version specific QML import path + ./use-versioned-import-path.patch + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # The build attempts to sign qmltestrunner, which may already be signed, causing it to fail unless forced. + (fetchpatch2 { + url = "https://invent.kde.org/qt/qt/qtdeclarative/-/commit/8effbbcefd8cae27cd5da07b4ffe3aa86dad83bf.diff"; + hash = "sha256-wKrKXdr1ddshpRVIZZ/dsn87wjPXSaoUvXT9edlPtzA="; + }) + ]; cmakeFlags = [ diff --git a/pkgs/development/python-modules/benqprojector/default.nix b/pkgs/development/python-modules/benqprojector/default.nix new file mode 100644 index 000000000000..4dd1e9c0fea8 --- /dev/null +++ b/pkgs/development/python-modules/benqprojector/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + hatch-vcs, + pyserial, + pyserial-asyncio-fast, +}: + +buildPythonPackage rec { + pname = "benqprojector"; + version = "0.1.6"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rrooggiieerr"; + repo = "benqprojector.py"; + tag = version; + hash = "sha256-Ys2C44kr5gd6tXO51OFRx4YVKVRGLfFPCYDFGt+gN0c="; + }; + + build-system = [ + hatchling + hatch-vcs + ]; + + dependencies = [ + pyserial + pyserial-asyncio-fast + ]; + + # Test cases require an actual serial/telnet connection to a projector + doCheck = false; + + pythonImportsCheck = [ "benqprojector" ]; + + meta = rec { + description = "Python library to control BenQ projectors"; + homepage = "https://github.com/rrooggiieerr/benqprojector.py"; + changelog = "${homepage}/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ sephalon ]; + }; +} diff --git a/pkgs/development/tools/pnpm/fetch-deps/pnpm-config-hook.sh b/pkgs/development/tools/pnpm/fetch-deps/pnpm-config-hook.sh index 09652b8c6965..f66f06c0a867 100644 --- a/pkgs/development/tools/pnpm/fetch-deps/pnpm-config-hook.sh +++ b/pkgs/development/tools/pnpm/fetch-deps/pnpm-config-hook.sh @@ -44,11 +44,23 @@ pnpmConfigHook() { runHook prePnpmInstall - pnpm install \ + if ! pnpm install \ --offline \ --ignore-scripts \ "${pnpmInstallFlags[@]}" \ --frozen-lockfile + then + echo + echo "ERROR: pnpm failed to install dependencies" + echo + echo "If you see ERR_PNPM_NO_OFFLINE_TARBALL above this, follow these to fix the issue:" + echo '1. Set pnpmDeps.hash to "" (empty string)' + echo "2. Build the derivation and wait for it to fail with a hash mismatch" + echo "3. Copy the 'got: sha256-' value back into the pnpmDeps.hash field" + echo + + exit 1 + fi echo "Patching scripts" diff --git a/pkgs/development/tools/pnpm/generic.nix b/pkgs/development/tools/pnpm/generic.nix index d1048a25da42..54f463b1990b 100644 --- a/pkgs/development/tools/pnpm/generic.nix +++ b/pkgs/development/tools/pnpm/generic.nix @@ -10,6 +10,7 @@ withNode ? true, version, hash, + buildPackages, }: let majorVersion = lib.versions.major version; @@ -70,7 +71,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { passthru = let - fetchDepsAttrs = callPackages ./fetch-deps { pnpm = finalAttrs.finalPackage; }; + fetchDepsAttrs = callPackages ./fetch-deps { + pnpm = buildPackages."pnpm_${lib.versions.major version}"; + }; in { inherit (fetchDepsAttrs) fetchDeps configHook; diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index b584538eb42e..fab6f674d0cd 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,11 +1,11 @@ { "testing": { - "version": "6.15-rc2", - "hash": "sha256:0ldqjmafisf8dx5xhak9y7glwlrk07hppfpi27w2nb5845bqdwfz" + "version": "6.15-rc3", + "hash": "sha256:0pf83a8q4yxyz0wfnrwa14rdfcczll633qyn02n2pbqg7r5mxi61" }, "6.1": { - "version": "6.1.134", - "hash": "sha256:08xx0w5gz7w5hqsnpckmizi1zpg38iwfchj20163ivnxf3fhriv0" + "version": "6.1.135", + "hash": "sha256:1fbyjprj65b1blb033lcy9y4bkh9jb7m06h6qph739wnzzhpmlg9" }, "5.15": { "version": "5.15.180", @@ -20,19 +20,19 @@ "hash": "sha256:11dy6zvxnripwr4lfg357wdl70kcg5ljs3wxhz2klqpas60gbjqb" }, "6.6": { - "version": "6.6.87", - "hash": "sha256:1iks6msk4cajyy0khyhrwsdl123hr81n67xzdnhlgg6dvb1famw9" + "version": "6.6.88", + "hash": "sha256:0l0697dcfdjkl80c7x1nfvw3n6390nnbznlpfbg51sgp7sv8kpqr" }, "6.12": { - "version": "6.12.24", - "hash": "sha256:078c2gs7f4gzxhc1jr42bfwrfi4yq5f84l7r2bfn05crnp0l4cb4" + "version": "6.12.25", + "hash": "sha256:141visdf85iw011ncp77csmkahvn598lqvhi493a4g31dw7piby8" }, "6.13": { "version": "6.13.12", "hash": "sha256:0hhj49k3ksjcp0dg5yiahqzryjfdpr9c1a9ph6j9slzmkikbn7v1" }, "6.14": { - "version": "6.14.3", - "hash": "sha256:0ak5av0ykf8m65dmbihlcx9ahb1p8rgx6bm04acz0s15qcic7ili" + "version": "6.14.4", + "hash": "sha256:0fak7y9dr5rxzmi4m545kz7pyk2c91dkj4k7i2jgnl80ga6z4lll" } } diff --git a/pkgs/servers/home-assistant/custom-components/benqprojector/package.nix b/pkgs/servers/home-assistant/custom-components/benqprojector/package.nix new file mode 100644 index 000000000000..2ae968131d14 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/benqprojector/package.nix @@ -0,0 +1,29 @@ +{ + lib, + buildHomeAssistantComponent, + fetchFromGitHub, + benqprojector, +}: + +buildHomeAssistantComponent rec { + owner = "rrooggiieerr"; + domain = "benqprojector"; + version = "0.1.3"; + + src = fetchFromGitHub { + inherit owner; + repo = "homeassistant-benqprojector"; + tag = version; + hash = "sha256-iAFmXL10QqudECsS9u9w7KBETzu9aWCg1EBbFR1ff+o="; + }; + + dependencies = [ benqprojector ]; + + meta = rec { + description = "Home Assistant integration for BenQ projectors"; + homepage = "https://github.com/rrooggiieerr/homeassistant-benqprojector"; + changelog = "${homepage}/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ sephalon ]; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/sun2/package.nix b/pkgs/servers/home-assistant/custom-components/sun2/package.nix new file mode 100644 index 000000000000..b707d666ee26 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/sun2/package.nix @@ -0,0 +1,26 @@ +{ + lib, + buildHomeAssistantComponent, + fetchFromGitHub, +}: + +buildHomeAssistantComponent rec { + owner = "pnbruckner"; + domain = "sun2"; + version = "3.3.5"; + + src = fetchFromGitHub { + inherit owner; + repo = "ha-sun2"; + tag = version; + hash = "sha256-aR9tQw1d64RWuwc9QLhTP0z4TdaKeRfN0p7lMdWUpgw="; + }; + + meta = rec { + description = "Home Assistant Sun2 sensor"; + homepage = "https://github.com/pnbruckner/ha-sun2"; + changelog = "${homepage}/releases/tag/${version}"; + maintainers = with lib.maintainers; [ sephalon ]; + license = lib.licenses.unlicense; + }; +} diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 1f7f307b0a10..0dfd769106e1 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -23,19 +23,19 @@ let patchGoVersion = '' find . -name go.mod -not -path "./.bingo/*" -print0 | while IFS= read -r -d ''' line; do substituteInPlace "$line" \ - --replace-fail "go 1.23.7" "go 1.23.6" + --replace-fail "go 1.24.2" "go 1.23.6" done find . -name go.work -print0 | while IFS= read -r -d ''' line; do substituteInPlace "$line" \ - --replace-fail "go 1.23.7" "go 1.23.6" + --replace-fail "go 1.24.2" "go 1.23.6" done substituteInPlace Makefile \ - --replace-fail "GO_VERSION = 1.23.7" "GO_VERSION = 1.23.7" + --replace-fail "GO_VERSION = 1.24.2" "GO_VERSION = 1.23.7" ''; in buildGoModule rec { pname = "grafana"; - version = "11.3.5"; + version = "11.3.6"; subPackages = [ "pkg/cmd/grafana" @@ -47,7 +47,7 @@ buildGoModule rec { owner = "grafana"; repo = "grafana"; rev = "v${version}"; - hash = "sha256-k1Sj2lGnM1t7N+T0gtbKLTSWcQOWYZu409qUHiY+c7Q="; + hash = "sha256-OvK7OEiKgE9kfJCJt+LXklOfa0JWAv49rn1fnBDysQE="; }; # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22 @@ -102,7 +102,7 @@ buildGoModule rec { postPatch = patchGoVersion; - vendorHash = "sha256-N74L2ZgRx4KmbihTYZ6XRLpQSZxr072ON46UwNKxzuE="; + vendorHash = "sha256-yb2sNIkFL+PkxPUkzDP+rCqf59JGM8SxUySWa3Q3UTc="; proxyVendor = true; diff --git a/pkgs/tools/admin/fastlane/Gemfile b/pkgs/tools/admin/fastlane/Gemfile index ed9098c1e9d4..1fa8dbca63b1 100644 --- a/pkgs/tools/admin/fastlane/Gemfile +++ b/pkgs/tools/admin/fastlane/Gemfile @@ -1,4 +1,2 @@ source 'https://rubygems.org' gem 'fastlane' - -gem "abbrev", "~> 0.1.2" diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index 50f4212ec318..d9ca6d0777e2 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -5,26 +5,25 @@ GEM base64 nkf rexml - addressable (2.8.7) - public_suffix (>= 2.0.2, < 7.0) + addressable (2.8.6) + public_suffix (>= 2.0.2, < 6.0) artifactory (3.0.17) atomos (0.1.3) - aws-eventstream (1.3.2) - aws-partitions (1.1068.0) - aws-sdk-core (3.220.1) + aws-eventstream (1.3.0) + aws-partitions (1.909.0) + aws-sdk-core (3.191.6) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.992.0) - aws-sigv4 (~> 1.9) - base64 + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.99.0) - aws-sdk-core (~> 3, >= 3.216.0) - aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.182.0) - aws-sdk-core (~> 3, >= 3.216.0) + aws-sdk-kms (1.78.0) + aws-sdk-core (~> 3, >= 3.191.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.146.1) + aws-sdk-core (~> 3, >= 3.191.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.5) - aws-sigv4 (1.11.0) + aws-sigv4 (~> 1.8) + aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) base64 (0.2.0) @@ -34,13 +33,13 @@ GEM commander (4.6.0) highline (~> 2.0.0) declarative (0.0.20) - digest-crc (0.7.0) + digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) dotenv (2.8.1) emoji_regex (3.2.3) - excon (0.112.0) - faraday (1.10.4) + excon (0.110.0) + faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -59,17 +58,17 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.1.0) - multipart-post (~> 2.0) - faraday-net_http (1.0.2) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) faraday-retry (1.0.3) - faraday_middleware (1.2.1) + faraday_middleware (1.2.0) faraday (~> 1.0) - fastimage (2.4.0) - fastlane (2.227.0) + fastimage (2.3.1) + fastlane (2.220.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -85,7 +84,6 @@ GEM faraday-cookie_jar (~> 0.0.6) faraday_middleware (~> 1.0) fastimage (>= 2.1.0, < 3.0.0) - fastlane-sirp (>= 1.0.0) gh_inspector (>= 1.1.2, < 2.0.0) google-apis-androidpublisher_v3 (~> 0.3) google-apis-playcustomapp_v1 (~> 0.1) @@ -109,10 +107,8 @@ GEM tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) xcodeproj (>= 1.13.0, < 2.0.0) - xcpretty (~> 0.4.0) + xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) - fastlane-sirp (1.0.0) - sysrandom (~> 1.0) gh_inspector (1.1.3) google-apis-androidpublisher_v3 (0.54.0) google-apis-core (>= 0.11.0, < 2.a) @@ -130,12 +126,12 @@ GEM google-apis-core (>= 0.11.0, < 2.a) google-apis-storage_v1 (0.31.0) google-apis-core (>= 0.11.0, < 2.a) - google-cloud-core (1.8.0) + google-cloud-core (1.7.0) google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) - google-cloud-errors (1.5.0) + google-cloud-errors (1.4.0) google-cloud-storage (1.47.0) addressable (~> 2.8) digest-crc (~> 0.4) @@ -151,36 +147,34 @@ GEM os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) highline (2.0.3) - http-cookie (1.0.8) + http-cookie (1.0.5) domain_name (~> 0.5) - httpclient (2.9.0) - mutex_m + httpclient (2.8.3) jmespath (1.6.2) - json (2.10.2) - jwt (2.10.1) + json (2.7.2) + jwt (2.8.1) base64 - mini_magick (4.13.2) + mini_magick (4.12.0) mini_mime (1.1.5) multi_json (1.15.0) - multipart-post (2.4.1) - mutex_m (0.3.0) - nanaimo (0.4.0) + multipart-post (2.4.0) + nanaimo (0.3.0) naturally (2.2.1) nkf (0.2.0) - optparse (0.6.0) + optparse (0.4.0) os (1.1.4) - plist (3.7.2) - public_suffix (6.0.1) + plist (3.7.1) + public_suffix (5.0.5) rake (13.2.1) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.4.1) - rouge (3.28.0) + rexml (3.2.6) + rouge (2.0.7) ruby2_keywords (0.0.5) - rubyzip (2.4.1) + rubyzip (2.3.2) security (0.1.5) signet (0.19.0) addressable (~> 2.8) @@ -190,7 +184,6 @@ GEM simctl (1.6.10) CFPropertyList naturally - sysrandom (1.0.5) terminal-notifier (2.0.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) @@ -200,17 +193,17 @@ GEM tty-spinner (0.9.3) tty-cursor (~> 0.7) uber (0.1.0) - unicode-display_width (2.6.0) + unicode-display_width (2.5.0) word_wrap (1.0.0) - xcodeproj (1.27.0) + xcodeproj (1.24.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.4.0) - rexml (>= 3.3.6, < 4.0) - xcpretty (0.4.0) - rouge (~> 3.28.0) + nanaimo (~> 0.3.0) + rexml (~> 3.2.4) + xcpretty (0.3.0) + rouge (~> 2.0.7) xcpretty-travis-formatter (1.0.1) xcpretty (~> 0.2, >= 0.0.7) @@ -221,4 +214,4 @@ DEPENDENCIES fastlane BUNDLED WITH - 2.6.2 + 2.5.6 diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index 7565ccee0a62..eb46a8fe55c5 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -5,10 +5,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6"; + sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr"; type = "gem"; }; - version = "2.8.7"; + version = "2.8.6"; }; artifactory = { groups = [ "default" ]; @@ -35,37 +35,36 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1mvjjn8vh1c3nhibmjj9qcwxagj6m9yy961wblfqdmvhr9aklb3y"; + sha256 = "0gvdg4yx4p9av2glmp7vsxhs0n8fj1ga9kq2xdb8f95j7b04qhzi"; type = "gem"; }; - version = "1.3.2"; + version = "1.3.0"; }; aws-partitions = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lmnx4sa9wm9ffqsjbybxzlgz6h4clf96s694sdn2lz1qcx0fq2i"; + sha256 = "00iknq94smbskgmxqmlxlcgpq5famd968l12nvv8bxi7gk1hagsk"; type = "gem"; }; - version = "1.1068.0"; + version = "1.909.0"; }; aws-sdk-core = { dependencies = [ "aws-eventstream" "aws-partitions" "aws-sigv4" - "base64" "jmespath" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0cjdqmy5hjbgzc0iac1i143va76qgp7jc7hg1aviy1n8cgywq44y"; + sha256 = "08h9apxdn2aflkg751j4i56ks4750znfbj56w4zlxf4jk7jxkbyk"; type = "gem"; }; - version = "3.220.1"; + version = "3.191.6"; }; aws-sdk-kms = { dependencies = [ @@ -76,10 +75,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1a3mh89kfh6flqxw48wfv9wfwkj2zxazw096mqm56wnnzz1jyads"; + sha256 = "0fbp2vw5qnyiya63hlmwiqkbh30lipyqplancmhm84ad7i98ambb"; type = "gem"; }; - version = "1.99.0"; + version = "1.78.0"; }; aws-sdk-s3 = { dependencies = [ @@ -91,10 +90,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "03a55dbihv6xvgfwhx0f35rwc7q3rr0555vfpxlwpdjw75wkbz6h"; + sha256 = "1al80phz4x9wwfnr07q1l8h5f0qxgfrrycbg8jvznhxm3zhrakrq"; type = "gem"; }; - version = "1.182.0"; + version = "1.146.1"; }; aws-sigv4 = { dependencies = [ "aws-eventstream" ]; @@ -102,10 +101,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1nx1il781qg58nwjkkdn9fw741cjjnixfsh389234qm8j5lpka2h"; + sha256 = "1g3w27wzjy4si6kp49w10as6ml6g6zl3xrfqs5ikpfciidv9kpc4"; type = "gem"; }; - version = "1.11.0"; + version = "1.8.0"; }; babosa = { groups = [ "default" ]; @@ -199,10 +198,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "01wcsyhaadss4zzvqh12kvbq3hmkl5y4fck7pr608hd24qxc5bb4"; + sha256 = "09114ndpnnyamc2q07bmpzw7kp3rbbfv7plmxcbzzi9d6prmd92w"; type = "gem"; }; - version = "0.7.0"; + version = "0.6.5"; }; domain_name = { groups = [ "default" ]; @@ -239,10 +238,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1w7098hnyby5sn2315qy26as6kxlxivxlcrs714amj9g9hxaryfs"; + sha256 = "1m3gzvp1wqki0yh4b7761qhdy4pyr4phy429b7s9w25nrkhp4lsz"; type = "gem"; }; - version = "0.112.0"; + version = "0.110.0"; }; faraday = { dependencies = [ @@ -262,10 +261,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "069gmdh5j90v06rbwlqvlhzhq45lxhx74mahz25xd276rm0wb153"; + sha256 = "1c760q0ks4vj4wmaa7nh1dgvgqiwaw0mjr7v8cymy7i3ffgjxx90"; type = "gem"; }; - version = "1.10.4"; + version = "1.10.3"; }; faraday-cookie_jar = { dependencies = [ @@ -327,20 +326,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0l87r9jg06nsh24gwwd1jdnxb1zq89ffybnxab0dd90nfcf0ysw5"; + sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh"; type = "gem"; }; - version = "1.1.0"; + version = "1.0.4"; }; faraday-net_http = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "10n6wikd442mfm15hd6gzm0qb527161w1wwch4h5m4iclkz2x6b3"; + sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.1"; }; faraday-net_http_persistent = { groups = [ "default" ]; @@ -388,20 +387,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1s990pnapb3vci9c00bklqc7jjix4i2zhxn2zf1lfk46xv47hnyl"; + sha256 = "1bw8mfh4yin2xk7138rg3fhb2p5g2dlmdma88k82psah9mbmvlfy"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.0"; }; fastimage = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1s67b9n7ki3iaycypq8sh02377gjkaxadg4dq53bpgfk4xg3gkjz"; + sha256 = "1sfc7svf7h1ja6zmsq9f3ps6pg0q4hymphh6rk7ipmp7ygqjkii3"; type = "gem"; }; - version = "2.4.0"; + version = "2.3.1"; }; fastlane = { dependencies = [ @@ -419,7 +418,6 @@ "faraday-cookie_jar" "faraday_middleware" "fastimage" - "fastlane-sirp" "gh_inspector" "google-apis-androidpublisher_v3" "google-apis-playcustomapp_v1" @@ -450,21 +448,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "12lqn70c3v5h2z2svn1gickyhkhny6rwnm2xfrs3gmjc6pvfrqhb"; + sha256 = "14ywmlipmryzdxzn4235ah67hy06wh5hf32jbs3a9j7byc2x1kx3"; type = "gem"; }; - version = "2.227.0"; - }; - fastlane-sirp = { - dependencies = [ "sysrandom" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0hg6ql3g25f96fsmwr9xlxpn8afa7wvjampnrh1fqffhphjqyiv6"; - type = "gem"; - }; - version = "1.0.0"; + version = "2.220.0"; }; gh_inspector = { groups = [ "default" ]; @@ -548,10 +535,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1kw10897ardky1chwwsb8milygzcdi8qlqlhcnqwmkw9y75yswp5"; + sha256 = "0dagdfx3rnk9xplnj19gqpqn41fd09xfn8lp2p75psihhnj2i03l"; type = "gem"; }; - version = "1.8.0"; + version = "1.7.0"; }; google-cloud-env = { dependencies = [ "faraday" ]; @@ -569,10 +556,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0jvv9w8s4dqc4ncfa6c6qpdypz2wj8dmgpjd44jq2qhhij5y4sxm"; + sha256 = "056yw9cg771c1xqvw15wpdfdw9lz3m13fh5b6a3p1c9xaq7jwkhb"; type = "gem"; }; - version = "1.5.0"; + version = "1.4.0"; }; google-cloud-storage = { dependencies = [ @@ -626,21 +613,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "19hsskzk5zpv14mnf07pq71hfk1fsjwfjcw616pgjjzjbi2f0kxi"; + sha256 = "13rilvlv8kwbzqfb644qp6hrbsj82cbqmnzcvqip1p6vqx36sxbk"; type = "gem"; }; - version = "1.0.8"; + version = "1.0.5"; }; httpclient = { - dependencies = [ "mutex_m" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1j4qwj1nv66v3n9s4xqf64x2galvjm630bwa5xngicllwic5jr2b"; + sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; type = "gem"; }; - version = "2.9.0"; + version = "2.8.3"; }; jmespath = { groups = [ "default" ]; @@ -657,10 +643,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "01lbdaizhkxmrw4y8j3wpvsryvnvzmg0pfs56c52laq2jgdfmq1l"; + sha256 = "0b4qsi8gay7ncmigr0pnbxyb17y3h8kavdyhsh7nrlqwr35vb60q"; type = "gem"; }; - version = "2.10.2"; + version = "2.7.2"; }; jwt = { dependencies = [ "base64" ]; @@ -668,20 +654,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1i8wmzgb5nfhvkx1f6bhdwfm7v772172imh439v3xxhkv3hllhp6"; + sha256 = "02m3vza49pb9dirwpn8vmzbcypi3fc6l3a9dh253jwm1121g7ajb"; type = "gem"; }; - version = "2.10.1"; + version = "2.8.1"; }; mini_magick = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1nfxjpmka12ihbwd87d5k2hh7d2pv3aq95x0l2lh8gca1s72bmki"; + sha256 = "0slh78f9z6n0l1i2km7m48yz7l4fjrk88sj1f4mh1wb39sl2yc37"; type = "gem"; }; - version = "4.13.2"; + version = "4.12.0"; }; mini_mime = { groups = [ "default" ]; @@ -708,30 +694,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1a5lrlvmg2kb2dhw3lxcsv6x276bwgsxpnka1752082miqxd0wlq"; + sha256 = "1033p35166d9p97y4vajbbvr13pmkk9zwn7sylxpmk9jrpk8ri67"; type = "gem"; }; - version = "2.4.1"; - }; - mutex_m = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0l875dw0lk7b2ywa54l0wjcggs94vb7gs8khfw9li75n2sn09jyg"; - type = "gem"; - }; - version = "0.3.0"; + version = "2.4.0"; }; nanaimo = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "08q73nchv8cpk28h1sdnf5z6a862fcf4mxy1d58z25xb3dankw7s"; + sha256 = "0xi36h3f7nm8bc2k0b6svpda1lyank2gf872lxjbhw3h95hdrbma"; type = "gem"; }; - version = "0.4.0"; + version = "0.3.0"; }; naturally = { groups = [ "default" ]; @@ -758,10 +734,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1306kdvq0xr333xma4452zvvvw6mx7fw20fwi6508i6dq5lh9s95"; + sha256 = "1pmsn1g1q5fpkjrc4h1wlw6lxlqp165sdcd951xyl47n6k0az17m"; type = "gem"; }; - version = "0.6.0"; + version = "0.4.0"; }; os = { groups = [ "default" ]; @@ -778,20 +754,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0hlaf4b3d8grxm9fqbnam5gwd55wvghl0jyzjd1hc5hirhklaynk"; + sha256 = "0b643i5b7b7galvlb2fc414ifmb78b5lsq47gnvhzl8m27dl559z"; type = "gem"; }; - version = "3.7.2"; + version = "3.7.1"; }; public_suffix = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31"; + sha256 = "14y4vzjwf5gp0mqgs880kis0k7n2biq8i6ci6q2n315kichl1hvj"; type = "gem"; }; - version = "6.0.1"; + version = "5.0.5"; }; rake = { groups = [ "default" ]; @@ -833,20 +809,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7"; + sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; type = "gem"; }; - version = "3.4.1"; + version = "3.2.6"; }; rouge = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "080fswzii68wnbsg7pgq55ba7p289sqjlxwp4vch0h32qy1f8v8d"; + sha256 = "0sfikq1q8xyqqx690iiz7ybhzx87am4w50w8f2nq36l3asw4x89d"; type = "gem"; }; - version = "3.28.0"; + version = "2.0.7"; }; ruby2_keywords = { groups = [ "default" ]; @@ -863,10 +839,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "05an0wz87vkmqwcwyh5rjiaavydfn5f4q1lixcsqkphzvj7chxw5"; + sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; type = "gem"; }; - version = "2.4.1"; + version = "2.3.2"; }; security = { groups = [ "default" ]; @@ -908,16 +884,6 @@ }; version = "1.6.10"; }; - sysrandom = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0x8yryf6migjnkfwr8dxgx1qyzhvajgha60hr5mgfkn65qyarhas"; - type = "gem"; - }; - version = "1.0.5"; - }; terminal-notifier = { groups = [ "default" ]; platforms = [ ]; @@ -995,10 +961,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj"; + sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky"; type = "gem"; }; - version = "2.6.0"; + version = "2.5.0"; }; word_wrap = { groups = [ "default" ]; @@ -1023,10 +989,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1lslz1kfb8jnd1ilgg02qx0p0y6yiq8wwk84mgg2ghh58lxsgiwc"; + sha256 = "1wpg4n7b8571j2h8h7v2kk8pr141rgf6m8mhk221k990fissrq56"; type = "gem"; }; - version = "1.27.0"; + version = "1.24.0"; }; xcpretty = { dependencies = [ "rouge" ]; @@ -1034,10 +1000,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1lbwk77g28jjhin3qjrh7ldfsgf7aszi9j60mp8yz10i3wyqgvqj"; + sha256 = "1xq47q2h5llj7b54rws4796904vnnjz7qqnacdv7wlp3gdbwrivm"; type = "gem"; }; - version = "0.4.0"; + version = "0.3.0"; }; xcpretty-travis-formatter = { dependencies = [ "xcpretty" ]; diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix index fdbaad9861df..f0cd29ec0f32 100644 --- a/pkgs/tools/admin/meshcentral/default.nix +++ b/pkgs/tools/admin/meshcentral/default.nix @@ -9,11 +9,11 @@ }: yarn2nix-moretea.mkYarnPackage { - version = "1.1.43"; + version = "1.1.44"; src = fetchzip { - url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.43.tgz"; - sha256 = "0y6bqg03l0p0mkmmk6vh82gxjzsx1mkvjzwpyayrryn3hjaaih4k"; + url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.44.tgz"; + sha256 = "1rjn608czjn0f066wgakdzkz73wx0lrinrqs83j44h49qfqwxkl3"; }; patches = [ @@ -25,7 +25,7 @@ yarn2nix-moretea.mkYarnPackage { offlineCache = fetchYarnDeps { yarnLock = ./yarn.lock; - hash = "sha256-dkR48KS5Ykh/3RyTuzOQ9dUXLBhhIT0KYGIXTn+CUKA="; + hash = "sha256-WltJXI9hd2OIRuPrqjDoCsa6/zjRGydPYCeiVxZIcS8="; }; # Tarball has CRLF line endings. This makes patching difficult, so let's convert them. diff --git a/pkgs/tools/admin/meshcentral/package.json b/pkgs/tools/admin/meshcentral/package.json index 412495c43de0..213cb7460e26 100644 --- a/pkgs/tools/admin/meshcentral/package.json +++ b/pkgs/tools/admin/meshcentral/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "1.1.43", + "version": "1.1.44", "keywords": [ "Remote Device Management", "Remote Device Monitoring", diff --git a/pkgs/tools/admin/meshcentral/yarn.lock b/pkgs/tools/admin/meshcentral/yarn.lock index 82ccbe4cde7e..11e7b0199e46 100644 --- a/pkgs/tools/admin/meshcentral/yarn.lock +++ b/pkgs/tools/admin/meshcentral/yarn.lock @@ -48,24 +48,24 @@ "@smithy/util-utf8" "^2.0.0" tslib "^2.6.2" -"@aws-sdk/client-cognito-identity@3.775.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.775.0.tgz#2be72dd874f22fc9cb8a5ce9a1aefff4a658241e" - integrity sha512-AMGywI8C+kcSTWjftq9jgzkospF1A/QNd/h6zN+3uuS+3rZhkPIoPCpaQ0NSTYD49FTq8ALZzNKTqTEOnp+txA== +"@aws-sdk/client-cognito-identity@3.796.0": + version "3.796.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.796.0.tgz#8dcb4cb37789f887ed77e3fdcae8cfe1fff6cada" + integrity sha512-p8ZzHICnQaCL4oS16yHUCLH6/VkbmWP8p2P7vALncUYguHDE/oNcWNAARo56x3Qx0TbRCi0OD4KAwD6AhddMdg== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/core" "3.775.0" - "@aws-sdk/credential-provider-node" "3.775.0" + "@aws-sdk/core" "3.796.0" + "@aws-sdk/credential-provider-node" "3.796.0" "@aws-sdk/middleware-host-header" "3.775.0" "@aws-sdk/middleware-logger" "3.775.0" "@aws-sdk/middleware-recursion-detection" "3.775.0" - "@aws-sdk/middleware-user-agent" "3.775.0" + "@aws-sdk/middleware-user-agent" "3.796.0" "@aws-sdk/region-config-resolver" "3.775.0" "@aws-sdk/types" "3.775.0" - "@aws-sdk/util-endpoints" "3.775.0" + "@aws-sdk/util-endpoints" "3.787.0" "@aws-sdk/util-user-agent-browser" "3.775.0" - "@aws-sdk/util-user-agent-node" "3.775.0" + "@aws-sdk/util-user-agent-node" "3.796.0" "@smithy/config-resolver" "^4.1.0" "@smithy/core" "^3.2.0" "@smithy/fetch-http-handler" "^5.0.2" @@ -93,23 +93,23 @@ "@smithy/util-utf8" "^4.0.0" tslib "^2.6.2" -"@aws-sdk/client-sso@3.775.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.775.0.tgz#3b2af9433f4f9925d0031bf213525dc11a8263c7" - integrity sha512-vqG1S2ap77WP4D5qt4bEPE0duQ4myN+cDr1NeP8QpSTajetbkDGVo7h1VViYMcUoFUVWBj6Qf1X1VfOq+uaxbA== +"@aws-sdk/client-sso@3.796.0": + version "3.796.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.796.0.tgz#231fc98bd71c5e915e9060fba871a6d9d9ccb3d6" + integrity sha512-EJExg8mbwqP0VG+RNFV4ZPuUo7QsDsUfTnuFQY51V8iXrbOdV+PDLRr4psXj2fxvrLxc9AlGUMNqd/j4VZtQzA== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/core" "3.775.0" + "@aws-sdk/core" "3.796.0" "@aws-sdk/middleware-host-header" "3.775.0" "@aws-sdk/middleware-logger" "3.775.0" "@aws-sdk/middleware-recursion-detection" "3.775.0" - "@aws-sdk/middleware-user-agent" "3.775.0" + "@aws-sdk/middleware-user-agent" "3.796.0" "@aws-sdk/region-config-resolver" "3.775.0" "@aws-sdk/types" "3.775.0" - "@aws-sdk/util-endpoints" "3.775.0" + "@aws-sdk/util-endpoints" "3.787.0" "@aws-sdk/util-user-agent-browser" "3.775.0" - "@aws-sdk/util-user-agent-node" "3.775.0" + "@aws-sdk/util-user-agent-node" "3.796.0" "@smithy/config-resolver" "^4.1.0" "@smithy/core" "^3.2.0" "@smithy/fetch-http-handler" "^5.0.2" @@ -137,51 +137,51 @@ "@smithy/util-utf8" "^4.0.0" tslib "^2.6.2" -"@aws-sdk/core@3.775.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.775.0.tgz#5d22ba78f07c07b48fb4d5b18172b9a896c0cbd0" - integrity sha512-8vpW4WihVfz0DX+7WnnLGm3GuQER++b0IwQG35JlQMlgqnc44M//KbJPsIHA0aJUJVwJAEShgfr5dUbY8WUzaA== +"@aws-sdk/core@3.796.0": + version "3.796.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.796.0.tgz#6076b78772c1eb97ec6ea9064c85ce500e0aa889" + integrity sha512-tH8Sp7lCxISVoLnkyv4AouuXs2CDlMhTuesWa0lq2NX1f+DXsMwSBtN37ttZdpFMw3F8mWdsJt27X9h2Oq868A== dependencies: "@aws-sdk/types" "3.775.0" "@smithy/core" "^3.2.0" "@smithy/node-config-provider" "^4.0.2" "@smithy/property-provider" "^4.0.2" "@smithy/protocol-http" "^5.1.0" - "@smithy/signature-v4" "^5.0.2" + "@smithy/signature-v4" "^5.1.0" "@smithy/smithy-client" "^4.2.0" "@smithy/types" "^4.2.0" "@smithy/util-middleware" "^4.0.2" fast-xml-parser "4.4.1" tslib "^2.6.2" -"@aws-sdk/credential-provider-cognito-identity@3.775.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.775.0.tgz#d77403cf50aba0690c848903dd442368a401f479" - integrity sha512-fcyZzoCFp2u4NWXW8INA81kEEsWC7ZFzy5m/6t2RF1Gjt+1n2AlFQVqF73LeyEcaN+biNKq87kh94Btk0QdfHA== +"@aws-sdk/credential-provider-cognito-identity@3.796.0": + version "3.796.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.796.0.tgz#c037d35d8a8284fc4cc658da9e7a2498f3703f1f" + integrity sha512-plvMsQNWW1Jq7YRs8S6xHEbdn+kO/F+vDjCBrPaT4LhcDMsXqO/jcDNRuYOnPRBQsqjp7n7MM3oMhyY4fupa6g== dependencies: - "@aws-sdk/client-cognito-identity" "3.775.0" + "@aws-sdk/client-cognito-identity" "3.796.0" "@aws-sdk/types" "3.775.0" "@smithy/property-provider" "^4.0.2" "@smithy/types" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-env@3.775.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.775.0.tgz#b8c81818f4c62d89b5f04dc410ab9b48e954f22c" - integrity sha512-6ESVxwCbGm7WZ17kY1fjmxQud43vzJFoLd4bmlR+idQSWdqlzGDYdcfzpjDKTcivdtNrVYmFvcH1JBUwCRAZhw== +"@aws-sdk/credential-provider-env@3.796.0": + version "3.796.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.796.0.tgz#4ed6903814868b0f9daa8c8db449b1f1adcda041" + integrity sha512-kQzGKm4IOYYO6vUrai2JocNwhJm4Aml2BsAV+tBhFhhkutE7khf9PUucoVjB78b0J48nF+kdSacqzY+gB81/Uw== dependencies: - "@aws-sdk/core" "3.775.0" + "@aws-sdk/core" "3.796.0" "@aws-sdk/types" "3.775.0" "@smithy/property-provider" "^4.0.2" "@smithy/types" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-http@3.775.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.775.0.tgz#0fbc7f4e6cada37fc9b647de0d7c12a42a44bcc6" - integrity sha512-PjDQeDH/J1S0yWV32wCj2k5liRo0ssXMseCBEkCsD3SqsU8o5cU82b0hMX4sAib/RkglCSZqGO0xMiN0/7ndww== +"@aws-sdk/credential-provider-http@3.796.0": + version "3.796.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.796.0.tgz#7f36074021b2605dba4b758b4b0ca98fb5b965ad" + integrity sha512-wWOT6VAHIKOuHdKFGm1iyKvx7f6+Kc/YTzFWJPuT+l+CPlXR6ylP1UMIDsHHLKpMzsrh3CH77QDsjkhQrnKkfg== dependencies: - "@aws-sdk/core" "3.775.0" + "@aws-sdk/core" "3.796.0" "@aws-sdk/types" "3.775.0" "@smithy/fetch-http-handler" "^5.0.2" "@smithy/node-http-handler" "^4.0.4" @@ -192,18 +192,18 @@ "@smithy/util-stream" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-ini@3.775.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.775.0.tgz#64be57d4ef2a2ca9a685255969a5989759042f55" - integrity sha512-0gJc6cALsgrjeC5U3qDjbz4myIC/j49+gPz9nkvY+C0OYWt1KH1tyfiZUuCRGfuFHhQ+3KMMDSL229TkBP3E7g== +"@aws-sdk/credential-provider-ini@3.796.0": + version "3.796.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.796.0.tgz#6d5f260b93104b126e26919287a4e131d1cb8e75" + integrity sha512-qGWBDn9aO8avFfYU7daps7Sy6OglF1x0q0w48slt0KMXbHd2/LvKVIiYwyofYCXed0yzcEOF2IYm9FjXdcn+ug== dependencies: - "@aws-sdk/core" "3.775.0" - "@aws-sdk/credential-provider-env" "3.775.0" - "@aws-sdk/credential-provider-http" "3.775.0" - "@aws-sdk/credential-provider-process" "3.775.0" - "@aws-sdk/credential-provider-sso" "3.775.0" - "@aws-sdk/credential-provider-web-identity" "3.775.0" - "@aws-sdk/nested-clients" "3.775.0" + "@aws-sdk/core" "3.796.0" + "@aws-sdk/credential-provider-env" "3.796.0" + "@aws-sdk/credential-provider-http" "3.796.0" + "@aws-sdk/credential-provider-process" "3.796.0" + "@aws-sdk/credential-provider-sso" "3.796.0" + "@aws-sdk/credential-provider-web-identity" "3.796.0" + "@aws-sdk/nested-clients" "3.796.0" "@aws-sdk/types" "3.775.0" "@smithy/credential-provider-imds" "^4.0.2" "@smithy/property-provider" "^4.0.2" @@ -211,17 +211,17 @@ "@smithy/types" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-node@3.775.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.775.0.tgz#cfa9e4135d8480a38aa1e7590fac809fe6030703" - integrity sha512-D8Zre5W2sXC/ANPqCWPqwYpU1cKY9DF6ckFZyDrqlcBC0gANgpY6fLrBtYo2fwJsbj+1A24iIpBINV7erdprgA== +"@aws-sdk/credential-provider-node@3.796.0": + version "3.796.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.796.0.tgz#aa621e4f15d7317b351c1dbb896bfcabbc21db0c" + integrity sha512-WeNK7OWPrsOvhO3DAgpUO0FtmVghMaZ/IpPJHJ4Y0nBIsWOBXLrbZ2Y1mdT8N2bGGUaM91tJaV8Yf8COc3gvmA== dependencies: - "@aws-sdk/credential-provider-env" "3.775.0" - "@aws-sdk/credential-provider-http" "3.775.0" - "@aws-sdk/credential-provider-ini" "3.775.0" - "@aws-sdk/credential-provider-process" "3.775.0" - "@aws-sdk/credential-provider-sso" "3.775.0" - "@aws-sdk/credential-provider-web-identity" "3.775.0" + "@aws-sdk/credential-provider-env" "3.796.0" + "@aws-sdk/credential-provider-http" "3.796.0" + "@aws-sdk/credential-provider-ini" "3.796.0" + "@aws-sdk/credential-provider-process" "3.796.0" + "@aws-sdk/credential-provider-sso" "3.796.0" + "@aws-sdk/credential-provider-web-identity" "3.796.0" "@aws-sdk/types" "3.775.0" "@smithy/credential-provider-imds" "^4.0.2" "@smithy/property-provider" "^4.0.2" @@ -229,63 +229,65 @@ "@smithy/types" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-process@3.775.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.775.0.tgz#7ab90383f12461c5d20546e933924e654660542b" - integrity sha512-A6k68H9rQp+2+7P7SGO90Csw6nrUEm0Qfjpn9Etc4EboZhhCLs9b66umUsTsSBHus4FDIe5JQxfCUyt1wgNogg== +"@aws-sdk/credential-provider-process@3.796.0": + version "3.796.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.796.0.tgz#d22d8adf73985fb218ff74365cd86b71bbd64513" + integrity sha512-r4e8/4AdKn/qQbRVocW7oXkpoiuXdTv0qty8AASNLnbQnT1vjD1bvmP6kp4fbHPWgwY8I9h0Dqjp49uy9Bqyuw== dependencies: - "@aws-sdk/core" "3.775.0" + "@aws-sdk/core" "3.796.0" "@aws-sdk/types" "3.775.0" "@smithy/property-provider" "^4.0.2" "@smithy/shared-ini-file-loader" "^4.0.2" "@smithy/types" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-sso@3.775.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.775.0.tgz#fb0267025981b8d0b7ba55fdfb18742759708d64" - integrity sha512-du06V7u9HDmRuwZnRjf85shO3dffeKOkQplV5/2vf3LgTPNEI9caNomi/cCGyxKGOeSUHAKrQ1HvpPfOaI6t5Q== +"@aws-sdk/credential-provider-sso@3.796.0": + version "3.796.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.796.0.tgz#db9081637747162ed8c5b29c61a98b898eea3e99" + integrity sha512-RUYsQ1t6UdzkpZ7pocUt1l/9l9GCYCaopIhv0DU6CipA8rkWtoweKsLHKdv+8wE4p6gqDfDIHGam1ivswiCIzg== dependencies: - "@aws-sdk/client-sso" "3.775.0" - "@aws-sdk/core" "3.775.0" - "@aws-sdk/token-providers" "3.775.0" + "@aws-sdk/client-sso" "3.796.0" + "@aws-sdk/core" "3.796.0" + "@aws-sdk/token-providers" "3.796.0" "@aws-sdk/types" "3.775.0" "@smithy/property-provider" "^4.0.2" "@smithy/shared-ini-file-loader" "^4.0.2" "@smithy/types" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-web-identity@3.775.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.775.0.tgz#d0db1b0bc37c95c99d3728c71bbe76b734704e12" - integrity sha512-z4XLYui5aHsr78mbd5BtZfm55OM5V55qK/X17OPrEqjYDDk3GlI8Oe2ZjTmOVrKwMpmzXKhsakeFHKfDyOvv1A== +"@aws-sdk/credential-provider-web-identity@3.796.0": + version "3.796.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.796.0.tgz#8d19749fcf28f6603bb26a402f3f8e24797c35ba" + integrity sha512-dpmFJT4IyjT09vruvMu/rWQQjVreqdxAe8pLPpGhoeKyA1O6+PS73b+VNXKvD31rQT8e4g6dVpA6KMxNW63aag== dependencies: - "@aws-sdk/core" "3.775.0" - "@aws-sdk/nested-clients" "3.775.0" + "@aws-sdk/core" "3.796.0" + "@aws-sdk/nested-clients" "3.796.0" "@aws-sdk/types" "3.775.0" "@smithy/property-provider" "^4.0.2" "@smithy/types" "^4.2.0" tslib "^2.6.2" "@aws-sdk/credential-providers@^3.186.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.775.0.tgz#63567b6bdc04463b92e9cfa8926e7383e28ab0df" - integrity sha512-THvyeStdvd0z8Dv1lJ7KrMRiZkFfUktYQUvvFT45ph14jHC5oRoPColtLHz4JjuDN5QEQ5EGrbc6USADZu1k/w== + version "3.796.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.796.0.tgz#60a9544366a08e6e6dc69625a668cfd12b6501d9" + integrity sha512-thZw44Bk3pS0PW81QmPfNSliX5XfXHDlWRjPYHBx+eTlPtidyD5klJkkfF5fkQlpHPeP2KNLuRnr6bRu+uMirg== dependencies: - "@aws-sdk/client-cognito-identity" "3.775.0" - "@aws-sdk/core" "3.775.0" - "@aws-sdk/credential-provider-cognito-identity" "3.775.0" - "@aws-sdk/credential-provider-env" "3.775.0" - "@aws-sdk/credential-provider-http" "3.775.0" - "@aws-sdk/credential-provider-ini" "3.775.0" - "@aws-sdk/credential-provider-node" "3.775.0" - "@aws-sdk/credential-provider-process" "3.775.0" - "@aws-sdk/credential-provider-sso" "3.775.0" - "@aws-sdk/credential-provider-web-identity" "3.775.0" - "@aws-sdk/nested-clients" "3.775.0" + "@aws-sdk/client-cognito-identity" "3.796.0" + "@aws-sdk/core" "3.796.0" + "@aws-sdk/credential-provider-cognito-identity" "3.796.0" + "@aws-sdk/credential-provider-env" "3.796.0" + "@aws-sdk/credential-provider-http" "3.796.0" + "@aws-sdk/credential-provider-ini" "3.796.0" + "@aws-sdk/credential-provider-node" "3.796.0" + "@aws-sdk/credential-provider-process" "3.796.0" + "@aws-sdk/credential-provider-sso" "3.796.0" + "@aws-sdk/credential-provider-web-identity" "3.796.0" + "@aws-sdk/nested-clients" "3.796.0" "@aws-sdk/types" "3.775.0" + "@smithy/config-resolver" "^4.1.0" "@smithy/core" "^3.2.0" "@smithy/credential-provider-imds" "^4.0.2" + "@smithy/node-config-provider" "^4.0.2" "@smithy/property-provider" "^4.0.2" "@smithy/types" "^4.2.0" tslib "^2.6.2" @@ -319,36 +321,36 @@ "@smithy/types" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/middleware-user-agent@3.775.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.775.0.tgz#66950672df55ddb32062baa4d92c67b3b67dfa65" - integrity sha512-7Lffpr1ptOEDE1ZYH1T78pheEY1YmeXWBfFt/amZ6AGsKSLG+JPXvof3ltporTGR2bhH/eJPo7UHCglIuXfzYg== +"@aws-sdk/middleware-user-agent@3.796.0": + version "3.796.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.796.0.tgz#80149d7f9034d41d35de88d96a6b73c1cb06413b" + integrity sha512-IeNg+3jNWT37J45opi5Jx89hGF0lOnZjiNwlMp3rKq7PlOqy8kWq5J1Gxk0W3tIkPpuf68CtBs/QFrRXWOjsZw== dependencies: - "@aws-sdk/core" "3.775.0" + "@aws-sdk/core" "3.796.0" "@aws-sdk/types" "3.775.0" - "@aws-sdk/util-endpoints" "3.775.0" + "@aws-sdk/util-endpoints" "3.787.0" "@smithy/core" "^3.2.0" "@smithy/protocol-http" "^5.1.0" "@smithy/types" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/nested-clients@3.775.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.775.0.tgz#abf064391a0b967ad44a4657d6ffcea729f9014d" - integrity sha512-f37jmAzkuIhKyhtA6s0LGpqQvm218vq+RNMUDkGm1Zz2fxJ5pBIUTDtygiI3vXTcmt9DTIB8S6JQhjrgtboktw== +"@aws-sdk/nested-clients@3.796.0": + version "3.796.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.796.0.tgz#f13f3bd87b923561348394ac6a9010d74334cb7c" + integrity sha512-jJ8a0ldWtXh/ice7nldUjTqja7KYlSYk1pwfIIvJLIqEn2SvQHK/pyCINTmmOmFAWXMKBQBeWUMxo1pPYNytzQ== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/core" "3.775.0" + "@aws-sdk/core" "3.796.0" "@aws-sdk/middleware-host-header" "3.775.0" "@aws-sdk/middleware-logger" "3.775.0" "@aws-sdk/middleware-recursion-detection" "3.775.0" - "@aws-sdk/middleware-user-agent" "3.775.0" + "@aws-sdk/middleware-user-agent" "3.796.0" "@aws-sdk/region-config-resolver" "3.775.0" "@aws-sdk/types" "3.775.0" - "@aws-sdk/util-endpoints" "3.775.0" + "@aws-sdk/util-endpoints" "3.787.0" "@aws-sdk/util-user-agent-browser" "3.775.0" - "@aws-sdk/util-user-agent-node" "3.775.0" + "@aws-sdk/util-user-agent-node" "3.796.0" "@smithy/config-resolver" "^4.1.0" "@smithy/core" "^3.2.0" "@smithy/fetch-http-handler" "^5.0.2" @@ -388,12 +390,12 @@ "@smithy/util-middleware" "^4.0.2" tslib "^2.6.2" -"@aws-sdk/token-providers@3.775.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.775.0.tgz#0d2128b2c8985731dcf592c5b9334654ddd0556b" - integrity sha512-Q6MtbEhkOggVSz/dN89rIY/ry80U3v89o0Lrrc+Rpvaiaaz8pEN0DsfEcg0IjpzBQ8Owoa6lNWyglHbzPhaJpA== +"@aws-sdk/token-providers@3.796.0": + version "3.796.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.796.0.tgz#c31f1d522a1df01ecf3780e72de67d2fc0c8787b" + integrity sha512-Sxr/EqJBxOwLsXHv8C91N/Aao8Rgjn5bcpzplrTZ7wrfDrzqQfSCvjh7apCxdLYMKPBV+an75blCAd7JD4/bAg== dependencies: - "@aws-sdk/nested-clients" "3.775.0" + "@aws-sdk/nested-clients" "3.796.0" "@aws-sdk/types" "3.775.0" "@smithy/property-provider" "^4.0.2" "@smithy/shared-ini-file-loader" "^4.0.2" @@ -408,10 +410,10 @@ "@smithy/types" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/util-endpoints@3.775.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.775.0.tgz#2f6fd728c86aeb1fba38506161b2eb024de17c19" - integrity sha512-yjWmUgZC9tUxAo8Uaplqmq0eUh0zrbZJdwxGRKdYxfm4RG6fMw1tj52+KkatH7o+mNZvg1GDcVp/INktxonJLw== +"@aws-sdk/util-endpoints@3.787.0": + version "3.787.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.787.0.tgz#1398f0bd87f19e615ae920c73e16d9d5e5cb76d1" + integrity sha512-fd3zkiOkwnbdbN0Xp9TsP5SWrmv0SpT70YEdbb8wAj2DWQwiCmFszaSs+YCvhoCdmlR3Wl9Spu0pGpSAGKeYvQ== dependencies: "@aws-sdk/types" "3.775.0" "@smithy/types" "^4.2.0" @@ -435,12 +437,12 @@ bowser "^2.11.0" tslib "^2.6.2" -"@aws-sdk/util-user-agent-node@3.775.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.775.0.tgz#dbc34ff2d84e2c3d10466081cad005d49c3d9740" - integrity sha512-N9yhTevbizTOMo3drH7Eoy6OkJ3iVPxhV7dwb6CMAObbLneS36CSfA6xQXupmHWcRvZPTz8rd1JGG3HzFOau+g== +"@aws-sdk/util-user-agent-node@3.796.0": + version "3.796.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.796.0.tgz#72c2ea1f32d2eb1200e111f48fd8a3c005f5202c" + integrity sha512-9fQpNcHgVFitf1tbTT8V1xGRoRHSmOAWjrhevo6Tc0WoINMAKz+4JNqfVGWRE5Tmtpq0oHKo1RmvxXQQtJYciA== dependencies: - "@aws-sdk/middleware-user-agent" "3.775.0" + "@aws-sdk/middleware-user-agent" "3.796.0" "@aws-sdk/types" "3.775.0" "@smithy/node-config-provider" "^4.0.2" "@smithy/types" "^4.2.0" @@ -850,19 +852,19 @@ resolved "https://registry.yarnpkg.com/@google-cloud/projectify/-/projectify-4.0.0.tgz#d600e0433daf51b88c1fa95ac7f02e38e80a07be" integrity sha512-MmaX6HeSvyPbWGwFq7mXdo0uQZLGBYCwziiLIGq5JVX+/bdI3SAq6bP98trV5eTWfLuvsMcIC1YJOF2vfteLFA== -"@google-cloud/promisify@^4.0.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@google-cloud/promisify/-/promisify-4.1.0.tgz#df8b060f0121c6462233f5420738dcda09c6df4a" - integrity sha512-G/FQx5cE/+DqBbOpA5jKsegGwdPniU6PuIEMt+qxWgFxvxuFOzVmp6zYchtYuwAWV5/8Dgs0yAmjvNZv3uXLQg== +"@google-cloud/promisify@<4.1.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@google-cloud/promisify/-/promisify-4.0.0.tgz#a906e533ebdd0f754dca2509933334ce58b8c8b1" + integrity sha512-Orxzlfb9c67A15cq2JQEyVc7wEsmFBmHjZWZYQMUyJ1qivXyMwdyNOs9odi79hze+2zqdTtu1E19IM/FtqZ10g== "@google-cloud/storage@^7.7.0": - version "7.15.2" - resolved "https://registry.yarnpkg.com/@google-cloud/storage/-/storage-7.15.2.tgz#5371767d78064d4fec259594520be38f5f02ab06" - integrity sha512-+2k+mcQBb9zkaXMllf2wwR/rI07guAx+eZLWsGTDihW2lJRGfiqB7xu1r7/s4uvSP/T+nAumvzT5TTscwHKJ9A== + version "7.16.0" + resolved "https://registry.yarnpkg.com/@google-cloud/storage/-/storage-7.16.0.tgz#62c04ee4f80190992ef06cb033a90c054bcea575" + integrity sha512-7/5LRgykyOfQENcm6hDKP8SX/u9XxE5YOiWOkgkwcoO+cG8xT/cyOvp9wwN3IxfdYgpHs8CE7Nq2PKX2lNaEXw== dependencies: "@google-cloud/paginator" "^5.0.0" "@google-cloud/projectify" "^4.0.0" - "@google-cloud/promisify" "^4.0.0" + "@google-cloud/promisify" "<4.1.0" abort-controller "^3.0.0" async-retry "^1.3.3" duplexify "^4.1.3" @@ -877,17 +879,17 @@ uuid "^8.0.0" "@grpc/grpc-js@^1.10.9": - version "1.13.1" - resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.13.1.tgz#0fdd678dddc0d64d958ba7b420652fe62180ed50" - integrity sha512-z5nNuIs75S73ZULjPDe5QCNTiCv7FyBZXEVWOyAHtcebnuJf0g1SuueI3U1/z/KK39XyAQRUC+C9ZQJOtgHynA== + version "1.13.3" + resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.13.3.tgz#6ad08d186c2a8651697085f790c5c68eaca45904" + integrity sha512-FTXHdOoPbZrBjlVLHuKbDZnsTxXv2BlHF57xw6LuThXacXvtkahEPED0CKMk6obZDf65Hv4k3z62eyPNpvinIg== dependencies: "@grpc/proto-loader" "^0.7.13" "@js-sdsl/ordered-map" "^4.4.2" "@grpc/proto-loader@^0.7.13": - version "0.7.13" - resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.7.13.tgz#f6a44b2b7c9f7b609f5748c6eac2d420e37670cf" - integrity sha512-AiXO/bfe9bmxBjxxtYxFAXGZvMaN5s8kO+jBHAJCON8rJoB5YS/D6X7ZNc6XQkuHNmyl4CYaMI1fJ/Gn27RGGw== + version "0.7.15" + resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.7.15.tgz#4cdfbf35a35461fc843abe8b9e2c0770b5095e60" + integrity sha512-tMXdRCfYVixjuFK+Hk0Q1s38gV9zDiDJfWL3h1rv4Qc39oILCu1TRTDt7+fGUI8K4G1Fj125Hx/ru3azECWTyQ== dependencies: lodash.camelcase "^4.3.0" long "^5.0.0" @@ -1144,13 +1146,13 @@ localforage "^1.9.0" util "^0.12.4" -"@sendgrid/client@^8.1.4": - version "8.1.4" - resolved "https://registry.yarnpkg.com/@sendgrid/client/-/client-8.1.4.tgz#4db39e49d8ed732169d73b5d5c94d2b11907970d" - integrity sha512-VxZoQ82MpxmjSXLR3ZAE2OWxvQIW2k2G24UeRPr/SYX8HqWLV/8UBN15T2WmjjnEb5XSmFImTJOKDzzSeKr9YQ== +"@sendgrid/client@^8.1.5": + version "8.1.5" + resolved "https://registry.yarnpkg.com/@sendgrid/client/-/client-8.1.5.tgz#e6586c1ea02ec587b393c1f2a63d9eec8c94e34d" + integrity sha512-Jqt8aAuGIpWGa15ZorTWI46q9gbaIdQFA21HIPQQl60rCjzAko75l3D1z7EyjFrNr4MfQ0StusivWh8Rjh10Cg== dependencies: "@sendgrid/helpers" "^8.0.0" - axios "^1.7.4" + axios "^1.8.2" "@sendgrid/helpers@^8.0.0": version "8.0.0" @@ -1160,11 +1162,11 @@ deepmerge "^4.2.2" "@sendgrid/mail@*": - version "8.1.4" - resolved "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-8.1.4.tgz#0ba72906685eae1a1ef990cca31e962f1ece6928" - integrity sha512-MUpIZykD9ARie8LElYCqbcBhGGMaA/E6I7fEcG7Hc2An26QJyLtwOaKQ3taGp8xO8BICPJrSKuYV4bDeAJKFGQ== + version "8.1.5" + resolved "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-8.1.5.tgz#995ef96aaf4664d2f059ec6ca38f79f724d350f2" + integrity sha512-W+YuMnkVs4+HA/bgfto4VHKcPKLc7NiZ50/NH2pzO6UHCCFuq8/GNB98YJlLEr/ESDyzAaDr7lVE7hoBwFTT3Q== dependencies: - "@sendgrid/client" "^8.1.4" + "@sendgrid/client" "^8.1.5" "@sendgrid/helpers" "^8.0.0" "@sideway/address@^4.1.5": @@ -1394,10 +1396,10 @@ "@smithy/types" "^4.2.0" tslib "^2.6.2" -"@smithy/signature-v4@^5.0.2": - version "5.0.2" - resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-5.0.2.tgz#363854e946fbc5bc206ff82e79ada5d5c14be640" - integrity sha512-Mz+mc7okA73Lyz8zQKJNyr7lIcHLiPYp0+oiqiMNc/t7/Kf2BENs5d63pEj7oPqdjaum6g0Fc8wC78dY1TgtXw== +"@smithy/signature-v4@^5.1.0": + version "5.1.0" + resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-5.1.0.tgz#2c56e5b278482b04383d84ea2c07b7f0a8eb8f63" + integrity sha512-4t5WX60sL3zGJF/CtZsUQTs3UrZEDO2P7pEaElrekbLqkWPYkgqNW1oeiNYC6xXifBnT9dVBOnNQRvOE9riU9w== dependencies: "@smithy/is-array-buffer" "^4.0.0" "@smithy/protocol-http" "^5.1.0" @@ -1673,11 +1675,11 @@ integrity sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA== "@types/node@*", "@types/node@>=13.7.0", "@types/node@^22.0.1", "@types/node@^22.5.4": - version "22.13.13" - resolved "https://registry.yarnpkg.com/@types/node/-/node-22.13.13.tgz#5e7d110fb509b0d4a43fbf48fa9d6e0f83e1b1e7" - integrity sha512-ClsL5nMwKaBRwPcCvH8E7+nU4GxHVx1axNvMZTFHMEfNI7oahimt26P5zjVCRrjiIWj6YFXfE1v3dEp94wLcGQ== + version "22.15.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-22.15.0.tgz#5fcf430c079da64e96028b87cbffc218a02685db" + integrity sha512-99S8dWD2DkeE6PBaEDw+In3aar7hdoBvjyJMR6vaKBTzpvR0P00ClzJMOoVrj9D2+Sy/YCwACYHnBTpMhg1UCA== dependencies: - undici-types "~6.20.0" + undici-types "~6.21.0" "@types/node@^14.14.14": version "14.18.63" @@ -1745,9 +1747,9 @@ "@types/webidl-conversions" "*" "@types/ws@^8.5.3": - version "8.18.0" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.18.0.tgz#8a2ec491d6f0685ceaab9a9b7ff44146236993b5" - integrity sha512-8svvI3hMyvN0kKCJMvTJP/x6Y/EoQbepff882wL+Sn5QsXb3etnamgrJq4isrBxSJj5L2AuXcI0+bgkoAXGUJw== + version "8.18.1" + resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.18.1.tgz#48464e4bf2ddfd17db13d845467f6070ffea4aa9" + integrity sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg== dependencies: "@types/node" "*" @@ -2009,9 +2011,9 @@ accepts@~1.3.8: negotiator "0.6.3" acebase-core@^1.27.5: - version "1.27.5" - resolved "https://registry.yarnpkg.com/acebase-core/-/acebase-core-1.27.5.tgz#58697bdeae60250d009619b07fb60fe8a8123d0e" - integrity sha512-mogTRyHg+5/TYp6puXcdhTUmupPLGyWSBpzf/1gXANEk/QffaPvEFGzolJ5fTIVFl3UhVoYcUj2jEDbQHmGGMQ== + version "1.28.1" + resolved "https://registry.yarnpkg.com/acebase-core/-/acebase-core-1.28.1.tgz#a99ee78a5a142d8aee59d06d4faa093999cb8cba" + integrity sha512-WfYdG3aeZag+p+wXgKpVNfu9FubuZenW5VDPtUP/qIlac1io+AWuctI5JNuG/plNkpNaTJjujoeTE9z6+Y3HnQ== optionalDependencies: rxjs ">= 5.x <= 7.x" @@ -2400,10 +2402,10 @@ axios@^0.27.2: follow-redirects "^1.14.9" form-data "^4.0.0" -axios@^1.2.2, axios@^1.7.4: - version "1.8.4" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.8.4.tgz#78990bb4bc63d2cae072952d374835950a82f447" - integrity sha512-eBSYY4Y68NNlHbHBMdeDmKNtDgXWhQsJcGqzO3iLUM0GraQFSS9cVgPX5I9b3lbdFKyYoAEGAZF1DwhTaljNAw== +axios@^1.2.2, axios@^1.8.2: + version "1.9.0" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.9.0.tgz#25534e3b72b54540077d33046f77e3b8d7081901" + integrity sha512-re4CqKTJaURpzbLHtIi6XpDv20/CnpXOtjRY5/CU32L8gU8ek9UIivcfvSWvmKEngmVbrUtPpdDwWDWL7DNHvg== dependencies: follow-redirects "^1.15.6" form-data "^4.0.0" @@ -2494,9 +2496,9 @@ big-integer@^1.6.48: integrity sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg== bignumber.js@^9.0.0, bignumber.js@^9.0.1: - version "9.1.2" - resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.2.tgz#b7c4242259c008903b13707983b5f4bbd31eda0c" - integrity sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug== + version "9.3.0" + resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.3.0.tgz#bdba7e2a4c1a2eba08290e8dcad4f36393c92acd" + integrity sha512-EM7aMFTXbptt/wZdMlBv2t8IViwQL+h6SLHosp8Yf0dqJMTnY6iL32opnAB6kAdL0SZPuvcAzFr31o0c/R3/RA== binary-extensions@^2.0.0: version "2.3.0" @@ -2783,9 +2785,9 @@ camelcase@^5.0.0: integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== caniuse-lite@^1.0.30001688: - version "1.0.30001707" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001707.tgz#c5e104d199e6f4355a898fcd995a066c7eb9bf41" - integrity sha512-3qtRjw/HQSMlDWf+X79N206fepf4SOOU6SQLMaq/0KkZLmSjPxAkBOQQ+FxbHKfHmYLZFfdWsO3KA90ceHPSnw== + version "1.0.30001715" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001715.tgz#bd325a37ad366e3fe90827d74062807a34fbaeb2" + integrity sha512-7ptkFGMm2OAOgvZpwgA4yjQ5SQbrNVGdRjzH0pBdy1Fasvcr+KAeECmbCAECzTuDuoX0FCY8KzUxjf9+9kfZEw== caseless@~0.12.0: version "0.12.0" @@ -3384,14 +3386,14 @@ destroy@1.2.0: integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== detect-libc@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.3.tgz#f0cd503b40f9939b894697d19ad50895e30cf700" - integrity sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw== + version "2.0.4" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.4.tgz#f04715b8ba815e53b4d8109655b6508a6865a7e8" + integrity sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA== discord-api-types@^0.37.114, discord-api-types@^0.37.119, discord-api-types@^0.37.12, discord-api-types@^0.37.41: - version "0.37.119" - resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.119.tgz#29e32f635351da32dd4c92defcafdeb65156ad33" - integrity sha512-WasbGFXEB+VQWXlo6IpW3oUv73Yuau1Ig4AZF/m13tXcTKnMpc/mHjpztIlz4+BM9FG9BHQkEXiPto3bKduQUg== + version "0.37.120" + resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.120.tgz#ad7209930509c4cee3efddbacc77a1b18cf66d34" + integrity sha512-7xpNK0EiWjjDFp2nAhHXezE4OUWm7s1zhc/UXXN6hnFFU8dfoPHgV0Hx0RPiCa3ILRpdeh152icc68DGCyXYIw== discord.js@14.6.0: version "14.6.0" @@ -3498,9 +3500,9 @@ ee-first@1.1.1: integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== electron-to-chromium@^1.5.73: - version "1.5.123" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.123.tgz#fae5bdba0ba27045895176327aa79831aba0790c" - integrity sha512-refir3NlutEZqlKaBLK0tzlVLe5P2wDKS7UQt/3SpibizgsRAPOsqQC3ffw1nlv3ze5gjRQZYHoPymgVZkplFA== + version "1.5.142" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.142.tgz#1de55d0d19b24b07768c4bfc90f41bd7f248d043" + integrity sha512-Ah2HgkTu/9RhTDNThBtzu2Wirdy4DC9b0sMT1pUhbkZQ5U/iwmE+PHZX1MpjD5IkJCc2wSghgGG/B04szAx07w== emoji-regex@^7.0.1: version "7.0.3" @@ -3551,10 +3553,10 @@ entities@^2.0.0: resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== -entities@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" - integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== +entities@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-6.0.0.tgz#09c9e29cb79b0a6459a9b9db9efb418ac5bb8e51" + integrity sha512-aKstq2TDOndCn4diEyp9Uq/Flu2i1GlLkc6XIDQSDMuaFE3OPW5OphLCyQ5SpSJZTb4reN+kTcYru5yIfXoRPw== env-paths@^2.2.0: version "2.2.1" @@ -4325,9 +4327,9 @@ google-auth-library@^9.0.0, google-auth-library@^9.3.0, google-auth-library@^9.6 jws "^4.0.0" google-gax@^4.3.3: - version "4.4.1" - resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-4.4.1.tgz#95a9cf7ee7777ac22d1926a45b5f886dd8beecae" - integrity sha512-Phyp9fMfA00J3sZbJxbbB4jC55b7DBjE3F6poyL3wKMEBVKA79q6BGuHcTiM28yOzVql0NDbRL8MLLh8Iwk9Dg== + version "4.6.0" + resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-4.6.0.tgz#455c94496d80ecf0cba113b0451a883b7bcee0fd" + integrity sha512-zKKLeLfcYBVOzzM48Brtn4EQkKcTli9w6c1ilzFK2NbJvcd4ATD8/XqFExImvE/W5IwMlKKwa5qqVufji3ioNQ== dependencies: "@grpc/grpc-js" "^1.10.9" "@grpc/proto-loader" "^0.7.13" @@ -4538,9 +4540,9 @@ html-encoding-sniffer@^3.0.0: whatwg-encoding "^2.0.0" html-entities@^2.5.2: - version "2.5.3" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.5.3.tgz#d8a0680bd24ee35af8c74d6d4b695627dde61c00" - integrity sha512-D3AfvN7SjhTgBSA8L1BN4FpPzuEd06uy4lHwSoRWr0lndi9BKaNzPLKGOWZ2ocSGguozr08TTb2jhCLHaemruw== + version "2.6.0" + resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.6.0.tgz#7c64f1ea3b36818ccae3d3fb48b6974208e984f8" + integrity sha512-kig+rMn/QOVRvr7c86gQ8lWXq+Hkv6CbAH1hLu+RG338StTpE8Z0b44SDVaqVu7HGKf27frdmUYEs9hTUX/cLQ== html-escaper@^2.0.0: version "2.0.2" @@ -4598,9 +4600,9 @@ http-errors@~1.8.1: toidentifier "1.0.1" http-parser-js@>=0.5.1: - version "0.5.9" - resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.9.tgz#b817b3ca0edea6236225000d795378707c169cec" - integrity sha512-n1XsPy3rXVxlqxVioEWdC+0+M+SQw0DpJynwtOPo1X+ZlvdzTLtDBIJJlDQTnwZIFJrZSzSGmIOUdP8tu+SgLw== + version "0.5.10" + resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.10.tgz#b3277bd6d7ed5588e20ea73bf724fcbe44609075" + integrity sha512-Pysuw9XpUq5dVc/2SMHpuTY01RFl8fttgcyunjL7eEMhGM3cI4eOmiCycJDVCo/7O7ClfQD3SaI6ftDzqOXYMA== http-proxy-agent@^4.0.1: version "4.0.1" @@ -5552,9 +5554,9 @@ logform@^2.7.0: triple-beam "^1.3.0" long@^5.0.0, long@^5.2.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/long/-/long-5.3.1.tgz#9d4222d3213f38a5ec809674834e0f0ab21abe96" - integrity sha512-ka87Jz3gcx/I7Hal94xaN2tZEOPoUOEVftkQqZx2EeQRN7LGdfLlI3FvZ+7WDplm+vK2Urx9ULrvSowtdCieng== + version "5.3.2" + resolved "https://registry.yarnpkg.com/long/-/long-5.3.2.tgz#1d84463095999262d7d7b7f8bfd4a8cc55167f83" + integrity sha512-mNAgZ1GmyNhD7AuqnTG3/VQ26o760+ZYBPKjPvugO8+nLbYfX6TVpJPseBvopbdY+qpZ/lKUnmEc1LeZYS3QAA== lossless-json@2.0.1: version "2.0.1" @@ -6225,9 +6227,9 @@ number-is-nan@^1.0.0: integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ== nwsapi@^2.2.4: - version "2.2.19" - resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.19.tgz#586660f7c24c34691907002309a8dc28064c9c0b" - integrity sha512-94bcyI3RsqiZufXjkr3ltkI86iEl+I7uiHVDtcq9wJUTwYQJ5odHDeSzkkrRzi80jJ8MaeZgqKjH1bAWAFw9bA== + version "2.2.20" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.20.tgz#22e53253c61e7b0e7e93cef42c891154bcca11ef" + integrity sha512-/ieB+mDe4MrrKMT8z+mQL8klXydZWGR5Dowt4RAGKbJ3kIGEx3X4ljUo+6V73IXtUPWgfOlU5B9MlGxFO5T+cA== nyc@^14.1.1: version "14.1.1" @@ -6500,11 +6502,11 @@ parse-passwd@^1.0.0: integrity sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q== parse5@^7.1.2: - version "7.2.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.2.1.tgz#8928f55915e6125f430cc44309765bf17556a33a" - integrity sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ== + version "7.3.0" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.3.0.tgz#d7e224fa72399c7a175099f45fc2ad024b05ec05" + integrity sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw== dependencies: - entities "^4.5.0" + entities "^6.0.0" parseurl@~1.3.3: version "1.3.3" @@ -6671,14 +6673,14 @@ performance-now@^2.1.0: integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow== pg-cloudflare@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/pg-cloudflare/-/pg-cloudflare-1.1.1.tgz#e6d5833015b170e23ae819e8c5d7eaedb472ca98" - integrity sha512-xWPagP/4B6BgFO+EKz3JONXv3YDgvkbVrGw2mTo3D6tVDQRh1e7cqVGvyR3BE+eQgAvx1XhW/iEASj4/jCWl3Q== + version "1.2.5" + resolved "https://registry.yarnpkg.com/pg-cloudflare/-/pg-cloudflare-1.2.5.tgz#2e3649c38a7a9c74a7e5327c8098a2fd9af595bd" + integrity sha512-OOX22Vt0vOSRrdoUPKJ8Wi2OpE/o/h9T8X1s4qSkCedbNah9ei2W2765be8iMVxQUsvgT7zIAT2eIa9fs5+vtg== pg-connection-string@^2.7.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.7.0.tgz#f1d3489e427c62ece022dba98d5262efcb168b37" - integrity sha512-PI2W9mv53rXJQEOb8xNR8lH7Hr+EKa6oJa38zsK0S/ky2er16ios1wLKhZyxzD7jUReiWokc9WK5nxSnC7W1TA== + version "2.8.5" + resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.8.5.tgz#82cefd0269cb64a09603342d9b69e8392e6eb6cd" + integrity sha512-Ni8FuZ8yAF+sWZzojvtLE2b03cqjO5jNULcHFfM9ZZ0/JXrgom5pBREbtnAw7oxsxJqHw9Nz/XWORUEL3/IFow== pg-int8@1.0.1: version "1.0.1" @@ -6686,14 +6688,14 @@ pg-int8@1.0.1: integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw== pg-pool@^3.8.0: - version "3.8.0" - resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.8.0.tgz#e6bce7fc4506a8d6106551363fc5283e5445b776" - integrity sha512-VBw3jiVm6ZOdLBTIcXLNdSotb6Iy3uOCwDGFAksZCXmi10nyRvnP2v3jl4d+IsLYRyXf6o9hIm/ZtUzlByNUdw== + version "3.9.5" + resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.9.5.tgz#73ee76bacc51f4bef5f9928a107ff15c98275fae" + integrity sha512-DxyAlOgvUzRFpFAZjbCc8fUfG7BcETDHgepFPf724B0i08k9PAiZV1tkGGgQIL0jbMEuR9jW1YN7eX+WgXxCsQ== pg-protocol@^1.8.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.8.0.tgz#c707101dd07813868035a44571488e4b98639d48" - integrity sha512-jvuYlEkL03NRvOoyoRktBK7+qU5kOvlAwvmrH8sr3wbLrOdVWsRxQfz8mMy9sZFsqJ1hEWNfdWKI4SAmoL+j7g== + version "1.9.5" + resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.9.5.tgz#e544eff37d6ab79c26281d7c0b59ac9be4862686" + integrity sha512-DYTWtWpfd5FOro3UnAfwvhD8jh59r2ig8bPtc9H8Ds7MscE/9NYruUQWFAOuraRl29jwcT2kyMFQ3MxeaVjUhg== pg-types@^2.1.0: version "2.2.0" @@ -6747,9 +6749,9 @@ pify@^4.0.1: integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== pirates@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9" - integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg== + version "4.0.7" + resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.7.tgz#643b4a18c4257c8a65104b73f3049ce9a0a15e22" + integrity sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA== pkg-dir@^3.0.0: version "3.0.0" @@ -6892,9 +6894,9 @@ proto3-json-serializer@^2.0.2: protobufjs "^7.2.5" protobufjs@^7.2.5, protobufjs@^7.2.6, protobufjs@^7.3.2: - version "7.4.0" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.4.0.tgz#7efe324ce9b3b61c82aae5de810d287bc08a248a" - integrity sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw== + version "7.5.0" + resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.5.0.tgz#a317ad80713e9db43c8e55afa8636a9aa76bb630" + integrity sha512-Z2E/kOY1QjoMlCytmexzYfDm/w5fKAiRwpSzGtdnXW1zC88Z2yXazHHrOtwCzn+7wSxyE8PYM4rvVcMphF9sOA== dependencies: "@protobufjs/aspromise" "^1.1.2" "@protobufjs/base64" "^1.1.2" @@ -8432,10 +8434,10 @@ unbox-primitive@^1.1.0: has-symbols "^1.1.0" which-boxed-primitive "^1.1.1" -undici-types@~6.20.0: - version "6.20.0" - resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.20.0.tgz#8171bf22c1f588d1554d55bf204bc624af388433" - integrity sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg== +undici-types@~6.21.0: + version "6.21.0" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb" + integrity sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ== undici@^5.11.0, undici@^5.22.0: version "5.29.0" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 990b66984152..50773b6cab1c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4078,10 +4078,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; - gpredict = callPackage ../applications/science/astronomy/gpredict { - hamlib = hamlib_4; - }; - gprof2dot = with python3Packages; toPythonApplication gprof2dot; grails = callPackage ../development/web/grails { jdk = null; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e59e190851e1..5d1637056aef 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1659,6 +1659,8 @@ self: super: with self; { beniget = callPackage ../development/python-modules/beniget { }; + benqprojector = callPackage ../development/python-modules/benqprojector { }; + bentoml = callPackage ../development/python-modules/bentoml { }; berkeleydb = callPackage ../development/python-modules/berkeleydb { };