From f0591af948ba067d10ff69aaa05e2bdccce7f88d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Sep 2024 19:59:17 +0000 Subject: [PATCH 001/108] python312Packages.annexremote: 1.6.5 -> 1.6.6 --- pkgs/development/python-modules/annexremote/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/annexremote/default.nix b/pkgs/development/python-modules/annexremote/default.nix index 8b133595ebbd..3cc5eaf4b693 100644 --- a/pkgs/development/python-modules/annexremote/default.nix +++ b/pkgs/development/python-modules/annexremote/default.nix @@ -3,26 +3,23 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, - pythonOlder, setuptools, setuptools-scm, }: buildPythonPackage rec { pname = "annexremote"; - version = "1.6.5"; + version = "1.6.6"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "Lykos153"; repo = "AnnexRemote"; rev = "refs/tags/v${version}"; - hash = "sha256-8WAa5EO5n/dccNW0TUwFgcRjvDFt8QfpHIX2arM4HGc="; + hash = "sha256-RShDcqAjG+ujGzWu5S9za24WSsIWctqi3nWQ8EU4DTo="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; From d4cb98bd4ff0896db581116524501e55a89c99f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Oct 2024 14:37:39 +0000 Subject: [PATCH 002/108] qlog: 0.38.0 -> 0.39.0 --- pkgs/applications/radio/qlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/qlog/default.nix b/pkgs/applications/radio/qlog/default.nix index dacdfcbb2704..f6a224378f21 100644 --- a/pkgs/applications/radio/qlog/default.nix +++ b/pkgs/applications/radio/qlog/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "qlog"; - version = "0.38.0"; + version = "0.39.0"; src = fetchFromGitHub { owner = "foldynl"; repo = "QLog"; rev = "v${version}"; - hash = "sha256-C9kXntcCUaEl/S1ypZrU0ZPfaJbzg6/aXJSC+TREmhc="; + hash = "sha256-W+Ftc97/lI49rUItVhCb9W9mxcCElED/oZxefgIDqyM="; fetchSubmodules = true; }; From 93e0ab3c24282ed1e3430a5303ee281bc8458375 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Tue, 8 Oct 2024 14:54:31 +0200 Subject: [PATCH 003/108] proxmox-auto-install-assistant: init at 8.2.6 Signed-off-by: Christoph Heiss --- .../proxmox-auto-install-assistant/Cargo.lock | 1667 +++++++++++++++++ .../package.nix | 47 + 2 files changed, 1714 insertions(+) create mode 100644 pkgs/by-name/pr/proxmox-auto-install-assistant/Cargo.lock create mode 100644 pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix diff --git a/pkgs/by-name/pr/proxmox-auto-install-assistant/Cargo.lock b/pkgs/by-name/pr/proxmox-auto-install-assistant/Cargo.lock new file mode 100644 index 000000000000..ae850ced93c7 --- /dev/null +++ b/pkgs/by-name/pr/proxmox-auto-install-assistant/Cargo.lock @@ -0,0 +1,1667 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "anstream" +version = "0.6.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" + +[[package]] +name = "anstyle-parse" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" + +[[package]] +name = "autocfg" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "cc" +version = "1.1.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1" +dependencies = [ + "shlex", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "4.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.5.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" + +[[package]] +name = "colorchoice" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "cpufeatures" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "cursive" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5438eb16bdd8af51b31e74764fef5d0a9260227a5ec82ba75c9d11ce46595839" +dependencies = [ + "ahash", + "cfg-if", + "crossbeam-channel", + "cursive_core", + "lazy_static", + "libc", + "log", + "signal-hook", + "termion", + "unicode-segmentation", + "unicode-width", +] + +[[package]] +name = "cursive_core" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4db3b58161228d0dcb45c7968c5e74c3f03ad39e8983e58ad7d57061aa2cd94d" +dependencies = [ + "ahash", + "crossbeam-channel", + "enum-map", + "enumset", + "lazy_static", + "log", + "num", + "owning_ref", + "time", + "unicode-segmentation", + "unicode-width", + "xi-unicode", +] + +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "enum-map" +version = "2.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6866f3bfdf8207509a033af1a75a7b08abda06bbaaeae6669323fd5a097df2e9" +dependencies = [ + "enum-map-derive", +] + +[[package]] +name = "enum-map-derive" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "enumset" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d07a4b049558765cef5f0c1a273c3fc57084d768b44d2f98127aef4cceb17293" +dependencies = [ + "enumset_derive", +] + +[[package]] +name = "enumset_derive" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59c3b24c345d8c314966bdc1832f6c2635bfcce8e7cf363bd115987bba2ee242" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "fastrand" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" + +[[package]] +name = "flate2" +version = "1.0.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "js-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libc" +version = "0.2.159" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[package]] +name = "native-tls" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset", + "pin-utils", +] + +[[package]] +name = "num" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" +dependencies = [ + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + +[[package]] +name = "numtoa" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" + +[[package]] +name = "once_cell" +version = "1.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" + +[[package]] +name = "openssl" +version = "0.10.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "owning_ref" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce" +dependencies = [ + "stable_deref_trait", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "proc-macro2" +version = "1.0.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "proxmox-auto-install-assistant" +version = "8.2.6" +dependencies = [ + "anyhow", + "clap", + "glob", + "log", + "proxmox-auto-installer", + "regex", + "serde", + "serde_json", + "toml", +] + +[[package]] +name = "proxmox-auto-installer" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap", + "glob", + "log", + "proxmox-installer-common", + "regex", + "serde", + "serde_json", + "serde_plain", + "toml", +] + +[[package]] +name = "proxmox-chroot" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap", + "nix", + "proxmox-installer-common", + "regex", + "serde_json", +] + +[[package]] +name = "proxmox-fetch-answer" +version = "0.1.0" +dependencies = [ + "anyhow", + "hex", + "log", + "native-tls", + "proxmox-auto-installer", + "rustls 0.20.9", + "rustls-native-certs 0.6.3", + "sha2", + "toml", + "ureq", +] + +[[package]] +name = "proxmox-installer-common" +version = "0.1.0" +dependencies = [ + "regex", + "serde", + "serde_json", +] + +[[package]] +name = "proxmox-tui-installer" +version = "0.1.0" +dependencies = [ + "cursive", + "proxmox-installer-common", + "regex", + "serde", + "serde_json", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_termios" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20145670ba436b55d91fc92d25e71160fbfbdd57831631c8d7d36377a476f1cb" + +[[package]] +name = "regex" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin 0.5.2", + "untrusted 0.7.1", + "web-sys", + "winapi", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustix" +version = "0.38.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" +dependencies = [ + "log", + "ring 0.16.20", + "sct", + "webpki", +] + +[[package]] +name = "rustls" +version = "0.23.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8" +dependencies = [ + "log", + "once_cell", + "ring 0.17.8", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile 1.0.4", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-native-certs" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.2.0", + "rustls-pki-types", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + +[[package]] +name = "rustls-pemfile" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55" + +[[package]] +name = "rustls-webpki" +version = "0.102.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +dependencies = [ + "ring 0.17.8", + "rustls-pki-types", + "untrusted 0.9.0", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "schannel" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring 0.17.8", + "untrusted 0.9.0", +] + +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "serde" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.128" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_plain" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1fc6db65a611022b23a0dec6975d63fb80a302cb3388835ff02c097258d50" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" +dependencies = [ + "serde", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "syn" +version = "2.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" +dependencies = [ + "cfg-if", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "termion" +version = "1.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e" +dependencies = [ + "libc", + "numtoa", + "redox_syscall", + "redox_termios", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "libc", + "num-conv", + "num_threads", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "toml" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "unicode-bidi" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" + +[[package]] +name = "unicode-ident" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + +[[package]] +name = "unicode-normalization" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + +[[package]] +name = "unicode-width" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "ureq" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" +dependencies = [ + "base64 0.22.1", + "flate2", + "log", + "native-tls", + "once_cell", + "rustls 0.23.14", + "rustls-native-certs 0.7.3", + "rustls-pki-types", + "url", + "webpki-roots", +] + +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" + +[[package]] +name = "web-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" +dependencies = [ + "ring 0.17.8", + "untrusted 0.9.0", +] + +[[package]] +name = "webpki-roots" +version = "0.26.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "xi-unicode" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" diff --git a/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix b/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix new file mode 100644 index 000000000000..d161ab4ab0f3 --- /dev/null +++ b/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix @@ -0,0 +1,47 @@ +{ + lib, + fetchgit, + rustPlatform, + testers, + proxmox-auto-install-assistant, +}: + +rustPlatform.buildRustPackage rec { + pname = "proxmox-auto-install-assistant"; + version = "8.2.6"; + + src = fetchgit { + url = "git://git.proxmox.com/git/pve-installer.git"; + rev = "c339618cbdcbce378bf192e01393a60903fe2b04"; + hash = "sha256-nF2FpzXeoPIB+dW92HAI+EJZuMJxlnD012Yu3hL9OvU="; + }; + + postPatch = '' + rm -v .cargo/config.toml + cp -v ${./Cargo.lock} Cargo.lock + # fix up hard-coded version number to match that of the debian package + substituteInPlace proxmox-auto-install-assistant/Cargo.toml \ + --replace-fail 'version = "0.1.0"' 'version = "${version}"' + ''; + + buildAndTestSubdir = "proxmox-auto-install-assistant"; + + cargoLock.lockFile = ./Cargo.lock; + + passthru.tests.version = testers.testVersion { package = proxmox-auto-install-assistant; }; + + meta = { + description = "Tool to prepare a Proxmox installation ISO for automated installations"; + longDescription = '' + This tool can be used to prepare a Proxmox installation ISO for automated installations. + Additional uses are to validate the format of an answer file or to test match filters and + print information on the properties to match against for the current hardware + ''; + homepage = "https://pve.proxmox.com/wiki/Automated_Installation"; + changelog = "https://git.proxmox.com/?p=pve-installer.git;a=blob;f=debian/changelog"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ christoph-heiss ]; + platforms = lib.platforms.linux; + mainProgram = "proxmox-auto-install-assistant"; + }; +} From 79a2983ffb16957569192a75271cf97079aa461b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Oct 2024 06:39:37 +0000 Subject: [PATCH 004/108] ocamlPackages.ocf: 0.8.0 -> 0.9.0 --- pkgs/development/ocaml-modules/ocf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocf/default.nix b/pkgs/development/ocaml-modules/ocf/default.nix index 5e3c76be1a33..137589308e2b 100644 --- a/pkgs/development/ocaml-modules/ocf/default.nix +++ b/pkgs/development/ocaml-modules/ocf/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "ocf"; - version = "0.8.0"; + version = "0.9.0"; duneVersion = "3"; minimalOCamlVersion = "4.03"; src = fetchFromGitLab { @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "zoggy"; repo = "ocf"; rev = version; - sha256 = "sha256:00ap3q5yjqmpk87lxqv1j2wkc7583ynhjr1jjrfn9r0j2h9pfd60"; + sha256 = "sha256-tTNpvncLO/WfcMbjqRfqzcdPv2Bd877fOU5AZlkkcXA="; }; propagatedBuildInputs = [ yojson ]; From 5082384e7d8c5705a3fe92787db8c88aad2f6ac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sun, 13 Oct 2024 18:44:25 +0200 Subject: [PATCH 005/108] networkd: add missing option SendHostname and Hostname for dhcpV6Config --- nixos/modules/system/boot/networkd.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 94a5de7e2bd4..08bf011d28e1 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -909,7 +909,9 @@ let "UseAddress" "UseDNS" "UseNTP" + "SendHostname" "UseHostname" + "Hostname" "UseDomains" "RouteMetric" "RapidCommit" @@ -930,6 +932,7 @@ let (assertValueOneOf "UseAddress" boolValues) (assertValueOneOf "UseDNS" boolValues) (assertValueOneOf "UseNTP" boolValues) + (assertValueOneOf "SendHostname" boolValues) (assertValueOneOf "UseHostname" boolValues) (assertValueOneOf "UseDomains" (boolValues ++ ["route"])) (assertInt "RouteMetric") From f73a47fb19cd5020478d23b27657f2b0056edbd8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Oct 2024 17:07:05 +0000 Subject: [PATCH 006/108] pure-ftpd: 1.0.51 -> 1.0.52 --- pkgs/servers/ftp/pure-ftpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/ftp/pure-ftpd/default.nix b/pkgs/servers/ftp/pure-ftpd/default.nix index dc48785c1c66..22a7d65fc1c3 100644 --- a/pkgs/servers/ftp/pure-ftpd/default.nix +++ b/pkgs/servers/ftp/pure-ftpd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pure-ftpd"; - version = "1.0.51"; + version = "1.0.52"; src = fetchurl { url = "https://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${version}.tar.gz"; - sha256 = "sha256-QWD2a3ZhXuojl+rE6j8KFGt5KCB7ebxMwvma17e9lRM="; + sha256 = "sha256-ESbzqVhW0IiJ/4lwPLGqnsmSTZOdFU6WkEySDwXcPHQ="; }; buildInputs = [ openssl pam libxcrypt ]; From c3702008df667885d4bf8b0d5bc882e4f4d6106c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Oct 2024 22:59:34 +0000 Subject: [PATCH 007/108] hivex: 1.3.23 -> 1.3.24 --- pkgs/development/libraries/hivex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index c85790408bdd..d31e57b6c228 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "hivex"; - version = "1.3.23"; + version = "1.3.24"; src = fetchurl { url = "https://libguestfs.org/download/hivex/${pname}-${version}.tar.gz"; - hash = "sha256-QM9UhPFclGciWfs7makL7285DmPzelKhwGgIogFqa70="; + hash = "sha256-pS+kXOzJp4rbLShgXWgmHk8f1FFKd4pUcwE9LMyKGTw="; }; patches = [ ./hivex-syms.patch ]; From 548654ce32bac6d9c9084e6f2754b8240f21fc19 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Oct 2024 03:34:51 +0200 Subject: [PATCH 008/108] yaffshiv: init at 0-unstable-2024-08-30 --- pkgs/by-name/ya/yaffshiv/package.nix | 32 ++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pkgs/by-name/ya/yaffshiv/package.nix diff --git a/pkgs/by-name/ya/yaffshiv/package.nix b/pkgs/by-name/ya/yaffshiv/package.nix new file mode 100644 index 000000000000..2b319ad44d0a --- /dev/null +++ b/pkgs/by-name/ya/yaffshiv/package.nix @@ -0,0 +1,32 @@ +{ + lib, + stdenv, + fetchFromGitHub, + python3, +}: + +stdenv.mkDerivation { + pname = "yaffshiv"; + version = "0-unstable-2024-08-30"; + + src = fetchFromGitHub { + owner = "devttys0"; + repo = "yaffshiv"; + rev = "f6f0ef77bf79ca46aaa77bc34eda06e7b55da8e8"; + sha256 = "sha256-C43UzkaPKheexvVcKi/Krcik+arPXggWAYMSi9RY5eo="; + }; + + buildInputs = [ python3 ]; + + installPhase = '' + install -D -m755 src/yaffshiv $out/bin/yaffshiv + ''; + + meta = { + description = "Simple YAFFS file system parser and extractor"; + homepage = "https://github.com/devttys0/yaffshiv"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sgo ]; + mainProgram = "yaffshiv"; + }; +} From 681b468aa241143a9d028a89c1b776d1a5b4e50f Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Oct 2024 03:46:32 +0200 Subject: [PATCH 009/108] binwalk: add yaffshiv for YAFFS support --- pkgs/development/python-modules/binwalk/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index 024bd4d2dea3..e9586af7cb28 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -20,6 +20,7 @@ pyqtgraph, pyqt5, pytestCheckHook, + yaffshiv, visualizationSupport ? false, }: @@ -49,6 +50,7 @@ buildPythonPackage rec { squashfsTools xz pycrypto + yaffshiv ] ++ lib.optionals visualizationSupport [ matplotlib From ed281f83685241fc25ed0a1bb37198479b0142a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Oct 2024 06:59:06 +0000 Subject: [PATCH 010/108] vkd3d: 1.12 -> 1.13 --- pkgs/by-name/vk/vkd3d/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vk/vkd3d/package.nix b/pkgs/by-name/vk/vkd3d/package.nix index eba5b7014300..b7835e8a9409 100644 --- a/pkgs/by-name/vk/vkd3d/package.nix +++ b/pkgs/by-name/vk/vkd3d/package.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "vkd3d"; - version = "1.12"; + version = "1.13"; src = fetchFromGitLab { domain = "gitlab.winehq.org"; owner = "wine"; repo = "vkd3d"; rev = "vkd3d-${finalAttrs.version}"; - hash = "sha256-9FNuWtfJJqkSZ3O11G22aNp8PfseLHH4oyL6MulNwMY="; + hash = "sha256-5G+cdK3rJWlEbJN7uPspPyTtjVk4v/sTg134tZo1CTI="; }; outputs = [ "out" "dev" "lib" ]; From 87f3b081886db7e3b123e5266ef5f054c2edeb29 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 16 Oct 2024 19:31:11 +0400 Subject: [PATCH 011/108] =?UTF-8?q?fittrackee:=200.8.9=20=E2=86=92=200.8.1?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/fi/fittrackee/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fi/fittrackee/package.nix b/pkgs/by-name/fi/fittrackee/package.nix index e12db808ac2d..b197539cc421 100644 --- a/pkgs/by-name/fi/fittrackee/package.nix +++ b/pkgs/by-name/fi/fittrackee/package.nix @@ -28,14 +28,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "fittrackee"; - version = "0.8.9"; + version = "0.8.10"; pyproject = true; src = fetchFromGitHub { owner = "SamR1"; repo = "FitTrackee"; rev = "refs/tags/v${version}"; - hash = "sha256-raN6Ef/Z/JbdJDMKBIaBL8nmvFwvuZFX4rfC0ZgWgKI="; + hash = "sha256-K110H5Y8vQrRx2/O+2ezhpGp4G5sJUlzE+1cSYu7+4I="; }; build-system = [ From 736094aec658c6238767beeefb9a1ea46a64c7f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Oct 2024 13:30:08 +0000 Subject: [PATCH 012/108] xml-security-c: 2.0.4 -> 3.0.0 --- pkgs/development/libraries/xml-security-c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix index d36804c6bce8..e198848d0fa2 100644 --- a/pkgs/development/libraries/xml-security-c/default.nix +++ b/pkgs/development/libraries/xml-security-c/default.nix @@ -15,12 +15,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "xml-security-c"; - version = "2.0.4"; + version = "3.0.0"; src = fetchgit { url = "https://git.shibboleth.net/git/cpp-xml-security"; rev = finalAttrs.version; - hash = "sha256-60A6LqUUGmoZMmIvhuZWjrZl6utp7WLhPe738oNd/AA="; + hash = "sha256-D60JtD4p9ERh6sowvwBHtE9XWVm3D8saooagDvA6ZtQ="; }; configureFlags = [ From af9a4001993091f54a541b4bd86c4701cf18868d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Oct 2024 15:33:51 +0000 Subject: [PATCH 013/108] python312Packages.pyclipper: 1.3.0.post5 -> 1.3.0.post6 --- pkgs/development/python-modules/pyclipper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyclipper/default.nix b/pkgs/development/python-modules/pyclipper/default.nix index edde76cd28d8..0b08fb4377bd 100644 --- a/pkgs/development/python-modules/pyclipper/default.nix +++ b/pkgs/development/python-modules/pyclipper/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyclipper"; - version = "1.3.0.post5"; + version = "1.3.0.post6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fonttools"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-FKpP+tgJFzhij3wDQsAgwrTNnny7lgmN+tlSQ9JgG+Q="; + hash = "sha256-s2D0ipDatAaF7A1RYOKyI31nkfc/WL3vHWsAMbo+WcY="; }; nativeBuildInputs = [ From 7ca98189e6a3f2d0b6aea0c48fa7d7b941dbe747 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 13:02:04 +0000 Subject: [PATCH 014/108] ocamlPackages.eliom: 11.0.0 -> 11.0.1 --- pkgs/development/ocaml-modules/eliom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 205fa78371fb..bb066aee32ee 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -17,13 +17,13 @@ buildDunePackage rec { pname = "eliom"; - version = "11.0.0"; + version = "11.0.1"; src = fetchFromGitHub { owner = "ocsigen"; repo = "eliom"; rev = version; - hash = "sha256-RgIK3xkKdX+zOurhML4370rsO4blJrWoEla09Nfe9Mw="; + hash = "sha256-SUzfJ1R/J0jKaMC0wmXB+sNfG1VfFaFbDJql1OPdRpg="; }; nativeBuildInputs = [ From f699630ccf2fe121553a51b56700ed696ec322ee Mon Sep 17 00:00:00 2001 From: wrvsrx Date: Fri, 25 Oct 2024 15:34:03 +0800 Subject: [PATCH 015/108] python3Packages.vdirsyncer: 0.19.2 -> 0.19.3 --- pkgs/development/python-modules/vdirsyncer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix index 7851df4a2971..e0a4e1353a57 100644 --- a/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "vdirsyncer"; - version = "0.19.2"; + version = "0.19.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/QWM7quCk0WaBGbNmw5Ks7OUYsbgiaDwrDfDB0INgro="; + hash = "sha256-5DeFH+uYXew1RGVPj5z23RCbCwP34ZlWCGYDCS/+so8="; }; postPatch = '' From ff9e35236c407f623e6f0c7ec6e0937e7a6d0cb1 Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Fri, 25 Oct 2024 09:41:50 -0700 Subject: [PATCH 016/108] haskell.mkDerivation: Support sourceRoot, setSourceRoot Allow setting `sourceRoot` and `setSourceRoot` in the arguments to `haskellPackages.mkDerivation`. These arguments are passed directly to `stdenv.mkDerivation`. It may be worth reading over `pkgs/stdenv/generic/setup.sh` and checking if there's other unsupported variables which may be useful. It may also be worth adding an argument like `extraAttrs` to be passed to `stdenv.mkDerivation` directly, as an escape hatch. --- doc/languages-frameworks/haskell.section.md | 4 ++++ pkgs/development/haskell-modules/generic-builder.nix | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index 247daf8d1dbe..3c2798c538d0 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -191,6 +191,10 @@ and `version` from Hackage. `sha256` : Hash to use for the default case of `src`. +`sourceRoot`, `setSourceRoot` +: Passed to `stdenv.mkDerivation`; see [“Variables controlling the unpack +phase”](#variables-controlling-the-unpack-phase). + `revision` : Revision number of the updated cabal file to fetch from Hackage. If `null` (which is the default value), the one included in `src` is used. diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 92c2451a5df1..14afa3dfe6b4 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -34,6 +34,8 @@ in , version, revision ? null , sha256 ? null , src ? fetchurl { url = "mirror://hackage/${pname}-${version}.tar.gz"; inherit sha256; } +, sourceRoot ? null +, setSourceRoot ? null , buildDepends ? [], setupHaskellDepends ? [], libraryHaskellDepends ? [], executableHaskellDepends ? [] , buildTarget ? "" , buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? [], benchmarkToolDepends ? [] @@ -825,6 +827,8 @@ stdenv.mkDerivation ({ ; } +// optionalAttrs (args ? sourceRoot) { inherit sourceRoot; } +// optionalAttrs (args ? setSourceRoot) { inherit setSourceRoot; } // optionalAttrs (args ? preCompileBuildDriver) { inherit preCompileBuildDriver; } // optionalAttrs (args ? postCompileBuildDriver) { inherit postCompileBuildDriver; } // optionalAttrs (args ? preUnpack) { inherit preUnpack; } From 178e42029f406152cc3dc57a14e2ab17eb745276 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Oct 2024 10:15:46 +0200 Subject: [PATCH 017/108] python312Packages.google-cloud-artifact-registry: 1.11.5 -> 1.12.0 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-artifact-registry-v1.12.0/packages/google-cloud-artifact-registry/CHANGELOG.md --- .../python-modules/google-cloud-artifact-registry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix index 3f4a7b9e52ff..c67815b9d7ab 100644 --- a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix +++ b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-artifact-registry"; - version = "1.11.5"; + version = "1.12.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_artifact_registry"; inherit version; - hash = "sha256-lNWDbgu9DDNRSh7cC1TfiYvy237bH16QduskPzQt9Mg="; + hash = "sha256-XuPps4IBJxIfF+9qmqDYzZDw3BOrZeVUznk/3af33XQ="; }; build-system = [ setuptools ]; From 53ccc5e51593694072d887e58f58175d07c0c9a8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Oct 2024 10:18:26 +0200 Subject: [PATCH 018/108] python312Packages.google-cloud-compute: 1.19.2 -> 1.20.0 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-compute-v1.20.0/packages/google-cloud-compute/CHANGELOG.md --- .../python-modules/google-cloud-compute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-compute/default.nix b/pkgs/development/python-modules/google-cloud-compute/default.nix index 7535e9f3f8c1..83e5ae9ea3d9 100644 --- a/pkgs/development/python-modules/google-cloud-compute/default.nix +++ b/pkgs/development/python-modules/google-cloud-compute/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-compute"; - version = "1.19.2"; + version = "1.20.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_compute"; inherit version; - hash = "sha256-P86Cq+FOdvqqgSNNmnvh5jSy7Yon9V/u/PKxRkZ/f6s="; + hash = "sha256-q32xYqLCWV+tpJKgBnAV3DDjWCxPFOTtbMdDNyHIcp0="; }; build-system = [ setuptools ]; From 0f1c874bb85623f77613f10163491bca7b5b2f65 Mon Sep 17 00:00:00 2001 From: Ondrej Telka Date: Sun, 27 Oct 2024 11:42:57 +0100 Subject: [PATCH 019/108] maintainers: add ondt --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4d959e70c68c..0c7a7d46a203 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16035,6 +16035,12 @@ githubId = 1538622; name = "Michael Reilly"; }; + ondt = { + name = "Ondrej Telka"; + email = "nix@ondt.dev"; + github = "ondt"; + githubId = 20520951; + }; onedragon = { name = "YiLong Liu"; email = "18922251299@163.com"; From c58ef65a1be68b5d35c1fe24595c9eaadbd3f2e7 Mon Sep 17 00:00:00 2001 From: Ondrej Telka Date: Sun, 27 Oct 2024 12:08:01 +0100 Subject: [PATCH 020/108] xtrlock-pam: python2 -> python3 --- pkgs/misc/screensavers/xtrlock-pam/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/screensavers/xtrlock-pam/default.nix b/pkgs/misc/screensavers/xtrlock-pam/default.nix index 25ac90175914..7c3bba246cb7 100644 --- a/pkgs/misc/screensavers/xtrlock-pam/default.nix +++ b/pkgs/misc/screensavers/xtrlock-pam/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python2, pkg-config, pam, xorg }: +{ lib, stdenv, fetchFromGitHub, python39, pkg-config, pam, xorg }: stdenv.mkDerivation { pname = "xtrlock-pam"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ python2 pam xorg.libX11 ]; + buildInputs = [ python39 pam xorg.libX11 ]; configurePhase = '' substituteInPlace .config/options.py --replace /usr/include/security/pam_appl.h ${pam}/include/security/pam_appl.h @@ -24,7 +24,7 @@ stdenv.mkDerivation { homepage = "https://github.com/aanatoly/xtrlock-pam"; description = "PAM based X11 screen locker"; license = "unknown"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ ondt ]; platforms = with lib.platforms; linux; }; } From 09db8040605c11ad67b80429e5efac8f21b6b3f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Oct 2024 01:44:47 +0000 Subject: [PATCH 021/108] dq: 20240101 -> 20241027 --- pkgs/tools/networking/dq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dq/default.nix b/pkgs/tools/networking/dq/default.nix index 94bf2cd5c3b2..93a260c1d90a 100644 --- a/pkgs/tools/networking/dq/default.nix +++ b/pkgs/tools/networking/dq/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dq"; - version = "20240101"; + version = "20241027"; src = fetchFromGitHub { owner = "janmojzis"; repo = "dq"; rev = "refs/tags/${version}"; - hash = "sha256-dN2QpQU2jRkSVzaYh2MKbJvx0J1XACHHjsM/ePvZAp8="; + hash = "sha256-aXNj2JsSCxp3+zTF2/7SAffrzwQH+3NCppxpnPCLT4o="; }; nativeBuildInputs = [ installShellFiles ]; From 2bad2a7aff2ad24c91c92f55618021597d1ceb9c Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 28 Oct 2024 14:38:56 +0400 Subject: [PATCH 022/108] dq: migrate to by-name --- .../networking/dq/default.nix => by-name/dq/dq/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/networking/dq/default.nix => by-name/dq/dq/package.nix} (100%) diff --git a/pkgs/tools/networking/dq/default.nix b/pkgs/by-name/dq/dq/package.nix similarity index 100% rename from pkgs/tools/networking/dq/default.nix rename to pkgs/by-name/dq/dq/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 46bc00824633..f50eefe868b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6972,8 +6972,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - dq = callPackage ../tools/networking/dq { }; - dool = callPackage ../tools/system/dool { }; dosfstools = callPackage ../tools/filesystems/dosfstools { }; From 1779edf359f103f1eb407fafc448c15ef407f923 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Oct 2024 06:25:09 +0000 Subject: [PATCH 023/108] jbrowse: 2.15.4 -> 2.16.0 --- pkgs/applications/science/biology/jbrowse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/jbrowse/default.nix b/pkgs/applications/science/biology/jbrowse/default.nix index 97c89adf8e73..d98527cc1e13 100644 --- a/pkgs/applications/science/biology/jbrowse/default.nix +++ b/pkgs/applications/science/biology/jbrowse/default.nix @@ -2,11 +2,11 @@ let pname = "jbrowse"; - version = "2.15.4"; + version = "2.16.0"; src = fetchurl { url = "https://github.com/GMOD/jbrowse-components/releases/download/v${version}/jbrowse-desktop-v${version}-linux.AppImage"; - sha256 = "sha256-ojIvC93dx9BSnUw7zBpDMBD0xPCMG4GUH1e5ZRGd9pk="; + sha256 = "sha256-Nf+Dp1XVXgY1+iih7/cvzxnfCKdgHz5kpefdMucrlIA="; }; appimageContents = appimageTools.extractType2 { From 7fb87169ef9e1101de2c76d564e7dd761b944640 Mon Sep 17 00:00:00 2001 From: Petr Portnov Date: Mon, 8 Jul 2024 20:55:49 +0300 Subject: [PATCH 024/108] gdbuspp: init at 1 --- pkgs/by-name/gd/gdbuspp/package.nix | 46 +++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 pkgs/by-name/gd/gdbuspp/package.nix diff --git a/pkgs/by-name/gd/gdbuspp/package.nix b/pkgs/by-name/gd/gdbuspp/package.nix new file mode 100644 index 000000000000..7dca39208964 --- /dev/null +++ b/pkgs/by-name/gd/gdbuspp/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + glib, + pkg-config, +}: + +stdenv.mkDerivation rec { + pname = "gdbuspp"; + version = "2"; + src = fetchFromGitHub { + owner = "OpenVPN"; + repo = "gdbuspp"; + rev = "refs/tags/v${version}"; + hash = "sha256-A0sl4zZa17zMec/jJASE8lDVNohzJzEGZbWjjsorB2Y="; + }; + + postPatch = '' + patchShebangs --build ./scripts/get-git-ref + ''; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ glib ]; + + meta = { + description = "GDBus++ - a glib2 D-Bus wrapper for C++"; + longDescription = '' + This library provides a simpler C++ based interface to implement D-Bus + into applications in a more C++ approach, based on the C++17 standard. + ''; + homepage = "https://codeberg.org/OpenVPN/gdbuspp"; + changelog = "https://codeberg.org/OpenVPN/gdbuspp/releases/tag/v${version}"; + license = lib.licenses.agpl3Only; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + maintainers = [ lib.maintainers.progrm_jarvis ]; + platforms = lib.platforms.linux; + }; +} From 279d00a8f540e235ad48585c6970c58de4a345da Mon Sep 17 00:00:00 2001 From: Petr Portnov Date: Mon, 8 Jul 2024 20:56:36 +0300 Subject: [PATCH 025/108] openvpn3: 20 -> 23 Co-authored-by: Yaroslav Bolyukin --- nixos/modules/programs/openvpn3.nix | 107 +++++++++++--- ...1-build-reduce-hardcode-in-asio_path.patch | 46 ++++++ ...stallation-directories-customization.patch | 115 +++++++++++++++ pkgs/by-name/op/openvpn3/package.nix | 135 ++++++++++++++++++ pkgs/tools/networking/openvpn3/default.nix | 123 ---------------- pkgs/top-level/all-packages.nix | 2 - 6 files changed, 382 insertions(+), 146 deletions(-) create mode 100644 pkgs/by-name/op/openvpn3/0001-build-reduce-hardcode-in-asio_path.patch create mode 100644 pkgs/by-name/op/openvpn3/0002-build-allow-installation-directories-customization.patch create mode 100644 pkgs/by-name/op/openvpn3/package.nix delete mode 100644 pkgs/tools/networking/openvpn3/default.nix diff --git a/nixos/modules/programs/openvpn3.nix b/nixos/modules/programs/openvpn3.nix index 10042b44471f..780f4d776322 100644 --- a/nixos/modules/programs/openvpn3.nix +++ b/nixos/modules/programs/openvpn3.nix @@ -1,29 +1,87 @@ { config, lib, pkgs, ... }: let + json = pkgs.formats.json { }; cfg = config.programs.openvpn3; -in -{ + + inherit (lib) mkEnableOption mkPackageOption mkOption literalExpression max options lists; + inherit (lib.types) bool submodule ints; +in { options.programs.openvpn3 = { - enable = lib.mkEnableOption "the openvpn3 client"; - package = lib.mkOption { - type = lib.types.package; - default = pkgs.openvpn3.override { - enableSystemdResolved = config.services.resolved.enable; + enable = mkEnableOption "the openvpn3 client"; + package = mkPackageOption pkgs "openvpn3" { }; + netcfg = mkOption { + description = "Network configuration"; + default = { }; + type = submodule { + options = { + settings = mkOption { + description = "Options stored in {file}`/etc/openvpn3/netcfg.json` configuration file"; + default = { }; + type = submodule { + freeformType = json.type; + options = { + systemd_resolved = mkOption { + type = bool; + description = "Whether to use systemd-resolved integration"; + default = config.services.resolved.enable; + defaultText = literalExpression "config.services.resolved.enable"; + example = false; + }; + }; + }; + }; + }; + }; + }; + log-service = mkOption { + description = "Log service configuration"; + default = { }; + type = submodule { + options = { + settings = mkOption { + description = "Options stored in {file}`/etc/openvpn3/log-service.json` configuration file"; + default = { }; + type = submodule { + freeformType = json.type; + options = { + journald = mkOption { + description = "Use systemd-journald"; + type = bool; + default = true; + example = false; + }; + log_dbus_details = mkOption { + description = "Add D-Bus details in log file/syslog"; + type = bool; + default = true; + example = false; + }; + log_level = mkOption { + description = "How verbose should the logging be"; + type = (ints.between 0 7) // { + merge = _loc: defs: + lists.foldl max 0 (options.getValues defs); + }; + default = 3; + example = 6; + }; + timestamp = mkOption { + description = "Add timestamp log file"; + type = bool; + default = false; + example = true; + }; + }; + }; + }; + }; }; - defaultText = lib.literalExpression ''pkgs.openvpn3.override { - enableSystemdResolved = config.services.resolved.enable; - }''; - description = '' - Which package to use for `openvpn3`. - ''; }; }; config = lib.mkIf cfg.enable { - services.dbus.packages = [ - cfg.package - ]; + services.dbus.packages = [ cfg.package ]; users.users.openvpn = { isSystemUser = true; @@ -31,13 +89,20 @@ in group = "openvpn"; }; - users.groups.openvpn = { - gid = config.ids.gids.openvpn; + users.groups.openvpn = { gid = config.ids.gids.openvpn; }; + + environment = { + systemPackages = [ cfg.package ]; + etc = { + "openvpn3/netcfg.json".source = + json.generate "netcfg.json" cfg.netcfg.settings; + "openvpn3/log-service.json".source = + json.generate "log-service.json" cfg.log-service.settings; + }; }; - environment.systemPackages = [ - cfg.package - ]; + systemd.packages = [ cfg.package ]; }; + meta.maintainers = with lib.maintainers; [ shamilton progrm_jarvis ]; } diff --git a/pkgs/by-name/op/openvpn3/0001-build-reduce-hardcode-in-asio_path.patch b/pkgs/by-name/op/openvpn3/0001-build-reduce-hardcode-in-asio_path.patch new file mode 100644 index 000000000000..bd289b0965ae --- /dev/null +++ b/pkgs/by-name/op/openvpn3/0001-build-reduce-hardcode-in-asio_path.patch @@ -0,0 +1,46 @@ +From 30b2528054e6627a7124ac04cb018356ef23d864 Mon Sep 17 00:00:00 2001 +From: Petr Portnov +Date: Mon, 2 Sep 2024 22:25:33 +0300 +Subject: [PATCH 1/1] build: reduce hardcode in `asio_path` + +Currently, `asio_path` variable value is concatenated with `/asio/include` +to specify the path to custom `asio` installation. +The problem is that this is too strict as some distros (namely NixOS) +may have the `include` directory with a differently named parent. +Thus this change minimizes the hardcoded part of the path to make it more flexible. + +Signed-off-by: Petr Portnov +--- + meson.build | 2 +- + meson_options.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index c9e0a2d..c01eb8e 100644 +--- a/meson.build ++++ b/meson.build +@@ -74,7 +74,7 @@ endif + # + # Setup additional include header dirs + # +-asio_inc = get_option('asio_path') / 'asio' / 'include' ++asio_inc = get_option('asio_path') / 'include' + message ('ASIO library: ' + asio_inc) + + openvpn3_core_inc = get_option('openvpn3_core_path') +diff --git a/meson_options.txt b/meson_options.txt +index d9cf02e..43e301e 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -26,7 +26,7 @@ option('debug_options', type: 'boolean', value: false, + # + # Build environment and related build time options + # +-option('asio_path', type: 'string', value: './vendor/asio', ++option('asio_path', type: 'string', value: './vendor/asio/asio', + description: 'Path to the ASIO header files') + + option('openvpn3_core_path', type: 'string', value: './openvpn3-core', +-- +2.43.0 + diff --git a/pkgs/by-name/op/openvpn3/0002-build-allow-installation-directories-customization.patch b/pkgs/by-name/op/openvpn3/0002-build-allow-installation-directories-customization.patch new file mode 100644 index 000000000000..535f522fa64b --- /dev/null +++ b/pkgs/by-name/op/openvpn3/0002-build-allow-installation-directories-customization.patch @@ -0,0 +1,115 @@ +From 848cc46d05c203de393d75434a3f571d78687f50 Mon Sep 17 00:00:00 2001 +From: Petr Portnov +Date: Sun, 22 Sep 2024 13:16:02 +0300 +Subject: [PATCH] build: allow installation directories' customization + +This allows to configure the installation directories +for systemd and D-Bus files. + +Signed-off-by: Petr Portnov +--- + distro/systemd/meson.build | 9 +++++++-- + meson.build | 12 ++++++++++-- + meson_options.txt | 12 ++++++++++++ + src/configmgr/meson.build | 10 ++++++---- + 4 files changed, 35 insertions(+), 8 deletions(-) + +diff --git a/distro/systemd/meson.build b/distro/systemd/meson.build +index 36d556c..9c636b6 100644 +--- a/distro/systemd/meson.build ++++ b/distro/systemd/meson.build +@@ -15,12 +15,17 @@ systemd_cfg = configuration_data({ + + systemd_service_cfg = dependency('systemd') + ++systemd_system_unit_dir = get_option('systemd_system_unit_dir') ++if systemd_system_unit_dir == '' ++ systemd_system_unit_dir = systemd_service_cfg.get_variable('systemdsystemunitdir') ++endif ++ + configure_file( + input: 'openvpn3-autoload.service.in', + output: 'openvpn3-autoload.service', + configuration: systemd_cfg, + install: true, +- install_dir: systemd_service_cfg.get_variable('systemdsystemunitdir'), ++ install_dir: systemd_system_unit_dir, + ) + + configure_file( +@@ -28,7 +33,7 @@ configure_file( + output: 'openvpn3-session@.service', + configuration: systemd_cfg, + install: true, +- install_dir: systemd_service_cfg.get_variable('systemdsystemunitdir'), ++ install_dir: systemd_system_unit_dir, + ) + + custom_target('openvpn3-systemd', +diff --git a/meson.build b/meson.build +index 586c72a..ba41440 100644 +--- a/meson.build ++++ b/meson.build +@@ -203,8 +203,16 @@ message('OpenVPN 3 Linux service binary directory: ' + get_option('prefix') / li + + # + # D-Bus configuration +-dbus_policy_dir = dep_dbus.get_variable('datadir') / 'dbus-1' / 'system.d' +-dbus_service_dir = dep_dbus.get_variable('system_bus_services_dir') ++dbus_policy_dir = get_option('dbus_policy_dir') ++if dbus_policy_dir == '' ++ dbus_policy_dir = dep_dbus.get_variable('datadir') / 'dbus-1' / 'system.d' ++endif ++ ++dbus_service_dir = get_option('dbus_system_service_dir') ++if dbus_service_dir == '' ++ dbus_service_dir = dep_dbus.get_variable('system_bus_services_dir') ++endif ++ + dbus_config = { + 'OPENVPN_USERNAME': get_option('openvpn_username'), + 'LIBEXEC_PATH': get_option('prefix') / libexec_dir, +diff --git a/meson_options.txt b/meson_options.txt +index 43e301e..04809df 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -93,6 +93,18 @@ option('use-legacy-polkit-pkla', type: 'feature', value: 'disabled', + option('polkit_pkla_rulesdir', type: 'string', value: '', + description: 'Override PolicyKit PKLA rules directory') + ++# ++# Installation ++# ++option('dbus_policy_dir', type: 'string', ++ description: 'D-Bus policy directory') ++option('dbus_system_service_dir', type: 'string', ++ description: 'D-Bus system service directory') ++option('systemd_system_unit_dir', type: 'string', ++ description: 'Path to systemd system unit directory') ++option('create_statedir', type: 'feature', value: 'enabled', ++ description: 'Create directory for OpenVPN 3 state during install phase') ++ + # + # Testing tools + # +diff --git a/src/configmgr/meson.build b/src/configmgr/meson.build +index 5d0a649..6f788b7 100644 +--- a/src/configmgr/meson.build ++++ b/src/configmgr/meson.build +@@ -52,7 +52,9 @@ configure_file( + install_dir: dbus_service_dir, + ) + +-# Create the configs directory for persistent configuration profiles +-# NOTE: Can be replaced with install_emptydir() when Meson 0.60 or newer +-# is available on all supported distros +-meson.add_install_script('sh','-c', 'mkdir -p $DESTDIR@0@'.format(openvpn3_statedir / 'configs')) ++if get_option('create_statedir').enabled() ++ # Create the configs directory for persistent configuration profiles ++ # NOTE: Can be replaced with install_emptydir() when Meson 0.60 or newer ++ # is available on all supported distros ++ meson.add_install_script('sh','-c', 'mkdir -p $DESTDIR@0@'.format(openvpn3_statedir / 'configs')) ++endif +-- +2.45.2 + diff --git a/pkgs/by-name/op/openvpn3/package.nix b/pkgs/by-name/op/openvpn3/package.nix new file mode 100644 index 000000000000..b1c18f5fe011 --- /dev/null +++ b/pkgs/by-name/op/openvpn3/package.nix @@ -0,0 +1,135 @@ +{ + lib, + stdenv, + fetchFromGitHub, + asio, + glib, + jsoncpp, + libcap_ng, + libnl, + libuuid, + lz4, + openssl, + pkg-config, + protobuf, + python3, + systemd, + tinyxml-2, + wrapGAppsHook3, + gobject-introspection, + meson, + ninja, + gdbuspp, + cmake, + git, + enableSystemdResolved ? true, +}: + +stdenv.mkDerivation rec { + pname = "openvpn3"; + # also update openvpn3-core + version = "23"; + + src = fetchFromGitHub { + owner = "OpenVPN"; + repo = "openvpn3-linux"; + rev = "refs/tags/v${version}"; + hash = "sha256-5gkutqyUPZDwRPzSFdUXg2G5mtQKbdhZu8xnNAdXoF0="; + # `openvpn3-core` is a submodule. + # TODO: make it into a separate package + fetchSubmodules = true; + }; + + patches = [ + # Merged in upstream, will land in v24 + # https://github.com/OpenVPN/openvpn3-linux/commit/75abb7dc9366ba85fb1a144d88f02a1e8a62f538 + ./0001-build-reduce-hardcode-in-asio_path.patch + ./0002-build-allow-installation-directories-customization.patch + ]; + + postPatch = '' + echo '#define OPENVPN_VERSION "3.git:unknown:unknown" + #define PACKAGE_GUIVERSION "v${builtins.replaceStrings [ "_" ] [ ":" ] version}" + #define PACKAGE_NAME "openvpn3-linux" + ' > ./src/build-version.h + + patchShebangs \ + ./scripts \ + ./src/python/{openvpn2,openvpn3-as,openvpn3-autoload} \ + ./distro/systemd/openvpn3-systemd \ + ./src/tests/dbus/netcfg-subscription-test \ + ./src/shell/bash-completion/gen-openvpn2-completion.py + ''; + + pythonPath = python3.withPackages (ps: [ + ps.dbus-python + ps.pygobject3 + ps.systemd + ]); + + nativeBuildInputs = [ + meson + ninja + pkg-config + cmake + git + + python3.pkgs.wrapPython + python3.pkgs.docutils + python3.pkgs.jinja2 + python3.pkgs.dbus-python + wrapGAppsHook3 + gobject-introspection + ]; + + buildInputs = [ + asio + glib + jsoncpp + libcap_ng + libnl + libuuid + lz4 + openssl + protobuf + tinyxml-2 + gdbuspp + ] ++ lib.optionals enableSystemdResolved [ systemd.dev ]; + + mesonFlags = [ + (lib.mesonOption "selinux" "disabled") + (lib.mesonOption "selinux_policy" "disabled") + (lib.mesonOption "bash-completion" "enabled") + (lib.mesonOption "test_programs" "disabled") + (lib.mesonOption "unit_tests" "disabled") + (lib.mesonOption "asio_path" "${asio}") + (lib.mesonOption "dbus_policy_dir" "${placeholder "out"}/share/dbus-1/system.d") + (lib.mesonOption "dbus_system_service_dir" "${placeholder "out"}/share/dbus-1/system-services") + (lib.mesonOption "systemd_system_unit_dir" "${placeholder "out"}/lib/systemd/system") + (lib.mesonOption "create_statedir" "disabled") + (lib.mesonOption "sharedstatedir" "/etc") + ]; + + dontWrapGApps = true; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + postFixup = '' + wrapPythonPrograms + wrapPythonProgramsIn "$out/libexec/openvpn3-linux" "$out ${pythonPath}" + ''; + + NIX_LDFLAGS = "-lpthread"; + + meta = { + description = "OpenVPN 3 Linux client"; + license = lib.licenses.agpl3Plus; + homepage = "https://github.com/OpenVPN/openvpn3-linux/"; + changelog = "https://github.com/OpenVPN/openvpn3-linux/releases/tag/v${version}"; + maintainers = with lib.maintainers; [ + shamilton + progrm_jarvis + ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/tools/networking/openvpn3/default.nix b/pkgs/tools/networking/openvpn3/default.nix deleted file mode 100644 index 9473277d291f..000000000000 --- a/pkgs/tools/networking/openvpn3/default.nix +++ /dev/null @@ -1,123 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, asio -, autoconf-archive -, autoreconfHook -, glib -, gtest -, jsoncpp -, libcap_ng -, libnl -, libuuid -, lz4 -, openssl -, pkg-config -, protobuf -, python3 -, systemd -, enableSystemdResolved ? false -, tinyxml-2 -, wrapGAppsHook3 -}: - -let - openvpn3-core = fetchFromGitHub { - owner = "OpenVPN"; - repo = "openvpn3"; - rev = "7590cb109349809b948e8edaeecabdbfe24e4b17"; - hash = "sha256-S9D/FQa7HYj0FJnyb5dCrtgTH9Nf2nvtyp/VHiebq7I="; - }; -in -stdenv.mkDerivation rec { - pname = "openvpn3"; - # also update openvpn3-core - version = "20"; - - src = fetchFromGitHub { - owner = "OpenVPN"; - repo = "openvpn3-linux"; - rev = "v${version}"; - hash = "sha256-Weyb+rcx04mpDdcL7Qt4O+PvPf5MLPAP/Uy+8qoNXbQ="; - }; - - postPatch = '' - rm -r ./vendor/googletest - cp -r ${gtest.src} ./vendor/googletest - rm -r ./openvpn3-core - ln -s ${openvpn3-core} ./openvpn3-core - - chmod -R +w ./vendor/googletest - shopt -s globstar - - patchShebangs **/*.py **/*.sh ./src/python/{openvpn2,openvpn3-as,openvpn3-autoload} \ - ./distro/systemd/openvpn3-systemd ./src/tests/dbus/netcfg-subscription-test - - echo "3.git:v${version}:unknown" > openvpn3-core-version - ''; - - preAutoreconf = '' - substituteInPlace ./update-version-m4.sh --replace 'VERSION="$(git describe --always --tags)"' "VERSION=v${version}" - ./update-version-m4.sh - ''; - - nativeBuildInputs = [ - autoconf-archive - autoreconfHook - python3.pkgs.docutils - python3.pkgs.jinja2 - pkg-config - wrapGAppsHook3 - python3.pkgs.wrapPython - ] ++ pythonPath; - - buildInputs = [ - asio - glib - jsoncpp - libcap_ng - libnl - libuuid - lz4 - openssl - protobuf - tinyxml-2 - ] ++ lib.optionals enableSystemdResolved [ - systemd - ]; - - # runtime deps - pythonPath = with python3.pkgs; [ - dbus-python - pygobject3 - ]; - - dontWrapGApps = true; - preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - postFixup = '' - wrapPythonPrograms - ''; - - configureFlags = [ - "--enable-bash-completion" - "--enable-addons-aws" - "--disable-selinux-build" - "--disable-build-test-progs" - ] ++ lib.optionals enableSystemdResolved [ - # This defaults to --resolv-conf /etc/resolv.conf. See - # https://github.com/OpenVPN/openvpn3-linux/blob/v20/configure.ac#L434 - "DEFAULT_DNS_RESOLVER=--systemd-resolved" - ]; - - NIX_LDFLAGS = "-lpthread"; - - meta = with lib; { - description = "OpenVPN 3 Linux client"; - license = licenses.agpl3Plus; - homepage = "https://github.com/OpenVPN/openvpn3-linux/"; - maintainers = with maintainers; [ shamilton ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93f3939af957..1d9be40fd113 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10747,8 +10747,6 @@ with pkgs; openvpn = callPackage ../tools/networking/openvpn {}; - openvpn3 = callPackage ../tools/networking/openvpn3 { }; - openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { }; openvpn-auth-ldap = callPackage ../tools/networking/openvpn/openvpn-auth-ldap.nix { From bf68a7769afeb81f3d6055bb269c009a397ef7ab Mon Sep 17 00:00:00 2001 From: Matthias Meschede Date: Tue, 29 Oct 2024 16:15:33 +0100 Subject: [PATCH 026/108] aichat: 0.22.0 -> 0.23.0 --- pkgs/tools/misc/aichat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/aichat/default.nix b/pkgs/tools/misc/aichat/default.nix index 5a0335d15be6..0520e371fcd0 100644 --- a/pkgs/tools/misc/aichat/default.nix +++ b/pkgs/tools/misc/aichat/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "aichat"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "sigoden"; repo = "aichat"; rev = "v${version}"; - hash = "sha256-gUn1NnEbiZbg7zBer1KX8smBCpcL0fQ+TkEoH8kdPws="; + hash = "sha256-75KL1ODA+HyG/YRQIDs3++RgxQHyxKj6zh/2f6zQbdY="; }; - cargoHash = "sha256-xbWcH8kkDe3+IEeHqxd8QW1h5oPDJfAkfNzJp8MWLR8="; + cargoHash = "sha256-pLQ3P+0SdM3QMqO3AdwYOJKFH3Jqz6ID/J1V5dBGG6s="; nativeBuildInputs = [ pkg-config From c991dc942c0e093ac2cf5fceeca19a67faf1a392 Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 30 Oct 2024 10:42:38 +0900 Subject: [PATCH 027/108] python312Packages.pyclipper: refactor --- pkgs/development/python-modules/pyclipper/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyclipper/default.nix b/pkgs/development/python-modules/pyclipper/default.nix index 0b08fb4377bd..d016c8bd7003 100644 --- a/pkgs/development/python-modules/pyclipper/default.nix +++ b/pkgs/development/python-modules/pyclipper/default.nix @@ -2,27 +2,26 @@ lib, fetchFromGitHub, buildPythonPackage, + setuptools, setuptools-scm, cython, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "pyclipper"; version = "1.3.0.post6"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchFromGitHub { owner = "fonttools"; - repo = pname; + repo = "pyclipper"; rev = "refs/tags/${version}"; hash = "sha256-s2D0ipDatAaF7A1RYOKyI31nkfc/WL3vHWsAMbo+WcY="; }; - nativeBuildInputs = [ + build-system = [ + setuptools setuptools-scm cython ]; From 7fb369fe3e9826c1f1f9e62d1f333a6a61b01d30 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Wed, 30 Oct 2024 09:09:33 +0100 Subject: [PATCH 028/108] tomlplusplus: disable broken tests on darwin Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/to/tomlplusplus/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/to/tomlplusplus/package.nix b/pkgs/by-name/to/tomlplusplus/package.nix index 7d95a15503b1..38e213eff28c 100644 --- a/pkgs/by-name/to/tomlplusplus/package.nix +++ b/pkgs/by-name/to/tomlplusplus/package.nix @@ -44,12 +44,15 @@ stdenv.mkDerivation (finalAttrs: { glibcLocales ]; - doCheck = true; mesonFlags = [ "-Dbuild_tests=${lib.boolToString finalAttrs.doCheck}" "-Dbuild_examples=true" ]; + # almost all tests fail on Darwin with the following exception: + # libc++abi: terminating due to uncaught exception of type std::runtime_error: collate_byname::collate_byname failed to construct for + doCheck = !stdenv.hostPlatform.isDarwin; + passthru = { updateScript = nix-update-script { }; tests.pkg-config = testers.hasPkgConfigModules { From 0c24c1ec6aef63b1ba13a019b40d6bb047c62e26 Mon Sep 17 00:00:00 2001 From: Ben Millwood Date: Tue, 22 Oct 2024 12:27:28 +0100 Subject: [PATCH 029/108] factorio: Give advice on retaining source tarball When manually adding the source tarball to the store with `nix-prefetch-url`, it can be GC'd after the derivation is built. Then if any library version updates and the derivation wants to rebuild, the same tarball needs to be redownloaded and re-prefetched. (Even if downloading it automatically, this can be annoying on a slower network connection, since it's nearly 4GB). This advice is mostly helpful on NixOS and it'd be nice to offer something to non-NixOS nix users as well, but I don't know what it would be. --- pkgs/by-name/fa/factorio/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/fa/factorio/package.nix b/pkgs/by-name/fa/factorio/package.nix index c9b30b31b461..a4d72af4b29e 100644 --- a/pkgs/by-name/fa/factorio/package.nix +++ b/pkgs/by-name/fa/factorio/package.nix @@ -70,6 +70,15 @@ let nix-prefetch-url file://\''$HOME/Downloads/factorio_\''${releaseType}_x64_\''${version}.tar.xz --name factorio_\''${releaseType}_x64-\''${version}.tar.xz Note the ultimate "_" is replaced with "-" in the --name arg! + + If you go this route you might want to tell nix to explicitly hold on to the + source tarball. Otherwise it could get GC'd from the nix store and you'd + have to redownload it next time the package wants to rebuild to use a newer + dependency. E.g. if you're using nixos: + + system.extraDependencies = [ + factorio.src + ]; ''; desktopItem = makeDesktopItem { From 36534d1172c9763449b7355be47653b017cb1de1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 30 Oct 2024 14:32:25 +0000 Subject: [PATCH 030/108] factorio: stylistic changes from PR review --- pkgs/by-name/fa/factorio/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fa/factorio/package.nix b/pkgs/by-name/fa/factorio/package.nix index a4d72af4b29e..ebeb71d4e245 100644 --- a/pkgs/by-name/fa/factorio/package.nix +++ b/pkgs/by-name/fa/factorio/package.nix @@ -71,10 +71,10 @@ let Note the ultimate "_" is replaced with "-" in the --name arg! - If you go this route you might want to tell nix to explicitly hold on to the - source tarball. Otherwise it could get GC'd from the nix store and you'd + If you go this route you might want to tell Nix to explicitly hold on to the + source tarball. Otherwise it could get GC'd from the Nix store and you'd have to redownload it next time the package wants to rebuild to use a newer - dependency. E.g. if you're using nixos: + dependency. E.g. if you're using NixOS: system.extraDependencies = [ factorio.src From 27df79a45ec48b2c44e6f855958ad85c2074c29c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 30 Oct 2024 16:49:35 +0100 Subject: [PATCH 031/108] cifs-utils: format with nixfmt-rfc-style --- pkgs/os-specific/linux/cifs-utils/default.nix | 43 ++++++++++++++----- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index cae7901386d1..9c905b7cca6b 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -1,5 +1,16 @@ -{ stdenv, lib, fetchurl, autoreconfHook, docutils, pkg-config -, libkrb5, keyutils, pam, talloc, python3 }: +{ + stdenv, + lib, + fetchurl, + autoreconfHook, + docutils, + pkg-config, + libkrb5, + keyutils, + pam, + talloc, + python3, +}: stdenv.mkDerivation rec { pname = "cifs-utils"; @@ -10,16 +21,28 @@ stdenv.mkDerivation rec { sha256 = "sha256-De+quFvT6kb/xFq0H7DQrVTQWuLPqn5QPehtTxK8gWE="; }; - nativeBuildInputs = [ autoreconfHook docutils pkg-config ]; - - buildInputs = [ libkrb5 keyutils pam talloc python3 ]; - - configureFlags = [ "ROOTSBINDIR=$(out)/sbin" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - # AC_FUNC_MALLOC is broken on cross builds. - "ac_cv_func_malloc_0_nonnull=yes" - "ac_cv_func_realloc_0_nonnull=yes" + nativeBuildInputs = [ + autoreconfHook + docutils + pkg-config ]; + buildInputs = [ + keyutils + libkrb5 + pam + python3 + talloc + ]; + + configureFlags = + [ "ROOTSBINDIR=$(out)/sbin" ] + ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # AC_FUNC_MALLOC is broken on cross builds. + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + ]; + meta = with lib; { homepage = "https://wiki.samba.org/index.php/LinuxCIFS_utils"; description = "Tools for managing Linux CIFS client filesystems"; From f4fdf302a7f85f2e5b7d7a54efe72d95fec09ae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 30 Oct 2024 16:55:13 +0100 Subject: [PATCH 032/108] cifs-utils: add optional dependencies for cifs.idmap, getcifsacl and setcifsacl and capability dropping in mount.cifs --- pkgs/os-specific/linux/cifs-utils/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index 9c905b7cca6b..e05e31e9c2d7 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -5,9 +5,11 @@ autoreconfHook, docutils, pkg-config, + libcap, libkrb5, keyutils, pam, + samba, talloc, python3, }: @@ -29,9 +31,11 @@ stdenv.mkDerivation rec { buildInputs = [ keyutils + libcap libkrb5 pam python3 + samba talloc ]; From 61cc9c8291025fee650e293c44b993fa3df1acbe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Oct 2024 16:37:21 +0000 Subject: [PATCH 033/108] rshijack: 0.5.1 -> 0.5.2 --- pkgs/tools/networking/rshijack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/rshijack/default.nix b/pkgs/tools/networking/rshijack/default.nix index 181abdf4b603..6984d538c5d4 100644 --- a/pkgs/tools/networking/rshijack/default.nix +++ b/pkgs/tools/networking/rshijack/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rshijack"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "kpcyrd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UyrHMw+3JE4zR+N7rdcTkLP3m4h6txkYa8uG9r7S9ZE="; + sha256 = "sha256-vTbjb0tm6jCP9+QWG5R83v31W6RUgSEv96iR37QdnFo="; }; - cargoHash = "sha256-bGGbZ3JXeo6eytiDHrgHOQN3VgfaqtWssz5hY0RZoZ0="; + cargoHash = "sha256-3rDPk+lPRrDrE2iqHAOi7zhyc+xYPXkM9P4Bu0JUL40="; meta = with lib; { description = "TCP connection hijacker"; From 0e293d4f0e4e252ce67edc2597b9eace819caf8c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Oct 2024 17:06:52 +0000 Subject: [PATCH 034/108] colima: 0.7.5 -> 0.7.6 --- pkgs/applications/virtualization/colima/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index 290186a59e3e..1d82b405c7ab 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "colima"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { owner = "abiosoft"; repo = pname; rev = "v${version}"; - hash = "sha256-WInmoTUaEm2kQ7esZgPj3YIHmHbBrlBTWcLPC9/2MdY="; + hash = "sha256-S8KmwUN5ZU21P/i6X9uSmQ25nMHZxYKd6XtawrwP6yU="; # We need the git revision leaveDotGit = true; postFetch = '' @@ -35,7 +35,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ]; - vendorHash = "sha256-niuBo2YUUYKH0eSApOByNLrcHqr9m5VKGoiGp1fKklg="; + vendorHash = "sha256-caqQA+vDtC5s9qehMIMAcl8JD3Ls2wCSfOpUFPFQ9zY="; # disable flaky Test_extractZones # https://hydra.nixos.org/build/212378003/log From 2ea92734b876419c712fc1a66995fc7771b4dec7 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Thu, 31 Oct 2024 00:07:52 +0100 Subject: [PATCH 035/108] torque: add missing dependency, format, do minor cleanup --- pkgs/servers/computing/torque/default.nix | 62 ++++++++++++++++------- 1 file changed, 44 insertions(+), 18 deletions(-) diff --git a/pkgs/servers/computing/torque/default.nix b/pkgs/servers/computing/torque/default.nix index 9cf0b9ba0b20..74b5fa8dd043 100644 --- a/pkgs/servers/computing/torque/default.nix +++ b/pkgs/servers/computing/torque/default.nix @@ -1,14 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, openssl, flex, bison, pkg-config, groff, libxml2, util-linux -, coreutils, file, libtool, which, boost, autoreconfHook +{ + lib, + stdenv, + fetchFromGitHub, + + autoreconfHook, + pkg-config, + flex, + bison, + + openssl, + groff, + libxml2, + util-linux, + libtool, + which, + coreutils, + boost, + zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "torque"; version = "6.1.3h2"; src = fetchFromGitHub { owner = "adaptivecomputing"; - repo = pname; + repo = "torque"; # branch 6.1.3h2, as they aren't pushing tags # https://github.com/adaptivecomputing/torque/issues/467 rev = "458883319157cfc5c509046d09f9eb8e68e8d398"; @@ -16,10 +33,24 @@ stdenv.mkDerivation rec { }; strictDeps = true; - nativeBuildInputs = [ autoreconfHook pkg-config flex bison libxml2 ]; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + flex + bison + libxml2 + ]; + buildInputs = [ - openssl groff libxml2 util-linux libtool - which boost + openssl + groff + libxml2 + util-linux + libtool + which + boost + zlib ]; enableParallelBuilding = true; @@ -29,25 +60,22 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace Makefile.am \ - --replace "contrib/init.d contrib/systemd" "" + --replace-fail "contrib/init.d contrib/systemd" "" substituteInPlace src/cmds/Makefile.am \ - --replace "/etc/" "$out/etc/" + --replace-fail "/etc/" "$out/etc/" substituteInPlace src/mom_rcp/pathnames.h \ - --replace /bin/cp ${coreutils}/bin/cp + --replace-fail /bin/cp ${coreutils}/bin/cp substituteInPlace src/resmom/requests.c \ - --replace /bin/cp ${coreutils}/bin/cp + --replace-fail /bin/cp ${coreutils}/bin/cp ''; preConfigure = '' - substituteInPlace ./configure \ - --replace '/usr/bin/file' '${file}/bin/file' - # fix broken libxml2 detection sed -i '/xmlLib\=/c\xmlLib=xml2' ./configure for s in fifo cray_t3e dec_cluster msic_cluster sgi_origin umn_cluster; do substituteInPlace src/scheduler.cc/samples/$s/Makefile.in \ - --replace "schedprivdir = " "schedprivdir = $out/" + --replace-fail "schedprivdir = " "schedprivdir = $out/" done for f in $(find ./ -name Makefile.in); do @@ -59,9 +87,7 @@ stdenv.mkDerivation rec { ''; postInstall = '' - cp -v buildutils/pbs_mkdirs $out/bin/ - cp -v torque.setup $out/bin/ - chmod +x $out/bin/pbs_mkdirs $out/bin/torque.setup + install -Dm755 torque.setup buildutils/pbs_mkdirs -t $out/bin/ ''; meta = with lib; { From 75b3fc6e9b6d20ea93502f8b2432c97418d265dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Oct 2024 01:52:58 +0000 Subject: [PATCH 036/108] cntr: 1.5.3 -> 1.5.4 --- pkgs/applications/virtualization/cntr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix index 448254db0ccf..188032d2b966 100644 --- a/pkgs/applications/virtualization/cntr/default.nix +++ b/pkgs/applications/virtualization/cntr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cntr"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "Mic92"; repo = "cntr"; rev = version; - sha256 = "sha256-spa4qPEhpNSZIk16jeH9YEr4g9JcVmpetHz72A/ZAPY="; + sha256 = "sha256-ErGratd1RCynE+iS+qn9feJi5o9f94lUNJZfy4XAjkc="; }; - cargoHash = "sha256-YN8EtUXKtT8Xc0RnW7QqL+awyWy5xFKWhYMxgYG28I4="; + cargoHash = "sha256-4EDAQ0MG0BTN0L3W4Jm0IdVY8vj5U3faO+ruUjLMBMY="; passthru.tests = nixosTests.cntr; From d6838ca37da55762428c57c6d349678a490dc5f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9D=92=95=F0=9D=92=82=F0=9D=92=8F=F0=9D=92=97?= =?UTF-8?q?=F0=9D=92=8A=F0=9D=92=93?= Date: Thu, 31 Oct 2024 13:31:12 +0600 Subject: [PATCH 037/108] picom-pijulius: 8.2-unstable-2024-10-05 -> 8.2-unstable-2024-10-30 --- pkgs/by-name/pi/picom-pijulius/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/picom-pijulius/package.nix b/pkgs/by-name/pi/picom-pijulius/package.nix index a735f2691331..098e7a68be1a 100644 --- a/pkgs/by-name/pi/picom-pijulius/package.nix +++ b/pkgs/by-name/pi/picom-pijulius/package.nix @@ -9,13 +9,13 @@ }: picom.overrideAttrs (previousAttrs: { pname = "picom-pijulius"; - version = "8.2-unstable-2024-10-05"; + version = "8.2-unstable-2024-10-30"; src = fetchFromGitHub { owner = "pijulius"; repo = "picom"; - rev = "9977760e5ace3b17453e3cd89d14bc0f8de5b5f9"; - hash = "sha256-lqmZqEmD/+qZg+8UOOGJB6L0FdUuZFN5qBdL593RC/A="; + rev = "bdbcae085c1ba6c2ec6f21712ed140daaa630d89"; + hash = "sha256-3S8p4vXfryL3IfWPpjhp1GxqJelHRw5aFI3a+ysRKTU="; }; buildInputs = (previousAttrs.buildInputs or [ ]) ++ [ pcre ]; From 2be85a2207e73f22a51d633de4f96a50d32e6331 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Thu, 31 Oct 2024 09:05:55 +0100 Subject: [PATCH 038/108] affine: format using nixfmt --- pkgs/by-name/af/affine/package.nix | 136 +++++++++++++++-------------- 1 file changed, 72 insertions(+), 64 deletions(-) diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index 9573e53f3e6b..edb38993c519 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -1,67 +1,75 @@ -{ lib -, fetchurl -, stdenvNoCC -, copyDesktopItems -, makeDesktopItem -, makeWrapper -, unzip -, electron -, commandLineArgs ? "" +{ + lib, + fetchurl, + stdenvNoCC, + copyDesktopItems, + makeDesktopItem, + makeWrapper, + unzip, + electron, + commandLineArgs ? "", }: -stdenvNoCC.mkDerivation (finalAttrs: let - icon = fetchurl { - url = "https://raw.githubusercontent.com/toeverything/AFFiNE/v${finalAttrs.version}/packages/frontend/core/public/favicon-192.png"; - hash = "sha256-smZ5W7fy3TK3bvjwV4i71j2lVmKSZcyhMhcWfPxNnN4="; - }; -in { - pname = "affine"; - version = "0.17.0"; - src = fetchurl { - url = "https://github.com/toeverything/AFFiNE/releases/download/v${finalAttrs.version}/affine-${finalAttrs.version}-stable-linux-x64.zip"; - hash = "sha256-7Gaiv3XBxpHcI4curNlkN8kXcJZrD4WQS8ciqcabRMs="; - }; - nativeBuildInputs = [ - copyDesktopItems - makeWrapper - unzip - ]; - postInstall = '' - mkdir -p $out/lib - cp -r ./resources/* -t $out/lib/ - mkdir -p $out/share/doc/affine/ - cp LICENSE* $out/share/doc/affine/ - install -Dm644 ${icon} $out/share/pixmaps/affine.png - makeWrapper "${electron}/bin/electron" $out/bin/affine \ - --inherit-argv0 \ - --add-flags $out/lib/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ - --add-flags ${lib.escapeShellArg commandLineArgs} - ''; - desktopItems = [ - (makeDesktopItem { - name = "affine"; - desktopName = "AFFiNE"; - exec = "affine %U"; - terminal = false; - icon = "affine"; - startupWMClass = "affine"; - categories = ["Utility"]; - }) - ]; - meta = with lib; { - description = "Workspace with fully merged docs, whiteboards and databases"; - longDescription = '' - AFFiNE is an open-source, all-in-one workspace and an operating - system for all the building blocks that assemble your knowledge - base and much more -- wiki, knowledge management, presentation - and digital assets +stdenvNoCC.mkDerivation ( + finalAttrs: + let + icon = fetchurl { + url = "https://raw.githubusercontent.com/toeverything/AFFiNE/v${finalAttrs.version}/packages/frontend/core/public/favicon-192.png"; + hash = "sha256-smZ5W7fy3TK3bvjwV4i71j2lVmKSZcyhMhcWfPxNnN4="; + }; + in + { + pname = "affine"; + version = "0.17.0"; + src = fetchurl { + url = "https://github.com/toeverything/AFFiNE/releases/download/v${finalAttrs.version}/affine-${finalAttrs.version}-stable-linux-x64.zip"; + hash = "sha256-7Gaiv3XBxpHcI4curNlkN8kXcJZrD4WQS8ciqcabRMs="; + }; + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + unzip + ]; + postInstall = '' + mkdir -p $out/lib + cp -r ./resources/* -t $out/lib/ + mkdir -p $out/share/doc/affine/ + cp LICENSE* $out/share/doc/affine/ + install -Dm644 ${icon} $out/share/pixmaps/affine.png + makeWrapper "${electron}/bin/electron" $out/bin/affine \ + --inherit-argv0 \ + --add-flags $out/lib/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags ${lib.escapeShellArg commandLineArgs} ''; - homepage = "https://affine.pro/"; - downloadPage = "https://affine.pro/download"; - license = licenses.mit; - maintainers = with maintainers; [richar redyf]; - mainProgram = "affine"; - platforms = ["x86_64-linux"]; - }; -}) + desktopItems = [ + (makeDesktopItem { + name = "affine"; + desktopName = "AFFiNE"; + exec = "affine %U"; + terminal = false; + icon = "affine"; + startupWMClass = "affine"; + categories = [ "Utility" ]; + }) + ]; + meta = with lib; { + description = "Workspace with fully merged docs, whiteboards and databases"; + longDescription = '' + AFFiNE is an open-source, all-in-one workspace and an operating + system for all the building blocks that assemble your knowledge + base and much more -- wiki, knowledge management, presentation + and digital assets + ''; + homepage = "https://affine.pro/"; + downloadPage = "https://affine.pro/download"; + license = licenses.mit; + maintainers = with maintainers; [ + richar + redyf + ]; + mainProgram = "affine"; + platforms = [ "x86_64-linux" ]; + }; + } +) From 75f7506a51866bd74523680de989f4778e783783 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Thu, 31 Oct 2024 09:06:16 +0100 Subject: [PATCH 039/108] affine: remove with lib usage --- pkgs/by-name/af/affine/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index edb38993c519..c7530bdd1e70 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -53,7 +53,7 @@ stdenvNoCC.mkDerivation ( categories = [ "Utility" ]; }) ]; - meta = with lib; { + meta = { description = "Workspace with fully merged docs, whiteboards and databases"; longDescription = '' AFFiNE is an open-source, all-in-one workspace and an operating @@ -63,8 +63,8 @@ stdenvNoCC.mkDerivation ( ''; homepage = "https://affine.pro/"; downloadPage = "https://affine.pro/download"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ richar redyf ]; From 66a4ef3f60fe5974a6d3ec13ee3c3815d63754b9 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Thu, 31 Oct 2024 09:10:01 +0100 Subject: [PATCH 040/108] affine: 0.17.0 -> 0.17.5 --- pkgs/by-name/af/affine/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index c7530bdd1e70..0dec9b5835b2 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -20,10 +20,10 @@ stdenvNoCC.mkDerivation ( in { pname = "affine"; - version = "0.17.0"; + version = "0.17.5"; src = fetchurl { url = "https://github.com/toeverything/AFFiNE/releases/download/v${finalAttrs.version}/affine-${finalAttrs.version}-stable-linux-x64.zip"; - hash = "sha256-7Gaiv3XBxpHcI4curNlkN8kXcJZrD4WQS8ciqcabRMs="; + hash = "sha256-lK5DDI9CKRneY4AwMI4r1qlGyYtQG4Xi8Ys4I3jawTk="; }; nativeBuildInputs = [ copyDesktopItems From f79acd97b30325cd296156880687c29cd8d97dd8 Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Thu, 31 Oct 2024 10:13:40 +0100 Subject: [PATCH 041/108] kitty: add matplotlib dependency to rebuild the documentation --- pkgs/applications/terminal-emulators/kitty/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index 508741039297..1add6434c847 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -55,6 +55,7 @@ buildPythonApplication rec { simde lcms2 librsync + matplotlib openssl.dev xxHash ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ From 540c37037d7e578a6226c278a5ae9cae025ab8bd Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Thu, 31 Oct 2024 10:07:29 +0100 Subject: [PATCH 042/108] =?UTF-8?q?kitty:=200.36.4=20=E2=86=92=200.37.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Diff: https://github.com/kovidgoyal/kitty/compare/v0.36.4...v0.37.0 --- pkgs/applications/terminal-emulators/kitty/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index 1add6434c847..cab3a2103a54 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -33,20 +33,20 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.36.4"; + version = "0.37.0"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "refs/tags/v${version}"; - hash = "sha256-nN0y2VKK5UNaozpHQNPN7AYkto9z6rJNpYRJhvLPtVQ="; + hash = "sha256-xxM5nqEr7avtJUlcsrA/KXOTxSajIg7kDQM6Q4V+6WM="; }; goModules = (buildGo123Module { pname = "kitty-go-modules"; inherit src version; - vendorHash = "sha256-8hsQH7OdsxeVG6pomuxdmTXNmQYBROoUUxoC10LeLFo="; + vendorHash = "sha256-d5jRhOm53HDGnsU5Lg5tVGU/9z8RGqORzS53hOyIKBk="; }).goModules; buildInputs = [ From e049b3ce6e97c6e824734cff2855d1508c33c6e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Oct 2024 11:31:33 +0000 Subject: [PATCH 043/108] zrythm: 1.0.0-rc.1 -> 1.0.0-rc.2 --- pkgs/applications/audio/zrythm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/zrythm/default.nix b/pkgs/applications/audio/zrythm/default.nix index 28315b0a3701..da36dfde736b 100644 --- a/pkgs/applications/audio/zrythm/default.nix +++ b/pkgs/applications/audio/zrythm/default.nix @@ -79,11 +79,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "zrythm"; - version = "1.0.0-rc.1"; + version = "1.0.0-rc.2"; src = fetchzip { url = "https://www.zrythm.org/releases/zrythm-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-Ljbw7bjGI6js4OP9KEXCkhC9AMbInSz0nn+pROm4vXw="; + sha256 = "sha256-Da//nY0yXSbDPEg6t9jgL32NoT8dFYSQ4Kzc/KbHGSk="; }; passthru.updateScript = writeScript "update-zrythm" '' From 3775aee7787ee8e8344854649766aa0c792529a7 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Thu, 31 Oct 2024 13:19:31 +0000 Subject: [PATCH 044/108] raycast: 1.84.2 -> 1.84.8 --- pkgs/os-specific/darwin/raycast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/raycast/default.nix b/pkgs/os-specific/darwin/raycast/default.nix index 6379e9e853a4..03003c5a4b43 100644 --- a/pkgs/os-specific/darwin/raycast/default.nix +++ b/pkgs/os-specific/darwin/raycast/default.nix @@ -11,12 +11,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.84.2"; + version = "1.84.8"; src = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal"; - hash = "sha256-9bONKZyOEPj6eGQKx6IyZSf7ZZhwL985AzN/imNsoys="; + hash = "sha256-MSxscz2c5eNfdlWxn8sEVtqg2iXlPnIfJHnaiMvwtgY="; }; dontPatch = true; From eff46693028bfae03145c95334f5f3e13560420a Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Thu, 31 Oct 2024 15:24:04 +0200 Subject: [PATCH 045/108] raycast: move to `pkgs/by-name` --- .../raycast/default.nix => by-name/ra/raycast/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{os-specific/darwin/raycast/default.nix => by-name/ra/raycast/package.nix} (100%) diff --git a/pkgs/os-specific/darwin/raycast/default.nix b/pkgs/by-name/ra/raycast/package.nix similarity index 100% rename from pkgs/os-specific/darwin/raycast/default.nix rename to pkgs/by-name/ra/raycast/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78432a806ea6..eb1edfd3a4f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34913,8 +34913,6 @@ with pkgs; raylib-games = callPackage ../games/raylib-games { }; - raycast = callPackage ../os-specific/darwin/raycast { }; - redeclipse = callPackage ../games/redeclipse { }; rftg = callPackage ../games/rftg { }; From 5dceb649bf9db2d1217ce1d9ffd448f94efe556d Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 31 Oct 2024 14:11:20 +0000 Subject: [PATCH 046/108] _7zz: disable `uasm` by default --- pkgs/tools/archivers/7zz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix index 8a0b1365ee2d..ca8f8366f7f6 100644 --- a/pkgs/tools/archivers/7zz/default.nix +++ b/pkgs/tools/archivers/7zz/default.nix @@ -2,9 +2,9 @@ , lib , fetchzip - # Only used for Linux's x86/x86_64 + # Only useful on Linux x86/x86_64, and brings in non‐free Open Watcom , uasm -, useUasm ? (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86) +, useUasm ? false # RAR code is under non-free unRAR license # see the meta.license section below for more details From f465662a11ba4658e35ba9d58d6ede9e01a98ebf Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 31 Oct 2024 13:49:37 +0000 Subject: [PATCH 047/108] =?UTF-8?q?lib/licenses:=20mark=20`watcom`=20as=20?= =?UTF-8?q?non=E2=80=90Free?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/licenses.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 6ba244b88b82..291c66ea850e 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -1290,6 +1290,15 @@ lib.mapAttrs mkLicense ({ watcom = { spdxId = "Watcom-1.0"; fullName = "Sybase Open Watcom Public License 1.0"; + # Despite being OSI‐approved, this licence is not considered FOSS + # by Debian, Fedora, or the FSF, due to an onerous restriction that + # requires publication of even privately‐deployed modifications. + # This violates the FSF’s freedom 3 and Debian’s “desert island + # test” and “dissident test”. + # + # See: + free = false; + redistributable = true; }; w3c = { From 749ed8cfbab817706ba8e85fca14ba7f50a1a004 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 31 Oct 2024 09:53:01 -0500 Subject: [PATCH 048/108] btop: switch to apple-sdk_11 --- pkgs/tools/system/btop/default.nix | 42 ++++++++++++++++-------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix index f49f77f6e22c..6d4444e3204b 100644 --- a/pkgs/tools/system/btop/default.nix +++ b/pkgs/tools/system/btop/default.nix @@ -1,16 +1,17 @@ -{ lib -, config -, stdenv -, fetchFromGitHub -, cmake -, darwin -, removeReferencesTo -, btop -, testers -, autoAddDriverRunpath -, cudaSupport ? config.cudaSupport -, rocmSupport ? config.rocmSupport -, rocmPackages +{ + lib, + config, + stdenv, + fetchFromGitHub, + cmake, + removeReferencesTo, + btop, + testers, + autoAddDriverRunpath, + apple-sdk_11, + cudaSupport ? config.cudaSupport, + rocmSupport ? config.rocmSupport, + rocmPackages, }: stdenv.mkDerivation rec { @@ -24,15 +25,16 @@ stdenv.mkDerivation rec { hash = "sha256-A5hOBxj8tKlkHd8zDHfDoU6fIu8gDpt3/usbiDk0/G0="; }; - nativeBuildInputs = [ - cmake - ] ++ lib.optionals cudaSupport [ - autoAddDriverRunpath - ]; + nativeBuildInputs = + [ + cmake + ] + ++ lib.optionals cudaSupport [ + autoAddDriverRunpath + ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.CoreFoundation - darwin.apple_sdk_11_0.frameworks.IOKit + apple-sdk_11 ]; installFlags = [ "PREFIX=$(out)" ]; From 1b82e17fcab8f77abdbd2acc0f95508307af00ec Mon Sep 17 00:00:00 2001 From: Collin Diekvoss Date: Thu, 31 Oct 2024 13:12:53 -0500 Subject: [PATCH 049/108] Update surrealdb options for v2 --- nixos/modules/services/databases/surrealdb.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/databases/surrealdb.nix b/nixos/modules/services/databases/surrealdb.nix index b88129ebc6f4..d38b7b311f1f 100644 --- a/nixos/modules/services/databases/surrealdb.nix +++ b/nixos/modules/services/databases/surrealdb.nix @@ -14,9 +14,9 @@ in { type = lib.types.str; description = '' The path that surrealdb will write data to. Use null for in-memory. - Can be one of "memory", "file://:path", "tikv://:addr". + Can be one of "memory", "rocksdb://:path", "surrealkv://:path", "tikv://:addr", "fdb://:addr". ''; - default = "file:///var/lib/surrealdb/"; + default = "rocksdb:///var/lib/surrealdb/"; example = "memory"; }; @@ -41,10 +41,9 @@ in { extraFlags = lib.mkOption { type = lib.types.listOf lib.types.str; default = []; - example = [ "--allow-all" "--auth" "--user root" "--pass root" ]; + example = [ "--allow-all" "--user" "root" "--pass" "root" ]; description = '' - Specify a list of additional command line flags, - which get escaped and are then passed to surrealdb. + Specify a list of additional command line flags. ''; }; }; @@ -61,7 +60,7 @@ in { after = [ "network.target" ]; serviceConfig = { - ExecStart = "${cfg.package}/bin/surreal start --bind ${cfg.host}:${toString cfg.port} ${lib.escapeShellArgs cfg.extraFlags} -- ${cfg.dbPath}"; + ExecStart = "${cfg.package}/bin/surreal start --bind ${cfg.host}:${toString cfg.port} ${lib.strings.concatStringsSep " " cfg.extraFlags} -- ${cfg.dbPath}"; DynamicUser = true; Restart = "on-failure"; StateDirectory = "surrealdb"; From 5df02a403a5d8acb032d869d0450c6b3ac05bff6 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Thu, 31 Oct 2024 20:15:29 +0100 Subject: [PATCH 050/108] python312Packages.dask-awkward: disable flaky test --- pkgs/development/python-modules/dask-awkward/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix index 8f14ceb76e1f..18bf0952ca2b 100644 --- a/pkgs/development/python-modules/dask-awkward/default.nix +++ b/pkgs/development/python-modules/dask-awkward/default.nix @@ -71,6 +71,8 @@ buildPythonPackage rec { "test_from_text" # ValueError: not a ROOT file: first four bytes... "test_basic_root_works" + # Flaky. https://github.com/dask-contrib/dask-awkward/issues/506. + "test_distance_behavior" ]; __darwinAllowLocalNetworking = true; From f9c95e2357b0e7d1be8b91becd61d17e08e814a1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 31 Oct 2024 14:08:32 +0100 Subject: [PATCH 051/108] =?UTF-8?q?coqPackages.stdpp:=201.10.0=20=E2=86=92?= =?UTF-8?q?=201.11.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit coqPackages.iris: 4.2.0 → 4.3.0 --- pkgs/development/coq-modules/iris/default.nix | 2 ++ pkgs/development/coq-modules/stdpp/default.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/development/coq-modules/iris/default.nix b/pkgs/development/coq-modules/iris/default.nix index a39e8a99509c..a8e925e98f04 100644 --- a/pkgs/development/coq-modules/iris/default.nix +++ b/pkgs/development/coq-modules/iris/default.nix @@ -6,6 +6,7 @@ mkCoqDerivation rec { owner = "iris"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.19" "8.20"; out = "4.3.0"; } { case = range "8.18" "8.19"; out = "4.2.0"; } { case = range "8.16" "8.18"; out = "4.1.0"; } { case = range "8.13" "8.17"; out = "4.0.0"; } @@ -13,6 +14,7 @@ mkCoqDerivation rec { { case = range "8.11" "8.13"; out = "3.4.0"; } { case = range "8.9" "8.10"; out = "3.3.0"; } ] null; + release."4.3.0".sha256 = "sha256-3qhjiFI+A3I3fD8rFfJL5Hek77wScfn/FNNbDyGqA1k="; release."4.2.0".sha256 = "sha256-HuiHIe+5letgr1NN1biZZFq0qlWUbFmoVI7Q91+UIfM="; release."4.1.0".sha256 = "sha256-nTZUeZOXiH7HsfGbMKDE7vGrNVCkbMaWxdMWUcTUNlo="; release."4.0.0".sha256 = "sha256-Jc9TmgGvkiDaz9IOoExyeryU1E+Q37GN24NIM397/Gg="; diff --git a/pkgs/development/coq-modules/stdpp/default.nix b/pkgs/development/coq-modules/stdpp/default.nix index 1215acaed5a1..509aac763b16 100644 --- a/pkgs/development/coq-modules/stdpp/default.nix +++ b/pkgs/development/coq-modules/stdpp/default.nix @@ -6,6 +6,7 @@ mkCoqDerivation rec { domain = "gitlab.mpi-sws.org"; owner = "iris"; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.19" "8.20"; out = "1.11.0"; } { case = range "8.18" "8.19"; out = "1.10.0"; } { case = range "8.16" "8.18"; out = "1.9.0"; } { case = range "8.13" "8.17"; out = "1.8.0"; } @@ -13,6 +14,7 @@ mkCoqDerivation rec { { case = range "8.11" "8.13"; out = "1.5.0"; } { case = range "8.8" "8.10"; out = "1.4.0"; } ] null; + release."1.11.0".sha256 = "sha256-yqnkaA5gUdZBJZ3JnvPYh11vKQRl0BAnior1yGowG7k="; release."1.10.0".sha256 = "sha256-bfynevIKxAltvt76lsqVxBmifFkzEhyX8lRgTKxr21I="; release."1.9.0".sha256 = "sha256-OXeB+XhdyzWMp5Karsz8obp0rTeMKrtG7fu/tmc9aeI="; release."1.8.0".sha256 = "sha256-VkIGBPHevHeHCo/Q759Q7y9WyhSF/4SMht4cOPuAXHU="; From 123c188e6ae9bec25ac61837e9c1b9ab5f0ef925 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Thu, 31 Oct 2024 21:38:42 +0100 Subject: [PATCH 052/108] python3Packages.gensim: relax scipy dep, disable on 3.12 --- pkgs/development/python-modules/gensim/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index e02b71f0ca46..c13babd7e4d9 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -19,7 +19,8 @@ buildPythonPackage rec { version = "4.3.3"; pyproject = true; - disabled = pythonOlder "3.8"; + # C code generated with CPython3.12 does not work cython_0. + disabled = !(pythonOlder "3.12"); src = fetchPypi { inherit pname version; @@ -44,6 +45,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pythonRelaxDeps = [ + "scipy" + ]; + pythonImportsCheck = [ "gensim" ]; # Test setup takes several minutes From 6ce64dedbad8e6dfa0b0ab70b608f0d8fdf79102 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Oct 2024 22:09:45 +0100 Subject: [PATCH 053/108] python312Packages.llama-index-core: 0.11.16 -> 0.11.20 Diff: https://github.com/run-llama/llama_index/compare/refs/tags/v0.11.16...v0.11.20 Changelog: https://github.com/run-llama/llama_index/blob/0.11.20/CHANGELOG.md --- .../development/python-modules/llama-index-core/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix index 782d908b7333..7a43ff20d2f5 100644 --- a/pkgs/development/python-modules/llama-index-core/default.nix +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pname = "llama-index-core"; - version = "0.11.16"; + version = "0.11.20"; pyproject = true; disabled = pythonOlder "3.8"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "run-llama"; repo = "llama_index"; rev = "refs/tags/v${version}"; - hash = "sha256-t4hQMlORpdWXkbKQhVSxD/pdxFtu+sJ4FQQxIXLoH94="; + hash = "sha256-r4xedtxoYv6CcxtDrgwau9LY3kOBg3jXlQm1g59L7x4="; }; sourceRoot = "${src.name}/${pname}"; @@ -63,6 +63,8 @@ buildPythonPackage rec { cp -r ${nltk-data.punkt}/tokenizers/punkt/* llama_index/core/_static/nltk_cache/tokenizers/punkt/ ''; + pythonRelaxDeps = [ "tenacity" ]; + build-system = [ poetry-core ]; dependencies = [ From 68b4067ba67551d4013374fb5488f37be8251bb6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Oct 2024 22:18:38 +0100 Subject: [PATCH 054/108] python312Packages.llama-cloud: 0.1.2 -> 0.1.4 --- pkgs/development/python-modules/llama-cloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-cloud/default.nix b/pkgs/development/python-modules/llama-cloud/default.nix index fe99fe37a9c2..1da515654a97 100644 --- a/pkgs/development/python-modules/llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-cloud/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-cloud"; - version = "0.1.2"; + version = "0.1.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_cloud"; inherit version; - hash = "sha256-fIB0fpp/MtS3OcLV1K3XNR+DbZLmM9asA/pAGJbTMJc="; + hash = "sha256-bwFVl5vZYWCVHLgSxIg28frOA3vHnM/Y0YWxjvTJ+vg="; }; build-system = [ poetry-core ]; From 854eb680d13e67085010bad0fdcc51b6ed2e00cb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Oct 2024 22:19:09 +0100 Subject: [PATCH 055/108] python312Packages.llama-index-graph-stores-neo4j: 0.3.2 -> 0.3.5 --- .../python-modules/llama-index-graph-stores-neo4j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix index 62fe9f466002..9b16410ab4f4 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-graph-stores-neo4j"; - version = "0.3.2"; + version = "0.3.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_graph_stores_neo4j"; inherit version; - hash = "sha256-O/iTlpbREmN1tbojbaqZ7gLAN2JdKmKEzhKCnpth6S0="; + hash = "sha256-r3/bxG4EZmeJ5fa4mmE2OTlbvGN780rsze5HoKQssiY="; }; build-system = [ poetry-core ]; From 9bdd02c88d6b43ebb13ae90f1253e933af435278 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Oct 2024 22:19:35 +0100 Subject: [PATCH 056/108] python312Packages.llama-index-llms-ollama: 0.3.3 -> 0.3.4 --- .../python-modules/llama-index-llms-ollama/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix index 7967890cb317..04bb0ddd0caa 100644 --- a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-llms-ollama"; - version = "0.3.3"; + version = "0.3.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_ollama"; inherit version; - hash = "sha256-J54Z9tWb81DcIIDVzaXqa9JkKd576gvGdMoiTDoTOII="; + hash = "sha256-Vt9uGIcIGvRSL57DK+LUYy2NTyYZ9yqnHqYJZiMeVKA="; }; build-system = [ poetry-core ]; From b1860f0ae1c16fb631342153b568b77cf1fbad28 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Oct 2024 22:19:56 +0100 Subject: [PATCH 057/108] python312Packages.llama-parse: 0.5.7 -> 0.5.12 --- pkgs/development/python-modules/llama-parse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-parse/default.nix b/pkgs/development/python-modules/llama-parse/default.nix index 7eabf44f7f79..bc8719d4de36 100644 --- a/pkgs/development/python-modules/llama-parse/default.nix +++ b/pkgs/development/python-modules/llama-parse/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-parse"; - version = "0.5.7"; + version = "0.5.12"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_parse"; inherit version; - hash = "sha256-sqKdvOMrmTQvuULRwhCr7w7qV99vJmZimQOe96kx/v8="; + hash = "sha256-4kFgbPNXRCXfdsD10BoxqVx5LG+++AqvcvjtZEi9FxU="; }; build-system = [ poetry-core ]; From 2e3561cb113512888dceb00f570c16f096ecc9e3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Oct 2024 22:20:17 +0100 Subject: [PATCH 058/108] python312Packages.llama-index-vector-stores-qdrant: 0.3.0 -> 0.3.3 --- .../llama-index-vector-stores-qdrant/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix index b45bfd7c0bd5..92fe05098613 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-qdrant"; - version = "0.3.0"; + version = "0.3.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_qdrant"; inherit version; - hash = "sha256-mWY86wyS3aVd+cBhY8pCvn6w86Z0AdWrjOlz987Wg6I="; + hash = "sha256-YpecQB3OHi7id/Mvu73dn+gcXjXzVZR5+Sr0KwkIbDs="; }; build-system = [ poetry-core ]; From a29dbedba01cb9372751b19767e9f8487a61ff7d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Oct 2024 22:20:54 +0100 Subject: [PATCH 059/108] python312Packages.llama-index-multi-modal-llms-openai: 0.2.2 -> 0.2.3 --- .../llama-index-multi-modal-llms-openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix index fc9f3a108eff..333780fc2f68 100644 --- a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-multi-modal-llms-openai"; - version = "0.2.2"; + version = "0.2.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_multi_modal_llms_openai"; inherit version; - hash = "sha256-xyBc/Zoj4iAdtSfKP4+l70+yYKtsmxXnkWNjCpFu4Vk="; + hash = "sha256-jrm38f85Vu8JeeIbyD5qiF5AmHtxmfGV5GUl0G465AI="; }; build-system = [ poetry-core ]; From 35f3b601eeb72767ad096c7f88e48d7c1a696fd4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Oct 2024 22:21:09 +0100 Subject: [PATCH 060/108] python312Packages.llama-index-llms-openai: 0.2.12 -> 0.2.16 --- .../python-modules/llama-index-llms-openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix index 2f3e86094708..3ac980fd6ac3 100644 --- a/pkgs/development/python-modules/llama-index-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-llms-openai"; - version = "0.2.12"; + version = "0.2.16"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_openai"; inherit version; - hash = "sha256-RyG8GnZcyfiWuSgku07RTyicGfwVdlpmgJB4slY6dBE="; + hash = "sha256-fGZt0nBWwnigef9F1T8fv8jtNjdkqnuu7i4D30f5Byo="; }; pythonRemoveDeps = [ From 25b3bfec1b762fa942edb4c83b92ccfb49d82070 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Oct 2024 22:27:15 +0100 Subject: [PATCH 061/108] python312Packages.llama-index-legacy: relax tenacity --- .../development/python-modules/llama-index-legacy/default.nix | 2 ++ .../llama-index-vector-stores-chroma/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-legacy/default.nix b/pkgs/development/python-modules/llama-index-legacy/default.nix index f51ae416bb1d..5ab6bd06bba3 100644 --- a/pkgs/development/python-modules/llama-index-legacy/default.nix +++ b/pkgs/development/python-modules/llama-index-legacy/default.nix @@ -20,6 +20,8 @@ buildPythonPackage rec { hash = "sha256-9pafEIXvsKvr1jZ+RvNRICDz9rnAhvRYpRmDDdYeggY="; }; + pythonRelaxDeps = [ "tenacity" ]; + build-system = [ poetry-core ]; dependencies = [ llama-index-core ]; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix index 6ab0835a135c..629d27c8e554 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-chroma"; - version = "0.2.0"; + version = "0.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_chroma"; inherit version; - hash = "sha256-n6fGNgXB4pbhea1e5QT0Co/sVnd8r3L5+pVCut5U2Uw="; + hash = "sha256-3vFadjVLtGWLFrrbklN6cudmJz1eVmsFdUYQBdpThH8="; }; build-system = [ poetry-core ]; From c7abe575227f011657aa13bb2a8840e4101fe3eb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Oct 2024 22:51:54 +0100 Subject: [PATCH 062/108] python312Pakcages.llama-index-core: disable failing test --- pkgs/development/python-modules/llama-index-core/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix index 7a43ff20d2f5..be4eef72fa7e 100644 --- a/pkgs/development/python-modules/llama-index-core/default.nix +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -129,6 +129,8 @@ buildPythonPackage rec { # Tests require network access "test_from_namespaced_persist_dir" "test_from_persist_dir" + # asyncio.exceptions.InvalidStateError: invalid state + "test_workflow_context_to_dict_mid_run" ]; meta = with lib; { From e0dea9c90600cf34b4b65182ad59515226d597c3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Oct 2024 23:11:28 +0100 Subject: [PATCH 063/108] python312Packages.chromadb: 0.5.11 -> 0.5.17 Changelog: https://github.com/chroma-core/chroma/releases/tag/0.5.17 --- pkgs/development/python-modules/chromadb/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix index f1105a0f4980..1be9ca150285 100644 --- a/pkgs/development/python-modules/chromadb/default.nix +++ b/pkgs/development/python-modules/chromadb/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { pname = "chromadb"; - version = "0.5.11"; + version = "0.5.17"; pyproject = true; disabled = pythonOlder "3.9"; @@ -61,13 +61,13 @@ buildPythonPackage rec { owner = "chroma-core"; repo = "chroma"; rev = "refs/tags/${version}"; - hash = "sha256-qE8eX97khcQa2JS9ZuJ1j3/pduXcQGyuVyvsnvKaemo="; + hash = "sha256-ui4wUV9jIvgPtnY5L8mHg9k3l3ccL4u1rir426wwuMg="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-zciqOK5EkvxX3ctkGdkAppOQAW4CJ554PZsw2ctrdG0="; + hash = "sha256-lF+TpoQF6vZoxjPX3CN6TnWiY72qoxrVu2hilWgNx2E="; }; pythonRelaxDeps = [ @@ -149,6 +149,8 @@ buildPythonPackage rec { # Tests are laky / timing sensitive "test_fastapi_server_token_authn_allows_when_it_should_allow" "test_fastapi_server_token_authn_rejects_when_it_should_reject" + # Issue with event loop + "test_http_client_bw_compatibility" ]; disabledTestPaths = [ From f975c8df9ec0c6ce5b50f8d43e7fdac085081914 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Fri, 1 Nov 2024 00:40:48 +0100 Subject: [PATCH 064/108] proton-ge-bin: GE-Proton9-16 -> GE-Proton9-18 --- pkgs/by-name/pr/proton-ge-bin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index fa152d3aeb8b..e144efcc8340 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-ge-bin"; - version = "GE-Proton9-16"; + version = "GE-Proton9-18"; src = fetchzip { url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz"; - hash = "sha256-n/pU5bAr78Hawo8BMk7VW8uK0FjVsBJGMf78zRMGFPQ="; + hash = "sha256-NoRNM61Y9q8ksOXPeDV/NaIqHblWjXtK3tXcX5UEwkI="; }; outputs = [ From e04f0c4897cc264c4e1a9457fd06ff2c1ff511e1 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 31 Oct 2024 19:24:13 -0500 Subject: [PATCH 065/108] btop: apple-sdk_11 -> apple-sdk_15 --- pkgs/tools/system/btop/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix index 6d4444e3204b..ffcf0b6be42e 100644 --- a/pkgs/tools/system/btop/default.nix +++ b/pkgs/tools/system/btop/default.nix @@ -8,10 +8,11 @@ btop, testers, autoAddDriverRunpath, - apple-sdk_11, + apple-sdk_15, cudaSupport ? config.cudaSupport, rocmSupport ? config.rocmSupport, rocmPackages, + darwinMinVersionHook, }: stdenv.mkDerivation rec { @@ -34,7 +35,8 @@ stdenv.mkDerivation rec { ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 + apple-sdk_15 + (darwinMinVersionHook "10.15") ]; installFlags = [ "PREFIX=$(out)" ]; From 29b57372646ba623945832431cfa103980217d74 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 31 Oct 2024 19:24:29 -0500 Subject: [PATCH 066/108] btop: add versionCheckHook --- pkgs/tools/system/btop/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix index ffcf0b6be42e..2a50e5933d3a 100644 --- a/pkgs/tools/system/btop/default.nix +++ b/pkgs/tools/system/btop/default.nix @@ -5,14 +5,13 @@ fetchFromGitHub, cmake, removeReferencesTo, - btop, - testers, autoAddDriverRunpath, apple-sdk_15, + darwinMinVersionHook, + versionCheckHook, + rocmPackages, cudaSupport ? config.cudaSupport, rocmSupport ? config.rocmSupport, - rocmPackages, - darwinMinVersionHook, }: stdenv.mkDerivation rec { @@ -50,9 +49,9 @@ stdenv.mkDerivation rec { patchelf --add-rpath ${lib.getLib rocmPackages.rocm-smi}/lib $out/bin/btop ''; - passthru.tests.version = testers.testVersion { - package = btop; - }; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; meta = with lib; { description = "Monitor of resources"; From 6d2334ef22898e18404db2028655ca1d2d44e4ed Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 31 Oct 2024 09:41:27 -0500 Subject: [PATCH 067/108] skhd: darwin sdk refactor Requires 10.13 minimum --- pkgs/by-name/sk/skhd/package.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/sk/skhd/package.nix b/pkgs/by-name/sk/skhd/package.nix index 1876a43916a7..6612e3b0137f 100644 --- a/pkgs/by-name/sk/skhd/package.nix +++ b/pkgs/by-name/sk/skhd/package.nix @@ -1,18 +1,13 @@ { lib, - overrideSDK, stdenv, - darwin, fetchFromGitHub, testers, + darwinMinVersionHook, nix-update-script, + apple-sdk_11, }: -let - inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa; - - stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; -in -stdenv'.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "skhd"; version = "0.3.9"; @@ -24,8 +19,8 @@ stdenv'.mkDerivation (finalAttrs: { }; buildInputs = [ - Carbon - Cocoa + apple-sdk_11 + (darwinMinVersionHook "10.13") ]; makeFlags = [ "BUILD_PATH=$(out)/bin" ]; From b08788ace8f564c939a3f296145039b8e98ff630 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 31 Oct 2024 19:09:43 -0500 Subject: [PATCH 068/108] skhd: add versionCheckHook --- pkgs/by-name/sk/skhd/package.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/sk/skhd/package.nix b/pkgs/by-name/sk/skhd/package.nix index 6612e3b0137f..60321fae3557 100644 --- a/pkgs/by-name/sk/skhd/package.nix +++ b/pkgs/by-name/sk/skhd/package.nix @@ -2,10 +2,10 @@ lib, stdenv, fetchFromGitHub, - testers, + apple-sdk_11, darwinMinVersionHook, nix-update-script, - apple-sdk_11, + versionCheckHook, }: stdenv.mkDerivation (finalAttrs: { pname = "skhd"; @@ -33,14 +33,11 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace $out/Library/LaunchDaemons/org.nixos.skhd.plist --subst-var out ''; - passthru = { - tests.version = testers.testVersion { - package = finalAttrs.finalPackage; - version = "skhd-v${finalAttrs.version}"; - }; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; - updateScript = nix-update-script { }; - }; + passthru.updateScript = nix-update-script { }; meta = { description = "Simple hotkey daemon for macOS"; From 137cdc1a0afcb6e90ceb454278f880da88a1fb5f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 1 Nov 2024 09:16:58 +0100 Subject: [PATCH 069/108] metasploit: 6.4.33 -> 6.4.34 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 12 ++++++------ pkgs/tools/security/metasploit/default.nix | 4 ++-- pkgs/tools/security/metasploit/gemset.nix | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index f14aae04e7e8..746bda19b7a2 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.33" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.34" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 0cab46fc0f1b..50a46d730477 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 1939065b94ee3c2033e720b753c5a6bd70e09c07 - ref: refs/tags/6.4.33 + revision: e9286ec3faffa15e12ef3e267da335cd4afdfaea + ref: refs/tags/6.4.34 specs: - metasploit-framework (6.4.33) + metasploit-framework (6.4.34) aarch64 abbrev actionpack (~> 7.0.0) @@ -44,7 +44,7 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.183) + metasploit-payloads (= 2.0.187) metasploit_data_models metasploit_payloads-mettle (= 1.0.35) mqtt @@ -69,7 +69,7 @@ GIT pg puma railties - rasn1 + rasn1 (= 0.13.0) rb-readline recog redcarpet @@ -274,7 +274,7 @@ GEM activemodel (~> 7.0) activesupport (~> 7.0) railties (~> 7.0) - metasploit-payloads (2.0.183) + metasploit-payloads (2.0.187) metasploit_data_models (6.0.3) activerecord (~> 7.0) activesupport (~> 7.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 074b6b8ceffe..bf4df0eeef3c 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.4.33"; + version = "6.4.34"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = "refs/tags/${version}"; - hash = "sha256-RMQEFRIArj2RuYk6GFDsGXpWRPANxD8OUJUQMtQUBW4="; + hash = "sha256-2ZYyvASTh1vqBolUCyp8lNLgTPv0tFd7+qZe3KpkDhk="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 7f748cbe4769..752912eabdc5 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -734,12 +734,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "1939065b94ee3c2033e720b753c5a6bd70e09c07"; - sha256 = "0vh52ka3444ma073zi0dy125cyhrxi81hfl9p68kvbh028ah9i24"; + rev = "e9286ec3faffa15e12ef3e267da335cd4afdfaea"; + sha256 = "068fcjmdqpm6z9xmgd7lzd6f1lllghm0nm490vm5p1wk0jy355nr"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.4.33"; + version = "6.4.34"; }; metasploit-model = { groups = ["default"]; @@ -756,10 +756,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bdn7g01a4hvli6ymkl215xmw823jnd5fwv63wy9bgyaih14ysmd"; + sha256 = "13cm4pblldz1cl3cmvppkwsbv12b2a4kfl3r3kzfyjwrlhz121wn"; type = "gem"; }; - version = "2.0.183"; + version = "2.0.187"; }; metasploit_data_models = { groups = ["default"]; From 8c6ecc5ce78d9f3ab2db07bae6463fb212984afe Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Fri, 1 Nov 2024 10:40:05 +0200 Subject: [PATCH 070/108] ncspot: fix desktop file Fix the typo in the name the desktop file and icon. --- pkgs/by-name/nc/ncspot/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nc/ncspot/package.nix b/pkgs/by-name/nc/ncspot/package.nix index 08bc03048e54..64547d827a21 100644 --- a/pkgs/by-name/nc/ncspot/package.nix +++ b/pkgs/by-name/nc/ncspot/package.nix @@ -80,8 +80,8 @@ rustPlatform.buildRustPackage rec { ++ lib.optional withTermion "termion_backend"; postInstall = '' - install -D --mode=444 $src/misc/ncspot.desktop $out/share/applications/nscpot.desktop - install -D --mode=444 $src/images/logo.svg $out/share/icons/hicolor/scalable/apps/nscpot.png + install -D --mode=444 $src/misc/ncspot.desktop $out/share/applications/ncspot.desktop + install -D --mode=444 $src/images/logo.svg $out/share/icons/hicolor/scalable/apps/ncspot.svg ''; passthru = { From d86732dc63a4d84f5a558b46612936e8cda3525b Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Fri, 1 Nov 2024 10:42:27 +0200 Subject: [PATCH 071/108] ncspot: 1.2.0 -> 1.2.1 --- pkgs/by-name/nc/ncspot/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nc/ncspot/package.nix b/pkgs/by-name/nc/ncspot/package.nix index 64547d827a21..85ababb6044b 100644 --- a/pkgs/by-name/nc/ncspot/package.nix +++ b/pkgs/by-name/nc/ncspot/package.nix @@ -35,16 +35,16 @@ rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "refs/tags/v${version}"; - hash = "sha256-FI/MZRxTyYWh+CWq3roO6d48xlPsyL58+euGmCZ8p4Y="; + hash = "sha256-h3Mp67AKuzzeO6l7jN6yrQAHpYSsaOp1Y+qJoamK82U="; }; - cargoHash = "sha256-Jg/P6aaMlgpunYd30eoBt1leL0vgEBn2wNRGZsP4abc="; + cargoHash = "sha256-uWnW4Ov5MoDh3xkmTsNSin9WI0SJAoDGa+n8IMNvo4Y="; nativeBuildInputs = [ pkg-config ] ++ lib.optional withClipboard python3; From bc7813e23410032e2e5f39a5828d9cdbe8870dba Mon Sep 17 00:00:00 2001 From: Nathan Henrie Date: Thu, 24 Oct 2024 15:32:31 -0600 Subject: [PATCH 072/108] watchdog: init at 5.16 This is the Linux software `watchdog` as packaged on Debian, Raspbian, and I believe Fedora. It has a number of configuration options not available with the systemd watchdog, including rebooting if unable to ping a specific host, if a specific network adapter fails, and can also perform custom tests and actions. --- pkgs/by-name/wa/watchdog/package.nix | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 pkgs/by-name/wa/watchdog/package.nix diff --git a/pkgs/by-name/wa/watchdog/package.nix b/pkgs/by-name/wa/watchdog/package.nix new file mode 100644 index 000000000000..3f94879716ae --- /dev/null +++ b/pkgs/by-name/wa/watchdog/package.nix @@ -0,0 +1,25 @@ +{ + lib, + stdenv, + fetchzip, +}: +stdenv.mkDerivation (finalAttrs: { + version = "5.16"; + pname = "watchdog"; + src = fetchzip { + url = "mirror://sourceforge/watchdog/watchdog-${finalAttrs.version}.tar.gz"; + hash = "sha256-ecXsnPvAhlRB8jiTgK+i1j6m/0idNqmzjSqi6UGCydE="; + }; + makeFlags = [ + "CONFIG_FILENAME:=${placeholder "out"}/etc/watchdog.conf" + ]; + + meta = { + description = "Software watchdog for Linux"; + homepage = "https://sourceforge.net/projects/watchdog/"; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ n8henrie ]; + mainProgram = "watchdog"; + }; +}) From 308b635fee33877b874f05664308d7afea4c8bfa Mon Sep 17 00:00:00 2001 From: Nishimara Date: Sun, 13 Oct 2024 01:07:44 +0300 Subject: [PATCH 073/108] zapret: 0-unstable-2024-08-01 -> 67 --- pkgs/by-name/za/zapret/package.nix | 34 +++++++++++++++++------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/za/zapret/package.nix b/pkgs/by-name/za/zapret/package.nix index 4cb0f099e08f..470f65d1b267 100644 --- a/pkgs/by-name/za/zapret/package.nix +++ b/pkgs/by-name/za/zapret/package.nix @@ -13,40 +13,40 @@ gawk }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "zapret"; - version = "0-unstable-2024-08-01"; + version = "67"; src = fetchFromGitHub { owner = "bol-van"; repo = "zapret"; - rev = "9cf72b7c68f6a7c80dfddc6c1cf6d6db32718376"; - hash = "sha256-8cqKCNYLLkZXlwrybKUPG6fLd7gmf8zV9tjWoTxAwIY="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-4TgM0NkvVvdSEJ01SULu+GqpfqokTTErHAt3QkxkLIs="; }; buildInputs = [ libcap zlib libnetfilter_queue libnfnetlink ]; nativeBuildInputs = [ iptables nftables gawk ]; - buildPhase = '' - mkdir -p $out/bin - - make TGT=$out/bin - ''; + makeFlags = [ "TGT=${placeholder "out"}/bin" ]; installPhase = '' + runHook preInstall + mkdir -p $out/usr/share/zapret/init.d/sysv mkdir -p $out/usr/share/docs cp $src/blockcheck.sh $out/bin/blockcheck substituteInPlace $out/bin/blockcheck \ - --replace "ZAPRET_BASE=\"\$EXEDIR\"" "ZAPRET_BASE=$out/usr/share/zapret" + --replace-fail '$(cd "$EXEDIR"; pwd)' "$out/usr/share/zapret" + + ln -s ../../../bin/blockcheck $out/usr/share/zapret/blockcheck cp $src/init.d/sysv/functions $out/usr/share/zapret/init.d/sysv/functions cp $src/init.d/sysv/zapret $out/usr/share/zapret/init.d/sysv/init.d substituteInPlace $out/usr/share/zapret/init.d/sysv/functions \ - --replace "ZAPRET_BASE=\$(readlink -f \"\$EXEDIR/../..\")" "ZAPRET_BASE=$out/usr/share/zapret" + --replace-fail "/opt/zapret" "\"$out/usr/share/zapret\"" touch $out/usr/share/zapret/config @@ -57,6 +57,8 @@ stdenv.mkDerivation { cp $src/common/* $out/usr/share/zapret/common cp $src/ipset/* $out/usr/share/zapret/ipset + rm -f $out/usr/share/zapret/ipset/zapret-hosts-user-exclude.txt.default + mkdir -p $out/usr/share/zapret/nfq ln -s ../../../../bin/nfqws $out/usr/share/zapret/nfq/nfqws @@ -67,16 +69,18 @@ stdenv.mkDerivation { done ln -s ../usr/share/zapret/init.d/sysv/init.d $out/bin/zapret + + runHook postInstall ''; - meta = with lib; { + meta = { description = "DPI bypass multi platform"; homepage = "https://github.com/bol-van/zapret"; - license = licenses.mit; - maintainers = with maintainers; [ nishimara ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nishimara ]; mainProgram = "zapret"; # probably gonna work on darwin, but untested broken = stdenv.hostPlatform.isDarwin; }; -} +}) From 7d6fe54a06303a47568266b6c905dc980fa427bd Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Fri, 1 Nov 2024 11:50:13 +0100 Subject: [PATCH 074/108] .github/labeler.yml: add nixos label to switch-to-configuration-ng pull requests Signed-off-by: Sefa Eyeoglu --- .github/labeler.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/labeler.yml b/.github/labeler.yml index 2a22d38cff16..074116f1d398 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -210,6 +210,7 @@ - changed-files: - any-glob-to-any-file: - nixos/**/* + - pkgs/by-name/sw/switch-to-configuration-ng/**/* - pkgs/os-specific/linux/nixos-rebuild/**/* "6.topic: nim": From 29d920d4a999bc39ac70c4c6075317aa11bc0986 Mon Sep 17 00:00:00 2001 From: nartsisss Date: Fri, 1 Nov 2024 14:19:43 +0300 Subject: [PATCH 075/108] telegram-bot-api: 7.10 -> 7.11 --- pkgs/by-name/te/telegram-bot-api/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/telegram-bot-api/package.nix b/pkgs/by-name/te/telegram-bot-api/package.nix index 97e96a199911..c82364d2c6ca 100644 --- a/pkgs/by-name/te/telegram-bot-api/package.nix +++ b/pkgs/by-name/te/telegram-bot-api/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation { pname = "telegram-bot-api"; - version = "7.10"; + version = "7.11"; src = fetchFromGitHub { repo = "telegram-bot-api"; owner = "tdlib"; - rev = "a186a9ae823d91678ace87ef5b920688c555f5b5"; - hash = "sha256-1oGDR9WLWC/0QyAmTkMWkbkD+49/gU/nWBZq0mMOl8g="; + rev = "6d1b62b51bdc543c10f854aae751e160e5b7b9c5"; + hash = "sha256-FLHAv9CQ90Jd2DnzQSRl5wHW6hnWUCz0Ap65Vjkgj0s="; fetchSubmodules = true; }; From aafc60a9e79ae6fee63f75beda74bac41dfacafa Mon Sep 17 00:00:00 2001 From: nartsisss Date: Fri, 1 Nov 2024 14:20:36 +0300 Subject: [PATCH 076/108] telegram-bot-api: add maintainer nartsiss --- pkgs/by-name/te/telegram-bot-api/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/te/telegram-bot-api/package.nix b/pkgs/by-name/te/telegram-bot-api/package.nix index c82364d2c6ca..e87de1d53f5e 100644 --- a/pkgs/by-name/te/telegram-bot-api/package.nix +++ b/pkgs/by-name/te/telegram-bot-api/package.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [ Anillc Forden + nartsiss ]; platforms = lib.platforms.all; mainProgram = "telegram-bot-api"; From 730ebac01f5c2b47a332aa95425623b9bc9e8402 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 04:02:44 +0000 Subject: [PATCH 077/108] python312Packages.yappi: 1.6.0 -> 1.6.3 --- pkgs/development/python-modules/yappi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yappi/default.nix b/pkgs/development/python-modules/yappi/default.nix index 634914a18c30..90126ce1be2f 100644 --- a/pkgs/development/python-modules/yappi/default.nix +++ b/pkgs/development/python-modules/yappi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "yappi"; - version = "1.6.0"; + version = "1.6.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "sumerc"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-zA4apOGyrbjBOxUKBARiKmmM9rSVFVGWsDpOaItOoLU="; + hash = "sha256-nkkm50/94iVYZdUBm7DZkNQsBqddO6unjP29ctf7dxo="; }; patches = [ ./tests.patch ]; From 2d7517cf9b003b199e783678efdc806607fee13b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 1 Nov 2024 09:03:55 +0100 Subject: [PATCH 078/108] python312Packages.ax-platform: add optional-dependencies - switch to disabledTestPaths --- .../python-modules/ax-platform/default.nix | 59 +++++++++++-------- 1 file changed, 36 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/ax-platform/default.nix b/pkgs/development/python-modules/ax-platform/default.nix index 7f98a4978249..ec033ec962b3 100644 --- a/pkgs/development/python-modules/ax-platform/default.nix +++ b/pkgs/development/python-modules/ax-platform/default.nix @@ -1,21 +1,24 @@ { lib, + botorch, buildPythonPackage, fetchFromGitHub, - botorch, + hypothesis, ipywidgets, jinja2, + jupyter, + mercurial, pandas, plotly, - setuptools, - setuptools-scm, - typeguard, - hypothesis, - mercurial, pyfakefs, - pytestCheckHook, - yappi, pyre-extensions, + pytestCheckHook, + pythonOlder, + setuptools-scm, + setuptools, + sqlalchemy, + typeguard, + yappi, }: buildPythonPackage rec { @@ -23,6 +26,8 @@ buildPythonPackage rec { version = "0.4.3"; pyproject = true; + disabled = pythonOlder "3.10"; + src = fetchFromGitHub { owner = "facebook"; repo = "ax"; @@ -30,6 +35,8 @@ buildPythonPackage rec { hash = "sha256-jmBjrtxqg4Iu3Qr0HRqjVfwURXzbJaGm+DBFNHYk/vA="; }; + env.ALLOW_BOTORCH_LATEST = "1"; + build-system = [ setuptools setuptools-scm @@ -45,7 +52,10 @@ buildPythonPackage rec { pyre-extensions ]; - env.ALLOW_BOTORCH_LATEST = "1"; + optional-dependencies = { + mysql = [ sqlalchemy ]; + notebook = [ jupyter ]; + }; nativeCheckInputs = [ hypothesis @@ -53,21 +63,23 @@ buildPythonPackage rec { pyfakefs pytestCheckHook yappi - ]; - pytestFlagsArray = [ - "--ignore=ax/benchmark" - "--ignore=ax/runners/tests/test_torchx.py" + ] ++ lib.flatten (builtins.attrValues optional-dependencies); + + disabledTestPaths = [ + "ax/benchmark" + "ax/runners/tests/test_torchx.py" # requires pyre_extensions - "--ignore=ax/telemetry/tests" - "--ignore=ax/core/tests/test_utils.py" - "--ignore=ax/early_stopping/tests/test_strategies.py" + "ax/telemetry/tests" + "ax/core/tests/test_utils.py" + "ax/early_stopping/tests/test_strategies.py" # broken with sqlalchemy 2 - "--ignore=ax/core/tests/test_experiment.py" - "--ignore=ax/service/tests/test_ax_client.py" - "--ignore=ax/service/tests/test_scheduler.py" - "--ignore=ax/service/tests/test_with_db_settings_base.py" - "--ignore=ax/storage" + "ax/core/tests/test_experiment.py" + "ax/service/tests/test_ax_client.py" + "ax/service/tests/test_scheduler.py" + "ax/service/tests/test_with_db_settings_base.py" + "ax/storage" ]; + disabledTests = [ # exact comparison of floating points "test_optimize_l0_homotopy" @@ -78,12 +90,13 @@ buildPythonPackage rec { # uses torch.equal "test_convert_observations" ]; + pythonImportsCheck = [ "ax" ]; meta = { - changelog = "https://github.com/facebook/Ax/releases/tag/${version}"; - description = "Ax is an accessible, general-purpose platform for understanding, managing, deploying, and automating adaptive experiments"; + description = "Platform for understanding, managing, deploying, and automating adaptive experiments"; homepage = "https://ax.dev/"; + changelog = "https://github.com/facebook/Ax/releases/tag/${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ veprbl ]; }; From 8c5a7eba6b6c1238b3de1e85d3dc27693db1dc99 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 1 Nov 2024 11:47:53 +0000 Subject: [PATCH 079/108] mongosh: 2.3.2 -> 2.3.3 --- pkgs/by-name/mo/mongosh/package-lock.json | 1440 +++++++++------------ pkgs/by-name/mo/mongosh/package.nix | 6 +- pkgs/by-name/mo/mongosh/source.json | 8 +- 3 files changed, 628 insertions(+), 826 deletions(-) diff --git a/pkgs/by-name/mo/mongosh/package-lock.json b/pkgs/by-name/mo/mongosh/package-lock.json index 67c8f25377d1..6e51eca9d050 100644 --- a/pkgs/by-name/mo/mongosh/package-lock.json +++ b/pkgs/by-name/mo/mongosh/package-lock.json @@ -1,15 +1,15 @@ { "name": "mongosh", - "version": "2.3.2", + "version": "2.3.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mongosh", - "version": "2.3.2", + "version": "2.3.3", "license": "Apache-2.0", "dependencies": { - "@mongosh/cli-repl": "2.3.2" + "@mongosh/cli-repl": "2.3.3" }, "bin": { "mongosh": "bin/mongosh.js" @@ -157,26 +157,26 @@ } }, "node_modules/@aws-sdk/client-cognito-identity": { - "version": "3.670.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.670.0.tgz", - "integrity": "sha512-4q/yYdtO/RisGdQ3a2E912YekIpQYvS4TYPYS/onCbTXW/7C8/Ha7yUEncE7Woou0MDXyoVh50UATcJEmUt0+Q==", + "version": "3.682.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.682.0.tgz", + "integrity": "sha512-BD8PPPk3+ZzFqCJSPraoXkgRcPTtjguXtyDYsyBMzFofWmN4YeswXSavZVAC354W98mkffDaXBvieyqu1Y9fKA==", "license": "Apache-2.0", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/client-sso-oidc": "3.670.0", - "@aws-sdk/client-sts": "3.670.0", - "@aws-sdk/core": "3.667.0", - "@aws-sdk/credential-provider-node": "3.670.0", - "@aws-sdk/middleware-host-header": "3.667.0", - "@aws-sdk/middleware-logger": "3.667.0", - "@aws-sdk/middleware-recursion-detection": "3.667.0", - "@aws-sdk/middleware-user-agent": "3.669.0", - "@aws-sdk/region-config-resolver": "3.667.0", - "@aws-sdk/types": "3.667.0", - "@aws-sdk/util-endpoints": "3.667.0", - "@aws-sdk/util-user-agent-browser": "3.670.0", - "@aws-sdk/util-user-agent-node": "3.669.0", + "@aws-sdk/client-sso-oidc": "3.682.0", + "@aws-sdk/client-sts": "3.682.0", + "@aws-sdk/core": "3.679.0", + "@aws-sdk/credential-provider-node": "3.682.0", + "@aws-sdk/middleware-host-header": "3.679.0", + "@aws-sdk/middleware-logger": "3.679.0", + "@aws-sdk/middleware-recursion-detection": "3.679.0", + "@aws-sdk/middleware-user-agent": "3.682.0", + "@aws-sdk/region-config-resolver": "3.679.0", + "@aws-sdk/types": "3.679.0", + "@aws-sdk/util-endpoints": "3.679.0", + "@aws-sdk/util-user-agent-browser": "3.679.0", + "@aws-sdk/util-user-agent-node": "3.682.0", "@smithy/config-resolver": "^3.0.9", "@smithy/core": "^2.4.8", "@smithy/fetch-http-handler": "^3.2.9", @@ -209,23 +209,23 @@ } }, "node_modules/@aws-sdk/client-sso": { - "version": "3.670.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.670.0.tgz", - "integrity": "sha512-J+oz6uSsDvk4pimMDnKJb1wsV216zTrejvMTIL4RhUD1QPIVVOpteTdUShcjZUIZnkcJZGI+cym/SFK0kuzTpg==", + "version": "3.682.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.682.0.tgz", + "integrity": "sha512-PYH9RFUMYLFl66HSBq4tIx6fHViMLkhJHTYJoJONpBs+Td+NwVJ895AdLtDsBIhMS0YseCbPpuyjUCJgsUrwUw==", "license": "Apache-2.0", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/core": "3.667.0", - "@aws-sdk/middleware-host-header": "3.667.0", - "@aws-sdk/middleware-logger": "3.667.0", - "@aws-sdk/middleware-recursion-detection": "3.667.0", - "@aws-sdk/middleware-user-agent": "3.669.0", - "@aws-sdk/region-config-resolver": "3.667.0", - "@aws-sdk/types": "3.667.0", - "@aws-sdk/util-endpoints": "3.667.0", - "@aws-sdk/util-user-agent-browser": "3.670.0", - "@aws-sdk/util-user-agent-node": "3.669.0", + "@aws-sdk/core": "3.679.0", + "@aws-sdk/middleware-host-header": "3.679.0", + "@aws-sdk/middleware-logger": "3.679.0", + "@aws-sdk/middleware-recursion-detection": "3.679.0", + "@aws-sdk/middleware-user-agent": "3.682.0", + "@aws-sdk/region-config-resolver": "3.679.0", + "@aws-sdk/types": "3.679.0", + "@aws-sdk/util-endpoints": "3.679.0", + "@aws-sdk/util-user-agent-browser": "3.679.0", + "@aws-sdk/util-user-agent-node": "3.682.0", "@smithy/config-resolver": "^3.0.9", "@smithy/core": "^2.4.8", "@smithy/fetch-http-handler": "^3.2.9", @@ -258,24 +258,24 @@ } }, "node_modules/@aws-sdk/client-sso-oidc": { - "version": "3.670.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.670.0.tgz", - "integrity": "sha512-4qDK2L36Q4J1lfemaHHd9ZxqKRaos3STp44qPAHf/8QyX6Uk5sXgZNVO2yWM7SIEtVKwwBh/fZAsdBkGPBfZcw==", + "version": "3.682.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.682.0.tgz", + "integrity": "sha512-ZPZ7Y/r/w3nx/xpPzGSqSQsB090Xk5aZZOH+WBhTDn/pBEuim09BYXCLzvvxb7R7NnuoQdrTJiwimdJAhHl7ZQ==", "license": "Apache-2.0", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/core": "3.667.0", - "@aws-sdk/credential-provider-node": "3.670.0", - "@aws-sdk/middleware-host-header": "3.667.0", - "@aws-sdk/middleware-logger": "3.667.0", - "@aws-sdk/middleware-recursion-detection": "3.667.0", - "@aws-sdk/middleware-user-agent": "3.669.0", - "@aws-sdk/region-config-resolver": "3.667.0", - "@aws-sdk/types": "3.667.0", - "@aws-sdk/util-endpoints": "3.667.0", - "@aws-sdk/util-user-agent-browser": "3.670.0", - "@aws-sdk/util-user-agent-node": "3.669.0", + "@aws-sdk/core": "3.679.0", + "@aws-sdk/credential-provider-node": "3.682.0", + "@aws-sdk/middleware-host-header": "3.679.0", + "@aws-sdk/middleware-logger": "3.679.0", + "@aws-sdk/middleware-recursion-detection": "3.679.0", + "@aws-sdk/middleware-user-agent": "3.682.0", + "@aws-sdk/region-config-resolver": "3.679.0", + "@aws-sdk/types": "3.679.0", + "@aws-sdk/util-endpoints": "3.679.0", + "@aws-sdk/util-user-agent-browser": "3.679.0", + "@aws-sdk/util-user-agent-node": "3.682.0", "@smithy/config-resolver": "^3.0.9", "@smithy/core": "^2.4.8", "@smithy/fetch-http-handler": "^3.2.9", @@ -307,29 +307,29 @@ "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sts": "^3.670.0" + "@aws-sdk/client-sts": "^3.682.0" } }, "node_modules/@aws-sdk/client-sts": { - "version": "3.670.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.670.0.tgz", - "integrity": "sha512-bExrNo8ZVWorS3cjMZKQnA2HWqDmAzcZoSN/cPVoPFNkHwdl1lzPxvcLzmhpIr48JHgKfybBjrbluDZfIYeEog==", + "version": "3.682.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.682.0.tgz", + "integrity": "sha512-xKuo4HksZ+F8m9DOfx/ZuWNhaPuqZFPwwy0xqcBT6sWH7OAuBjv/fnpOTzyQhpVTWddlf+ECtMAMrxjxuOExGQ==", "license": "Apache-2.0", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/client-sso-oidc": "3.670.0", - "@aws-sdk/core": "3.667.0", - "@aws-sdk/credential-provider-node": "3.670.0", - "@aws-sdk/middleware-host-header": "3.667.0", - "@aws-sdk/middleware-logger": "3.667.0", - "@aws-sdk/middleware-recursion-detection": "3.667.0", - "@aws-sdk/middleware-user-agent": "3.669.0", - "@aws-sdk/region-config-resolver": "3.667.0", - "@aws-sdk/types": "3.667.0", - "@aws-sdk/util-endpoints": "3.667.0", - "@aws-sdk/util-user-agent-browser": "3.670.0", - "@aws-sdk/util-user-agent-node": "3.669.0", + "@aws-sdk/client-sso-oidc": "3.682.0", + "@aws-sdk/core": "3.679.0", + "@aws-sdk/credential-provider-node": "3.682.0", + "@aws-sdk/middleware-host-header": "3.679.0", + "@aws-sdk/middleware-logger": "3.679.0", + "@aws-sdk/middleware-recursion-detection": "3.679.0", + "@aws-sdk/middleware-user-agent": "3.682.0", + "@aws-sdk/region-config-resolver": "3.679.0", + "@aws-sdk/types": "3.679.0", + "@aws-sdk/util-endpoints": "3.679.0", + "@aws-sdk/util-user-agent-browser": "3.679.0", + "@aws-sdk/util-user-agent-node": "3.682.0", "@smithy/config-resolver": "^3.0.9", "@smithy/core": "^2.4.8", "@smithy/fetch-http-handler": "^3.2.9", @@ -362,12 +362,12 @@ } }, "node_modules/@aws-sdk/core": { - "version": "3.667.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.667.0.tgz", - "integrity": "sha512-pMcDVI7Tmdsc8R3sDv0Omj/4iRParGY+uJtAfF669WnZfDfaBQaix2Mq7+Mu08vdjqO9K3gicFvjk9S1VLmOKA==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.679.0.tgz", + "integrity": "sha512-CS6PWGX8l4v/xyvX8RtXnBisdCa5+URzKd0L6GvHChype9qKUVxO/Gg6N/y43Hvg7MNWJt9FBPNWIxUB+byJwg==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.667.0", + "@aws-sdk/types": "3.679.0", "@smithy/core": "^2.4.8", "@smithy/node-config-provider": "^3.1.8", "@smithy/property-provider": "^3.1.7", @@ -384,13 +384,13 @@ } }, "node_modules/@aws-sdk/credential-provider-cognito-identity": { - "version": "3.670.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.670.0.tgz", - "integrity": "sha512-l41x9lZtZnzyQ6+8D3i7BwqwG1u7JTfHwJDZmsh+sIbrccLlJm7TfxkegOwUbzJ6JdzdigCIM1cKBc52O8EG9w==", + "version": "3.682.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.682.0.tgz", + "integrity": "sha512-V+y4qUQtc0kTnNR7u5LwnZn8EZk2pjdNX+84MwD9VjXekqbXikADu06Mj93kVGVW+qgqtNMvJ8PpiI3EaaxC7A==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/client-cognito-identity": "3.670.0", - "@aws-sdk/types": "3.667.0", + "@aws-sdk/client-cognito-identity": "3.682.0", + "@aws-sdk/types": "3.679.0", "@smithy/property-provider": "^3.1.7", "@smithy/types": "^3.5.0", "tslib": "^2.6.2" @@ -400,13 +400,13 @@ } }, "node_modules/@aws-sdk/credential-provider-env": { - "version": "3.667.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.667.0.tgz", - "integrity": "sha512-zZbrkkaPc54WXm+QAnpuv0LPNfsts0HPPd+oCECGs7IQRaFsGj187cwvPg9RMWDFZqpm64MdBDoA8OQHsqzYCw==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.679.0.tgz", + "integrity": "sha512-EdlTYbzMm3G7VUNAMxr9S1nC1qUNqhKlAxFU8E7cKsAe8Bp29CD5HAs3POc56AVo9GC4yRIS+/mtlZSmrckzUA==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/core": "3.667.0", - "@aws-sdk/types": "3.667.0", + "@aws-sdk/core": "3.679.0", + "@aws-sdk/types": "3.679.0", "@smithy/property-provider": "^3.1.7", "@smithy/types": "^3.5.0", "tslib": "^2.6.2" @@ -416,13 +416,13 @@ } }, "node_modules/@aws-sdk/credential-provider-http": { - "version": "3.667.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.667.0.tgz", - "integrity": "sha512-sjtybFfERZWiqTY7fswBxKQLvUkiCucOWyqh3IaPo/4nE1PXRnaZCVG0+kRBPrYIxWqiVwytvZzMJy8sVZcG0A==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.679.0.tgz", + "integrity": "sha512-ZoKLubW5DqqV1/2a3TSn+9sSKg0T8SsYMt1JeirnuLJF0mCoYFUaWMyvxxKuxPoqvUsaycxKru4GkpJ10ltNBw==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/core": "3.667.0", - "@aws-sdk/types": "3.667.0", + "@aws-sdk/core": "3.679.0", + "@aws-sdk/types": "3.679.0", "@smithy/fetch-http-handler": "^3.2.9", "@smithy/node-http-handler": "^3.2.4", "@smithy/property-provider": "^3.1.7", @@ -437,18 +437,18 @@ } }, "node_modules/@aws-sdk/credential-provider-ini": { - "version": "3.670.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.670.0.tgz", - "integrity": "sha512-TB1gacUj75leaTt2JsCTzygDSIk4ksv9uZoR7VenlgFPRktyOeT+fapwIVBeB2Qg7b9uxAY2K5XkKstDZyBEEw==", + "version": "3.682.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.682.0.tgz", + "integrity": "sha512-6eqWeHdK6EegAxqDdiCi215nT3QZPwukgWAYuVxNfJ/5m0/P7fAzF+D5kKVgByUvGJEbq/FEL8Fw7OBe64AA+g==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/core": "3.667.0", - "@aws-sdk/credential-provider-env": "3.667.0", - "@aws-sdk/credential-provider-http": "3.667.0", - "@aws-sdk/credential-provider-process": "3.667.0", - "@aws-sdk/credential-provider-sso": "3.670.0", - "@aws-sdk/credential-provider-web-identity": "3.667.0", - "@aws-sdk/types": "3.667.0", + "@aws-sdk/core": "3.679.0", + "@aws-sdk/credential-provider-env": "3.679.0", + "@aws-sdk/credential-provider-http": "3.679.0", + "@aws-sdk/credential-provider-process": "3.679.0", + "@aws-sdk/credential-provider-sso": "3.682.0", + "@aws-sdk/credential-provider-web-identity": "3.679.0", + "@aws-sdk/types": "3.679.0", "@smithy/credential-provider-imds": "^3.2.4", "@smithy/property-provider": "^3.1.7", "@smithy/shared-ini-file-loader": "^3.1.8", @@ -459,22 +459,22 @@ "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sts": "^3.670.0" + "@aws-sdk/client-sts": "^3.682.0" } }, "node_modules/@aws-sdk/credential-provider-node": { - "version": "3.670.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.670.0.tgz", - "integrity": "sha512-zwNrRYzubk4CaZ7zebeDhxsm8QtNWkbGKopZPOaZSnd5uqUGRcmx4ccVRngWUK68XDP44aEUWC8iU5Pc7btpHQ==", + "version": "3.682.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.682.0.tgz", + "integrity": "sha512-HSmDqZcBVZrTctHCT9m++vdlDfJ1ARI218qmZa+TZzzOFNpKWy6QyHMEra45GB9GnkkMmV6unoDSPMuN0AqcMg==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/credential-provider-env": "3.667.0", - "@aws-sdk/credential-provider-http": "3.667.0", - "@aws-sdk/credential-provider-ini": "3.670.0", - "@aws-sdk/credential-provider-process": "3.667.0", - "@aws-sdk/credential-provider-sso": "3.670.0", - "@aws-sdk/credential-provider-web-identity": "3.667.0", - "@aws-sdk/types": "3.667.0", + "@aws-sdk/credential-provider-env": "3.679.0", + "@aws-sdk/credential-provider-http": "3.679.0", + "@aws-sdk/credential-provider-ini": "3.682.0", + "@aws-sdk/credential-provider-process": "3.679.0", + "@aws-sdk/credential-provider-sso": "3.682.0", + "@aws-sdk/credential-provider-web-identity": "3.679.0", + "@aws-sdk/types": "3.679.0", "@smithy/credential-provider-imds": "^3.2.4", "@smithy/property-provider": "^3.1.7", "@smithy/shared-ini-file-loader": "^3.1.8", @@ -486,13 +486,13 @@ } }, "node_modules/@aws-sdk/credential-provider-process": { - "version": "3.667.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.667.0.tgz", - "integrity": "sha512-HZHnvop32fKgsNHkdhVaul7UzQ25sEc0j9yqA4bjhtbk0ECl42kj3f1pJ+ZU/YD9ut8lMJs/vVqiOdNThVdeBw==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.679.0.tgz", + "integrity": "sha512-u/p4TV8kQ0zJWDdZD4+vdQFTMhkDEJFws040Gm113VHa/Xo1SYOjbpvqeuFoz6VmM0bLvoOWjxB9MxnSQbwKpQ==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/core": "3.667.0", - "@aws-sdk/types": "3.667.0", + "@aws-sdk/core": "3.679.0", + "@aws-sdk/types": "3.679.0", "@smithy/property-provider": "^3.1.7", "@smithy/shared-ini-file-loader": "^3.1.8", "@smithy/types": "^3.5.0", @@ -503,15 +503,15 @@ } }, "node_modules/@aws-sdk/credential-provider-sso": { - "version": "3.670.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.670.0.tgz", - "integrity": "sha512-5PkA8BOy4q57Vhe9AESoHKZ7vjRbElNPKjXA4qC01xY+DitClRFz4O3B9sMzFp0PHlz9nDVSXXKgq0yzF/nAag==", + "version": "3.682.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.682.0.tgz", + "integrity": "sha512-h7IH1VsWgV6YAJSWWV6y8uaRjGqLY3iBpGZlXuTH/c236NMLaNv+WqCBLeBxkFGUb2WeQ+FUPEJDCD69rgLIkg==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/client-sso": "3.670.0", - "@aws-sdk/core": "3.667.0", - "@aws-sdk/token-providers": "3.667.0", - "@aws-sdk/types": "3.667.0", + "@aws-sdk/client-sso": "3.682.0", + "@aws-sdk/core": "3.679.0", + "@aws-sdk/token-providers": "3.679.0", + "@aws-sdk/types": "3.679.0", "@smithy/property-provider": "^3.1.7", "@smithy/shared-ini-file-loader": "^3.1.8", "@smithy/types": "^3.5.0", @@ -522,13 +522,13 @@ } }, "node_modules/@aws-sdk/credential-provider-web-identity": { - "version": "3.667.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.667.0.tgz", - "integrity": "sha512-t8CFlZMD/1p/8Cli3rvRiTJpjr/8BO64gw166AHgFZYSN2h95L2l1tcW0jpsc3PprA32nLg1iQVKYt4WGM4ugw==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.679.0.tgz", + "integrity": "sha512-a74tLccVznXCaBefWPSysUcLXYJiSkeUmQGtalNgJ1vGkE36W5l/8czFiiowdWdKWz7+x6xf0w+Kjkjlj42Ung==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/core": "3.667.0", - "@aws-sdk/types": "3.667.0", + "@aws-sdk/core": "3.679.0", + "@aws-sdk/types": "3.679.0", "@smithy/property-provider": "^3.1.7", "@smithy/types": "^3.5.0", "tslib": "^2.6.2" @@ -537,28 +537,28 @@ "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sts": "^3.667.0" + "@aws-sdk/client-sts": "^3.679.0" } }, "node_modules/@aws-sdk/credential-providers": { - "version": "3.670.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.670.0.tgz", - "integrity": "sha512-2O7Ditryao7/8pCS4GPP2pba/Ia/rruejKoI8STiSmdgccssHcaHtiJ3mYNkKtRUEdi19ulspfz1nU+Ew4x4fA==", + "version": "3.682.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.682.0.tgz", + "integrity": "sha512-vLBdUlTISEXVKYFFO665ajC0U0RdXFx21fwTHiN2g4edFH++di2XCJ8/Y34bu09z9bV/rwFT2jn41iAVWasNKg==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/client-cognito-identity": "3.670.0", - "@aws-sdk/client-sso": "3.670.0", - "@aws-sdk/client-sts": "3.670.0", - "@aws-sdk/core": "3.667.0", - "@aws-sdk/credential-provider-cognito-identity": "3.670.0", - "@aws-sdk/credential-provider-env": "3.667.0", - "@aws-sdk/credential-provider-http": "3.667.0", - "@aws-sdk/credential-provider-ini": "3.670.0", - "@aws-sdk/credential-provider-node": "3.670.0", - "@aws-sdk/credential-provider-process": "3.667.0", - "@aws-sdk/credential-provider-sso": "3.670.0", - "@aws-sdk/credential-provider-web-identity": "3.667.0", - "@aws-sdk/types": "3.667.0", + "@aws-sdk/client-cognito-identity": "3.682.0", + "@aws-sdk/client-sso": "3.682.0", + "@aws-sdk/client-sts": "3.682.0", + "@aws-sdk/core": "3.679.0", + "@aws-sdk/credential-provider-cognito-identity": "3.682.0", + "@aws-sdk/credential-provider-env": "3.679.0", + "@aws-sdk/credential-provider-http": "3.679.0", + "@aws-sdk/credential-provider-ini": "3.682.0", + "@aws-sdk/credential-provider-node": "3.682.0", + "@aws-sdk/credential-provider-process": "3.679.0", + "@aws-sdk/credential-provider-sso": "3.682.0", + "@aws-sdk/credential-provider-web-identity": "3.679.0", + "@aws-sdk/types": "3.679.0", "@smithy/credential-provider-imds": "^3.2.4", "@smithy/property-provider": "^3.1.7", "@smithy/types": "^3.5.0", @@ -569,12 +569,12 @@ } }, "node_modules/@aws-sdk/middleware-host-header": { - "version": "3.667.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.667.0.tgz", - "integrity": "sha512-Z7fIAMQnPegs7JjAQvlOeWXwpMRfegh5eCoIP6VLJIeR6DLfYKbP35JBtt98R6DXslrN2RsbTogjbxPEDQfw1w==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.679.0.tgz", + "integrity": "sha512-y176HuQ8JRY3hGX8rQzHDSbCl9P5Ny9l16z4xmaiLo+Qfte7ee4Yr3yaAKd7GFoJ3/Mhud2XZ37fR015MfYl2w==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.667.0", + "@aws-sdk/types": "3.679.0", "@smithy/protocol-http": "^4.1.4", "@smithy/types": "^3.5.0", "tslib": "^2.6.2" @@ -584,12 +584,12 @@ } }, "node_modules/@aws-sdk/middleware-logger": { - "version": "3.667.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.667.0.tgz", - "integrity": "sha512-PtTRNpNm/5c746jRgZCNg4X9xEJIwggkGJrF0GP9AB1ANg4pc/sF2Fvn1NtqPe9wtQ2stunJprnm5WkCHN7QiA==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.679.0.tgz", + "integrity": "sha512-0vet8InEj7nvIvGKk+ch7bEF5SyZ7Us9U7YTEgXPrBNStKeRUsgwRm0ijPWWd0a3oz2okaEwXsFl7G/vI0XiEA==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.667.0", + "@aws-sdk/types": "3.679.0", "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, @@ -598,12 +598,12 @@ } }, "node_modules/@aws-sdk/middleware-recursion-detection": { - "version": "3.667.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.667.0.tgz", - "integrity": "sha512-U5glWD3ehFohzpUpopLtmqAlDurGWo2wRGPNgi4SwhWU7UDt6LS7E/UvJjqC0CUrjlzOw+my2A+Ncf+fisMhxQ==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.679.0.tgz", + "integrity": "sha512-sQoAZFsQiW/LL3DfKMYwBoGjYDEnMbA9WslWN8xneCmBAwKo6IcSksvYs23PP8XMIoBGe2I2J9BSr654XWygTQ==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.667.0", + "@aws-sdk/types": "3.679.0", "@smithy/protocol-http": "^4.1.4", "@smithy/types": "^3.5.0", "tslib": "^2.6.2" @@ -613,14 +613,14 @@ } }, "node_modules/@aws-sdk/middleware-user-agent": { - "version": "3.669.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.669.0.tgz", - "integrity": "sha512-K8ScPi45zjJrj5Y2gRqVsvKKQCQbvQBfYGcBw9ZOx9TTavH80bOCBjWg/GFnvs4f37tqVc1wMN2oGvcTF6HveQ==", + "version": "3.682.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.682.0.tgz", + "integrity": "sha512-7TyvYR9HdGH1/Nq0eeApUTM4izB6rExiw87khVYuJwZHr6FmvIL1FsOVFro/4WlXa0lg4LiYOm/8H8dHv+fXTg==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/core": "3.667.0", - "@aws-sdk/types": "3.667.0", - "@aws-sdk/util-endpoints": "3.667.0", + "@aws-sdk/core": "3.679.0", + "@aws-sdk/types": "3.679.0", + "@aws-sdk/util-endpoints": "3.679.0", "@smithy/core": "^2.4.8", "@smithy/protocol-http": "^4.1.4", "@smithy/types": "^3.5.0", @@ -631,12 +631,12 @@ } }, "node_modules/@aws-sdk/region-config-resolver": { - "version": "3.667.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.667.0.tgz", - "integrity": "sha512-iNr+JhhA902JMKHG9IwT9YdaEx6KGl6vjAL5BRNeOjfj4cZYMog6Lz/IlfOAltMtT0w88DAHDEFrBd2uO0l2eg==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.679.0.tgz", + "integrity": "sha512-Ybx54P8Tg6KKq5ck7uwdjiKif7n/8g1x+V0V9uTjBjRWqaIgiqzXwKWoPj6NCNkE7tJNtqI4JrNxp/3S3HvmRw==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.667.0", + "@aws-sdk/types": "3.679.0", "@smithy/node-config-provider": "^3.1.8", "@smithy/types": "^3.5.0", "@smithy/util-config-provider": "^3.0.0", @@ -648,12 +648,12 @@ } }, "node_modules/@aws-sdk/token-providers": { - "version": "3.667.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.667.0.tgz", - "integrity": "sha512-ZecJlG8p6D4UTYlBHwOWX6nknVtw/OBJ3yPXTSajBjhUlj9lE2xvejI8gl4rqkyLXk7z3bki+KR4tATbMaM9yg==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.679.0.tgz", + "integrity": "sha512-1/+Zso/x2jqgutKixYFQEGli0FELTgah6bm7aB+m2FAWH4Hz7+iMUsazg6nSWm714sG9G3h5u42Dmpvi9X6/hA==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.667.0", + "@aws-sdk/types": "3.679.0", "@smithy/property-provider": "^3.1.7", "@smithy/shared-ini-file-loader": "^3.1.8", "@smithy/types": "^3.5.0", @@ -663,13 +663,13 @@ "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sso-oidc": "^3.667.0" + "@aws-sdk/client-sso-oidc": "^3.679.0" } }, "node_modules/@aws-sdk/types": { - "version": "3.667.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.667.0.tgz", - "integrity": "sha512-gYq0xCsqFfQaSL/yT1Gl1vIUjtsg7d7RhnUfsXaHt8xTxOKRTdH9GjbesBjXOzgOvB0W0vfssfreSNGFlOOMJg==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.679.0.tgz", + "integrity": "sha512-NwVq8YvInxQdJ47+zz4fH3BRRLC6lL+WLkvr242PVBbUOLRyK/lkwHlfiKUoeVIMyK5NF+up6TRg71t/8Bny6Q==", "license": "Apache-2.0", "dependencies": { "@smithy/types": "^3.5.0", @@ -680,12 +680,12 @@ } }, "node_modules/@aws-sdk/util-endpoints": { - "version": "3.667.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.667.0.tgz", - "integrity": "sha512-X22SYDAuQJWnkF1/q17pkX3nGw5XMD9YEUbmt87vUnRq7iyJ3JOpl6UKOBeUBaL838wA5yzdbinmCITJ/VZ1QA==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.679.0.tgz", + "integrity": "sha512-YL6s4Y/1zC45OvddvgE139fjeWSKKPgLlnfrvhVL7alNyY9n7beR4uhoDpNrt5mI6sn9qiBF17790o+xLAXjjg==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.667.0", + "@aws-sdk/types": "3.679.0", "@smithy/types": "^3.5.0", "@smithy/util-endpoints": "^2.1.3", "tslib": "^2.6.2" @@ -695,9 +695,9 @@ } }, "node_modules/@aws-sdk/util-locate-window": { - "version": "3.568.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.568.0.tgz", - "integrity": "sha512-3nh4TINkXYr+H41QaPelCceEB2FXP3fxp93YZXB/kqJvX0U9j0N0Uk45gvsjmEPzG8XxkPEeLIfT2I1M7A6Lig==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.679.0.tgz", + "integrity": "sha512-zKTd48/ZWrCplkXpYDABI74rQlbR0DNHs8nH95htfSLj9/mWRSwaGptoxwcihaq/77vi/fl2X3y0a1Bo8bt7RA==", "license": "Apache-2.0", "dependencies": { "tslib": "^2.6.2" @@ -707,25 +707,25 @@ } }, "node_modules/@aws-sdk/util-user-agent-browser": { - "version": "3.670.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.670.0.tgz", - "integrity": "sha512-iRynWWazqEcCKwGMcQcywKTDLdLvqts1Yx474U64I9OKQXXwhOwhXbF5CAPSRta86lkVNAVYJa/0Bsv45pNn1A==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.679.0.tgz", + "integrity": "sha512-CusSm2bTBG1kFypcsqU8COhnYc6zltobsqs3nRrvYqYaOqtMnuE46K4XTWpnzKgwDejgZGOE+WYyprtAxrPvmQ==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.667.0", + "@aws-sdk/types": "3.679.0", "@smithy/types": "^3.5.0", "bowser": "^2.11.0", "tslib": "^2.6.2" } }, "node_modules/@aws-sdk/util-user-agent-node": { - "version": "3.669.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.669.0.tgz", - "integrity": "sha512-9jxCYrgggy2xd44ZASqI7AMiRVaSiFp+06Kg8BQSU0ijKpBJlwcsqIS8pDT/n6LxuOw2eV5ipvM2C0r1iKzrGA==", + "version": "3.682.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.682.0.tgz", + "integrity": "sha512-so5s+j0gPoTS0HM4HPL+G0ajk0T6cQAg8JXzRgvyiQAxqie+zGCZAV3VuVeMNWMVbzsgZl0pYZaatPFTLG/AxA==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/middleware-user-agent": "3.669.0", - "@aws-sdk/types": "3.667.0", + "@aws-sdk/middleware-user-agent": "3.682.0", + "@aws-sdk/types": "3.679.0", "@smithy/node-config-provider": "^3.1.8", "@smithy/types": "^3.5.0", "tslib": "^2.6.2" @@ -743,12 +743,13 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.25.7.tgz", - "integrity": "sha512-0xZJFNE5XMpENsgfHYTw8FbX4kv53mFLn2i3XPoq69LyhYSCBJtitaHx9QnsVTrsogI4Z3+HtEfZ2/GFPOtf5g==", + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", + "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", "license": "MIT", "dependencies": { - "@babel/highlight": "^7.25.7", + "@babel/helper-validator-identifier": "^7.25.9", + "js-tokens": "^4.0.0", "picocolors": "^1.0.0" }, "engines": { @@ -756,30 +757,30 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.25.8", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.8.tgz", - "integrity": "sha512-ZsysZyXY4Tlx+Q53XdnOFmqwfB9QDTHYxaZYajWRoBLuLEAwI2UIbtxOjWh/cFaa9IKUlcB+DDuoskLuKu56JA==", + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.2.tgz", + "integrity": "sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==", "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.25.8", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.8.tgz", - "integrity": "sha512-Oixnb+DzmRT30qu9d3tJSQkxuygWm32DFykT4bRoORPa9hZ/L4KhVB/XiRm6KG+roIEM7DBQlmg27kw2HZkdZg==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz", + "integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==", "license": "MIT", "dependencies": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.25.7", - "@babel/generator": "^7.25.7", - "@babel/helper-compilation-targets": "^7.25.7", - "@babel/helper-module-transforms": "^7.25.7", - "@babel/helpers": "^7.25.7", - "@babel/parser": "^7.25.8", - "@babel/template": "^7.25.7", - "@babel/traverse": "^7.25.7", - "@babel/types": "^7.25.8", + "@babel/code-frame": "^7.26.0", + "@babel/generator": "^7.26.0", + "@babel/helper-compilation-targets": "^7.25.9", + "@babel/helper-module-transforms": "^7.26.0", + "@babel/helpers": "^7.26.0", + "@babel/parser": "^7.26.0", + "@babel/template": "^7.25.9", + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.26.0", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -804,12 +805,13 @@ } }, "node_modules/@babel/generator": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.7.tgz", - "integrity": "sha512-5Dqpl5fyV9pIAD62yK9P7fcA768uVPUyrQmqpqstHWgMma4feF1x/oFysBCVZLY5wJ2GkMUCdsNDnGZrPoR6rA==", + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.2.tgz", + "integrity": "sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==", "license": "MIT", "dependencies": { - "@babel/types": "^7.25.7", + "@babel/parser": "^7.26.2", + "@babel/types": "^7.26.0", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^3.0.2" @@ -819,13 +821,13 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.7.tgz", - "integrity": "sha512-DniTEax0sv6isaw6qSQSfV4gVRNtw2rte8HHM45t9ZR0xILaufBRNkpMifCRiAPyvL4ACD6v0gfCwCmtOQaV4A==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz", + "integrity": "sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==", "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.25.7", - "@babel/helper-validator-option": "^7.25.7", + "@babel/compat-data": "^7.25.9", + "@babel/helper-validator-option": "^7.25.9", "browserslist": "^4.24.0", "lru-cache": "^5.1.1", "semver": "^6.3.1" @@ -859,28 +861,27 @@ "license": "ISC" }, "node_modules/@babel/helper-module-imports": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.7.tgz", - "integrity": "sha512-o0xCgpNmRohmnoWKQ0Ij8IdddjyBFE4T2kagL/x6M3+4zUgc+4qTOUBoNe4XxDskt1HPKO007ZPiMgLDq2s7Kw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz", + "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==", "license": "MIT", "dependencies": { - "@babel/traverse": "^7.25.7", - "@babel/types": "^7.25.7" + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.7.tgz", - "integrity": "sha512-k/6f8dKG3yDz/qCwSM+RKovjMix563SLxQFo0UhRNo239SP6n9u5/eLtKD6EAjwta2JHJ49CsD8pms2HdNiMMQ==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz", + "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==", "license": "MIT", "dependencies": { - "@babel/helper-module-imports": "^7.25.7", - "@babel/helper-simple-access": "^7.25.7", - "@babel/helper-validator-identifier": "^7.25.7", - "@babel/traverse": "^7.25.7" + "@babel/helper-module-imports": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9", + "@babel/traverse": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -890,89 +891,61 @@ } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.7.tgz", - "integrity": "sha512-eaPZai0PiqCi09pPs3pAFfl/zYgGaE6IdXtYvmf0qlcDTd3WCtO7JWCcRd64e0EQrcYgiHibEZnOGsSY4QSgaw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz", + "integrity": "sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==", "license": "MIT", "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/helper-simple-access": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.25.7.tgz", - "integrity": "sha512-FPGAkJmyoChQeM+ruBGIDyrT2tKfZJO8NcxdC+CWNJi7N8/rZpSxK7yvBJ5O/nF1gfu5KzN7VKG3YVSLFfRSxQ==", - "license": "MIT", - "dependencies": { - "@babel/traverse": "^7.25.7", - "@babel/types": "^7.25.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@babel/helper-string-parser": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.7.tgz", - "integrity": "sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz", + "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==", "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.7.tgz", - "integrity": "sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", + "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.7.tgz", - "integrity": "sha512-ytbPLsm+GjArDYXJ8Ydr1c/KJuutjF2besPNbIZnZ6MKUxi/uTA22t2ymmA4WFjZFpjiAMO0xuuJPqK2nvDVfQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz", + "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==", "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.7.tgz", - "integrity": "sha512-Sv6pASx7Esm38KQpF/U/OXLwPPrdGHNKoeblRxgZRLXnAtnkEe4ptJPDtAZM7fBLadbc1Q07kQpSiGQ0Jg6tRA==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.0.tgz", + "integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==", "license": "MIT", "dependencies": { - "@babel/template": "^7.25.7", - "@babel/types": "^7.25.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/highlight": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.25.7.tgz", - "integrity": "sha512-iYyACpW3iW8Fw+ZybQK+drQre+ns/tKpXbNESfrhNnPLIklLbXr7MYJ6gPEd0iETGLOK+SxMjVvKb/ffmk+FEw==", - "license": "MIT", - "dependencies": { - "@babel/helper-validator-identifier": "^7.25.7", - "chalk": "^2.4.2", - "js-tokens": "^4.0.0", - "picocolors": "^1.0.0" + "@babel/template": "^7.25.9", + "@babel/types": "^7.26.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/parser": { - "version": "7.25.8", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.8.tgz", - "integrity": "sha512-HcttkxzdPucv3nNFmfOOMfFf64KgdJVqm1KaCm25dPGMLElo9nsLvXeJECQg8UzPuBGLyTSA0ZzqCtDSzKTEoQ==", + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.2.tgz", + "integrity": "sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==", "license": "MIT", "dependencies": { - "@babel/types": "^7.25.8" + "@babel/types": "^7.26.0" }, "bin": { "parser": "bin/babel-parser.js" @@ -982,12 +955,12 @@ } }, "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.7.tgz", - "integrity": "sha512-xKcfLTlJYUczdaM1+epcdh1UGewJqr9zATgrNHcLBcV2QmfvPPEixo/sK/syql9cEmbr7ulu5HMFG5vbbt/sEA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz", + "integrity": "sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -997,12 +970,12 @@ } }, "node_modules/@babel/plugin-transform-parameters": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.7.tgz", - "integrity": "sha512-FYiTvku63me9+1Nz7TOx4YMtW3tWXzfANZtrzHhUZrz4d47EEtMQhzFoZWESfXuAMMT5mwzD4+y1N8ONAX6lMQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz", + "integrity": "sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1012,12 +985,12 @@ } }, "node_modules/@babel/plugin-transform-shorthand-properties": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.7.tgz", - "integrity": "sha512-uBbxNwimHi5Bv3hUccmOFlUy3ATO6WagTApenHz9KzoIdn0XeACdB12ZJ4cjhuB2WSi80Ez2FWzJnarccriJeA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz", + "integrity": "sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1027,30 +1000,30 @@ } }, "node_modules/@babel/template": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.7.tgz", - "integrity": "sha512-wRwtAgI3bAS+JGU2upWNL9lSlDcRCqD05BZ1n3X2ONLH1WilFP6O1otQjeMK/1g0pvYcXC7b/qVUB1keofjtZA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz", + "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==", "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.25.7", - "@babel/parser": "^7.25.7", - "@babel/types": "^7.25.7" + "@babel/code-frame": "^7.25.9", + "@babel/parser": "^7.25.9", + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.7.tgz", - "integrity": "sha512-jatJPT1Zjqvh/1FyJs6qAHL+Dzb7sTb+xr7Q+gM1b+1oBsMsQQ4FkVKb6dFlJvLlVssqkRzV05Jzervt9yhnzg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz", + "integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==", "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.25.7", - "@babel/generator": "^7.25.7", - "@babel/parser": "^7.25.7", - "@babel/template": "^7.25.7", - "@babel/types": "^7.25.7", + "@babel/code-frame": "^7.25.9", + "@babel/generator": "^7.25.9", + "@babel/parser": "^7.25.9", + "@babel/template": "^7.25.9", + "@babel/types": "^7.25.9", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -1059,14 +1032,13 @@ } }, "node_modules/@babel/types": { - "version": "7.25.8", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.8.tgz", - "integrity": "sha512-JWtuCu8VQsMladxVz/P4HzHUGCAwpuqacmowgXFs5XjxIgKuNjnLokQzuVjlTvIzODaDmpjT3oxcC48vyk9EWg==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.0.tgz", + "integrity": "sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==", "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^7.25.7", - "@babel/helper-validator-identifier": "^7.25.7", - "to-fast-properties": "^2.0.0" + "@babel/helper-string-parser": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1201,9 +1173,9 @@ } }, "node_modules/@mongodb-js/devtools-connect": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-3.3.1.tgz", - "integrity": "sha512-z9TJtUbDakYBKEB+/7fmBjFRcMCtiK/fIi04BKBs8cv71KmbS+PU76y6/7rE/TQucQ7/mPEhWs7+Z9TuKHR20A==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-3.3.2.tgz", + "integrity": "sha512-nrl6QL0c4OUX0ov1lceDalOttlsN56ST6A0lBXkhce7aDjYl5Q1+OR06C9npKOgw7QNOFzgCgNRgsd+e7kM2+Q==", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-proxy-support": "^0.4.1", @@ -1294,13 +1266,13 @@ } }, "node_modules/@mongosh/arg-parser": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@mongosh/arg-parser/-/arg-parser-2.3.2.tgz", - "integrity": "sha512-izy830Jvg1HxP7LnE68dhKvrhIALOCBf/GDI8egJZNfRcvR1VuzaquFhHyFtvhGeoqo+j9ujbaM/24v12+LLFg==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@mongosh/arg-parser/-/arg-parser-2.3.3.tgz", + "integrity": "sha512-CfRB87Tia64CaaxthfQazD3AlEVSXL8UlDvXdiIyMd2LorjSKZ505u1/eO2bEecRUY2TNk724HnQ7TVl8L78QA==", "license": "Apache-2.0", "dependencies": { - "@mongosh/errors": "2.3.2", - "@mongosh/i18n": "2.3.2", + "@mongosh/errors": "2.3.3", + "@mongosh/i18n": "2.3.3", "mongodb-connection-string-url": "^3.0.1" }, "engines": { @@ -1308,9 +1280,9 @@ } }, "node_modules/@mongosh/async-rewriter2": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@mongosh/async-rewriter2/-/async-rewriter2-2.3.2.tgz", - "integrity": "sha512-VhqTUpv3q+Q/2kyOY37RrHaLyOnxTFyBqGz+wmaS9kADorsVTa6DuIO9GF+JLomVzdyFuIW3uaoNYbwq+mnPCA==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@mongosh/async-rewriter2/-/async-rewriter2-2.3.3.tgz", + "integrity": "sha512-JWIQ0Uz5tm5Q7wJnXJMcCFK9G688YCXV6Z929Kwpel7GmAy3B3mvgY5p33sM2ysukcjIZL6g4nRuJ5LkeVJniw==", "license": "Apache-2.0", "dependencies": { "@babel/core": "^7.22.8", @@ -1327,13 +1299,13 @@ } }, "node_modules/@mongosh/autocomplete": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@mongosh/autocomplete/-/autocomplete-2.3.2.tgz", - "integrity": "sha512-bpqG9A/O9ILP0vdwEZwV0Wc0T+LzcyqnWx1RWrC3XvUqMz1kfj5IJNK6RI1D7WuueWfi+HF+GAkz4kLNfFkgrg==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@mongosh/autocomplete/-/autocomplete-2.3.3.tgz", + "integrity": "sha512-MtY9nPO+CTQeozjbUnTWYrH7DnvNEzp4lHdviHuf9mGzFlrtel+9WzyntzRTVxR+Zy5oMK5SZewY43Z8GCjpAg==", "license": "Apache-2.0", "dependencies": { "@mongodb-js/mongodb-constants": "^0.10.1", - "@mongosh/shell-api": "2.3.2", + "@mongosh/shell-api": "2.3.3", "semver": "^7.5.4" }, "engines": { @@ -1341,26 +1313,26 @@ } }, "node_modules/@mongosh/cli-repl": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@mongosh/cli-repl/-/cli-repl-2.3.2.tgz", - "integrity": "sha512-uiadUiZebVKYMuUPbtw8JiD2CiSuht28+Fk9DMD+ktYBKfoA8fF4pjqVvO0HVkEWIJaDZXCMiQXwgOc3L65BTw==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@mongosh/cli-repl/-/cli-repl-2.3.3.tgz", + "integrity": "sha512-xQpgweCyWHL3YRhLneHeASBO7RhVo+WsMp1nkXazZotrs0RYRLXGsGMjvXv8/vbA79aomicVY/oV6Nl5LhZ4Ew==", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-proxy-support": "^0.4.1", - "@mongosh/arg-parser": "2.3.2", - "@mongosh/autocomplete": "2.3.2", - "@mongosh/editor": "2.3.2", - "@mongosh/errors": "2.3.2", - "@mongosh/history": "2.3.2", - "@mongosh/i18n": "2.3.2", - "@mongosh/js-multiline-to-singleline": "2.3.2", - "@mongosh/logging": "2.3.2", - "@mongosh/service-provider-core": "2.3.2", - "@mongosh/service-provider-server": "2.3.2", - "@mongosh/shell-api": "2.3.2", - "@mongosh/shell-evaluator": "2.3.2", - "@mongosh/snippet-manager": "2.3.2", - "@mongosh/types": "2.3.2", + "@mongosh/arg-parser": "2.3.3", + "@mongosh/autocomplete": "2.3.3", + "@mongosh/editor": "2.3.3", + "@mongosh/errors": "2.3.3", + "@mongosh/history": "2.3.3", + "@mongosh/i18n": "2.3.3", + "@mongosh/js-multiline-to-singleline": "2.3.3", + "@mongosh/logging": "2.3.3", + "@mongosh/service-provider-core": "2.3.3", + "@mongosh/service-provider-node-driver": "2.3.3", + "@mongosh/shell-api": "2.3.3", + "@mongosh/shell-evaluator": "2.3.3", + "@mongosh/snippet-manager": "2.3.3", + "@mongosh/types": "2.3.3", "@segment/analytics-node": "^1.3.0", "ansi-escape-sequences": "^5.1.2", "askcharacter": "^2.0.4", @@ -1392,16 +1364,16 @@ } }, "node_modules/@mongosh/editor": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@mongosh/editor/-/editor-2.3.2.tgz", - "integrity": "sha512-J3c6mxE5SigMb1mz8qvNVbB+OZyom+r0NoqG5ZON45h+ZFl8ookYMQhXSh4qD0qZZbxdT0Ogm/87AaGfExF6EQ==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@mongosh/editor/-/editor-2.3.3.tgz", + "integrity": "sha512-Yba1rqltKYGHHsGyY7Bc5kvReV5iuBkyb5nYsJX2QVkxeJgkFlz+BQIVRJdiG29PN7RyfwqeEz5S3PDM21bb2g==", "license": "Apache-2.0", "dependencies": { - "@mongosh/js-multiline-to-singleline": "2.3.2", - "@mongosh/service-provider-core": "2.3.2", - "@mongosh/shell-api": "2.3.2", - "@mongosh/shell-evaluator": "2.3.2", - "@mongosh/types": "2.3.2", + "@mongosh/js-multiline-to-singleline": "2.3.3", + "@mongosh/service-provider-core": "2.3.3", + "@mongosh/shell-api": "2.3.3", + "@mongosh/shell-evaluator": "2.3.3", + "@mongosh/types": "2.3.3", "js-beautify": "^1.15.1" }, "engines": { @@ -1409,18 +1381,18 @@ } }, "node_modules/@mongosh/errors": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-2.3.2.tgz", - "integrity": "sha512-TKjWgKmxVW16+3+IcQNgv7RxSE3XinRKapxhs9E5nM5FDAXEMRMQnrhhb4KR9Wtp6phAywPSfNjWhuAeI91efQ==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-2.3.3.tgz", + "integrity": "sha512-rGeWzTOAkmrIobffPIoQMr79TPo8HbJh/7PAYJl3z8LQY2orS4SwJbZQsqrR0XgZE7ljVGSVigMjIy5KN79Qww==", "license": "Apache-2.0", "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/history": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-2.3.2.tgz", - "integrity": "sha512-+XLO1kbTwJ1XJ5PKpyU4vn+gqwGtTXQcF4zZIXwxZPN7a0MnBF2DaoMOvEkUYalG0/rkLdVdhILh17HM0mNLsA==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-2.3.3.tgz", + "integrity": "sha512-NzXRXSwO1qZfZG76vwUmJvD2BAEgSvvrsuJVRMRV8XmypegLc0tKnB2gKBPzv65Y9km02usi7BhWpoa6OvQkiw==", "license": "Apache-2.0", "dependencies": { "mongodb-connection-string-url": "^3.0.1", @@ -1431,21 +1403,21 @@ } }, "node_modules/@mongosh/i18n": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@mongosh/i18n/-/i18n-2.3.2.tgz", - "integrity": "sha512-n/h/305TRPUAbBunhULKiqf9QyNHfgpj8WQjPI/2nZdfCKw29cdkiYjBNEMKl1j3jIGD51/wYgIUT4e51vZUwg==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@mongosh/i18n/-/i18n-2.3.3.tgz", + "integrity": "sha512-essiM0eMiMcmgDMjd8gYfiZSHhN+zRl//ykrKcZSHr/2Dhsz01ran2bFihkuqxqUhNS6zYwjglTVPHu7Mz+Z4w==", "license": "Apache-2.0", "dependencies": { - "@mongosh/errors": "2.3.2" + "@mongosh/errors": "2.3.3" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/js-multiline-to-singleline": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.3.2.tgz", - "integrity": "sha512-Bvt7JSAUdODW94HOqjZ6C3LapAq0agDYVu9MXQJPuv+s+2x0K+rlZqiSLVUtus5m4GayTogY+LXvYZmoK+8CFQ==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.3.3.tgz", + "integrity": "sha512-XAtRFsbLajS1NgpKomLr+Mu5HEI5U66IkVA+v9P1xX5Q5RV6VkOMAKCtquU3IrkDIsrFobyYa6D/r8Oh1qnKKA==", "license": "Apache-2.0", "dependencies": { "@babel/core": "^7.16.12", @@ -1456,15 +1428,15 @@ } }, "node_modules/@mongosh/logging": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@mongosh/logging/-/logging-2.3.2.tgz", - "integrity": "sha512-gwFWHFTEddEFNyBb3e/vhYkkhkkNtwySDeXLPc2Ngf51zDYavFLUIsH07wz9CDdZ4Vo/MtwT/f09T1Yhg0XFsA==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@mongosh/logging/-/logging-2.3.3.tgz", + "integrity": "sha512-zhihgRJGZIzeyIlvMpyiawTXc+RMINTq/IkZ+Y769TUQvHGswqXDud/A9F7K/kSm37tk1KGvhBM1YsHiejJTnQ==", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-connect": "^3.3.0", - "@mongosh/errors": "2.3.2", - "@mongosh/history": "2.3.2", - "@mongosh/types": "2.3.2", + "@mongosh/errors": "2.3.3", + "@mongosh/history": "2.3.3", + "@mongosh/types": "2.3.3", "mongodb-log-writer": "^1.4.2", "mongodb-redact": "^1.1.2" }, @@ -1473,15 +1445,15 @@ } }, "node_modules/@mongosh/service-provider-core": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-2.3.2.tgz", - "integrity": "sha512-lQqLuFojElKADTueYIE6gUPud31zrNwsFNk23mgH/PKDDYHGtYt5ZKQ7aAFe57HSMUZXk13SiANFukdoTcfvtA==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-2.3.3.tgz", + "integrity": "sha512-8LIl5tBgwuuUYT9VMxdPf7Aow1D9kCUbuTzTOO7vLVYoihxAPyLcR3+N85zV4wVvKSZH69lGoFW3xFDwdTyBGQ==", "license": "Apache-2.0", "dependencies": { "@aws-sdk/credential-providers": "^3.525.0", - "@mongosh/errors": "2.3.2", - "bson": "^6.8.0", - "mongodb": "^6.9.0", + "@mongosh/errors": "2.3.3", + "bson": "^6.9.0", + "mongodb": "^6.10.0", "mongodb-build-info": "^1.7.2", "mongodb-connection-string-url": "^3.0.1" }, @@ -1492,19 +1464,19 @@ "mongodb-client-encryption": "^6.1.0" } }, - "node_modules/@mongosh/service-provider-server": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@mongosh/service-provider-server/-/service-provider-server-2.3.2.tgz", - "integrity": "sha512-nDrgmmA/JWyUEW551/m2O4btibc8E+kpOcTvp4LNNZwFO4flqKozMv4NKBMxnYrqTjxIEp+A4WzFEND7yesVHg==", + "node_modules/@mongosh/service-provider-node-driver": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@mongosh/service-provider-node-driver/-/service-provider-node-driver-2.3.3.tgz", + "integrity": "sha512-82ORgX2X0mLAsyOqsLjMOGN6A1nrVS76PVoL3X9oaegcGkMduShl7mAebpAusxdXl9nNBqtsnT7PDF0X/tOAOA==", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-connect": "^3.3.0", "@mongodb-js/oidc-plugin": "^1.1.1", - "@mongosh/errors": "2.3.2", - "@mongosh/service-provider-core": "2.3.2", - "@mongosh/types": "2.3.2", + "@mongosh/errors": "2.3.3", + "@mongosh/service-provider-core": "2.3.3", + "@mongosh/types": "2.3.3", "aws4": "^1.12.0", - "mongodb": "^6.9.0", + "mongodb": "^6.10.0", "mongodb-connection-string-url": "^3.0.1", "socks": "^2.8.3" }, @@ -1516,7 +1488,7 @@ "mongodb-client-encryption": "^6.1.0" } }, - "node_modules/@mongosh/service-provider-server/node_modules/kerberos": { + "node_modules/@mongosh/service-provider-node-driver/node_modules/kerberos": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/kerberos/-/kerberos-2.1.0.tgz", "integrity": "sha512-HvOl6O6cyEN/8Z4CAocHe/sekJtvt5UrxUdCuu7bXDZ2Hnsy6OpsQbISW+lpm03vrbO2ir+1QQ5Sx/vMEhHnog==", @@ -1532,14 +1504,14 @@ "node": ">=12.9.0" } }, - "node_modules/@mongosh/service-provider-server/node_modules/node-addon-api": { + "node_modules/@mongosh/service-provider-node-driver/node_modules/node-addon-api": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz", "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==", "license": "MIT", "optional": true }, - "node_modules/@mongosh/service-provider-server/node_modules/prebuild-install": { + "node_modules/@mongosh/service-provider-node-driver/node_modules/prebuild-install": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz", "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==", @@ -1567,16 +1539,16 @@ } }, "node_modules/@mongosh/shell-api": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-2.3.2.tgz", - "integrity": "sha512-VDj6XVn7m6qHWphJAxPAnQ4HknJ2VZWwQFfQHm9u/6HFDnpAdnN/bubY9nawc55qdZTadpvg5m9YvmOZ3541rA==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-2.3.3.tgz", + "integrity": "sha512-hXnjEhW1ISH4J8UZOY0zqeZ51rkRqwoy1xfqya65Oyn22vQkO9ZR5XL3HzNVsH5h2Axvope2jbJGNsRGk0LQOQ==", "license": "Apache-2.0", "dependencies": { - "@mongosh/arg-parser": "2.3.2", - "@mongosh/errors": "2.3.2", - "@mongosh/history": "2.3.2", - "@mongosh/i18n": "2.3.2", - "@mongosh/service-provider-core": "2.3.2", + "@mongosh/arg-parser": "2.3.3", + "@mongosh/errors": "2.3.3", + "@mongosh/history": "2.3.3", + "@mongosh/i18n": "2.3.3", + "@mongosh/service-provider-core": "2.3.3", "mongodb-redact": "^1.1.2" }, "engines": { @@ -1584,30 +1556,30 @@ } }, "node_modules/@mongosh/shell-evaluator": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@mongosh/shell-evaluator/-/shell-evaluator-2.3.2.tgz", - "integrity": "sha512-dQPRrsi60SFrn/p0vHkcsR+i7hUSQagdwkj0JarqDtGFuowWn6f2t4crSklOjM0wie4Bi/bsXwtFyGEUl+YN2g==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@mongosh/shell-evaluator/-/shell-evaluator-2.3.3.tgz", + "integrity": "sha512-+TJxh3HgNmkApMNPsbZiZm/gqui3EYUuinZJtqWpZkisLA4dlTbuAGjkS4pKFS6CU1lLYk+7ytfj0oXFx9Ij2w==", "license": "Apache-2.0", "dependencies": { - "@mongosh/async-rewriter2": "2.3.2", - "@mongosh/history": "2.3.2", - "@mongosh/shell-api": "2.3.2" + "@mongosh/async-rewriter2": "2.3.3", + "@mongosh/history": "2.3.3", + "@mongosh/shell-api": "2.3.3" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/snippet-manager": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@mongosh/snippet-manager/-/snippet-manager-2.3.2.tgz", - "integrity": "sha512-h7fU2uEBPulvJdXinvz3Y17XSEIbw3ibRHabNaA/T6hM31GzxOQ2QHSawGJK+LNf0VyzwQ2L8bzFtJetoJq1OQ==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@mongosh/snippet-manager/-/snippet-manager-2.3.3.tgz", + "integrity": "sha512-Lf2X9tLIDPnI9pXZfHA1jMQlbcsLKpgTHaCkfxitLinuxFXSrBlPYoVxAngbRccL2W67aK+l3FhxmKg8JMS/gg==", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-proxy-support": "^0.4.1", - "@mongosh/errors": "2.3.2", - "@mongosh/shell-api": "2.3.2", - "@mongosh/types": "2.3.2", - "bson": "^6.8.0", + "@mongosh/errors": "2.3.3", + "@mongosh/shell-api": "2.3.3", + "@mongosh/types": "2.3.3", + "bson": "^6.9.0", "cross-spawn": "^7.0.3", "escape-string-regexp": "^4.0.0", "joi": "^17.4.0", @@ -1618,9 +1590,9 @@ } }, "node_modules/@mongosh/types": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-2.3.2.tgz", - "integrity": "sha512-QXKsjEVsz1X2WyvWNyGsI+8Zs3/Z+vbCiBOC3t95JrGJlbkz5uPjGbAwcXSZTheehdCd01spgedSNn3r5yQDtQ==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-2.3.3.tgz", + "integrity": "sha512-Jw/SOOPlK+O7NpD6yrtNVqvUDs96Cilb5IFjbKAeBi4z+vfjdDjBsCtpD9HfI8dc5Wh9PMZtOsbjsVhdBvvqXA==", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-connect": "^3.3.0" @@ -1747,12 +1719,12 @@ "license": "BSD-3-Clause" }, "node_modules/@smithy/abort-controller": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.5.tgz", - "integrity": "sha512-DhNPnqTqPoG8aZ5dWkFOgsuY+i0GQ3CI6hMmvCoduNsnU9gUZWZBwGfDQsTTB7NvFPkom1df7jMIJWU90kuXXg==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.6.tgz", + "integrity": "sha512-0XuhuHQlEqbNQZp7QxxrFTdVWdwxch4vjxYgfInF91hZFkPxf9QDrdQka0KfxFMPqLNzSw0b95uGTrLliQUavQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.5.0", + "@smithy/types": "^3.6.0", "tslib": "^2.6.2" }, "engines": { @@ -1760,15 +1732,15 @@ } }, "node_modules/@smithy/config-resolver": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-3.0.9.tgz", - "integrity": "sha512-5d9oBf40qC7n2xUoHmntKLdqsyTMMo/r49+eqSIjJ73eDfEtljAxEhzIQ3bkgXJtR3xiv7YzMT/3FF3ORkjWdg==", + "version": "3.0.10", + "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-3.0.10.tgz", + "integrity": "sha512-Uh0Sz9gdUuz538nvkPiyv1DZRX9+D15EKDtnQP5rYVAzM/dnYk3P8cg73jcxyOitPgT3mE3OVj7ky7sibzHWkw==", "license": "Apache-2.0", "dependencies": { - "@smithy/node-config-provider": "^3.1.8", - "@smithy/types": "^3.5.0", + "@smithy/node-config-provider": "^3.1.9", + "@smithy/types": "^3.6.0", "@smithy/util-config-provider": "^3.0.0", - "@smithy/util-middleware": "^3.0.7", + "@smithy/util-middleware": "^3.0.8", "tslib": "^2.6.2" }, "engines": { @@ -1776,19 +1748,17 @@ } }, "node_modules/@smithy/core": { - "version": "2.4.8", - "resolved": "https://registry.npmjs.org/@smithy/core/-/core-2.4.8.tgz", - "integrity": "sha512-x4qWk7p/a4dcf7Vxb2MODIf4OIcqNbK182WxRvZ/3oKPrf/6Fdic5sSElhO1UtXpWKBazWfqg0ZEK9xN1DsuHA==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@smithy/core/-/core-2.5.1.tgz", + "integrity": "sha512-DujtuDA7BGEKExJ05W5OdxCoyekcKT3Rhg1ZGeiUWaz2BJIWXjZmsG/DIP4W48GHno7AQwRsaCb8NcBgH3QZpg==", "license": "Apache-2.0", "dependencies": { - "@smithy/middleware-endpoint": "^3.1.4", - "@smithy/middleware-retry": "^3.0.23", - "@smithy/middleware-serde": "^3.0.7", - "@smithy/protocol-http": "^4.1.4", - "@smithy/smithy-client": "^3.4.0", - "@smithy/types": "^3.5.0", + "@smithy/middleware-serde": "^3.0.8", + "@smithy/protocol-http": "^4.1.5", + "@smithy/types": "^3.6.0", "@smithy/util-body-length-browser": "^3.0.0", - "@smithy/util-middleware": "^3.0.7", + "@smithy/util-middleware": "^3.0.8", + "@smithy/util-stream": "^3.2.1", "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, @@ -1797,15 +1767,15 @@ } }, "node_modules/@smithy/credential-provider-imds": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-3.2.4.tgz", - "integrity": "sha512-S9bb0EIokfYEuar4kEbLta+ivlKCWOCFsLZuilkNy9i0uEUEHSi47IFLPaxqqCl+0ftKmcOTHayY5nQhAuq7+w==", + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-3.2.5.tgz", + "integrity": "sha512-4FTQGAsuwqTzVMmiRVTn0RR9GrbRfkP0wfu/tXWVHd2LgNpTY0uglQpIScXK4NaEyXbB3JmZt8gfVqO50lP8wg==", "license": "Apache-2.0", "dependencies": { - "@smithy/node-config-provider": "^3.1.8", - "@smithy/property-provider": "^3.1.7", - "@smithy/types": "^3.5.0", - "@smithy/url-parser": "^3.0.7", + "@smithy/node-config-provider": "^3.1.9", + "@smithy/property-provider": "^3.1.8", + "@smithy/types": "^3.6.0", + "@smithy/url-parser": "^3.0.8", "tslib": "^2.6.2" }, "engines": { @@ -1826,12 +1796,12 @@ } }, "node_modules/@smithy/hash-node": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-3.0.7.tgz", - "integrity": "sha512-SAGHN+QkrwcHFjfWzs/czX94ZEjPJ0CrWJS3M43WswDXVEuP4AVy9gJ3+AF6JQHZD13bojmuf/Ap/ItDeZ+Qfw==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-3.0.8.tgz", + "integrity": "sha512-tlNQYbfpWXHimHqrvgo14DrMAgUBua/cNoz9fMYcDmYej7MAmUcjav/QKQbFc3NrcPxeJ7QClER4tWZmfwoPng==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.5.0", + "@smithy/types": "^3.6.0", "@smithy/util-buffer-from": "^3.0.0", "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" @@ -1841,12 +1811,12 @@ } }, "node_modules/@smithy/invalid-dependency": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-3.0.7.tgz", - "integrity": "sha512-Bq00GsAhHeYSuZX8Kpu4sbI9agH2BNYnqUmmbTGWOhki9NVsWn2jFr896vvoTMH8KAjNX/ErC/8t5QHuEXG+IA==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-3.0.8.tgz", + "integrity": "sha512-7Qynk6NWtTQhnGTTZwks++nJhQ1O54Mzi7fz4PqZOiYXb4Z1Flpb2yRvdALoggTS8xjtohWUM+RygOtB30YL3Q==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.5.0", + "@smithy/types": "^3.6.0", "tslib": "^2.6.2" } }, @@ -1863,13 +1833,13 @@ } }, "node_modules/@smithy/middleware-content-length": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.9.tgz", - "integrity": "sha512-t97PidoGElF9hTtLCrof32wfWMqC5g2SEJNxaVH3NjlatuNGsdxXRYO/t+RPnxA15RpYiS0f+zG7FuE2DeGgjA==", + "version": "3.0.10", + "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.10.tgz", + "integrity": "sha512-T4dIdCs1d/+/qMpwhJ1DzOhxCZjZHbHazEPJWdB4GDi2HjIZllVzeBEcdJUN0fomV8DURsgOyrbEUzg3vzTaOg==", "license": "Apache-2.0", "dependencies": { - "@smithy/protocol-http": "^4.1.4", - "@smithy/types": "^3.5.0", + "@smithy/protocol-http": "^4.1.5", + "@smithy/types": "^3.6.0", "tslib": "^2.6.2" }, "engines": { @@ -1877,17 +1847,18 @@ } }, "node_modules/@smithy/middleware-endpoint": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.1.4.tgz", - "integrity": "sha512-/ChcVHekAyzUbyPRI8CzPPLj6y8QRAfJngWcLMgsWxKVzw/RzBV69mSOzJYDD3pRwushA1+5tHtPF8fjmzBnrQ==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.2.1.tgz", + "integrity": "sha512-wWO3xYmFm6WRW8VsEJ5oU6h7aosFXfszlz3Dj176pTij6o21oZnzkCLzShfmRaaCHDkBXWBdO0c4sQAvLFP6zA==", "license": "Apache-2.0", "dependencies": { - "@smithy/middleware-serde": "^3.0.7", - "@smithy/node-config-provider": "^3.1.8", - "@smithy/shared-ini-file-loader": "^3.1.8", - "@smithy/types": "^3.5.0", - "@smithy/url-parser": "^3.0.7", - "@smithy/util-middleware": "^3.0.7", + "@smithy/core": "^2.5.1", + "@smithy/middleware-serde": "^3.0.8", + "@smithy/node-config-provider": "^3.1.9", + "@smithy/shared-ini-file-loader": "^3.1.9", + "@smithy/types": "^3.6.0", + "@smithy/url-parser": "^3.0.8", + "@smithy/util-middleware": "^3.0.8", "tslib": "^2.6.2" }, "engines": { @@ -1895,18 +1866,18 @@ } }, "node_modules/@smithy/middleware-retry": { - "version": "3.0.23", - "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.23.tgz", - "integrity": "sha512-x9PbGXxkcXIpm6L26qRSCC+eaYcHwybRmqU8LO/WM2RRlW0g8lz6FIiKbKgGvHuoK3dLZRiQVSQJveiCzwnA5A==", + "version": "3.0.25", + "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.25.tgz", + "integrity": "sha512-m1F70cPaMBML4HiTgCw5I+jFNtjgz5z5UdGnUbG37vw6kh4UvizFYjqJGHvicfgKMkDL6mXwyPp5mhZg02g5sg==", "license": "Apache-2.0", "dependencies": { - "@smithy/node-config-provider": "^3.1.8", - "@smithy/protocol-http": "^4.1.4", - "@smithy/service-error-classification": "^3.0.7", - "@smithy/smithy-client": "^3.4.0", - "@smithy/types": "^3.5.0", - "@smithy/util-middleware": "^3.0.7", - "@smithy/util-retry": "^3.0.7", + "@smithy/node-config-provider": "^3.1.9", + "@smithy/protocol-http": "^4.1.5", + "@smithy/service-error-classification": "^3.0.8", + "@smithy/smithy-client": "^3.4.2", + "@smithy/types": "^3.6.0", + "@smithy/util-middleware": "^3.0.8", + "@smithy/util-retry": "^3.0.8", "tslib": "^2.6.2", "uuid": "^9.0.1" }, @@ -1915,12 +1886,12 @@ } }, "node_modules/@smithy/middleware-serde": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.7.tgz", - "integrity": "sha512-VytaagsQqtH2OugzVTq4qvjkLNbWehHfGcGr0JLJmlDRrNCeZoWkWsSOw1nhS/4hyUUWF/TLGGml4X/OnEep5g==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.8.tgz", + "integrity": "sha512-Xg2jK9Wc/1g/MBMP/EUn2DLspN8LNt+GMe7cgF+Ty3vl+Zvu+VeZU5nmhveU+H8pxyTsjrAkci8NqY6OuvZnjA==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.5.0", + "@smithy/types": "^3.6.0", "tslib": "^2.6.2" }, "engines": { @@ -1928,12 +1899,12 @@ } }, "node_modules/@smithy/middleware-stack": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.7.tgz", - "integrity": "sha512-EyTbMCdqS1DoeQsO4gI7z2Gzq1MoRFAeS8GkFYIwbedB7Lp5zlLHJdg+56tllIIG5Hnf9ZWX48YKSHlsKvugGA==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.8.tgz", + "integrity": "sha512-d7ZuwvYgp1+3682Nx0MD3D/HtkmZd49N3JUndYWQXfRZrYEnCWYc8BHcNmVsPAp9gKvlurdg/mubE6b/rPS9MA==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.5.0", + "@smithy/types": "^3.6.0", "tslib": "^2.6.2" }, "engines": { @@ -1941,14 +1912,14 @@ } }, "node_modules/@smithy/node-config-provider": { - "version": "3.1.8", - "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.8.tgz", - "integrity": "sha512-E0rU0DglpeJn5ge64mk8wTGEXcQwmpUTY5Zr7IzTpDLmHKiIamINERNZYrPQjg58Ck236sEKSwRSHA4CwshU6Q==", + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.9.tgz", + "integrity": "sha512-qRHoah49QJ71eemjuS/WhUXB+mpNtwHRWQr77J/m40ewBVVwvo52kYAmb7iuaECgGTTcYxHS4Wmewfwy++ueew==", "license": "Apache-2.0", "dependencies": { - "@smithy/property-provider": "^3.1.7", - "@smithy/shared-ini-file-loader": "^3.1.8", - "@smithy/types": "^3.5.0", + "@smithy/property-provider": "^3.1.8", + "@smithy/shared-ini-file-loader": "^3.1.9", + "@smithy/types": "^3.6.0", "tslib": "^2.6.2" }, "engines": { @@ -1956,15 +1927,15 @@ } }, "node_modules/@smithy/node-http-handler": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.2.4.tgz", - "integrity": "sha512-49reY3+JgLMFNm7uTAKBWiKCA6XSvkNp9FqhVmusm2jpVnHORYFeFZ704LShtqWfjZW/nhX+7Iexyb6zQfXYIQ==", + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.2.5.tgz", + "integrity": "sha512-PkOwPNeKdvX/jCpn0A8n9/TyoxjGZB8WVoJmm9YzsnAgggTj4CrjpRHlTQw7dlLZ320n1mY1y+nTRUDViKi/3w==", "license": "Apache-2.0", "dependencies": { - "@smithy/abort-controller": "^3.1.5", - "@smithy/protocol-http": "^4.1.4", - "@smithy/querystring-builder": "^3.0.7", - "@smithy/types": "^3.5.0", + "@smithy/abort-controller": "^3.1.6", + "@smithy/protocol-http": "^4.1.5", + "@smithy/querystring-builder": "^3.0.8", + "@smithy/types": "^3.6.0", "tslib": "^2.6.2" }, "engines": { @@ -1972,12 +1943,12 @@ } }, "node_modules/@smithy/property-provider": { - "version": "3.1.7", - "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.7.tgz", - "integrity": "sha512-QfzLi1GPMisY7bAM5hOUqBdGYnY5S2JAlr201pghksrQv139f8iiiMalXtjczIP5f6owxFn3MINLNUNvUkgtPw==", + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.8.tgz", + "integrity": "sha512-ukNUyo6rHmusG64lmkjFeXemwYuKge1BJ8CtpVKmrxQxc6rhUX0vebcptFA9MmrGsnLhwnnqeH83VTU9hwOpjA==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.5.0", + "@smithy/types": "^3.6.0", "tslib": "^2.6.2" }, "engines": { @@ -1985,12 +1956,12 @@ } }, "node_modules/@smithy/protocol-http": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.4.tgz", - "integrity": "sha512-MlWK8eqj0JlpZBnWmjQLqmFp71Ug00P+m72/1xQB3YByXD4zZ+y9N4hYrR0EDmrUCZIkyATWHOXFgtavwGDTzQ==", + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.5.tgz", + "integrity": "sha512-hsjtwpIemmCkm3ZV5fd/T0bPIugW1gJXwZ/hpuVubt2hEUApIoUTrf6qIdh9MAWlw0vjMrA1ztJLAwtNaZogvg==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.5.0", + "@smithy/types": "^3.6.0", "tslib": "^2.6.2" }, "engines": { @@ -1998,12 +1969,12 @@ } }, "node_modules/@smithy/querystring-builder": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.7.tgz", - "integrity": "sha512-65RXGZZ20rzqqxTsChdqSpbhA6tdt5IFNgG6o7e1lnPVLCe6TNWQq4rTl4N87hTDD8mV4IxJJnvyE7brbnRkQw==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.8.tgz", + "integrity": "sha512-btYxGVqFUARbUrN6VhL9c3dnSviIwBYD9Rz1jHuN1hgh28Fpv2xjU1HeCeDJX68xctz7r4l1PBnFhGg1WBBPuA==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.5.0", + "@smithy/types": "^3.6.0", "@smithy/util-uri-escape": "^3.0.0", "tslib": "^2.6.2" }, @@ -2012,12 +1983,12 @@ } }, "node_modules/@smithy/querystring-parser": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.7.tgz", - "integrity": "sha512-Fouw4KJVWqqUVIu1gZW8BH2HakwLz6dvdrAhXeXfeymOBrZw+hcqaWs+cS1AZPVp4nlbeIujYrKA921ZW2WMPA==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.8.tgz", + "integrity": "sha512-BtEk3FG7Ks64GAbt+JnKqwuobJNX8VmFLBsKIwWr1D60T426fGrV2L3YS5siOcUhhp6/Y6yhBw1PSPxA5p7qGg==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.5.0", + "@smithy/types": "^3.6.0", "tslib": "^2.6.2" }, "engines": { @@ -2025,24 +1996,24 @@ } }, "node_modules/@smithy/service-error-classification": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.7.tgz", - "integrity": "sha512-91PRkTfiBf9hxkIchhRKJfl1rsplRDyBnmyFca3y0Z3x/q0JJN480S83LBd8R6sBCkm2bBbqw2FHp0Mbh+ecSA==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.8.tgz", + "integrity": "sha512-uEC/kCCFto83bz5ZzapcrgGqHOh/0r69sZ2ZuHlgoD5kYgXJEThCoTuw/y1Ub3cE7aaKdznb+jD9xRPIfIwD7g==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.5.0" + "@smithy/types": "^3.6.0" }, "engines": { "node": ">=16.0.0" } }, "node_modules/@smithy/shared-ini-file-loader": { - "version": "3.1.8", - "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.8.tgz", - "integrity": "sha512-0NHdQiSkeGl0ICQKcJQ2lCOKH23Nb0EaAa7RDRId6ZqwXkw4LJyIyZ0t3iusD4bnKYDPLGy2/5e2rfUhrt0Acw==", + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.9.tgz", + "integrity": "sha512-/+OsJRNtoRbtsX0UpSgWVxFZLsJHo/4sTr+kBg/J78sr7iC+tHeOvOJrS5hCpVQ6sWBbhWLp1UNiuMyZhE6pmA==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.5.0", + "@smithy/types": "^3.6.0", "tslib": "^2.6.2" }, "engines": { @@ -2050,16 +2021,16 @@ } }, "node_modules/@smithy/signature-v4": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-4.2.0.tgz", - "integrity": "sha512-LafbclHNKnsorMgUkKm7Tk7oJ7xizsZ1VwqhGKqoCIrXh4fqDDp73fK99HOEEgcsQbtemmeY/BPv0vTVYYUNEQ==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-4.2.1.tgz", + "integrity": "sha512-NsV1jF4EvmO5wqmaSzlnTVetemBS3FZHdyc5CExbDljcyJCEEkJr8ANu2JvtNbVg/9MvKAWV44kTrGS+Pi4INg==", "license": "Apache-2.0", "dependencies": { "@smithy/is-array-buffer": "^3.0.0", - "@smithy/protocol-http": "^4.1.4", - "@smithy/types": "^3.5.0", + "@smithy/protocol-http": "^4.1.5", + "@smithy/types": "^3.6.0", "@smithy/util-hex-encoding": "^3.0.0", - "@smithy/util-middleware": "^3.0.7", + "@smithy/util-middleware": "^3.0.8", "@smithy/util-uri-escape": "^3.0.0", "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" @@ -2069,16 +2040,17 @@ } }, "node_modules/@smithy/smithy-client": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.4.0.tgz", - "integrity": "sha512-nOfJ1nVQsxiP6srKt43r2My0Gp5PLWCW2ASqUioxIiGmu6d32v4Nekidiv5qOmmtzIrmaD+ADX5SKHUuhReeBQ==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.4.2.tgz", + "integrity": "sha512-dxw1BDxJiY9/zI3cBqfVrInij6ShjpV4fmGHesGZZUiP9OSE/EVfdwdRz0PgvkEvrZHpsj2htRaHJfftE8giBA==", "license": "Apache-2.0", "dependencies": { - "@smithy/middleware-endpoint": "^3.1.4", - "@smithy/middleware-stack": "^3.0.7", - "@smithy/protocol-http": "^4.1.4", - "@smithy/types": "^3.5.0", - "@smithy/util-stream": "^3.1.9", + "@smithy/core": "^2.5.1", + "@smithy/middleware-endpoint": "^3.2.1", + "@smithy/middleware-stack": "^3.0.8", + "@smithy/protocol-http": "^4.1.5", + "@smithy/types": "^3.6.0", + "@smithy/util-stream": "^3.2.1", "tslib": "^2.6.2" }, "engines": { @@ -2086,9 +2058,9 @@ } }, "node_modules/@smithy/types": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.5.0.tgz", - "integrity": "sha512-QN0twHNfe8mNJdH9unwsCK13GURU7oEAZqkBI+rsvpv1jrmserO+WnLE7jidR9W/1dxwZ0u/CB01mV2Gms/K2Q==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.6.0.tgz", + "integrity": "sha512-8VXK/KzOHefoC65yRgCn5vG1cysPJjHnOVt9d0ybFQSmJgQj152vMn4EkYhGuaOmnnZvCPav/KnYyE6/KsNZ2w==", "license": "Apache-2.0", "dependencies": { "tslib": "^2.6.2" @@ -2098,13 +2070,13 @@ } }, "node_modules/@smithy/url-parser": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.7.tgz", - "integrity": "sha512-70UbSSR8J97c1rHZOWhl+VKiZDqHWxs/iW8ZHrHp5fCCPLSBE7GcUlUvKSle3Ca+J9LLbYCj/A79BxztBvAfpA==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.8.tgz", + "integrity": "sha512-4FdOhwpTW7jtSFWm7SpfLGKIBC9ZaTKG5nBF0wK24aoQKQyDIKUw3+KFWCQ9maMzrgTJIuOvOnsV2lLGW5XjTg==", "license": "Apache-2.0", "dependencies": { - "@smithy/querystring-parser": "^3.0.7", - "@smithy/types": "^3.5.0", + "@smithy/querystring-parser": "^3.0.8", + "@smithy/types": "^3.6.0", "tslib": "^2.6.2" } }, @@ -2169,14 +2141,14 @@ } }, "node_modules/@smithy/util-defaults-mode-browser": { - "version": "3.0.23", - "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.23.tgz", - "integrity": "sha512-Y07qslyRtXDP/C5aWKqxTPBl4YxplEELG3xRrz2dnAQ6Lq/FgNrcKWmV561nNaZmFH+EzeGOX3ZRMbU8p1T6Nw==", + "version": "3.0.25", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.25.tgz", + "integrity": "sha512-fRw7zymjIDt6XxIsLwfJfYUfbGoO9CmCJk6rjJ/X5cd20+d2Is7xjU5Kt/AiDt6hX8DAf5dztmfP5O82gR9emA==", "license": "Apache-2.0", "dependencies": { - "@smithy/property-provider": "^3.1.7", - "@smithy/smithy-client": "^3.4.0", - "@smithy/types": "^3.5.0", + "@smithy/property-provider": "^3.1.8", + "@smithy/smithy-client": "^3.4.2", + "@smithy/types": "^3.6.0", "bowser": "^2.11.0", "tslib": "^2.6.2" }, @@ -2185,17 +2157,17 @@ } }, "node_modules/@smithy/util-defaults-mode-node": { - "version": "3.0.23", - "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.23.tgz", - "integrity": "sha512-9Y4WH7f0vnDGuHUa4lGX9e2p+sMwODibsceSV6rfkZOvMC+BY3StB2LdO1NHafpsyHJLpwAgChxQ38tFyd6vkg==", + "version": "3.0.25", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.25.tgz", + "integrity": "sha512-H3BSZdBDiVZGzt8TG51Pd2FvFO0PAx/A0mJ0EH8a13KJ6iUCdYnw/Dk/MdC1kTd0eUuUGisDFaxXVXo4HHFL1g==", "license": "Apache-2.0", "dependencies": { - "@smithy/config-resolver": "^3.0.9", - "@smithy/credential-provider-imds": "^3.2.4", - "@smithy/node-config-provider": "^3.1.8", - "@smithy/property-provider": "^3.1.7", - "@smithy/smithy-client": "^3.4.0", - "@smithy/types": "^3.5.0", + "@smithy/config-resolver": "^3.0.10", + "@smithy/credential-provider-imds": "^3.2.5", + "@smithy/node-config-provider": "^3.1.9", + "@smithy/property-provider": "^3.1.8", + "@smithy/smithy-client": "^3.4.2", + "@smithy/types": "^3.6.0", "tslib": "^2.6.2" }, "engines": { @@ -2203,13 +2175,13 @@ } }, "node_modules/@smithy/util-endpoints": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-2.1.3.tgz", - "integrity": "sha512-34eACeKov6jZdHqS5hxBMJ4KyWKztTMulhuQ2UdOoP6vVxMLrOKUqIXAwJe/wiWMhXhydLW664B02CNpQBQ4Aw==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-2.1.4.tgz", + "integrity": "sha512-kPt8j4emm7rdMWQyL0F89o92q10gvCUa6sBkBtDJ7nV2+P7wpXczzOfoDJ49CKXe5CCqb8dc1W+ZdLlrKzSAnQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/node-config-provider": "^3.1.8", - "@smithy/types": "^3.5.0", + "@smithy/node-config-provider": "^3.1.9", + "@smithy/types": "^3.6.0", "tslib": "^2.6.2" }, "engines": { @@ -2229,12 +2201,12 @@ } }, "node_modules/@smithy/util-middleware": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.7.tgz", - "integrity": "sha512-OVA6fv/3o7TMJTpTgOi1H5OTwnuUa8hzRzhSFDtZyNxi6OZ70L/FHattSmhE212I7b6WSOJAAmbYnvcjTHOJCA==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.8.tgz", + "integrity": "sha512-p7iYAPaQjoeM+AKABpYWeDdtwQNxasr4aXQEA/OmbOaug9V0odRVDy3Wx4ci8soljE/JXQo+abV0qZpW8NX0yA==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.5.0", + "@smithy/types": "^3.6.0", "tslib": "^2.6.2" }, "engines": { @@ -2242,13 +2214,13 @@ } }, "node_modules/@smithy/util-retry": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.7.tgz", - "integrity": "sha512-nh1ZO1vTeo2YX1plFPSe/OXaHkLAHza5jpokNiiKX2M5YpNUv6RxGJZhpfmiR4jSvVHCjIDmILjrxKmP+/Ghug==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.8.tgz", + "integrity": "sha512-TCEhLnY581YJ+g1x0hapPz13JFqzmh/pMWL2KEFASC51qCfw3+Y47MrTmea4bUE5vsdxQ4F6/KFbUeSz22Q1ow==", "license": "Apache-2.0", "dependencies": { - "@smithy/service-error-classification": "^3.0.7", - "@smithy/types": "^3.5.0", + "@smithy/service-error-classification": "^3.0.8", + "@smithy/types": "^3.6.0", "tslib": "^2.6.2" }, "engines": { @@ -2256,14 +2228,14 @@ } }, "node_modules/@smithy/util-stream": { - "version": "3.1.9", - "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.1.9.tgz", - "integrity": "sha512-7YAR0Ub3MwTMjDfjnup4qa6W8gygZMxikBhFMPESi6ASsl/rZJhwLpF/0k9TuezScCojsM0FryGdz4LZtjKPPQ==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.2.1.tgz", + "integrity": "sha512-R3ufuzJRxSJbE58K9AEnL/uSZyVdHzud9wLS8tIbXclxKzoe09CRohj2xV8wpx5tj7ZbiJaKYcutMm1eYgz/0A==", "license": "Apache-2.0", "dependencies": { - "@smithy/fetch-http-handler": "^3.2.9", - "@smithy/node-http-handler": "^3.2.4", - "@smithy/types": "^3.5.0", + "@smithy/fetch-http-handler": "^4.0.0", + "@smithy/node-http-handler": "^3.2.5", + "@smithy/types": "^3.6.0", "@smithy/util-base64": "^3.0.0", "@smithy/util-buffer-from": "^3.0.0", "@smithy/util-hex-encoding": "^3.0.0", @@ -2274,6 +2246,19 @@ "node": ">=16.0.0" } }, + "node_modules/@smithy/util-stream/node_modules/@smithy/fetch-http-handler": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-4.0.0.tgz", + "integrity": "sha512-MLb1f5tbBO2X6K4lMEKJvxeLooyg7guq48C2zKr4qM7F2Gpkz4dc+hdSgu77pCJ76jVqFBjZczHYAs6dp15N+g==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/protocol-http": "^4.1.5", + "@smithy/querystring-builder": "^3.0.8", + "@smithy/types": "^3.6.0", + "@smithy/util-base64": "^3.0.0", + "tslib": "^2.6.2" + } + }, "node_modules/@smithy/util-uri-escape": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-3.0.0.tgz", @@ -2343,9 +2328,9 @@ } }, "node_modules/acorn": { - "version": "8.12.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", - "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", + "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", "license": "MIT", "bin": { "acorn": "bin/acorn" @@ -2458,15 +2443,18 @@ } }, "node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "license": "MIT", "dependencies": { - "color-convert": "^1.9.0" + "color-convert": "^2.0.1" }, "engines": { - "node": ">=4" + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, "node_modules/argparse": { @@ -2703,9 +2691,9 @@ } }, "node_modules/browserslist": { - "version": "4.24.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz", - "integrity": "sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==", + "version": "4.24.2", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz", + "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==", "funding": [ { "type": "opencollective", @@ -2722,10 +2710,10 @@ ], "license": "MIT", "dependencies": { - "caniuse-lite": "^1.0.30001663", - "electron-to-chromium": "^1.5.28", + "caniuse-lite": "^1.0.30001669", + "electron-to-chromium": "^1.5.41", "node-releases": "^2.0.18", - "update-browserslist-db": "^1.1.0" + "update-browserslist-db": "^1.1.1" }, "bin": { "browserslist": "cli.js" @@ -2735,9 +2723,9 @@ } }, "node_modules/bson": { - "version": "6.8.0", - "resolved": "https://registry.npmjs.org/bson/-/bson-6.8.0.tgz", - "integrity": "sha512-iOJg8pr7wq2tg/zSlCCHMi3hMm5JTOxLTagf3zxhcenHsFp+c6uOs6K7W5UE7A4QIJGtqh/ZovFNMP4mOPJynQ==", + "version": "6.9.0", + "resolved": "https://registry.npmjs.org/bson/-/bson-6.9.0.tgz", + "integrity": "sha512-X9hJeyeM0//Fus+0pc5dSUMhhrrmWwQUtdavaQeF3Ta6m69matZkGWV/MrBcnwUeLC8W9kwwc2hfkZgUuCX3Ig==", "license": "Apache-2.0", "engines": { "node": ">=16.20.1" @@ -2820,9 +2808,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001668", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001668.tgz", - "integrity": "sha512-nWLrdxqCdblixUO+27JtGJJE/txpJlyUy5YN1u53wLZkP0emYCo5zgS6QYft7VUYR42LGgi/S5hdLZTrnyIddw==", + "version": "1.0.30001676", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001676.tgz", + "integrity": "sha512-Qz6zwGCiPghQXGJvgQAem79esjitvJ+CxSbSQkW9H/UX5hg8XM88d4lp2W+MEQ81j+Hip58Il+jGVdazk1z9cw==", "funding": [ { "type": "opencollective", @@ -2840,26 +2828,19 @@ "license": "CC-BY-4.0" }, "node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "license": "MIT", "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" }, "engines": { - "node": ">=4" - } - }, - "node_modules/chalk/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "license": "MIT", - "engines": { - "node": ">=0.8.0" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" } }, "node_modules/chownr": { @@ -2872,18 +2853,21 @@ } }, "node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "license": "MIT", "dependencies": { - "color-name": "1.1.3" + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" } }, "node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "license": "MIT" }, "node_modules/commander": { @@ -3173,9 +3157,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.36", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.36.tgz", - "integrity": "sha512-HYTX8tKge/VNp6FGO+f/uVDmUkq+cEfcxYhKf15Akc4M5yxt5YmorwlAitKWjWhWQnKcDRBAQKXkhqqXMqcrjw==", + "version": "1.5.50", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.50.tgz", + "integrity": "sha512-eMVObiUQ2LdgeO1F/ySTXsvqvxb6ZH2zPGaMYsWzRDdOddUa77tdmI0ltg+L16UpbWdhPmuF3wIQYyQq65WfZw==", "license": "ISC" }, "node_modules/emoji-regex": { @@ -3199,76 +3183,6 @@ "url": "https://github.com/sponsors/wooorm" } }, - "node_modules/emphasize/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "license": "MIT", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/emphasize/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/emphasize/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "license": "MIT", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/emphasize/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "license": "MIT" - }, - "node_modules/emphasize/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/emphasize/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/encodeurl": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", @@ -3879,12 +3793,12 @@ "license": "Apache-2.0" }, "node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "license": "MIT", "engines": { - "node": ">=4" + "node": ">=8" } }, "node_modules/has-property-descriptors": { @@ -4360,18 +4274,18 @@ } }, "node_modules/lru-cache": { - "version": "11.0.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.1.tgz", - "integrity": "sha512-CgeuL5uom6j/ZVrg7G/+1IXqRY8JXX4Hghfy5YE0EhoYQWvndP1kufu58cmZLNIDKnRhZrXfdS9urVWx98AipQ==", + "version": "11.0.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.2.tgz", + "integrity": "sha512-123qHRfJBmo2jXDbo/a5YOQrJoHF/GNQTLzQ5+IdK5pWpceK17yRc6ozlWd25FxvGKQbIUs91fDFkXmDHTKcyA==", "license": "ISC", "engines": { "node": "20 || >=22" } }, "node_modules/macos-export-certificate-and-key": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/macos-export-certificate-and-key/-/macos-export-certificate-and-key-1.2.3.tgz", - "integrity": "sha512-O7+9e2JSctV1ylyzx8nwHDaA/H5Tpoudtd8q/YfRp26hAjE32caMPAS2jPQ2azRRSuRqx8gD24Vnf9bo7hH5Dw==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/macos-export-certificate-and-key/-/macos-export-certificate-and-key-1.2.4.tgz", + "integrity": "sha512-y5QZEywlBNKd+EhPZ1Hz1FmDbbeQKtuVHJaTlawdl7vXw9bi/4tJB2xSMwX4sMVcddy3gbQ8K0IqXAi2TpDo2g==", "hasInstallScript": true, "license": "Apache-2.0", "optional": true, @@ -4559,9 +4473,9 @@ "optional": true }, "node_modules/mongodb": { - "version": "6.9.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.9.0.tgz", - "integrity": "sha512-UMopBVx1LmEUbW/QE0Hw18u583PEDVQmUmVzzBRH0o/xtE9DBRA5ZYLOjpLIa03i8FXjzvQECJcqoMvCXftTUA==", + "version": "6.10.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.10.0.tgz", + "integrity": "sha512-gP9vduuYWb9ZkDM546M+MP2qKVk5ZG2wPF63OvSRuUbqCR+11ZCAE1mOfllhlAG0wcoJY5yDL/rV3OmYEwXIzg==", "license": "Apache-2.0", "dependencies": { "@mongodb-js/saslprep": "^1.1.5", @@ -4712,9 +4626,9 @@ } }, "node_modules/node-abi": { - "version": "3.68.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.68.0.tgz", - "integrity": "sha512-7vbj10trelExNjFSBm5kTvZXXa7pZyKWx9RCKIyqe6I9Ev3IzGpQoqBP3a+cOdxY+pWj6VkP28n/2wWysBHD/A==", + "version": "3.71.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.71.0.tgz", + "integrity": "sha512-SZ40vRiy/+wRTf21hxkkEjPJZpARzUMVcJoQse2EF8qkUWbbO2z7vd5oA/H6bVH6SZQ5STGcu0KRDS7biNRfxw==", "license": "MIT", "optional": true, "dependencies": { @@ -5036,9 +4950,9 @@ "license": "MIT" }, "node_modules/picocolors": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz", - "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", "license": "ISC" }, "node_modules/prebuild-install": { @@ -5083,76 +4997,6 @@ "node": ">=14" } }, - "node_modules/pretty-repl/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "license": "MIT", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/pretty-repl/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/pretty-repl/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "license": "MIT", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/pretty-repl/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "license": "MIT" - }, - "node_modules/pretty-repl/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/pretty-repl/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/proto-list": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", @@ -5825,15 +5669,15 @@ "license": "MIT" }, "node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "license": "MIT", "dependencies": { - "has-flag": "^3.0.0" + "has-flag": "^4.0.0" }, "engines": { - "node": ">=4" + "node": ">=8" } }, "node_modules/system-ca": { @@ -5927,15 +5771,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", - "license": "MIT", - "engines": { - "node": ">=4" - } - }, "node_modules/toidentifier": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", @@ -5958,9 +5793,9 @@ } }, "node_modules/tslib": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", - "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==", + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", "license": "0BSD" }, "node_modules/tunnel-agent": { @@ -6193,39 +6028,6 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, - "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "license": "MIT", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/wrap-ansi-cjs/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "license": "MIT", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/wrap-ansi-cjs/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "license": "MIT" - }, "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", diff --git a/pkgs/by-name/mo/mongosh/package.nix b/pkgs/by-name/mo/mongosh/package.nix index 79834dafc2b8..8221c89c7197 100644 --- a/pkgs/by-name/mo/mongosh/package.nix +++ b/pkgs/by-name/mo/mongosh/package.nix @@ -34,11 +34,11 @@ buildNpmPackage { updateScript = ./update.sh; }; - meta = with lib; { + meta = { homepage = "https://www.mongodb.com/try/download/shell"; description = "MongoDB Shell"; - maintainers = with maintainers; [ aaronjheng ]; - license = licenses.asl20; + maintainers = with lib.maintainers; [ aaronjheng ]; + license = lib.licenses.asl20; mainProgram = "mongosh"; }; } diff --git a/pkgs/by-name/mo/mongosh/source.json b/pkgs/by-name/mo/mongosh/source.json index 29ff15911b93..b765ff88facf 100644 --- a/pkgs/by-name/mo/mongosh/source.json +++ b/pkgs/by-name/mo/mongosh/source.json @@ -1,6 +1,6 @@ { - "version": "2.3.2", - "integrity": "sha512-KobngQr6A3kS7DJhXBc+sAnk3GujTI/WxVz+NfOVl0i/DDd6v+dI95xwhxggcu6wUtvj40AyTH20gvvvdkeGHg==", - "filename": "mongosh-2.3.2.tgz", - "deps": "sha256-t6HsvxXLutSjGfYTVX/15b+WCbT5+2NO2epW0aNttAI=" + "version": "2.3.3", + "integrity": "sha512-nNVPMhaT/5HmTWGPuHfa3WWbu0lDQRyqoHP51YWZcBX4pgOWwGPXpQqEHLsKhEvzL8jdp8aemT/3/iyfvWUAhA==", + "filename": "mongosh-2.3.3.tgz", + "deps": "sha256-jL7Lf35AHZEUrsSVe4qMT60XzFr03NEBjWFWFkY3n/U=" } From 33e2d3aab7517e32b64c843a81ecf9f56a16c4c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 12:23:31 +0000 Subject: [PATCH 080/108] fishPlugins.forgit: 24.10.0 -> 24.11.0 --- pkgs/shells/fish/plugins/forgit.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/fish/plugins/forgit.nix b/pkgs/shells/fish/plugins/forgit.nix index 014c2a0dc1fd..876cee959dcd 100644 --- a/pkgs/shells/fish/plugins/forgit.nix +++ b/pkgs/shells/fish/plugins/forgit.nix @@ -2,13 +2,13 @@ buildFishPlugin rec { pname = "forgit"; - version = "24.10.0"; + version = "24.11.0"; src = fetchFromGitHub { owner = "wfxr"; repo = "forgit"; rev = version; - hash = "sha256-g1uedR9BLG0DuGdM/9xqFv6yhBHHnqjQMt1n0z9I29I="; + hash = "sha256-8BMFL3WktkkB8m6asbNeb9swnLWi3jHo012fBXGa8ls="; }; postInstall = '' From e9378c411dac7d6384ec22667d12393acbddfbfa Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 30 Oct 2024 08:40:20 -0400 Subject: [PATCH 081/108] keycloak: 26.0.2 -> 26.0.4 Diff: https://github.com/keycloak/keycloak/compare/26.0.2...26.0.4 --- pkgs/servers/keycloak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index e89feea01c14..4daccef9f013 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let ''; in stdenv.mkDerivation rec { pname = "keycloak"; - version = "26.0.2"; + version = "26.0.4"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-bhzzhFYMimGts5EElvlRpii4UGPzug6R0/F1lfbXKok="; + hash = "sha256-W0h/wjPfKLtp9YVJZe0dT71xnDs/RsYfZlpOp5UCMww="; }; nativeBuildInputs = [ makeWrapper jre ]; From cab0f213d682d3ac7c0456056140be9cd06f054b Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 1 Nov 2024 09:24:37 -0400 Subject: [PATCH 082/108] keycloak: 26.0.4 -> 26.0.5 Diff: https://github.com/keycloak/keycloak/compare/26.0.4...26.0.5 --- pkgs/servers/keycloak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 4daccef9f013..95639d8047f6 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let ''; in stdenv.mkDerivation rec { pname = "keycloak"; - version = "26.0.4"; + version = "26.0.5"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-W0h/wjPfKLtp9YVJZe0dT71xnDs/RsYfZlpOp5UCMww="; + hash = "sha256-BpXW+PN9kgHGshFwvrx2Tj5K0VXuVbT1VZgWl1ElSjI="; }; nativeBuildInputs = [ makeWrapper jre ]; From 35387b655dd8ab3a2dd494835b23ab312d00b43d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 13:41:14 +0000 Subject: [PATCH 083/108] csvtk: 0.30.0 -> 0.31.0 --- pkgs/by-name/cs/csvtk/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cs/csvtk/package.nix b/pkgs/by-name/cs/csvtk/package.nix index 4079b55f9835..fa493a66437d 100644 --- a/pkgs/by-name/cs/csvtk/package.nix +++ b/pkgs/by-name/cs/csvtk/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: let - version = "0.30.0"; + version = "0.31.0"; in buildGoModule { pname = "csvtk"; @@ -14,10 +14,10 @@ buildGoModule { owner = "shenwei356"; repo = "csvtk"; rev = "refs/tags/v${version}"; - hash = "sha256-xq56dErO0vjG9bZ5aISIFWX4IOHaQksE9W1is2HiFuQ="; + hash = "sha256-RfW7SiRcsN0F/+2bixLMNsqJCOSD1BQwlm4Zm2kogXM="; }; - vendorHash = "sha256-wJedDF7QIg8oWc/QX+rZDyq/nkAW+PMb8EYb0RGJxQM="; + vendorHash = "sha256-5RqAtnGioasbQxLltglCWitzb7mQgNYIE9IFkE0AOME="; meta = { description = "Cross-platform, efficient and practical CSV/TSV toolkit in Golang"; From 88cbef5e67c45866386da166a5cbdc1ee7e0cb85 Mon Sep 17 00:00:00 2001 From: Abhishek Singh Date: Wed, 30 Oct 2024 06:56:35 +0530 Subject: [PATCH 084/108] vimPlugins.nvim-scissors: init at 2024-10-30 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 11f6cce9affa..b7b095e95c8d 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -9233,6 +9233,18 @@ final: prev: meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; + nvim-scissors = buildVimPlugin { + pname = "nvim-scissors"; + version = "2024-10-30"; + src = fetchFromGitHub { + owner = "chrisgrieser"; + repo = "nvim-scissors"; + rev = "27213bd106239eeb8adbfdd4f346f76ccd50ce53"; + sha256 = "sha256-8rOkXEhLNLLaYoBs5Ir3kIDYWPXyhmXL7PAsY2FiX2U="; + }; + meta.homepage = "https://github.com/chrisgrieser/nvim-scissors/"; + }; + nvim-search-and-replace = buildVimPlugin { pname = "nvim-search-and-replace"; version = "2022-09-06"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 0e3f1d17c464..246af5ef008c 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1665,6 +1665,10 @@ in } ); + nvim-scissors = super.nvim-scissors.overrideAttrs { + nvimRequireCheck = "scissors"; + }; + nvim-teal-maker = super.nvim-teal-maker.overrideAttrs { postPatch = '' substituteInPlace lua/tealmaker/init.lua \ diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index ad4f66f1b643..e0d83b977aa8 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -775,6 +775,7 @@ https://github.com/olrtg/nvim-rename-state/,HEAD, https://github.com/chrisgrieser/nvim-rip-substitute/,, https://github.com/petertriho/nvim-scrollbar/,HEAD, https://github.com/dstein64/nvim-scrollview/,, +https://github.com/chrisgrieser/nvim-scissors,HEAD, https://github.com/s1n7ax/nvim-search-and-replace/,HEAD, https://github.com/garymjr/nvim-snippets/,, https://github.com/dcampos/nvim-snippy/,HEAD, From e4f302deb8cf324905ba93e650f2f4ef24b33606 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Fri, 1 Nov 2024 11:07:41 -0400 Subject: [PATCH 085/108] zed-editor: 0.159.6 -> 0.159.7 --- pkgs/by-name/ze/zed-editor/Cargo.lock | 37 +++++++++++++------------- pkgs/by-name/ze/zed-editor/package.nix | 4 +-- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/Cargo.lock b/pkgs/by-name/ze/zed-editor/Cargo.lock index 439da2822875..db546065c243 100644 --- a/pkgs/by-name/ze/zed-editor/Cargo.lock +++ b/pkgs/by-name/ze/zed-editor/Cargo.lock @@ -854,7 +854,7 @@ dependencies = [ "chrono", "futures-util", "http-types", - "hyper 0.14.30", + "hyper 0.14.31", "hyper-rustls 0.24.2", "serde", "serde_json", @@ -1350,7 +1350,7 @@ dependencies = [ "http-body 0.4.6", "http-body 1.0.1", "httparse", - "hyper 0.14.30", + "hyper 0.14.31", "hyper-rustls 0.24.2", "once_cell", "pin-project-lite", @@ -1441,7 +1441,7 @@ dependencies = [ "headers", "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.30", + "hyper 0.14.31", "itoa", "matchit", "memchr", @@ -1587,7 +1587,7 @@ dependencies = [ "bitflags 2.6.0", "cexpr", "clang-sys", - "itertools 0.10.5", + "itertools 0.12.1", "lazy_static", "lazycell", "proc-macro2", @@ -2366,7 +2366,7 @@ dependencies = [ "clickhouse-derive", "clickhouse-rs-cityhash-sys", "futures 0.3.30", - "hyper 0.14.30", + "hyper 0.14.31", "hyper-tls", "lz4", "sealed", @@ -2569,7 +2569,7 @@ dependencies = [ "gpui", "hex", "http_client", - "hyper 0.14.30", + "hyper 0.14.31", "indoc", "jsonwebtoken", "language", @@ -5568,9 +5568,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.30" +version = "0.14.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85" dependencies = [ "bytes 1.7.2", "futures-channel", @@ -5583,7 +5583,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2 0.5.7", "tokio", "tower-service", "tracing", @@ -5618,7 +5618,7 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.12", - "hyper 0.14.30", + "hyper 0.14.31", "log", "rustls 0.21.12", "rustls-native-certs 0.6.3", @@ -5651,7 +5651,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes 1.7.2", - "hyper 0.14.30", + "hyper 0.14.31", "native-tls", "tokio", "tokio-native-tls", @@ -6473,7 +6473,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -9502,6 +9502,7 @@ dependencies = [ "fs", "futures 0.3.30", "gpui", + "itertools 0.13.0", "log", "parking_lot", "prost", @@ -9626,7 +9627,7 @@ dependencies = [ "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.30", + "hyper 0.14.31", "hyper-tls", "ipnet", "js-sys", @@ -9930,9 +9931,9 @@ dependencies = [ [[package]] name = "runtimelib" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7d76d28b882a7b889ebb04e79bc2b160b3061821ea596ff0f4a838fc7a76db0" +checksum = "43075bcdb843dc90af086586895247681fb79ed9dc24c62e5455995a807d3d85" dependencies = [ "anyhow", "async-dispatcher", @@ -13416,7 +13417,7 @@ dependencies = [ "futures-util", "headers", "http 0.2.12", - "hyper 0.14.30", + "hyper 0.14.31", "log", "mime", "mime_guess", @@ -14129,7 +14130,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -14996,7 +14997,7 @@ dependencies = [ [[package]] name = "zed" -version = "0.159.6" +version = "0.159.7" dependencies = [ "activity_indicator", "anyhow", diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 34be451f3ef7..93fd60f74983 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -88,13 +88,13 @@ let in rustPlatform.buildRustPackage rec { pname = "zed-editor"; - version = "0.159.6"; + version = "0.159.7"; src = fetchFromGitHub { owner = "zed-industries"; repo = "zed"; rev = "refs/tags/v${version}"; - hash = "sha256-Jr4s22UXd4jtpXRyWSkCVRUhYZXgISDmq+RYr2i7qGs="; + hash = "sha256-gqovQkg3Zypi5YV/wIzTFfJQt5Zwb8IF+drQKvRCgEM="; }; patches = From 6a2f29a3829c7f68073618a6d69584101d770b03 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 1 Nov 2024 16:17:20 +0100 Subject: [PATCH 086/108] python312Packages.gradio: relax aiofiles and markupfiles fixes https://hydra.nixos.org/build/276677105 --- pkgs/development/python-modules/gradio/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix index 2a75ac5ed6e4..f1698a9b0125 100644 --- a/pkgs/development/python-modules/gradio/default.nix +++ b/pkgs/development/python-modules/gradio/default.nix @@ -83,7 +83,11 @@ buildPythonPackage rec { rm -rf venv/ ''; - pythonRelaxDeps = [ "tomlkit" ]; + pythonRelaxDeps = [ + "tomlkit" + "aiofiles" + "markupsafe" + ]; pythonRemoveDeps = [ # our package is presented as a binary, not a python lib - and From 586a9433b74ac1ff11c4de044ed10c37cfd3c504 Mon Sep 17 00:00:00 2001 From: Karun Sandhu <129101708+MrSom3body@users.noreply.github.com> Date: Fri, 1 Nov 2024 00:50:05 +0100 Subject: [PATCH 087/108] ente-auth: fix icon path --- pkgs/by-name/en/ente-auth/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix index 268ffdf2b507..f0c21d7aad87 100644 --- a/pkgs/by-name/en/ente-auth/package.nix +++ b/pkgs/by-name/en/ente-auth/package.nix @@ -78,7 +78,7 @@ flutter324.buildFlutterApplication rec { ]; postInstall = '' - FAV=$out/app/data/flutter_assets/assets/icons/auth-icon.png + FAV=$out/app/ente-auth/data/flutter_assets/assets/icons/auth-icon.png ICO=$out/share/icons install -D $FAV $ICO/ente-auth.png From 0b0ff2ffd1cebe152e1842821606c019a8be5e23 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 1 Nov 2024 13:23:25 +0100 Subject: [PATCH 088/108] python312Packages.hstspreload: 2024.10.1 -> 2024.11.1 Diff: https://github.com/sethmlarson/hstspreload/compare/refs/tags/2024.10.1...2024.11.1 --- pkgs/development/python-modules/hstspreload/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index dacb9e2dcaaf..baf3e4581e58 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2024.10.1"; + version = "2024.11.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sethmlarson"; repo = "hstspreload"; rev = "refs/tags/${version}"; - hash = "sha256-so693xMgVb7pUoin3oYT26F02/C5KeVCuPQjOAJ6axQ="; + hash = "sha256-Gm0jZbJwVdoU19gkTuzJ9Mop1qsPDboTg53Yiocb3Rc="; }; build-system = [ setuptools ]; From 7111740cfa60b34dd7272a877bd3c995842a49ce Mon Sep 17 00:00:00 2001 From: Julian Stecklina Date: Fri, 1 Nov 2024 17:20:24 +0100 Subject: [PATCH 089/108] Revert "virtualbox: do not use open-watcom-bin" This reverts commit 67aa62d45f6d271db7e0ed6e255ce93f5a166814. --- pkgs/applications/virtualization/virtualbox/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index b1c04d305393..23e93e8fdf2f 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -49,6 +49,9 @@ yasm, glslang, nixosTests, + # If open-watcom-bin is not passed, VirtualBox will fall back to use + # the shipped alternative sources (assembly). + open-watcom-bin, makeself, perl, vulkan-loader, @@ -292,6 +295,7 @@ stdenv.mkDerivation (finalAttrs: { ${optionalString (!enableHardening) "--disable-hardening"} \ ${optionalString (!enable32bitGuests) "--disable-vmmraw"} \ ${optionalString enableWebService "--enable-webservice"} \ + ${optionalString (open-watcom-bin != null) "--with-ow-dir=${open-watcom-bin}"} \ ${optionalString (enableKvm) "--with-kvm"} \ ${extraConfigureFlags} \ --disable-kmods From e70bc9367ee06c609323e73e7fe537f4e7a5f586 Mon Sep 17 00:00:00 2001 From: Julian Stecklina Date: Fri, 1 Nov 2024 17:22:49 +0100 Subject: [PATCH 090/108] virtualbox: build BIOS from alternate sources ... to avoid depending on open-watcom-bin which has a habit of breaking. --- pkgs/top-level/all-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25785bf43510..70de0cb7fe68 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33072,6 +33072,11 @@ with pkgs; # VirtualBox uses wsimport, which was removed after JDK 8. jdk = jdk8; + + # Opt out of building the guest BIOS sources with the problematic Open Watcom + # toolchain. People who need to build the BIOS from sources (for example to + # apply patches) can override this. + open-watcom-bin = null; }; virtualboxKvm = lowPrio (virtualbox.override { From 100a0fa0af68b1146bda1c94e7ff0c9ef577488b Mon Sep 17 00:00:00 2001 From: Guillaume Desforges Date: Thu, 31 Oct 2024 13:49:45 +0100 Subject: [PATCH 091/108] dbeaver: allow custom java -Xmx value DBeaver has its Java heap size setting written in dbeaver.ini, which is copied on install to $out/opt/dbeaver. This means that, to increase the java heap size, it needs to happen in Nix build. This change proposes to allow passing this setting to the function so that one can override it. --- pkgs/by-name/db/dbeaver-bin/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index 8e62a026ba00..ece1216d445c 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -12,6 +12,7 @@ glib, webkitgtk_4_0, glib-networking, + override_xmx ? "1024m", }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -54,6 +55,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { dontConfigure = true; dontBuild = true; + prePatch = '' + substituteInPlace dbeaver.ini \ + --replace-fail '-Xmx1024m' '-Xmx${override_xmx}' + ''; + installPhase = if !stdenvNoCC.hostPlatform.isDarwin then '' From 78ebb34bc8368518f2e1440f8205800d082e6be4 Mon Sep 17 00:00:00 2001 From: Julian Stecklina Date: Fri, 1 Nov 2024 17:52:50 +0100 Subject: [PATCH 092/108] virtualboxKvm: fix for 7.0.22 --- .../virtualization/virtualbox/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 23e93e8fdf2f..a7b091013ae7 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -233,11 +233,18 @@ stdenv.mkDerivation (finalAttrs: { }) # While the KVM patch should not break any other behavior if --with-kvm is not specified, # we don't take any chances and only apply it if people actually want to use KVM support. - ++ optional enableKvm (fetchpatch { - name = "virtualbox-${finalAttrs.virtualboxVersion}-kvm-dev-${finalAttrs.kvmPatchVersion}.patch"; - url = "https://github.com/cyberus-technology/virtualbox-kvm/releases/download/dev-${finalAttrs.kvmPatchVersion}/kvm-backend-${finalAttrs.virtualboxVersion}-dev-${finalAttrs.kvmPatchVersion}.patch"; - hash = finalAttrs.kvmPatchHash; - }) + ++ optional enableKvm ( + let + patchVboxVersion = + # There is no updated patch for 7.0.22 yet, but the older one still applies. + if finalAttrs.virtualboxVersion == "7.0.22" then "7.0.20" else finalAttrs.virtualboxVersion; + in + fetchpatch { + name = "virtualbox-${finalAttrs.virtualboxVersion}-kvm-dev-${finalAttrs.kvmPatchVersion}.patch"; + url = "https://github.com/cyberus-technology/virtualbox-kvm/releases/download/dev-${finalAttrs.kvmPatchVersion}/kvm-backend-${patchVboxVersion}-dev-${finalAttrs.kvmPatchVersion}.patch"; + hash = finalAttrs.kvmPatchHash; + } + ) ++ [ ./qt-dependency-paths.patch # https://github.com/NixOS/nixpkgs/issues/123851 From 5d1c122dc9d2673ad5cad7849e97717428c9973c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 1 Nov 2024 20:24:32 +0100 Subject: [PATCH 093/108] python312Packages.hyppo: 0.5.0 -> 0.5.1 Diff: https://github.com/neurodata/hyppo/compare/refs/tags/v0.5.0...v0.5.1 Changelog: https://github.com/neurodata/hyppo/releases/tag/v0.5.1 --- .../python-modules/hyppo/default.nix | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/hyppo/default.nix b/pkgs/development/python-modules/hyppo/default.nix index 58415779bcf7..5288be1c30a3 100644 --- a/pkgs/development/python-modules/hyppo/default.nix +++ b/pkgs/development/python-modules/hyppo/default.nix @@ -1,31 +1,32 @@ { lib, - buildPythonPackage, - pythonOlder, - fetchFromGitHub, - setuptools, - pytestCheckHook, autograd, + buildPythonPackage, + fetchFromGitHub, + future, + matplotlib, numba, numpy, + pytestCheckHook, + pythonOlder, scikit-learn, scipy, - matplotlib, seaborn, + setuptools, }: buildPythonPackage rec { pname = "hyppo"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "neurodata"; - repo = pname; + repo = "hyppo"; rev = "refs/tags/v${version}"; - hash = "sha256-7ZDzmSnieXz6E0x7mOL4109+hyeEQ0AW0Qhc4IwBM18="; + hash = "sha256-bYxqYSOOifQE3gbw8vNk/A13D5TPx7ERSgFvRHMXKGM="; }; # some of the doctests (4/21) are broken, e.g. unbound variables, nondeterministic with insufficient tolerance, etc. @@ -36,8 +37,9 @@ buildPythonPackage rec { build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ autograd + future numba numpy scikit-learn From 60263374cda31d7b929c36e5c6e0f28d281976fd Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 1 Nov 2024 23:28:36 +0400 Subject: [PATCH 094/108] csvtk: install shell completions --- pkgs/by-name/cs/csvtk/package.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/by-name/cs/csvtk/package.nix b/pkgs/by-name/cs/csvtk/package.nix index fa493a66437d..9686b5fae891 100644 --- a/pkgs/by-name/cs/csvtk/package.nix +++ b/pkgs/by-name/cs/csvtk/package.nix @@ -1,7 +1,10 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, + installShellFiles, + buildPackages, }: let version = "0.31.0"; @@ -19,6 +22,23 @@ buildGoModule { vendorHash = "sha256-5RqAtnGioasbQxLltglCWitzb7mQgNYIE9IFkE0AOME="; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = + let + csvtkBin = + if stdenv.buildPlatform.canExecute stdenv.hostPlatform then + "$out" + else + lib.getBin buildPackages.csvtk; + in + '' + for shell in bash zsh fish; do + ${csvtkBin}/bin/csvtk genautocomplete --shell $shell --file csvtk.$shell + installShellCompletion csvtk.$shell + done + ''; + meta = { description = "Cross-platform, efficient and practical CSV/TSV toolkit in Golang"; changelog = "https://github.com/shenwei356/csvtk/releases/tag/v${version}"; From 500bc3e96986c0393405eeb0a088bab748cf1abd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 1 Nov 2024 21:36:49 +0100 Subject: [PATCH 095/108] python312Packages.sqlalchemy-mixins: add aiosqlite --- .../python-modules/sqlalchemy-mixins/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy-mixins/default.nix b/pkgs/development/python-modules/sqlalchemy-mixins/default.nix index 5189413f9f09..66a1e659b5a1 100644 --- a/pkgs/development/python-modules/sqlalchemy-mixins/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-mixins/default.nix @@ -1,5 +1,6 @@ { lib, + aiosqlite, buildPythonPackage, fetchFromGitHub, setuptools, @@ -18,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "absent1706"; - repo = pname; + repo = "sqlalchemy-mixins"; rev = "refs/tags/v${version}"; hash = "sha256-0uB3x7RQSNEq3DyTSiOIGajwPQQEBjXK8HOyuXCNa/E="; }; @@ -30,7 +31,10 @@ buildPythonPackage rec { sqlalchemy ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + aiosqlite + pytestCheckHook + ]; pythonImportsCheck = [ "sqlalchemy_mixins" ]; From fd5b39ad6e9ea714c41897e707b100b67137c1fa Mon Sep 17 00:00:00 2001 From: Nicolas Goudry Date: Fri, 1 Nov 2024 21:39:37 +0100 Subject: [PATCH 096/108] gitkraken: fix invalid darwin hash --- pkgs/applications/version-management/gitkraken/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 2ebe3c4d2305..5f2003e84617 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -69,7 +69,7 @@ let x86_64-darwin = fetchzip { url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; - hash = "sha256-21VwDFw2dyySoc4NC/RR3k/VtksqaZ5vkdx0z5MKqLc="; + hash = "sha256-fPvEItavxFwUbk3WsTBvzRMu7fjnm5HxybEueHn//Q4="; }; aarch64-darwin = fetchzip { From cc7216313aa50ad184b2a69930fb274e524c1f7c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 1 Nov 2024 22:27:28 +0100 Subject: [PATCH 097/108] vscode-extensions.github.copilot: 1.236.0 -> 1.243.1191 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 37e29095c05e..07f64605f96c 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2039,8 +2039,8 @@ let mktplcRef = { publisher = "github"; name = "copilot"; - version = "1.236.0"; # compatible with vscode ^1.94 - hash = "sha256-ozJwByuSjROWSxfrapcyxDkI7xgcjqf/IKtUfEC+MGk="; + version = "1.243.1191"; # compatible with vscode ^1.95 + hash = "sha256-tMUFMi+lBZZQA/8UTyoqQ5s+xnWKh39V8GYErO9ZuSo="; }; meta = { From 0029a89ce9cbe49b5e3ef9bdcc4dcaa2e26a1d0d Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 1 Nov 2024 22:34:51 +0100 Subject: [PATCH 098/108] vscode-extensions.github.copilot-chat: 0.22.2024100702 -> 0.23.2024102903 --- pkgs/applications/editors/vscode/extensions/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 07f64605f96c..2522929f094c 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2056,8 +2056,9 @@ let mktplcRef = { publisher = "github"; name = "copilot-chat"; - version = "0.22.2024100702"; # latest compatible with vscode ^1.94 - hash = "sha256-n/ecEnxz3LiTx9MuHO8AMIWBJPNNxQb6vghlG/hPMUY="; + # Verify which version is available with nix run nixpkgs#vsce -- show github.copilot-chat --json + version = "0.23.2024102903"; # compatible with vscode ^1.95 + hash = "sha256-FGvB+b24i23bdhpJpCQDvIHqqFvCJrWAKnX6fJgkr2E="; }; meta = { description = "GitHub Copilot Chat is a companion extension to GitHub Copilot that houses experimental chat features"; From b44fbe5ed4ca82247c07302015327b26be12266e Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 8 Oct 2024 22:41:48 -0300 Subject: [PATCH 099/108] mpc-cli: hide inputs --- pkgs/applications/audio/mpc/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index c58c6831edf4..4b5403df4ae4 100644 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -8,7 +8,7 @@ , meson , ninja , pkg-config -, sphinx +, python3Packages }: stdenv.mkDerivation rec { @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - sphinx + python3Packages.sphinx ]; postInstall = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ccdc8f5d639..572ae28bd2c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30932,9 +30932,7 @@ with pkgs; withConplay = false; }; - mpc-cli = callPackage ../applications/audio/mpc { - inherit (python3Packages) sphinx; - }; + mpc-cli = callPackage ../applications/audio/mpc { }; clerk = callPackage ../applications/audio/clerk { }; From 791efe72af651b8940efd43c60e0e0cbfb7480da Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 14 Oct 2024 20:31:26 -0300 Subject: [PATCH 100/108] mpc: migrate to by-name And green-alias mpc-cli. --- .../audio/mpc/default.nix => by-name/mp/mpc/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{applications/audio/mpc/default.nix => by-name/mp/mpc/package.nix} (100%) diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/by-name/mp/mpc/package.nix similarity index 100% rename from pkgs/applications/audio/mpc/default.nix rename to pkgs/by-name/mp/mpc/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 572ae28bd2c3..f3f80d4f01ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30932,7 +30932,7 @@ with pkgs; withConplay = false; }; - mpc-cli = callPackage ../applications/audio/mpc { }; + mpc-cli = mpc; # green-alias added 2024-10-14 clerk = callPackage ../applications/audio/clerk { }; From 36ecd8606f33cfb8bd88c86d924a2e0949914a87 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 8 Oct 2024 22:59:10 -0300 Subject: [PATCH 101/108] mpc: refactor - finalAttrs --- pkgs/by-name/mp/mpc/package.nix | 44 ++++++++++++++++----------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/pkgs/by-name/mp/mpc/package.nix b/pkgs/by-name/mp/mpc/package.nix index 4b5403df4ae4..6a4a748b8138 100644 --- a/pkgs/by-name/mp/mpc/package.nix +++ b/pkgs/by-name/mp/mpc/package.nix @@ -1,24 +1,25 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, installShellFiles -, libiconv -, libmpdclient -, meson -, ninja -, pkg-config -, python3Packages +{ + lib, + fetchFromGitHub, + fetchpatch, + installShellFiles, + libiconv, + libmpdclient, + meson, + ninja, + pkg-config, + python3Packages, + stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mpc"; version = "0.34"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; - repo = pname; - rev = "v${version}"; + repo = "mpc"; + rev = "v${finalAttrs.version}"; hash = "sha256-2FjYBfak0IjibuU+CNQ0y9Ei8hTZhynS/BK2DNerhVw="; }; @@ -32,8 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ libmpdclient - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; nativeBuildInputs = [ installShellFiles @@ -51,13 +51,13 @@ stdenv.mkDerivation rec { rm $out/share/doc/mpc/contrib/mpc-completion.bash ''; - meta = with lib; { + meta = { homepage = "https://www.musicpd.org/clients/mpc/"; description = "Minimalist command line interface to MPD"; - changelog = "https://raw.githubusercontent.com/MusicPlayerDaemon/mpc/v${version}/NEWS"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; + changelog = "https://raw.githubusercontent.com/MusicPlayerDaemon/mpc/refs/heads/master/NEWS"; + license = lib.licenses.gpl2Plus; mainProgram = "mpc"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; -} +}) From ca1ecc03a2fc1d6c0852a4f6cdb71f23e02fa28e Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 8 Oct 2024 23:04:37 -0300 Subject: [PATCH 102/108] mpc: 0.34 -> 0.35 --- pkgs/by-name/mp/mpc/package.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/mp/mpc/package.nix b/pkgs/by-name/mp/mpc/package.nix index 6a4a748b8138..2d1976123167 100644 --- a/pkgs/by-name/mp/mpc/package.nix +++ b/pkgs/by-name/mp/mpc/package.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub, - fetchpatch, installShellFiles, libiconv, libmpdclient, @@ -14,23 +13,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "mpc"; - version = "0.34"; + version = "0.35"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "mpc"; rev = "v${finalAttrs.version}"; - hash = "sha256-2FjYBfak0IjibuU+CNQ0y9Ei8hTZhynS/BK2DNerhVw="; + hash = "sha256-oVdnj3nsYvOHcIOgoamLamriuWu9lucWUQtxVmXZabs="; }; - patches = [ - # fix the build with meson 0.60 (https://github.com/MusicPlayerDaemon/mpc/pull/76) - (fetchpatch { - url = "https://github.com/MusicPlayerDaemon/mpc/commit/b656ca4b6c2a0d5b6cebd7f7daa679352f664e0e.patch"; - sha256 = "sha256-fjjSlCKxgkz7Em08CaK7+JAzl8YTzLcpGGMz2HJlsVw="; - }) - ]; - buildInputs = [ libmpdclient ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; From b1b1176946e8ea915b3c4d1b469b52d92e48b7bb Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 16 Oct 2024 21:34:54 -0300 Subject: [PATCH 103/108] clerk: update and format And fix version --- pkgs/applications/audio/clerk/default.nix | 101 +++++++++++++--------- 1 file changed, 61 insertions(+), 40 deletions(-) diff --git a/pkgs/applications/audio/clerk/default.nix b/pkgs/applications/audio/clerk/default.nix index f77b03daac78..2470e4c5369c 100644 --- a/pkgs/applications/audio/clerk/default.nix +++ b/pkgs/applications/audio/clerk/default.nix @@ -1,20 +1,22 @@ -{ lib -, stdenv -, fetchFromGitHub -, makeWrapper -, rofi -, tmux -, fzf -, mpc-cli -, perl -, util-linux -, libnotify -, perlPackages +{ + lib, + fetchFromGitHub, + fzf, + installShellFiles, + libnotify, + makeWrapper, + mpc, + perlPackages, + rofi, + stdenv, + tmux, + unstableGitUpdater, + util-linux, }: stdenv.mkDerivation { pname = "clerk"; - version = "unstable-2023-10-07"; + version = "4.0.5-unstable-2023-10-07"; src = fetchFromGitHub { owner = "carnager"; @@ -23,12 +25,10 @@ stdenv.mkDerivation { hash = "sha256-V2nDLq2ViC5Twve0EILBEYOdEavqgYB/TQq/T+ftfmk="; }; - postPatch = '' - substituteInPlace clerk_rating_client.service \ - --replace "/usr" "$out" - ''; - - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + installShellFiles + makeWrapper + ]; buildInputs = with perlPackages; [ perl @@ -47,36 +47,57 @@ stdenv.mkDerivation { strictDeps = true; + postPatch = '' + substituteInPlace clerk_rating_client.service \ + --replace "/usr" "$out" + ''; + installPhase = '' runHook preInstall - install -D clerk.pl $out/bin/clerk - install -D clerk_rating_client $out/bin/clerk_rating_client + mv clerk.pl clerk + installBin clerk clerk_rating_client install -D clerk_rating_client.service $out/lib/systemd/user/clerk_rating_client.service + runHook postInstall ''; - postFixup = let - binPath = lib.makeBinPath [ - libnotify - mpc-cli - rofi - tmux - fzf - util-linux - ]; - in - '' - wrapProgram $out/bin/clerk --set PERL5LIB $PERL5LIB --prefix PATH : "${binPath}" - wrapProgram $out/bin/clerk_rating_client --set PERL5LIB $PERL5LIB --prefix PATH : "${binPath}" - ''; + postFixup = + let + binPath = lib.makeBinPath [ + fzf + libnotify + mpc + rofi + tmux + util-linux + ]; + in + '' + pushd $out/bin + for f in clerk clerk_rating_client; do + wrapProgram $f \ + --prefix PATH : "${binPath}" \ + --set PERL5LIB $PERL5LIB + done + popd + ''; - meta = with lib; { - description = "MPD client based on rofi/fzf"; + passthru.updateScript = unstableGitUpdater { + url = "https://github.com/carnager/clerk.git"; + hardcodeZeroVersion = true; + }; + + meta = { homepage = "https://github.com/carnager/clerk"; - license = licenses.mit; - maintainers = with maintainers; [ anderspapitto rewine ]; + description = "MPD client based on rofi/fzf"; + license = lib.licenses.mit; mainProgram = "clerk"; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ + anderspapitto + rewine + AndersonTorres + ]; + platforms = lib.platforms.linux; }; } From bcd149f7a57a9871cd5b9762e8262f912ee0e700 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 16 Oct 2024 21:37:22 -0300 Subject: [PATCH 104/108] clerk: migrate to by-name --- .../audio/clerk/default.nix => by-name/cl/clerk/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/audio/clerk/default.nix => by-name/cl/clerk/package.nix} (100%) diff --git a/pkgs/applications/audio/clerk/default.nix b/pkgs/by-name/cl/clerk/package.nix similarity index 100% rename from pkgs/applications/audio/clerk/default.nix rename to pkgs/by-name/cl/clerk/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3f80d4f01ff..d3cc8a4ac564 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30934,8 +30934,6 @@ with pkgs; mpc-cli = mpc; # green-alias added 2024-10-14 - clerk = callPackage ../applications/audio/clerk { }; - nbstripout = callPackage ../applications/version-management/nbstripout { }; ncmpc = callPackage ../applications/audio/ncmpc { }; From 178ea7bbd53839046cc3dffe400c7fd8cc1064fd Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 16 Oct 2024 20:56:28 -0300 Subject: [PATCH 105/108] nixos/triggerhappy: update and format mpc-cli is now mpc --- .../services/hardware/triggerhappy.nix | 98 ++++++++++++------- 1 file changed, 62 insertions(+), 36 deletions(-) diff --git a/nixos/modules/services/hardware/triggerhappy.nix b/nixos/modules/services/hardware/triggerhappy.nix index d2137971b3a7..a9bcf250cf69 100644 --- a/nixos/modules/services/hardware/triggerhappy.nix +++ b/nixos/modules/services/hardware/triggerhappy.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.services.triggerhappy; @@ -6,35 +11,53 @@ let socket = "/run/thd.socket"; configFile = pkgs.writeText "triggerhappy.conf" '' - ${lib.concatMapStringsSep "\n" - ({ keys, event, cmd, ... }: - ''${lib.concatMapStringsSep "+" (x: "KEY_" + x) keys} ${toString { press = 1; hold = 2; release = 0; }.${event}} ${cmd}'' - ) - cfg.bindings} + ${lib.concatMapStringsSep "\n" ( + { + keys, + event, + cmd, + ... + }: + ''${lib.concatMapStringsSep "+" (x: "KEY_" + x) keys} ${ + toString + { + press = 1; + hold = 2; + release = 0; + } + .${event} + } ${cmd}'' + ) cfg.bindings} ${cfg.extraConfig} ''; - bindingCfg = { ... }: { - options = { + bindingCfg = + { ... }: + { + options = { + + keys = lib.mkOption { + type = lib.types.listOf lib.types.str; + description = "List of keys to match. Key names as defined in linux/input-event-codes.h"; + }; + + event = lib.mkOption { + type = lib.types.enum [ + "press" + "hold" + "release" + ]; + default = "press"; + description = "Event to match."; + }; + + cmd = lib.mkOption { + type = lib.types.str; + description = "What to run."; + }; - keys = lib.mkOption { - type = lib.types.listOf lib.types.str; - description = "List of keys to match. Key names as defined in linux/input-event-codes.h"; }; - - event = lib.mkOption { - type = lib.types.enum ["press" "hold" "release"]; - default = "press"; - description = "Event to match."; - }; - - cmd = lib.mkOption { - type = lib.types.str; - description = "What to run."; - }; - }; - }; in @@ -65,9 +88,9 @@ in bindings = lib.mkOption { type = lib.types.listOf (lib.types.submodule bindingCfg); - default = []; + default = [ ]; example = lib.literalExpression '' - [ { keys = ["PLAYPAUSE"]; cmd = "''${pkgs.mpc-cli}/bin/mpc -q toggle"; } ] + [ { keys = ["PLAYPAUSE"]; cmd = "''${lib.getExe pkgs.mpc} -q toggle"; } ] ''; description = '' Key bindings for {command}`triggerhappy`. @@ -86,7 +109,6 @@ in }; - ###### implementation config = lib.mkIf cfg.enable { @@ -101,18 +123,22 @@ in wantedBy = [ "multi-user.target" ]; description = "Global hotkey daemon"; serviceConfig = { - ExecStart = "${pkgs.triggerhappy}/bin/thd ${lib.optionalString (cfg.user != "root") "--user ${cfg.user}"} --socket ${socket} --triggers ${configFile} --deviceglob /dev/input/event*"; + ExecStart = "${pkgs.triggerhappy}/bin/thd ${ + lib.optionalString (cfg.user != "root") "--user ${cfg.user}" + } --socket ${socket} --triggers ${configFile} --deviceglob /dev/input/event*"; }; }; - services.udev.packages = lib.singleton (pkgs.writeTextFile { - name = "triggerhappy-udev-rules"; - destination = "/etc/udev/rules.d/61-triggerhappy.rules"; - text = '' - ACTION=="add", SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{name}!="triggerhappy", \ - RUN+="${pkgs.triggerhappy}/bin/th-cmd --socket ${socket} --passfd --udev" - ''; - }); + services.udev.packages = lib.singleton ( + pkgs.writeTextFile { + name = "triggerhappy-udev-rules"; + destination = "/etc/udev/rules.d/61-triggerhappy.rules"; + text = '' + ACTION=="add", SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{name}!="triggerhappy", \ + RUN+="${pkgs.triggerhappy}/bin/th-cmd --socket ${socket} --passfd --udev" + ''; + } + ); }; From 77ec23d6aff5b78c52364725f455e8916d57d456 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 16 Oct 2024 21:28:57 -0300 Subject: [PATCH 106/108] nixos/tests/mpd: update and format mpc-cli is now mpc --- nixos/tests/mpd.nix | 127 +++++++++++++++++++++++++------------------- 1 file changed, 72 insertions(+), 55 deletions(-) diff --git a/nixos/tests/mpd.nix b/nixos/tests/mpd.nix index 0772c05d12ac..e268eb573808 100644 --- a/nixos/tests/mpd.nix +++ b/nixos/tests/mpd.nix @@ -1,12 +1,13 @@ -import ./make-test-python.nix ({ pkgs, lib, ... }: +import ./make-test-python.nix ( + { pkgs, lib, ... }: let track = pkgs.fetchurl { # Sourced from http://freemusicarchive.org/music/Blue_Wave_Theory/Surf_Music_Month_Challenge/Skyhawk_Beach_fade_in - # License: http://creativecommons.org/licenses/by-sa/4.0/ name = "Blue_Wave_Theory-Skyhawk_Beach.mp3"; url = "https://freemusicarchive.org/file/music/ccCommunity/Blue_Wave_Theory/Surf_Music_Month_Challenge/Blue_Wave_Theory_-_04_-_Skyhawk_Beach.mp3"; - sha256 = "0xw417bxkx4gqqy139bb21yldi37xx8xjfxrwaqa0gyw19dl6mgp"; + hash = "sha256-91VDWwrcP6Cw4rk72VHvZ8RGfRBrpRE8xo/02dcJhHc="; + meta.license = lib.licenses.cc-by-sa-40; }; defaultCfg = rec { @@ -16,42 +17,56 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: musicDirectory = "${dataDir}/music"; }; - defaultMpdCfg = with defaultCfg; { - inherit dataDir musicDirectory user group; + defaultMpdCfg = { + inherit (defaultCfg) + dataDir + musicDirectory + user + group + ; enable = true; }; - musicService = { user, group, musicDirectory }: { - description = "Sets up the music file(s) for MPD to use."; - requires = [ "mpd.service" ]; - after = [ "mpd.service" ]; - wantedBy = [ "default.target" ]; - script = '' - cp ${track} ${musicDirectory} - ''; - serviceConfig = { - User = user; - Group = group; + musicService = + { + user, + group, + musicDirectory, + }: + { + description = "Sets up the music file(s) for MPD to use."; + requires = [ "mpd.service" ]; + after = [ "mpd.service" ]; + wantedBy = [ "default.target" ]; + script = '' + cp ${track} ${musicDirectory} + ''; + serviceConfig = { + User = user; + Group = group; + }; }; - }; - mkServer = { mpd, musicService, }: - { boot.kernelModules = [ "snd-dummy" ]; + mkServer = + { mpd, musicService }: + { + boot.kernelModules = [ "snd-dummy" ]; services.mpd = mpd; systemd.services.musicService = musicService; }; - in { + in + { name = "mpd"; - meta = with pkgs.lib.maintainers; { - maintainers = [ emmanuelrosa ]; + meta = { + maintainers = with lib.maintainers; [ emmanuelrosa ]; }; - nodes = - { client = - { ... }: { }; + nodes = { + client = { ... }: { }; serverALSA = - { ... }: lib.mkMerge [ + { ... }: + lib.mkMerge [ (mkServer { mpd = defaultMpdCfg // { network.listenAddress = "any"; @@ -63,13 +78,14 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: } ''; }; - musicService = with defaultMpdCfg; musicService { inherit user group musicDirectory; }; + musicService = musicService { inherit (defaultMpdCfg) user group musicDirectory; }; }) { networking.firewall.allowedTCPPorts = [ 6600 ]; } ]; serverPulseAudio = - { ... }: lib.mkMerge [ + { ... }: + lib.mkMerge [ (mkServer { mpd = defaultMpdCfg // { extraConfig = '' @@ -80,7 +96,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: ''; }; - musicService = with defaultCfg; musicService { inherit user group musicDirectory; }; + musicService = musicService { inherit (defaultMpdCfg) user group musicDirectory; }; }) { hardware.pulseaudio = { @@ -94,40 +110,41 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: ]; }; - testScript = '' - mpc = "${pkgs.mpc-cli}/bin/mpc --wait" + testScript = '' + mpc = "${lib.getExe pkgs.mpc} --wait" - # Connects to the given server and attempts to play a tune. - def play_some_music(server): - server.wait_for_unit("mpd.service") - server.succeed(f"{mpc} update") - _, tracks = server.execute(f"{mpc} ls") + # Connects to the given server and attempts to play a tune. + def play_some_music(server): + server.wait_for_unit("mpd.service") + server.succeed(f"{mpc} update") + _, tracks = server.execute(f"{mpc} ls") - for track in tracks.splitlines(): - server.succeed(f"{mpc} add {track}") + for track in tracks.splitlines(): + server.succeed(f"{mpc} add {track}") - _, added_tracks = server.execute(f"{mpc} playlist") + _, added_tracks = server.execute(f"{mpc} playlist") - # Check we succeeded adding audio tracks to the playlist - assert len(added_tracks.splitlines()) > 0 + # Check we succeeded adding audio tracks to the playlist + assert len(added_tracks.splitlines()) > 0 - server.succeed(f"{mpc} play") + server.succeed(f"{mpc} play") - _, output = server.execute(f"{mpc} status") - # Assure audio track is playing - assert "playing" in output + _, output = server.execute(f"{mpc} status") + # Assure audio track is playing + assert "playing" in output - server.succeed(f"{mpc} stop") + server.succeed(f"{mpc} stop") - play_some_music(serverALSA) - play_some_music(serverPulseAudio) + play_some_music(serverALSA) + play_some_music(serverPulseAudio) - client.wait_for_unit("multi-user.target") - client.succeed(f"{mpc} -h serverALSA status") + client.wait_for_unit("multi-user.target") + client.succeed(f"{mpc} -h serverALSA status") - # The PulseAudio-based server is configured not to accept external client connections - # to perform the following test: - client.fail(f"{mpc} -h serverPulseAudio status") - ''; -}) + # The PulseAudio-based server is configured not to accept external client connections + # to perform the following test: + client.fail(f"{mpc} -h serverPulseAudio status") + ''; + } +) From 93207b762985558888c0fe334b043a6f01d13d51 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 16 Oct 2024 21:39:50 -0300 Subject: [PATCH 107/108] bumblebee-status: update plugins mpc-cli is now mpc --- .../window-managers/i3/bumblebee-status/plugins.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix b/pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix index 5810070d2ff4..d5567ce15e8f 100644 --- a/pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix +++ b/pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix @@ -89,7 +89,7 @@ in memory.propagatedBuildInputs = [ pkgs.gnome-system-monitor ]; messagereceiver = { }; mocp.propagatedBuildInputs = [ pkgs.moc ]; - mpd.propagatedBuildInputs = [ pkgs.mpc-cli ]; + mpd.propagatedBuildInputs = [ pkgs.mpc ]; network.propagatedBuildInputs = [ py.netifaces pkgs.iw ]; network_traffic.propagatedBuildInputs = [ py.netifaces ]; nic.propagatedBuildInputs = [ py.netifaces pkgs.iw ]; From 913fb6348478695104c458b7a6deb74a87a46fae Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Thu, 24 Oct 2024 17:53:09 -0300 Subject: [PATCH 108/108] {mpc_cli,mpc-cli}: red-alias --- pkgs/top-level/aliases.nix | 3 ++- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 394335eaee14..fcbe89709280 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -778,7 +778,8 @@ mapAliases { mongodb-5_0 = throw "mongodb-5_0 has been removed, it's end of life since October 2024"; # Added 2024-10-01 moz-phab = mozphab; # Added 2022-08-09 mp3info = throw "'mp3info' has been removed due to lack of maintenance upstream. Consider using 'eartag' or 'tagger' instead"; # Added 2024-09-14 - mpc_cli = mpc-cli; # moved from top-level 2022-01-24 + mpc-cli = mpc; # Added 2024-10-14 + mpc_cli = mpc; # Added 2024-10-14 mpd_clientlib = throw "'mpd_clientlib' has been renamed to/replaced by 'libmpdclient'"; # Converted to throw 2024-10-17 mpdevil = plattenalbum; # Added 2024-05-22 mpg321 = throw "'mpg321' has been removed due to it being unmaintained by upstream. Consider using mpg123 instead."; # Added 2024-05-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3cc8a4ac564..84907eb22fbb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30932,8 +30932,6 @@ with pkgs; withConplay = false; }; - mpc-cli = mpc; # green-alias added 2024-10-14 - nbstripout = callPackage ../applications/version-management/nbstripout { }; ncmpc = callPackage ../applications/audio/ncmpc { };