From 9b7c656cec45bcca84f65694b05fe818822166f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Jul 2024 14:28:45 +0000 Subject: [PATCH 01/47] boogie: 3.2.0 -> 3.2.1 --- pkgs/by-name/bo/boogie/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bo/boogie/package.nix b/pkgs/by-name/bo/boogie/package.nix index ce5d84983294..528e62179eb0 100644 --- a/pkgs/by-name/bo/boogie/package.nix +++ b/pkgs/by-name/bo/boogie/package.nix @@ -2,13 +2,13 @@ buildDotnetModule rec { pname = "Boogie"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "boogie-org"; repo = "boogie"; rev = "v${version}"; - sha256 = "sha256-3+9zOoKk8IdqkxoMzjZofizyx+294mer3t6illXUr2M="; + sha256 = "sha256-89S3yBjEUHbQbuWWLe/pTMaDOCqDR04hNJwIRzh5xaI="; }; projectFile = [ "Source/Boogie.sln" ]; From a8c8ce96d18e189950e454cae99ac3b93e846d7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C3=B6lfchen?= <115360611+W-lfchen@users.noreply.github.com> Date: Thu, 18 Jul 2024 23:49:07 +0200 Subject: [PATCH 02/47] obsidian: 1.6.5 -> 1.6.7 --- pkgs/applications/misc/obsidian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 9ca05a653a35..f3bd7ef37bad 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -13,7 +13,7 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.6.5"; + version = "1.6.7"; appname = "Obsidian"; meta = with lib; { description = "Powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -26,7 +26,7 @@ let filename = if stdenv.isDarwin then "Obsidian-${version}.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - hash = if stdenv.isDarwin then "sha256-gA6FkCalGw0pgnCbOJliItLzMGr+CG9r6mSMdvVUAoQ=" else "sha256-9goJnKOgJk5TrFUNz4vff8704cvHfqZpGL/iBkcU2GY="; + hash = if stdenv.isDarwin then "sha256-rFXmhlxXlVz5nCrXMmfYGaxe4/wnBRdFxsfiwiIDHgw=" else "sha256-ok1fedN8+OXBisFpVXbKRW2OhE4o9MC9lJmtMMST6V8="; }; icon = fetchurl { From 8cb75d03216e19f814ea97012d5c3730aff11d02 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 00:32:54 +0000 Subject: [PATCH 03/47] python312Packages.tika-client: 0.5.0 -> 0.6.0 --- pkgs/development/python-modules/tika-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tika-client/default.nix b/pkgs/development/python-modules/tika-client/default.nix index ec9c4a0f4dd1..f2e74ad90c93 100644 --- a/pkgs/development/python-modules/tika-client/default.nix +++ b/pkgs/development/python-modules/tika-client/default.nix @@ -8,7 +8,7 @@ }: buildPythonPackage rec { pname = "tika-client"; - version = "0.5.0"; + version = "0.6.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "stumpylog"; repo = "tika-client"; rev = "refs/tags/${version}"; - hash = "sha256-fFibRF3SoDOje6M9YmZI0dwYVn/cvgXqmClvqvNy5f8="; + hash = "sha256-1Gc/WF8eEGT17z2CiuSLUIngDZVoHdBhfsUddNUBwWo="; }; propagatedBuildInputs = [ From 3b37e6cecd635f6fa8e6d5b0e56a564d1d91075c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 04:19:27 +0000 Subject: [PATCH 04/47] trrntzip: 1.1 -> 1.3 --- pkgs/by-name/tr/trrntzip/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/trrntzip/package.nix b/pkgs/by-name/tr/trrntzip/package.nix index 89018ea649af..baa671ce217c 100644 --- a/pkgs/by-name/tr/trrntzip/package.nix +++ b/pkgs/by-name/tr/trrntzip/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "trrntzip"; - version = "1.1"; + version = "1.3"; src = fetchFromGitHub { owner = "0-wiz-0"; repo = "trrntzip"; rev = "v${finalAttrs.version}"; - hash = "sha256-7BrTJCQH9x9cNqm7tGOLxQlbTmlxs5S2hAD4ZWIady8="; + hash = "sha256-whxPqXT6w91jWv9aoTE4ITbjqohgwytzA0HN7WXKcTA="; }; nativeBuildInputs = [ cmake ]; From a8cf52fddc3757e074c6a6b444a5f60c40b30a34 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 07:47:36 +0000 Subject: [PATCH 05/47] weaviate: 1.25.6 -> 1.25.8 --- pkgs/servers/search/weaviate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/search/weaviate/default.nix b/pkgs/servers/search/weaviate/default.nix index 667ba4434d58..d3786881af02 100644 --- a/pkgs/servers/search/weaviate/default.nix +++ b/pkgs/servers/search/weaviate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "weaviate"; - version = "1.25.6"; + version = "1.25.8"; src = fetchFromGitHub { owner = "weaviate"; repo = "weaviate"; rev = "v${version}"; - hash = "sha256-jXnCICtw5NYnqfiBeM8aZkpnTd30IcQJMH2CUqPGMlY="; + hash = "sha256-MmOA0kO5OCXz5MIqz1netXFUShZc0TkMCFKNfbD1uEM="; }; - vendorHash = "sha256-40O6MF1Tk9ZhGVLcKGzoUTaUFjKuXdpIHbB1GuRgyL8="; + vendorHash = "sha256-D+/gB1HbwXWHJ6e5J6s+HgN4yPQX1nYbvMY2oLIQFwQ="; subPackages = [ "cmd/weaviate-server" ]; From 01750f8f404d4e6a8a4ba3638fc678da6de65c55 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 19 Jul 2024 07:48:25 +0000 Subject: [PATCH 06/47] mongosh: 2.2.10 -> 2.2.12 --- .../tools/mongosh/package-lock.json | 1235 ++++++++--------- pkgs/development/tools/mongosh/source.json | 8 +- 2 files changed, 612 insertions(+), 631 deletions(-) diff --git a/pkgs/development/tools/mongosh/package-lock.json b/pkgs/development/tools/mongosh/package-lock.json index 3df381034008..f1cf59df3105 100644 --- a/pkgs/development/tools/mongosh/package-lock.json +++ b/pkgs/development/tools/mongosh/package-lock.json @@ -1,15 +1,15 @@ { "name": "mongosh", - "version": "2.2.10", + "version": "2.2.12", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mongosh", - "version": "2.2.10", + "version": "2.2.12", "license": "Apache-2.0", "dependencies": { - "@mongosh/cli-repl": "2.2.10" + "@mongosh/cli-repl": "2.2.12" }, "bin": { "mongosh": "bin/mongosh.js" @@ -146,49 +146,49 @@ } }, "node_modules/@aws-sdk/client-cognito-identity": { - "version": "3.606.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.606.0.tgz", - "integrity": "sha512-CJ3kovUg7HAn3trqo0WxVw3PJoaHxiGU1U+Ok8Vx/sL81+auyyiasT09M/NcchRqwAooKvUi44sVD0ih7Zi9Nw==", + "version": "3.616.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.616.0.tgz", + "integrity": "sha512-3yli0rchw7FuI8CmxUKW5z6TzrAJzBm9x+Se20Gqm0idXc2X2RT4Z8axtni5umBu8+4QWgNDZAr/WG6bR/JUGA==", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/client-sso-oidc": "3.606.0", - "@aws-sdk/client-sts": "3.606.0", - "@aws-sdk/core": "3.598.0", - "@aws-sdk/credential-provider-node": "3.600.0", - "@aws-sdk/middleware-host-header": "3.598.0", - "@aws-sdk/middleware-logger": "3.598.0", - "@aws-sdk/middleware-recursion-detection": "3.598.0", - "@aws-sdk/middleware-user-agent": "3.598.0", - "@aws-sdk/region-config-resolver": "3.598.0", - "@aws-sdk/types": "3.598.0", - "@aws-sdk/util-endpoints": "3.598.0", - "@aws-sdk/util-user-agent-browser": "3.598.0", - "@aws-sdk/util-user-agent-node": "3.598.0", - "@smithy/config-resolver": "^3.0.2", - "@smithy/core": "^2.2.1", - "@smithy/fetch-http-handler": "^3.0.2", - "@smithy/hash-node": "^3.0.1", - "@smithy/invalid-dependency": "^3.0.1", - "@smithy/middleware-content-length": "^3.0.1", - "@smithy/middleware-endpoint": "^3.0.2", - "@smithy/middleware-retry": "^3.0.4", - "@smithy/middleware-serde": "^3.0.1", - "@smithy/middleware-stack": "^3.0.1", - "@smithy/node-config-provider": "^3.1.1", - "@smithy/node-http-handler": "^3.0.1", - "@smithy/protocol-http": "^4.0.1", - "@smithy/smithy-client": "^3.1.2", - "@smithy/types": "^3.1.0", - "@smithy/url-parser": "^3.0.1", + "@aws-sdk/client-sso-oidc": "3.616.0", + "@aws-sdk/client-sts": "3.616.0", + "@aws-sdk/core": "3.616.0", + "@aws-sdk/credential-provider-node": "3.616.0", + "@aws-sdk/middleware-host-header": "3.616.0", + "@aws-sdk/middleware-logger": "3.609.0", + "@aws-sdk/middleware-recursion-detection": "3.616.0", + "@aws-sdk/middleware-user-agent": "3.616.0", + "@aws-sdk/region-config-resolver": "3.614.0", + "@aws-sdk/types": "3.609.0", + "@aws-sdk/util-endpoints": "3.614.0", + "@aws-sdk/util-user-agent-browser": "3.609.0", + "@aws-sdk/util-user-agent-node": "3.614.0", + "@smithy/config-resolver": "^3.0.5", + "@smithy/core": "^2.2.7", + "@smithy/fetch-http-handler": "^3.2.2", + "@smithy/hash-node": "^3.0.3", + "@smithy/invalid-dependency": "^3.0.3", + "@smithy/middleware-content-length": "^3.0.4", + "@smithy/middleware-endpoint": "^3.0.5", + "@smithy/middleware-retry": "^3.0.10", + "@smithy/middleware-serde": "^3.0.3", + "@smithy/middleware-stack": "^3.0.3", + "@smithy/node-config-provider": "^3.1.4", + "@smithy/node-http-handler": "^3.1.3", + "@smithy/protocol-http": "^4.0.4", + "@smithy/smithy-client": "^3.1.8", + "@smithy/types": "^3.3.0", + "@smithy/url-parser": "^3.0.3", "@smithy/util-base64": "^3.0.0", "@smithy/util-body-length-browser": "^3.0.0", "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.4", - "@smithy/util-defaults-mode-node": "^3.0.4", - "@smithy/util-endpoints": "^2.0.2", - "@smithy/util-middleware": "^3.0.1", - "@smithy/util-retry": "^3.0.1", + "@smithy/util-defaults-mode-browser": "^3.0.10", + "@smithy/util-defaults-mode-node": "^3.0.10", + "@smithy/util-endpoints": "^2.0.5", + "@smithy/util-middleware": "^3.0.3", + "@smithy/util-retry": "^3.0.3", "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, @@ -197,46 +197,46 @@ } }, "node_modules/@aws-sdk/client-sso": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso/-/client-sso-3.598.0.tgz", - "integrity": "sha512-nOI5lqPYa+YZlrrzwAJywJSw3MKVjvu6Ge2fCqQUNYMfxFB0NAaDFnl0EPjXi+sEbtCuz/uWE77poHbqiZ+7Iw==", + "version": "3.616.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso/-/client-sso-3.616.0.tgz", + "integrity": "sha512-hwW0u1f8U4dSloAe61/eupUiGd5Q13B72BuzGxvRk0cIpYX/2m0KBG8DDl7jW1b2QQ+CflTLpG2XUf2+vRJxGA==", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/core": "3.598.0", - "@aws-sdk/middleware-host-header": "3.598.0", - "@aws-sdk/middleware-logger": "3.598.0", - "@aws-sdk/middleware-recursion-detection": "3.598.0", - "@aws-sdk/middleware-user-agent": "3.598.0", - "@aws-sdk/region-config-resolver": "3.598.0", - "@aws-sdk/types": "3.598.0", - "@aws-sdk/util-endpoints": "3.598.0", - "@aws-sdk/util-user-agent-browser": "3.598.0", - "@aws-sdk/util-user-agent-node": "3.598.0", - "@smithy/config-resolver": "^3.0.2", - "@smithy/core": "^2.2.1", - "@smithy/fetch-http-handler": "^3.0.2", - "@smithy/hash-node": "^3.0.1", - "@smithy/invalid-dependency": "^3.0.1", - "@smithy/middleware-content-length": "^3.0.1", - "@smithy/middleware-endpoint": "^3.0.2", - "@smithy/middleware-retry": "^3.0.4", - "@smithy/middleware-serde": "^3.0.1", - "@smithy/middleware-stack": "^3.0.1", - "@smithy/node-config-provider": "^3.1.1", - "@smithy/node-http-handler": "^3.0.1", - "@smithy/protocol-http": "^4.0.1", - "@smithy/smithy-client": "^3.1.2", - "@smithy/types": "^3.1.0", - "@smithy/url-parser": "^3.0.1", + "@aws-sdk/core": "3.616.0", + "@aws-sdk/middleware-host-header": "3.616.0", + "@aws-sdk/middleware-logger": "3.609.0", + "@aws-sdk/middleware-recursion-detection": "3.616.0", + "@aws-sdk/middleware-user-agent": "3.616.0", + "@aws-sdk/region-config-resolver": "3.614.0", + "@aws-sdk/types": "3.609.0", + "@aws-sdk/util-endpoints": "3.614.0", + "@aws-sdk/util-user-agent-browser": "3.609.0", + "@aws-sdk/util-user-agent-node": "3.614.0", + "@smithy/config-resolver": "^3.0.5", + "@smithy/core": "^2.2.7", + "@smithy/fetch-http-handler": "^3.2.2", + "@smithy/hash-node": "^3.0.3", + "@smithy/invalid-dependency": "^3.0.3", + "@smithy/middleware-content-length": "^3.0.4", + "@smithy/middleware-endpoint": "^3.0.5", + "@smithy/middleware-retry": "^3.0.10", + "@smithy/middleware-serde": "^3.0.3", + "@smithy/middleware-stack": "^3.0.3", + "@smithy/node-config-provider": "^3.1.4", + "@smithy/node-http-handler": "^3.1.3", + "@smithy/protocol-http": "^4.0.4", + "@smithy/smithy-client": "^3.1.8", + "@smithy/types": "^3.3.0", + "@smithy/url-parser": "^3.0.3", "@smithy/util-base64": "^3.0.0", "@smithy/util-body-length-browser": "^3.0.0", "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.4", - "@smithy/util-defaults-mode-node": "^3.0.4", - "@smithy/util-endpoints": "^2.0.2", - "@smithy/util-middleware": "^3.0.1", - "@smithy/util-retry": "^3.0.1", + "@smithy/util-defaults-mode-browser": "^3.0.10", + "@smithy/util-defaults-mode-node": "^3.0.10", + "@smithy/util-endpoints": "^2.0.5", + "@smithy/util-middleware": "^3.0.3", + "@smithy/util-retry": "^3.0.3", "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, @@ -245,47 +245,47 @@ } }, "node_modules/@aws-sdk/client-sso-oidc": { - "version": "3.606.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.606.0.tgz", - "integrity": "sha512-gL1FHPS6hwgMNS/A+Qh5bUyHOeRVOqdb7c6+i+9gR3wtGvt2lvoSm8w5DhS08Xiiacz2AqYRDEapp0xuyCrbBQ==", + "version": "3.616.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.616.0.tgz", + "integrity": "sha512-YY1hpYS/G1uRGjQf88dL8VLHkP/IjGxKeXdhy+JnzMdCkAWl3V9j0fEALw40NZe0x79gr6R2KUOUH/IKYQfUmg==", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/core": "3.598.0", - "@aws-sdk/credential-provider-node": "3.600.0", - "@aws-sdk/middleware-host-header": "3.598.0", - "@aws-sdk/middleware-logger": "3.598.0", - "@aws-sdk/middleware-recursion-detection": "3.598.0", - "@aws-sdk/middleware-user-agent": "3.598.0", - "@aws-sdk/region-config-resolver": "3.598.0", - "@aws-sdk/types": "3.598.0", - "@aws-sdk/util-endpoints": "3.598.0", - "@aws-sdk/util-user-agent-browser": "3.598.0", - "@aws-sdk/util-user-agent-node": "3.598.0", - "@smithy/config-resolver": "^3.0.2", - "@smithy/core": "^2.2.1", - "@smithy/fetch-http-handler": "^3.0.2", - "@smithy/hash-node": "^3.0.1", - "@smithy/invalid-dependency": "^3.0.1", - "@smithy/middleware-content-length": "^3.0.1", - "@smithy/middleware-endpoint": "^3.0.2", - "@smithy/middleware-retry": "^3.0.4", - "@smithy/middleware-serde": "^3.0.1", - "@smithy/middleware-stack": "^3.0.1", - "@smithy/node-config-provider": "^3.1.1", - "@smithy/node-http-handler": "^3.0.1", - "@smithy/protocol-http": "^4.0.1", - "@smithy/smithy-client": "^3.1.2", - "@smithy/types": "^3.1.0", - "@smithy/url-parser": "^3.0.1", + "@aws-sdk/core": "3.616.0", + "@aws-sdk/credential-provider-node": "3.616.0", + "@aws-sdk/middleware-host-header": "3.616.0", + "@aws-sdk/middleware-logger": "3.609.0", + "@aws-sdk/middleware-recursion-detection": "3.616.0", + "@aws-sdk/middleware-user-agent": "3.616.0", + "@aws-sdk/region-config-resolver": "3.614.0", + "@aws-sdk/types": "3.609.0", + "@aws-sdk/util-endpoints": "3.614.0", + "@aws-sdk/util-user-agent-browser": "3.609.0", + "@aws-sdk/util-user-agent-node": "3.614.0", + "@smithy/config-resolver": "^3.0.5", + "@smithy/core": "^2.2.7", + "@smithy/fetch-http-handler": "^3.2.2", + "@smithy/hash-node": "^3.0.3", + "@smithy/invalid-dependency": "^3.0.3", + "@smithy/middleware-content-length": "^3.0.4", + "@smithy/middleware-endpoint": "^3.0.5", + "@smithy/middleware-retry": "^3.0.10", + "@smithy/middleware-serde": "^3.0.3", + "@smithy/middleware-stack": "^3.0.3", + "@smithy/node-config-provider": "^3.1.4", + "@smithy/node-http-handler": "^3.1.3", + "@smithy/protocol-http": "^4.0.4", + "@smithy/smithy-client": "^3.1.8", + "@smithy/types": "^3.3.0", + "@smithy/url-parser": "^3.0.3", "@smithy/util-base64": "^3.0.0", "@smithy/util-body-length-browser": "^3.0.0", "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.4", - "@smithy/util-defaults-mode-node": "^3.0.4", - "@smithy/util-endpoints": "^2.0.2", - "@smithy/util-middleware": "^3.0.1", - "@smithy/util-retry": "^3.0.1", + "@smithy/util-defaults-mode-browser": "^3.0.10", + "@smithy/util-defaults-mode-node": "^3.0.10", + "@smithy/util-endpoints": "^2.0.5", + "@smithy/util-middleware": "^3.0.3", + "@smithy/util-retry": "^3.0.3", "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, @@ -293,52 +293,52 @@ "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sts": "^3.606.0" + "@aws-sdk/client-sts": "^3.616.0" } }, "node_modules/@aws-sdk/client-sts": { - "version": "3.606.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sts/-/client-sts-3.606.0.tgz", - "integrity": "sha512-b11mAhjrkm3MMiAPoMGcmd6vsaz2120lg8rHG/NZCo9vB1K6Kc7WP+a1Q05TRMseer2egTtpWJfn44aVO97VqA==", + "version": "3.616.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sts/-/client-sts-3.616.0.tgz", + "integrity": "sha512-FP7i7hS5FpReqnysQP1ukQF1OUWy8lkomaOnbu15H415YUrfCp947SIx6+BItjmx+esKxPkEjh/fbCVzw2D6hQ==", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/client-sso-oidc": "3.606.0", - "@aws-sdk/core": "3.598.0", - "@aws-sdk/credential-provider-node": "3.600.0", - "@aws-sdk/middleware-host-header": "3.598.0", - "@aws-sdk/middleware-logger": "3.598.0", - "@aws-sdk/middleware-recursion-detection": "3.598.0", - "@aws-sdk/middleware-user-agent": "3.598.0", - "@aws-sdk/region-config-resolver": "3.598.0", - "@aws-sdk/types": "3.598.0", - "@aws-sdk/util-endpoints": "3.598.0", - "@aws-sdk/util-user-agent-browser": "3.598.0", - "@aws-sdk/util-user-agent-node": "3.598.0", - "@smithy/config-resolver": "^3.0.2", - "@smithy/core": "^2.2.1", - "@smithy/fetch-http-handler": "^3.0.2", - "@smithy/hash-node": "^3.0.1", - "@smithy/invalid-dependency": "^3.0.1", - "@smithy/middleware-content-length": "^3.0.1", - "@smithy/middleware-endpoint": "^3.0.2", - "@smithy/middleware-retry": "^3.0.4", - "@smithy/middleware-serde": "^3.0.1", - "@smithy/middleware-stack": "^3.0.1", - "@smithy/node-config-provider": "^3.1.1", - "@smithy/node-http-handler": "^3.0.1", - "@smithy/protocol-http": "^4.0.1", - "@smithy/smithy-client": "^3.1.2", - "@smithy/types": "^3.1.0", - "@smithy/url-parser": "^3.0.1", + "@aws-sdk/client-sso-oidc": "3.616.0", + "@aws-sdk/core": "3.616.0", + "@aws-sdk/credential-provider-node": "3.616.0", + "@aws-sdk/middleware-host-header": "3.616.0", + "@aws-sdk/middleware-logger": "3.609.0", + "@aws-sdk/middleware-recursion-detection": "3.616.0", + "@aws-sdk/middleware-user-agent": "3.616.0", + "@aws-sdk/region-config-resolver": "3.614.0", + "@aws-sdk/types": "3.609.0", + "@aws-sdk/util-endpoints": "3.614.0", + "@aws-sdk/util-user-agent-browser": "3.609.0", + "@aws-sdk/util-user-agent-node": "3.614.0", + "@smithy/config-resolver": "^3.0.5", + "@smithy/core": "^2.2.7", + "@smithy/fetch-http-handler": "^3.2.2", + "@smithy/hash-node": "^3.0.3", + "@smithy/invalid-dependency": "^3.0.3", + "@smithy/middleware-content-length": "^3.0.4", + "@smithy/middleware-endpoint": "^3.0.5", + "@smithy/middleware-retry": "^3.0.10", + "@smithy/middleware-serde": "^3.0.3", + "@smithy/middleware-stack": "^3.0.3", + "@smithy/node-config-provider": "^3.1.4", + "@smithy/node-http-handler": "^3.1.3", + "@smithy/protocol-http": "^4.0.4", + "@smithy/smithy-client": "^3.1.8", + "@smithy/types": "^3.3.0", + "@smithy/url-parser": "^3.0.3", "@smithy/util-base64": "^3.0.0", "@smithy/util-body-length-browser": "^3.0.0", "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.4", - "@smithy/util-defaults-mode-node": "^3.0.4", - "@smithy/util-endpoints": "^2.0.2", - "@smithy/util-middleware": "^3.0.1", - "@smithy/util-retry": "^3.0.1", + "@smithy/util-defaults-mode-browser": "^3.0.10", + "@smithy/util-defaults-mode-node": "^3.0.10", + "@smithy/util-endpoints": "^2.0.5", + "@smithy/util-middleware": "^3.0.3", + "@smithy/util-retry": "^3.0.3", "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, @@ -347,15 +347,15 @@ } }, "node_modules/@aws-sdk/core": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/core/-/core-3.598.0.tgz", - "integrity": "sha512-HaSjt7puO5Cc7cOlrXFCW0rtA0BM9lvzjl56x0A20Pt+0wxXGeTOZZOkXQIepbrFkV2e/HYukuT9e99vXDm59g==", + "version": "3.616.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/core/-/core-3.616.0.tgz", + "integrity": "sha512-O/urkh2kECs/IqZIVZxyeyHZ7OR2ZWhLNK7btsVQBQvJKrEspLrk/Fp20Qfg5JDerQfBN83ZbyRXLJOOucdZpw==", "dependencies": { - "@smithy/core": "^2.2.1", - "@smithy/protocol-http": "^4.0.1", - "@smithy/signature-v4": "^3.1.0", - "@smithy/smithy-client": "^3.1.2", - "@smithy/types": "^3.1.0", + "@smithy/core": "^2.2.7", + "@smithy/protocol-http": "^4.0.4", + "@smithy/signature-v4": "^4.0.0", + "@smithy/smithy-client": "^3.1.8", + "@smithy/types": "^3.3.0", "fast-xml-parser": "4.2.5", "tslib": "^2.6.2" }, @@ -364,14 +364,14 @@ } }, "node_modules/@aws-sdk/credential-provider-cognito-identity": { - "version": "3.606.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.606.0.tgz", - "integrity": "sha512-4wGvXilFLkozs4/dMnn9NvxZbL9oyyReoF9aR3kGUZ0QVO8cCBp/Zkr8IXZifhVBo9/esJdMFnR9lEXR7Yuleg==", + "version": "3.616.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.616.0.tgz", + "integrity": "sha512-bcsf36gdGY2SpvTmoxd7t2235q+Rjg6xnTeCiKs9YuzbNezZ4FosqSORs7/vu2CvyaXWwV28909Q1boZ76v4TA==", "dependencies": { - "@aws-sdk/client-cognito-identity": "3.606.0", - "@aws-sdk/types": "3.598.0", - "@smithy/property-provider": "^3.1.1", - "@smithy/types": "^3.1.0", + "@aws-sdk/client-cognito-identity": "3.616.0", + "@aws-sdk/types": "3.609.0", + "@smithy/property-provider": "^3.1.3", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -379,13 +379,13 @@ } }, "node_modules/@aws-sdk/credential-provider-env": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.598.0.tgz", - "integrity": "sha512-vi1khgn7yXzLCcgSIzQrrtd2ilUM0dWodxj3PQ6BLfP0O+q1imO3hG1nq7DVyJtq7rFHs6+9N8G4mYvTkxby2w==", + "version": "3.609.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.609.0.tgz", + "integrity": "sha512-v69ZCWcec2iuV9vLVJMa6fAb5xwkzN4jYIT8yjo2c4Ia/j976Q+TPf35Pnz5My48Xr94EFcaBazrWedF+kwfuQ==", "dependencies": { - "@aws-sdk/types": "3.598.0", - "@smithy/property-provider": "^3.1.1", - "@smithy/types": "^3.1.0", + "@aws-sdk/types": "3.609.0", + "@smithy/property-provider": "^3.1.3", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -393,18 +393,18 @@ } }, "node_modules/@aws-sdk/credential-provider-http": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.598.0.tgz", - "integrity": "sha512-N7cIafi4HVlQvEgvZSo1G4T9qb/JMLGMdBsDCT5XkeJrF0aptQWzTFH0jIdZcLrMYvzPcuEyO3yCBe6cy/ba0g==", + "version": "3.616.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.616.0.tgz", + "integrity": "sha512-1rgCkr7XvEMBl7qWCo5BKu3yAxJs71dRaZ55Xnjte/0ZHH6Oc93ZrHzyYy6UH6t0nZrH+FAuw7Yko2YtDDwDeg==", "dependencies": { - "@aws-sdk/types": "3.598.0", - "@smithy/fetch-http-handler": "^3.0.2", - "@smithy/node-http-handler": "^3.0.1", - "@smithy/property-provider": "^3.1.1", - "@smithy/protocol-http": "^4.0.1", - "@smithy/smithy-client": "^3.1.2", - "@smithy/types": "^3.1.0", - "@smithy/util-stream": "^3.0.2", + "@aws-sdk/types": "3.609.0", + "@smithy/fetch-http-handler": "^3.2.2", + "@smithy/node-http-handler": "^3.1.3", + "@smithy/property-provider": "^3.1.3", + "@smithy/protocol-http": "^4.0.4", + "@smithy/smithy-client": "^3.1.8", + "@smithy/types": "^3.3.0", + "@smithy/util-stream": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -412,45 +412,45 @@ } }, "node_modules/@aws-sdk/credential-provider-ini": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.598.0.tgz", - "integrity": "sha512-/ppcIVUbRwDIwJDoYfp90X3+AuJo2mvE52Y1t2VSrvUovYn6N4v95/vXj6LS8CNDhz2jvEJYmu+0cTMHdhI6eA==", + "version": "3.616.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.616.0.tgz", + "integrity": "sha512-5gQdMr9cca3xV7FF2SxpxWGH2t6+t4o+XBGiwsHm8muEjf4nUmw7Ij863x25Tjt2viPYV0UStczSb5Sihp7bkA==", "dependencies": { - "@aws-sdk/credential-provider-env": "3.598.0", - "@aws-sdk/credential-provider-http": "3.598.0", - "@aws-sdk/credential-provider-process": "3.598.0", - "@aws-sdk/credential-provider-sso": "3.598.0", - "@aws-sdk/credential-provider-web-identity": "3.598.0", - "@aws-sdk/types": "3.598.0", - "@smithy/credential-provider-imds": "^3.1.1", - "@smithy/property-provider": "^3.1.1", - "@smithy/shared-ini-file-loader": "^3.1.1", - "@smithy/types": "^3.1.0", + "@aws-sdk/credential-provider-env": "3.609.0", + "@aws-sdk/credential-provider-http": "3.616.0", + "@aws-sdk/credential-provider-process": "3.614.0", + "@aws-sdk/credential-provider-sso": "3.616.0", + "@aws-sdk/credential-provider-web-identity": "3.609.0", + "@aws-sdk/types": "3.609.0", + "@smithy/credential-provider-imds": "^3.1.4", + "@smithy/property-provider": "^3.1.3", + "@smithy/shared-ini-file-loader": "^3.1.4", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sts": "^3.598.0" + "@aws-sdk/client-sts": "^3.616.0" } }, "node_modules/@aws-sdk/credential-provider-node": { - "version": "3.600.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.600.0.tgz", - "integrity": "sha512-1pC7MPMYD45J7yFjA90SxpR0yaSvy+yZiq23aXhAPZLYgJBAxHLu0s0mDCk/piWGPh8+UGur5K0bVdx4B1D5hw==", + "version": "3.616.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.616.0.tgz", + "integrity": "sha512-Se+u6DAxjDPjKE3vX1X2uxjkWgGq69BTo0uTB0vDUiWwBVgh16s9BsBhSAlKEH1CCbbJHvOg4YdTrzjwzqyClg==", "dependencies": { - "@aws-sdk/credential-provider-env": "3.598.0", - "@aws-sdk/credential-provider-http": "3.598.0", - "@aws-sdk/credential-provider-ini": "3.598.0", - "@aws-sdk/credential-provider-process": "3.598.0", - "@aws-sdk/credential-provider-sso": "3.598.0", - "@aws-sdk/credential-provider-web-identity": "3.598.0", - "@aws-sdk/types": "3.598.0", - "@smithy/credential-provider-imds": "^3.1.1", - "@smithy/property-provider": "^3.1.1", - "@smithy/shared-ini-file-loader": "^3.1.1", - "@smithy/types": "^3.1.0", + "@aws-sdk/credential-provider-env": "3.609.0", + "@aws-sdk/credential-provider-http": "3.616.0", + "@aws-sdk/credential-provider-ini": "3.616.0", + "@aws-sdk/credential-provider-process": "3.614.0", + "@aws-sdk/credential-provider-sso": "3.616.0", + "@aws-sdk/credential-provider-web-identity": "3.609.0", + "@aws-sdk/types": "3.609.0", + "@smithy/credential-provider-imds": "^3.1.4", + "@smithy/property-provider": "^3.1.3", + "@smithy/shared-ini-file-loader": "^3.1.4", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -458,14 +458,14 @@ } }, "node_modules/@aws-sdk/credential-provider-process": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.598.0.tgz", - "integrity": "sha512-rM707XbLW8huMk722AgjVyxu2tMZee++fNA8TJVNgs1Ma02Wx6bBrfIvlyK0rCcIRb0WdQYP6fe3Xhiu4e8IBA==", + "version": "3.614.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.614.0.tgz", + "integrity": "sha512-Q0SI0sTRwi8iNODLs5+bbv8vgz8Qy2QdxbCHnPk/6Cx6LMf7i3dqmWquFbspqFRd8QiqxStrblwxrUYZi09tkA==", "dependencies": { - "@aws-sdk/types": "3.598.0", - "@smithy/property-provider": "^3.1.1", - "@smithy/shared-ini-file-loader": "^3.1.1", - "@smithy/types": "^3.1.0", + "@aws-sdk/types": "3.609.0", + "@smithy/property-provider": "^3.1.3", + "@smithy/shared-ini-file-loader": "^3.1.4", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -473,16 +473,16 @@ } }, "node_modules/@aws-sdk/credential-provider-sso": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.598.0.tgz", - "integrity": "sha512-5InwUmrAuqQdOOgxTccRayMMkSmekdLk6s+az9tmikq0QFAHUCtofI+/fllMXSR9iL6JbGYi1940+EUmS4pHJA==", + "version": "3.616.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.616.0.tgz", + "integrity": "sha512-3rsWs9GBi8Z8Gps5ROwqguxtw+J6OIg1vawZMLRNMqqZoBvbOToe9wEnpid8ylU+27+oG8uibJNlNuRyXApUjw==", "dependencies": { - "@aws-sdk/client-sso": "3.598.0", - "@aws-sdk/token-providers": "3.598.0", - "@aws-sdk/types": "3.598.0", - "@smithy/property-provider": "^3.1.1", - "@smithy/shared-ini-file-loader": "^3.1.1", - "@smithy/types": "^3.1.0", + "@aws-sdk/client-sso": "3.616.0", + "@aws-sdk/token-providers": "3.614.0", + "@aws-sdk/types": "3.609.0", + "@smithy/property-provider": "^3.1.3", + "@smithy/shared-ini-file-loader": "^3.1.4", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -490,42 +490,42 @@ } }, "node_modules/@aws-sdk/credential-provider-web-identity": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.598.0.tgz", - "integrity": "sha512-GV5GdiMbz5Tz9JO4NJtRoFXjW0GPEujA0j+5J/B723rTN+REHthJu48HdBKouHGhdzkDWkkh1bu52V02Wprw8w==", + "version": "3.609.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.609.0.tgz", + "integrity": "sha512-U+PG8NhlYYF45zbr1km3ROtBMYqyyj/oK8NRp++UHHeuavgrP+4wJ4wQnlEaKvJBjevfo3+dlIBcaeQ7NYejWg==", "dependencies": { - "@aws-sdk/types": "3.598.0", - "@smithy/property-provider": "^3.1.1", - "@smithy/types": "^3.1.0", + "@aws-sdk/types": "3.609.0", + "@smithy/property-provider": "^3.1.3", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sts": "^3.598.0" + "@aws-sdk/client-sts": "^3.609.0" } }, "node_modules/@aws-sdk/credential-providers": { - "version": "3.606.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-providers/-/credential-providers-3.606.0.tgz", - "integrity": "sha512-34hswGNDWBFvp4Hi4Gv9DIJ4Ks0Nbg8w3emFsPVHLqqI6X2Wd0hJTf+mi1kMhy/AQXt5LisKLw6wjNIKD2+KGg==", + "version": "3.616.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-providers/-/credential-providers-3.616.0.tgz", + "integrity": "sha512-uyscpYV21lr24FNFu8ZkIKzOCD/xoysRci9HmShtKBY/FixwZRlLv7aUpqH7xcLd7sgsQwa2UD/7s9PKj/DXSg==", "dependencies": { - "@aws-sdk/client-cognito-identity": "3.606.0", - "@aws-sdk/client-sso": "3.598.0", - "@aws-sdk/client-sts": "3.606.0", - "@aws-sdk/credential-provider-cognito-identity": "3.606.0", - "@aws-sdk/credential-provider-env": "3.598.0", - "@aws-sdk/credential-provider-http": "3.598.0", - "@aws-sdk/credential-provider-ini": "3.598.0", - "@aws-sdk/credential-provider-node": "3.600.0", - "@aws-sdk/credential-provider-process": "3.598.0", - "@aws-sdk/credential-provider-sso": "3.598.0", - "@aws-sdk/credential-provider-web-identity": "3.598.0", - "@aws-sdk/types": "3.598.0", - "@smithy/credential-provider-imds": "^3.1.1", - "@smithy/property-provider": "^3.1.1", - "@smithy/types": "^3.1.0", + "@aws-sdk/client-cognito-identity": "3.616.0", + "@aws-sdk/client-sso": "3.616.0", + "@aws-sdk/client-sts": "3.616.0", + "@aws-sdk/credential-provider-cognito-identity": "3.616.0", + "@aws-sdk/credential-provider-env": "3.609.0", + "@aws-sdk/credential-provider-http": "3.616.0", + "@aws-sdk/credential-provider-ini": "3.616.0", + "@aws-sdk/credential-provider-node": "3.616.0", + "@aws-sdk/credential-provider-process": "3.614.0", + "@aws-sdk/credential-provider-sso": "3.616.0", + "@aws-sdk/credential-provider-web-identity": "3.609.0", + "@aws-sdk/types": "3.609.0", + "@smithy/credential-provider-imds": "^3.1.4", + "@smithy/property-provider": "^3.1.3", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -533,13 +533,13 @@ } }, "node_modules/@aws-sdk/middleware-host-header": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.598.0.tgz", - "integrity": "sha512-WiaG059YBQwQraNejLIi0gMNkX7dfPZ8hDIhvMr5aVPRbaHH8AYF3iNSsXYCHvA2Cfa1O9haYXsuMF9flXnCmA==", + "version": "3.616.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.616.0.tgz", + "integrity": "sha512-mhNfHuGhCDZwYCABebaOvTgOM44UCZZRq2cBpgPZLVKP0ydAv5aFHXv01goexxXHqgHoEGx0uXWxlw0s2EpFDg==", "dependencies": { - "@aws-sdk/types": "3.598.0", - "@smithy/protocol-http": "^4.0.1", - "@smithy/types": "^3.1.0", + "@aws-sdk/types": "3.609.0", + "@smithy/protocol-http": "^4.0.4", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -547,12 +547,12 @@ } }, "node_modules/@aws-sdk/middleware-logger": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-logger/-/middleware-logger-3.598.0.tgz", - "integrity": "sha512-bxBjf/VYiu3zfu8SYM2S9dQQc3tz5uBAOcPz/Bt8DyyK3GgOpjhschH/2XuUErsoUO1gDJqZSdGOmuHGZQn00Q==", + "version": "3.609.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-logger/-/middleware-logger-3.609.0.tgz", + "integrity": "sha512-S62U2dy4jMDhDFDK5gZ4VxFdWzCtLzwbYyFZx2uvPYTECkepLUfzLic2BHg2Qvtu4QjX+oGE3P/7fwaGIsGNuQ==", "dependencies": { - "@aws-sdk/types": "3.598.0", - "@smithy/types": "^3.1.0", + "@aws-sdk/types": "3.609.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -560,13 +560,13 @@ } }, "node_modules/@aws-sdk/middleware-recursion-detection": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.598.0.tgz", - "integrity": "sha512-vjT9BeFY9FeN0f8hm2l6F53tI0N5bUq6RcDkQXKNabXBnQxKptJRad6oP2X5y3FoVfBLOuDkQgiC2940GIPxtQ==", + "version": "3.616.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.616.0.tgz", + "integrity": "sha512-LQKAcrZRrR9EGez4fdCIVjdn0Ot2HMN12ChnoMGEU6oIxnQ2aSC7iASFFCV39IYfeMh7iSCPj7Wopqw8rAouzg==", "dependencies": { - "@aws-sdk/types": "3.598.0", - "@smithy/protocol-http": "^4.0.1", - "@smithy/types": "^3.1.0", + "@aws-sdk/types": "3.609.0", + "@smithy/protocol-http": "^4.0.4", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -574,14 +574,14 @@ } }, "node_modules/@aws-sdk/middleware-user-agent": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.598.0.tgz", - "integrity": "sha512-4tjESlHG5B5MdjUaLK7tQs/miUtHbb6deauQx8ryqSBYOhfHVgb1ZnzvQR0bTrhpqUg0WlybSkDaZAICf9xctg==", + "version": "3.616.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.616.0.tgz", + "integrity": "sha512-iMcAb4E+Z3vuEcrDsG6T2OBNiqWAquwahP9qepHqfmnmJqHr1mSHtXDYTGBNid31+621sUQmneUQ+fagpGAe4w==", "dependencies": { - "@aws-sdk/types": "3.598.0", - "@aws-sdk/util-endpoints": "3.598.0", - "@smithy/protocol-http": "^4.0.1", - "@smithy/types": "^3.1.0", + "@aws-sdk/types": "3.609.0", + "@aws-sdk/util-endpoints": "3.614.0", + "@smithy/protocol-http": "^4.0.4", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -589,15 +589,15 @@ } }, "node_modules/@aws-sdk/region-config-resolver": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.598.0.tgz", - "integrity": "sha512-oYXhmTokSav4ytmWleCr3rs/1nyvZW/S0tdi6X7u+dLNL5Jee+uMxWGzgOrWK6wrQOzucLVjS4E/wA11Kv2GTw==", + "version": "3.614.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.614.0.tgz", + "integrity": "sha512-vDCeMXvic/LU0KFIUjpC3RiSTIkkvESsEfbVHiHH0YINfl8HnEqR5rj+L8+phsCeVg2+LmYwYxd5NRz4PHxt5g==", "dependencies": { - "@aws-sdk/types": "3.598.0", - "@smithy/node-config-provider": "^3.1.1", - "@smithy/types": "^3.1.0", + "@aws-sdk/types": "3.609.0", + "@smithy/node-config-provider": "^3.1.4", + "@smithy/types": "^3.3.0", "@smithy/util-config-provider": "^3.0.0", - "@smithy/util-middleware": "^3.0.1", + "@smithy/util-middleware": "^3.0.3", "tslib": "^2.6.2" }, "engines": { @@ -605,29 +605,29 @@ } }, "node_modules/@aws-sdk/token-providers": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/token-providers/-/token-providers-3.598.0.tgz", - "integrity": "sha512-TKY1EVdHVBnZqpyxyTHdpZpa1tUpb6nxVeRNn1zWG8QB5MvH4ALLd/jR+gtmWDNQbIG4cVuBOZFVL8hIYicKTA==", + "version": "3.614.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/token-providers/-/token-providers-3.614.0.tgz", + "integrity": "sha512-okItqyY6L9IHdxqs+Z116y5/nda7rHxLvROxtAJdLavWTYDydxrZstImNgGWTeVdmc0xX2gJCI77UYUTQWnhRw==", "dependencies": { - "@aws-sdk/types": "3.598.0", - "@smithy/property-provider": "^3.1.1", - "@smithy/shared-ini-file-loader": "^3.1.1", - "@smithy/types": "^3.1.0", + "@aws-sdk/types": "3.609.0", + "@smithy/property-provider": "^3.1.3", + "@smithy/shared-ini-file-loader": "^3.1.4", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sso-oidc": "^3.598.0" + "@aws-sdk/client-sso-oidc": "^3.614.0" } }, "node_modules/@aws-sdk/types": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/types/-/types-3.598.0.tgz", - "integrity": "sha512-742uRl6z7u0LFmZwDrFP6r1wlZcgVPw+/TilluDJmCAR8BgRw3IR+743kUXKBGd8QZDRW2n6v/PYsi/AWCDDMQ==", + "version": "3.609.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/types/-/types-3.609.0.tgz", + "integrity": "sha512-+Tqnh9w0h2LcrUsdXyT1F8mNhXz+tVYBtP19LpeEGntmvHwa2XzvLUCWpoIAIVsHp5+HdB2X9Sn0KAtmbFXc2Q==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -635,13 +635,13 @@ } }, "node_modules/@aws-sdk/util-endpoints": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/util-endpoints/-/util-endpoints-3.598.0.tgz", - "integrity": "sha512-Qo9UoiVVZxcOEdiOMZg3xb1mzkTxrhd4qSlg5QQrfWPJVx/QOg+Iy0NtGxPtHtVZNHZxohYwDwV/tfsnDSE2gQ==", + "version": "3.614.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/util-endpoints/-/util-endpoints-3.614.0.tgz", + "integrity": "sha512-wK2cdrXHH4oz4IomV/yrGkftU9A+ITB6nFL+rxxyO78is2ifHJpFdV4aqk4LSkXYPi6CXWNru/Dqc7yiKXgJPw==", "dependencies": { - "@aws-sdk/types": "3.598.0", - "@smithy/types": "^3.1.0", - "@smithy/util-endpoints": "^2.0.2", + "@aws-sdk/types": "3.609.0", + "@smithy/types": "^3.3.0", + "@smithy/util-endpoints": "^2.0.5", "tslib": "^2.6.2" }, "engines": { @@ -660,24 +660,24 @@ } }, "node_modules/@aws-sdk/util-user-agent-browser": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.598.0.tgz", - "integrity": "sha512-36Sxo6F+ykElaL1mWzWjlg+1epMpSe8obwhCN1yGE7Js9ywy5U6k6l+A3q3YM9YRbm740sNxncbwLklMvuhTKw==", + "version": "3.609.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.609.0.tgz", + "integrity": "sha512-fojPU+mNahzQ0YHYBsx0ZIhmMA96H+ZIZ665ObU9tl+SGdbLneVZVikGve+NmHTQwHzwkFsZYYnVKAkreJLAtA==", "dependencies": { - "@aws-sdk/types": "3.598.0", - "@smithy/types": "^3.1.0", + "@aws-sdk/types": "3.609.0", + "@smithy/types": "^3.3.0", "bowser": "^2.11.0", "tslib": "^2.6.2" } }, "node_modules/@aws-sdk/util-user-agent-node": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.598.0.tgz", - "integrity": "sha512-oyWGcOlfTdzkC6SVplyr0AGh54IMrDxbhg5RxJ5P+V4BKfcDoDcZV9xenUk9NsOi9MuUjxMumb9UJGkDhM1m0A==", + "version": "3.614.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.614.0.tgz", + "integrity": "sha512-15ElZT88peoHnq5TEoEtZwoXTXRxNrk60TZNdpl/TUBJ5oNJ9Dqb5Z4ryb8ofN6nm9aFf59GVAerFDz8iUoHBA==", "dependencies": { - "@aws-sdk/types": "3.598.0", - "@smithy/node-config-provider": "^3.1.1", - "@smithy/types": "^3.1.0", + "@aws-sdk/types": "3.609.0", + "@smithy/node-config-provider": "^3.1.4", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -705,28 +705,28 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.24.7.tgz", - "integrity": "sha512-qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw==", + "version": "7.24.9", + "resolved": "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.24.9.tgz", + "integrity": "sha512-e701mcfApCJqMMueQI0Fb68Amflj83+dvAvHawoBpAz+GDjCIyGHzNwnefjsWJ3xiYAqqiQFoWbspGYBdb2/ng==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/core/-/core-7.24.7.tgz", - "integrity": "sha512-nykK+LEK86ahTkX/3TgauT0ikKoNCfKHEaZYTUVupJdTLzGNvrblu4u6fa7DhZONAltdf8e662t/abY8idrd/g==", + "version": "7.24.9", + "resolved": "https://registry.npmmirror.com/@babel/core/-/core-7.24.9.tgz", + "integrity": "sha512-5e3FI4Q3M3Pbr21+5xJwCv6ZT6KmGkI0vw3Tozy5ODAQFTIWe37iT8Cr7Ice2Ntb+M3iSKCEWMB1MBgKrW3whg==", "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.24.7", - "@babel/generator": "^7.24.7", - "@babel/helper-compilation-targets": "^7.24.7", - "@babel/helper-module-transforms": "^7.24.7", - "@babel/helpers": "^7.24.7", - "@babel/parser": "^7.24.7", + "@babel/generator": "^7.24.9", + "@babel/helper-compilation-targets": "^7.24.8", + "@babel/helper-module-transforms": "^7.24.9", + "@babel/helpers": "^7.24.8", + "@babel/parser": "^7.24.8", "@babel/template": "^7.24.7", - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7", + "@babel/traverse": "^7.24.8", + "@babel/types": "^7.24.9", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -750,11 +750,11 @@ } }, "node_modules/@babel/generator": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/generator/-/generator-7.24.7.tgz", - "integrity": "sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA==", + "version": "7.24.10", + "resolved": "https://registry.npmmirror.com/@babel/generator/-/generator-7.24.10.tgz", + "integrity": "sha512-o9HBZL1G2129luEUlG1hB4N/nlYNWHnpwlND9eOMclRqqu1YDy2sSYVCFUZwl8I1Gxh+QSRrP2vD7EpUmFVXxg==", "dependencies": { - "@babel/types": "^7.24.7", + "@babel/types": "^7.24.9", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^2.5.1" @@ -764,13 +764,13 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.7.tgz", - "integrity": "sha512-ctSdRHBi20qWOfy27RUb4Fhp07KSJ3sXcuSvTrXrc4aG8NSYDo1ici3Vhg9bg69y5bj0Mr1lh0aeEgTvc12rMg==", + "version": "7.24.8", + "resolved": "https://registry.npmmirror.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.8.tgz", + "integrity": "sha512-oU+UoqCHdp+nWVDkpldqIQL/i/bvAv53tRqLG/s+cOXxe66zOYLU7ar/Xs3LdmBihrUMEUhwu6dMZwbNOYDwvw==", "dependencies": { - "@babel/compat-data": "^7.24.7", - "@babel/helper-validator-option": "^7.24.7", - "browserslist": "^4.22.2", + "@babel/compat-data": "^7.24.8", + "@babel/helper-validator-option": "^7.24.8", + "browserslist": "^4.23.1", "lru-cache": "^5.1.1", "semver": "^6.3.1" }, @@ -833,9 +833,9 @@ } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/helper-module-transforms/-/helper-module-transforms-7.24.7.tgz", - "integrity": "sha512-1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ==", + "version": "7.24.9", + "resolved": "https://registry.npmmirror.com/@babel/helper-module-transforms/-/helper-module-transforms-7.24.9.tgz", + "integrity": "sha512-oYbh+rtFKj/HwBQkFlUzvcybzklmVdVV3UU+mN7n2t/q3yGHbuVdNxyFvSBO1tfvjyArpHNcWMAzsSPdyI46hw==", "dependencies": { "@babel/helper-environment-visitor": "^7.24.7", "@babel/helper-module-imports": "^7.24.7", @@ -851,9 +851,9 @@ } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.7.tgz", - "integrity": "sha512-Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg==", + "version": "7.24.8", + "resolved": "https://registry.npmmirror.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz", + "integrity": "sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==", "engines": { "node": ">=6.9.0" } @@ -882,9 +882,9 @@ } }, "node_modules/@babel/helper-string-parser": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.24.7.tgz", - "integrity": "sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg==", + "version": "7.24.8", + "resolved": "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz", + "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==", "engines": { "node": ">=6.9.0" } @@ -898,20 +898,20 @@ } }, "node_modules/@babel/helper-validator-option": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/helper-validator-option/-/helper-validator-option-7.24.7.tgz", - "integrity": "sha512-yy1/KvjhV/ZCL+SM7hBrvnZJ3ZuT9OuZgIJAGpPEToANvc3iM6iDvBnRjtElWibHU6n8/LPR/EjX9EtIEYO3pw==", + "version": "7.24.8", + "resolved": "https://registry.npmmirror.com/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz", + "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/helpers/-/helpers-7.24.7.tgz", - "integrity": "sha512-NlmJJtvcw72yRJRcnCmGvSi+3jDEg8qFu3z0AFoymmzLx5ERVWyzd9kVXr7Th9/8yIJi2Zc6av4Tqz3wFs8QWg==", + "version": "7.24.8", + "resolved": "https://registry.npmmirror.com/@babel/helpers/-/helpers-7.24.8.tgz", + "integrity": "sha512-gV2265Nkcz7weJJfvDoAEVzC1e2OTDpkGbEsebse8koXUJUXPsCMi7sRo/+SPMuMZ9MtUPnGwITTnQnU5YjyaQ==", "dependencies": { "@babel/template": "^7.24.7", - "@babel/types": "^7.24.7" + "@babel/types": "^7.24.8" }, "engines": { "node": ">=6.9.0" @@ -932,9 +932,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.24.7.tgz", - "integrity": "sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==", + "version": "7.24.8", + "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.24.8.tgz", + "integrity": "sha512-WzfbgXOkGzZiXXCqk43kKwZjzwx4oulxZi3nq2TYL9mOjQv6kYwul9mz6ID36njuL7Xkp6nJEfok848Zj10j/w==", "bin": { "parser": "bin/babel-parser.js" }, @@ -943,11 +943,11 @@ } }, "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.7.tgz", - "integrity": "sha512-19eJO/8kdCQ9zISOf+SEUJM/bAUIsvY3YDnXZTupUCQ8LgrWnsG/gFB9dvXqdXnRXMAM8fvt7b0CBKQHNGy1mw==", + "version": "7.24.8", + "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.8.tgz", + "integrity": "sha512-36e87mfY8TnRxc7yc6M9g9gOB7rKgSahqkIKwLpz4Ppk2+zC2Cy1is0uwtuSG6AE4zlTOUa+7JGz9jCJGLqQFQ==", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.24.8" }, "engines": { "node": ">=6.9.0" @@ -998,18 +998,18 @@ } }, "node_modules/@babel/traverse": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.24.7.tgz", - "integrity": "sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==", + "version": "7.24.8", + "resolved": "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.24.8.tgz", + "integrity": "sha512-t0P1xxAPzEDcEPmjprAQq19NWum4K0EQPjMwZQZbHt+GiZqvjCHjj755Weq1YRPVzBI+3zSfvScfpnuIecVFJQ==", "dependencies": { "@babel/code-frame": "^7.24.7", - "@babel/generator": "^7.24.7", + "@babel/generator": "^7.24.8", "@babel/helper-environment-visitor": "^7.24.7", "@babel/helper-function-name": "^7.24.7", "@babel/helper-hoist-variables": "^7.24.7", "@babel/helper-split-export-declaration": "^7.24.7", - "@babel/parser": "^7.24.7", - "@babel/types": "^7.24.7", + "@babel/parser": "^7.24.8", + "@babel/types": "^7.24.8", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -1018,11 +1018,11 @@ } }, "node_modules/@babel/types": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.24.7.tgz", - "integrity": "sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==", + "version": "7.24.9", + "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.24.9.tgz", + "integrity": "sha512-xm8XrMKz0IlUdocVbYJe0Z9xEgidU7msskG8BbhnTPK/HZ2z/7FP7ykqPgrUH+C+r414mNfNWam1f2vqOjqjYQ==", "dependencies": { - "@babel/helper-string-parser": "^7.24.7", + "@babel/helper-string-parser": "^7.24.8", "@babel/helper-validator-identifier": "^7.24.7", "to-fast-properties": "^2.0.0" }, @@ -1114,9 +1114,9 @@ } }, "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.15", - "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", - "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==" + "version": "1.5.0", + "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", + "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==" }, "node_modules/@jridgewell/trace-mapping": { "version": "0.3.25", @@ -1147,25 +1147,25 @@ } }, "node_modules/@mongodb-js/devtools-connect": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@mongodb-js/devtools-connect/-/devtools-connect-3.0.1.tgz", - "integrity": "sha512-xbk/eGHPQTQz4VSpGb5oRqSSbzipcFDODrAc4YtYFrb0980buOAopO71NozCbQoVnoiO1pYVIqcnrZMHkdaJzg==", + "version": "3.0.5", + "resolved": "https://registry.npmmirror.com/@mongodb-js/devtools-connect/-/devtools-connect-3.0.5.tgz", + "integrity": "sha512-L9GKPo119VpTt7K4DA99T9D+lpZTQNfUdKTLSgHCtoJa81bHu/bOneSlDA23dfT2ET3GNVNICWzNwOn2sXEA1Q==", "dependencies": { - "@mongodb-js/oidc-http-server-pages": "1.1.1", + "@mongodb-js/oidc-http-server-pages": "1.1.2", "lodash.merge": "^4.6.2", "mongodb-connection-string-url": "^3.0.0", "socks": "^2.7.3", - "system-ca": "^1.0.2" + "system-ca": "^2.0.0" }, "optionalDependencies": { "kerberos": "^2.1.0", - "mongodb-client-encryption": "^6.0.0", + "mongodb-client-encryption": "^6.0.0 || ^6.1.0-alpha.0", "os-dns-native": "^1.2.0", "resolve-mongodb-srv": "^1.1.1" }, "peerDependencies": { "@mongodb-js/oidc-plugin": "^1.0.0", - "mongodb": "^5.8.1 || ^6.0.0", + "mongodb": "^6.8.0", "mongodb-log-writer": "^1.4.2" } }, @@ -1178,9 +1178,9 @@ } }, "node_modules/@mongodb-js/oidc-http-server-pages": { - "version": "1.1.1", - "resolved": "https://registry.npmmirror.com/@mongodb-js/oidc-http-server-pages/-/oidc-http-server-pages-1.1.1.tgz", - "integrity": "sha512-zYkANxb4HVDN4zGuU2ud4fL+XpqRxaydCwVZyU9Mh5EhqbrCL5mGH7t3BaGnfdQUw+HVtwP3dmasc+5Hjewk+g==" + "version": "1.1.2", + "resolved": "https://registry.npmmirror.com/@mongodb-js/oidc-http-server-pages/-/oidc-http-server-pages-1.1.2.tgz", + "integrity": "sha512-YcRlJ/HkKMahWvaPFTN/al5MGGX6CKQTsBHFTpNduxmeHd40jO8Cj5W7dfrqJAoit5E/G+GOwMaEfWdNrdlihg==" }, "node_modules/@mongodb-js/oidc-plugin": { "version": "1.0.2", @@ -1196,20 +1196,20 @@ } }, "node_modules/@mongodb-js/saslprep": { - "version": "1.1.7", - "resolved": "https://registry.npmmirror.com/@mongodb-js/saslprep/-/saslprep-1.1.7.tgz", - "integrity": "sha512-dCHW/oEX0KJ4NjDULBo3JiOaK5+6axtpBbS+ao2ZInoAL9/YRQLhXzSNAFz7hP4nzLkIqsfYAK/PDE3+XHny0Q==", + "version": "1.1.8", + "resolved": "https://registry.npmmirror.com/@mongodb-js/saslprep/-/saslprep-1.1.8.tgz", + "integrity": "sha512-qKwC/M/nNNaKUBMQ0nuzm47b7ZYWQHN3pcXq4IIcoSBc2hOIrflAxJduIvvqmhoz3gR2TacTAs8vlsCVPkiEdQ==", "dependencies": { "sparse-bitfield": "^3.0.3" } }, "node_modules/@mongosh/arg-parser": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/arg-parser/-/arg-parser-2.2.10.tgz", - "integrity": "sha512-QvXziAmACrFty7id5I0s3ZOetIc1wWhjtpytGMtchEiusTQOO+NJy74UMrxK+NGxKPDRL0MroRIo05/LEfPkJg==", + "version": "2.2.12", + "resolved": "https://registry.npmmirror.com/@mongosh/arg-parser/-/arg-parser-2.2.12.tgz", + "integrity": "sha512-JayM6b5QnSMopt484MMD3u9uPtjNLlmTNlkbBSYxtTYpvom2WHGdrHmb1dQ50cPZ6sidH5aQ25MlzyYxcaopxQ==", "dependencies": { - "@mongosh/errors": "2.2.10", - "@mongosh/i18n": "2.2.10", + "@mongosh/errors": "2.2.12", + "@mongosh/i18n": "2.2.12", "mongodb-connection-string-url": "^3.0.1" }, "engines": { @@ -1217,9 +1217,9 @@ } }, "node_modules/@mongosh/async-rewriter2": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/async-rewriter2/-/async-rewriter2-2.2.10.tgz", - "integrity": "sha512-ssY+WxY/oOHPZAIjrYzUYhCr1K2towzshxQpYw3nk5JyjTdvN4gc0xnrWMNLJonEOD/ADTdlneFshQhuh/V1vQ==", + "version": "2.2.12", + "resolved": "https://registry.npmmirror.com/@mongosh/async-rewriter2/-/async-rewriter2-2.2.12.tgz", + "integrity": "sha512-BNZYYpfLiiX+Z+9Svf0OtxuW6lHCvdn4rjSZkdOgUQMYI93I897aW3HmDRhde5yMF/QMaT7STBjmBvC2TXAkCQ==", "dependencies": { "@babel/core": "^7.22.8", "@babel/plugin-transform-destructuring": "^7.22.5", @@ -1235,12 +1235,12 @@ } }, "node_modules/@mongosh/autocomplete": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/autocomplete/-/autocomplete-2.2.10.tgz", - "integrity": "sha512-iLrZ1vfA67jKwEWtSKGYAZ7QM5beYFo4AsmiV+KCXwtcZref3dX1OgcjBvRW8dRvSonz8/7RnN9r8QtsTyw2xw==", + "version": "2.2.12", + "resolved": "https://registry.npmmirror.com/@mongosh/autocomplete/-/autocomplete-2.2.12.tgz", + "integrity": "sha512-LFB4eFN2jH9q6ZAN3kt3ZdKjLBNJ8dqgagKV3IDM6gc9bQRxaI53MUWDxwUqA0xLFLLe7nchjmlQqOgo6nvH1g==", "dependencies": { "@mongodb-js/mongodb-constants": "^0.10.1", - "@mongosh/shell-api": "2.2.10", + "@mongosh/shell-api": "2.2.12", "semver": "^7.5.4" }, "engines": { @@ -1248,25 +1248,25 @@ } }, "node_modules/@mongosh/cli-repl": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/cli-repl/-/cli-repl-2.2.10.tgz", - "integrity": "sha512-fjn+GZlsChPqn2A+hWiSgxNcGxO96hPBcv2TDfnXwtMSQySPBavJoayBDbEnazRHxgbAxqpmTV4UfWPOX+jYvA==", + "version": "2.2.12", + "resolved": "https://registry.npmmirror.com/@mongosh/cli-repl/-/cli-repl-2.2.12.tgz", + "integrity": "sha512-QukyHafcVX7dOut4HufM8c3PNuXJxkJcC7OylgzajubZzlUwyLNQSM7GAZBahx4tXjyzpe7hvHdhNdFMlvIUCA==", "dependencies": { - "@mongosh/arg-parser": "2.2.10", - "@mongosh/autocomplete": "2.2.10", - "@mongosh/editor": "2.2.10", - "@mongosh/errors": "2.2.10", - "@mongosh/history": "2.2.10", - "@mongosh/i18n": "2.2.10", - "@mongosh/import-node-fetch": "2.2.10", - "@mongosh/js-multiline-to-singleline": "2.2.10", - "@mongosh/logging": "2.2.10", - "@mongosh/service-provider-core": "2.2.10", - "@mongosh/service-provider-server": "2.2.10", - "@mongosh/shell-api": "2.2.10", - "@mongosh/shell-evaluator": "2.2.10", - "@mongosh/snippet-manager": "2.2.10", - "@mongosh/types": "2.2.10", + "@mongosh/arg-parser": "2.2.12", + "@mongosh/autocomplete": "2.2.12", + "@mongosh/editor": "2.2.12", + "@mongosh/errors": "2.2.12", + "@mongosh/history": "2.2.12", + "@mongosh/i18n": "2.2.12", + "@mongosh/import-node-fetch": "2.2.12", + "@mongosh/js-multiline-to-singleline": "2.2.12", + "@mongosh/logging": "2.2.12", + "@mongosh/service-provider-core": "2.2.12", + "@mongosh/service-provider-server": "2.2.12", + "@mongosh/shell-api": "2.2.12", + "@mongosh/shell-evaluator": "2.2.12", + "@mongosh/snippet-manager": "2.2.12", + "@mongosh/types": "2.2.12", "@segment/analytics-node": "^1.3.0", "ansi-escape-sequences": "^5.1.2", "askcharacter": "^2.0.4", @@ -1295,19 +1295,19 @@ "glibc-version": "^1.0.0", "macos-export-certificate-and-key": "^1.1.2", "mongodb-crypt-library-version": "^1.0.5", - "win-export-certificate-and-key": "^1.1.2" + "win-export-certificate-and-key": "^2.0.0" } }, "node_modules/@mongosh/editor": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/editor/-/editor-2.2.10.tgz", - "integrity": "sha512-iYNvhBbTNXwR0Dt9bj+hwJFAWVttS2F+zl6vzvF/wcA1THddFi4A8LboWMvDtpb7YF5woHCXIW3Oc3gHOUSW/g==", + "version": "2.2.12", + "resolved": "https://registry.npmmirror.com/@mongosh/editor/-/editor-2.2.12.tgz", + "integrity": "sha512-+9NSkCNmx0xseTcSVPKH5XptlYbDV0MFq6cxspU7YLfQGHI85fvjr73Oo51Ih9TDynI9CMXZzVV5Cpy1omo7SQ==", "dependencies": { - "@mongosh/js-multiline-to-singleline": "2.2.10", - "@mongosh/service-provider-core": "2.2.10", - "@mongosh/shell-api": "2.2.10", - "@mongosh/shell-evaluator": "2.2.10", - "@mongosh/types": "2.2.10", + "@mongosh/js-multiline-to-singleline": "2.2.12", + "@mongosh/service-provider-core": "2.2.12", + "@mongosh/shell-api": "2.2.12", + "@mongosh/shell-evaluator": "2.2.12", + "@mongosh/types": "2.2.12", "js-beautify": "^1.15.1" }, "engines": { @@ -1315,40 +1315,40 @@ } }, "node_modules/@mongosh/errors": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/errors/-/errors-2.2.10.tgz", - "integrity": "sha512-jR8dv9MYYRwr+Yri/KI6HAuob0zdVBQOrMvjc+ygBbTIkL3wh1iOrjZKZuYUsjei1FDxLA8NywftAoHDchq2Tg==", + "version": "2.2.12", + "resolved": "https://registry.npmmirror.com/@mongosh/errors/-/errors-2.2.12.tgz", + "integrity": "sha512-7Ns3xOFXhQil99wmU5HAC+GzJljzWV1X5a5khdCU/xq2oRKNJc92JGJMRfG6MK8YXB8rhkjYBoqssPdBaeE5gA==", "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/history": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/history/-/history-2.2.10.tgz", - "integrity": "sha512-EmMKvsytTXq/1tAwxZUvl+6+gCrarWdEDB9mO9vTCFneOgB0ao2jpo7KA9Jc63r8RYhDH78dtjFsSuFeox3AiA==", + "version": "2.2.12", + "resolved": "https://registry.npmmirror.com/@mongosh/history/-/history-2.2.12.tgz", + "integrity": "sha512-JcNSwB/HnVK2RJRJY3MwtTNuWA9aeXWY5mc+wNYYIQ77dXtrphXpIxzSaLL0EXMrQZQBeCibxoYzBFZx4n2jFg==", "dependencies": { "mongodb-connection-string-url": "^3.0.1", - "mongodb-redact": "^0.2.3" + "mongodb-redact": "^1.1.0" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/i18n": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/i18n/-/i18n-2.2.10.tgz", - "integrity": "sha512-TxyFOhdXqCN0AXGcWziPzZ+YBf8KthnZIbOVSyA+C1a0jynfMf+XBnLnNpwvKfGZUeQ1VyZkrKLPopG7e2nuIA==", + "version": "2.2.12", + "resolved": "https://registry.npmmirror.com/@mongosh/i18n/-/i18n-2.2.12.tgz", + "integrity": "sha512-2A59O56WG/fwtNs0VjS/tvsen0MKXSHCSn9w51PGbdLYFCD8RQUetPSSfLcEuqlsXn88NDFsiQbkSsRo4sEMXw==", "dependencies": { - "@mongosh/errors": "2.2.10" + "@mongosh/errors": "2.2.12" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/import-node-fetch": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/import-node-fetch/-/import-node-fetch-2.2.10.tgz", - "integrity": "sha512-c0xG7P7HjKn3ND/aK7gyADRFhXc5CogADfX6exkFlM3z5A8HVCZ0o8/x7m0oi3IIHyCvebvEatbZJ+HjdiR8UQ==", + "version": "2.2.12", + "resolved": "https://registry.npmmirror.com/@mongosh/import-node-fetch/-/import-node-fetch-2.2.12.tgz", + "integrity": "sha512-JlmLFM/cUwkPWG8UaL9LUzr4Uh4K9CxBhW3VdEH8VkulRxzwLPhiWhcEzz1luW9FHpSKKG3YwYOt/qSQUYgrAQ==", "dependencies": { "node-fetch": "^3.3.2" }, @@ -1357,9 +1357,9 @@ } }, "node_modules/@mongosh/js-multiline-to-singleline": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.2.10.tgz", - "integrity": "sha512-MynI6HGlZ0kPqRfx83+9/An39laBzjlc2f6DzDIiO9FVGYcEYMScIG6e0U06M8fiarqeftprSW9dBdc1KQkeEw==", + "version": "2.2.12", + "resolved": "https://registry.npmmirror.com/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.2.12.tgz", + "integrity": "sha512-FHgoapYi/aDfFomh7WujQaTJCjhjy2UxLsGbnx5SwORQGxeHfkv2mtKxI3IZyIPeckU9DgpN/f7nukulbkPP7A==", "dependencies": { "@babel/core": "^7.16.12", "@babel/types": "^7.21.2" @@ -1369,28 +1369,28 @@ } }, "node_modules/@mongosh/logging": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/logging/-/logging-2.2.10.tgz", - "integrity": "sha512-0z3L23rtaASh1E2hV/wSWxDTycxktbD2XVUnSW1YbyRfePd7YOwVeUhNeFYUf1Qq2q2KeTdxgMaP5/BodY+h5A==", + "version": "2.2.12", + "resolved": "https://registry.npmmirror.com/@mongosh/logging/-/logging-2.2.12.tgz", + "integrity": "sha512-fSBO0dLfzRQ0ZtflKqWwDLLWn6t7ZYjUBCsDIpTVhvJlexvZQ/71izD3yEN4k2MRZyTFiTM5lYGURSqTldppNA==", "dependencies": { - "@mongodb-js/devtools-connect": "^3.0.1", - "@mongosh/errors": "2.2.10", - "@mongosh/history": "2.2.10", - "@mongosh/types": "2.2.10", + "@mongodb-js/devtools-connect": "^3.0.2", + "@mongosh/errors": "2.2.12", + "@mongosh/history": "2.2.12", + "@mongosh/types": "2.2.12", "mongodb-log-writer": "^1.4.2", - "mongodb-redact": "^0.2.3" + "mongodb-redact": "^1.1.0" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/service-provider-core": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-core/-/service-provider-core-2.2.10.tgz", - "integrity": "sha512-XB+G24WjTIYXnHoToJhDJMwMV7pCcgCwgme0MiE6lzcYs5HwlHhk9tzBwv0+i+3NcCb5SMqU38iUMuGG6jKJdQ==", + "version": "2.2.12", + "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-core/-/service-provider-core-2.2.12.tgz", + "integrity": "sha512-pYd2KKlNFn/6fn9w5vSlkFUUkKoK8F+UAhy8TqjfYBA9cSQKLD+Et5qClC09APIAcVyk0Xd66n7KHG0Qb0vaxA==", "dependencies": { "@aws-sdk/credential-providers": "^3.525.0", - "@mongosh/errors": "2.2.10", + "@mongosh/errors": "2.2.12", "bson": "^6.7.0", "mongodb": "^6.7.0", "mongodb-build-info": "^1.7.2" @@ -1403,15 +1403,15 @@ } }, "node_modules/@mongosh/service-provider-server": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-server/-/service-provider-server-2.2.10.tgz", - "integrity": "sha512-7WxxKZgXNdW7f6vUCmqqWPexPOFqy/n155rFeyWhRVBI5mdbb/Sb5vsdqo1+6AyDpCXsLdl8CldsqmOfGKG36A==", + "version": "2.2.12", + "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-server/-/service-provider-server-2.2.12.tgz", + "integrity": "sha512-+BSkQSyoHtdmmm5FBhVNDme5H9pbMm014DnbBGfIEmi3ism5DSgCMeAHIQUK0+zDC6gsRn6d9mmCy/5qnHT8jA==", "dependencies": { - "@mongodb-js/devtools-connect": "^3.0.1", + "@mongodb-js/devtools-connect": "^3.0.2", "@mongodb-js/oidc-plugin": "^1.0.2", - "@mongosh/errors": "2.2.10", - "@mongosh/service-provider-core": "2.2.10", - "@mongosh/types": "2.2.10", + "@mongosh/errors": "2.2.12", + "@mongosh/service-provider-core": "2.2.12", + "@mongosh/types": "2.2.12", "aws4": "^1.12.0", "mongodb": "^6.7.0", "mongodb-connection-string-url": "^3.0.1", @@ -1426,43 +1426,43 @@ } }, "node_modules/@mongosh/shell-api": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/shell-api/-/shell-api-2.2.10.tgz", - "integrity": "sha512-Cgcb0U5wqzmTmwAmMkSqhZ3fR4PjqNJ2px61i/9JzWAgIEDSbv9Xni3mcfDRQd/qjLHCEUlAPFgEBu7Cpk0qBQ==", + "version": "2.2.12", + "resolved": "https://registry.npmmirror.com/@mongosh/shell-api/-/shell-api-2.2.12.tgz", + "integrity": "sha512-sjy6di7W5h0MbQ4lPXYOModwSnebiwWYDJVv6wtj9TvCz8Bua19fIr9jnW4GTjA/MLaWO0DjYh6MFg34SqvoLQ==", "dependencies": { - "@mongosh/arg-parser": "2.2.10", - "@mongosh/errors": "2.2.10", - "@mongosh/history": "2.2.10", - "@mongosh/i18n": "2.2.10", - "@mongosh/service-provider-core": "2.2.10", - "mongodb-redact": "^0.2.3" + "@mongosh/arg-parser": "2.2.12", + "@mongosh/errors": "2.2.12", + "@mongosh/history": "2.2.12", + "@mongosh/i18n": "2.2.12", + "@mongosh/service-provider-core": "2.2.12", + "mongodb-redact": "^1.1.0" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/shell-evaluator": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/shell-evaluator/-/shell-evaluator-2.2.10.tgz", - "integrity": "sha512-9v/p5WDu+Ur7+jhXajkBOvpINcRORA1UpdMOV4sBGQ623VbmoDd7xFeFPoi0uWzV50qW5yNRlh3+dvsG/jdKmQ==", + "version": "2.2.12", + "resolved": "https://registry.npmmirror.com/@mongosh/shell-evaluator/-/shell-evaluator-2.2.12.tgz", + "integrity": "sha512-oSxx996l1vumeBDNZ2XYOWSmbPKA5b1XLL9YEFpsS27WLnxwvBiAb2qu6pJ8fDmJh9nDDAkWP5jlf2zYBitByA==", "dependencies": { - "@mongosh/async-rewriter2": "2.2.10", - "@mongosh/history": "2.2.10", - "@mongosh/shell-api": "2.2.10" + "@mongosh/async-rewriter2": "2.2.12", + "@mongosh/history": "2.2.12", + "@mongosh/shell-api": "2.2.12" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/snippet-manager": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/snippet-manager/-/snippet-manager-2.2.10.tgz", - "integrity": "sha512-y49cANhiCZYaWjaJFLh1ByPJhNAoyZvpI9R1sbA0MC7fu2kWxd91a6mWVWI4ZZPgHGXmpGkAK0/4MpWcUGymsQ==", + "version": "2.2.12", + "resolved": "https://registry.npmmirror.com/@mongosh/snippet-manager/-/snippet-manager-2.2.12.tgz", + "integrity": "sha512-ZcM7lTCDBKP/JS97xcDd67sXFzMXeNJ/BlctfdL+huS8Ff90rBVVOTsKPGCH/ScYBk+IgDtSep7GU4RSYgdtJA==", "dependencies": { - "@mongosh/errors": "2.2.10", - "@mongosh/import-node-fetch": "2.2.10", - "@mongosh/shell-api": "2.2.10", - "@mongosh/types": "2.2.10", + "@mongosh/errors": "2.2.12", + "@mongosh/import-node-fetch": "2.2.12", + "@mongosh/shell-api": "2.2.12", + "@mongosh/types": "2.2.12", "bson": "^6.7.0", "cross-spawn": "^7.0.3", "escape-string-regexp": "^4.0.0", @@ -1474,11 +1474,11 @@ } }, "node_modules/@mongosh/types": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/types/-/types-2.2.10.tgz", - "integrity": "sha512-BfCcmbC3givNCgYZxf6aUJy+/nHg2By6Hs9gZ/WMGgiedMuL5fRE18dGlwy3Aog7Jc6tVkBCMtOpYgjVnUPoxQ==", + "version": "2.2.12", + "resolved": "https://registry.npmmirror.com/@mongosh/types/-/types-2.2.12.tgz", + "integrity": "sha512-19LPOUVDy1FE01U6CvOjplv5U8prY0RZa3Cf0QSTpHQlnzWcrzMIHqPWS3luXFwGSKhQU/GxFfEJesqdE8C7HQ==", "dependencies": { - "@mongodb-js/devtools-connect": "^3.0.1" + "@mongodb-js/devtools-connect": "^3.0.2" }, "engines": { "node": ">=14.15.1" @@ -1602,11 +1602,11 @@ } }, "node_modules/@smithy/config-resolver": { - "version": "3.0.4", - "resolved": "https://registry.npmmirror.com/@smithy/config-resolver/-/config-resolver-3.0.4.tgz", - "integrity": "sha512-VwiOk7TwXoE7NlNguV/aPq1hFH72tqkHCw8eWXbr2xHspRyyv9DLpLXhq+Ieje+NwoqXrY0xyQjPXdOE6cGcHA==", + "version": "3.0.5", + "resolved": "https://registry.npmmirror.com/@smithy/config-resolver/-/config-resolver-3.0.5.tgz", + "integrity": "sha512-SkW5LxfkSI1bUC74OtfBbdz+grQXYiPYolyu8VfpLIjEoN/sHVBlLeGXMQ1vX4ejkgfv6sxVbQJ32yF2cl1veA==", "dependencies": { - "@smithy/node-config-provider": "^3.1.3", + "@smithy/node-config-provider": "^3.1.4", "@smithy/types": "^3.3.0", "@smithy/util-config-provider": "^3.0.0", "@smithy/util-middleware": "^3.0.3", @@ -1617,15 +1617,15 @@ } }, "node_modules/@smithy/core": { - "version": "2.2.4", - "resolved": "https://registry.npmmirror.com/@smithy/core/-/core-2.2.4.tgz", - "integrity": "sha512-qdY3LpMOUyLM/gfjjMQZui+UTNS7kBRDWlvyIhVOql5dn2J3isk9qUTBtQ1CbDH8MTugHis1zu3h4rH+Qmmh4g==", + "version": "2.2.8", + "resolved": "https://registry.npmmirror.com/@smithy/core/-/core-2.2.8.tgz", + "integrity": "sha512-1Y0XX0Ucyg0LWTfTVLWpmvSRtFRniykUl3dQ0os1sTd03mKDudR6mVyX+2ak1phwPXx2aEWMAAdW52JNi0mc3A==", "dependencies": { - "@smithy/middleware-endpoint": "^3.0.4", - "@smithy/middleware-retry": "^3.0.7", + "@smithy/middleware-endpoint": "^3.0.5", + "@smithy/middleware-retry": "^3.0.11", "@smithy/middleware-serde": "^3.0.3", - "@smithy/protocol-http": "^4.0.3", - "@smithy/smithy-client": "^3.1.5", + "@smithy/protocol-http": "^4.0.4", + "@smithy/smithy-client": "^3.1.9", "@smithy/types": "^3.3.0", "@smithy/util-middleware": "^3.0.3", "tslib": "^2.6.2" @@ -1635,11 +1635,11 @@ } }, "node_modules/@smithy/credential-provider-imds": { - "version": "3.1.3", - "resolved": "https://registry.npmmirror.com/@smithy/credential-provider-imds/-/credential-provider-imds-3.1.3.tgz", - "integrity": "sha512-U1Yrv6hx/mRK6k8AncuI6jLUx9rn0VVSd9NPEX6pyYFBfkSkChOc/n4zUb8alHUVg83TbI4OdZVo1X0Zfj3ijA==", + "version": "3.1.4", + "resolved": "https://registry.npmmirror.com/@smithy/credential-provider-imds/-/credential-provider-imds-3.1.4.tgz", + "integrity": "sha512-NKyH01m97Xa5xf3pB2QOF3lnuE8RIK0hTVNU5zvZAwZU8uspYO4DHQVlK+Y5gwSrujTfHvbfd1D9UFJAc0iYKQ==", "dependencies": { - "@smithy/node-config-provider": "^3.1.3", + "@smithy/node-config-provider": "^3.1.4", "@smithy/property-provider": "^3.1.3", "@smithy/types": "^3.3.0", "@smithy/url-parser": "^3.0.3", @@ -1650,11 +1650,11 @@ } }, "node_modules/@smithy/fetch-http-handler": { - "version": "3.2.0", - "resolved": "https://registry.npmmirror.com/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.0.tgz", - "integrity": "sha512-vFvDxMrc6sO5Atec8PaISckMcAwsCrRhYxwUylg97bRT2KZoumOF7qk5+6EVUtuM1IG9AJV5aqXnHln9ZdXHpg==", + "version": "3.2.2", + "resolved": "https://registry.npmmirror.com/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.2.tgz", + "integrity": "sha512-3LaWlBZObyGrOOd7e5MlacnAKEwFBmAeiW/TOj2eR9475Vnq30uS2510+tnKbxrGjROfNdOhQqGo5j3sqLT6bA==", "dependencies": { - "@smithy/protocol-http": "^4.0.3", + "@smithy/protocol-http": "^4.0.4", "@smithy/querystring-builder": "^3.0.3", "@smithy/types": "^3.3.0", "@smithy/util-base64": "^3.0.0", @@ -1696,11 +1696,11 @@ } }, "node_modules/@smithy/middleware-content-length": { - "version": "3.0.3", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-content-length/-/middleware-content-length-3.0.3.tgz", - "integrity": "sha512-Dbz2bzexReYIQDWMr+gZhpwBetNXzbhnEMhYKA6urqmojO14CsXjnsoPYO8UL/xxcawn8ZsuVU61ElkLSltIUQ==", + "version": "3.0.4", + "resolved": "https://registry.npmmirror.com/@smithy/middleware-content-length/-/middleware-content-length-3.0.4.tgz", + "integrity": "sha512-wySGje/KfhsnF8YSh9hP16pZcl3C+X6zRsvSfItQGvCyte92LliilU3SD0nR7kTlxnAJwxY8vE/k4Eoezj847Q==", "dependencies": { - "@smithy/protocol-http": "^4.0.3", + "@smithy/protocol-http": "^4.0.4", "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, @@ -1709,13 +1709,13 @@ } }, "node_modules/@smithy/middleware-endpoint": { - "version": "3.0.4", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-endpoint/-/middleware-endpoint-3.0.4.tgz", - "integrity": "sha512-whUJMEPwl3ANIbXjBXZVdJNgfV2ZU8ayln7xUM47rXL2txuenI7jQ/VFFwCzy5lCmXScjp6zYtptW5Evud8e9g==", + "version": "3.0.5", + "resolved": "https://registry.npmmirror.com/@smithy/middleware-endpoint/-/middleware-endpoint-3.0.5.tgz", + "integrity": "sha512-V4acqqrh5tDxUEGVTOgf2lYMZqPQsoGntCrjrJZEeBzEzDry2d2vcI1QCXhGltXPPY+BMc6eksZMguA9fIY8vA==", "dependencies": { "@smithy/middleware-serde": "^3.0.3", - "@smithy/node-config-provider": "^3.1.3", - "@smithy/shared-ini-file-loader": "^3.1.3", + "@smithy/node-config-provider": "^3.1.4", + "@smithy/shared-ini-file-loader": "^3.1.4", "@smithy/types": "^3.3.0", "@smithy/url-parser": "^3.0.3", "@smithy/util-middleware": "^3.0.3", @@ -1726,14 +1726,14 @@ } }, "node_modules/@smithy/middleware-retry": { - "version": "3.0.7", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-retry/-/middleware-retry-3.0.7.tgz", - "integrity": "sha512-f5q7Y09G+2h5ivkSx5CHvlAT4qRR3jBFEsfXyQ9nFNiWQlr8c48blnu5cmbTQ+p1xmIO14UXzKoF8d7Tm0Gsjw==", + "version": "3.0.11", + "resolved": "https://registry.npmmirror.com/@smithy/middleware-retry/-/middleware-retry-3.0.11.tgz", + "integrity": "sha512-/TIRWmhwMpv99JCGuMhJPnH7ggk/Lah7s/uNDyr7faF02BxNsyD/fz9Tw7pgCf9tYOKgjimm2Qml1Aq1pbkt6g==", "dependencies": { - "@smithy/node-config-provider": "^3.1.3", - "@smithy/protocol-http": "^4.0.3", + "@smithy/node-config-provider": "^3.1.4", + "@smithy/protocol-http": "^4.0.4", "@smithy/service-error-classification": "^3.0.3", - "@smithy/smithy-client": "^3.1.5", + "@smithy/smithy-client": "^3.1.9", "@smithy/types": "^3.3.0", "@smithy/util-middleware": "^3.0.3", "@smithy/util-retry": "^3.0.3", @@ -1769,12 +1769,12 @@ } }, "node_modules/@smithy/node-config-provider": { - "version": "3.1.3", - "resolved": "https://registry.npmmirror.com/@smithy/node-config-provider/-/node-config-provider-3.1.3.tgz", - "integrity": "sha512-rxdpAZczzholz6CYZxtqDu/aKTxATD5DAUDVj7HoEulq+pDSQVWzbg0btZDlxeFfa6bb2b5tUvgdX5+k8jUqcg==", + "version": "3.1.4", + "resolved": "https://registry.npmmirror.com/@smithy/node-config-provider/-/node-config-provider-3.1.4.tgz", + "integrity": "sha512-YvnElQy8HR4vDcAjoy7Xkx9YT8xZP4cBXcbJSgm/kxmiQu08DwUwj8rkGnyoJTpfl/3xYHH+d8zE+eHqoDCSdQ==", "dependencies": { "@smithy/property-provider": "^3.1.3", - "@smithy/shared-ini-file-loader": "^3.1.3", + "@smithy/shared-ini-file-loader": "^3.1.4", "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, @@ -1783,12 +1783,12 @@ } }, "node_modules/@smithy/node-http-handler": { - "version": "3.1.1", - "resolved": "https://registry.npmmirror.com/@smithy/node-http-handler/-/node-http-handler-3.1.1.tgz", - "integrity": "sha512-L71NLyPeP450r2J/mfu1jMc//Z1YnqJt2eSNw7uhiItaONnBLDA68J5jgxq8+MBDsYnFwNAIc7dBG1ImiWBiwg==", + "version": "3.1.3", + "resolved": "https://registry.npmmirror.com/@smithy/node-http-handler/-/node-http-handler-3.1.3.tgz", + "integrity": "sha512-UiKZm8KHb/JeOPzHZtRUfyaRDO1KPKPpsd7iplhiwVGOeVdkiVJ5bVe7+NhWREMOKomrDIDdSZyglvMothLg0Q==", "dependencies": { "@smithy/abort-controller": "^3.1.1", - "@smithy/protocol-http": "^4.0.3", + "@smithy/protocol-http": "^4.0.4", "@smithy/querystring-builder": "^3.0.3", "@smithy/types": "^3.3.0", "tslib": "^2.6.2" @@ -1810,9 +1810,9 @@ } }, "node_modules/@smithy/protocol-http": { - "version": "4.0.3", - "resolved": "https://registry.npmmirror.com/@smithy/protocol-http/-/protocol-http-4.0.3.tgz", - "integrity": "sha512-x5jmrCWwQlx+Zv4jAtc33ijJ+vqqYN+c/ZkrnpvEe/uDas7AT7A/4Rc2CdfxgWv4WFGmEqODIrrUToPN6DDkGw==", + "version": "4.0.4", + "resolved": "https://registry.npmmirror.com/@smithy/protocol-http/-/protocol-http-4.0.4.tgz", + "integrity": "sha512-fAA2O4EFyNRyYdFLVIv5xMMeRb+3fRKc/Rt2flh5k831vLvUmNFXcydeg7V3UeEhGURJI4c1asmGJBjvmF6j8Q==", "dependencies": { "@smithy/types": "^3.3.0", "tslib": "^2.6.2" @@ -1858,9 +1858,9 @@ } }, "node_modules/@smithy/shared-ini-file-loader": { - "version": "3.1.3", - "resolved": "https://registry.npmmirror.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.3.tgz", - "integrity": "sha512-Z8Y3+08vgoDgl4HENqNnnzSISAaGrF2RoKupoC47u2wiMp+Z8P/8mDh1CL8+8ujfi2U5naNvopSBmP/BUj8b5w==", + "version": "3.1.4", + "resolved": "https://registry.npmmirror.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.4.tgz", + "integrity": "sha512-qMxS4hBGB8FY2GQqshcRUy1K6k8aBWP5vwm8qKkCT3A9K2dawUwOIJfqh9Yste/Bl0J2lzosVyrXDj68kLcHXQ==", "dependencies": { "@smithy/types": "^3.3.0", "tslib": "^2.6.2" @@ -1870,9 +1870,9 @@ } }, "node_modules/@smithy/signature-v4": { - "version": "3.1.2", - "resolved": "https://registry.npmmirror.com/@smithy/signature-v4/-/signature-v4-3.1.2.tgz", - "integrity": "sha512-3BcPylEsYtD0esM4Hoyml/+s7WP2LFhcM3J2AGdcL2vx9O60TtfpDOL72gjb4lU8NeRPeKAwR77YNyyGvMbuEA==", + "version": "4.0.0", + "resolved": "https://registry.npmmirror.com/@smithy/signature-v4/-/signature-v4-4.0.0.tgz", + "integrity": "sha512-ervYjQ+ZvmNG51Ui77IOTPri7nOyo8Kembzt9uwwlmtXJPmFXvslOahbA1blvAVs7G0KlYMiOBog1rAt7RVXxg==", "dependencies": { "@smithy/is-array-buffer": "^3.0.0", "@smithy/types": "^3.3.0", @@ -1887,15 +1887,15 @@ } }, "node_modules/@smithy/smithy-client": { - "version": "3.1.5", - "resolved": "https://registry.npmmirror.com/@smithy/smithy-client/-/smithy-client-3.1.5.tgz", - "integrity": "sha512-x9bL9Mx2CT2P1OiUlHM+ZNpbVU6TgT32f9CmTRzqIHA7M4vYrROCWEoC3o4xHNJASoGd4Opos3cXYPgh+/m4Ww==", + "version": "3.1.9", + "resolved": "https://registry.npmmirror.com/@smithy/smithy-client/-/smithy-client-3.1.9.tgz", + "integrity": "sha512-My2RaInZ4gSwJUPMaiLR/Nk82+c4LlvqpXA+n7lonGYgCZq23Tg+/xFhgmiejJ6XPElYJysTPyV90vKyp17+1g==", "dependencies": { - "@smithy/middleware-endpoint": "^3.0.4", + "@smithy/middleware-endpoint": "^3.0.5", "@smithy/middleware-stack": "^3.0.3", - "@smithy/protocol-http": "^4.0.3", + "@smithy/protocol-http": "^4.0.4", "@smithy/types": "^3.3.0", - "@smithy/util-stream": "^3.0.5", + "@smithy/util-stream": "^3.1.1", "tslib": "^2.6.2" }, "engines": { @@ -1979,12 +1979,12 @@ } }, "node_modules/@smithy/util-defaults-mode-browser": { - "version": "3.0.7", - "resolved": "https://registry.npmmirror.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.7.tgz", - "integrity": "sha512-Q2txLyvQyGfmjsaDbVV7Sg8psefpFcrnlGapDzXGFRPFKRBeEg6OvFK8FljqjeHSaCZ6/UuzQExUPqBR/2qlDA==", + "version": "3.0.11", + "resolved": "https://registry.npmmirror.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.11.tgz", + "integrity": "sha512-O3s9DGb3bmRvEKmT8RwvSWK4A9r6svfd+MnJB+UMi9ZcCkAnoRtliulOnGF0qCMkKF9mwk2tkopBBstalPY/vg==", "dependencies": { "@smithy/property-provider": "^3.1.3", - "@smithy/smithy-client": "^3.1.5", + "@smithy/smithy-client": "^3.1.9", "@smithy/types": "^3.3.0", "bowser": "^2.11.0", "tslib": "^2.6.2" @@ -1994,15 +1994,15 @@ } }, "node_modules/@smithy/util-defaults-mode-node": { - "version": "3.0.7", - "resolved": "https://registry.npmmirror.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.7.tgz", - "integrity": "sha512-F4Qcj1fG6MGi2BSWCslfsMSwllws/WzYONBGtLybyY+halAcXdWhcew+mej8M5SKd5hqPYp4f7b+ABQEaeytgg==", + "version": "3.0.11", + "resolved": "https://registry.npmmirror.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.11.tgz", + "integrity": "sha512-qd4a9qtyOa/WY14aHHOkMafhh9z8D2QTwlcBoXMTPnEwtcY+xpe1JyFm9vya7VsB8hHsfn3XodEtwqREiu4ygQ==", "dependencies": { - "@smithy/config-resolver": "^3.0.4", - "@smithy/credential-provider-imds": "^3.1.3", - "@smithy/node-config-provider": "^3.1.3", + "@smithy/config-resolver": "^3.0.5", + "@smithy/credential-provider-imds": "^3.1.4", + "@smithy/node-config-provider": "^3.1.4", "@smithy/property-provider": "^3.1.3", - "@smithy/smithy-client": "^3.1.5", + "@smithy/smithy-client": "^3.1.9", "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, @@ -2011,11 +2011,11 @@ } }, "node_modules/@smithy/util-endpoints": { - "version": "2.0.4", - "resolved": "https://registry.npmmirror.com/@smithy/util-endpoints/-/util-endpoints-2.0.4.tgz", - "integrity": "sha512-ZAtNf+vXAsgzgRutDDiklU09ZzZiiV/nATyqde4Um4priTmasDH+eLpp3tspL0hS2dEootyFMhu1Y6Y+tzpWBQ==", + "version": "2.0.5", + "resolved": "https://registry.npmmirror.com/@smithy/util-endpoints/-/util-endpoints-2.0.5.tgz", + "integrity": "sha512-ReQP0BWihIE68OAblC/WQmDD40Gx+QY1Ez8mTdFMXpmjfxSyz2fVQu3A4zXRfQU9sZXtewk3GmhfOHswvX+eNg==", "dependencies": { - "@smithy/node-config-provider": "^3.1.3", + "@smithy/node-config-provider": "^3.1.4", "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, @@ -2060,12 +2060,12 @@ } }, "node_modules/@smithy/util-stream": { - "version": "3.0.5", - "resolved": "https://registry.npmmirror.com/@smithy/util-stream/-/util-stream-3.0.5.tgz", - "integrity": "sha512-xC3L5PKMAT/Bh8fmHNXP9sdQ4+4aKVUU3EEJ2CF/lLk7R+wtMJM+v/1B4en7jO++Wa5spGzFDBCl0QxgbUc5Ug==", + "version": "3.1.1", + "resolved": "https://registry.npmmirror.com/@smithy/util-stream/-/util-stream-3.1.1.tgz", + "integrity": "sha512-EhRnVvl3AhoHAT2rGQ5o+oSDRM/BUSMPLZZdRJZLcNVUsFAjOs4vHaPdNQivTSzRcFxf5DA4gtO46WWU2zimaw==", "dependencies": { - "@smithy/fetch-http-handler": "^3.2.0", - "@smithy/node-http-handler": "^3.1.1", + "@smithy/fetch-http-handler": "^3.2.2", + "@smithy/node-http-handler": "^3.1.3", "@smithy/types": "^3.3.0", "@smithy/util-base64": "^3.0.0", "@smithy/util-buffer-from": "^3.0.0", @@ -2139,9 +2139,9 @@ } }, "node_modules/acorn": { - "version": "8.12.0", - "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.12.0.tgz", - "integrity": "sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==", + "version": "8.12.1", + "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.12.1.tgz", + "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", "bin": { "acorn": "bin/acorn" }, @@ -2451,9 +2451,9 @@ } }, "node_modules/browserslist": { - "version": "4.23.1", - "resolved": "https://registry.npmmirror.com/browserslist/-/browserslist-4.23.1.tgz", - "integrity": "sha512-TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw==", + "version": "4.23.2", + "resolved": "https://registry.npmmirror.com/browserslist/-/browserslist-4.23.2.tgz", + "integrity": "sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA==", "funding": [ { "type": "opencollective", @@ -2469,10 +2469,10 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001629", - "electron-to-chromium": "^1.4.796", + "caniuse-lite": "^1.0.30001640", + "electron-to-chromium": "^1.4.820", "node-releases": "^2.0.14", - "update-browserslist-db": "^1.0.16" + "update-browserslist-db": "^1.1.0" }, "bin": { "browserslist": "cli.js" @@ -2553,9 +2553,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001638", - "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001638.tgz", - "integrity": "sha512-5SuJUJ7cZnhPpeLHaH0c/HPAnAHZvS6ElWyHK9GSIbVOQABLzowiI2pjmpvZ1WEbkyz46iFd4UXlOHR5SqgfMQ==", + "version": "1.0.30001642", + "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001642.tgz", + "integrity": "sha512-3XQ0DoRgLijXJErLSl+bLnJ+Et4KqV1PY6JJBGAFlsNsz31zeAIncyeZfLCabHK/jtSh+671RM9YMldxjUPZtA==", "funding": [ { "type": "opencollective", @@ -2862,9 +2862,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/electron-to-chromium": { - "version": "1.4.815", - "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.815.tgz", - "integrity": "sha512-OvpTT2ItpOXJL7IGcYakRjHCt8L5GrrN/wHCQsRB4PQa1X9fe+X9oen245mIId7s14xvArCGSTIq644yPUKKLg==" + "version": "1.4.830", + "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.830.tgz", + "integrity": "sha512-TrPKKH20HeN0J1LHzsYLs2qwXrp8TF4nHdu4sq61ozGbzMpWhI7iIOPYPPkxeq1azMT9PZ8enPFcftbs/Npcjg==" }, "node_modules/emoji-regex": { "version": "9.2.2", @@ -3444,18 +3444,18 @@ } }, "node_modules/glibc-version/node_modules/node-addon-api": { - "version": "8.0.0", - "resolved": "https://registry.npmmirror.com/node-addon-api/-/node-addon-api-8.0.0.tgz", - "integrity": "sha512-ipO7rsHEBqa9STO5C5T10fj732ml+5kLN1cAG8/jdHd56ldQeGj3Q7+scUS+VHK/qy1zLEwC4wMK5+yM0btPvw==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/node-addon-api/-/node-addon-api-8.1.0.tgz", + "integrity": "sha512-yBY+qqWSv3dWKGODD6OGE6GnTX7Q2r+4+DfpqxHSHh8x0B4EKP9+wVGLS6U/AM1vxSNNmUEuIV5EGhYwPpfOwQ==", "optional": true, "engines": { "node": "^18 || ^20 || >= 21" } }, "node_modules/glob": { - "version": "10.4.2", - "resolved": "https://registry.npmmirror.com/glob/-/glob-10.4.2.tgz", - "integrity": "sha512-GwMlUF6PkPo3Gk21UxkCohOv0PLcIXVtKyLlpEI28R/cO/4eNOdmLk3CMW1wROV/WR/EsZOWAfBbBOqYvs88/w==", + "version": "10.4.5", + "resolved": "https://registry.npmmirror.com/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^3.1.2", @@ -3467,9 +3467,6 @@ "bin": { "glob": "dist/esm/bin.mjs" }, - "engines": { - "node": ">=16 || 14 >=14.18" - }, "funding": { "url": "https://github.com/sponsors/isaacs" } @@ -3796,15 +3793,12 @@ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" }, "node_modules/jackspeak": { - "version": "3.4.0", - "resolved": "https://registry.npmmirror.com/jackspeak/-/jackspeak-3.4.0.tgz", - "integrity": "sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw==", + "version": "3.4.3", + "resolved": "https://registry.npmmirror.com/jackspeak/-/jackspeak-3.4.3.tgz", + "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", "dependencies": { "@isaacs/cliui": "^8.0.2" }, - "engines": { - "node": ">=14" - }, "funding": { "url": "https://github.com/sponsors/isaacs" }, @@ -3825,9 +3819,9 @@ } }, "node_modules/jose": { - "version": "4.15.7", - "resolved": "https://registry.npmmirror.com/jose/-/jose-4.15.7.tgz", - "integrity": "sha512-L7ioP+JAuZe8v+T5+zVI9Tx8LtU8BL7NxkyDFVMv+Qr3JW0jSoYDedLtodaXwfqMpeCyx4WXFNyu9tJt4WvC1A==", + "version": "4.15.9", + "resolved": "https://registry.npmmirror.com/jose/-/jose-4.15.9.tgz", + "integrity": "sha512-1vUQX+IdDMVPj4k8kOxgUqlcK518yluMuGZwqlr44FS1ppZB/5GWh4rZG89erpOBOJjU/OBsnCVFfapsRz6nEA==", "funding": { "url": "https://github.com/sponsors/panva" } @@ -4267,11 +4261,11 @@ } }, "node_modules/mongodb-redact": { - "version": "0.2.3", - "resolved": "https://registry.npmmirror.com/mongodb-redact/-/mongodb-redact-0.2.3.tgz", - "integrity": "sha512-a6ZPWlC9yf6F/n6ylKyyTO2PXZeD6nPKWwBmAIlOtOH4v82DIfsgO4Bpml10/YSwFxF1+VY8NHohmxofzpB4Yw==", + "version": "1.1.3", + "resolved": "https://registry.npmmirror.com/mongodb-redact/-/mongodb-redact-1.1.3.tgz", + "integrity": "sha512-rMw3JlgJ1WhTYUlztojIJ+PGO4sQuwQmsbs1YY60Qf+jPHiDfP10YF//BvpVfy5lKRxAYZmgRTL/fLj1bUbIAg==", "dependencies": { - "lodash": "^4.17.15" + "lodash": "^4.17.21" } }, "node_modules/ms": { @@ -4354,19 +4348,10 @@ "url": "https://opencollective.com/node-fetch" } }, - "node_modules/node-forge": { - "version": "1.3.1", - "resolved": "https://registry.npmmirror.com/node-forge/-/node-forge-1.3.1.tgz", - "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==", - "optional": true, - "engines": { - "node": ">= 6.13.0" - } - }, "node_modules/node-releases": { - "version": "2.0.14", - "resolved": "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.14.tgz", - "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==" + "version": "2.0.17", + "resolved": "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.17.tgz", + "integrity": "sha512-Ww6ZlOiEQfPfXM45v17oabk77Z7mg5bOt7AjDyzy7RjK9OrLrLC8dyZQoAPEOtFX9SaNf1Tdvr5gRJWdTJj7GA==" }, "node_modules/nopt": { "version": "7.2.1", @@ -4603,12 +4588,9 @@ } }, "node_modules/path-scurry/node_modules/lru-cache": { - "version": "10.3.0", - "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-10.3.0.tgz", - "integrity": "sha512-CQl19J/g+Hbjbv4Y3mFNNXFEL/5t/KCg8POCuUqd4rMKjGG+j1ybER83hxV58zL+dFI1PTkt3GNFSHRt+d8qEQ==", - "engines": { - "node": "14 || >=16.14" - } + "version": "10.4.3", + "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==" }, "node_modules/path-to-regexp": { "version": "0.1.7", @@ -4993,9 +4975,9 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmmirror.com/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "version": "7.6.3", + "resolved": "https://registry.npmmirror.com/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "bin": { "semver": "bin/semver.js" }, @@ -5365,12 +5347,12 @@ } }, "node_modules/system-ca": { - "version": "1.0.3", - "resolved": "https://registry.npmmirror.com/system-ca/-/system-ca-1.0.3.tgz", - "integrity": "sha512-FHwdyDHM/J6SjHNVEp532J5rWsO0oPB/szZGsP/8I2s78mPLQhE0WwKTGi/RJulqTICekINsczg5q44n/1b+lQ==", + "version": "2.0.0", + "resolved": "https://registry.npmmirror.com/system-ca/-/system-ca-2.0.0.tgz", + "integrity": "sha512-eEWsCZHEyXdRPPMO680gLUhb9x8RK7YlXvv+I0zCvmGg9zf9OCchJxDf5NHqGPwAzLDEFpLXL5qv9KEU62N4Nw==", "optionalDependencies": { "macos-export-certificate-and-key": "^1.1.1", - "win-export-certificate-and-key": "^1.1.1" + "win-export-certificate-and-key": "^2.0.0" } }, "node_modules/tar": { @@ -5533,9 +5515,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.0.16", - "resolved": "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.0.16.tgz", - "integrity": "sha512-KVbTxlBYlckhF5wgfyZXTWnMn7MMZjMu9XG8bPlliUOP9ThaF4QnhP8qrjrH7DRzHfSk0oQv1wToW+iA5GajEQ==", + "version": "1.1.0", + "resolved": "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz", + "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==", "funding": [ { "type": "opencollective", @@ -5638,9 +5620,9 @@ } }, "node_modules/win-export-certificate-and-key": { - "version": "1.1.2", - "resolved": "https://registry.npmmirror.com/win-export-certificate-and-key/-/win-export-certificate-and-key-1.1.2.tgz", - "integrity": "sha512-3Su7Xdt9UR8pZicWQDcGSWNL6We/NzAGxe7AeQ1Z/zAeGHWlTKAh3HemGvIvxLRPsk4NW9D/QL3cL6SIvFcTvQ==", + "version": "2.0.1", + "resolved": "https://registry.npmmirror.com/win-export-certificate-and-key/-/win-export-certificate-and-key-2.0.1.tgz", + "integrity": "sha512-GsPUuIn95CepWgfiaqyIBWlj1uzr0LMfWIHBESSa+f84Zll9SjIX7Jj0+xNs/FlhH5zEkPO6k+SRQX1dfv3zPg==", "hasInstallScript": true, "optional": true, "os": [ @@ -5648,8 +5630,7 @@ ], "dependencies": { "bindings": "^1.5.0", - "node-addon-api": "^3.1.0", - "node-forge": "^1.2.1" + "node-addon-api": "^3.1.0" } }, "node_modules/win-export-certificate-and-key/node_modules/node-addon-api": { diff --git a/pkgs/development/tools/mongosh/source.json b/pkgs/development/tools/mongosh/source.json index d9e301c949b2..2b29ce88e8d8 100644 --- a/pkgs/development/tools/mongosh/source.json +++ b/pkgs/development/tools/mongosh/source.json @@ -1,6 +1,6 @@ { - "version": "2.2.10", - "integrity": "sha512-VTuZLREjLMzUDD/s0QEvJFF18A2mvYgxbEfGFr22vDS1se47bxgPcvvuDGQCQvVWC6OG+f75qkwtp8jPkYWa4w==", - "filename": "mongosh-2.2.10.tgz", - "deps": "sha256-iSbFG/Xh2EtGCJfcTLLTJm4BMrTHnnhYuk+FIVE/TJI=" + "version": "2.2.12", + "integrity": "sha512-xdjUc5p7ccHHpigT4dQb8OKRFF6rxDu8T8cMHLAHmJV3YhQdh2j+3NPn4Cj0JQQ5J1nmzPKM6jp+SlyUbs+2xg==", + "filename": "mongosh-2.2.12.tgz", + "deps": "sha256-yM9C4joROSyX02noNS4n5bUhWyDDXzFttGyyyFAubPM=" } From 276828565edf13fe0b94dd9d5b3556d42881455b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 14:06:44 +0000 Subject: [PATCH 07/47] murex: 6.1.8300 -> 6.2.3000 --- pkgs/shells/murex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/murex/default.nix b/pkgs/shells/murex/default.nix index 723cc2ae5111..04718b50379d 100644 --- a/pkgs/shells/murex/default.nix +++ b/pkgs/shells/murex/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "murex"; - version = "6.1.8300"; + version = "6.2.3000"; src = fetchFromGitHub { owner = "lmorg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-16eaPxmTauuttpjHUSQlBu/d/S3CWKgQYttqQWp0lkU="; + sha256 = "sha256-Y9FVmIYipEkKXHU7TcRX7s/8/50b5fYnPLalFXHPomM="; }; vendorHash = "sha256-/qK7Zgdz48vmz+tIMZmo1M5Glr842fOCinMoLAeQasg="; From 23e3186b41e28a8bee4e47c517b05b1fba3a3fad Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 20 Jul 2024 18:34:27 +0200 Subject: [PATCH 08/47] python312Packages.hikari: 2.0.0.dev125 -> 2.0.0.dev126 --- pkgs/development/python-modules/hikari/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/hikari/default.nix b/pkgs/development/python-modules/hikari/default.nix index f83a50b29160..b3d2807912f3 100644 --- a/pkgs/development/python-modules/hikari/default.nix +++ b/pkgs/development/python-modules/hikari/default.nix @@ -17,13 +17,13 @@ }: buildPythonPackage rec { pname = "hikari"; - version = "2.0.0.dev125"; + version = "2.0.0.dev126"; src = fetchFromGitHub { owner = "hikari-py"; repo = "hikari"; rev = version; - hash = "sha256-qxgIYquXUWrm8bS8EamERMHOnjI2aPyK7bQieVG66uA="; + hash = "sha256-KpF9P92IciILV7zlYTCgtMqhudT9uOR2SQJdWDtxYaA="; # The git commit is part of the `hikari.__git_sha1__` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -64,7 +64,8 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; postPatch = '' - substituteInPlace hikari/_about.py --replace "__git_sha1__: typing.Final[str] = \"HEAD\"" "__git_sha1__: typing.Final[str] = \"$(cat $src/COMMIT)\"" + substituteInPlace hikari/_about.py \ + --replace-fail "__git_sha1__: typing.Final[str] = \"HEAD\"" "__git_sha1__: typing.Final[str] = \"$(cat $src/COMMIT)\"" ''; meta = with lib; { From 9881658a3761be8814c3959f019c970d8a0a01cd Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 20 Jul 2024 18:35:51 +0200 Subject: [PATCH 09/47] python312Packages.hikari: add sigmanificient to maintainers --- pkgs/development/python-modules/hikari/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/hikari/default.nix b/pkgs/development/python-modules/hikari/default.nix index b3d2807912f3..ad275e5e3800 100644 --- a/pkgs/development/python-modules/hikari/default.nix +++ b/pkgs/development/python-modules/hikari/default.nix @@ -73,6 +73,6 @@ buildPythonPackage rec { homepage = "https://www.hikari-py.dev/"; changelog = "https://github.com/hikari-py/hikari/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ tomodachi94 ]; + maintainers = with maintainers; [ tomodachi94 sigmanificient ]; }; } From 4df73f999512edf5e76e32bcfea6b62ef1d856ae Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 20 Jul 2024 18:36:45 +0200 Subject: [PATCH 10/47] python312Packages.hikari-crescent: 0.6.6 -> 1.0.0 --- pkgs/development/python-modules/hikari-crescent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hikari-crescent/default.nix b/pkgs/development/python-modules/hikari-crescent/default.nix index 368b683cd98f..89f78ff0770b 100644 --- a/pkgs/development/python-modules/hikari-crescent/default.nix +++ b/pkgs/development/python-modules/hikari-crescent/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "hikari-crescent"; - version = "0.6.6"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "hikari-crescent"; repo = "hikari-crescent"; rev = "refs/tags/v${version}"; - hash = "sha256-PZAmz7Wofg6jnF25p/8leJQ9PeZaE3q5q2GUJG7NEB0="; + hash = "sha256-0eDPdN+3lalgHiBNXuZUEJllAKFxdKK6paTFNHU5jIM="; }; build-system = [ poetry-core ]; From 4a9c6f23ebe4af8a702753c42b3d1be218e19d78 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Jul 2024 15:25:14 +0000 Subject: [PATCH 11/47] seabird: 0.4.2 -> 0.5.1 --- pkgs/by-name/se/seabird/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/seabird/package.nix b/pkgs/by-name/se/seabird/package.nix index f0d6021a40df..b364c52b4823 100644 --- a/pkgs/by-name/se/seabird/package.nix +++ b/pkgs/by-name/se/seabird/package.nix @@ -14,16 +14,16 @@ buildGoModule rec { pname = "seabird"; - version = "0.4.2"; + version = "0.5.1"; src = fetchFromGitHub { owner = "getseabird"; repo = "seabird"; rev = "v${version}"; - hash = "sha256-GfoP3TeSzA4Hi3fCUR3Y3yWUAj3ogxTRsD4hXuERPio="; + hash = "sha256-y+QIBqU3kAxedhWLnu07m9HQOCgHfOvVscIxxWtUcZo="; }; - vendorHash = "sha256-uUMQ2AddIfPvD7B3KOfN7fWL8oIEK6G5L+NPYo+em5k="; + vendorHash = "sha256-4o9z4XjtW7kNHAb8L0kuq9rgQzTwvAAXcl6+RIGjmqI="; nativeBuildInputs = [ copyDesktopItems From e5f00e0e52fd0d14cf03b0ae4a32a6dad1200347 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 21 Jul 2024 20:01:26 +0200 Subject: [PATCH 12/47] nmap: 7.94 -> 7.95 --- pkgs/tools/security/nmap/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 9280abbcfb5d..503a537fbd52 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchurl, libpcap, pkg-config, openssl, lua5_4 -, pcre, libssh2 +, pcre2, libssh2 , withLua ? true }: stdenv.mkDerivation rec { pname = "nmap"; - version = "7.94"; + version = "7.95"; src = fetchurl { url = "https://nmap.org/dist/nmap-${version}.tar.bz2"; - sha256 = "sha256-1xvhie7EPX4Jm6yFcVCdMWxFd8p5SRgyrD4SF7yPksw="; + sha256 = "sha256-4Uq1MOR7Wv2I8ciiusf4nNj+a0eOItJVxbm923ocV3g="; }; prePatch = lib.optionalString stdenv.isDarwin '' @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ pcre libssh2 libpcap openssl ]; + buildInputs = [ pcre2 libssh2 libpcap openssl ]; enableParallelBuilding = true; From e68494d4713897d46ad80caa92dd4e1549d7a075 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 21 Jul 2024 20:15:11 +0200 Subject: [PATCH 13/47] nmap: reformat --- pkgs/tools/security/nmap/default.nix | 34 ++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 503a537fbd52..0c1e33219f22 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -1,6 +1,14 @@ -{ lib, stdenv, fetchurl, libpcap, pkg-config, openssl, lua5_4 -, pcre2, libssh2 -, withLua ? true +{ + lib, + stdenv, + fetchurl, + libpcap, + pkg-config, + openssl, + lua5_4, + pcre2, + libssh2, + withLua ? true, }: stdenv.mkDerivation rec { @@ -37,17 +45,25 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ pcre2 libssh2 libpcap openssl ]; + buildInputs = [ + pcre2 + libssh2 + libpcap + openssl + ]; enableParallelBuilding = true; doCheck = false; # fails 3 tests, probably needs the net - meta = with lib; { + meta = { description = "Free and open source utility for network discovery and security auditing"; - homepage = "http://www.nmap.org"; - license = licenses.gpl2Only; - platforms = platforms.all; - maintainers = with maintainers; [ thoughtpolice fpletz ]; + homepage = "http://www.nmap.org"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ + thoughtpolice + fpletz + ]; }; } From 0ece69c750f2b38f3bdb56e1eeb7c10f4588d2a9 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 21 Jul 2024 20:26:57 +0200 Subject: [PATCH 14/47] nmap: move to by-name --- .../security/nmap/default.nix => by-name/nm/nmap/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/security/nmap/default.nix => by-name/nm/nmap/package.nix} (100%) diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/by-name/nm/nmap/package.nix similarity index 100% rename from pkgs/tools/security/nmap/default.nix rename to pkgs/by-name/nm/nmap/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cad427f99100..54f6c87c243f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10925,8 +10925,6 @@ with pkgs; npth = callPackage ../development/libraries/npth { }; - nmap = callPackage ../tools/security/nmap { }; - nmap-formatter = callPackage ../tools/security/nmap-formatter { }; nmapsi4 = libsForQt5.callPackage ../tools/security/nmap/qt.nix { }; From 271ef65cb88de00e25afabec5e94147de50ebdaa Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 21 Jul 2024 20:35:45 +0200 Subject: [PATCH 15/47] nmap: don't compile with included libinear & zlib --- pkgs/by-name/nm/nmap/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/nm/nmap/package.nix b/pkgs/by-name/nm/nmap/package.nix index 0c1e33219f22..6b6a83c7eae9 100644 --- a/pkgs/by-name/nm/nmap/package.nix +++ b/pkgs/by-name/nm/nmap/package.nix @@ -7,7 +7,9 @@ openssl, lua5_4, pcre2, + liblinear, libssh2, + zlib, withLua ? true, }: @@ -29,7 +31,6 @@ stdenv.mkDerivation rec { configureFlags = [ (if withLua then "--with-liblua=${lua5_4}" else "--without-liblua") - "--with-liblinear=included" "--without-ndiff" "--without-zenmap" ]; @@ -47,9 +48,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ pcre2 + liblinear libssh2 libpcap openssl + zlib ]; enableParallelBuilding = true; From a3140b5bc8d08da6f759a88aef1826b9f2aa5465 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 21 Jul 2024 20:28:07 +0200 Subject: [PATCH 16/47] nmapsi4: move to by-name --- .../nmap/qt.nix => by-name/nm/nmapsi4/package.nix} | 9 +++------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 3 insertions(+), 8 deletions(-) rename pkgs/{tools/security/nmap/qt.nix => by-name/nm/nmapsi4/package.nix} (89%) diff --git a/pkgs/tools/security/nmap/qt.nix b/pkgs/by-name/nm/nmapsi4/package.nix similarity index 89% rename from pkgs/tools/security/nmap/qt.nix rename to pkgs/by-name/nm/nmapsi4/package.nix index 956649088ff3..9faf7eb46e02 100644 --- a/pkgs/tools/security/nmap/qt.nix +++ b/pkgs/by-name/nm/nmapsi4/package.nix @@ -2,12 +2,9 @@ , fetchFromGitHub , cmake , pkg-config -, wrapQtAppsHook , dnsutils , nmap -, qtbase -, qtscript -, qtwebengine +, libsForQt5 }: stdenv.mkDerivation rec { @@ -21,9 +18,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-q3XfwJ4TGK4E58haN0Q0xRH4GDpKD8VZzyxHe/VwBqY="; }; - nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config libsForQt5.wrapQtAppsHook ]; - buildInputs = [ qtbase qtscript qtwebengine ]; + buildInputs = with libsForQt5; [ qtbase qtscript qtwebengine ]; postPatch = '' substituteInPlace src/platform/digmanager.cpp \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54f6c87c243f..b1bd1f2b7422 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10927,8 +10927,6 @@ with pkgs; nmap-formatter = callPackage ../tools/security/nmap-formatter { }; - nmapsi4 = libsForQt5.callPackage ../tools/security/nmap/qt.nix { }; - noise-repellent = callPackage ../applications/audio/noise-repellent { }; noisetorch = callPackage ../applications/audio/noisetorch { }; From 598c87675a59bad9c0d79e1eae1e1dfc6964d344 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 21 Jul 2024 20:29:25 +0200 Subject: [PATCH 17/47] nmapsi4: reformat --- pkgs/by-name/nm/nmapsi4/package.nix | 34 +++++++++++++++++++---------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/nm/nmapsi4/package.nix b/pkgs/by-name/nm/nmapsi4/package.nix index 9faf7eb46e02..a9574b4baa01 100644 --- a/pkgs/by-name/nm/nmapsi4/package.nix +++ b/pkgs/by-name/nm/nmapsi4/package.nix @@ -1,10 +1,12 @@ -{ lib, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, dnsutils -, nmap -, libsForQt5 +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + dnsutils, + nmap, + libsForQt5, }: stdenv.mkDerivation rec { @@ -18,9 +20,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-q3XfwJ4TGK4E58haN0Q0xRH4GDpKD8VZzyxHe/VwBqY="; }; - nativeBuildInputs = [ cmake pkg-config libsForQt5.wrapQtAppsHook ]; + nativeBuildInputs = [ + cmake + pkg-config + libsForQt5.wrapQtAppsHook + ]; - buildInputs = with libsForQt5; [ qtbase qtscript qtwebengine ]; + buildInputs = with libsForQt5; [ + qtbase + qtscript + qtwebengine + ]; postPatch = '' substituteInPlace src/platform/digmanager.cpp \ @@ -48,11 +58,11 @@ stdenv.mkDerivation rec { done ''; - meta = with lib; { + meta = { description = "Qt frontend for nmap"; mainProgram = "nmapsi4"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ peterhoeg ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ peterhoeg ]; inherit (src.meta) homepage; }; } From 00c522b86bb73fffda1c7f4e1fba7cd7eb529e6b Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 5 Feb 2024 18:49:48 -0300 Subject: [PATCH 18/47] mpvc: migrate to by-name --- .../misc/mpvc/default.nix => by-name/mp/mpvc/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/misc/mpvc/default.nix => by-name/mp/mpvc/package.nix} (100%) diff --git a/pkgs/applications/misc/mpvc/default.nix b/pkgs/by-name/mp/mpvc/package.nix similarity index 100% rename from pkgs/applications/misc/mpvc/default.nix rename to pkgs/by-name/mp/mpvc/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5a285502f32..a5e737ec9311 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39962,8 +39962,6 @@ with pkgs; mg = callPackage ../applications/editors/mg { }; - mpvc = callPackage ../applications/misc/mpvc { }; - # Overriding does not work when using callPackage on discord using import instead. (https://github.com/NixOS/nixpkgs/pull/179906) discord = import ../applications/networking/instant-messengers/discord { inherit lib stdenv; From a5875f7a7bc6e924b9488308827cc90105323f50 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 10 Jul 2024 19:48:46 -0300 Subject: [PATCH 19/47] mpvc: rework - align input set - finalAttrs - strictDeps - remove nested with --- pkgs/by-name/mp/mpvc/package.nix | 47 ++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/mp/mpvc/package.nix b/pkgs/by-name/mp/mpvc/package.nix index 5182b53faa9a..ccef34088b98 100644 --- a/pkgs/by-name/mp/mpvc/package.nix +++ b/pkgs/by-name/mp/mpvc/package.nix @@ -1,32 +1,43 @@ -{ lib, stdenv, socat, fetchFromGitHub, makeWrapper }: +{ + lib, + fetchFromGitHub, + makeWrapper, + socat, + stdenv, + testers, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mpvc"; version = "1.3"; src = fetchFromGitHub { owner = "lwilletts"; repo = "mpvc"; - rev = version; - sha256 = "sha256-wPETEG0BtNBEj3ZyP70byLzIP+NMUKbnjQ+kdvrvK3s="; + rev = finalAttrs.version; + hash = "sha256-wPETEG0BtNBEj3ZyP70byLzIP+NMUKbnjQ+kdvrvK3s="; }; - makeFlags = [ "PREFIX=$(out)" ]; - installFlags = [ "PREFIX=$(out)" ]; - - postInstall = '' - wrapProgram $out/bin/mpvc --prefix PATH : "${socat}/bin/" - ''; - nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ socat ]; - meta = with lib; { - description = "Mpc-like control interface for mpv"; - mainProgram = "mpvc"; + makeFlags = [ "PREFIX=$(out)" ]; + + installFlags = [ "PREFIX=$(out)" ]; + + strictDeps = true; + + postInstall = '' + wrapProgram $out/bin/mpvc --prefix PATH : "${lib.getBin socat}/" + ''; + + meta = { homepage = "https://github.com/lwilletts/mpvc"; - license = licenses.mit; - maintainers = [ maintainers.neeasade ]; - platforms = platforms.linux; + description = "Mpc-like control interface for mpv"; + license = lib.licenses.mit; + mainProgram = "mpvc"; + maintainers = with lib.maintainers; [ neeasade ]; + platforms = lib.platforms.linux; }; -} +}) From 3ce1e066be9d2d273c654dd2f8823230c94fb11a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 10 Jul 2024 20:53:01 -0300 Subject: [PATCH 20/47] mpvc: 1.3 -> 1.4-unstable-2024-07-09 - Using a new repo because it has more updates; - Using master tip instead of tagged release because, well, 1.5 does not exist and the latest versions are `1.5-`. - Adding myself as maintainer --- pkgs/by-name/mp/mpvc/package.nix | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/mp/mpvc/package.nix b/pkgs/by-name/mp/mpvc/package.nix index ccef34088b98..2bb7039f5ee1 100644 --- a/pkgs/by-name/mp/mpvc/package.nix +++ b/pkgs/by-name/mp/mpvc/package.nix @@ -9,19 +9,21 @@ stdenv.mkDerivation (finalAttrs: { pname = "mpvc"; - version = "1.3"; + version = "1.4-unstable-2024-07-09"; src = fetchFromGitHub { - owner = "lwilletts"; + owner = "gmt4"; repo = "mpvc"; - rev = finalAttrs.version; - hash = "sha256-wPETEG0BtNBEj3ZyP70byLzIP+NMUKbnjQ+kdvrvK3s="; + rev = "966156dacd026cde220951d41c4ac5915cd6ad64"; + hash = "sha256-/M3xOb0trUaxJGXmV2+sOCbrHGyP4jpyo+S/oBoDkO0="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ socat ]; + outputs = [ "out" "doc" ]; + makeFlags = [ "PREFIX=$(out)" ]; installFlags = [ "PREFIX=$(out)" ]; @@ -32,12 +34,18 @@ stdenv.mkDerivation (finalAttrs: { wrapProgram $out/bin/mpvc --prefix PATH : "${lib.getBin socat}/" ''; + # This is not Archlinux :) + postFixup = '' + rm -r $out/share/licenses + rmdir $out/share || true + ''; + meta = { - homepage = "https://github.com/lwilletts/mpvc"; + homepage = "https://github.com/gmt4/mpvc"; description = "Mpc-like control interface for mpv"; license = lib.licenses.mit; mainProgram = "mpvc"; - maintainers = with lib.maintainers; [ neeasade ]; + maintainers = with lib.maintainers; [ AndersonTorres neeasade ]; platforms = lib.platforms.linux; }; }) From 96981e3429a25c8cb38496952b2854471db0d11a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 10 Jul 2024 21:23:43 -0300 Subject: [PATCH 21/47] mpvc: remove neeasade as maintainer No activity since 2023-07-20. --- pkgs/by-name/mp/mpvc/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mp/mpvc/package.nix b/pkgs/by-name/mp/mpvc/package.nix index 2bb7039f5ee1..90b5c1d4b5eb 100644 --- a/pkgs/by-name/mp/mpvc/package.nix +++ b/pkgs/by-name/mp/mpvc/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Mpc-like control interface for mpv"; license = lib.licenses.mit; mainProgram = "mpvc"; - maintainers = with lib.maintainers; [ AndersonTorres neeasade ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.linux; }; }) From 24b1fa8cd9a457e27f378a6524bbb8ba7fc3f18b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 21 Jul 2024 12:37:18 +0200 Subject: [PATCH 22/47] httm: 0.39.1 -> 0.40.1 --- pkgs/tools/filesystems/httm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix index fc1643e9b60e..e48bd316ea1d 100644 --- a/pkgs/tools/filesystems/httm/default.nix +++ b/pkgs/tools/filesystems/httm/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.39.1"; + version = "0.40.1"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - hash = "sha256-Wlmr2xI3RRiV8z+AhD1If3TSD/tBBFg3b9YNAximRk8="; + hash = "sha256-iJs151HdwcSNlgbbSX/CKBOeGvfEJes8Q8nm/HDfssg="; }; - cargoHash = "sha256-9N+Yo82fx2mFrClk7H1fHhVS4lOX+us5Hs2EXmCbY4o="; + cargoHash = "sha256-n/UKM+/rXuf4vbc+1TGUTZzmRyYjLNMttmYnUs7HZPw="; nativeBuildInputs = [ installShellFiles ]; From c31bf925295243609e3ac6aa6d3ce43bebcd0760 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 23 Jul 2024 21:55:00 +0200 Subject: [PATCH 23/47] httm: reformat, move to by-name --- .../httm/default.nix => by-name/ht/httm/package.nix} | 9 +++++---- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 5 insertions(+), 6 deletions(-) rename pkgs/{tools/filesystems/httm/default.nix => by-name/ht/httm/package.nix} (94%) diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/by-name/ht/httm/package.nix similarity index 94% rename from pkgs/tools/filesystems/httm/default.nix rename to pkgs/by-name/ht/httm/package.nix index e48bd316ea1d..d008e766fef4 100644 --- a/pkgs/tools/filesystems/httm/default.nix +++ b/pkgs/by-name/ht/httm/package.nix @@ -1,7 +1,8 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, installShellFiles +{ + lib, + rustPlatform, + fetchFromGitHub, + installShellFiles, }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a079b2f4aee..5b8854090f31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1851,8 +1851,6 @@ with pkgs; hsd = callPackage ../tools/misc/hsd { }; - httm = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/httm { }; - hyperpotamus = callPackage ../tools/misc/hyperpotamus { }; immich-cli = callPackage ../tools/misc/immich-cli { }; From b934fad58cec0b7923b33ea2e49ae022bef2cc8a Mon Sep 17 00:00:00 2001 From: Sergey Vlasov Date: Sun, 10 Mar 2024 22:20:04 +0300 Subject: [PATCH 24/47] i3: fix and reenable testsuite The `checkPhase` script was stale and needed to be rewritten for the new version of i3 (paths are different now, and `complete-run.pl` now invokes `xvfb-run` internally). The code to check the log file for errors might be unneeded for the new version (`complete-run.pl` seems to return a non-zero exit code correctly on errors), but is left to catch any possible regressions in the test runner behavior. Also the `318-i3-dmenu-desktop.t` testcase was failing, because that testcase was creating a temporary Perl script intended to shadow the real `i3-msg` executable, but the `#!/usr/bin/env perl` shebang in that script did not work in the build environment; this problem was not really obvious, because `system('i3-msg', $cmd)` silently continued to search for the `i3-msg` executable further in `$PATH` and launched the real binary instead of the replacement script. The problematic shebang needed to be replaced manually, because `patchShebangs` handles only real shebangs on the first line of each executable file. --- .../window-managers/i3/default.nix | 30 +++++++++++++------ 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 8ced173b2223..e4327940ba84 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -36,20 +36,32 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs . + + # This testcase generates a Perl executable file with a shebang, and + # patchShebangs can't replace a shebang in the middle of a file. + substituteInPlace testcases/t/318-i3-dmenu-desktop.t \ + --replace-fail "#!/usr/bin/env perl" "#!${perl}/bin/perl" ''; - # Tests have been failing (at least for some people in some cases) - # and have been disabled until someone wants to fix them. Some - # initial digging uncovers that the tests call out to `git`, which - # they shouldn't, and then even once that's fixed have some - # perl-related errors later on. For more, see - # https://github.com/NixOS/nixpkgs/issues/7957 - doCheck = false; # stdenv.hostPlatform.system == "x86_64-linux"; + doCheck = stdenv.hostPlatform.system == "x86_64-linux"; checkPhase = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") '' - (cd testcases && xvfb-run ./complete-run.pl -p 1 --keep-xserver-output) - ! grep -q '^not ok' testcases/latest/complete-run.log + test_failed= + # "| cat" disables fancy progress reporting which makes the log unreadable. + ./complete-run.pl -p 1 --keep-xserver-output | cat || test_failed="complete-run.pl returned $?" + if [ -z "$test_failed" ]; then + # Apparently some old versions of `complete-run.pl` did not return a + # proper exit code, so check the log for signs of errors too. + grep -q '^not ok' latest/complete-run.log && test_failed="test log contains errors" ||: + fi + if [ -n "$test_failed" ]; then + echo "***** Error: $test_failed" + echo "===== Test log =====" + cat latest/complete-run.log + echo "===== End of test log =====" + false + fi ''; postInstall = '' From f2f398f81fdd4029b1262f7b53f51bcd918a420a Mon Sep 17 00:00:00 2001 From: Sergey Vlasov Date: Sun, 10 Mar 2024 22:36:56 +0300 Subject: [PATCH 25/47] i3: add more dependencies used by tests Some tests in the i3 testsuite are silently skipped if the dependencies required to run those tests are missing. The problematic dependencies turned out to be `xdotool`, `xorg.setxkbmap`, `xorg.xrandr`, `which` (the latter is used to verify the presence of some tools). Add those dependencies to `buildInputs`, so that all tests would be run. Ideally such missing dependencies should be detected as test failures, but it's hard to implement, because missing tools result just in `skip` marks in the test log, and there are some tests which are skipped for other reasons (e.g., tests which were written before the expected behavior is actually implemented in i3). --- pkgs/applications/window-managers/i3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index e4327940ba84..d1e304942557 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,7 +1,7 @@ { fetchurl, lib, stdenv, pkg-config, makeWrapper, meson, ninja, installShellFiles, libxcb, xcbutilkeysyms , xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre2, libev , yajl, xcb-util-cursor, perl, pango, perlPackages, libxkbcommon -, xvfb-run +, xorgserver, xvfb-run, xdotool, xorg, which , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { libstartup_notification libX11 pcre2 libev yajl xcb-util-cursor perl pango perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun perlPackages.ExtUtilsPkgConfig perlPackages.InlineC - xvfb-run + xorgserver xvfb-run xdotool xorg.setxkbmap xorg.xrandr which ]; configureFlags = [ "--disable-builddir" ]; From a32ddd6d6cd46b2af58632d0f2280998c88f28c6 Mon Sep 17 00:00:00 2001 From: Sergey Vlasov Date: Sun, 10 Mar 2024 23:28:01 +0300 Subject: [PATCH 26/47] i3: make postPatch work for older forks too The `i3-rounded` package is derived from `i3`, but uses some old fork of `i3` which does not have the `318-i3-dmenu-desktop.t` testcase. Make the code in `postPatch` check whether that testcase is actually present, so that the build of `i3-rounded` does not fail. --- pkgs/applications/window-managers/i3/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index d1e304942557..76c6dc845e2d 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -39,8 +39,10 @@ stdenv.mkDerivation rec { # This testcase generates a Perl executable file with a shebang, and # patchShebangs can't replace a shebang in the middle of a file. - substituteInPlace testcases/t/318-i3-dmenu-desktop.t \ - --replace-fail "#!/usr/bin/env perl" "#!${perl}/bin/perl" + if [ -f testcases/t/318-i3-dmenu-desktop.t ]; then + substituteInPlace testcases/t/318-i3-dmenu-desktop.t \ + --replace-fail "#!/usr/bin/env perl" "#!${perl}/bin/perl" + fi ''; doCheck = stdenv.hostPlatform.system == "x86_64-linux"; From e9f59d8d5069950b30d7e06952c1ae362704fbf1 Mon Sep 17 00:00:00 2001 From: Sergey Vlasov Date: Sun, 10 Mar 2024 23:44:02 +0300 Subject: [PATCH 27/47] i3-rounded: disable testsuite Some tests in the `i3-rounded` fork are failing; disable the testsuite to allow the package to build as before. --- pkgs/applications/window-managers/i3/rounded.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/window-managers/i3/rounded.nix b/pkgs/applications/window-managers/i3/rounded.nix index ee04f4246fef..45e80f7fb1a7 100644 --- a/pkgs/applications/window-managers/i3/rounded.nix +++ b/pkgs/applications/window-managers/i3/rounded.nix @@ -13,6 +13,9 @@ i3.overrideAttrs (oldAttrs: rec { buildInputs = oldAttrs.buildInputs ++ [ pcre ]; + # Some tests are failing. + doCheck = false; + meta = with lib; { description = "Fork of i3-gaps that adds rounding to window corners"; homepage = "https://github.com/LinoBigatti/i3-rounded"; From 43e1972a6839e8cd84db4768463159be50467561 Mon Sep 17 00:00:00 2001 From: Sergey Vlasov Date: Tue, 12 Mar 2024 10:24:16 +0300 Subject: [PATCH 28/47] i3: enable the testsuite on all Linux platforms The testsuite can run only on Linux, because it requires `xvfb-run`, which is not available on non-Linux platforms; however, it should not be limited just to `x86_64-linux`. The conditional setting of `checkPhase` was introduced in #6135, because at that time the `checkPhase` script referred to `${xdummy}`, and that kind of reference would break evaluation if the specified package was not available; the current version of the `checkPhase` script does not refer to any package paths directly, therefore the condition is no longer needed and can be removed. --- pkgs/applications/window-managers/i3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 76c6dc845e2d..d655ce07ece8 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -45,10 +45,10 @@ stdenv.mkDerivation rec { fi ''; - doCheck = stdenv.hostPlatform.system == "x86_64-linux"; + # xvfb-run is available only on Linux + doCheck = stdenv.isLinux; - checkPhase = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") - '' + checkPhase = '' test_failed= # "| cat" disables fancy progress reporting which makes the log unreadable. ./complete-run.pl -p 1 --keep-xserver-output | cat || test_failed="complete-run.pl returned $?" From 081b609aeaa187c03ff1bfef49e6a740c770f8fa Mon Sep 17 00:00:00 2001 From: Sergey Vlasov Date: Tue, 12 Mar 2024 10:31:59 +0300 Subject: [PATCH 29/47] i3: add test-only deps to buildInputs only when testing is enabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This may fix the build on Darwin (the `xvfb-run` package, which is required only to run the testsuite, is Linux-only since #123097, and the “proper solution” mentioned in that PR was not implemented). Apparently someone cared about building `i3` on Darwin at the time of #6135. --- pkgs/applications/window-managers/i3/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index d655ce07ece8..6438eee19525 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { libstartup_notification libX11 pcre2 libev yajl xcb-util-cursor perl pango perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun perlPackages.ExtUtilsPkgConfig perlPackages.InlineC + ] ++ lib.optionals doCheck [ xorgserver xvfb-run xdotool xorg.setxkbmap xorg.xrandr which ]; From d118df3f8dc8c6eac6b72a424e2cec87f47863b7 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Tue, 23 Jul 2024 20:07:40 -0700 Subject: [PATCH 30/47] zig_0_13.hook: disable progress output The progress output is not printed in a readable manner in a nix build. Passing `--color off` disables it during builds. --- pkgs/development/compilers/zig/0.13/hook.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/zig/0.13/hook.nix b/pkgs/development/compilers/zig/0.13/hook.nix index a56b1a21e961..2d379f1b7caf 100644 --- a/pkgs/development/compilers/zig/0.13/hook.nix +++ b/pkgs/development/compilers/zig/0.13/hook.nix @@ -18,6 +18,7 @@ makeSetupHook { zig_default_flags = [ "-Dcpu=baseline" "--release=safe" + "--color off" # Turn off progress output ]; }; From e6aa19a9ce805590cb674e39544b1c6e5da014c8 Mon Sep 17 00:00:00 2001 From: Daniel Baker Date: Sat, 22 Jun 2024 21:29:41 -0700 Subject: [PATCH 31/47] python3Packages.spatialmath-python: init at 1.1.10 Co-authored-by: Anthony Camarillo --- .../spatialmath-python/default.nix | 76 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 78 insertions(+) create mode 100644 pkgs/development/python-modules/spatialmath-python/default.nix diff --git a/pkgs/development/python-modules/spatialmath-python/default.nix b/pkgs/development/python-modules/spatialmath-python/default.nix new file mode 100644 index 000000000000..3613763f3105 --- /dev/null +++ b/pkgs/development/python-modules/spatialmath-python/default.nix @@ -0,0 +1,76 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + oldest-supported-numpy, + setuptools, + ansitable, + matplotlib, + numpy, + scipy, + typing-extensions, + coverage, + flake8, + pytest, + pytest-timeout, + pytest-xvfb, + sympy, + pytestCheckHook, + pythonRelaxDepsHook, +}: + +buildPythonPackage rec { + pname = "spatialmath-python"; + version = "1.1.10"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "spatialmath_python"; + inherit version; + hash = "sha256-7h29RHCrxdexpabtxMQx/7RahQmCDGHhdJ1WETvtfYg="; + }; + + nativeBuildInputs = [ + oldest-supported-numpy + setuptools + pythonRelaxDepsHook + ]; + + pythonRemoveDeps = [ "pre-commit" ]; + + propagatedBuildInputs = [ + ansitable + matplotlib + numpy + scipy + typing-extensions + ]; + + passthru.optional-dependencies = { + dev = [ + coverage + flake8 + pytest + pytest-timeout + pytest-xvfb + sympy + ]; + }; + + pythonImportsCheck = [ "spatialmath" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "Provides spatial maths capability for Python"; + homepage = "https://pypi.org/project/spatialmath-python/"; + license = licenses.mit; + maintainers = with maintainers; [ + djacu + a-camarillo + ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 80c03faf8f4b..bb59bc90477d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14538,6 +14538,8 @@ self: super: with self; { spatial-image = callPackage ../development/python-modules/spatial-image { }; + spatialmath-python = callPackage ../development/python-modules/spatialmath-python { }; + spdx = callPackage ../development/python-modules/spdx { }; spdx-lookup = callPackage ../development/python-modules/spdx-lookup { }; From dafbfa8c33ad2cef7f9b0cb3293eaacba6c47158 Mon Sep 17 00:00:00 2001 From: seth Date: Wed, 24 Jul 2024 03:23:41 -0400 Subject: [PATCH 32/47] resources: 1.5.0 -> 1.5.1 Diff: https://github.com/nokyan/resources/compare/refs/tags/v1.5.0...v1.5.1 Changelog: https://github.com/nokyan/resources/releases/tag/1.5.1 --- pkgs/by-name/re/resources/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/resources/package.nix b/pkgs/by-name/re/resources/package.nix index 82d1f0a24e8b..83489bae2058 100644 --- a/pkgs/by-name/re/resources/package.nix +++ b/pkgs/by-name/re/resources/package.nix @@ -19,19 +19,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "resources"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "nokyan"; repo = "resources"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-Xj8c8ZVhlS2h4ZygeCOaT1XHEbgTSkseinofP9X+5qY="; + hash = "sha256-uzZCczayJ5C0TZznA2wjGNYF3nB6fh/rrBKvv9s3J5g="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) src; name = "resources-${finalAttrs.version}"; - hash = "sha256-PZ91xSiWt9rMnSy8KZOmWbUL5Y0Nf3Kk577ZwkdnHwg="; + hash = "sha256-a0VdSNy8E7qen+6yFXuQBmYnDD/DMUgrZqJK6BJja60="; }; nativeBuildInputs = [ From c6baa3fbaff841351ce081ded4e27e0044fb9e9a Mon Sep 17 00:00:00 2001 From: seth Date: Wed, 24 Jul 2024 03:26:33 -0400 Subject: [PATCH 33/47] resources: add updateScript --- pkgs/by-name/re/resources/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/re/resources/package.nix b/pkgs/by-name/re/resources/package.nix index 83489bae2058..cf710d62fdf3 100644 --- a/pkgs/by-name/re/resources/package.nix +++ b/pkgs/by-name/re/resources/package.nix @@ -15,6 +15,7 @@ , libadwaita , dmidecode , util-linux +, nix-update-script }: stdenv.mkDerivation (finalAttrs: { @@ -65,6 +66,10 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonOption "profile" "default") ]; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { changelog = "https://github.com/nokyan/resources/releases/tag/${finalAttrs.version}"; description = "Monitor your system resources and processes"; From 7995b33989b50f7b5c94eea03ac304492b996a79 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Jul 2024 08:55:28 +0000 Subject: [PATCH 34/47] bdf2psf: 1.229 -> 1.230 --- pkgs/tools/misc/bdf2psf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index 7daaa02fb215..0a01b1f9a885 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bdf2psf"; - version = "1.229"; + version = "1.230"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "sha256-RQz3ny2a77jzR4wrGpXOl7Gvkw2dGae4xwnwu3EeeeY="; + sha256 = "sha256-W7eFrzuDcjm9P2hAP7+u9YPIhCqF3pbWb9+ynmKjs5M="; }; nativeBuildInputs = [ dpkg ]; From 32443e63978cb2800ff32c4da717fc166d11d99c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Jul 2024 12:03:23 +0000 Subject: [PATCH 35/47] python312Packages.litellm: 1.41.21 -> 1.41.28 --- pkgs/development/python-modules/litellm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix index 611c957abc42..72a770848285 100644 --- a/pkgs/development/python-modules/litellm/default.nix +++ b/pkgs/development/python-modules/litellm/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "litellm"; - version = "1.41.21"; + version = "1.41.28"; pyproject = true; disabled = pythonOlder "3.8"; @@ -46,7 +46,7 @@ buildPythonPackage rec { owner = "BerriAI"; repo = "litellm"; rev = "refs/tags/v${version}"; - hash = "sha256-JVW60jq+C/eSaB5E6D/1cTE9LOqz/HT+bV9KJKdN+zs="; + hash = "sha256-DNFzBl2K4liphEMVPRbLWMzzCxtIcvUgQxvppAnv/10="; }; build-system = [ poetry-core ]; From 246d1ee533810ac1946d863bbd9de9b525818d56 Mon Sep 17 00:00:00 2001 From: abysssol Date: Tue, 23 Jul 2024 22:24:02 -0400 Subject: [PATCH 36/47] nixos/ollama: reformat with `nixfmt-rfc-style` --- nixos/modules/services/misc/ollama.nix | 168 ++++++++++++++----------- 1 file changed, 97 insertions(+), 71 deletions(-) diff --git a/nixos/modules/services/misc/ollama.nix b/nixos/modules/services/misc/ollama.nix index 07031a082344..d545b15e5e1a 100644 --- a/nixos/modules/services/misc/ollama.nix +++ b/nixos/modules/services/misc/ollama.nix @@ -1,22 +1,37 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let inherit (lib) literalExpression types mkBefore; cfg = config.services.ollama; - ollamaPackage = cfg.package.override { - inherit (cfg) acceleration; - }; + ollamaPackage = cfg.package.override { inherit (cfg) acceleration; }; staticUser = cfg.user != null && cfg.group != null; in { imports = [ - (lib.mkRemovedOptionModule [ "services" "ollama" "listenAddress" ] - "Use `services.ollama.host` and `services.ollama.port` instead.") - (lib.mkRemovedOptionModule [ "services" "ollama" "sandbox" ] - "Set `services.ollama.user` and `services.ollama.group` instead.") - (lib.mkRemovedOptionModule [ "services" "ollama" "writablePaths" ] - "The `models` directory is now always writable. To make other directories writable, use `systemd.services.ollama.serviceConfig.ReadWritePaths`." ) + (lib.mkRemovedOptionModule [ + "services" + "ollama" + "listenAddress" + ] "Use `services.ollama.host` and `services.ollama.port` instead.") + (lib.mkRemovedOptionModule [ + "services" + "ollama" + "sandbox" + ] "Set `services.ollama.user` and `services.ollama.group` instead.") + (lib.mkRemovedOptionModule + [ + "services" + "ollama" + "writablePaths" + ] + "The `models` directory is now always writable. To make other directories writable, use `systemd.services.ollama.serviceConfig.ReadWritePaths`." + ) ]; options = { @@ -84,7 +99,13 @@ in ''; }; acceleration = lib.mkOption { - type = types.nullOr (types.enum [ false "rocm" "cuda" ]); + type = types.nullOr ( + types.enum [ + false + "rocm" + "cuda" + ] + ); default = null; example = "rocm"; description = '' @@ -150,13 +171,13 @@ in }; config = lib.mkIf cfg.enable { - users = lib.mkIf staticUser { + users = lib.mkIf staticUser { users.${cfg.user} = { inherit (cfg) home; isSystemUser = true; group = cfg.group; }; - groups.${cfg.group} = {}; + groups.${cfg.group} = { }; }; systemd.services.ollama = { @@ -169,64 +190,66 @@ in OLLAMA_HOST = "${cfg.host}:${toString cfg.port}"; HSA_OVERRIDE_GFX_VERSION = lib.mkIf (cfg.rocmOverrideGfx != null) cfg.rocmOverrideGfx; }; - serviceConfig = lib.optionalAttrs staticUser { - User = cfg.user; - Group = cfg.group; - } // { - DynamicUser = true; - ExecStart = "${lib.getExe ollamaPackage} serve"; - WorkingDirectory = cfg.home; - StateDirectory = [ "ollama" ]; - ReadWritePaths = [ - cfg.home - cfg.models - ]; + serviceConfig = + lib.optionalAttrs staticUser { + User = cfg.user; + Group = cfg.group; + } + // { + DynamicUser = true; + ExecStart = "${lib.getExe ollamaPackage} serve"; + WorkingDirectory = cfg.home; + StateDirectory = [ "ollama" ]; + ReadWritePaths = [ + cfg.home + cfg.models + ]; - CapabilityBoundingSet = [ "" ]; - DeviceAllow = [ - # CUDA - # https://docs.nvidia.com/dgx/pdf/dgx-os-5-user-guide.pdf - "char-nvidiactl" - "char-nvidia-caps" - "char-nvidia-uvm" - # ROCm - "char-drm" - "char-kfd" - ]; - DevicePolicy = "closed"; - LockPersonality = true; - MemoryDenyWriteExecute = true; - NoNewPrivileges = true; - PrivateDevices = false; # hides acceleration devices - PrivateTmp = true; - PrivateUsers = true; - ProcSubset = "all"; # /proc/meminfo - ProtectClock = true; - ProtectControlGroups = true; - ProtectHome = true; - ProtectHostname = true; - ProtectKernelLogs = true; - ProtectKernelModules = true; - ProtectKernelTunables = true; - ProtectProc = "invisible"; - ProtectSystem = "strict"; - RemoveIPC = true; - RestrictNamespaces = true; - RestrictRealtime = true; - RestrictSUIDSGID = true; - RestrictAddressFamilies = [ - "AF_INET" - "AF_INET6" - "AF_UNIX" - ]; - SupplementaryGroups = [ "render" ]; # for rocm to access /dev/dri/renderD* devices - SystemCallArchitectures = "native"; - SystemCallFilter = [ - "@system-service @resources" - "~@privileged" - ]; - UMask = "0077"; - }; + CapabilityBoundingSet = [ "" ]; + DeviceAllow = [ + # CUDA + # https://docs.nvidia.com/dgx/pdf/dgx-os-5-user-guide.pdf + "char-nvidiactl" + "char-nvidia-caps" + "char-nvidia-uvm" + # ROCm + "char-drm" + "char-kfd" + ]; + DevicePolicy = "closed"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = false; # hides acceleration devices + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "all"; # /proc/meminfo + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + SupplementaryGroups = [ "render" ]; # for rocm to access /dev/dri/renderD* devices + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service @resources" + "~@privileged" + ]; + UMask = "0077"; + }; postStart = mkBefore '' set -x export OLLAMA_HOST=${lib.escapeShellArg cfg.host}:${builtins.toString cfg.port} @@ -242,5 +265,8 @@ in environment.systemPackages = [ ollamaPackage ]; }; - meta.maintainers = with lib.maintainers; [ abysssol onny ]; + meta.maintainers = with lib.maintainers; [ + abysssol + onny + ]; } From 339d0cd68c5135bf6dbde360b46570324f8e3685 Mon Sep 17 00:00:00 2001 From: abysssol Date: Tue, 23 Jul 2024 23:05:25 -0400 Subject: [PATCH 37/47] nixos/ollama: update `.git-blame-ignore-revs` --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index e8d367705d3b..f6ffeb9b122a 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -150,3 +150,6 @@ ff5c8f6cc3d1f2e017e86d50965c14b71f00567b # ollama: format with nixfmt-rfc-style (#329353) bdfde18037f8d9f9b641a4016c8ada4dc4cbf856 + +# nixos/ollama: format with nixfmt-rfc-style (#329561) +246d1ee533810ac1946d863bbd9de9b525818d56 From 084f6a3e260a9576c955137ff44b2e6d4fac6891 Mon Sep 17 00:00:00 2001 From: abysssol Date: Tue, 23 Jul 2024 22:26:43 -0400 Subject: [PATCH 38/47] nixos/ollama: make `rocmOverrideGfx` backward compatible The initial version of `rocmOverrideGfx` incorrectly used `lib.mkIf` in an attempt to prevent interference with previous uses of `environmentVariables.HSA_OVERRIDE_GFX_VERSION`. However, the effect was actually to simply erase existing definitions of `HSA_OVERRIDE_GFX_VERSION` until `rocmOverrideGfx` was set, which was the situation I was trying to avoid in the first place. This fixes the bug by switching from `lib.mkIf` to `lib.optionalAttrs`. --- nixos/modules/services/misc/ollama.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/misc/ollama.nix b/nixos/modules/services/misc/ollama.nix index d545b15e5e1a..06c4869ec7bb 100644 --- a/nixos/modules/services/misc/ollama.nix +++ b/nixos/modules/services/misc/ollama.nix @@ -184,12 +184,16 @@ in description = "Server for local large language models"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; - environment = cfg.environmentVariables // { - HOME = cfg.home; - OLLAMA_MODELS = cfg.models; - OLLAMA_HOST = "${cfg.host}:${toString cfg.port}"; - HSA_OVERRIDE_GFX_VERSION = lib.mkIf (cfg.rocmOverrideGfx != null) cfg.rocmOverrideGfx; - }; + environment = + cfg.environmentVariables + // { + HOME = cfg.home; + OLLAMA_MODELS = cfg.models; + OLLAMA_HOST = "${cfg.host}:${toString cfg.port}"; + } + // lib.optionalAttrs (cfg.rocmOverrideGfx != null) { + HSA_OVERRIDE_GFX_VERSION = cfg.rocmOverrideGfx; + }; serviceConfig = lib.optionalAttrs staticUser { User = cfg.user; From e461b1584eb87289bfb1c957038ce7339835980c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 23 Jul 2024 22:45:16 +0200 Subject: [PATCH 39/47] python311Packages.huggingface-hub: 0.23.5 -> 0.24.2 Diff: https://github.com/huggingface/huggingface_hub/compare/refs/tags/v0.23.5...v0.24.2 Changelog: https://github.com/huggingface/huggingface_hub/releases/tag/v0.24.2 --- pkgs/development/python-modules/huggingface-hub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index 7a01170a8ba6..4d9045e78668 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.23.5"; + version = "0.24.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "huggingface_hub"; rev = "refs/tags/v${version}"; - hash = "sha256-Nncyi9u72aq1142wBpz3M/ji2GlCbdEqCZ9+kRRnMT4="; + hash = "sha256-tbv5ri37udhx9qhPhCRFe0GOc62n0e7uF0EjDpF2TIQ="; }; build-system = [ setuptools ]; From 86f0eda71c32da0048eab26b45d78a80064e42f3 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 23 Jul 2024 22:50:35 +0200 Subject: [PATCH 40/47] python311Packages.transformers: 4.42.4 -> 4.43.2 Diff: https://github.com/huggingface/transformers/compare/v4.42.4...v4.43.2 Changelog: https://github.com/huggingface/transformers/releases/tag/v4.43.2 --- .../python-modules/transformers/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 54c5e7978682..976d3a0c2bc7 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -3,8 +3,11 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, + + # build-system setuptools, - # propagated build inputs + + # dependencies filelock, huggingface-hub, numpy, @@ -16,7 +19,8 @@ tokenizers, safetensors, tqdm, - # optional dependencies + + # optional-dependencies diffusers, scikit-learn, tensorflow, @@ -55,7 +59,7 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.42.4"; + version = "4.43.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -64,7 +68,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-v5p63D8j1CNx3dCPa121auny5StEUpNK9IkPSugzAjg="; + hash = "sha256-TOuwdmuHUW/RoYl7XYLjjBuz7nAuvJWigka2Bf7yNuQ="; }; build-system = [ setuptools ]; @@ -82,7 +86,7 @@ buildPythonPackage rec { tqdm ]; - passthru.optional-dependencies = + optional-dependencies = let audio = [ librosa From fbfbd547fa40abd4238844e138167b207e819314 Mon Sep 17 00:00:00 2001 From: jaredmontoya <49511278+jaredmontoya@users.noreply.github.com> Date: Tue, 23 Jul 2024 23:39:16 +0200 Subject: [PATCH 41/47] coulr: init at 2.1.0 --- pkgs/by-name/co/coulr/package.nix | 71 +++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 pkgs/by-name/co/coulr/package.nix diff --git a/pkgs/by-name/co/coulr/package.nix b/pkgs/by-name/co/coulr/package.nix new file mode 100644 index 000000000000..c7db6a671b15 --- /dev/null +++ b/pkgs/by-name/co/coulr/package.nix @@ -0,0 +1,71 @@ +{ + lib, + fetchFromGitHub, + python3, + wrapGAppsHook4, + pkg-config, + meson, + ninja, + appstream-glib, + desktop-file-utils, + gobject-introspection, + libadwaita, + libportal-gtk4, + libnotify, + nix-update-script, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "coulr"; + version = "2.1.0"; + + pyproject = false; + dontWrapGApps = true; + + src = fetchFromGitHub { + owner = "Huluti"; + repo = "Coulr"; + rev = version; + hash = "sha256-1xnL5AWl/rLQu3i9m6uxbS4QT+690hmEW8kYTwkg7Gw="; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + appstream-glib + desktop-file-utils + gobject-introspection + wrapGAppsHook4 + ]; + + buildInputs = [ + libadwaita + libportal-gtk4 + libnotify + ]; + + dependencies = [ python3.pkgs.pygobject3 ]; + + postPatch = '' + patchShebangs build-aux/meson/postinstall.py + substituteInPlace build-aux/meson/postinstall.py \ + --replace-fail gtk-update-icon-cache gtk4-update-icon-cache + ''; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Color box to help developers and designers"; + homepage = "https://github.com/Huluti/Coulr"; + changelog = "https://github.com/Huluti/Coulr/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jaredmontoya ]; + mainProgram = "coulr"; + platforms = lib.platforms.linux; + }; +} From 01a69e5619da6436a8c7ec852731e26db7bc454b Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 25 Jul 2024 01:22:21 +0200 Subject: [PATCH 42/47] pcsx2-bin: simplify updateScript --- pkgs/by-name/pc/pcsx2-bin/package.nix | 3 ++- pkgs/by-name/pc/pcsx2-bin/update.sh | 8 -------- 2 files changed, 2 insertions(+), 9 deletions(-) delete mode 100755 pkgs/by-name/pc/pcsx2-bin/update.sh diff --git a/pkgs/by-name/pc/pcsx2-bin/package.nix b/pkgs/by-name/pc/pcsx2-bin/package.nix index cb38ebac1c76..db8ddcb957db 100644 --- a/pkgs/by-name/pc/pcsx2-bin/package.nix +++ b/pkgs/by-name/pc/pcsx2-bin/package.nix @@ -3,6 +3,7 @@ stdenvNoCC, fetchurl, makeWrapper, + nix-update-script, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -30,7 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; passthru = { - updateScript = ./update.sh; + updateScript = nix-update-script { }; }; meta = { diff --git a/pkgs/by-name/pc/pcsx2-bin/update.sh b/pkgs/by-name/pc/pcsx2-bin/update.sh deleted file mode 100755 index 0450ad205744..000000000000 --- a/pkgs/by-name/pc/pcsx2-bin/update.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq gnused common-updater-scripts - -set -eou pipefail - -LATEST_VERSION="$(curl --silent --fail ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/PCSX2/pcsx2/releases" | jq '.[0].tag_name' --raw-output | sed 's/^v//')" - -update-source-version pcsx2-bin "$LATEST_VERSION" From b52e9d5dbdd3dfb87e01d595c4f5b34f767d452a Mon Sep 17 00:00:00 2001 From: Allen Conlon Date: Sun, 21 Jul 2024 15:33:56 -0400 Subject: [PATCH 43/47] zarf: add shell completion --- .../applications/networking/cluster/zarf/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/applications/networking/cluster/zarf/default.nix b/pkgs/applications/networking/cluster/zarf/default.nix index 2f28b3fc9587..8e74c7564683 100644 --- a/pkgs/applications/networking/cluster/zarf/default.nix +++ b/pkgs/applications/networking/cluster/zarf/default.nix @@ -1,6 +1,8 @@ { lib , buildGoModule , fetchFromGitHub +, installShellFiles +, stdenv }: buildGoModule rec { @@ -17,6 +19,8 @@ buildGoModule rec { vendorHash = "sha256-+3VYBvcA8TzO9uBl0863uATOavPY9cjt8xtgW7N7C4w="; proxyVendor = true; + nativeBuildInputs = [ installShellFiles ]; + preBuild = '' mkdir -p build/ui touch build/ui/index.html @@ -26,6 +30,14 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X" "github.com/defenseunicorns/zarf/src/config.CLIVersion=${src.rev}" "-X" "k8s.io/component-base/version.gitVersion=v0.0.0+zarf${src.rev}" "-X" "k8s.io/component-base/version.gitCommit=${src.rev}" "-X" "k8s.io/component-base/version.buildDate=1970-01-01T00:00:00Z" ]; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + export K9S_LOGS_DIR=$(mktemp -d) + installShellCompletion --cmd zarf \ + --bash <($out/bin/zarf completion --no-log-file bash) \ + --fish <($out/bin/zarf completion --no-log-file fish) \ + --zsh <($out/bin/zarf completion --no-log-file zsh) + ''; + meta = with lib; { description = "DevSecOps for Air Gap & Limited-Connection Systems. https://zarf.dev"; mainProgram = "zarf"; From 0bb31825c5f191b24ed5ee79c13b3205690445f1 Mon Sep 17 00:00:00 2001 From: kfollesdal Date: Thu, 25 Jul 2024 04:27:34 +0200 Subject: [PATCH 44/47] python3Packages.databricks-sql-connector: 3.2.0 -> 3.3.0, unbreak (#329134) --- .../databricks-sql-connector/default.nix | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/databricks-sql-connector/default.nix b/pkgs/development/python-modules/databricks-sql-connector/default.nix index 00a67be18575..9bce12ae9e2b 100644 --- a/pkgs/development/python-modules/databricks-sql-connector/default.nix +++ b/pkgs/development/python-modules/databricks-sql-connector/default.nix @@ -12,27 +12,40 @@ pyarrow, pytestCheckHook, pythonOlder, + pythonAtLeast, sqlalchemy, thrift, + requests, + urllib3, + fetchpatch, }: buildPythonPackage rec { pname = "databricks-sql-connector"; - version = "3.2.0"; + version = "3.3.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + # Depends on thrift that at the moment do not work in Python 3.12 + # see PR 328415 fix this. + disabled = pythonOlder "3.7" || pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "databricks"; repo = "databricks-sql-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Sk/tYgFnWWHAsMSHhEUIwUagc6femAzQpQGyzJGXW1E="; + hash = "sha256-a3OeKJ3c2UCClsPMah7iJY2YvIVLfHmmBuHAx8vdXZs="; }; + patches = [ + (fetchpatch { + name = "fix-pandas.patch"; + url = "https://patch-diff.githubusercontent.com/raw/databricks/databricks-sql-python/pull/416.patch"; + sha256 = "sha256-sNCp8xSSmKP2yNzDK4wyWC5Hoe574AeHnKTeNcIxaek="; + }) + ]; + pythonRelaxDeps = [ - "numpy" - "thrift" + "pyarrow" ]; nativeBuildInputs = [ @@ -49,6 +62,8 @@ buildPythonPackage rec { pyarrow sqlalchemy thrift + requests + urllib3 ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -63,8 +78,5 @@ buildPythonPackage rec { changelog = "https://github.com/databricks/databricks-sql-python/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ harvidsen ]; - # No SQLAlchemy 2.0 support - # https://github.com/databricks/databricks-sql-python/issues/91 - broken = true; }; } From 8aa86c4650a34a33834dfc3ab406b03936f9d9ea Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Thu, 25 Jul 2024 00:29:47 -0300 Subject: [PATCH 45/47] emacsPackages.color-theme-solarized: remove color-theme dependency --- .../manual-packages/color-theme-solarized/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/default.nix index f8ff5ef966d0..7c047fe32f4e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/default.nix @@ -1,6 +1,5 @@ { lib, - color-theme, fetchFromGitHub, melpaBuild, unstableGitUpdater, @@ -17,8 +16,6 @@ melpaBuild { hash = "sha256-7E8r56dzfD06tsQEnqU5mWSbwz9x9QPbzken2J/fhlg="; }; - packageRequires = [ color-theme ]; - passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { From afd2f214b0387394bd4a5f4d339ceaf08f271a42 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Wed, 24 Jul 2024 21:21:39 -0700 Subject: [PATCH 46/47] llvmPackages_git.compiler-rt: fix darwin patch (#329796) --- pkgs/development/compilers/llvm/common/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index a7de2bb2041c..b84fcab17f1b 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -595,7 +595,8 @@ let ++ lib.optional (lib.versionAtLeast metadata.release_version "19") ( fetchpatch { url = "https://github.com/llvm/llvm-project/pull/99837/commits/14ae0a660a38e1feb151928a14f35ff0f4487351.patch"; - hash = "sha256-1CkA+RzI+645uG/QXsmOMKrLAjhVpfLUjNtgZ0QTv1E="; + hash = "sha256-JykABCaNNhYhZQxCvKiBn54DZ5ZguksgCHnpdwWF2no="; + relative = "compiler-rt"; } ); in From f5fd8730397b9951d24de58f51a5e9cb327e2a85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 25 Jul 2024 04:02:38 +0000 Subject: [PATCH 47/47] terraform: 1.9.2 -> 1.9.3 --- pkgs/applications/networking/cluster/terraform/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 84a740fb71de..e0c67b209347 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -165,9 +165,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.9.2"; - hash = "sha256-g1CsDWjwjBVfSNFZ9PRGlPlJOrqXP2eMYk1P+ohtYNU="; - vendorHash = "sha256-cPWJtrGad8VsvyjJHQwpfDitsJY/Q0iCtp1MRyzGT+U="; + version = "1.9.3"; + hash = "sha256-5xtTjT+AP7Db3bhzhHkzmRIJpJB3UFZs+4cTgDB7Ihc="; + vendorHash = "sha256-FnjCJilPuhYs/JTuEyb4Grn4t40Ox2uqwQf2h9B227Q="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins;