From db58732cbe6646cc8e54d67e1bad554049f3159f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 6 Aug 2023 20:25:40 -0300 Subject: [PATCH 01/63] whitesur-kde: init at unstable-2023-08-15 --- pkgs/data/themes/whitesur-kde/default.nix | 49 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/data/themes/whitesur-kde/default.nix diff --git a/pkgs/data/themes/whitesur-kde/default.nix b/pkgs/data/themes/whitesur-kde/default.nix new file mode 100644 index 000000000000..2e98b4165c07 --- /dev/null +++ b/pkgs/data/themes/whitesur-kde/default.nix @@ -0,0 +1,49 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gitUpdater +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "whitesur-kde"; + version = "unstable-2023-08-15"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = finalAttrs.pname; + rev = "d50bc20b2b78705bb9856204066affb763fa8a35"; + hash = "sha256-oG6QT4VQpBznM+gvzdiY4CldOwdHcBeHlbvlc52eFuU="; + }; + + postPatch = '' + patchShebangs install.sh + + substituteInPlace install.sh \ + --replace '$HOME/.config' $out/share \ + --replace '$HOME/.local' $out \ + --replace '"$HOME"/.Xresources' $out/doc/.Xresources + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/doc + + name= ./install.sh + + mkdir -p $out/share/sddm/themes + cp -a sddm/WhiteSur $out/share/sddm/themes/ + + runHook postInstall + ''; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + description = "A MacOS big sur like theme for KDE Plasma desktop"; + homepage = "https://github.com/vinceliuice/WhiteSur-kde"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ed1020bb6e1..b6b5fec5d249 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29898,6 +29898,8 @@ with pkgs; whitesur-icon-theme = callPackage ../data/icons/whitesur-icon-theme { }; + whitesur-kde = callPackage ../data/themes/whitesur-kde { }; + wireless-regdb = callPackage ../data/misc/wireless-regdb { }; work-sans = callPackage ../data/fonts/work-sans { }; From ccbd98db50f27ff15014284f876beee2217bceae Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Sun, 18 Jun 2023 14:12:25 +0200 Subject: [PATCH 02/63] trivial-builders/applyPatches: carry `meta` information to the patched source There is no reason to not carry licenses and other information to any patched source. This should improve our metadata in those situations. --- pkgs/build-support/trivial-builders/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index 7c4d204df407..0b6bc4b61296 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -905,13 +905,17 @@ rec { ) + "-patched" , patches ? [] , postPatch ? "" - }: stdenvNoCC.mkDerivation { + , ... + }@args: stdenvNoCC.mkDerivation { inherit name src patches postPatch; preferLocalBuild = true; allowSubstitutes = false; phases = "unpackPhase patchPhase installPhase"; installPhase = "cp -R ./ $out"; - }; + } + # Carry `meta` information from the underlying `src` if present. + // (optionalAttrs (builtins.hasAttr "meta" src) src.meta) + // (removeAttrs args [ "src" "name" "patches" "postPatch" ]); /* An immutable file in the store with a length of 0 bytes. */ emptyFile = runCommand "empty-file" { From b4b1ce244338c3b8b66a6fd17f9dd3aa3e31f9ec Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Sun, 18 Jun 2023 14:13:35 +0200 Subject: [PATCH 03/63] fetchNextcloudApp: meta propagation for licenses, etc. This improves the metadata propgation for nc4nix-generated packages. Adds: - licenses (best effort given spdxId doesn't seem guaranteed here) - homepage - longDescription --- .../fetchnextcloudapp/default.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchnextcloudapp/default.nix b/pkgs/build-support/fetchnextcloudapp/default.nix index a7a3066ffab3..29a3f727a082 100644 --- a/pkgs/build-support/fetchnextcloudapp/default.nix +++ b/pkgs/build-support/fetchnextcloudapp/default.nix @@ -1,10 +1,20 @@ -{ stdenv, fetchzip, applyPatches, ... }: +{ stdenv, fetchzip, applyPatches, lib, ... }: { url , sha256 +, licenses , patches ? [ ] , name ? null , version ? null +, description ? null +, homepage ? null }: +let + # TODO: do something better + licenseMap = { + "agpl" = lib.licenses.agpl3Only; + "apache" = lib.licenses.asl20; + }; +in if name != null || version != null then throw '' `pkgs.fetchNextcloudApp` has been changed to use `fetchzip`. To update, please @@ -23,5 +33,11 @@ else applyPatches { fi popd &>/dev/null ''; + meta = + ({ + licenses = map (licenseString: licenseMap.${licenseString}) licenses; + longDescription = description; + inherit homepage; + }); }; } From c74490e000168b59f73062a059608dce5a0e1859 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Sun, 18 Jun 2023 14:54:20 +0200 Subject: [PATCH 04/63] nextcloud*Packages: add description, homepage, licenses from JSON This ensures this data is replicated in the meta attribute. --- pkgs/servers/nextcloud/packages/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/nextcloud/packages/default.nix b/pkgs/servers/nextcloud/packages/default.nix index e5874f2d94ac..3c0f28464cca 100644 --- a/pkgs/servers/nextcloud/packages/default.nix +++ b/pkgs/servers/nextcloud/packages/default.nix @@ -15,7 +15,7 @@ let packages = self: # This takes the data generated from the go tool. mkNextcloudDerivation = self.callPackage ({ }: { data }: pkgs.fetchNextcloudApp { - inherit (data) url sha256; + inherit (data) url sha256 description homepage licenses; }) {}; } // lib.mapAttrs (type: pkgs: lib.makeExtensible (_: lib.mapAttrs (pname: data: self.mkNextcloudDerivation { inherit data; }) pkgs)) generatedJson; From 850af444356b0865337f204c3802b3ac57491695 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 20 Aug 2023 11:51:21 +0200 Subject: [PATCH 05/63] applyPatches: fix adding meta information --- pkgs/build-support/trivial-builders/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index 0b6bc4b61296..3d2a5512c58e 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -914,7 +914,7 @@ rec { installPhase = "cp -R ./ $out"; } # Carry `meta` information from the underlying `src` if present. - // (optionalAttrs (builtins.hasAttr "meta" src) src.meta) + // (optionalAttrs (src?meta) { inherit (src) meta; }) // (removeAttrs args [ "src" "name" "patches" "postPatch" ]); /* An immutable file in the store with a length of 0 bytes. */ From c317dcec0d36ba6c51f73bd23b5425a3f1d03141 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 20 Aug 2023 12:30:34 +0200 Subject: [PATCH 06/63] nextcloud*Packages: expose proper license information This change makes sure that each Nextcloud plugin installed provides a `meta` section with proper license information. Unfortunately, the metadata from the appstore is useless for this purpose since it doesn't differentiate between e.g. AGPL 3.x and AGPL 3.x or any later version. In fact, this isn't consistent between their software, e.g. `bookmarks` has `agpl3Plus` according to the files' headers[1] whereas `twofactor_nextcloud_notification` is AGPL 3 only[2]. I don't think there's any trivial and reasonable way to retrieve this information programatically, so I decided to change the format of `nextcloud-apps.json`[3] to also contain the license in the form of the license attribute we have in `lib/licenses.nix`, i.e. GNU AGPL 3 or later is `agpl3Plus`. I retrieved the information using the following approach: * go to the source code of $app at the revision we currently have packaged * check for a license identifier (does it specify the license only or the license "or any later version")? * first in `src/main.js` because most apps from Nextcloud itself used actual spdx identifiers in the frontend's source-code. * then in `lib/AppInfo/Application.php` which each Nextcloud app has. License changes should be updated accordingly when updating the apps. As with any other package in nixpkgs as well, this currently needs to be done manually (or as part of the review process)[4]. Also, I decided to change the `name` of the `applyPatches` derivation from `source-patched` to `nextcloud-app-${appName}-${appVersion}`. When deploying a lot of apps (and probably displaying the diff using `nix store diff-closures` on deploy), the current output isn't very helpful. This is purely optional because I didn't want to break the interface of `fetchNextcloudApp` again. [1] https://github.com/nextcloud/bookmarks/blob/v13.1.0/lib/AppInfo/Application.php#L6 [2] https://github.com/nextcloud/twofactor_nextcloud_notification/blob/v3.7.0/lib/AppInfo/Application.php [3] This isn't really well-defined since it's preprocessed with `jq(1)` before passing the apps to nc4nix. [4] Though notable license changes (e.g. agpl -> gpl) would also pop up in the diff of .json, so this is pretty easy to catch. --- .../fetchnextcloudapp/default.nix | 24 +++---- pkgs/servers/nextcloud/packages/default.nix | 12 +++- pkgs/servers/nextcloud/packages/generate.sh | 2 +- .../nextcloud/packages/nextcloud-apps.json | 62 +++++++++---------- 4 files changed, 51 insertions(+), 49 deletions(-) diff --git a/pkgs/build-support/fetchnextcloudapp/default.nix b/pkgs/build-support/fetchnextcloudapp/default.nix index 29a3f727a082..658cd87cafa7 100644 --- a/pkgs/build-support/fetchnextcloudapp/default.nix +++ b/pkgs/build-support/fetchnextcloudapp/default.nix @@ -1,27 +1,22 @@ { stdenv, fetchzip, applyPatches, lib, ... }: { url , sha256 -, licenses +, appName ? null +, appVersion ? null +, license , patches ? [ ] , name ? null , version ? null , description ? null , homepage ? null }: -let - # TODO: do something better - licenseMap = { - "agpl" = lib.licenses.agpl3Only; - "apache" = lib.licenses.asl20; - }; -in if name != null || version != null then throw '' `pkgs.fetchNextcloudApp` has been changed to use `fetchzip`. To update, please * remove `name`/`version` * update the hash '' -else applyPatches { +else applyPatches ({ inherit patches; src = fetchzip { inherit url sha256; @@ -33,11 +28,12 @@ else applyPatches { fi popd &>/dev/null ''; - meta = - ({ - licenses = map (licenseString: licenseMap.${licenseString}) licenses; + meta = { + license = lib.licenses.${license}; longDescription = description; inherit homepage; - }); + }; }; -} +} // lib.optionalAttrs (appName != null && appVersion != null) { + name = "nextcloud-app-${appName}-${appVersion}"; +}) diff --git a/pkgs/servers/nextcloud/packages/default.nix b/pkgs/servers/nextcloud/packages/default.nix index 3c0f28464cca..9c12619968af 100644 --- a/pkgs/servers/nextcloud/packages/default.nix +++ b/pkgs/servers/nextcloud/packages/default.nix @@ -9,15 +9,21 @@ let packages = self: generatedJson = { inherit apps; }; + appBaseDefs = builtins.fromJSON (builtins.readFile ./nextcloud-apps.json); in { # Create a derivation from the official Nextcloud apps. # This takes the data generated from the go tool. - mkNextcloudDerivation = self.callPackage ({ }: { data }: + mkNextcloudDerivation = self.callPackage ({ }: { pname, data }: pkgs.fetchNextcloudApp { - inherit (data) url sha256 description homepage licenses; + appName = pname; + appVersion = data.version; + license = appBaseDefs.${pname}; + inherit (data) url sha256 description homepage; }) {}; - } // lib.mapAttrs (type: pkgs: lib.makeExtensible (_: lib.mapAttrs (pname: data: self.mkNextcloudDerivation { inherit data; }) pkgs)) generatedJson; + } // lib.mapAttrs (type: pkgs: + lib.makeExtensible (_: lib.mapAttrs (pname: data: self.mkNextcloudDerivation { inherit pname; inherit data; }) pkgs)) + generatedJson; in (lib.makeExtensible (_: (lib.makeScope newScope packages))).extend (selfNC: superNC: {}) diff --git a/pkgs/servers/nextcloud/packages/generate.sh b/pkgs/servers/nextcloud/packages/generate.sh index ff8957a6a34d..48960ab24dec 100755 --- a/pkgs/servers/nextcloud/packages/generate.sh +++ b/pkgs/servers/nextcloud/packages/generate.sh @@ -8,7 +8,7 @@ set -x export NEXTCLOUD_VERSIONS=$(nix-instantiate --eval -E 'import ./nc-versions.nix {}' -A e) -APPS=`cat nextcloud-apps.json | jq -r '.[]' | sed -z 's/\n/,/g;s/,$/\n/'` +APPS=`cat nextcloud-apps.json | jq -r 'keys|.[]' | sed -z 's/\n/,/g;s/,$/\n/'` nc4nix -apps $APPS rm *.log diff --git a/pkgs/servers/nextcloud/packages/nextcloud-apps.json b/pkgs/servers/nextcloud/packages/nextcloud-apps.json index 26b57eba0603..bbbe556f6cbe 100644 --- a/pkgs/servers/nextcloud/packages/nextcloud-apps.json +++ b/pkgs/servers/nextcloud/packages/nextcloud-apps.json @@ -1,31 +1,31 @@ -[ - "bookmarks" -, "calendar" -, "contacts" -, "cospend" -, "deck" -, "files_texteditor" -, "files_markdown" -, "forms" -, "groupfolders" -, "impersonate" -, "keeweb" -, "mail" -, "maps" -, "memories" -, "news" -, "notes" -, "notify_push" -, "onlyoffice" -, "polls" -, "previewgenerator" -, "qownnotesapi" -, "registration" -, "spreed" -, "tasks" -, "twofactor_nextcloud_notification" -, "twofactor_totp" -, "twofactor_webauthn" -, "unsplash" -, "user_saml" -] +{ + "bookmarks": "agpl3Plus" +, "calendar": "agpl3Plus" +, "contacts": "agpl3Plus" +, "cospend": "agpl3Plus" +, "deck": "agpl3Plus" +, "files_texteditor": "agpl3Plus" +, "files_markdown": "agpl3Plus" +, "forms": "agpl3Plus" +, "groupfolders": "agpl3Plus" +, "impersonate": "agpl3Plus" +, "keeweb": "agpl3Plus" +, "mail": "agpl3Plus" +, "maps": "agpl3Plus" +, "memories": "agpl3Plus" +, "news": "agpl3Plus" +, "notes": "agpl3Plus" +, "notify_push": "agpl3Plus" +, "onlyoffice": "asl20" +, "polls": "agpl3Plus" +, "previewgenerator": "agpl3Plus" +, "qownnotesapi": "agpl3Plus" +, "registration": "agpl3Plus" +, "spreed": "agpl3Plus" +, "tasks": "agpl3Plus" +, "twofactor_nextcloud_notification": "agpl3Only" +, "twofactor_totp": "agpl3Plus" +, "twofactor_webauthn": "agpl3Plus" +, "unsplash": "agpl3Only" +, "user_saml": "agpl3Plus" +} From 9a62a468740f355b6cfa5113583eece980a17869 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 20 Aug 2023 13:29:58 +0200 Subject: [PATCH 07/63] fetchNextcloudApp: remove backwards compat for old interface The `name` & `version` attributes only existed in a previous form of the API before it was switched over to using `fetchzip` & `applyPatches`[1]. The attributes existed to be able to throw an evaluation error with upgrade instructions when this was used. However, this was before 22.11, so this shouldn't be in use anymore (and if somebody is doing a migration from a very old NixOS, this is still documented in the 22.11 release-notes[2]). Anyways, this simplifies the code a little bit and also having both `appName`/`appVersion` and `name`/`version` in there is quite confusing. But still, I figured it's less confusing to not re-use attributes that were deprecated in the past, hence the alternative naming. [1] 3ca9b9a8ad1b9dee2ec40eecca557f0578786b93 [2] d41b381310f5dcde1434b23406532f54ebdeea22 --- pkgs/build-support/fetchnextcloudapp/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/build-support/fetchnextcloudapp/default.nix b/pkgs/build-support/fetchnextcloudapp/default.nix index 658cd87cafa7..0ec64bbe1df6 100644 --- a/pkgs/build-support/fetchnextcloudapp/default.nix +++ b/pkgs/build-support/fetchnextcloudapp/default.nix @@ -5,18 +5,10 @@ , appVersion ? null , license , patches ? [ ] -, name ? null -, version ? null , description ? null , homepage ? null }: -if name != null || version != null then throw '' - `pkgs.fetchNextcloudApp` has been changed to use `fetchzip`. - To update, please - * remove `name`/`version` - * update the hash -'' -else applyPatches ({ +applyPatches ({ inherit patches; src = fetchzip { inherit url sha256; @@ -32,6 +24,10 @@ else applyPatches ({ license = lib.licenses.${license}; longDescription = description; inherit homepage; + } // lib.optionalAttrs (description != null) { + longDescription = description; + } // lib.optionalAttrs (homepage != null) { + inherit homepage; }; }; } // lib.optionalAttrs (appName != null && appVersion != null) { From c7589fc67c770ba2b41702955945a1d75a2c3bd5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 20 Aug 2023 12:32:22 +0200 Subject: [PATCH 08/63] nextcloud*Packages: update --- pkgs/servers/nextcloud/packages/25.json | 14 +++++++------- pkgs/servers/nextcloud/packages/26.json | 20 ++++++++++---------- pkgs/servers/nextcloud/packages/27.json | 14 +++++++------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/25.json b/pkgs/servers/nextcloud/packages/25.json index 0c4d462b8b87..952fb6d8db83 100644 --- a/pkgs/servers/nextcloud/packages/25.json +++ b/pkgs/servers/nextcloud/packages/25.json @@ -3,7 +3,7 @@ "sha256": "1kdpma5f3rb9g29j364lqv6bkar5qgwlvcxmhpmzllwlkmjpc9w8", "url": "https://github.com/nextcloud/bookmarks/releases/download/v12.1.0/bookmarks-12.1.0.tar.gz", "version": "12.1.0", - "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- 🔍 Full-text search\n- 📲 Synchronize with all your browsers and devices\n- 👪 Share bookmarks with other users and publicly\n- ☠ Find broken links\n- ⚛ Generate RSS feeds of your collections\n- 📔 Read archived versions of your links in case they are depublished\n- 💬 Create new bookmarks directly from within Nextcloud Talk\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP v7.4+\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", + "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- 🔍 Full-text search\n- 📲 Synchronize with all your browsers and devices\n- 👪 Share bookmarks with other users and publicly\n- ☠ Find broken links\n- ⚛ Generate RSS feeds of your collections\n- 📔 Read archived versions of your links in case they are depublished\n- 💬 Create new bookmarks directly from within Nextcloud Talk\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", "homepage": "https://github.com/nextcloud/bookmarks", "licenses": [ "agpl" @@ -140,9 +140,9 @@ ] }, "news": { - "sha256": "1z08k8xnyv71zj0djlv339faq9lx23mlqgjanf2jhv6jhh8cy5c6", - "url": "https://github.com/nextcloud/news/releases/download/22.0.0/news.tar.gz", - "version": "22.0.0", + "sha256": "1j9dhqz5anwsmw3f8hbhvqc2h1fp15zmxzdbpnz1p3vwqf8f5cjs", + "url": "https://github.com/nextcloud/news/releases/download/23.0.0/news.tar.gz", + "version": "23.0.0", "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ @@ -170,9 +170,9 @@ ] }, "onlyoffice": { - "sha256": "10axh9a4w8y3iw95xdjn4q8wjg5459dki42xb6cax5ikimyfv07j", - "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v7.8.0/onlyoffice.tar.gz", - "version": "7.8.0", + "sha256": "12hzmngps86ha4lcfwaf62svfz41aywykq0z419r644g5i4v7raq", + "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v7.9.0/onlyoffice.tar.gz", + "version": "7.9.0", "description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.", "homepage": "https://www.onlyoffice.com", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/26.json b/pkgs/servers/nextcloud/packages/26.json index 1a913713dd20..557b6ec045f9 100644 --- a/pkgs/servers/nextcloud/packages/26.json +++ b/pkgs/servers/nextcloud/packages/26.json @@ -1,9 +1,9 @@ { "bookmarks": { - "sha256": "0xx331bgly91y8ncxk36ha3ncrr2xlivblfi7rix6ffkrdx73yb9", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.0.1/bookmarks-13.0.1.tar.gz", - "version": "13.0.1", - "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- 🔍 Full-text search\n- 📲 Synchronize with all your browsers and devices\n- 👪 Share bookmarks with other users and publicly\n- ☠ Find broken links\n- ⚛ Generate RSS feeds of your collections\n- 📔 Read archived versions of your links in case they are depublished\n- 💬 Create new bookmarks directly from within Nextcloud Talk\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP v7.4+\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", + "sha256": "16j10gj5nghgji36jhng60291wl4h9c3vndjx9j8jij9qn6hz23f", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.1.0/bookmarks-13.1.0.tar.gz", + "version": "13.1.0", + "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- 🔍 Full-text search\n- 📲 Synchronize with all your browsers and devices\n- 👪 Share bookmarks with other users and publicly\n- ☠ Find broken links\n- ⚛ Generate RSS feeds of your collections\n- 📔 Read archived versions of your links in case they are depublished\n- 💬 Create new bookmarks directly from within Nextcloud Talk\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", "homepage": "https://github.com/nextcloud/bookmarks", "licenses": [ "agpl" @@ -140,9 +140,9 @@ ] }, "news": { - "sha256": "1z08k8xnyv71zj0djlv339faq9lx23mlqgjanf2jhv6jhh8cy5c6", - "url": "https://github.com/nextcloud/news/releases/download/22.0.0/news.tar.gz", - "version": "22.0.0", + "sha256": "1j9dhqz5anwsmw3f8hbhvqc2h1fp15zmxzdbpnz1p3vwqf8f5cjs", + "url": "https://github.com/nextcloud/news/releases/download/23.0.0/news.tar.gz", + "version": "23.0.0", "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ @@ -170,9 +170,9 @@ ] }, "onlyoffice": { - "sha256": "10axh9a4w8y3iw95xdjn4q8wjg5459dki42xb6cax5ikimyfv07j", - "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v7.8.0/onlyoffice.tar.gz", - "version": "7.8.0", + "sha256": "12hzmngps86ha4lcfwaf62svfz41aywykq0z419r644g5i4v7raq", + "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v7.9.0/onlyoffice.tar.gz", + "version": "7.9.0", "description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.", "homepage": "https://www.onlyoffice.com", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/27.json b/pkgs/servers/nextcloud/packages/27.json index 27b3b202802c..850b46bf8379 100644 --- a/pkgs/servers/nextcloud/packages/27.json +++ b/pkgs/servers/nextcloud/packages/27.json @@ -1,9 +1,9 @@ { "bookmarks": { - "sha256": "0xx331bgly91y8ncxk36ha3ncrr2xlivblfi7rix6ffkrdx73yb9", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.0.1/bookmarks-13.0.1.tar.gz", - "version": "13.0.1", - "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- 🔍 Full-text search\n- 📲 Synchronize with all your browsers and devices\n- 👪 Share bookmarks with other users and publicly\n- ☠ Find broken links\n- ⚛ Generate RSS feeds of your collections\n- 📔 Read archived versions of your links in case they are depublished\n- 💬 Create new bookmarks directly from within Nextcloud Talk\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP v7.4+\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", + "sha256": "16j10gj5nghgji36jhng60291wl4h9c3vndjx9j8jij9qn6hz23f", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.1.0/bookmarks-13.1.0.tar.gz", + "version": "13.1.0", + "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- 🔍 Full-text search\n- 📲 Synchronize with all your browsers and devices\n- 👪 Share bookmarks with other users and publicly\n- ☠ Find broken links\n- ⚛ Generate RSS feeds of your collections\n- 📔 Read archived versions of your links in case they are depublished\n- 💬 Create new bookmarks directly from within Nextcloud Talk\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", "homepage": "https://github.com/nextcloud/bookmarks", "licenses": [ "agpl" @@ -140,9 +140,9 @@ ] }, "news": { - "sha256": "1z08k8xnyv71zj0djlv339faq9lx23mlqgjanf2jhv6jhh8cy5c6", - "url": "https://github.com/nextcloud/news/releases/download/22.0.0/news.tar.gz", - "version": "22.0.0", + "sha256": "1j9dhqz5anwsmw3f8hbhvqc2h1fp15zmxzdbpnz1p3vwqf8f5cjs", + "url": "https://github.com/nextcloud/news/releases/download/23.0.0/news.tar.gz", + "version": "23.0.0", "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ From 1e42f77bd5e3e1de8145d946f29232c04c1afa13 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 21 Aug 2023 10:32:46 +0300 Subject: [PATCH 09/63] heroic: enable Wayland IME support This doesn't crash anymore on the latest Electron and is useful for Steam Deck users. --- pkgs/games/heroic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix index 05455ae7c7d6..ca9d5799596e 100644 --- a/pkgs/games/heroic/default.nix +++ b/pkgs/games/heroic/default.nix @@ -93,7 +93,7 @@ in stdenv.mkDerivation rec { --inherit-argv0 \ --add-flags --disable-gpu-compositing \ --add-flags $out/share/${appName} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" substituteInPlace "$out/share/${appName}/flatpak/com.heroicgameslauncher.hgl.desktop" \ --replace "Exec=heroic-run" "Exec=heroic" From 587a19e43c61fda915adbfc5e487a2e7bb89fa03 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 2 Aug 2023 21:38:51 +0200 Subject: [PATCH 10/63] mpiCheckPhaseHook: add new setup hook for MPI aware check phases Add this hook to checkPhase to allow for running MPI application in the sandbox. It detects the MPI implementations and sets the respective environment variables. --- doc/hooks/index.md | 1 + doc/hooks/mpi-check-hook.section.md | 24 +++++++++ .../setup-hooks/mpi-check-hook/default.nix | 5 ++ .../mpi-check-hook/mpi-check-hook.sh | 54 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 5 files changed, 85 insertions(+) create mode 100644 doc/hooks/mpi-check-hook.section.md create mode 100644 pkgs/build-support/setup-hooks/mpi-check-hook/default.nix create mode 100644 pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh diff --git a/doc/hooks/index.md b/doc/hooks/index.md index 602febaf9d9b..8100e91c8b48 100644 --- a/doc/hooks/index.md +++ b/doc/hooks/index.md @@ -17,6 +17,7 @@ installShellFiles.section.md libiconv.section.md libxml2.section.md meson.section.md +mpi-check-hook.section.md ninja.section.md patch-rc-path-hooks.section.md perl.section.md diff --git a/doc/hooks/mpi-check-hook.section.md b/doc/hooks/mpi-check-hook.section.md new file mode 100644 index 000000000000..e3fb5c40dada --- /dev/null +++ b/doc/hooks/mpi-check-hook.section.md @@ -0,0 +1,24 @@ +# mpiCheckPhaseHook {#setup-hook-mpi-check} + + +This hook can be used to setup a check phase that +requires running a MPI application. It detects the +used present MPI implementaion type and exports +the neceesary environment variables to use +`mpirun` and `mpiexec` in a Nix sandbox. + + +Example: + +```nix + { mpiCheckPhaseHook, mpi, ... }: + + ... + + nativeCheckInputs = [ + openssh + mpiCheckPhaseHook + ]; +``` + + diff --git a/pkgs/build-support/setup-hooks/mpi-check-hook/default.nix b/pkgs/build-support/setup-hooks/mpi-check-hook/default.nix new file mode 100644 index 000000000000..2834cfcc44ff --- /dev/null +++ b/pkgs/build-support/setup-hooks/mpi-check-hook/default.nix @@ -0,0 +1,5 @@ +{ callPackage, makeSetupHook }: + +makeSetupHook { + name = "mpi-checkPhase-hook"; +} ./mpi-check-hook.sh diff --git a/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh b/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh new file mode 100644 index 000000000000..fca1f7b7f932 --- /dev/null +++ b/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh @@ -0,0 +1,54 @@ +preCheckHooks+=('setupMpiCheck') +preInstallCheckHooks+=('setupMpiCheck') + + +setupMpiCheck() { + # Find out which MPI implementation we are using + # and set safe defaults that are guaranteed to run + # on any build machine + + mpiType="NONE" + + # OpenMPI signature + if command ompi_info &> /dev/null; then + mpiType="openmpi" + fi + + # MPICH based implementations + if command mpichversion &> /dev/null; then + if [ "$mpiType" != "NONE" ]; then + echo "WARNING: found OpenMPI and MPICH/MVAPICH executables" + fi + + version=$(mpichversion) + if [[ "$version" == *"MPICH"* ]]; then + mpiType="MPICH" + fi + if [[ "$version" == *"MVAPICH"* ]]; then + mpiType="MVAPICH" + fi + fi + + echo "Found MPI implementation: $mpiType" + + case $mpiType in + openmpi) + # make sure the test starts even if we have less than the requested amount of cores + export OMPI_MCA_rmaps_base_oversubscribe=1 + # Disable CPU pinning + export OMPI_MCA_hwloc_base_binding_policy=none + ;; + MPICH) + # Fix to make mpich run in a sandbox + export HYDRA_IFACE=lo + ;; + MVAPICH) + # Disable CPU pinning + export MV2_ENABLE_AFFINITY=0 + ;; + esac + + # Limit number of OpenMP threads. Default is "all cores". + export OMP_NUM_THREADS=1 +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c89e688e2db6..17f9d307d59c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12258,6 +12258,7 @@ with pkgs; outils = callPackage ../tools/misc/outils { }; mpi = openmpi; # this attribute should used to build MPI applications + mpiCheckPhaseHook = callPackage ../build-support/setup-hooks/mpi-check-hook { }; ucc = callPackage ../development/libraries/ucc { }; From b44960c4d991189322f2d1a2ffd9e55ae2f72c26 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 2 Aug 2023 22:57:48 +0200 Subject: [PATCH 11/63] cp2k: use mpiCheckPhaseHook --- .../science/chemistry/cp2k/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/chemistry/cp2k/default.nix b/pkgs/applications/science/chemistry/cp2k/default.nix index 5defaafa3cd0..29b983cde536 100644 --- a/pkgs/applications/science/chemistry/cp2k/default.nix +++ b/pkgs/applications/science/chemistry/cp2k/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, gfortran, blas, lapack +{ lib, stdenv, fetchFromGitHub, mpiCheckPhaseHook, python3, gfortran, blas, lapack , fftw, libint, libvori, libxc, mpi, gsl, scalapack, openssh, makeWrapper , libxsmm, spglib, which, pkg-config, plumed, zlib , enableElpa ? false @@ -88,14 +88,18 @@ in stdenv.mkDerivation rec { EOF ''; + nativeCheckInputs = [ + mpiCheckPhaseHook + openssh + ]; + checkPhase = '' - export OMP_NUM_THREADS=1 + runHook preCheck - export HYDRA_IFACE=lo # Fix to make mpich run in a sandbox - export OMPI_MCA_rmaps_base_oversubscribe=1 export CP2K_DATA_DIR=data - mpirun -np 2 exe/${arch}/libcp2k_unittest.${cp2kVersion} + + runHook postCheck ''; installPhase = '' From 1534b6768e81bd895ec2c62575b8f1c7d74d2697 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 2 Aug 2023 23:04:28 +0200 Subject: [PATCH 12/63] nwchem: use mpiCheckPhaseHook --- pkgs/applications/science/chemistry/nwchem/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/chemistry/nwchem/default.nix b/pkgs/applications/science/chemistry/nwchem/default.nix index 82daf5f85e74..2a17be9f8a92 100644 --- a/pkgs/applications/science/chemistry/nwchem/default.nix +++ b/pkgs/applications/science/chemistry/nwchem/default.nix @@ -3,6 +3,7 @@ , pkgs , fetchFromGitHub , fetchurl +, mpiCheckPhaseHook , which , openssh , gcc @@ -190,16 +191,15 @@ stdenv.mkDerivation rec { doCheck = false; doInstallCheck = true; + nativeCheckInputs = [ mpiCheckPhaseHook ]; installCheckPhase = '' - export OMP_NUM_THREADS=1 - - # Fix to make mpich run in a sandbox - export HYDRA_IFACE=lo - export OMPI_MCA_rmaps_base_oversubscribe=1 + runHook preInstallCheck # run a simple water test mpirun -np 2 $out/bin/nwchem $out/share/nwchem/QA/tests/h2o/h2o.nw > h2o.out grep "Total SCF energy" h2o.out | grep 76.010538 + + runHook postInstallCheck ''; passthru = { inherit mpi; }; From ab963a1597e1d4b1ef8e53686f6129013ac77658 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 2 Aug 2023 23:04:45 +0200 Subject: [PATCH 13/63] scalapack: use mpiCheckPhaseHook --- .../science/math/scalapack/default.nix | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index 0d553376288f..e2a5e76c5586 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, openssh -, mpi, blas, lapack +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake +, openssh, mpiCheckPhaseHook, mpi, blas, lapack } : assert blas.isILP64 == lapack.isILP64; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ]; - nativeCheckInputs = [ openssh ]; + nativeCheckInputs = [ openssh mpiCheckPhaseHook ]; buildInputs = [ blas lapack ]; propagatedBuildInputs = [ mpi ]; hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; @@ -61,17 +61,6 @@ stdenv.mkDerivation rec { # sometimes fail due to this checkFlagsArray = [ "ARGS=--timeout 10000" ]; - preCheck = '' - # make sure the test starts even if we have less than 4 cores - export OMPI_MCA_rmaps_base_oversubscribe=1 - - # Fix to make mpich run in a sandbox - export HYDRA_IFACE=lo - - # Run single threaded - export OMP_NUM_THREADS=1 - ''; - meta = with lib; { homepage = "http://www.netlib.org/scalapack/"; description = "Library of high-performance linear algebra routines for parallel distributed memory machines"; From 4e1e4b6f3e6ee6721c6c80e31eaba5561b597363 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 2 Aug 2023 23:11:03 +0200 Subject: [PATCH 14/63] p4est-sc: use mpiCheckPhaseHook --- .../libraries/science/math/p4est-sc/default.nix | 10 +++++----- .../libraries/science/math/p4est/default.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/science/math/p4est-sc/default.nix b/pkgs/development/libraries/science/math/p4est-sc/default.nix index fbd9db6a419f..bb5d212061f2 100644 --- a/pkgs/development/libraries/science/math/p4est-sc/default.nix +++ b/pkgs/development/libraries/science/math/p4est-sc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, mpiCheckPhaseHook , autoreconfHook, pkg-config , p4est-sc-debugEnable ? true, p4est-sc-mpiSupport ? true , mpi, openssh, zlib @@ -47,10 +47,10 @@ stdenv.mkDerivation { enableParallelBuilding = true; makeFlags = [ "V=0" ]; - preCheck = '' - export OMPI_MCA_rmaps_base_oversubscribe=1 - export HYDRA_IFACE=lo - ''; + nativeCheckInputs = lib.optionals mpiSupport [ + mpiCheckPhaseHook + openssh + ]; # disallow Darwin checks due to prototype incompatibility of qsort_r # to be fixed in a future version of the source code diff --git a/pkgs/development/libraries/science/math/p4est/default.nix b/pkgs/development/libraries/science/math/p4est/default.nix index a55c5fe573bf..1218c695590e 100644 --- a/pkgs/development/libraries/science/math/p4est/default.nix +++ b/pkgs/development/libraries/science/math/p4est/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { ++ lib.optional withMetis "--with-metis" ; - inherit (p4est-sc) makeFlags dontDisableStatic enableParallelBuilding preCheck doCheck; + inherit (p4est-sc) makeFlags dontDisableStatic enableParallelBuilding doCheck; meta = { branch = "prev3-develop"; From ac48985e0d241fe8cbda38a1f9490f327eee1e54 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 2 Aug 2023 23:15:05 +0200 Subject: [PATCH 15/63] dbcsr: use mpiCheckPhaseHook --- .../libraries/science/math/dbcsr/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/science/math/dbcsr/default.nix b/pkgs/development/libraries/science/math/dbcsr/default.nix index 5a9d3c5066cc..2c576a190026 100644 --- a/pkgs/development/libraries/science/math/dbcsr/default.nix +++ b/pkgs/development/libraries/science/math/dbcsr/default.nix @@ -2,6 +2,7 @@ , lib , fetchFromGitHub , cmake +, mpiCheckPhaseHook , pkg-config , fypp , gfortran @@ -64,13 +65,12 @@ stdenv.mkDerivation rec { "-DUSE_MPI=ON" ]; - checkInputs = [ openssh ]; + checkInputs = [ + openssh + mpiCheckPhaseHook + ]; doCheck = true; - preCheck = '' - export HYDRA_IFACE=lo # Fix to make mpich run in a sandbox - export OMPI_MCA_rmaps_base_oversubscribe=1 - ''; meta = with lib; { description = "Distributed Block Compressed Sparse Row matrix library"; From 32db66c9f590dc2e422a2fe0d4ef905ec414ffc3 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 2 Aug 2023 23:17:57 +0200 Subject: [PATCH 16/63] elpa: use mpiCheckPhaseHook --- pkgs/development/libraries/elpa/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/elpa/default.nix b/pkgs/development/libraries/elpa/default.nix index ec108adc61eb..003de885c791 100644 --- a/pkgs/development/libraries/elpa/default.nix +++ b/pkgs/development/libraries/elpa/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, autoreconfHook, gfortran, perl -, mpi, blas, lapack, scalapack, openssh +{ lib, stdenv, fetchurl, autoreconfHook, mpiCheckPhaseHook +, gfortran, perl, mpi, blas, lapack, scalapack, openssh # CPU optimizations , avxSupport ? stdenv.hostPlatform.avxSupport , avx2Support ? stdenv.hostPlatform.avx2Support @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile.am --replace '#!/bin/bash' '#!${stdenv.shell}' ''; - nativeBuildInputs = [ autoreconfHook perl openssh ]; + nativeBuildInputs = [ autoreconfHook perl ]; buildInputs = [ mpi blas lapack scalapack ] ++ lib.optional enableCuda cudatoolkit; @@ -76,15 +76,10 @@ stdenv.mkDerivation rec { doCheck = true; + nativeCheckInputs = [ mpiCheckPhaseHook openssh ]; preCheck = '' #patchShebangs ./ - # make sure the test starts even if we have less than 4 cores - export OMPI_MCA_rmaps_base_oversubscribe=1 - - # Fix to make mpich run in a sandbox - export HYDRA_IFACE=lo - # Run dual threaded export OMP_NUM_THREADS=2 From 690da58deca1f8ae1443e498ef86cc8936ff47a5 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 2 Aug 2023 23:54:13 +0200 Subject: [PATCH 17/63] python3Packages.mpi4py: use mpiCheckPhaseHook --- pkgs/development/python-modules/mpi4py/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index 8584930c31f1..887c5446d53c 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -1,4 +1,6 @@ -{ lib, fetchPypi, fetchpatch, python, buildPythonPackage, mpi, openssh }: +{ lib, fetchPypi, fetchpatch, python, buildPythonPackage +, mpi, mpiCheckPhaseHook, openssh +}: buildPythonPackage rec { pname = "mpi4py"; @@ -33,10 +35,6 @@ buildPythonPackage rec { # sometimes packages specify where files should be installed outside the usual # python lib prefix, we override that back so all infrastructure (setup hooks) # work as expected - - # Needed to run the tests reliably. See: - # https://bitbucket.org/mpi4py/mpi4py/issues/87/multiple-test-errors-with-openmpi-30 - export OMPI_MCA_rmaps_base_oversubscribe=yes ''; setupPyBuildFlags = ["--mpicc=${mpi}/bin/mpicc"]; @@ -45,7 +43,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - nativeCheckInputs = [ openssh ]; + nativeCheckInputs = [ openssh mpiCheckPhaseHook ]; meta = with lib; { description = "Python bindings for the Message Passing Interface standard"; From cfc44b5d41f3b6af18c4af5e65ec4fd19e9b79cf Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 3 Aug 2023 00:03:32 +0200 Subject: [PATCH 18/63] pythonPackages.meep: use mpiCheckPhaseHook --- pkgs/development/python-modules/meep/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/meep/default.nix b/pkgs/development/python-modules/meep/default.nix index 021121a44ac2..df0dd2cb1bb1 100644 --- a/pkgs/development/python-modules/meep/default.nix +++ b/pkgs/development/python-modules/meep/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , autoreconfHook , pkg-config +, mpiCheckPhaseHook , gfortran , mpi , blas @@ -108,16 +109,12 @@ buildPythonPackage rec { errors can be caught. */ doCheck = true; + nativeCheckInputs = [ mpiCheckPhaseHook openssh ]; checkPhase = '' - export PATH=$PATH:${openssh}/bin + runHook preCheck + export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" - export OMP_NUM_THREADS=1 - - # Fix to make mpich run in a sandbox - export HYDRA_IFACE=lo - export OMPI_MCA_rmaps_base_oversubscribe=1 - # Generate a python test script cat > test.py << EOF import meep as mp @@ -139,6 +136,8 @@ buildPythonPackage rec { EOF ${mpi}/bin/mpiexec -np 2 python3 test.py + + runHook postCheck ''; meta = with lib; { From e831daaf4d2e77d3f58bef3f3ddf83bd7dd2be3b Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Wed, 5 Apr 2023 12:04:54 +0200 Subject: [PATCH 19/63] qgis: 3.28.3 -> 3.32.2 --- .../gis/qgis/set-pyqt-package-dirs-ltr.patch | 59 +++++++++++++++++++ .../gis/qgis/set-pyqt-package-dirs.patch | 4 +- pkgs/applications/gis/qgis/unwrapped-ltr.nix | 2 +- pkgs/applications/gis/qgis/unwrapped.nix | 6 +- 4 files changed, 66 insertions(+), 5 deletions(-) create mode 100644 pkgs/applications/gis/qgis/set-pyqt-package-dirs-ltr.patch diff --git a/pkgs/applications/gis/qgis/set-pyqt-package-dirs-ltr.patch b/pkgs/applications/gis/qgis/set-pyqt-package-dirs-ltr.patch new file mode 100644 index 000000000000..5553f80fbc5b --- /dev/null +++ b/pkgs/applications/gis/qgis/set-pyqt-package-dirs-ltr.patch @@ -0,0 +1,59 @@ +diff --git a/cmake/FindPyQt5.cmake b/cmake/FindPyQt5.cmake +index b51fd0075e..87ee317e05 100644 +--- a/cmake/FindPyQt5.cmake ++++ b/cmake/FindPyQt5.cmake +@@ -25,7 +25,7 @@ ELSE(EXISTS PYQT5_VERSION_STR) + IF(SIP_BUILD_EXECUTABLE) + # SIP >= 5.0 path + +- FILE(GLOB _pyqt5_metadata "${Python_SITEARCH}/PyQt5-*.dist-info/METADATA") ++ FILE(GLOB _pyqt5_metadata "@pyQt5PackageDir@/PyQt5-*.dist-info/METADATA") + IF(_pyqt5_metadata) + FILE(READ ${_pyqt5_metadata} _pyqt5_metadata_contents) + STRING(REGEX REPLACE ".*\nVersion: ([^\n]+).*$" "\\1" PYQT5_VERSION_STR ${_pyqt5_metadata_contents}) +@@ -34,8 +34,8 @@ ELSE(EXISTS PYQT5_VERSION_STR) + ENDIF(_pyqt5_metadata) + + IF(PYQT5_VERSION_STR) +- SET(PYQT5_MOD_DIR "${Python_SITEARCH}/PyQt5") +- SET(PYQT5_SIP_DIR "${Python_SITEARCH}/PyQt5/bindings") ++ SET(PYQT5_MOD_DIR "@pyQt5PackageDir@/PyQt5") ++ SET(PYQT5_SIP_DIR "@pyQt5PackageDir@/PyQt5/bindings") + FIND_PROGRAM(__pyuic5 "pyuic5") + GET_FILENAME_COMPONENT(PYQT5_BIN_DIR ${__pyuic5} DIRECTORY) + +diff --git a/cmake/FindQsci.cmake b/cmake/FindQsci.cmake +index 69e41c1fe9..5456c3d59b 100644 +--- a/cmake/FindQsci.cmake ++++ b/cmake/FindQsci.cmake +@@ -24,7 +24,7 @@ ELSE(QSCI_MOD_VERSION_STR) + IF(SIP_BUILD_EXECUTABLE) + # SIP >= 5.0 path + +- FILE(GLOB _qsci_metadata "${Python_SITEARCH}/QScintilla*.dist-info/METADATA") ++ FILE(GLOB _qsci_metadata "@qsciPackageDir@/QScintilla*.dist-info/METADATA") + IF(_qsci_metadata) + FILE(READ ${_qsci_metadata} _qsci_metadata_contents) + STRING(REGEX REPLACE ".*\nVersion: ([^\n]+).*$" "\\1" QSCI_MOD_VERSION_STR ${_qsci_metadata_contents}) +@@ -33,7 +33,7 @@ ELSE(QSCI_MOD_VERSION_STR) + ENDIF(_qsci_metadata) + + IF(QSCI_MOD_VERSION_STR) +- SET(QSCI_SIP_DIR "${PYQT5_SIP_DIR}") ++ SET(QSCI_SIP_DIR "@qsciPackageDir@/PyQt5/bindings") + SET(QSCI_FOUND TRUE) + ENDIF(QSCI_MOD_VERSION_STR) + +diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt +index 4cd19c3af4..668cc6a5e6 100644 +--- a/python/CMakeLists.txt ++++ b/python/CMakeLists.txt +@@ -206,7 +206,7 @@ if (WITH_GUI) + install(FILES ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_gui.pyi DESTINATION ${QGIS_PYTHON_DIR}) + endif() + if(QSCI_SIP_DIR) +- set(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -I ${QSCI_SIP_DIR}) ++ set(SIP_BUILD_EXTRA_OPTIONS ${SIP_BUILD_EXTRA_OPTIONS} --include-dir=${QSCI_SIP_DIR}) + else() + message(STATUS "Qsci sip file not found - disabling bindings for derived classes") + set(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} HAVE_QSCI_SIP) diff --git a/pkgs/applications/gis/qgis/set-pyqt-package-dirs.patch b/pkgs/applications/gis/qgis/set-pyqt-package-dirs.patch index 5553f80fbc5b..725c0b350e82 100644 --- a/pkgs/applications/gis/qgis/set-pyqt-package-dirs.patch +++ b/pkgs/applications/gis/qgis/set-pyqt-package-dirs.patch @@ -39,7 +39,7 @@ index 69e41c1fe9..5456c3d59b 100644 ENDIF(_qsci_metadata) IF(QSCI_MOD_VERSION_STR) -- SET(QSCI_SIP_DIR "${PYQT5_SIP_DIR}") +- SET(QSCI_SIP_DIR "${PYQT_SIP_DIR}") + SET(QSCI_SIP_DIR "@qsciPackageDir@/PyQt5/bindings") SET(QSCI_FOUND TRUE) ENDIF(QSCI_MOD_VERSION_STR) @@ -48,7 +48,7 @@ diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 4cd19c3af4..668cc6a5e6 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt -@@ -206,7 +206,7 @@ if (WITH_GUI) +@@ -212,7 +212,7 @@ if (WITH_GUI) install(FILES ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_gui.pyi DESTINATION ${QGIS_PYTHON_DIR}) endif() if(QSCI_SIP_DIR) diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 1506f0bb9e28..b69078afe314 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -124,7 +124,7 @@ in mkDerivation rec { patches = [ (substituteAll { - src = ./set-pyqt-package-dirs.patch; + src = ./set-pyqt-package-dirs-ltr.patch; pyQt5PackageDir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}"; qsciPackageDir = "${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}"; }) diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index c2d51f5b9817..c1b68f665488 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -29,6 +29,7 @@ , qt3d , qscintilla , qtlocation +, qtmultimedia , qtserialport , qtxmlpatterns , withGrass ? true @@ -73,14 +74,14 @@ let six ]; in mkDerivation rec { - version = "3.28.3"; + version = "3.30.1"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-nXauZSC78BX1fcx0SXniwQpRmdSLfoqZ5jlbXeHgRGI="; + hash = "sha256-MB0EQVJO5WLgqjdh8A7X45CpNvf7239wkZWciNfY3gY="; }; passthru = { @@ -111,6 +112,7 @@ in mkDerivation rec { qtkeychain qscintilla qtlocation + qtmultimedia qtserialport qtxmlpatterns qt3d From 85cf505bdfb43edf835c8b9d24a3b9bcce033ed2 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Tue, 22 Aug 2023 10:59:32 +0200 Subject: [PATCH 20/63] qgis: alphabetical sorting of dependencies --- pkgs/applications/gis/qgis/unwrapped.nix | 147 +++++++++++++---------- 1 file changed, 84 insertions(+), 63 deletions(-) diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index c1b68f665488..f388284240bf 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -1,50 +1,52 @@ { lib -, mkDerivation , fetchFromGitHub -, cmake -, ninja -, flex +, makeWrapper +, mkDerivation +, substituteAll +, wrapGAppsHook +, wrapQtAppsHook + +, withGrass ? true +, withWebKit ? false + , bison -, proj -, geos -, sqlite -, gsl -, qwt +, cmake +, exiv2 , fcgi -, python3 +, flex +, geos +, grass +, gsl +, hdf5 , libspatialindex , libspatialite -, postgresql -, txt2tags -, openssl , libzip -, hdf5 , netcdf -, exiv2 +, ninja +, openssl +, pdal +, postgresql +, proj , protobuf -, qtbase -, qtsensors +, python3 , qca-qt5 -, qtkeychain -, qt3d , qscintilla +, qt3d +, qtbase +, qtkeychain , qtlocation , qtmultimedia +, qtsensors , qtserialport -, qtxmlpatterns -, withGrass ? true -, grass -, withWebKit ? false , qtwebkit -, pdal +, qtxmlpatterns +, qwt +, sqlite +, txt2tags , zstd -, makeWrapper -, wrapGAppsHook -, substituteAll }: let - py = python3.override { packageOverrides = self: super: { pyqt5 = super.pyqt5.override { @@ -54,34 +56,34 @@ let }; pythonBuildInputs = with py.pkgs; [ - qscintilla-qt5 + chardet gdal jinja2 numpy - psycopg2 - chardet - python-dateutil - pyyaml - pytz - requests - urllib3 - pygments - pyqt5 - pyqt-builder - sip - setuptools owslib + psycopg2 + pygments + pyqt-builder + pyqt5 + python-dateutil + pytz + pyyaml + qscintilla-qt5 + requests + setuptools + sip six + urllib3 ]; in mkDerivation rec { - version = "3.30.1"; + version = "3.32.2"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-MB0EQVJO5WLgqjdh8A7X45CpNvf7239wkZWciNfY3gY="; + hash = "sha256-4Hcppzgst6v7SR/06ZICSujC4Gfckd/X5Mj40fh9OOU="; }; passthru = { @@ -89,41 +91,50 @@ in mkDerivation rec { inherit py; }; + nativeBuildInputs = [ + makeWrapper + wrapGAppsHook + wrapQtAppsHook + + cmake + flex + bison + ninja + ]; + buildInputs = [ - openssl - proj - geos - sqlite - gsl - qwt exiv2 - protobuf fcgi + geos + gsl + hdf5 libspatialindex libspatialite - postgresql - txt2tags libzip - hdf5 netcdf - qtbase - qtsensors + openssl + pdal + postgresql + proj + protobuf qca-qt5 - qtkeychain qscintilla + qt3d + qtbase + qtkeychain qtlocation qtmultimedia + qtsensors qtserialport qtxmlpatterns - qt3d - pdal + qwt + sqlite + txt2tags zstd ] ++ lib.optional withGrass grass ++ lib.optional withWebKit qtwebkit ++ pythonBuildInputs; - nativeBuildInputs = [ makeWrapper wrapGAppsHook cmake flex bison ninja ]; - patches = [ (substituteAll { src = ./set-pyqt-package-dirs.patch; @@ -132,6 +143,12 @@ in mkDerivation rec { }) ]; + # Add path to Qt platform plugins + # (offscreen is needed by "${APIS_SRC_DIR}/generate_console_pap.py") + preBuild = '' + export QT_QPA_PLATFORM_PLUGIN_PATH=${qtbase.bin}/lib/qt-${qtbase.version}/plugins/platforms + ''; + cmakeFlags = [ "-DWITH_3D=True" "-DWITH_PDAL=TRUE" @@ -142,13 +159,17 @@ in mkDerivation rec { in "-DGRASS_PREFIX${gmajor}=${grass}/grass${gmajor}${gminor}" ); + qtWrapperArgs = [ + "--set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-${qtbase.version}/plugins/platforms" + ]; + dontWrapGApps = true; # wrapper params passed below postFixup = lib.optionalString withGrass '' - # grass has to be availble on the command line even though we baked in + # GRASS has to be availble on the command line even though we baked in # the path at build time using GRASS_PREFIX. - # using wrapGAppsHook also prevents file dialogs from crashing the program - # on non-NixOS + # Using wrapGAppsHook also prevents file dialogs from crashing the program + # on non-NixOS. wrapProgram $out/bin/qgis \ "''${gappsWrapperArgs[@]}" \ --prefix PATH : ${lib.makeBinPath [ grass ]} From 9b337721ecbcb5f49ecbe6d820ce3f330382d533 Mon Sep 17 00:00:00 2001 From: Luna Simons Date: Wed, 23 Aug 2023 16:09:17 +0200 Subject: [PATCH 21/63] vrc-get: 1.1.2 -> 1.1.3 --- pkgs/tools/misc/vrc-get/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/vrc-get/default.nix b/pkgs/tools/misc/vrc-get/default.nix index f33290e662c6..c0099d822e40 100644 --- a/pkgs/tools/misc/vrc-get/default.nix +++ b/pkgs/tools/misc/vrc-get/default.nix @@ -2,13 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "vrc-get"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "anatawa12"; repo = pname; rev = "v${version}"; - sha256 = "03p3y6q6md2m6fj9v01419cy1wa13dhasd2izs7j9gl9jh69w9xm"; + hash = "sha256-CJBwW2QsLNLyNubawBPD+Cy74JrrdSUHe7JBSdbMnjY="; + fetchSubmodules = true; }; nativeBuildInputs = [ pkg-config ]; @@ -18,7 +19,7 @@ rustPlatform.buildRustPackage rec { # Make openssl-sys use pkg-config. OPENSSL_NO_VENDOR = 1; - cargoSha256 = "03lv72gw39q7hibg2rzibvc1y0az30691jdf2fwn1m5ng0r7lqvp"; + cargoHash = "sha256-PnNo+MmBo/Ke7pL6KwRKXz3gycJmbYefTRMWOvlCQaQ="; meta = with lib; { description = "Command line client of VRChat Package Manager, the main feature of VRChat Creator Companion (VCC)"; From 2f4a79f5004815244e1097762e6ad3f1fe7214c7 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 21 Aug 2023 17:37:30 +0200 Subject: [PATCH 22/63] mission-center: 0.2.5 -> 0.3.1 --- .../misc/mission-center/Cargo.lock | 274 ++++++++- .../misc/mission-center/default.nix | 15 +- .../{proxy-Cargo.lock => gatherer-Cargo.lock} | 579 ++++++++++-------- 3 files changed, 600 insertions(+), 268 deletions(-) rename pkgs/applications/misc/mission-center/{proxy-Cargo.lock => gatherer-Cargo.lock} (51%) diff --git a/pkgs/applications/misc/mission-center/Cargo.lock b/pkgs/applications/misc/mission-center/Cargo.lock index 3dbc6596dd91..943ee09302dc 100644 --- a/pkgs/applications/misc/mission-center/Cargo.lock +++ b/pkgs/applications/misc/mission-center/Cargo.lock @@ -52,6 +52,44 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener", + "futures-core", +] + +[[package]] +name = "async-lock" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +dependencies = [ + "event-listener", +] + +[[package]] +name = "async-task" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" + +[[package]] +name = "atomic-waker" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" + [[package]] name = "autocfg" version = "1.1.0" @@ -85,6 +123,21 @@ dependencies = [ "generic-array", ] +[[package]] +name = "blocking" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "atomic-waker", + "fastrand", + "futures-lite", + "log", +] + [[package]] name = "bumpalo" version = "3.13.0" @@ -182,6 +235,15 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" +[[package]] +name = "concurrent-queue" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +dependencies = [ + "crossbeam-utils 0.8.16", +] + [[package]] name = "const-random" version = "0.1.15" @@ -422,6 +484,12 @@ dependencies = [ "libc 0.2.147", ] +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + [[package]] name = "fallible-iterator" version = "0.2.0" @@ -434,6 +502,15 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + [[package]] name = "field-offset" version = "0.3.6" @@ -476,6 +553,21 @@ version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + [[package]] name = "futures-macro" version = "0.3.28" @@ -955,6 +1047,32 @@ dependencies = [ "web-sys", ] +[[package]] +name = "interprocess" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81f2533f3be42fffe3b5e63b71aeca416c1c3bc33e4e27be018521e76b1f38fb" +dependencies = [ + "blocking", + "cfg-if 1.0.0", + "futures-core", + "futures-io", + "intmap", + "libc 0.2.147", + "once_cell", + "rustc_version 0.4.0", + "spinning", + "thiserror", + "to_method", + "winapi", +] + +[[package]] +name = "intmap" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae52f28f45ac2bc96edb7714de995cffc174a395fb0abf5bff453587c980d7b9" + [[package]] name = "io-lifetimes" version = "1.0.11" @@ -1091,6 +1209,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "lock_api" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +dependencies = [ + "autocfg", + "scopeguard", +] + [[package]] name = "log" version = "0.4.19" @@ -1153,8 +1281,9 @@ dependencies = [ [[package]] name = "missioncenter" -version = "0.2.5" +version = "0.3.1" dependencies = [ + "arrayvec 0.7.4", "drm", "egl", "errno-sys", @@ -1162,6 +1291,7 @@ dependencies = [ "gettext-rs", "gl", "gtk4", + "interprocess", "lazy_static", "libadwaita", "libc 0.2.147", @@ -1182,8 +1312,10 @@ dependencies = [ "serde", "serde_json", "sha2", + "shared_memory_extended", "sysinfo", "textdistance", + "thiserror", ] [[package]] @@ -1330,6 +1462,12 @@ dependencies = [ "system-deps", ] +[[package]] +name = "parking" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" + [[package]] name = "pathfinder_canvas" version = "0.5.0" @@ -1354,7 +1492,7 @@ name = "pathfinder_content" version = "0.5.0" source = "git+https://github.com/servo/pathfinder?rev=21ec6fa933547636bc6c5ee8f0dd4a0ea3fcd062#21ec6fa933547636bc6c5ee8f0dd4a0ea3fcd062" dependencies = [ - "arrayvec", + "arrayvec 0.5.2", "bitflags 1.3.2", "image", "log", @@ -1501,6 +1639,12 @@ dependencies = [ "miniz_oxide", ] +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + [[package]] name = "proc-macro-crate" version = "1.3.1" @@ -1568,6 +1712,36 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc 0.2.147", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + [[package]] name = "raw-cpuid" version = "11.0.1" @@ -1763,6 +1937,19 @@ dependencies = [ "digest", ] +[[package]] +name = "shared_memory_extended" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "004d7ece9a3be64f85471d50967710b0a146144225bed5f0abd0514a3bed086f" +dependencies = [ + "cfg-if 1.0.0", + "libc 0.2.147", + "nix", + "rand", + "win-sys", +] + [[package]] name = "slab" version = "0.4.8" @@ -1778,6 +1965,15 @@ version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +[[package]] +name = "spinning" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d4f0e86297cad2658d92a707320d87bf4e6ae1050287f51d19b67ef3f153a7b" +dependencies = [ + "lock_api", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -1880,6 +2076,12 @@ dependencies = [ "crunchy", ] +[[package]] +name = "to_method" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8" + [[package]] name = "toml" version = "0.7.6" @@ -1956,6 +2158,12 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "waker-fn" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -2079,6 +2287,15 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "win-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b7b128a98c1cfa201b09eb49ba285887deb3cbe7466a98850eb1adabb452be5" +dependencies = [ + "windows", +] + [[package]] name = "winapi" version = "0.3.9" @@ -2101,6 +2318,19 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45296b64204227616fdbf2614cefa4c236b98ee64dfaaaa435207ed99fe7829f" +dependencies = [ + "windows_aarch64_msvc 0.34.0", + "windows_i686_gnu 0.34.0", + "windows_i686_msvc 0.34.0", + "windows_x86_64_gnu 0.34.0", + "windows_x86_64_msvc 0.34.0", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -2117,12 +2347,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_x86_64_msvc 0.48.0", ] [[package]] @@ -2131,24 +2361,48 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" + [[package]] name = "windows_aarch64_msvc" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +[[package]] +name = "windows_i686_gnu" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" + [[package]] name = "windows_i686_gnu" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +[[package]] +name = "windows_i686_msvc" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" + [[package]] name = "windows_i686_msvc" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +[[package]] +name = "windows_x86_64_gnu" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" + [[package]] name = "windows_x86_64_gnu" version = "0.48.0" @@ -2161,6 +2415,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +[[package]] +name = "windows_x86_64_msvc" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" + [[package]] name = "windows_x86_64_msvc" version = "0.48.0" diff --git a/pkgs/applications/misc/mission-center/default.nix b/pkgs/applications/misc/mission-center/default.nix index 3c4a81a509a9..32f9d90bd207 100644 --- a/pkgs/applications/misc/mission-center/default.nix +++ b/pkgs/applications/misc/mission-center/default.nix @@ -36,19 +36,19 @@ let nvtop = fetchFromGitHub { owner = "Syllo"; repo = "nvtop"; - rev = "9a8458b541a195a0c5cadafb66e240962c852b39"; - hash = "sha256-iFBZbESRTuwgLSUuHnjcXwmpvdeQrd3oUJd7BRyxu84="; + rev = "be47f8c560487efc6e6a419d59c69bfbdb819324"; + hash = "sha256-MdaZYLxCuVX4LvbwBYNfHHoJWqZAy4J8NBK7Guh2whc="; }; in stdenv.mkDerivation rec { pname = "mission-center"; - version = "0.2.5"; + version = "0.3.1"; src = fetchFromGitLab { owner = "mission-center-devs"; repo = "mission-center"; rev = "v${version}"; - hash = "sha256-f6GkwF+3USl60pUxxTu90KzdsfxBiAkiqnBSTTmC2Lc="; + hash = "sha256-fiUF1mvbnguySy2ZXTi4Z61t35FO6fljqm21dMGwQMI="; }; cargoDeps = symlinkJoin { @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { }; }) (rustPlatform.importCargoLock { - lockFile = ./proxy-Cargo.lock; + lockFile = ./gatherer-Cargo.lock; }) ]; }; @@ -111,7 +111,10 @@ stdenv.mkDerivation rec { done cd ../.. patchShebangs data/hwdb/generate_hwdb.py - sed -i 's|cmd.arg("dmidecode")|cmd.arg("${dmidecode}/bin/dmidecode")|g' src/sys_info_v2/mem_info.rs + ''; + + postInstall = '' + wrapProgram $out/bin/missioncenter --prefix PATH : $out/bin:${dmidecode}/bin ''; meta = with lib; { diff --git a/pkgs/applications/misc/mission-center/proxy-Cargo.lock b/pkgs/applications/misc/mission-center/gatherer-Cargo.lock similarity index 51% rename from pkgs/applications/misc/mission-center/proxy-Cargo.lock rename to pkgs/applications/misc/mission-center/gatherer-Cargo.lock index 7b99bafde589..ba0385a515be 100644 --- a/pkgs/applications/misc/mission-center/proxy-Cargo.lock +++ b/pkgs/applications/misc/mission-center/gatherer-Cargo.lock @@ -3,53 +3,54 @@ version = 3 [[package]] -name = "anstream" -version = "0.3.2" +name = "anyhow" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is-terminal", - "utf8parse", + "concurrent-queue", + "event-listener", + "futures-core", ] [[package]] -name = "anstyle" -version = "1.0.0" +name = "async-lock" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" - -[[package]] -name = "anstyle-parse" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" dependencies = [ - "utf8parse", + "event-listener", ] [[package]] -name = "anstyle-query" -version = "1.0.0" +name = "async-task" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -dependencies = [ - "windows-sys", -] +checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] -name = "anstyle-wincon" -version = "1.0.1" +name = "atomic-waker" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" -dependencies = [ - "anstyle", - "windows-sys", -] +checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" @@ -58,20 +59,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "block-buffer" -version = "0.10.4" +name = "blocking" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" dependencies = [ - "generic-array", + "async-channel", + "async-lock", + "async-task", + "atomic-waker", + "fastrand", + "futures-lite", + "log", ] -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" - [[package]] name = "cfg-if" version = "1.0.0" @@ -79,53 +80,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "clap" -version = "4.3.4" +name = "concurrent-queue" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80672091db20273a15cf9fdd4e47ed43b5091ec9841bf4c6145c9dfbbcae09ed" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" dependencies = [ - "clap_builder", - "clap_derive", - "once_cell", + "crossbeam-utils", ] -[[package]] -name = "clap_builder" -version = "4.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1458a1df40e1e2afebb7ab60ce55c1fa8f431146205aa5f4887e0b111c27636" -dependencies = [ - "anstream", - "anstyle", - "bitflags", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - [[package]] name = "const-random" version = "0.1.15" @@ -149,12 +111,12 @@ dependencies = [ ] [[package]] -name = "cpufeatures" -version = "0.2.9" +name = "crossbeam-utils" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ - "libc", + "cfg-if", ] [[package]] @@ -163,26 +125,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", -] - [[package]] name = "dlv-list" version = "0.5.0" @@ -193,34 +135,60 @@ dependencies = [ ] [[package]] -name = "errno" +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "futures-core" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" + +[[package]] +name = "futures-io" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "gatherer" version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ - "errno-dragonfly", + "anyhow", + "arrayvec", + "interprocess", + "lazy_static", "libc", - "windows-sys", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", + "num_cpus", + "rust-ini", + "shared_memory_extended", + "thiserror", ] [[package]] @@ -240,49 +208,46 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ + "cfg-if", +] + +[[package]] +name = "interprocess" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81f2533f3be42fffe3b5e63b71aeca416c1c3bc33e4e27be018521e76b1f38fb" +dependencies = [ + "blocking", + "cfg-if", + "futures-core", + "futures-io", + "intmap", "libc", + "once_cell", + "rustc_version", + "spinning", + "thiserror", + "to_method", + "winapi", ] [[package]] -name = "hermit-abi" -version = "0.3.1" +name = "intmap" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys", -] - -[[package]] -name = "is-terminal" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" -dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", - "windows-sys", -] +checksum = "ae52f28f45ac2bc96edb7714de995cffc174a395fb0abf5bff453587c980d7b9" [[package]] name = "lazy_static" @@ -292,23 +257,51 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.146" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] -name = "linux-raw-sys" -version = "0.3.8" +name = "lock_api" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "nix" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +dependencies = [ + "bitflags", + "cfg-if", + "libc", + "static_assertions", +] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "libc", ] @@ -328,6 +321,24 @@ dependencies = [ "hashbrown", ] +[[package]] +name = "parking" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" + +[[package]] +name = "pin-project-lite" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + [[package]] name = "proc-macro-hack" version = "0.5.20+deprecated" @@ -336,32 +347,50 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.60" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] [[package]] -name = "proxy" -version = "0.2.5" +name = "quote" +version = "1.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ - "clap", - "lazy_static", - "libc", - "num_cpus", - "rust-ini", - "sha2", + "proc-macro2", ] [[package]] -name = "quote" -version = "1.0.28" +name = "rand" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ - "proc-macro2", + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", ] [[package]] @@ -375,47 +404,85 @@ dependencies = [ ] [[package]] -name = "rustix" -version = "0.37.20" +name = "rustc_version" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys", + "semver", ] [[package]] -name = "sha2" -version = "0.10.7" +name = "scopeguard" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "semver" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" + +[[package]] +name = "shared_memory_extended" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "004d7ece9a3be64f85471d50967710b0a146144225bed5f0abd0514a3bed086f" dependencies = [ "cfg-if", - "cpufeatures", - "digest", + "libc", + "nix", + "rand", + "win-sys", ] [[package]] -name = "strsim" -version = "0.10.0" +name = "spinning" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "2d4f0e86297cad2658d92a707320d87bf4e6ae1050287f51d19b67ef3f153a7b" +dependencies = [ + "lock_api", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "syn" -version = "2.0.18" +version = "2.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "thiserror" +version = "1.0.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "tiny-keccak" version = "2.0.2" @@ -426,28 +493,22 @@ dependencies = [ ] [[package]] -name = "typenum" -version = "1.16.0" +name = "to_method" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8" [[package]] name = "unicode-ident" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] -name = "utf8parse" -version = "0.2.1" +name = "waker-fn" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "wasi" @@ -456,67 +517,75 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "windows-sys" -version = "0.48.0" +name = "win-sys" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +checksum = "5b7b128a98c1cfa201b09eb49ba285887deb3cbe7466a98850eb1adabb452be5" dependencies = [ - "windows-targets", + "windows", ] [[package]] -name = "windows-targets" -version = "0.48.0" +name = "winapi" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45296b64204227616fdbf2614cefa4c236b98ee64dfaaaa435207ed99fe7829f" dependencies = [ - "windows_aarch64_gnullvm", "windows_aarch64_msvc", "windows_i686_gnu", "windows_i686_msvc", "windows_x86_64_gnu", - "windows_x86_64_gnullvm", "windows_x86_64_msvc", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" From b12805b27f0996a7915b18a78afd8a4510b9d534 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 24 Aug 2023 09:13:33 +0200 Subject: [PATCH 23/63] python311Packages.hass-nabucasa: 0.69.0 -> 0.70.0 Diff: https://github.com/nabucasa/hass-nabucasa/compare/refs/tags/0.69.0...0.70.0 Changelog: https://github.com/NabuCasa/hass-nabucasa/releases/tag/0.70.0 --- pkgs/development/python-modules/hass-nabucasa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index 96297616d7b6..9bc33f5c7e01 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.69.0"; + version = "0.70.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "nabucasa"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-7FO/z5AseP80y74e4ivLXlwB9t5jJf2bCaNp6HfqZ1c="; + hash = "sha256-lELb39N5pAZFeANgzg5TBmC+gmY/wgXbE7wlvdlJe2A="; }; postPatch = '' From 407bfd3c88ec86881266422c978998318203fb95 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 24 Aug 2023 09:21:38 +0200 Subject: [PATCH 24/63] python311Packages.publicsuffixlist: 0.10.0.20230814 -> 0.10.0.20230824 --- pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 1c6e042e5778..455d095b7ea5 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20230814"; + version = "0.10.0.20230824"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GG6ilUUauVT2u/BuS4agzJVQdydEuGwpxJVznWDb46Q="; + hash = "sha256-8Cln/fjc1ne1EPyvGJH55N4Xzs9FbvZOxaoaXiWY8Bw="; }; passthru.optional-dependencies = { From 1bb708350a0bdf19bf6cfffe67151d484d79a839 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 25 Aug 2023 04:20:00 +0000 Subject: [PATCH 25/63] typescript: 5.1.6 -> 5.2.2 Diff: https://github.com/microsoft/TypeScript/compare/v5.1.6...v5.2.2 Changelog: https://github.com/microsoft/TypeScript/releases/tag/v5.2.2 --- pkgs/development/compilers/typescript/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/typescript/default.nix b/pkgs/development/compilers/typescript/default.nix index d63fe8651a1b..af60548c32e0 100644 --- a/pkgs/development/compilers/typescript/default.nix +++ b/pkgs/development/compilers/typescript/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "typescript"; - version = "5.1.6"; + version = "5.2.2"; src = fetchFromGitHub { owner = "microsoft"; repo = "TypeScript"; rev = "v${version}"; - hash = "sha256-YBAAiO7MBJ41VK6A9zeExB7ZSbbrQ23sVTHAqo+/H/w="; + hash = "sha256-wjoqDmCudN5+9C3GrP1viiXBvsWgU0UIYWaFeK/TJEY="; }; - npmDepsHash = "sha256-RHiUhhkzkr2Ra3wc1d13gE2WIZL49w7IEFEAZuBDTDI="; + npmDepsHash = "sha256-7Wm6nlpqZRNqBU0mYFZRVWQkO4uqvrKrp2h2aEmZtow="; meta = with lib; { description = "A superset of JavaScript that compiles to clean JavaScript output"; From bb160f01b67fef7a00c22a99320e5e7a2e567118 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Aug 2023 12:29:59 +0200 Subject: [PATCH 26/63] python311Packages.keyrings-alt: add changelog to meta --- pkgs/development/python-modules/keyrings-alt/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix index ab6959389a9e..aac7754c5c14 100644 --- a/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/pkgs/development/python-modules/keyrings-alt/default.nix @@ -39,9 +39,10 @@ buildPythonPackage rec { ]; meta = with lib; { - license = licenses.mit; description = "Alternate keyring implementations"; homepage = "https://github.com/jaraco/keyrings.alt"; + changelog = "https://github.com/jaraco/keyrings.alt/blob/v${version}/NEWS.rst"; + license = licenses.mit; maintainers = with maintainers; [ nyarly ]; }; } From 37ef7f9aace0268fc4d3882c6326ac19a9a4a7c5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Aug 2023 12:30:32 +0200 Subject: [PATCH 27/63] python311Packages.keyrings-alt: normalize pname --- pkgs/development/python-modules/keyrings-alt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix index aac7754c5c14..443c4fa805fd 100644 --- a/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/pkgs/development/python-modules/keyrings-alt/default.nix @@ -11,7 +11,7 @@ }: buildPythonPackage rec { - pname = "keyrings.alt"; + pname = "keyrings-alt"; version = "4.2.0"; format = "pyproject"; disabled = isPy27; From 8f60952c3d3c6b5cbab045127227ab2ad03fde7c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Aug 2023 12:32:49 +0200 Subject: [PATCH 28/63] python311Packages.keyrings-alt: 4.2.0 -> 5.0.0 Changelog: https://github.com/jaraco/keyrings.alt/blob/v5.0.0/NEWS.rst --- .../python-modules/keyrings-alt/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix index 443c4fa805fd..f463b18950dd 100644 --- a/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/pkgs/development/python-modules/keyrings-alt/default.nix @@ -1,24 +1,24 @@ { lib , buildPythonPackage , fetchPypi -, pythonOlder -, isPy27 -, six - -, pytestCheckHook +, jaraco-classes , keyring +, pytestCheckHook +, pythonOlder , setuptools-scm }: buildPythonPackage rec { pname = "keyrings-alt"; - version = "4.2.0"; + version = "5.0.0"; format = "pyproject"; - disabled = isPy27; + + disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-K6PVZEG6Bjf1+cCWBo9nAQrART+dC2Jt4qowGTU7ZDE="; + pname = "keyrings.alt"; + inherit version; + hash = "sha256-nURstHu86pD/ouzD6AA6z0FXP8IBv0S0vxO9DhFISCg="; }; nativeBuildInputs = [ @@ -26,7 +26,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - six + jaraco-classes ]; nativeCheckInputs = [ From d4364f931b2b0a7456cd0948500bfb9ade8a8ea0 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 25 Aug 2023 22:04:47 +0800 Subject: [PATCH 29/63] mongosh: 1.10.5 -> 1.10.6 --- .../tools/mongosh/package-lock.json | 1015 +++++++++-------- pkgs/development/tools/mongosh/source.json | 8 +- 2 files changed, 516 insertions(+), 507 deletions(-) diff --git a/pkgs/development/tools/mongosh/package-lock.json b/pkgs/development/tools/mongosh/package-lock.json index 8dc69a1d059c..f3af35f3e10f 100644 --- a/pkgs/development/tools/mongosh/package-lock.json +++ b/pkgs/development/tools/mongosh/package-lock.json @@ -1,15 +1,15 @@ { "name": "mongosh", - "version": "1.10.5", + "version": "1.10.6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mongosh", - "version": "1.10.5", + "version": "1.10.6", "license": "Apache-2.0", "dependencies": { - "@mongosh/cli-repl": "1.10.5" + "@mongosh/cli-repl": "1.10.6" }, "bin": { "mongosh": "bin/mongosh.js" @@ -122,43 +122,43 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "node_modules/@aws-sdk/client-cognito-identity": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.391.0.tgz", - "integrity": "sha512-5mlkdrLP6sTG6D+q/qFw6vPVegFGSy1XcVUdERmWo6fvR7mYlRNETGC5sNsGPcMhnN3MCviqxCJmXpwnsP7okg==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.398.0.tgz", + "integrity": "sha512-Pr/S1f8R2FsJ8DwBC6g0CSdtZNNV5dMHhlIi+t8YAmCJvP4KT+UhzFjbvQRINlBRLFuGUuP7p5vRcGVELD3+wA==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sts": "3.391.0", - "@aws-sdk/credential-provider-node": "3.391.0", - "@aws-sdk/middleware-host-header": "3.391.0", - "@aws-sdk/middleware-logger": "3.391.0", - "@aws-sdk/middleware-recursion-detection": "3.391.0", - "@aws-sdk/middleware-signing": "3.391.0", - "@aws-sdk/middleware-user-agent": "3.391.0", - "@aws-sdk/types": "3.391.0", - "@aws-sdk/util-endpoints": "3.391.0", - "@aws-sdk/util-user-agent-browser": "3.391.0", - "@aws-sdk/util-user-agent-node": "3.391.0", - "@smithy/config-resolver": "^2.0.3", - "@smithy/fetch-http-handler": "^2.0.3", - "@smithy/hash-node": "^2.0.3", - "@smithy/invalid-dependency": "^2.0.3", - "@smithy/middleware-content-length": "^2.0.3", - "@smithy/middleware-endpoint": "^2.0.3", - "@smithy/middleware-retry": "^2.0.3", - "@smithy/middleware-serde": "^2.0.3", + "@aws-sdk/client-sts": "3.398.0", + "@aws-sdk/credential-provider-node": "3.398.0", + "@aws-sdk/middleware-host-header": "3.398.0", + "@aws-sdk/middleware-logger": "3.398.0", + "@aws-sdk/middleware-recursion-detection": "3.398.0", + "@aws-sdk/middleware-signing": "3.398.0", + "@aws-sdk/middleware-user-agent": "3.398.0", + "@aws-sdk/types": "3.398.0", + "@aws-sdk/util-endpoints": "3.398.0", + "@aws-sdk/util-user-agent-browser": "3.398.0", + "@aws-sdk/util-user-agent-node": "3.398.0", + "@smithy/config-resolver": "^2.0.5", + "@smithy/fetch-http-handler": "^2.0.5", + "@smithy/hash-node": "^2.0.5", + "@smithy/invalid-dependency": "^2.0.5", + "@smithy/middleware-content-length": "^2.0.5", + "@smithy/middleware-endpoint": "^2.0.5", + "@smithy/middleware-retry": "^2.0.5", + "@smithy/middleware-serde": "^2.0.5", "@smithy/middleware-stack": "^2.0.0", - "@smithy/node-config-provider": "^2.0.3", - "@smithy/node-http-handler": "^2.0.3", - "@smithy/protocol-http": "^2.0.3", - "@smithy/smithy-client": "^2.0.3", - "@smithy/types": "^2.2.0", - "@smithy/url-parser": "^2.0.3", + "@smithy/node-config-provider": "^2.0.5", + "@smithy/node-http-handler": "^2.0.5", + "@smithy/protocol-http": "^2.0.5", + "@smithy/smithy-client": "^2.0.5", + "@smithy/types": "^2.2.2", + "@smithy/url-parser": "^2.0.5", "@smithy/util-base64": "^2.0.0", "@smithy/util-body-length-browser": "^2.0.0", - "@smithy/util-body-length-node": "^2.0.0", - "@smithy/util-defaults-mode-browser": "^2.0.3", - "@smithy/util-defaults-mode-node": "^2.0.3", + "@smithy/util-body-length-node": "^2.1.0", + "@smithy/util-defaults-mode-browser": "^2.0.5", + "@smithy/util-defaults-mode-node": "^2.0.5", "@smithy/util-retry": "^2.0.0", "@smithy/util-utf8": "^2.0.0", "tslib": "^2.5.0" @@ -168,40 +168,40 @@ } }, "node_modules/@aws-sdk/client-sso": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.391.0.tgz", - "integrity": "sha512-aT+O1CbWIWYlCtWK6g3ZaMvFNImOgFGurOEPscuedqzG5UQc1bRtRrGYShLyzcZgfXP+s0cKYJqgGeRNoWiwqA==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.398.0.tgz", + "integrity": "sha512-CygL0jhfibw4kmWXG/3sfZMFNjcXo66XUuPC4BqZBk8Rj5vFoxp1vZeMkDLzTIk97Nvo5J5Bh+QnXKhub6AckQ==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/middleware-host-header": "3.391.0", - "@aws-sdk/middleware-logger": "3.391.0", - "@aws-sdk/middleware-recursion-detection": "3.391.0", - "@aws-sdk/middleware-user-agent": "3.391.0", - "@aws-sdk/types": "3.391.0", - "@aws-sdk/util-endpoints": "3.391.0", - "@aws-sdk/util-user-agent-browser": "3.391.0", - "@aws-sdk/util-user-agent-node": "3.391.0", - "@smithy/config-resolver": "^2.0.3", - "@smithy/fetch-http-handler": "^2.0.3", - "@smithy/hash-node": "^2.0.3", - "@smithy/invalid-dependency": "^2.0.3", - "@smithy/middleware-content-length": "^2.0.3", - "@smithy/middleware-endpoint": "^2.0.3", - "@smithy/middleware-retry": "^2.0.3", - "@smithy/middleware-serde": "^2.0.3", + "@aws-sdk/middleware-host-header": "3.398.0", + "@aws-sdk/middleware-logger": "3.398.0", + "@aws-sdk/middleware-recursion-detection": "3.398.0", + "@aws-sdk/middleware-user-agent": "3.398.0", + "@aws-sdk/types": "3.398.0", + "@aws-sdk/util-endpoints": "3.398.0", + "@aws-sdk/util-user-agent-browser": "3.398.0", + "@aws-sdk/util-user-agent-node": "3.398.0", + "@smithy/config-resolver": "^2.0.5", + "@smithy/fetch-http-handler": "^2.0.5", + "@smithy/hash-node": "^2.0.5", + "@smithy/invalid-dependency": "^2.0.5", + "@smithy/middleware-content-length": "^2.0.5", + "@smithy/middleware-endpoint": "^2.0.5", + "@smithy/middleware-retry": "^2.0.5", + "@smithy/middleware-serde": "^2.0.5", "@smithy/middleware-stack": "^2.0.0", - "@smithy/node-config-provider": "^2.0.3", - "@smithy/node-http-handler": "^2.0.3", - "@smithy/protocol-http": "^2.0.3", - "@smithy/smithy-client": "^2.0.3", - "@smithy/types": "^2.2.0", - "@smithy/url-parser": "^2.0.3", + "@smithy/node-config-provider": "^2.0.5", + "@smithy/node-http-handler": "^2.0.5", + "@smithy/protocol-http": "^2.0.5", + "@smithy/smithy-client": "^2.0.5", + "@smithy/types": "^2.2.2", + "@smithy/url-parser": "^2.0.5", "@smithy/util-base64": "^2.0.0", "@smithy/util-body-length-browser": "^2.0.0", - "@smithy/util-body-length-node": "^2.0.0", - "@smithy/util-defaults-mode-browser": "^2.0.3", - "@smithy/util-defaults-mode-node": "^2.0.3", + "@smithy/util-body-length-node": "^2.1.0", + "@smithy/util-defaults-mode-browser": "^2.0.5", + "@smithy/util-defaults-mode-node": "^2.0.5", "@smithy/util-retry": "^2.0.0", "@smithy/util-utf8": "^2.0.0", "tslib": "^2.5.0" @@ -211,43 +211,43 @@ } }, "node_modules/@aws-sdk/client-sts": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.391.0.tgz", - "integrity": "sha512-y+KmorcUx9o5O99sXVPbhGUpsLpfhzYRaYCqxArLsyzZTCO6XDXMi8vg/xtS+b703j9lWEl5GxAv2oBaEwEnhQ==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.398.0.tgz", + "integrity": "sha512-/3Pa9wLMvBZipKraq3AtbmTfXW6q9kyvhwOno64f1Fz7kFb8ijQFMGoATS70B2pGEZTlxkUqJFWDiisT6Q6dFg==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/credential-provider-node": "3.391.0", - "@aws-sdk/middleware-host-header": "3.391.0", - "@aws-sdk/middleware-logger": "3.391.0", - "@aws-sdk/middleware-recursion-detection": "3.391.0", - "@aws-sdk/middleware-sdk-sts": "3.391.0", - "@aws-sdk/middleware-signing": "3.391.0", - "@aws-sdk/middleware-user-agent": "3.391.0", - "@aws-sdk/types": "3.391.0", - "@aws-sdk/util-endpoints": "3.391.0", - "@aws-sdk/util-user-agent-browser": "3.391.0", - "@aws-sdk/util-user-agent-node": "3.391.0", - "@smithy/config-resolver": "^2.0.3", - "@smithy/fetch-http-handler": "^2.0.3", - "@smithy/hash-node": "^2.0.3", - "@smithy/invalid-dependency": "^2.0.3", - "@smithy/middleware-content-length": "^2.0.3", - "@smithy/middleware-endpoint": "^2.0.3", - "@smithy/middleware-retry": "^2.0.3", - "@smithy/middleware-serde": "^2.0.3", + "@aws-sdk/credential-provider-node": "3.398.0", + "@aws-sdk/middleware-host-header": "3.398.0", + "@aws-sdk/middleware-logger": "3.398.0", + "@aws-sdk/middleware-recursion-detection": "3.398.0", + "@aws-sdk/middleware-sdk-sts": "3.398.0", + "@aws-sdk/middleware-signing": "3.398.0", + "@aws-sdk/middleware-user-agent": "3.398.0", + "@aws-sdk/types": "3.398.0", + "@aws-sdk/util-endpoints": "3.398.0", + "@aws-sdk/util-user-agent-browser": "3.398.0", + "@aws-sdk/util-user-agent-node": "3.398.0", + "@smithy/config-resolver": "^2.0.5", + "@smithy/fetch-http-handler": "^2.0.5", + "@smithy/hash-node": "^2.0.5", + "@smithy/invalid-dependency": "^2.0.5", + "@smithy/middleware-content-length": "^2.0.5", + "@smithy/middleware-endpoint": "^2.0.5", + "@smithy/middleware-retry": "^2.0.5", + "@smithy/middleware-serde": "^2.0.5", "@smithy/middleware-stack": "^2.0.0", - "@smithy/node-config-provider": "^2.0.3", - "@smithy/node-http-handler": "^2.0.3", - "@smithy/protocol-http": "^2.0.3", - "@smithy/smithy-client": "^2.0.3", - "@smithy/types": "^2.2.0", - "@smithy/url-parser": "^2.0.3", + "@smithy/node-config-provider": "^2.0.5", + "@smithy/node-http-handler": "^2.0.5", + "@smithy/protocol-http": "^2.0.5", + "@smithy/smithy-client": "^2.0.5", + "@smithy/types": "^2.2.2", + "@smithy/url-parser": "^2.0.5", "@smithy/util-base64": "^2.0.0", "@smithy/util-body-length-browser": "^2.0.0", - "@smithy/util-body-length-node": "^2.0.0", - "@smithy/util-defaults-mode-browser": "^2.0.3", - "@smithy/util-defaults-mode-node": "^2.0.3", + "@smithy/util-body-length-node": "^2.1.0", + "@smithy/util-defaults-mode-browser": "^2.0.5", + "@smithy/util-defaults-mode-node": "^2.0.5", "@smithy/util-retry": "^2.0.0", "@smithy/util-utf8": "^2.0.0", "fast-xml-parser": "4.2.5", @@ -258,14 +258,14 @@ } }, "node_modules/@aws-sdk/credential-provider-cognito-identity": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.391.0.tgz", - "integrity": "sha512-60B2WDGJOijluCzeTQDzPWgGuAhYKTcYnK5fNMi9xzHBqw+IhPaGYcmAx1bQGY7SuoZBqVgt1h6fiNxY8TWO5w==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.398.0.tgz", + "integrity": "sha512-MFUhy1YayHg5ypRTk4OTfDumQRP+OJBagaGv14kA8DzhKH1sNrU4HV7A7y2J4SvkN5hG/KnLJqxpakCtB2/O2g==", "dependencies": { - "@aws-sdk/client-cognito-identity": "3.391.0", - "@aws-sdk/types": "3.391.0", + "@aws-sdk/client-cognito-identity": "3.398.0", + "@aws-sdk/types": "3.398.0", "@smithy/property-provider": "^2.0.0", - "@smithy/types": "^2.2.0", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -273,13 +273,13 @@ } }, "node_modules/@aws-sdk/credential-provider-env": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.391.0.tgz", - "integrity": "sha512-mAzICedcg4bfL0mM5O6QTd9mQ331NLse1DMr6XL21ZZiLB48ej19L7AGV2xq5QwVbqKU3IVv1myRyhvpDM9jMg==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.398.0.tgz", + "integrity": "sha512-Z8Yj5z7FroAsR6UVML+XUdlpoqEe9Dnle8c2h8/xWwIC2feTfIBhjLhRVxfbpbM1pLgBSNEcZ7U8fwq5l7ESVQ==", "dependencies": { - "@aws-sdk/types": "3.391.0", + "@aws-sdk/types": "3.398.0", "@smithy/property-provider": "^2.0.0", - "@smithy/types": "^2.2.0", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -287,19 +287,19 @@ } }, "node_modules/@aws-sdk/credential-provider-ini": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.391.0.tgz", - "integrity": "sha512-DJZmbmRMqNSfSV7UF8eBVhADz16KAMCTxnFuvgioHHfYUTZQEhCxRHI8jJqYWxhLTriS7AuTBIWr+1AIbwsCTA==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.398.0.tgz", + "integrity": "sha512-AsK1lStK3nB9Cn6S6ODb1ktGh7SRejsNVQVKX3t5d3tgOaX+aX1Iwy8FzM/ZEN8uCloeRifUGIY9uQFygg5mSw==", "dependencies": { - "@aws-sdk/credential-provider-env": "3.391.0", - "@aws-sdk/credential-provider-process": "3.391.0", - "@aws-sdk/credential-provider-sso": "3.391.0", - "@aws-sdk/credential-provider-web-identity": "3.391.0", - "@aws-sdk/types": "3.391.0", + "@aws-sdk/credential-provider-env": "3.398.0", + "@aws-sdk/credential-provider-process": "3.398.0", + "@aws-sdk/credential-provider-sso": "3.398.0", + "@aws-sdk/credential-provider-web-identity": "3.398.0", + "@aws-sdk/types": "3.398.0", "@smithy/credential-provider-imds": "^2.0.0", "@smithy/property-provider": "^2.0.0", "@smithy/shared-ini-file-loader": "^2.0.0", - "@smithy/types": "^2.2.0", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -307,20 +307,20 @@ } }, "node_modules/@aws-sdk/credential-provider-node": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.391.0.tgz", - "integrity": "sha512-LXHQwsTw4WBwRzD9swu8254Hao5MoIaGXIzbhX4EQ84dtOkKYbwiY4pDpLfcHcw3B1lFKkVclMze8WAs4EdEww==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.398.0.tgz", + "integrity": "sha512-odmI/DSKfuWUYeDnGTCEHBbC8/MwnF6yEq874zl6+owoVv0ZsYP8qBHfiJkYqrwg7wQ7Pi40sSAPC1rhesGwzg==", "dependencies": { - "@aws-sdk/credential-provider-env": "3.391.0", - "@aws-sdk/credential-provider-ini": "3.391.0", - "@aws-sdk/credential-provider-process": "3.391.0", - "@aws-sdk/credential-provider-sso": "3.391.0", - "@aws-sdk/credential-provider-web-identity": "3.391.0", - "@aws-sdk/types": "3.391.0", + "@aws-sdk/credential-provider-env": "3.398.0", + "@aws-sdk/credential-provider-ini": "3.398.0", + "@aws-sdk/credential-provider-process": "3.398.0", + "@aws-sdk/credential-provider-sso": "3.398.0", + "@aws-sdk/credential-provider-web-identity": "3.398.0", + "@aws-sdk/types": "3.398.0", "@smithy/credential-provider-imds": "^2.0.0", "@smithy/property-provider": "^2.0.0", "@smithy/shared-ini-file-loader": "^2.0.0", - "@smithy/types": "^2.2.0", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -328,14 +328,14 @@ } }, "node_modules/@aws-sdk/credential-provider-process": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.391.0.tgz", - "integrity": "sha512-KMlzPlBI+hBmXDo+EoFZdLgCVRkRa9B9iEE6x0+hQQ6g9bW6HI7cDRVdceR1ZoPasSaNAZ9QOXMTIBxTpn0sPQ==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.398.0.tgz", + "integrity": "sha512-WrkBL1W7TXN508PA9wRXPFtzmGpVSW98gDaHEaa8GolAPHMPa5t2QcC/z/cFpglzrcVv8SA277zu9Z8tELdZhg==", "dependencies": { - "@aws-sdk/types": "3.391.0", + "@aws-sdk/types": "3.398.0", "@smithy/property-provider": "^2.0.0", "@smithy/shared-ini-file-loader": "^2.0.0", - "@smithy/types": "^2.2.0", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -343,16 +343,16 @@ } }, "node_modules/@aws-sdk/credential-provider-sso": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.391.0.tgz", - "integrity": "sha512-FT/WoiRHiKys+FcRwvjui0yKuzNtJdn2uGuI1hYE0gpW1wVmW02ouufLckJTmcw09THUZ4w53OoCVU5OY00p8A==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.398.0.tgz", + "integrity": "sha512-2Dl35587xbnzR/GGZqA2MnFs8+kS4wbHQO9BioU0okA+8NRueohNMdrdQmQDdSNK4BfIpFspiZmFkXFNyEAfgw==", "dependencies": { - "@aws-sdk/client-sso": "3.391.0", - "@aws-sdk/token-providers": "3.391.0", - "@aws-sdk/types": "3.391.0", + "@aws-sdk/client-sso": "3.398.0", + "@aws-sdk/token-providers": "3.398.0", + "@aws-sdk/types": "3.398.0", "@smithy/property-provider": "^2.0.0", "@smithy/shared-ini-file-loader": "^2.0.0", - "@smithy/types": "^2.2.0", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -360,13 +360,13 @@ } }, "node_modules/@aws-sdk/credential-provider-web-identity": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.391.0.tgz", - "integrity": "sha512-n0vYg82B8bc4rxKltVbVqclev7hx+elyS9pEnZs3YbnbWJq0qqsznXmDfLqd1TcWpa09PGXcah0nsRDolVThsA==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.398.0.tgz", + "integrity": "sha512-iG3905Alv9pINbQ8/MIsshgqYMbWx+NDQWpxbIW3W0MkSH3iAqdVpSCteYidYX9G/jv2Um1nW3y360ib20bvNg==", "dependencies": { - "@aws-sdk/types": "3.391.0", + "@aws-sdk/types": "3.398.0", "@smithy/property-provider": "^2.0.0", - "@smithy/types": "^2.2.0", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -374,24 +374,24 @@ } }, "node_modules/@aws-sdk/credential-providers": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.391.0.tgz", - "integrity": "sha512-J2fh74zUC3qZnbZol95T9w9PTgmx9NfyIy5JVs43rISdvgnAkD9fXd6YbBfQOxl9Xx9HiZW7Fa3hTxma7d/zlA==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.398.0.tgz", + "integrity": "sha512-355vXmImn2e85mIWSYDVb101AF2lIVHKNCaH6sV1U/8i0ZOXh2cJYNdkRYrxNt1ezDB0k97lSKvuDx7RDvJyRg==", "dependencies": { - "@aws-sdk/client-cognito-identity": "3.391.0", - "@aws-sdk/client-sso": "3.391.0", - "@aws-sdk/client-sts": "3.391.0", - "@aws-sdk/credential-provider-cognito-identity": "3.391.0", - "@aws-sdk/credential-provider-env": "3.391.0", - "@aws-sdk/credential-provider-ini": "3.391.0", - "@aws-sdk/credential-provider-node": "3.391.0", - "@aws-sdk/credential-provider-process": "3.391.0", - "@aws-sdk/credential-provider-sso": "3.391.0", - "@aws-sdk/credential-provider-web-identity": "3.391.0", - "@aws-sdk/types": "3.391.0", + "@aws-sdk/client-cognito-identity": "3.398.0", + "@aws-sdk/client-sso": "3.398.0", + "@aws-sdk/client-sts": "3.398.0", + "@aws-sdk/credential-provider-cognito-identity": "3.398.0", + "@aws-sdk/credential-provider-env": "3.398.0", + "@aws-sdk/credential-provider-ini": "3.398.0", + "@aws-sdk/credential-provider-node": "3.398.0", + "@aws-sdk/credential-provider-process": "3.398.0", + "@aws-sdk/credential-provider-sso": "3.398.0", + "@aws-sdk/credential-provider-web-identity": "3.398.0", + "@aws-sdk/types": "3.398.0", "@smithy/credential-provider-imds": "^2.0.0", "@smithy/property-provider": "^2.0.0", - "@smithy/types": "^2.2.0", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -399,13 +399,13 @@ } }, "node_modules/@aws-sdk/middleware-host-header": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.391.0.tgz", - "integrity": "sha512-+nyNr0rb2ixY7mU48nibr7L7gsw37y4oELhqgnNKhcjZDJ34imBwKIMFa64n21FdftmhcjR8IdSpzXE9xrkJ8g==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.398.0.tgz", + "integrity": "sha512-m+5laWdBaxIZK2ko0OwcCHJZJ5V1MgEIt8QVQ3k4/kOkN9ICjevOYmba751pHoTnbOYB7zQd6D2OT3EYEEsUcA==", "dependencies": { - "@aws-sdk/types": "3.391.0", - "@smithy/protocol-http": "^2.0.3", - "@smithy/types": "^2.2.0", + "@aws-sdk/types": "3.398.0", + "@smithy/protocol-http": "^2.0.5", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -413,12 +413,12 @@ } }, "node_modules/@aws-sdk/middleware-logger": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.391.0.tgz", - "integrity": "sha512-KOwl5zo16b17JDhqILHBStccBQ2w35em7+/6vdkJdUII6OU8aVIFTlIQT9wOUvd4do6biIRBMZG3IK0Rg7mRDQ==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.398.0.tgz", + "integrity": "sha512-CiJjW+FL12elS6Pn7/UVjVK8HWHhXMfvHZvOwx/Qkpy340sIhkuzOO6fZEruECDTZhl2Wqn81XdJ1ZQ4pRKpCg==", "dependencies": { - "@aws-sdk/types": "3.391.0", - "@smithy/types": "^2.2.0", + "@aws-sdk/types": "3.398.0", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -426,13 +426,13 @@ } }, "node_modules/@aws-sdk/middleware-recursion-detection": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.391.0.tgz", - "integrity": "sha512-hVR3z59G7pX4pjDQs9Ag1tMgbLeGXOzeAAaNP9fEtHSd3KBMAGQgN3K3b9WPjzE2W0EoloHRJMK4qxZErdde2g==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.398.0.tgz", + "integrity": "sha512-7QpOqPQAZNXDXv6vsRex4R8dLniL0E/80OPK4PPFsrCh9btEyhN9Begh4i1T+5lL28hmYkztLOkTQ2N5J3hgRQ==", "dependencies": { - "@aws-sdk/types": "3.391.0", - "@smithy/protocol-http": "^2.0.3", - "@smithy/types": "^2.2.0", + "@aws-sdk/types": "3.398.0", + "@smithy/protocol-http": "^2.0.5", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -440,13 +440,13 @@ } }, "node_modules/@aws-sdk/middleware-sdk-sts": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.391.0.tgz", - "integrity": "sha512-6ZXI3Z4QU+TnT5PwKWloGmRHG81tWeI18/zxf9wWzrO2NhYFvITzEJH0vWLLiXdWtn/BYfLULXtDvkTaepbI5A==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.398.0.tgz", + "integrity": "sha512-+JH76XHEgfVihkY+GurohOQ5Z83zVN1nYcQzwCFnCDTh4dG4KwhnZKG+WPw6XJECocY0R+H0ivofeALHvVWJtQ==", "dependencies": { - "@aws-sdk/middleware-signing": "3.391.0", - "@aws-sdk/types": "3.391.0", - "@smithy/types": "^2.2.0", + "@aws-sdk/middleware-signing": "3.398.0", + "@aws-sdk/types": "3.398.0", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -454,15 +454,15 @@ } }, "node_modules/@aws-sdk/middleware-signing": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.391.0.tgz", - "integrity": "sha512-2pAJJlZqaHc0d+cz2FTVrQmWi8ygKfqfczHUo/loCtOaMNtWXBHb/JsLEecs6cXdizy6gi3YsLz6VZYwY4Ssxw==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.398.0.tgz", + "integrity": "sha512-O0KqXAix1TcvZBFt1qoFkHMUNJOSgjJTYS7lFTRKSwgsD27bdW2TM2r9R8DAccWFt5Amjkdt+eOwQMIXPGTm8w==", "dependencies": { - "@aws-sdk/types": "3.391.0", + "@aws-sdk/types": "3.398.0", "@smithy/property-provider": "^2.0.0", - "@smithy/protocol-http": "^2.0.3", + "@smithy/protocol-http": "^2.0.5", "@smithy/signature-v4": "^2.0.0", - "@smithy/types": "^2.2.0", + "@smithy/types": "^2.2.2", "@smithy/util-middleware": "^2.0.0", "tslib": "^2.5.0" }, @@ -471,14 +471,14 @@ } }, "node_modules/@aws-sdk/middleware-user-agent": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.391.0.tgz", - "integrity": "sha512-LdK9uMNA14zqRw3B79Mhy7GX36qld/GYo93xuu+lr+AQ98leZEdc6GUbrtNDI3fP1Z8TMQcyHUKBml4/B+wXpQ==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.398.0.tgz", + "integrity": "sha512-nF1jg0L+18b5HvTcYzwyFgfZQQMELJINFqI0mi4yRKaX7T5a3aGp5RVLGGju/6tAGTuFbfBoEhkhU3kkxexPYQ==", "dependencies": { - "@aws-sdk/types": "3.391.0", - "@aws-sdk/util-endpoints": "3.391.0", - "@smithy/protocol-http": "^2.0.3", - "@smithy/types": "^2.2.0", + "@aws-sdk/types": "3.398.0", + "@aws-sdk/util-endpoints": "3.398.0", + "@smithy/protocol-http": "^2.0.5", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -486,42 +486,42 @@ } }, "node_modules/@aws-sdk/token-providers": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.391.0.tgz", - "integrity": "sha512-kgfArsKLDJE71qQjfXiHiM5cZqgDHlMsqEx35+A65GmTWJaS1PGDqu3ZvVVU8E5mxnCCLw7vho21fsjvH6TBpg==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.398.0.tgz", + "integrity": "sha512-nrYgjzavGCKJL/48Vt0EL+OlIc5UZLfNGpgyUW9cv3XZwl+kXV0QB+HH0rHZZLfpbBgZ2RBIJR9uD5ieu/6hpQ==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/middleware-host-header": "3.391.0", - "@aws-sdk/middleware-logger": "3.391.0", - "@aws-sdk/middleware-recursion-detection": "3.391.0", - "@aws-sdk/middleware-user-agent": "3.391.0", - "@aws-sdk/types": "3.391.0", - "@aws-sdk/util-endpoints": "3.391.0", - "@aws-sdk/util-user-agent-browser": "3.391.0", - "@aws-sdk/util-user-agent-node": "3.391.0", - "@smithy/config-resolver": "^2.0.3", - "@smithy/fetch-http-handler": "^2.0.3", - "@smithy/hash-node": "^2.0.3", - "@smithy/invalid-dependency": "^2.0.3", - "@smithy/middleware-content-length": "^2.0.3", - "@smithy/middleware-endpoint": "^2.0.3", - "@smithy/middleware-retry": "^2.0.3", - "@smithy/middleware-serde": "^2.0.3", + "@aws-sdk/middleware-host-header": "3.398.0", + "@aws-sdk/middleware-logger": "3.398.0", + "@aws-sdk/middleware-recursion-detection": "3.398.0", + "@aws-sdk/middleware-user-agent": "3.398.0", + "@aws-sdk/types": "3.398.0", + "@aws-sdk/util-endpoints": "3.398.0", + "@aws-sdk/util-user-agent-browser": "3.398.0", + "@aws-sdk/util-user-agent-node": "3.398.0", + "@smithy/config-resolver": "^2.0.5", + "@smithy/fetch-http-handler": "^2.0.5", + "@smithy/hash-node": "^2.0.5", + "@smithy/invalid-dependency": "^2.0.5", + "@smithy/middleware-content-length": "^2.0.5", + "@smithy/middleware-endpoint": "^2.0.5", + "@smithy/middleware-retry": "^2.0.5", + "@smithy/middleware-serde": "^2.0.5", "@smithy/middleware-stack": "^2.0.0", - "@smithy/node-config-provider": "^2.0.3", - "@smithy/node-http-handler": "^2.0.3", + "@smithy/node-config-provider": "^2.0.5", + "@smithy/node-http-handler": "^2.0.5", "@smithy/property-provider": "^2.0.0", - "@smithy/protocol-http": "^2.0.3", + "@smithy/protocol-http": "^2.0.5", "@smithy/shared-ini-file-loader": "^2.0.0", - "@smithy/smithy-client": "^2.0.3", - "@smithy/types": "^2.2.0", - "@smithy/url-parser": "^2.0.3", + "@smithy/smithy-client": "^2.0.5", + "@smithy/types": "^2.2.2", + "@smithy/url-parser": "^2.0.5", "@smithy/util-base64": "^2.0.0", "@smithy/util-body-length-browser": "^2.0.0", - "@smithy/util-body-length-node": "^2.0.0", - "@smithy/util-defaults-mode-browser": "^2.0.3", - "@smithy/util-defaults-mode-node": "^2.0.3", + "@smithy/util-body-length-node": "^2.1.0", + "@smithy/util-defaults-mode-browser": "^2.0.5", + "@smithy/util-defaults-mode-node": "^2.0.5", "@smithy/util-retry": "^2.0.0", "@smithy/util-utf8": "^2.0.0", "tslib": "^2.5.0" @@ -531,11 +531,11 @@ } }, "node_modules/@aws-sdk/types": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.391.0.tgz", - "integrity": "sha512-QpYVFKMOnzHz/JMj/b8wb18qxiT92U/5r5MmtRz2R3LOH6ooTO96k4ozXCrYr0qNed1PAnOj73rPrrH2wnCJKQ==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.398.0.tgz", + "integrity": "sha512-r44fkS+vsEgKCuEuTV+TIk0t0m5ZlXHNjSDYEUvzLStbbfUFiNus/YG4UCa0wOk9R7VuQI67badsvvPeVPCGDQ==", "dependencies": { - "@smithy/types": "^2.2.0", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -543,11 +543,11 @@ } }, "node_modules/@aws-sdk/util-endpoints": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.391.0.tgz", - "integrity": "sha512-zv4sYDTQhNxyLoekcE02/nk3xvoo6yCHDy1kDJk0MFxOKaqUB+CvZdQBR4YBLSDlD4o4DUBmdYgKT58FfbM8sQ==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.398.0.tgz", + "integrity": "sha512-Fy0gLYAei/Rd6BrXG4baspCnWTUSd0NdokU1pZh4KlfEAEN1i8SPPgfiO5hLk7+2inqtCmqxVJlfqbMVe9k4bw==", "dependencies": { - "@aws-sdk/types": "3.391.0", + "@aws-sdk/types": "3.398.0", "tslib": "^2.5.0" }, "engines": { @@ -566,24 +566,24 @@ } }, "node_modules/@aws-sdk/util-user-agent-browser": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.391.0.tgz", - "integrity": "sha512-6ipHOB1WdCBNeAMJauN7l2qNE0WLVaTNhkD290/ElXm1FHGTL8yw6lIDIjhIFO1bmbZxDiKApwDiG7ROhaJoxQ==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.398.0.tgz", + "integrity": "sha512-A3Tzx1tkDHlBT+IgxmsMCHbV8LM7SwwCozq2ZjJRx0nqw3MCrrcxQFXldHeX/gdUMO+0Oocb7HGSnVODTq+0EA==", "dependencies": { - "@aws-sdk/types": "3.391.0", - "@smithy/types": "^2.2.0", + "@aws-sdk/types": "3.398.0", + "@smithy/types": "^2.2.2", "bowser": "^2.11.0", "tslib": "^2.5.0" } }, "node_modules/@aws-sdk/util-user-agent-node": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.391.0.tgz", - "integrity": "sha512-PVvAK/Lf4BdB1eJIZtyFpGSslGQwKpYt9/hKs5NlR+qxBMXU9T0DnTqH4GiXZaazvXr7OUVWitIF2b7iKBMTow==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.398.0.tgz", + "integrity": "sha512-RTVQofdj961ej4//fEkppFf4KXqKGMTCqJYghx3G0C/MYXbg7MGl7LjfNGtJcboRE8pfHHQ/TUWBDA7RIAPPlQ==", "dependencies": { - "@aws-sdk/types": "3.391.0", - "@smithy/node-config-provider": "^2.0.3", - "@smithy/types": "^2.2.0", + "@aws-sdk/types": "3.398.0", + "@smithy/node-config-provider": "^2.0.5", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -691,24 +691,24 @@ } }, "node_modules/@babel/core": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz", - "integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.11.tgz", + "integrity": "sha512-lh7RJrtPdhibbxndr6/xx0w8+CVlY5FJZiaSz908Fpy+G0xkBFTvwLcKJFF4PJxVfGhVWNebikpWGnOoC71juQ==", "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.22.10", "@babel/generator": "^7.22.10", "@babel/helper-compilation-targets": "^7.22.10", "@babel/helper-module-transforms": "^7.22.9", - "@babel/helpers": "^7.22.10", - "@babel/parser": "^7.22.10", + "@babel/helpers": "^7.22.11", + "@babel/parser": "^7.22.11", "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.10", - "@babel/types": "^7.22.10", + "@babel/traverse": "^7.22.11", + "@babel/types": "^7.22.11", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", - "json5": "^2.2.2", + "json5": "^2.2.3", "semver": "^6.3.1" }, "engines": { @@ -879,13 +879,13 @@ } }, "node_modules/@babel/helpers": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.10.tgz", - "integrity": "sha512-a41J4NW8HyZa1I1vAndrraTlPZ/eZoga2ZgS7fEr0tZJGVU4xqdE80CEm0CcNjha5EZ8fTBYLKHF0kqDUuAwQw==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.11.tgz", + "integrity": "sha512-vyOXC8PBWaGc5h7GMsNx68OH33cypkEDJCHvYVVgVbbxJDROYVtexSk0gK5iCF1xNjRIN2s8ai7hwkWDq5szWg==", "dependencies": { "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.10", - "@babel/types": "^7.22.10" + "@babel/traverse": "^7.22.11", + "@babel/types": "^7.22.11" }, "engines": { "node": ">=6.9.0" @@ -969,9 +969,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.10.tgz", - "integrity": "sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.11.tgz", + "integrity": "sha512-R5zb8eJIBPJriQtbH/htEQy4k7E2dHWlD2Y2VT07JCzwYZHBxV5ZYtM0UhXSNMT74LyxuM+b1jdL7pSesXbC/g==", "bin": { "parser": "bin/babel-parser.js" }, @@ -1035,9 +1035,9 @@ } }, "node_modules/@babel/traverse": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz", - "integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.11.tgz", + "integrity": "sha512-mzAenteTfomcB7mfPtyi+4oe5BZ6MXxWcn4CX+h4IRJ+OOGXBrWU6jDQavkQI9Vuc5P+donFabBfFCcmWka9lQ==", "dependencies": { "@babel/code-frame": "^7.22.10", "@babel/generator": "^7.22.10", @@ -1045,8 +1045,8 @@ "@babel/helper-function-name": "^7.22.5", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.22.10", - "@babel/types": "^7.22.10", + "@babel/parser": "^7.22.11", + "@babel/types": "^7.22.11", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -1055,9 +1055,9 @@ } }, "node_modules/@babel/types": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz", - "integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.11.tgz", + "integrity": "sha512-siazHiGuZRz9aB9NpHy9GOs9xiQPKnMzgdr493iI1M67vRXpnEq8ZOOKzezC5q7zwuQ6sDhdSp4SD9ixKSqKZg==", "dependencies": { "@babel/helper-string-parser": "^7.22.5", "@babel/helper-validator-identifier": "^7.22.5", @@ -1162,13 +1162,22 @@ "node": ">= 14.18.0" } }, - "node_modules/@mongosh/arg-parser": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/arg-parser/-/arg-parser-1.10.5.tgz", - "integrity": "sha512-Bt40S0q9Lgcn3JGHmFndmXVPpbE3FiaiV1MF4H15EFNIr9jWav95h+GH7ECrIEf8LkPW6kN1FGYnF3vEgepYzg==", + "node_modules/@mongodb-js/saslprep": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.0.tgz", + "integrity": "sha512-Xfijy7HvfzzqiOAhAepF4SGN5e9leLkMvg/OPOF97XemjfVCYN/oWa75wnkc6mltMSTwY+XlbhWgUOJmkFspSw==", + "optional": true, "dependencies": { - "@mongosh/errors": "1.10.5", - "@mongosh/i18n": "1.10.5", + "sparse-bitfield": "^3.0.3" + } + }, + "node_modules/@mongosh/arg-parser": { + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/arg-parser/-/arg-parser-1.10.6.tgz", + "integrity": "sha512-z6rXCrsG3mvH8TyFn+j0pZwAlYPhTOYNgiG7X/Jf3YZdtGbu31HFXdG0SQcHpt+3D9AMLQDMrABSrHLDM4PqJA==", + "dependencies": { + "@mongosh/errors": "1.10.6", + "@mongosh/i18n": "1.10.6", "mongodb-connection-string-url": "^2.6.0" }, "engines": { @@ -1176,9 +1185,9 @@ } }, "node_modules/@mongosh/async-rewriter2": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/async-rewriter2/-/async-rewriter2-1.10.5.tgz", - "integrity": "sha512-EO+YyzF2ZiCfA70cFNy0yhhxv8j4PwX+AOkL2IS07/j1xik4q2ipWXHIK5AHQKXUhaBqGxhwaa7/DSmSMMEABg==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/async-rewriter2/-/async-rewriter2-1.10.6.tgz", + "integrity": "sha512-1cd08jGwxj5TWdOSaLHnh82aT3IAzE7SpdXNdPIS6x9f1bddljnW21HT7aqVyuaG5RtU9kckf8eqE0pbD65taQ==", "dependencies": { "@babel/core": "^7.22.8", "@babel/plugin-transform-destructuring": "^7.22.5", @@ -1195,12 +1204,12 @@ } }, "node_modules/@mongosh/autocomplete": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/autocomplete/-/autocomplete-1.10.5.tgz", - "integrity": "sha512-580e/PdaEaBnHL31HHxVALuLWKH9Cck7BfHRfBzxnmRPH94JwbEe8SvZrOtqQJXmuLiJsXEmMYe7MpNnKiE1Qg==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/autocomplete/-/autocomplete-1.10.6.tgz", + "integrity": "sha512-mb1KgTMyfFb/WrBvaKLuBI3GbnlEkxC4JNqWSHW91nwvsrBY0rr13lSI/ENJX3CsrjzIC1DyxcY6J2um2UC7dw==", "dependencies": { "@mongodb-js/mongodb-constants": "^0.2.2", - "@mongosh/shell-api": "1.10.5", + "@mongosh/shell-api": "1.10.6", "semver": "^7.5.4" }, "engines": { @@ -1208,24 +1217,24 @@ } }, "node_modules/@mongosh/cli-repl": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/cli-repl/-/cli-repl-1.10.5.tgz", - "integrity": "sha512-3M8zo027AYGsTYDEf3qEmZKwHjl7kIheJOCeqBIl/sRbUi8lqpfIWju2DgzePVX/jkKZgLEkcJcNGF22gDPZPQ==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/cli-repl/-/cli-repl-1.10.6.tgz", + "integrity": "sha512-zb3LvlWsxxorgyPl18jatdVQreBtYd3A/+h1XGiNQtwjZ0eKkw4MSZudmz+z0SfTqRVPDMJ7Fgxk2m522e1HWA==", "dependencies": { - "@mongosh/arg-parser": "1.10.5", - "@mongosh/autocomplete": "1.10.5", - "@mongosh/editor": "1.10.5", - "@mongosh/errors": "1.10.5", - "@mongosh/history": "1.10.5", - "@mongosh/i18n": "1.10.5", - "@mongosh/js-multiline-to-singleline": "1.10.5", - "@mongosh/logging": "1.10.5", - "@mongosh/service-provider-core": "1.10.5", - "@mongosh/service-provider-server": "1.10.5", - "@mongosh/shell-api": "1.10.5", - "@mongosh/shell-evaluator": "1.10.5", - "@mongosh/snippet-manager": "1.10.5", - "@mongosh/types": "1.10.5", + "@mongosh/arg-parser": "1.10.6", + "@mongosh/autocomplete": "1.10.6", + "@mongosh/editor": "1.10.6", + "@mongosh/errors": "1.10.6", + "@mongosh/history": "1.10.6", + "@mongosh/i18n": "1.10.6", + "@mongosh/js-multiline-to-singleline": "1.10.6", + "@mongosh/logging": "1.10.6", + "@mongosh/service-provider-core": "1.10.6", + "@mongosh/service-provider-server": "1.10.6", + "@mongosh/shell-api": "1.10.6", + "@mongosh/shell-evaluator": "1.10.6", + "@mongosh/snippet-manager": "1.10.6", + "@mongosh/types": "1.10.6", "analytics-node": "^5.1.2", "ansi-escape-sequences": "^5.1.2", "askcharacter": "^1.0.0", @@ -1255,15 +1264,15 @@ } }, "node_modules/@mongosh/editor": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/editor/-/editor-1.10.5.tgz", - "integrity": "sha512-pAN+Cu7/fIiAhqaYE2eeMtr2pN2Im3+EgdmJyz2YezjTMvBPwRg7MsS2FU1cyD5bbqMfO9aEvmtQ8AD19UPkfQ==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/editor/-/editor-1.10.6.tgz", + "integrity": "sha512-HcHGSuVB9Jh27fi27flMtVCj7K0hiTmA1Wauv3IRwLOm+5QsMahXRt8sDIb86kw0mYtDke/UD2lWbbg351skPQ==", "dependencies": { - "@mongosh/js-multiline-to-singleline": "1.10.5", - "@mongosh/service-provider-core": "1.10.5", - "@mongosh/shell-api": "1.10.5", - "@mongosh/shell-evaluator": "1.10.5", - "@mongosh/types": "1.10.5", + "@mongosh/js-multiline-to-singleline": "1.10.6", + "@mongosh/service-provider-core": "1.10.6", + "@mongosh/shell-api": "1.10.6", + "@mongosh/shell-evaluator": "1.10.6", + "@mongosh/types": "1.10.6", "js-beautify": "^1.14.0" }, "engines": { @@ -1271,9 +1280,9 @@ } }, "node_modules/@mongosh/errors": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-1.10.5.tgz", - "integrity": "sha512-b9g/G/n5Oo5EOiW8i3CqC6pZUTHvFmD8fp0hG/LA0CXutvdzWHTLC3j8lEqqa6vByEj/GF12l9IPdBHs171wSw==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-1.10.6.tgz", + "integrity": "sha512-QWkp+1pTbsritSk2eAgw5+6m6h+GtP9n7C+LaiVhOB7HfYSCNdI9OVvZXpBzRC9Cw0rMORUc1BwUL/OioRtaYw==", "dependencies": { "chalk": "^4.1.2", "handlebars": "^4.7.7", @@ -1284,9 +1293,9 @@ } }, "node_modules/@mongosh/history": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-1.10.5.tgz", - "integrity": "sha512-kc8QAMAT7vSYW/BvS8rftp7WD+jfvWNdNYTRKxpv8Vuo6JD8p5+L6HThyc/1IufldGYQ9J30Rvrc4x8Hxc50tg==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-1.10.6.tgz", + "integrity": "sha512-lP6HauOMmmEr1TuHWbmBxFLT4ZHsEX3QxxvNU232LmH1XKNHOyr7G9oafAz/TnA49h+QNaRusKJwLEVMeI7Eaw==", "dependencies": { "mongodb-connection-string-url": "^2.6.0", "mongodb-redact": "^0.2.2" @@ -1296,11 +1305,11 @@ } }, "node_modules/@mongosh/i18n": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/i18n/-/i18n-1.10.5.tgz", - "integrity": "sha512-X+U+z5C41cn2ByMUSkS/k7depFiTT6bkR7/vyVPHVTS0JfrYwC1HIRTIB8O4HIhhriG9wt/nOQ8KIlGcYKezjg==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/i18n/-/i18n-1.10.6.tgz", + "integrity": "sha512-xj9/3MV6+jzcg+9HnInmAAtYLQF+2B8WNjrs3i+QHY0zl2C/2Fr59g8lL/btArtEbhCG0S0KYerYQ+9whI8qvg==", "dependencies": { - "@mongosh/errors": "1.10.5", + "@mongosh/errors": "1.10.6", "mustache": "^4.0.0" }, "engines": { @@ -1308,9 +1317,9 @@ } }, "node_modules/@mongosh/js-multiline-to-singleline": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-1.10.5.tgz", - "integrity": "sha512-jKbDw7XmQAYtJVdAgGlh+Gepn+lzVBlBQub68UYh/nagOe0QNNDXIdwr7Av39UF7gVBRH5hoC286VutMLJRtIA==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-1.10.6.tgz", + "integrity": "sha512-4kX7y6kAMCM/wwt1J6v6t6/rLQn5bZ8Xfc8HJA4bDiWVMt7FyjlrqShtkDXEzOcBpn2NMTKFrW8nmh1Bj3WZ2w==", "dependencies": { "@babel/core": "^7.16.12", "@babel/types": "^7.21.2" @@ -1320,14 +1329,14 @@ } }, "node_modules/@mongosh/logging": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/logging/-/logging-1.10.5.tgz", - "integrity": "sha512-qZQzDafW3sSAwsg8RDSwQeopZiN90J4eXmgstmEBj+qgFbBdZXfPaQNyOA5HVf6Kt9zOJXCqafa7FPXCDmgNhA==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/logging/-/logging-1.10.6.tgz", + "integrity": "sha512-QHvdyo2JC+1vb4y+G6civdx6UQSih5Ze+Myi63sHTNkTTEx7wf4qkRQm6qHNf++THxEjOB6Xmiq6V2J7WSfw4Q==", "dependencies": { "@mongodb-js/devtools-connect": "^2.3.1", - "@mongosh/errors": "1.10.5", - "@mongosh/history": "1.10.5", - "@mongosh/types": "1.10.5", + "@mongosh/errors": "1.10.6", + "@mongosh/history": "1.10.6", + "@mongosh/types": "1.10.6", "mongodb-log-writer": "^1.3.0", "mongodb-redact": "^0.2.2" }, @@ -1336,12 +1345,12 @@ } }, "node_modules/@mongosh/service-provider-core": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-1.10.5.tgz", - "integrity": "sha512-CPJ0U/R6yM99lx0X4M540tPn02QLg7S0Mqw4eVNzqAjpolNJBQSeec5Gd41TMwNU9MkWjUjDgSBtaacV103Fiw==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-1.10.6.tgz", + "integrity": "sha512-x91v6CnrTRr7Y61sUG5jLLqjcizggBiDHjpwxxauVvDrcziTWDXc9gEolJcgLqs2Roch3sQBc96BWfCwzJkfGw==", "dependencies": { "@aws-sdk/credential-providers": "^3.347.1", - "@mongosh/errors": "1.10.5", + "@mongosh/errors": "1.10.6", "bson": "^5.3.0", "mongodb": "^5.7.0", "mongodb-build-info": "^1.6.2" @@ -1354,14 +1363,14 @@ } }, "node_modules/@mongosh/service-provider-server": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/service-provider-server/-/service-provider-server-1.10.5.tgz", - "integrity": "sha512-7ROp+9u7PEAdlwqU5VD4zWq3Mh/mtFD7/aJ6AlNRu5qeuQx5NDOOxPCSrej4O9hjvsQGwNT7Qhj6SC90n6vW9g==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/service-provider-server/-/service-provider-server-1.10.6.tgz", + "integrity": "sha512-0L+byNyYYNORyDR64BTG5HgRBW3nle/vjJl0aSEvf2vWsUnZF9lijjTXw52JT8VQAoM8+i9xddwZodF/AMXP7Q==", "dependencies": { "@mongodb-js/devtools-connect": "^2.3.1", - "@mongosh/errors": "1.10.5", - "@mongosh/service-provider-core": "1.10.5", - "@mongosh/types": "1.10.5", + "@mongosh/errors": "1.10.6", + "@mongosh/service-provider-core": "1.10.6", + "@mongosh/types": "1.10.6", "@types/sinon-chai": "^3.2.4", "aws4": "^1.11.0", "mongodb": "^5.7.0", @@ -1377,15 +1386,15 @@ } }, "node_modules/@mongosh/shell-api": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-1.10.5.tgz", - "integrity": "sha512-SZypGBmMxrYciuBFwGCdhdTLmwbczZ3foULphLCG2g90BjRsxhMRe3dhLaZetfohVJz4jaGBITSIfFL3MHpmBw==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-1.10.6.tgz", + "integrity": "sha512-bqC4mObT0Vt2ynmqYFBmbWOmxqZlHl3JMGambpSAst1aQM3uUDWWbmf1s9icyfvUwAzbXe7698nUuOkxW+2/Vw==", "dependencies": { - "@mongosh/arg-parser": "1.10.5", - "@mongosh/errors": "1.10.5", - "@mongosh/history": "1.10.5", - "@mongosh/i18n": "1.10.5", - "@mongosh/service-provider-core": "1.10.5", + "@mongosh/arg-parser": "1.10.6", + "@mongosh/errors": "1.10.6", + "@mongosh/history": "1.10.6", + "@mongosh/i18n": "1.10.6", + "@mongosh/service-provider-core": "1.10.6", "mongodb-redact": "^0.2.2" }, "engines": { @@ -1393,26 +1402,26 @@ } }, "node_modules/@mongosh/shell-evaluator": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/shell-evaluator/-/shell-evaluator-1.10.5.tgz", - "integrity": "sha512-SAaY9lPPNK//kazce9+mRuRLV2ZMcPogku7luShqF4dVlpk4+OsouLEcvfcFUDGUXbC4RKByPMfoShdhjX0L/w==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/shell-evaluator/-/shell-evaluator-1.10.6.tgz", + "integrity": "sha512-djFpyX5vnyivF7Sf4ywwsPDJ0xZjOFOK+lYFTqXVrO8POvoDNYbKsaXs4Y6Ktd0mA5O1Zj/bXNbPDWHirpXy6g==", "dependencies": { - "@mongosh/async-rewriter2": "1.10.5", - "@mongosh/history": "1.10.5", - "@mongosh/shell-api": "1.10.5" + "@mongosh/async-rewriter2": "1.10.6", + "@mongosh/history": "1.10.6", + "@mongosh/shell-api": "1.10.6" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/snippet-manager": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/snippet-manager/-/snippet-manager-1.10.5.tgz", - "integrity": "sha512-TunA2xBclarEzaCSiv50LzdshmK0rBgYqK53qriVrnUeGEQpd6EvgTZN2F+wSpC0FJjLIkKT871amtPsjM5sJQ==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/snippet-manager/-/snippet-manager-1.10.6.tgz", + "integrity": "sha512-QcOf5XTwAQ3FDeBL9Jniew1pKTDBehLb9eq5hOmNuNtoLrNAu10gsqBkfEPrQ4x3F+TJpaIVQo3ULAahSYSitA==", "dependencies": { - "@mongosh/errors": "1.10.5", - "@mongosh/shell-api": "1.10.5", - "@mongosh/types": "1.10.5", + "@mongosh/errors": "1.10.6", + "@mongosh/shell-api": "1.10.6", + "@mongosh/types": "1.10.6", "bson": "^5.3.0", "cross-spawn": "^7.0.3", "escape-string-regexp": "^4.0.0", @@ -1425,9 +1434,9 @@ } }, "node_modules/@mongosh/types": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-1.10.5.tgz", - "integrity": "sha512-HQ5GUV8b4gMVlPXsqcfGCVwEK8i2DXHvSevv4RHx5ZwC19q+zt0urPqBKQHXpztmyQKnDWyNb+wwyJkhP9UKzA==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-1.10.6.tgz", + "integrity": "sha512-v6gRl1ek8ioWhyo8tTs1EQwGdGKSUBmUXbPSRjqFqVITkJ8kFDu0+qRoms2m4VHvIv9ml//VqHHvBTj8Mjxx9A==", "dependencies": { "@mongodb-js/devtools-connect": "^2.3.1" }, @@ -1468,11 +1477,11 @@ "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==" }, "node_modules/@smithy/abort-controller": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-2.0.4.tgz", - "integrity": "sha512-3+3/xRQ0K/NFVtKSiTGsUa3muZnVaBmHrLNgxwoBLZO9rNhwZtjjjf7pFJ6aoucoul/c/w3xobRkgi8F9MWX8Q==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-2.0.5.tgz", + "integrity": "sha512-byVZ2KWLMPYAZGKjRpniAzLcygJO4ruClZKdJTuB0eCB76ONFTdptBHlviHpAZXknRz7skYWPfcgO9v30A1SyA==", "dependencies": { - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -1480,11 +1489,11 @@ } }, "node_modules/@smithy/config-resolver": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-2.0.4.tgz", - "integrity": "sha512-JtKWIKoCFeOY5JGQeEl81AKdIpzeLLSjSMmO5yoKqc58Yn3cxmteylT6Elba3FgAHjK1OthARRXz5JXaKKRB7g==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-2.0.5.tgz", + "integrity": "sha512-n0c2AXz+kjALY2FQr7Zy9zhYigXzboIh1AuUUVCqFBKFtdEvTwnwPXrTDoEehLiRTUHNL+4yzZ3s+D0kKYSLSg==", "dependencies": { - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "@smithy/util-config-provider": "^2.0.0", "@smithy/util-middleware": "^2.0.0", "tslib": "^2.5.0" @@ -1494,14 +1503,14 @@ } }, "node_modules/@smithy/credential-provider-imds": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-2.0.4.tgz", - "integrity": "sha512-vW7xoDKZwjjf/2GCwVf/uvZce/QJOAYan9r8UsqlzOrnnpeS2ffhxeZjLK0/emZu8n6qU3amGgZ/BTo3oVtEyQ==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-2.0.5.tgz", + "integrity": "sha512-KFcf/e0meFkQNyteJ65f1G19sgUEY1e5zL7hyAEUPz2SEfBmC9B37WyRq87G3MEEsvmAWwCRu7nFFYUKtR3svQ==", "dependencies": { - "@smithy/node-config-provider": "^2.0.4", - "@smithy/property-provider": "^2.0.4", - "@smithy/types": "^2.2.1", - "@smithy/url-parser": "^2.0.4", + "@smithy/node-config-provider": "^2.0.5", + "@smithy/property-provider": "^2.0.5", + "@smithy/types": "^2.2.2", + "@smithy/url-parser": "^2.0.5", "tslib": "^2.5.0" }, "engines": { @@ -1509,34 +1518,34 @@ } }, "node_modules/@smithy/eventstream-codec": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-2.0.4.tgz", - "integrity": "sha512-DkVLcQjhOxPj/4pf2hNj2kvOeoLczirHe57g7czMNJCUBvg9cpU9hNgqS37Y5sjdEtMSa2oTyCS5oeHZtKgoIw==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-2.0.5.tgz", + "integrity": "sha512-iqR6OuOV3zbQK8uVs9o+9AxhVk8kW9NAxA71nugwUB+kTY9C35pUd0A5/m4PRT0Y0oIW7W4kgnSR3fdYXQjECw==", "dependencies": { "@aws-crypto/crc32": "3.0.0", - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "@smithy/util-hex-encoding": "^2.0.0", "tslib": "^2.5.0" } }, "node_modules/@smithy/fetch-http-handler": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-2.0.4.tgz", - "integrity": "sha512-1dwR8T+QMe5Gs60NpZgF7ReZp0SXz1O/aX5BdDhsOJh72fi3Bx2UZlDihCdb++9vPyBRMXFRF7I8/C4x8iIm8A==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-2.0.5.tgz", + "integrity": "sha512-EzFoMowdBNy1VqtvkiXgPFEdosIAt4/4bgZ8uiDiUyfhmNXq/3bV+CagPFFBsgFOR/X2XK4zFZHRsoa7PNHVVg==", "dependencies": { - "@smithy/protocol-http": "^2.0.4", - "@smithy/querystring-builder": "^2.0.4", - "@smithy/types": "^2.2.1", + "@smithy/protocol-http": "^2.0.5", + "@smithy/querystring-builder": "^2.0.5", + "@smithy/types": "^2.2.2", "@smithy/util-base64": "^2.0.0", "tslib": "^2.5.0" } }, "node_modules/@smithy/hash-node": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-2.0.4.tgz", - "integrity": "sha512-vZ6a/fvEAFJKNtxJsn0I2WM8uBdypLLhLTpP4BA6fRsBAtwIl5S4wTt0Hspy6uGNn/74LmCxGmFSTMMbSd7ZDA==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-2.0.5.tgz", + "integrity": "sha512-mk551hIywBITT+kXruRNXk7f8Fy7DTzBjZJSr/V6nolYKmUHIG3w5QU6nO9qPYEQGKc/yEPtkpdS28ndeG93lA==", "dependencies": { - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "@smithy/util-buffer-from": "^2.0.0", "@smithy/util-utf8": "^2.0.0", "tslib": "^2.5.0" @@ -1546,11 +1555,11 @@ } }, "node_modules/@smithy/invalid-dependency": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-2.0.4.tgz", - "integrity": "sha512-zfbPPZFiZvhIXJYKlzQwDUnxmWK/SmyDcM6iQJRZHU2jQZAzhHUXFGIu2lKH9L02VUqysOgQi3S/HY4fhrVT8w==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-2.0.5.tgz", + "integrity": "sha512-0wEi+JT0hM+UUwrJVYbqjuGFhy5agY/zXyiN7BNAJ1XoCDjU5uaNSj8ekPWsXd/d4yM6NSe8UbPd8cOc1+3oBQ==", "dependencies": { - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" } }, @@ -1566,12 +1575,12 @@ } }, "node_modules/@smithy/middleware-content-length": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-2.0.4.tgz", - "integrity": "sha512-Pdd+fhRbvizqsgYJ0pLWE6hjhq42wDFWzMj/1T7mEY9tG9bP6/AcdsQK8SAOckrBLURDoeSqTAwPKalsgcZBxw==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-2.0.5.tgz", + "integrity": "sha512-E7VwV5H02fgZIUGRli4GevBCAPvkyEI/fgl9SU47nPPi3DAAX3nEtUb8xfGbXjOcJ5BdSUoWWZn42tEd/blOqA==", "dependencies": { - "@smithy/protocol-http": "^2.0.4", - "@smithy/types": "^2.2.1", + "@smithy/protocol-http": "^2.0.5", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -1579,13 +1588,13 @@ } }, "node_modules/@smithy/middleware-endpoint": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-2.0.4.tgz", - "integrity": "sha512-aLPqkqKjZQ1V718P0Ostpp53nWfwK32uD0HFKSAOT25RvL285dqzGl0PAKDXpyLsPsPmHe0Yrg0AUFkRv4CRbQ==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-2.0.5.tgz", + "integrity": "sha512-tyzDuoNTbsMQCq5Xkc4QOt6e2GACUllQIV8SQ5fc59FtOIV9/vbf58/GxVjZm2o8+MMbdDBANjTDZe/ijZKfyA==", "dependencies": { - "@smithy/middleware-serde": "^2.0.4", - "@smithy/types": "^2.2.1", - "@smithy/url-parser": "^2.0.4", + "@smithy/middleware-serde": "^2.0.5", + "@smithy/types": "^2.2.2", + "@smithy/url-parser": "^2.0.5", "@smithy/util-middleware": "^2.0.0", "tslib": "^2.5.0" }, @@ -1594,13 +1603,13 @@ } }, "node_modules/@smithy/middleware-retry": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-2.0.4.tgz", - "integrity": "sha512-stozO6NgH9W/OSfFMOJEtlJCsnJFSoGyV4LHzIVQeXTzZ2RHjmytQ/Ez7GngHGZ1YsB4zxE1qDTXAU0AlaKf2w==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-2.0.5.tgz", + "integrity": "sha512-ulIfbFyzQTVnJbLjUl1CTSi0etg6tej/ekwaLp0Gn8ybUkDkKYa+uB6CF/m2J5B6meRwyJlsryR+DjaOVyiicg==", "dependencies": { - "@smithy/protocol-http": "^2.0.4", + "@smithy/protocol-http": "^2.0.5", "@smithy/service-error-classification": "^2.0.0", - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "@smithy/util-middleware": "^2.0.0", "@smithy/util-retry": "^2.0.0", "tslib": "^2.5.0", @@ -1611,11 +1620,11 @@ } }, "node_modules/@smithy/middleware-serde": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-2.0.4.tgz", - "integrity": "sha512-oDttJMMES7yXmopjQHnqTkxu8vZOdjB9VpSj94Ff4/GXdKQH7ozKLNIPq4C568nbeQbBt/gsLb6Ttbx1+j+JPQ==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-2.0.5.tgz", + "integrity": "sha512-in0AA5sous74dOfTGU9rMJBXJ0bDVNxwdXtEt5lh3FVd2sEyjhI+rqpLLRF1E4ixbw3RSEf80hfRpcPdjg4vvQ==", "dependencies": { - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -1634,13 +1643,13 @@ } }, "node_modules/@smithy/node-config-provider": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-2.0.4.tgz", - "integrity": "sha512-s9O90cEhkpzZulvdHBBaroZ6AJ5uV6qtmycgYKP1yOCSfPHGIWYwaULdbfxraUsvzCcnMosDNkfckqXYoKI6jw==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-2.0.5.tgz", + "integrity": "sha512-LRtjV9WkhONe2lVy+ipB/l1GX60ybzBmFyeRUoLUXWKdnZ3o81jsnbKzMK8hKq8eFSWPk+Lmyx6ZzCQabGeLxg==", "dependencies": { - "@smithy/property-provider": "^2.0.4", - "@smithy/shared-ini-file-loader": "^2.0.4", - "@smithy/types": "^2.2.1", + "@smithy/property-provider": "^2.0.5", + "@smithy/shared-ini-file-loader": "^2.0.5", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -1648,14 +1657,14 @@ } }, "node_modules/@smithy/node-http-handler": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-2.0.4.tgz", - "integrity": "sha512-svqeqkGgQz1B2m3IurHtp1O8vfuUGbqw6vynFmOrvPirRdiIPukHTZW1GN/JuBCtDpq9mNPutSVipfz2n4sZbQ==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-2.0.5.tgz", + "integrity": "sha512-lZm5DZf4b3V0saUw9WTC4/du887P6cy2fUyQgQQKRRV6OseButyD5yTzeMmXE53CaXJBMBsUvvIQ0hRVxIq56w==", "dependencies": { - "@smithy/abort-controller": "^2.0.4", - "@smithy/protocol-http": "^2.0.4", - "@smithy/querystring-builder": "^2.0.4", - "@smithy/types": "^2.2.1", + "@smithy/abort-controller": "^2.0.5", + "@smithy/protocol-http": "^2.0.5", + "@smithy/querystring-builder": "^2.0.5", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -1663,11 +1672,11 @@ } }, "node_modules/@smithy/property-provider": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-2.0.4.tgz", - "integrity": "sha512-OfaUIhnyvOkuCPHWMPkJqX++dUaDKsiZWuZqCdU04Z9dNAl2TtZAh7dw2rsZGb57vq6YH3PierNrDfQJTAKYtg==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-2.0.5.tgz", + "integrity": "sha512-cAFSUhX6aiHcmpWfrCLKvwBtgN1F6A0N8qY/8yeSi0LRLmhGqsY1/YTxFE185MCVzYbqBGXVr9TBv4RUcIV4rA==", "dependencies": { - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -1675,11 +1684,11 @@ } }, "node_modules/@smithy/protocol-http": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-2.0.4.tgz", - "integrity": "sha512-I1vCZ/m1U424gA9TXkL/pJ3HlRfujY8+Oj3GfDWcrNiWVmAeyx3CTvXw+yMHp2X01BOOu5fnyAa6JwAn1O+txA==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-2.0.5.tgz", + "integrity": "sha512-d2hhHj34mA2V86doiDfrsy2fNTnUOowGaf9hKb0hIPHqvcnShU4/OSc4Uf1FwHkAdYF3cFXTrj5VGUYbEuvMdw==", "dependencies": { - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -1687,11 +1696,11 @@ } }, "node_modules/@smithy/querystring-builder": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-2.0.4.tgz", - "integrity": "sha512-Jc7UPx1pNeisYcABkoo2Pn4kvomy1UI7uxv7R+1W3806KMAKgYHutWmZG01aPHu2XH0zY2RF2KfGiuialsxHvA==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-2.0.5.tgz", + "integrity": "sha512-4DCX9krxLzATj+HdFPC3i8pb7XTAWzzKqSw8aTZMjXjtQY+vhe4azMAqIvbb6g7JKwIkmkRAjK6EXO3YWSnJVQ==", "dependencies": { - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "@smithy/util-uri-escape": "^2.0.0", "tslib": "^2.5.0" }, @@ -1700,11 +1709,11 @@ } }, "node_modules/@smithy/querystring-parser": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-2.0.4.tgz", - "integrity": "sha512-Uh6+PhGxSo17qe2g/JlyoekvTHKn7dYWfmHqUzPAvkW+dHlc3DNVG3++PV48z33lCo5YDVBBturWQ9N/TKn+EA==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-2.0.5.tgz", + "integrity": "sha512-C2stCULH0r54KBksv3AWcN8CLS3u9+WsEW8nBrvctrJ5rQTNa1waHkffpVaiKvcW2nP0aIMBPCobD/kYf/q9mA==", "dependencies": { - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -1720,11 +1729,11 @@ } }, "node_modules/@smithy/shared-ini-file-loader": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.0.4.tgz", - "integrity": "sha512-091yneupXnSqvAU+vLG7h0g4QRRO6TjulpECXYVU6yW/LiNp7QE533DBpaphmbtI6tTC4EfGrhn35gTa0w+GQg==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.0.5.tgz", + "integrity": "sha512-Mvtk6FwMtfbKRC4YuSsIqRYp9WTxsSUJVVo2djgyhcacKGMqicHDWSAmgy3sDrKv+G/G6xTZCPwm6pJARtdxVg==", "dependencies": { - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -1732,13 +1741,13 @@ } }, "node_modules/@smithy/signature-v4": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-2.0.4.tgz", - "integrity": "sha512-y2xblkS0hb44QJDn9YjPp5aRFYSiI7w0bI3tATE3ybOrII2fppqD0SE3zgvew/B/3rTunuiCW+frTD0W4UYb9Q==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-2.0.5.tgz", + "integrity": "sha512-ABIzXmUDXK4n2c9cXjQLELgH2RdtABpYKT+U131e2I6RbCypFZmxIHmIBufJzU2kdMCQ3+thBGDWorAITFW04A==", "dependencies": { - "@smithy/eventstream-codec": "^2.0.4", + "@smithy/eventstream-codec": "^2.0.5", "@smithy/is-array-buffer": "^2.0.0", - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "@smithy/util-hex-encoding": "^2.0.0", "@smithy/util-middleware": "^2.0.0", "@smithy/util-uri-escape": "^2.0.0", @@ -1750,13 +1759,13 @@ } }, "node_modules/@smithy/smithy-client": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-2.0.4.tgz", - "integrity": "sha512-Dg1dkqyj3jwa03RFs6E4ASmfQ7CjplbGISJIJNSt3F8NfIid2RalbeCMOIHK7VagKh9qngZNyoKxObZC9LB9Lg==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-2.0.5.tgz", + "integrity": "sha512-kCTFr8wfOAWKDzGvfBElc6shHigWtHNhMQ1IbosjC4jOlayFyZMSs2PysKB+Ox/dhQ41KqOzgVjgiQ+PyWqHMQ==", "dependencies": { "@smithy/middleware-stack": "^2.0.0", - "@smithy/types": "^2.2.1", - "@smithy/util-stream": "^2.0.4", + "@smithy/types": "^2.2.2", + "@smithy/util-stream": "^2.0.5", "tslib": "^2.5.0" }, "engines": { @@ -1764,9 +1773,9 @@ } }, "node_modules/@smithy/types": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@smithy/types/-/types-2.2.1.tgz", - "integrity": "sha512-6nyDOf027ZeJiQVm6PXmLm7dR+hR2YJUkr4VwUniXA8xZUGAu5Mk0zfx2BPFrt+e5YauvlIqQoH0CsrM4tLkfg==", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-2.2.2.tgz", + "integrity": "sha512-4PS0y1VxDnELGHGgBWlDksB2LJK8TG8lcvlWxIsgR+8vROI7Ms8h1P4FQUx+ftAX2QZv5g1CJCdhdRmQKyonyw==", "dependencies": { "tslib": "^2.5.0" }, @@ -1775,12 +1784,12 @@ } }, "node_modules/@smithy/url-parser": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-2.0.4.tgz", - "integrity": "sha512-puIQ6+TJpI2AAPw7IGdGG6d2DEcVP5nJqa1VjrxzUcy2Jx7LtGn+gDHY2o9Pc9vQkmoicovTEKgvv7CdqP+0gg==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-2.0.5.tgz", + "integrity": "sha512-OdMBvZhpckQSkugCXNJQCvqJ71wE7Ftxce92UOQLQ9pwF6hoS5PLL7wEfpnuEXtStzBqJYkzu1C1ZfjuFGOXAA==", "dependencies": { - "@smithy/querystring-parser": "^2.0.4", - "@smithy/types": "^2.2.1", + "@smithy/querystring-parser": "^2.0.5", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" } }, @@ -1805,9 +1814,9 @@ } }, "node_modules/@smithy/util-body-length-node": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-2.0.0.tgz", - "integrity": "sha512-ZV7Z/WHTMxHJe/xL/56qZwSUcl63/5aaPAGjkfynJm4poILjdD4GmFI+V+YWabh2WJIjwTKZ5PNsuvPQKt93Mg==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-2.1.0.tgz", + "integrity": "sha512-/li0/kj/y3fQ3vyzn36NTLGmUwAICb7Jbe/CsWCktW363gh1MOcpEcSO3mJ344Gv2dqz8YJCLQpb6hju/0qOWw==", "dependencies": { "tslib": "^2.5.0" }, @@ -1839,12 +1848,12 @@ } }, "node_modules/@smithy/util-defaults-mode-browser": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.0.4.tgz", - "integrity": "sha512-wGdnPt4Ng72duUd97HrlqVkq6DKVB/yjaGkSg5n3uuQKzzHjoi3OdjXGumD/VYPHz0dYd7wpLNG2CnMm/nfDrg==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.0.5.tgz", + "integrity": "sha512-yciP6TPttLsj731aHTvekgyuCGXQrEAJibEwEWAh3kzaDsfGAVCuZSBlyvC2Dl3TZmHKCOQwHV8mIE7KQCTPuQ==", "dependencies": { - "@smithy/property-provider": "^2.0.4", - "@smithy/types": "^2.2.1", + "@smithy/property-provider": "^2.0.5", + "@smithy/types": "^2.2.2", "bowser": "^2.11.0", "tslib": "^2.5.0" }, @@ -1853,15 +1862,15 @@ } }, "node_modules/@smithy/util-defaults-mode-node": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.0.4.tgz", - "integrity": "sha512-QMkNcV6x52BeeeIvhvow6UmOu7nP7DXQljY6DKOP/aAokrli53IWTP/kUTd9B0Mp9tbW3WC10O6zaM69xiMNYw==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.0.5.tgz", + "integrity": "sha512-M07t99rWasXt+IaDZDyP3BkcoEm/mgIE1RIMASrE49LKSNxaVN7PVcgGc77+4uu2kzBAyqJKy79pgtezuknyjQ==", "dependencies": { - "@smithy/config-resolver": "^2.0.4", - "@smithy/credential-provider-imds": "^2.0.4", - "@smithy/node-config-provider": "^2.0.4", - "@smithy/property-provider": "^2.0.4", - "@smithy/types": "^2.2.1", + "@smithy/config-resolver": "^2.0.5", + "@smithy/credential-provider-imds": "^2.0.5", + "@smithy/node-config-provider": "^2.0.5", + "@smithy/property-provider": "^2.0.5", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -1903,13 +1912,13 @@ } }, "node_modules/@smithy/util-stream": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-2.0.4.tgz", - "integrity": "sha512-ZVje79afuv3DB1Ma/g5m/5v9Zda8nA0xNgvE1pOD3EnoTp/Ekch1z20AN6gfVsf7JYWK2VSMVDiqI9N8Ua4wbg==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-2.0.5.tgz", + "integrity": "sha512-ylx27GwI05xLpYQ4hDIfS15vm+wYjNN0Sc2P0FxuzgRe8v0BOLHppGIQ+Bezcynk8C9nUzsUue3TmtRhjut43g==", "dependencies": { - "@smithy/fetch-http-handler": "^2.0.4", - "@smithy/node-http-handler": "^2.0.4", - "@smithy/types": "^2.2.1", + "@smithy/fetch-http-handler": "^2.0.5", + "@smithy/node-http-handler": "^2.0.5", + "@smithy/types": "^2.2.2", "@smithy/util-base64": "^2.0.0", "@smithy/util-buffer-from": "^2.0.0", "@smithy/util-hex-encoding": "^2.0.0", @@ -1986,9 +1995,9 @@ "integrity": "sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==" }, "node_modules/@types/node": { - "version": "20.5.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.0.tgz", - "integrity": "sha512-Mgq7eCtoTjT89FqNoTzzXg2XvCi5VMhRV6+I2aYanc6kQCBImeNaAYRs/DyoVqk1YEUJK5gN9VO7HRIdz4Wo3Q==" + "version": "20.5.6", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.6.tgz", + "integrity": "sha512-Gi5wRGPbbyOTX+4Y2iULQ27oUPrefaB0PxGQJnfyWN3kvEDGM3mIB5M/gQLmitZf7A9FmLeaqxD3L1CXpm3VKQ==" }, "node_modules/@types/sinon": { "version": "10.0.16", @@ -2459,9 +2468,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001521", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001521.tgz", - "integrity": "sha512-fnx1grfpEOvDGH+V17eccmNjucGUnCbP6KL+l5KqBIerp26WK/+RQ7CIDE37KGJjaPyqWXXlFUyKiWmvdNNKmQ==", + "version": "1.0.30001523", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001523.tgz", + "integrity": "sha512-I5q5cisATTPZ1mc588Z//pj/Ox80ERYDfR71YnvY7raS/NOk8xXlZcB0sF7JdqaV//kOaa6aus7lRfpdnt1eBA==", "funding": [ { "type": "opencollective", @@ -2751,9 +2760,9 @@ "peer": true }, "node_modules/electron-to-chromium": { - "version": "1.4.494", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.494.tgz", - "integrity": "sha512-KF7wtsFFDu4ws1ZsSOt4pdmO1yWVNWCFtijVYZPUeW4SV7/hy/AESjLn/+qIWgq7mHscNOKAwN5AIM1+YAy+Ww==" + "version": "1.4.502", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.502.tgz", + "integrity": "sha512-xqeGw3Gr6o3uyHy/yKjdnDQHY2RQvXcGC2cfHjccK1IGkH6cX1WQBN8EeC/YpwPhGkBaikDTecJ8+ssxSVRQlw==" }, "node_modules/emphasize": { "version": "4.2.0", @@ -3786,9 +3795,9 @@ "optional": true }, "node_modules/mongodb": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-5.7.0.tgz", - "integrity": "sha512-zm82Bq33QbqtxDf58fLWBwTjARK3NSvKYjyz997KSy6hpat0prjeX/kxjbPVyZY60XYPDNETaHkHJI2UCzSLuw==", + "version": "5.8.1", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-5.8.1.tgz", + "integrity": "sha512-wKyh4kZvm6NrCPH8AxyzXm3JBoEf4Xulo0aUWh3hCgwgYJxyQ1KLST86ZZaSWdj6/kxYUA3+YZuyADCE61CMSg==", "dependencies": { "bson": "^5.4.0", "mongodb-connection-string-url": "^2.6.0", @@ -3798,12 +3807,12 @@ "node": ">=14.20.1" }, "optionalDependencies": { - "saslprep": "^1.0.3" + "@mongodb-js/saslprep": "^1.1.0" }, "peerDependencies": { - "@aws-sdk/credential-providers": "^3.201.0", - "@mongodb-js/zstd": "^1.1.0", - "kerberos": "^2.0.1", + "@aws-sdk/credential-providers": "^3.188.0", + "@mongodb-js/zstd": "^1.0.0", + "kerberos": "^1.0.0 || ^2.0.0", "mongodb-client-encryption": ">=2.3.0 <3", "snappy": "^7.2.2" }, @@ -3954,9 +3963,9 @@ "optional": true }, "node_modules/node-fetch": { - "version": "2.6.12", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz", - "integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", "dependencies": { "whatwg-url": "^5.0.0" }, @@ -4895,9 +4904,9 @@ } }, "node_modules/tslib": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", - "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==" + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/tunnel-agent": { "version": "0.6.0", @@ -4925,9 +4934,9 @@ } }, "node_modules/typescript": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", - "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" diff --git a/pkgs/development/tools/mongosh/source.json b/pkgs/development/tools/mongosh/source.json index 4ae0b069de68..5555d11e8028 100644 --- a/pkgs/development/tools/mongosh/source.json +++ b/pkgs/development/tools/mongosh/source.json @@ -1,6 +1,6 @@ { - "version": "1.10.5", - "integrity": "sha512-OAaUQv9dw/2p7Q8qIlUm8Ckv0UGFIPKHD09ApNcGU1bI3E6rGGhIMcpG8rcmdyV59mbtzoV4IeGkHbqX0KhGaw==", - "filename": "mongosh-1.10.5.tgz", - "deps": "sha256-P4JT4j2JiCIpHBODpXHcyLWd5VnOK0wXBkxtcAh2g4w=" + "version": "1.10.6", + "integrity": "sha512-rReUz89EF5eERhPZo29nYpKAux1u5iK3ug74wtsr7kE9SOJs5XGWS2gh8LKSMK9uieeDKRYX8+nFIa4bl1Ls2Q==", + "filename": "mongosh-1.10.6.tgz", + "deps": "sha256-j1l6PVPkp5Ju0uBB6dKfQP8fbwttWpPR3VPviu4a/Zg=" } From 4a53ef9ac65652fa54badceb82c72349c604dd67 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 25 Aug 2023 17:13:25 +0300 Subject: [PATCH 30/63] haruna: 0.11.1 -> 0.12.0 Diff: https://invent.kde.org/multimedia/haruna/-/compare/v0.11.1...v0.12.0 --- pkgs/applications/video/haruna/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/haruna/default.nix b/pkgs/applications/video/haruna/default.nix index 4e1bb7fa779d..f07a7b42855f 100644 --- a/pkgs/applications/video/haruna/default.nix +++ b/pkgs/applications/video/haruna/default.nix @@ -26,13 +26,13 @@ mkDerivation rec { pname = "haruna"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitLab { owner = "multimedia"; repo = "haruna"; rev = "v${version}"; - hash = "sha256-quCkQN1IxKoGr+VzeDXs2UChJgxfgI+z56SDYc6eZDc="; + hash = "sha256-NWV3DSQkgH4cqNnHipg4S3Nf5aEVdRzD0oT8a2OyCu4="; domain = "invent.kde.org"; }; From abefa4c7d3073c6abdfe16f3e2c638daaf9ae027 Mon Sep 17 00:00:00 2001 From: Sam Willcocks Date: Thu, 24 Aug 2023 20:05:17 +0100 Subject: [PATCH 31/63] bark: init at unstable-2023-08-22 --- pkgs/tools/audio/bark/default.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/audio/bark/default.nix diff --git a/pkgs/tools/audio/bark/default.nix b/pkgs/tools/audio/bark/default.nix new file mode 100644 index 000000000000..f943b555b010 --- /dev/null +++ b/pkgs/tools/audio/bark/default.nix @@ -0,0 +1,29 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, alsa-lib +, speexdsp +}: +rustPlatform.buildRustPackage { + pname = "bark"; + version = "unstable-2023-08-22"; + src = fetchFromGitHub { + owner = "haileys"; + repo = "bark"; + rev = "2586b9fb58b496f8ef06f516c9cd3aace77521f7"; + hash = "sha256-sGroae6uJhB9UIpFmvt520Zs9k0ir7H8pGkhKJmVWek="; + }; + cargoHash = "sha256-OjlVn4fvKPm3UfqhKkv7cDuvK4mcLcQXPNPK+WScrMc="; + buildInputs = [ alsa-lib speexdsp ]; + nativeBuildInputs = [ pkg-config ]; + + meta = { + description = "Live sync audio streaming for local networks"; + homepage = "https://github.com/haileys/bark"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ samw ]; + platforms = lib.platforms.linux; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b453d3a6ae25..28bd9c072ba0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3330,6 +3330,8 @@ with pkgs; azure-storage-azcopy = callPackage ../development/tools/azcopy { }; + bark = callPackage ../tools/audio/bark { }; + bashblog = callPackage ../tools/text/bashblog { }; berglas = callPackage ../tools/admin/berglas { }; From 4a62b430e46d14407b3381787dc2580e55a752c0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Aug 2023 17:02:17 +0200 Subject: [PATCH 32/63] python311Packages.types-awscrt: init at 0.19.0 --- .../python-modules/types-awscrt/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/types-awscrt/default.nix diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix new file mode 100644 index 000000000000..0154eb7e4474 --- /dev/null +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, poetry-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "types-awscrt"; + version = "0.19.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "types_awscrt"; + inherit version; + hash = "sha256-6u9gQiz3FrSuIW8WS3TWecgrDZxT2zgKN96ymuVXmxs="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + pythonImportsCheck = [ + "awscrt-stubs" + ]; + + meta = with lib; { + description = "Type annotations and code completion for awscrt"; + homepage = "https://github.com/youtype/types-awscrt"; + changelog = "https://github.com/youtype/types-awscrt/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 09bdb2475da6..5fa9de662463 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13118,6 +13118,8 @@ self: super: with self; { types-appdirs = callPackage ../development/python-modules/types-appdirs { }; + types-awscrt = callPackage ../development/python-modules/types-awscrt { }; + types-beautifulsoup4 = callPackage ../development/python-modules/types-beautifulsoup4 { }; types-colorama = callPackage ../development/python-modules/types-colorama { }; From f23b603a7b2796ae520ff8774eac1476cf2d3301 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Aug 2023 17:07:42 +0200 Subject: [PATCH 33/63] python311Packages.botocore-stubs: init at 1.31.34 --- .../python-modules/botocore-stubs/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/botocore-stubs/default.nix diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix new file mode 100644 index 000000000000..fda1cf960f67 --- /dev/null +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, poetry-core +, pythonOlder +, types-awscrt +, typing-extensions +}: + +buildPythonPackage rec { + pname = "botocore-stubs"; + version = "1.31.34"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "botocore_stubs"; + inherit version; + hash = "sha256-7HQvhmNqzyeHIgCYf+IGi6X7kmbOBBcKkOomtpjhVlQ="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + types-awscrt + typing-extensions + ]; + + pythonImportsCheck = [ + "botocore-stubs" + ]; + + meta = with lib; { + description = "Type annotations and code completion for botocore"; + homepage = "https://pypi.org/project/botocore-stubs/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5fa9de662463..2e3225440d0e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1525,6 +1525,8 @@ self: super: with self; { botocore = callPackage ../development/python-modules/botocore { }; + botocore-stubs = callPackage ../development/python-modules/botocore-stubs { }; + botorch = callPackage ../development/python-modules/botorch { }; bottle = callPackage ../development/python-modules/bottle { }; From dbf0e1dd95ca49918f416cb01d4a8d46793c306a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 26 Aug 2023 02:57:25 +0200 Subject: [PATCH 34/63] rust-cbindgen: 0.24.6 -> 0.25.0 https://github.com/mozilla/cbindgen/blob/v0.25.0/CHANGES --- pkgs/development/tools/rust/cbindgen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index 85a1f1272b7d..396b3f07b17e 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-cbindgen"; - version = "0.24.6"; + version = "0.25.0"; src = fetchFromGitHub { owner = "mozilla"; repo = "cbindgen"; rev = "v${version}"; - hash = "sha256-RHh97hwWmjV6hw+fX+fOtixX/DGedTf9cx+PYPW6/wI="; + hash = "sha256-gljICr0abKEXxJfLCJN3L2OIwUvw/QoIC6T5C7pieEA="; }; - cargoSha256 = "sha256-7G/16arXYwt7Nrs1isWyrPubm8GMi8NsjLjWAD8x6aM="; + cargoSha256 = "sha256-agBzn2MibM7158/QlLXI2HBBcYIe0p50rYSF1jBDF8U="; buildInputs = lib.optional stdenv.isDarwin Security; From 70a4b9e25bdc1e9c7083c7ff425e39090eabd3cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Aug 2023 02:02:14 +0000 Subject: [PATCH 35/63] librewolf-unwrapped: 116.0.2-1 -> 116.0.3-1 --- .../networking/browsers/librewolf/src.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index a22978098c01..c9ecd3de9219 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "116.0.2-1", + "packageVersion": "116.0.3-1", "source": { - "rev": "116.0.2-1", - "sha256": "08q50yjb8q168zb2y4iajjqd9ygbpywwr9i4vfn67wchqlsc1mrp" + "rev": "116.0.3-1", + "sha256": "19l5nny96p89xm8c9f5m1435sglshn7izmjnj338c8qh217zxiyq" }, "firefox": { - "version": "116.0.2", - "sha512": "2c0ae18672fe22c75002744831130e13da764f83726951e5b58cfe74f7f473e22634ce08ebc11a98bac5baec0a4ac099a3a350a8b756af9c5bea6d5f4432da6d" + "version": "116.0.3", + "sha512": "194c50e9ba5a918c37fbef8cd72ffb98e5e9f51955d8172b6666a758b5f20777ca0a7f79dff0328305fb6dafefb102ab002e326f47d0965a4dc6d3e9287c42b9" } } From 9b5ec78e14ad804941cd036b8b500ab3168c477d Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 25 Aug 2023 22:54:58 -0400 Subject: [PATCH 36/63] risor: 0.14.0 -> 0.15.0 Diff: https://github.com/risor-io/risor/compare/v0.14.0...v0.15.0 Changelog: https://github.com/risor-io/risor/releases/tag/v0.15.0 --- pkgs/development/interpreters/risor/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/risor/default.nix b/pkgs/development/interpreters/risor/default.nix index 61753ba2b99e..f5e44792627c 100644 --- a/pkgs/development/interpreters/risor/default.nix +++ b/pkgs/development/interpreters/risor/default.nix @@ -7,20 +7,18 @@ buildGoModule rec { pname = "risor"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "risor-io"; repo = "risor"; rev = "v${version}"; - hash = "sha256-QhXIwFrApSkWY2YYYGlojKsByNA2xpyVTm0SpYWB/Ds="; + hash = "sha256-aBUM/+mAuQ+JUOqeMtRYpOwdKbD6An9/Nc2Q6YDnUmE="; }; - vendorHash = "sha256-diAbQwnlhMm43ZlLKq3llMl9mO3sIkc80aCI5UDn7F4="; + sourceRoot = "${src.name}/cmd/risor"; - subPackages = [ - "cmd/..." - ]; + vendorHash = "sha256-vlrYmY70nEAI8FSsMzZtuLMt8+aVi0jDX7PGKRMw4r8="; ldflags = [ "-s" From c67a5478b6fd1db096706782bd27d945b2ff19ef Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 25 Aug 2023 23:07:42 -0400 Subject: [PATCH 37/63] slingshot: init at 0.2.3 https://github.com/caio-ishikawa/slingshot --- pkgs/tools/misc/slingshot/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/misc/slingshot/default.nix diff --git a/pkgs/tools/misc/slingshot/default.nix b/pkgs/tools/misc/slingshot/default.nix new file mode 100644 index 000000000000..48ea7f24c040 --- /dev/null +++ b/pkgs/tools/misc/slingshot/default.nix @@ -0,0 +1,27 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "slingshot"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "caio-ishikawa"; + repo = "slingshot"; + rev = "v${version}"; + hash = "sha256-PbcpvSBYoRs8TMkbbQjG284BWr+PSaTStPOg4a1GIrw="; + }; + + cargoHash = "sha256-Y0H88paBe2yyUyTdwxXO58YFDdH04kK+nHvi1qyYVF0="; + + meta = with lib; { + description = "Lightweight command line tool to quickly navigate across folders"; + homepage = "https://github.com/caio-ishikawa/slingshot"; + changelog = "https://github.com/caio-ishikawa/slingshot/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "slingshot"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e451ba0c98d..5ef9aa2c6e72 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35367,6 +35367,8 @@ with pkgs; SkypeExport = callPackage ../applications/networking/instant-messengers/SkypeExport { }; + slingshot = callPackage ../tools/misc/slingshot { }; + slop = callPackage ../tools/misc/slop { }; slowhttptest = callPackage ../tools/security/slowhttptest { }; From 512644190bc1ea645a03ebb856ed960f17b66945 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Fri, 25 Aug 2023 23:53:01 -0300 Subject: [PATCH 38/63] budgie.magpie: 0.9.2 -> 0.9.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Federico Damián Schonborn --- pkgs/desktops/budgie/magpie/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/budgie/magpie/default.nix b/pkgs/desktops/budgie/magpie/default.nix index 15e59f801a23..79c13454eba0 100644 --- a/pkgs/desktops/budgie/magpie/default.nix +++ b/pkgs/desktops/budgie/magpie/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "magpie"; - version = "0.9.2"; + version = "0.9.3"; outputs = [ "out" "dev" "devdoc" ]; @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "BuddiesOfBudgie"; repo = "magpie"; rev = "v${finalAttrs.version}"; - hash = "sha256-GoilHdESFgpwt8+Uqzrnf8jBpeaSak1uHTlkNcQdgtk="; + hash = "sha256-A8FmW2o2p5B5pxTZ6twwufyhfppuMXjnMKopZRD+XdE="; }; patches = [ @@ -124,8 +124,8 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs src/backends/native/gen-default-modes.py - # Magpie doesn't install any .desktop files - substituteInPlace meson/meson-postinstall.sh --replace "update-desktop-database" "# update-desktop-database" + # Magpie does not install any .desktop files + substituteInPlace scripts/mesonPostInstall.sh --replace "update-desktop-database" "# update-desktop-database" ''; postFixup = '' From 13fe5cbd8f7be2458a9e1f71d40ff6ae59c5df68 Mon Sep 17 00:00:00 2001 From: Vanilla Date: Sat, 26 Aug 2023 13:28:06 +0800 Subject: [PATCH 39/63] auditbeat7: init --- pkgs/misc/logging/beats/7.x.nix | 1 + pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 3 insertions(+) diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index 77ac0bd3b59d..ad4d00a8149e 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -24,6 +24,7 @@ let beat = package: extraArgs: buildGoModule (rec { } // extraArgs); in rec { + auditbeat7 = beat "auditbeat" { meta.description = "Lightweight shipper for audit data"; }; filebeat7 = beat "filebeat" { meta.description = "Lightweight shipper for logfiles"; buildInputs = [ systemd ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e451ba0c98d..84af5d6bfbb7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4241,11 +4241,13 @@ with pkgs; bchunk = callPackage ../tools/cd-dvd/bchunk { }; inherit (callPackages ../misc/logging/beats/7.x.nix { }) + auditbeat7 filebeat7 heartbeat7 metricbeat7 packetbeat7; + auditbeat = auditbeat7; filebeat = filebeat7; heartbeat = heartbeat7; metricbeat = metricbeat7; From 52598b86d1bee508b7308b7aa9040fc4c20874e6 Mon Sep 17 00:00:00 2001 From: zzzsyyy Date: Sat, 26 Aug 2023 14:04:01 +0800 Subject: [PATCH 40/63] flaca: 2.2.1 -> 2.2.2 --- pkgs/applications/graphics/flaca/Cargo.lock | 169 ++++++++----------- pkgs/applications/graphics/flaca/default.nix | 4 +- 2 files changed, 73 insertions(+), 100 deletions(-) diff --git a/pkgs/applications/graphics/flaca/Cargo.lock b/pkgs/applications/graphics/flaca/Cargo.lock index 459059ea20ad..af1e061d3caa 100644 --- a/pkgs/applications/graphics/flaca/Cargo.lock +++ b/pkgs/applications/graphics/flaca/Cargo.lock @@ -37,6 +37,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + [[package]] name = "bitvec" version = "1.0.1" @@ -69,11 +75,12 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -152,9 +159,9 @@ dependencies = [ [[package]] name = "dactyl" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ee53db074fe946dcfb43408f19964425827d2967f74c5f4509c48a91bd2899f" +checksum = "72f762271c6826d426c3fd2e37aa827fa039596bc7050e9289cb713265be3d7f" dependencies = [ "num-traits", ] @@ -177,15 +184,15 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", @@ -204,12 +211,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "fdeflate" @@ -222,7 +226,7 @@ dependencies = [ [[package]] name = "flaca" -version = "2.2.1" +version = "2.2.2" dependencies = [ "argyle", "cc", @@ -239,9 +243,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide", @@ -255,9 +259,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "fyi_msg" -version = "0.11.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34a6cc16a2874d6da616ed0766edc29ed01f51ed4121f6d8c723d622433f4298" +checksum = "64175e76ad270dcde1566c16eb7d0f6cc2cbb575e5721dbd899e7f3a86b92718" dependencies = [ "ahash", "bytecount", @@ -274,24 +278,15 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "image" -version = "0.24.6" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" dependencies = [ "bytemuck", "byteorder", @@ -311,26 +306,6 @@ dependencies = [ "hashbrown", ] -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys", -] - [[package]] name = "itertools" version = "0.10.5" @@ -351,9 +326,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.146" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libdeflate-sys" @@ -375,15 +350,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "memoffset" @@ -431,7 +406,7 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", "static_assertions", @@ -460,20 +435,20 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "libc", ] @@ -503,11 +478,11 @@ dependencies = [ [[package]] name = "png" -version = "0.17.9" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", @@ -548,7 +523,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -577,13 +552,12 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.20" +version = "0.38.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" +checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49" dependencies = [ - "bitflags", + "bitflags 2.4.0", "errno", - "io-lifetimes", "libc", "linux-raw-sys", "windows-sys", @@ -591,21 +565,21 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "simd-adler32" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "static_assertions" @@ -621,11 +595,10 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.6.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ - "autocfg", "cfg-if", "fastrand", "redox_syscall", @@ -688,9 +661,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -703,51 +676,51 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "write_atomic" -version = "0.3.2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12c8ddcf39a6adf57b643d28dd93e9e04c9f3df6af8aaf924c4c4622172cc103" +checksum = "e0ccffd0975630df843ef6124fdfb5032f86b6110d4913b7c85cab7d597dd49f" dependencies = [ "rustix", "tempfile", diff --git a/pkgs/applications/graphics/flaca/default.nix b/pkgs/applications/graphics/flaca/default.nix index 039ddcfecc31..0fcb0f7d21d1 100644 --- a/pkgs/applications/graphics/flaca/default.nix +++ b/pkgs/applications/graphics/flaca/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "flaca"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "Blobfolio"; repo = pname; rev = "v${version}"; - hash = "sha256-RXMqPpQM2h6EtIIH8Ix31euC7zK3v2QohZqouNlK7rM="; + hash = "sha256-YLJ8jeJhpxmSfF0PObd7FSFdVbEVhHYIaUJusAIEIx4="; }; # upstream does not provide a Cargo.lock From 94b9eb30d957db779fff130fd27a83e626f6410e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Aug 2023 06:11:09 +0000 Subject: [PATCH 41/63] tidb: 7.2.0 -> 7.3.0 --- pkgs/servers/tidb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/tidb/default.nix b/pkgs/servers/tidb/default.nix index e27f22ce6741..f5600579a0ef 100644 --- a/pkgs/servers/tidb/default.nix +++ b/pkgs/servers/tidb/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tidb"; - version = "7.2.0"; + version = "7.3.0"; src = fetchFromGitHub { owner = "pingcap"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7iz82H3H22GCLvy8VD+t1BkEEoNQ0+6ZLBOUwWTlNfI="; + sha256 = "sha256-zpAduymFC17iL9eEssFoHxK+J4EP1QyamchfLetFN/k="; }; - vendorHash = "sha256-9vgxdX8CPUbyJZNSkwTZK02ORIXACjad/yPef8zB7FU="; + vendorHash = "sha256-GbAZK2TQKc3bziZm202Q2QLLK0TDJ/AplSGKBSLSoqQ="; ldflags = [ "-s" From 9f60471520e9d5385928a4bb70ef80eadc7c2be1 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 26 Aug 2023 10:29:41 +0300 Subject: [PATCH 42/63] path-of-building.data: 2.33.1 -> 2.33.2 Diff: https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.33.1...v2.33.2 --- pkgs/games/path-of-building/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/path-of-building/default.nix b/pkgs/games/path-of-building/default.nix index e798dbde6db8..7da60008009e 100644 --- a/pkgs/games/path-of-building/default.nix +++ b/pkgs/games/path-of-building/default.nix @@ -2,13 +2,13 @@ let data = stdenv.mkDerivation(finalAttrs: { pname = "path-of-building-data"; - version = "2.33.1"; + version = "2.33.2"; src = fetchFromGitHub { owner = "PathOfBuildingCommunity"; repo = "PathOfBuilding"; rev = "v${finalAttrs.version}"; - hash = "sha256-nnASvWApp3BjUPa+i7cvMJnTiD8oXtZTU6OjryFxaBM="; + hash = "sha256-+lRpmRg5y7cGB6ru/Y76dZDV8EKQaakPJl+mOXc3u2s="; }; nativeBuildInputs = [ unzip ]; From 9dee811c7c25b13ce2f628cf24a089b9a738a9e6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Aug 2023 09:59:55 +0200 Subject: [PATCH 43/63] python311Packages.appthreat-vulnerability-db: 5.2.0 -> 5.2.1 Diff: https://github.com/AppThreat/vulnerability-db/compare/refs/tags/v5.2.0...v5.2.1 Changelog: https://github.com/AppThreat/vulnerability-db/releases/tag/v5.2.1 --- .../python-modules/appthreat-vulnerability-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 0a2dd009f6a4..29afbf63e1bc 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "5.2.0"; + version = "5.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-OtaoyqYRsZVoWezrTAy3zROyNeRLbZmCT+z7YCwf9Ow="; + hash = "sha256-FSi9fMp9SLnoIVo+Clca6oglroeIb6RbohiSSc6fqxo="; }; postPatch = '' From b0e5c80cd64f145e384105195ba59f63f9b12122 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 26 Aug 2023 11:00:12 +0300 Subject: [PATCH 44/63] heroic: keep IPC namespace --- pkgs/games/heroic/fhsenv.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/games/heroic/fhsenv.nix b/pkgs/games/heroic/fhsenv.nix index 40a8ea37efae..3979b2823926 100644 --- a/pkgs/games/heroic/fhsenv.nix +++ b/pkgs/games/heroic/fhsenv.nix @@ -12,6 +12,9 @@ buildFHSEnv { # Many Wine and native games need 32-bit libraries. multiArch = true; + # required by Electron + unshareIpc = false; + targetPkgs = pkgs: with pkgs; [ heroic-unwrapped gamemode From d580c355d11db33ff8141105c8baf63b5c571650 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Aug 2023 10:02:37 +0200 Subject: [PATCH 45/63] python311Packages.fountains: 2.1.0 -> 2.2.0 --- pkgs/development/python-modules/fountains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fountains/default.nix b/pkgs/development/python-modules/fountains/default.nix index 2f6b7cc94156..d86b8ff58454 100644 --- a/pkgs/development/python-modules/fountains/default.nix +++ b/pkgs/development/python-modules/fountains/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "fountains"; - version = "2.1.0"; + version = "2.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gYVguXMVrXxra/xy+R4RXVk9yDGKiKE8u3qWUk8sjt4="; + hash = "sha256-MhOQ4pemxmjfp7Uy5hLA8i8BBI5QbvD4EjEcKMM/u3I="; }; nativeBuildInputs = [ From c481af100598e4dedb8d9b137db3eae0d6babe9e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Aug 2023 10:03:26 +0200 Subject: [PATCH 46/63] python311Packages.meshtastic: 2.2.1 -> 2.2.2 Diff: https://github.com/meshtastic/Meshtastic-python/compare/refs/tags/2.2.1...2.2.2 Changelog: https://github.com/meshtastic/python/releases/tag/2.2.2 --- pkgs/development/python-modules/meshtastic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 00552394c8bb..18b2ae836151 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.2.1"; + version = "2.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-szeY3+84xAihGK9nLgMQf9oLRDlKlaPg6+I42TJkfVY="; + hash = "sha256-7mQq0phe920t7aJxvP0cCpVNH9s7F+x1fBdzAVUgtKE="; }; propagatedBuildInputs = [ From fcb7d7e878c67ba11c6196d902c44d34d5dd351a Mon Sep 17 00:00:00 2001 From: "Shahar \"Dawn\" Or" Date: Sat, 26 Aug 2023 15:03:30 +0700 Subject: [PATCH 47/63] cargo-run-bin: init at 1.1.5 Co-authored-by: Matthias Beyer --- .../tools/rust/cargo-run-bin/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/tools/rust/cargo-run-bin/default.nix diff --git a/pkgs/development/tools/rust/cargo-run-bin/default.nix b/pkgs/development/tools/rust/cargo-run-bin/default.nix new file mode 100644 index 000000000000..dca10dc1c42a --- /dev/null +++ b/pkgs/development/tools/rust/cargo-run-bin/default.nix @@ -0,0 +1,28 @@ +{ lib +, rustPlatform +, fetchCrate +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-run-bin"; + version = "1.1.5"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-YCWjdY8feiqU4/bOn19qbY8YiKa3SvFImvH0wDKXOhI="; + }; + + cargoSha256 = "sha256-mNJZjEkuUwo/aqyotqjNj+P50dFFGaJnLQ2CyCYg/1Y="; + + # multiple impurities in tests + doCheck = false; + + meta = with lib; { + description = "Build, cache, and run binaries scoped in Cargo.toml rather than installing globally. This acts similarly to npm run and gomodrun, and allows your teams to always be running the same tooling versions"; + homepage = "https://github.com/dustinblackman/cargo-run-bin"; + changelog = "https://github.com/dustinblackman/cargo-run-bin/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ mightyiam matthiasbeyer ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ab613c3366c..cf894e06b5b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17219,6 +17219,7 @@ with pkgs; }; cargo-readme = callPackage ../development/tools/rust/cargo-readme { }; cargo-risczero = callPackage ../development/tools/rust/cargo-risczero { }; + cargo-run-bin = callPackage ../development/tools/rust/cargo-run-bin {}; cargo-semver-checks = callPackage ../development/tools/rust/cargo-semver-checks { }; cargo-show-asm = callPackage ../development/tools/rust/cargo-show-asm { }; From bad873c04766b2749733918a301ae46202a53396 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Aug 2023 10:04:29 +0200 Subject: [PATCH 48/63] python311Packages.smbus2: 0.4.2 -> 0.4.3 Diff: https://github.com/kplindegaard/smbus2/compare/refs/tags/0.4.2...0.4.3 --- pkgs/development/python-modules/smbus2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/smbus2/default.nix b/pkgs/development/python-modules/smbus2/default.nix index ba36c02e6962..0a3c81a0698a 100644 --- a/pkgs/development/python-modules/smbus2/default.nix +++ b/pkgs/development/python-modules/smbus2/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "smbus2"; - version = "0.4.2"; + version = "0.4.3"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "kplindegaard"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6JzFbhUq8XR1nYkadPeYqItcLZDIFAwTe3BriEW2nVI="; + hash = "sha256-tjJurJzDn0ATiYY3Xo66lwUs98/7ZLG3d4+h1prVHAI="; }; nativeCheckInputs = [ From c663462360b89eae2b5155adb8645e6d7cb20f30 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Aug 2023 10:05:50 +0200 Subject: [PATCH 49/63] qovery-cli: 0.65.1 -> 0.66.1 Diff: https://github.com/Qovery/qovery-cli/compare/refs/tags/v0.65.1...v0.66.1 Changelog: https://github.com/Qovery/qovery-cli/releases/tag/v0.66.1 --- pkgs/tools/admin/qovery-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index 971e47d3ad61..a6e80cec52af 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.65.1"; + version = "0.66.1"; src = fetchFromGitHub { owner = "Qovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-0Wg6E89+k7YKx+DpIcO76NJ+VzGPQc07PoR0FvmYeKg="; + hash = "sha256-vWfwoOxs8scIJchQ+dDfyHZvU88YKaMH/wCWwVTwtyU="; }; vendorHash = "sha256-Fcm/f54zGgA742yhIVJxjv7Y2T8DblC71+hw5HTmOf0="; From 0819c77def1849b57187b10f90368c2ff2aeda49 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Aug 2023 10:07:20 +0200 Subject: [PATCH 50/63] checkov: 2.4.7 -> 2.4.10 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/2.4.7...2.4.10 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/2.4.10 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 4fdcdf9a0f1e..1c7e54ffbc43 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,14 +22,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.4.7"; + version = "2.4.10"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-NveRGWf0Aghu0fxVAVSukrH9zFl+QJ2rWNYm5JIHIjk="; + hash = "sha256-L5BRpwWAP4WyP3kyzp8ELVnXth84jRwP9wmj9kA+xcw="; }; patches = [ From 2ea678ed48b5c710b6561530d6a40808d7dc4d7b Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 26 Aug 2023 00:50:36 -0700 Subject: [PATCH 51/63] default-crate-overrides: add libseat-sys This is needed for building `cosmic-comp` using `crate2nix` instead of `buildRustPackage` (like https://github.com/NixOS/nixpkgs/pull/251365/ does). --- pkgs/build-support/rust/default-crate-overrides.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index f04eeeaa9bf5..92c71dfc059c 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -40,6 +40,7 @@ , autoconf , automake , libtool +, seatd # =libseat , ... }: @@ -172,6 +173,11 @@ in buildInputs = [ openssl zlib libgit2 ]; }; + libseat-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ seatd ]; + }; + libsqlite3-sys = attrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ sqlite ]; From 2426ca915b888a491c1bb595da825241514610d3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Aug 2023 10:09:59 +0200 Subject: [PATCH 52/63] python311Packages.smbus2: add changelog to meta --- pkgs/development/python-modules/smbus2/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/smbus2/default.nix b/pkgs/development/python-modules/smbus2/default.nix index 0a3c81a0698a..3f21bdf0acfd 100644 --- a/pkgs/development/python-modules/smbus2/default.nix +++ b/pkgs/development/python-modules/smbus2/default.nix @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Drop-in replacement for smbus-cffi/smbus-python"; homepage = "https://smbus2.readthedocs.io/"; + changelog = "https://github.com/kplindegaard/smbus2/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 1498e72925aa36b4fb3f3656869df6033bf964d1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Aug 2023 10:12:11 +0200 Subject: [PATCH 53/63] python311Packages.smbus2: add format --- pkgs/development/python-modules/smbus2/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/smbus2/default.nix b/pkgs/development/python-modules/smbus2/default.nix index 3f21bdf0acfd..ffeaf141a1fd 100644 --- a/pkgs/development/python-modules/smbus2/default.nix +++ b/pkgs/development/python-modules/smbus2/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "smbus2"; version = "0.4.3"; + format = "setuptools"; disabled = pythonOlder "3.6"; From 6fb63efc6140d39ab1817aa485d1c890e747a985 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Aug 2023 10:13:52 +0200 Subject: [PATCH 54/63] python311Packages.smbus2: migrate to pytestCheckHook --- pkgs/development/python-modules/smbus2/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/smbus2/default.nix b/pkgs/development/python-modules/smbus2/default.nix index ffeaf141a1fd..893dd1921b51 100644 --- a/pkgs/development/python-modules/smbus2/default.nix +++ b/pkgs/development/python-modules/smbus2/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, nose +, pytestCheckHook , pythonOlder }: @@ -20,15 +20,9 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - nose + pytestCheckHook ]; - checkPhase = '' - runHook preCheck - nosetests - runHook postCheck - ''; - pythonImportsCheck = [ "smbus2" ]; From 98d9acd376c1ffcde0b5c418f5739cb24bb8e99d Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sat, 26 Aug 2023 01:13:55 -0700 Subject: [PATCH 55/63] python2Packages.ninja: alias it to ninja build tool --- pkgs/top-level/python2-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 7b36e82f99fb..073ffa0be2c4 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -37,6 +37,10 @@ with self; with super; { more-itertools = callPackage ../development/python2-modules/more-itertools { }; + # ninja python stub was created to help simplify python builds using PyPA's + # build tool in Python 3, but it does not yet support Python 2 + ninja = pkgs.buildPackages.ninja; + packaging = callPackage ../development/python2-modules/packaging { }; pip = callPackage ../development/python2-modules/pip { }; From a5f7cae6088d44d629e161bf07be3406692757c0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Aug 2023 10:20:40 +0200 Subject: [PATCH 56/63] python311Packages.approvaltests: 8.3.1 -> 8.4.1 Diff: https://github.com/approvals/ApprovalTests.Python/compare/refs/tags/v8.3.1...v8.4.1 Changelog: https://github.com/approvals/ApprovalTests.Python/releases/tag/v8.4.1 --- .../python-modules/approvaltests/default.nix | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index f55ca7e29670..070479b69377 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -1,36 +1,33 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder - -# propagates , allpairspy , approval-utilities , beautifulsoup4 +, buildPythonPackage , empty-files +, fetchFromGitHub +, mock , mrjob +, numpy , pyperclip , pytest -, typing-extensions - -# tests -, numpy , pytestCheckHook +, pythonOlder +, testfixtures +, typing-extensions }: buildPythonPackage rec { - version = "8.3.1"; pname = "approvaltests"; + version = "8.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; - # no tests included in PyPI tarball src = fetchFromGitHub { owner = "approvals"; repo = "ApprovalTests.Python"; rev = "refs/tags/v${version}"; - hash = "sha256-FyYT+w4CX+CdUg0uGwyjw98H8Z+HMVecgMBW/ytrtFU="; + hash = "sha256-BuFiNZZ7228CKJ97mVK2S8Siqe040EYV5pElVtwuVf4="; }; propagatedBuildInputs = [ @@ -41,16 +38,18 @@ buildPythonPackage rec { mrjob pyperclip pytest + testfixtures typing-extensions ]; nativeCheckInputs = [ + mock numpy pytestCheckHook ]; disabledTests = [ - # tests expects paths below ApprovalTests.Python directory + # Tests expects paths below ApprovalTests.Python directory "test_received_filename" "test_pytest_namer" ]; @@ -63,7 +62,8 @@ buildPythonPackage rec { meta = with lib; { description = "Assertion/verification library to aid testing"; homepage = "https://github.com/approvals/ApprovalTests.Python"; + changelog = "https://github.com/approvals/ApprovalTests.Python/releases/tag/v${version}"; license = licenses.asl20; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ marsam ]; }; } From 1939a9af87b614662b778c37feeb4551512f8daa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Aug 2023 10:29:21 +0200 Subject: [PATCH 57/63] python311Packages.apptools: add changelog to meta --- pkgs/development/python-modules/apptools/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/apptools/default.nix b/pkgs/development/python-modules/apptools/default.nix index 0905100a2bae..350365ee638e 100644 --- a/pkgs/development/python-modules/apptools/default.nix +++ b/pkgs/development/python-modules/apptools/default.nix @@ -68,6 +68,7 @@ buildPythonPackage rec { meta = with lib; { description = "Set of packages that Enthought has found useful in creating a number of applications"; homepage = "https://github.com/enthought/apptools"; + changelog = "https://github.com/enthought/apptools/releases/tag/${version}"; license = licenses.bsdOriginal; maintainers = with maintainers; [ knedlsepp ]; }; From 30153560e10d46bb06b0b7948a44fa0c93423bd5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Aug 2023 10:32:52 +0200 Subject: [PATCH 58/63] python311Packages.apptools: 5.1.0 -> 5.2.1 Changelog: https://github.com/enthought/apptools/releases/tag/5.2.1 --- .../python-modules/apptools/default.nix | 24 ++----------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/apptools/default.nix b/pkgs/development/python-modules/apptools/default.nix index 350365ee638e..faaf6bec0796 100644 --- a/pkgs/development/python-modules/apptools/default.nix +++ b/pkgs/development/python-modules/apptools/default.nix @@ -1,12 +1,10 @@ { lib , buildPythonPackage , configobj -, fetchpatch , fetchPypi , importlib-resources , pandas , pytestCheckHook -, pythonAtLeast , pythonOlder , tables , traits @@ -15,34 +13,16 @@ buildPythonPackage rec { pname = "apptools"; - version = "5.1.0"; + version = "5.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "12x5lcs1cllpybz7f0i1lcwvmqsaa5n818wb2165lj049wqxx4yh"; + hash = "sha256-xiaPXfzzCIvK92oAA+ULd3TQG1JY1xmbQQtIUv8iRuM="; }; - patches = [ - # python310: Fix tests - # https://github.com/enthought/apptools/issues/303 - (fetchpatch { - url = "https://github.com/enthought/apptools/commit/10fb73916124f7ae7edf6c6688a05ad95678488f.patch"; - hash = "sha256-izAcP5RWobLvnk2PQx31SX/TUGkw+prbYbjamYVmtjY="; - name = "fix_python310_tests.patch"; - }) - - # python39: importlib_resources -> importlib.resources. This patch will be included - # in the next release after 5.1.0. - (fetchpatch { - url = "https://github.com/enthought/apptools/commit/0ae4f52f19a8c0ca9d7926e17c7de949097f24b4.patch"; - sha256 = "165aiwjisr5c3lasg7xblcha7y1y5bq23vi3g9gc80c24bzwcbsw"; - name = "fix_importlib-resources_naming.patch"; - }) - ]; - propagatedBuildInputs = [ configobj traits From 9b30d7b2b20a05a60ea3c9da7c6993e576ef8708 Mon Sep 17 00:00:00 2001 From: misuzu Date: Sat, 26 Aug 2023 12:14:44 +0300 Subject: [PATCH 59/63] zerotierone: 1.10.6 -> 1.12.1 (#251523) https://github.com/zerotier/ZeroTierOne/releases/tag/1.12.1 https://github.com/zerotier/ZeroTierOne/compare/1.10.6...1.12.1 https://github.com/zerotier/ZeroTierOne/blob/1.12.1/RELEASE-NOTES.md --- pkgs/tools/networking/zerotierone/Cargo.lock | 677 +++++++++--------- pkgs/tools/networking/zerotierone/default.nix | 8 +- 2 files changed, 329 insertions(+), 356 deletions(-) diff --git a/pkgs/tools/networking/zerotierone/Cargo.lock b/pkgs/tools/networking/zerotierone/Cargo.lock index e6373783c50e..b01e68e2d084 100644 --- a/pkgs/tools/networking/zerotierone/Cargo.lock +++ b/pkgs/tools/networking/zerotierone/Cargo.lock @@ -2,6 +2,27 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "addr2line" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -37,6 +58,21 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "backtrace" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + [[package]] name = "base64" version = "0.13.1" @@ -45,9 +81,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.0" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] name = "bitflags" @@ -56,19 +92,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "block-buffer" -version = "0.10.3" +name = "bitflags" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ "generic-array", ] [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "bytes" @@ -90,16 +132,19 @@ dependencies = [ "quote", "serde", "serde_json", - "syn", + "syn 1.0.109", "tempfile", "toml", ] [[package]] name = "cc" -version = "1.0.79" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" +dependencies = [ + "libc", +] [[package]] name = "cfg-if" @@ -109,12 +154,12 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.23" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ + "android-tzdata", "iana-time-zone", - "num-integer", "num-traits", "serde", "winapi", @@ -128,23 +173,13 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term", "atty", - "bitflags", + "bitflags 1.3.2", "strsim 0.8.0", "textwrap", "unicode-width", "vec_map", ] -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - [[package]] name = "core-foundation" version = "0.9.3" @@ -157,15 +192,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] @@ -180,50 +215,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "cxx" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d3488e7665a7a483b57e25bdd90d0aeb2bc7608c8d0346acf2ad3f1caf1d62" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48fcaf066a053a41a81dfb14d57d99738b767febb8b735c3016e469fac5da690" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef98b8b717a829ca5603af80e1f9e2e48013ab227b68ef37872ef84ee479bf" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "darling" version = "0.13.4" @@ -245,7 +236,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn", + "syn 1.0.109", ] [[package]] @@ -256,14 +247,20 @@ checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core", "quote", - "syn", + "syn 1.0.109", ] [[package]] -name = "digest" -version = "0.10.6" +name = "deranged" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929" + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "crypto-common", @@ -272,9 +269,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "encoding_rs" @@ -287,13 +284,13 @@ dependencies = [ [[package]] name = "errno" -version = "0.2.8" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", - "winapi", + "windows-sys", ] [[package]] @@ -308,12 +305,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "fnv" @@ -338,51 +332,51 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] [[package]] name = "futures-channel" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", ] [[package]] name = "futures-core" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-io" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-sink" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-core", "futures-io", @@ -395,9 +389,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -405,9 +399,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "js-sys", @@ -417,10 +411,16 @@ dependencies = [ ] [[package]] -name = "h2" -version = "0.3.16" +name = "gimli" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" + +[[package]] +name = "h2" +version = "0.3.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" dependencies = [ "bytes", "fnv", @@ -461,12 +461,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "hmac" @@ -507,15 +504,15 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.24" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -528,7 +525,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -550,26 +547,25 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.53" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi", + "windows", ] [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] [[package]] @@ -580,9 +576,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -590,38 +586,19 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown", ] -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" -dependencies = [ - "libc", - "windows-sys 0.45.0", -] - [[package]] name = "ipnet" -version = "2.7.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "itertools" @@ -634,15 +611,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.5" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -669,33 +646,21 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.139" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" - -[[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "linux-raw-sys" -version = "0.1.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "log" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "memchr" @@ -705,20 +670,28 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "mime" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] [[package]] name = "mio" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "log", "wasi", - "windows-sys 0.45.0", + "windows-sys", ] [[package]] @@ -762,28 +735,28 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.2", "libc", ] [[package]] name = "oauth2" -version = "4.3.0" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeaf26a72311c087f8c5ba617c96fac67a5c04f430e716ac8d8ab2de62e23368" +checksum = "09a6e2a2b13a56ebeabba9142f911745be6456163fd6c3d361274ebcd891a80c" dependencies = [ "base64 0.13.1", "chrono", @@ -800,16 +773,25 @@ dependencies = [ ] [[package]] -name = "once_cell" -version = "1.17.1" +name = "object" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "openidconnect" -version = "2.5.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a0f47b0f1499d08c4a8480c963d49c5ec77f4249c2b6869780979415f45809" +checksum = "98dd5b7049bac4fdd2233b8c9767d42c05da8006fdb79cc903258556d2b18009" dependencies = [ "base64 0.13.1", "chrono", @@ -834,11 +816,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.45" +version = "0.10.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1" +checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "foreign-types", "libc", @@ -849,13 +831,13 @@ dependencies = [ [[package]] name = "openssl-macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.29", ] [[package]] @@ -866,11 +848,10 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.80" +version = "0.9.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7" +checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" dependencies = [ - "autocfg", "cc", "libc", "pkg-config", @@ -888,15 +869,15 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" [[package]] name = "pin-utils" @@ -906,9 +887,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "ppv-lite86" @@ -918,18 +899,18 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.51" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.23" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -966,20 +947,20 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "reqwest" -version = "0.11.14" +version = "0.11.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" dependencies = [ - "base64 0.21.0", + "base64 0.21.2", "bytes", "encoding_rs", "futures-core", @@ -1026,47 +1007,46 @@ dependencies = [ ] [[package]] -name = "rustix" -version = "0.36.8" +name = "rustc-demangle" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustix" +version = "0.38.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" dependencies = [ - "bitflags", + "bitflags 2.4.0", "errno", - "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.45.0", + "windows-sys", ] [[package]] name = "ryu" -version = "1.0.12" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.42.0", + "windows-sys", ] -[[package]] -name = "scratch" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" - [[package]] name = "security-framework" -version = "2.8.2" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -1075,9 +1055,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.8.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -1085,9 +1065,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.152" +version = "1.0.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" dependencies = [ "serde_derive", ] @@ -1104,20 +1084,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.152" +version = "1.0.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.29", ] [[package]] name = "serde_json" -version = "1.0.93" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", @@ -1126,10 +1106,11 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.9" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b04f22b563c91331a10074bda3dd5492e3cc39d56bd557e91c0af42b6c7341" +checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" dependencies = [ + "itoa", "serde", ] @@ -1173,14 +1154,14 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if", "cpufeatures", @@ -1198,14 +1179,24 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", ] +[[package]] +name = "socket2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys", +] + [[package]] name = "spin" version = "0.5.2" @@ -1226,9 +1217,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "subtle" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" @@ -1242,25 +1233,27 @@ dependencies = [ ] [[package]] -name = "tempfile" -version = "3.4.0" +name = "syn" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651" dependencies = [ "cfg-if", "fastrand", "redox_syscall", "rustix", - "windows-sys 0.42.0", -] - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", + "windows-sys", ] [[package]] @@ -1274,30 +1267,31 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.38" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.38" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.29", ] [[package]] name = "time" -version = "0.3.20" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" +checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea" dependencies = [ + "deranged", "itoa", "serde", "time-core", @@ -1306,15 +1300,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" +checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd" dependencies = [ "time-core", ] @@ -1336,19 +1330,18 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.26.0" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", - "memchr", "mio", "num_cpus", "pin-project-lite", - "socket2", - "windows-sys 0.45.0", + "socket2 0.5.3", + "windows-sys", ] [[package]] @@ -1363,9 +1356,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", @@ -1403,9 +1396,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", ] @@ -1424,15 +1417,15 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "unicode-bidi" -version = "0.3.10" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -1463,9 +1456,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", "idna", @@ -1493,11 +1486,10 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] @@ -1509,9 +1501,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -1519,24 +1511,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.29", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -1546,9 +1538,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1556,28 +1548,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.29", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", @@ -1599,15 +1591,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -1615,34 +1598,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows-sys" -version = "0.42.0" +name = "windows" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows-targets", ] [[package]] name = "windows-sys" -version = "0.45.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ "windows-targets", ] [[package]] name = "windows-targets" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -1655,45 +1632,45 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winreg" @@ -1708,7 +1685,7 @@ dependencies = [ name = "zeroidc" version = "0.1.0" dependencies = [ - "base64 0.21.0", + "base64 0.21.2", "bytes", "cbindgen", "jwt", diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index c761d887e35d..de0ffe86ec4f 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -2,10 +2,8 @@ , stdenv , rustPlatform , fetchFromGitHub - , buildPackages , cargo -, iproute2 , lzo , openssl , pkg-config @@ -16,13 +14,13 @@ let pname = "zerotierone"; - version = "1.10.6"; + version = "1.12.1"; src = fetchFromGitHub { owner = "zerotier"; repo = "ZeroTierOne"; rev = version; - sha256 = "sha256-mapFKeF+8jMGkxSuHaw5oUdTdSQgAdxEwF/S6iyVLbY="; + sha256 = "sha256-430wdPrSNohM3sXewusjsW3tbE7EFGISGxABZF21yRc="; }; in stdenv.mkDerivation { @@ -62,8 +60,6 @@ in stdenv.mkDerivation { lzo openssl zlib - ] ++ lib.optional stdenv.isLinux [ - iproute2 ]; enableParallelBuilding = true; From b793df565b99e6617917e8c800dcd5d5b0326c1b Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 26 Aug 2023 12:20:31 +0300 Subject: [PATCH 60/63] path-of-building.data: 2.33.2 -> 2.33.3 Diff: https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.33.2...v2.33.3 --- pkgs/games/path-of-building/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/path-of-building/default.nix b/pkgs/games/path-of-building/default.nix index 7da60008009e..b0c7f10c99be 100644 --- a/pkgs/games/path-of-building/default.nix +++ b/pkgs/games/path-of-building/default.nix @@ -2,13 +2,13 @@ let data = stdenv.mkDerivation(finalAttrs: { pname = "path-of-building-data"; - version = "2.33.2"; + version = "2.33.3"; src = fetchFromGitHub { owner = "PathOfBuildingCommunity"; repo = "PathOfBuilding"; rev = "v${finalAttrs.version}"; - hash = "sha256-+lRpmRg5y7cGB6ru/Y76dZDV8EKQaakPJl+mOXc3u2s="; + hash = "sha256-mRF8bXDBTfMGB8SAhF4rrwkBZq1XyGA9Wkb1ZpvTCv0="; }; nativeBuildInputs = [ unzip ]; From 565af45965315b97ad8e44504c3b0e230e3a1fed Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Aug 2023 11:58:34 +0200 Subject: [PATCH 61/63] python311Packages.mdformat-mkdocs: 1.0.2 -> 1.0.4 Diff: https://github.com/KyleKing/mdformat-mkdocs/compare/refs/tags/v1.0.2...v1.0.4 --- pkgs/development/python-modules/mdformat-mkdocs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mdformat-mkdocs/default.nix b/pkgs/development/python-modules/mdformat-mkdocs/default.nix index 5df491ea8575..213b1dc0b7cd 100644 --- a/pkgs/development/python-modules/mdformat-mkdocs/default.nix +++ b/pkgs/development/python-modules/mdformat-mkdocs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "mdformat-mkdocs"; - version = "1.0.2"; + version = "1.0.4"; format = "flit"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "KyleKing"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-H+wqgcXNrdrZ5aQvZ7XM8YpBpVZM6pFtsANC00UZ0jM="; + hash = "sha256-mGWeG8clWJ7obsvO+gYaVzfAyDOh9HNdyWW5KgOgfmM="; }; buildInputs = [ From 15e7e402dcbc78785f81531b4d723f9036e20c78 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Aug 2023 12:01:13 +0200 Subject: [PATCH 62/63] python311Packages.mdformat-mkdocs: add changelog to meta --- pkgs/development/python-modules/mdformat-mkdocs/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/mdformat-mkdocs/default.nix b/pkgs/development/python-modules/mdformat-mkdocs/default.nix index 213b1dc0b7cd..734045426526 100644 --- a/pkgs/development/python-modules/mdformat-mkdocs/default.nix +++ b/pkgs/development/python-modules/mdformat-mkdocs/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "mdformat plugin for MkDocs"; homepage = "https://github.com/KyleKing/mdformat-mkdocs"; +changelog = "https://github.com/KyleKing/mdformat-mkdocs/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ aldoborrero ]; }; From b5e72c133a626ae3dd28bfd34bd740596a112f41 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Aug 2023 12:03:42 +0200 Subject: [PATCH 63/63] python311Packages.oauthenticator: 16.0.6 -> 16.0.7 Changelog: https://github.com/jupyterhub/oauthenticator/blob/16.0.7/docs/source/reference/changelog.md --- pkgs/development/python-modules/oauthenticator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index 855ecb8384d4..37f7a1e44c21 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "16.0.6"; + version = "16.0.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-82I+ZmWRUUV+kxveHNDXTsbOeZcT0QJo/SJP3paxRcY="; + hash = "sha256-opF7HdTJX4M7gTgB0VyWyyG/DO7lrVTvTcxMBX3a6UE="; }; postPatch = ''